Merge pull request #1 from meshtastic/master

Sacha's update to layout
This commit is contained in:
Adrian 2021-04-11 12:35:29 +01:00 committed by GitHub
commit bca64863af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 337 additions and 64 deletions

View file

@ -0,0 +1,36 @@
---
id: api_developers
title: APIs
sidebar_label: APIs
---
## General
:::note
Currently there are three methods of interfacing wiht devices: `HTTP`, `BLE`, and `Serial`.
Whilst each method has it's own ways sending and receiving data, the underlying protobuf transport medium remains the same.
:::
## HTTP
### Endpoints
#### `PUT` /api/v1/toradio
#### `GET` /api/v1/fromradio&all=`boolean`
## BLE
:::important
UUID for the service: `6ba1b218-15a8-461f-9fa8-5dcae273eafd`
:::
## Serial
:::important
You can communicate with devices with a baud rate of `921600`bps
:::

View file

@ -10,7 +10,7 @@ This project is still pretty young but moving at a pretty good pace. Not all fea
Most of these problems should be solved by the beta release (within three months):
- We don't make these devices and they haven't been tested by UL or the FCC. If you use them you are experimenting and we can't promise they won't burn your house down ;-)
- The encryption implementation is good but see this list of [caveats](software/crypto.md#summary-of-strengthsweaknesses-of-our-current-implementation) to determine risks you might face.
- The encryption implementation is good but see this list of [caveats](/software/other/crypto.md#summary-of-strengthsweaknesses-of-our-current-implementation) to determine risks you might face.
- A number of (straightforward) software work items have to be completed before battery life matches our measurements, currently battery life is about three days. Join us on chat if you want the spreadsheet of power measurements/calculations.
- The Android API needs to be documented better
- No one has written an iOS app yet. But some good souls [are talking about it](https://github.com/meshtastic/Meshtastic-esp32/issues/14) ;-)

View file

@ -0,0 +1,6 @@
---
id: concepts_getting_started
title: Concepts
sidebar_label: Concepts
slug: /getting_started/concepts
---

View file

@ -0,0 +1,6 @@
---
id: flashing_firmware_getting_started
title: Flashing Firmware
sidebar_label: Flashing
slug: /getting_started/flashing_firmware
---

View file

@ -1,8 +1,8 @@
---
id: overview
id: overview_getting_started
title: What is Meshtastic?
sidebar_label: Overview
slug: /
slug: /getting_started
---
Meshtastic® is a project that lets you use

View file

@ -0,0 +1,6 @@
---
id: antenna_hardware
title: Antennas
sidebar_label: Antennas
slug: /hardware/antenna
---

View file

@ -0,0 +1,6 @@
---
id: behaviour_hardware
title: Button Behaviour
sidebar_label: Behaviour
slug: /hardware/behaviour
---

View file

@ -0,0 +1,6 @@
---
id: supported_hardware_hardware
title: Supported hardware
sidebar_label: Supported hardware
slug: /hardware/supported_hardware
---

View file

@ -10,7 +10,7 @@ The routing protocol for Meshtastic is really quite simple (and suboptimal). It
### A note about protocol buffers
Because we want our devices to work across various vendors and implementations, we use [Protocol Buffers](https://github.com/meshtastic/Meshtastic-protobufs) pervasively. For information on how the protocol buffers are used wrt API clients see [sw-design](sw-design.md), for purposes of this document you mostly only
Because we want our devices to work across various vendors and implementations, we use [Protocol Buffers](https://github.com/meshtastic/Meshtastic-protobufs) pervasively. For information on how the protocol buffers are used wrt API clients see [sw-design](/software/other/sw-design.md), for purposes of this document you mostly only
need to consider the MeshPacket and Subpacket message types.
### Layer 1: Non reliable zero hop messaging

View file

@ -0,0 +1,5 @@
---
id: overview-software
title: Overview
sidebar_label: Overview
---

View file

@ -21,9 +21,27 @@ module.exports = {
},
items: [
{
to: "docs/",
activeBasePath: "docs",
label: "Docs",
to: "docs/getting_started",
activeBasePath: "docs/getting_started",
label: "Getting Started",
position: "left",
},
{
to: "docs/software/overview-software",
activeBasePath: "docs/software",
label: "Software",
position: "left",
},
{
to: "docs/hardware/supported_hardware",
activeBasePath: "docs/hardware",
label: "Hardware",
position: "left",
},
{
to: "docs/developers/api_developers",
activeBasePath: "docs/developers",
label: "Developers",
position: "left",
},
{
@ -46,20 +64,20 @@ module.exports = {
title: "Docs",
items: [
{
label: "Device",
to: "docs/device/radio-settings/",
label: "Getting Started",
to: "docs/getting_started",
},
{
label: "Software",
to: "docs/software/sw-design/",
to: "docs/software/overview-software",
},
{
label: "meshtastic.js",
to: "docs/js/getting-started/",
label: "Hardware",
to: "docs/hardware/supported_hardware",
},
{
label: "Protobufs",
to: "docs/protobufs/api",
label: "Developers",
to: "docs/developers/api_developers",
},
],
},
@ -67,16 +85,12 @@ module.exports = {
title: "Community",
items: [
{
label: "Stack Overflow",
href: "https://stackoverflow.com/questions/tagged/docusaurus",
label: "Forum",
href: "https://meshtastic.discourse.group",
},
{
label: "Discord",
href: "https://discordapp.com/invite/docusaurus",
},
{
label: "Twitter",
href: "https://twitter.com/docusaurus",
label: "Slack",
href: "#",
},
],
},

View file

@ -1,6 +1,72 @@
module.exports = {
Sidebar: {
"Getting Started": ["overview"],
"Getting Started": [
"getting_started/overview_getting_started",
"getting_started/flashing_firmware_getting_started",
"getting_started/concepts_getting_started",
{
"Howto's": [],
},
],
Software: [
"software/overview-software",
{
"Meshtastic Android": [],
},
{
"Meshtastic.js": [
"js/getting-started",
"js/connecting",
"js/events",
"js/http-api",
{
type: "link",
label: "API Docs",
href: "https://js.meshtastic.org",
},
],
},
{
"Meshtastic-python": [
{
type: "link",
label: "API Docs",
href: "https://meshtastic.github.io/Meshtastic-python",
},
],
},
{
Other: [
"software/other/sw-design",
"software/other/remote-hardware-service",
"software/other/rak815",
"software/other/power",
"software/other/plugin-api",
"software/other/pinetab",
"software/other/nrf52-TODO",
"software/other/mqtt",
"software/other/mesh-alg",
"software/other/install-OSX",
"software/other/esp32-arduino-build-notes",
"software/other/device-api",
"software/other/crypto",
"software/other/build-instructions",
"software/other/ant",
],
},
],
Hardware: [
"hardware/supported_hardware_hardware",
"hardware/behaviour_hardware",
"hardware/antenna_hardware",
],
Developers: [
{
Protobufs: ["protobufs/api"],
},
"developers/api_developers",
],
Device: [
"device/radio-settings",
"device/supported-hardware",
@ -8,34 +74,5 @@ module.exports = {
"device/http-api",
"device/documents",
],
Software: [
"software/sw-design",
"software/remote-hardware-service",
"software/rak815",
"software/power",
"software/plugin-api",
"software/pinetab",
"software/nrf52-TODO",
"software/mqtt",
"software/mesh-alg",
"software/install-OSX",
"software/esp32-arduino-build-notes",
"software/device-api",
"software/crypto",
"software/build-instructions",
"software/ant",
],
"Meshtastic.js": [
"js/getting-started",
"js/connecting",
"js/events",
"js/http-api",
{
type: "link",
label: "API Docs",
href: "https://js.meshtastic.org",
},
],
Protobufs: ["protobufs/api"],
},
};

View file

@ -10,32 +10,37 @@ import styles from './styles.module.css';
const features = [
{
title: "Easy to Use",
imageUrl: "img/undraw_docusaurus_mountain.svg",
title: "Diverse Software Ecosystem",
imageUrl: "img/software.svg",
description: (
<>
Docusaurus was designed from the ground up to be easily installed and
used to get your website up and running quickly.
Having an ever-growing, vibrant software ecosystem, there's almost
certainly, a capable solution ready to go for your project. With
libraries for Typescript and Python, apps for all major platforms and a
whole suite of native integrations, there's something for everyone.
</>
),
},
{
title: "Focus on What Matters",
imageUrl: "img/undraw_docusaurus_tree.svg",
title: "Extremely Versatile",
imageUrl: "img/versatility.svg",
description: (
<>
Docusaurus lets you focus on your docs, and we&apos;ll do the chores. Go
ahead and move your docs into the <code>docs</code> directory.
Create a highly scalable mesh with hardware on a multitude of platforms
to fit your unique requirements: Create an environment monitoring mesh
and produce real-time heatmaps, or maybe decentralised, encrypted
messaging network, your imagination is the limit.
</>
),
},
{
title: "Powered by React",
imageUrl: "img/undraw_docusaurus_react.svg",
title: "Peak Efficiency",
imageUrl: "img/efficiency.svg",
description: (
<>
Extend or customize your website layout by reusing React. Docusaurus can
be extended while reusing the same header and footer.
Go for days on end and on a single battery, or extend it infinitely with
a solar cell, communicate with tens kilometres between nodes on
inexpensive beginner friendly hardware.
</>
),
},

View file

@ -0,0 +1,144 @@
<?xml version="1.0" encoding="UTF-8"?><svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1000 850" enable-background="new 0 0 1000 1000" xml:space="preserve" width="1000px" height="1000px">
<path opacity="0.4" fill="#CCCDCF" enable-background="new " d="M793.432,662.59L655.74,749.421
c-14.256,8.991-31.763,11.205-47.809,6.048L457,706.953c-16.15-5.191-33.773-2.912-48.072,6.215l-110.5,70.537
c-12.049,7.613-27.988,4.017-35.6-8.032c-1.314-2.08-2.324-4.338-3-6.704l-95.37-334.34c-3.14-11.011,1.351-22.776,11.03-28.893
l139.16-87.949c15.618-9.871,34.81-12.308,52.4-6.655L513.163,358.1c17.655,5.675,36.92,3.198,52.566-6.758l104.638-66.589
c12.025-7.651,27.976-4.106,35.627,7.919c1.336,2.099,2.361,4.381,3.044,6.774l95.355,334.294
C807.526,644.723,803.067,656.458,793.432,662.59z"/>
<path fill="#FFFFFF" d="M798.808,627.107L681.23,701.929c-15.646,9.956-34.911,12.433-52.566,6.758l-146.125-46.968
c-17.59-5.653-36.781-3.216-52.4,6.654L303.8,748.222c-12.049,7.613-27.988,4.017-35.6-8.032c-1.314-2.08-2.324-4.338-3-6.704
l-95.369-334.34c-3.141-11.011,1.35-22.775,11.029-28.893L320.013,282.3c15.619-9.87,34.81-12.307,52.4-6.654l146.124,46.969
c17.655,5.675,36.921,3.198,52.566-6.759l104.638-66.588c12.025-7.651,27.976-4.106,35.627,7.919
c1.336,2.099,2.361,4.381,3.044,6.774l95.355,334.292C812.902,609.236,808.444,620.974,798.808,627.107z"/>
<path fill="#EAF4F7" d="M468.513,623.926L446.65,562.24l-103.319,35.371l-32.307-93.606l-84.151,16.748l59,206.834
c0.536,1.864,2.245,3.145,4.184,3.137c0.801-0.003,1.583-0.24,2.251-0.681l120.114-75.913
C411.9,653.519,468.513,623.926,468.513,623.926z"/>
<path fill="#363A5A" d="M290.059,755.24c-3.53-0.005-7.029-0.656-10.325-1.921c-8.502-3.203-14.973-10.261-17.427-19.009
l-95.369-334.341c-3.45-12.289,1.55-25.388,12.311-32.252l139.161-87.949c16.363-10.368,36.488-12.924,54.923-6.975l146.124,46.969
c16.804,5.425,35.152,3.066,50.037-6.433l104.639-66.588c13.421-8.542,31.225-4.586,39.767,8.835
c1.492,2.344,2.637,4.892,3.399,7.565l95.355,334.293c3.435,12.256-1.529,25.319-12.236,32.2L682.84,704.46
c-16.389,10.46-36.592,13.058-55.094,7.084l-146.125-46.969c-16.742-5.404-35.021-3.083-49.881,6.334L305.4,750.758
C300.815,753.677,295.494,755.232,290.059,755.24z M353.3,275.645c-11.218,0.003-22.204,3.192-31.68,9.195l-139.166,87.949
c-8.52,5.434-12.478,15.805-9.747,25.534l95.369,334.34c3.455,12.112,16.074,19.131,28.187,15.676
c2.093-0.597,4.09-1.49,5.929-2.653l126.343-79.849c16.362-10.368,36.487-12.924,54.922-6.975l146.125,46.969
c16.804,5.426,35.153,3.067,50.037-6.434L797.2,624.575l1.611,2.531l-1.611-2.531c8.48-5.449,12.411-15.795,9.688-25.5
l-95.359-334.288c-3.454-12.113-16.073-19.132-28.186-15.678c-2.116,0.603-4.133,1.51-5.989,2.691l-104.639,66.591
c-16.389,10.46-36.592,13.057-55.094,7.083L371.5,278.505C365.619,276.612,359.478,275.647,353.3,275.645z"/>
<path fill="#363A5A" d="M360.065,587.576c-1.105-0.001-1.999-0.897-1.998-2.002c0.001-0.91,0.617-1.705,1.498-1.934
c0.018,0,1.8-0.471,4.754-1.334c1.06-0.31,2.171,0.298,2.482,1.359s-0.298,2.171-1.359,2.482c-3.013,0.88-4.794,1.345-4.869,1.365
C360.407,587.554,360.236,587.576,360.065,587.576z"/>
<path fill="#363A5A" d="M379.416,581.573c-1.105,0-2-0.896-2-2c0-0.851,0.539-1.609,1.343-1.889c3.269-1.137,6.462-2.313,9.488-3.5
c1.029-0.402,2.189,0.107,2.591,1.136c0.402,1.029-0.107,2.189-1.136,2.591c-3.073,1.2-6.312,2.393-9.629,3.546
C379.862,581.532,379.64,581.572,379.416,581.573z M403,572c-1.105-0.003-1.997-0.901-1.994-2.006
c0.002-0.765,0.44-1.461,1.128-1.794c3.2-1.537,6.19-3.1,8.883-4.659c0.957-0.552,2.18-0.224,2.733,0.733
c0.552,0.957,0.224,2.18-0.733,2.732c-2.78,1.6-5.859,3.219-9.153,4.8C403.594,571.934,403.299,572.001,403,572z M424.438,558.435
c-1.105-0.001-1.999-0.897-1.999-2.001c0-0.557,0.233-1.089,0.642-1.467c2.37-2.075,4.337-4.57,5.8-7.359
c0.492-0.989,1.693-1.391,2.682-0.899c0.973,0.485,1.381,1.658,0.918,2.642c-1.68,3.24-3.947,6.14-6.685,8.553
c-0.368,0.343-0.853,0.534-1.357,0.534L424.438,558.435z M568.979,539.5h-0.222c-1.105,0-2-0.895-2-2s0.895-2,2-2h0.249
c0.842,0,1.728-0.018,2.636-0.055c2.154-0.009,4.289-0.41,6.3-1.182c1.01-0.448,2.191,0.007,2.639,1.017
c0.448,1.01-0.007,2.191-1.016,2.639c-2.47,0.987-5.104,1.504-7.764,1.522C570.841,539.48,569.9,539.5,568.979,539.5z
M553.846,537.22c-0.222,0-0.442-0.037-0.651-0.11c-3.375-1.149-6.556-2.806-9.432-4.913c-0.906-0.632-1.128-1.879-0.495-2.785
c0.632-0.906,1.879-1.128,2.785-0.495c0.028,0.019,0.055,0.039,0.082,0.06c2.551,1.866,5.37,3.333,8.362,4.35
c1.045,0.356,1.604,1.493,1.248,2.538C555.467,536.677,554.703,537.222,553.846,537.22L553.846,537.22z M429.546,535.948
c-0.768-0.001-1.468-0.442-1.8-1.135c-1.179-2.456-2.763-5.316-4.845-8.744c-0.573-0.944-0.272-2.175,0.672-2.748
c0.944-0.573,2.175-0.272,2.748,0.672l0,0c2.149,3.541,3.8,6.515,5.031,9.09c0.478,0.996,0.058,2.191-0.938,2.668
c-0.269,0.129-0.563,0.196-0.862,0.197H429.546z M583.546,524.801c-1.044-0.001-1.912-0.806-1.992-1.847
c-0.08-1.049-0.183-2.142-0.288-3.275c-0.206-2.2-0.419-4.478-0.53-6.931c-0.05-1.105,0.804-2.041,1.909-2.091
s2.041,0.804,2.091,1.909c0.107,2.358,0.315,4.585,0.516,6.741c0.108,1.156,0.212,2.271,0.294,3.34
c0.085,1.101-0.739,2.063-1.84,2.148c0,0-0.001,0-0.001,0c-0.064,0.005-0.116,0.005-0.167,0.005L583.546,524.801z M534.967,521.301
c-0.7,0.001-1.35-0.365-1.713-0.964c-1.79-2.992-3.355-6.113-4.683-9.337c-0.427-1.019,0.054-2.191,1.073-2.618
c1.019-0.427,2.191,0.054,2.617,1.073c1.248,3.045,2.722,5.993,4.407,8.819c0.572,0.945,0.27,2.175-0.675,2.747
c-0.312,0.189-0.67,0.289-1.034,0.289L534.967,521.301z M416.316,514.178c-0.667,0.001-1.29-0.331-1.662-0.885
c-1.825-2.716-3.743-5.53-5.719-8.415c-0.625-0.911-0.392-2.156,0.519-2.781c0.911-0.625,2.156-0.392,2.781,0.519
c1.983,2.9,3.909,5.721,5.739,8.446c0.616,0.917,0.373,2.159-0.544,2.776C417.101,514.059,416.713,514.178,416.316,514.178
L416.316,514.178z M584.142,499.522c-1.105,0.001-2.001-0.894-2.001-1.999c0-0.175,0.023-0.35,0.068-0.519
c0.927-3.439,2.284-6.747,4.038-9.846c0.543-0.962,1.763-1.301,2.725-0.758c0.962,0.543,1.301,1.763,0.758,2.725l0,0
c-1.589,2.806-2.818,5.802-3.658,8.915c-0.233,0.878-1.029,1.489-1.938,1.487L584.142,499.522z M525.374,497.808
c-0.879-0.001-1.654-0.575-1.911-1.415c-0.866-2.827-1.711-5.722-2.568-8.661l-0.332-1.138c-0.31-1.06,0.299-2.171,1.359-2.481
c1.06-0.31,2.171,0.299,2.481,1.36l0.332,1.139c0.852,2.921,1.692,5.8,2.552,8.611c0.323,1.056-0.271,2.174-1.328,2.498
C525.77,497.779,525.572,497.808,525.374,497.808L525.374,497.808z M401.946,493.131c-0.663,0.001-1.283-0.326-1.656-0.874
c-1.9-2.8-3.817-5.626-5.71-8.467c-0.612-0.92-0.364-2.161,0.556-2.774s2.161-0.364,2.774,0.556c1.885,2.83,3.789,5.648,5.687,8.433
c0.622,0.913,0.386,2.157-0.527,2.779C402.739,493.01,402.347,493.131,401.946,493.131L401.946,493.131z M597.484,478.287
c-1.105,0.001-2.001-0.894-2.002-1.998c-0.001-0.552,0.227-1.08,0.63-1.459c2.544-2.376,5.246-4.576,8.088-6.586
c0.9-0.641,2.149-0.431,2.789,0.469s0.431,2.149-0.469,2.789l0,0c-2.694,1.904-5.255,3.989-7.666,6.241
c-0.372,0.353-0.866,0.55-1.379,0.549L597.484,478.287z M517.999,473.424c-0.862,0.001-1.628-0.55-1.9-1.368
c-1.15-3.451-2.276-6.545-3.441-9.46c-0.434-1.016,0.039-2.191,1.055-2.624c1.016-0.434,2.191,0.039,2.624,1.055
c0.012,0.028,0.023,0.056,0.034,0.085c1.2,2.988,2.348,6.155,3.523,9.681c0.349,1.048-0.218,2.18-1.266,2.53
c-0.205,0.068-0.419,0.103-0.635,0.102H517.999z M387.94,471.847c-0.691,0.001-1.334-0.355-1.7-0.941
c-1.921-3.075-3.7-6.029-5.3-8.779c-0.555-0.955-0.23-2.179,0.725-2.734s2.179-0.23,2.734,0.725c1.576,2.713,3.337,5.63,5.235,8.669
c0.585,0.937,0.301,2.171-0.636,2.756C388.681,471.741,388.314,471.847,387.94,471.847z M618.402,463.985
c-1.105,0.002-2.002-0.892-2.003-1.997c-0.001-0.748,0.415-1.434,1.078-1.778c2.907-1.511,6.034-3,9.294-4.438
c1.015-0.437,2.191,0.032,2.628,1.047c0.432,1.004-0.022,2.168-1.019,2.615c-3.18,1.4-6.227,2.853-9.058,4.325
c-0.286,0.151-0.605,0.23-0.928,0.231L618.402,463.985z M641.761,454.002c-1.105-0.001-1.999-0.897-1.999-2.001
c0.001-0.845,0.532-1.599,1.329-1.883c0.55-0.196,1.106-0.391,1.667-0.586c2.181-0.824,3.945-2.483,4.9-4.61
c0.484-0.993,1.682-1.405,2.674-0.92s1.405,1.682,0.92,2.674c-0.014,0.028-0.028,0.056-0.043,0.083
c-1.423,3.039-3.987,5.393-7.136,6.552c-0.554,0.192-1.1,0.383-1.639,0.575c-0.219,0.08-0.449,0.121-0.682,0.121L641.761,454.002z
M507.97,450.086c-0.72,0-1.384-0.386-1.74-1.012c-1.63-2.877-3.432-5.653-5.395-8.314c-0.658-0.888-0.471-2.141,0.417-2.798
s2.141-0.471,2.798,0.417c2.056,2.791,3.943,5.704,5.65,8.721c0.546,0.96,0.211,2.181-0.749,2.727
c-0.301,0.171-0.641,0.261-0.988,0.262L507.97,450.086z M375.475,449.638c-0.772,0.001-1.475-0.443-1.807-1.14
c-1.62-3.4-2.978-6.617-4.038-9.566c-0.384-1.036,0.144-2.187,1.18-2.571c1.036-0.384,2.187,0.144,2.571,1.18
c0.005,0.013,0.009,0.025,0.014,0.038c1.015,2.824,2.322,5.919,3.885,9.2c0.475,0.997,0.052,2.191-0.945,2.666c0,0,0,0,0,0
c-0.27,0.131-0.567,0.199-0.867,0.198L375.475,449.638z M652.34,432.987h-0.04c-1.104-0.022-1.981-0.936-1.959-2.04
c0,0,0-0.001,0-0.001c0.011-0.508,0.016-1.02,0.016-1.536c0-2.576-0.132-5.408-0.393-8.417c-0.071-1.102,0.765-2.053,1.867-2.124
c1.068-0.069,2,0.715,2.117,1.778c0.272,3.124,0.409,6.072,0.409,8.763c0,0.544-0.005,1.083-0.016,1.618
C654.319,432.117,653.429,432.988,652.34,432.987z M492.191,430.358c-0.488,0.001-0.959-0.177-1.325-0.5
c-2.459-2.176-5.068-4.176-7.807-5.986c-0.921-0.609-1.174-1.851-0.565-2.772s1.851-1.174,2.772-0.565l0,0
c2.895,1.915,5.653,4.029,8.253,6.329c0.828,0.731,0.908,1.994,0.177,2.823c-0.381,0.432-0.929,0.679-1.505,0.677L492.191,430.358z
M368.567,425.372H368.5c-1.104-0.035-1.97-0.959-1.935-2.063c0,0,0-0.001,0-0.001c-0.018-3.886,1.334-7.655,3.819-10.643
c0.705-0.85,1.966-0.968,2.816-0.263c0.85,0.705,0.968,1.966,0.263,2.816c-0.021,0.026-0.044,0.051-0.066,0.076
c-1.881,2.292-2.885,5.178-2.834,8.143C370.528,424.515,369.645,425.37,368.567,425.372L368.567,425.372z M470.756,417.109
c-0.264,0-0.525-0.052-0.769-0.154c-3.054-1.267-6.173-2.373-9.343-3.312c-1.059-0.315-1.661-1.429-1.346-2.488
s1.429-1.661,2.488-1.346c3.305,0.98,6.556,2.133,9.74,3.454c1.02,0.425,1.501,1.596,1.076,2.616
C472.292,416.624,471.563,417.109,470.756,417.109z M446.407,410.363c-0.109,0-0.218-0.009-0.326-0.027
c-3.183-0.523-6.521-0.953-9.924-1.279c-1.1-0.106-1.905-1.083-1.799-2.182s1.083-1.905,2.182-1.799
c3.49,0.335,6.919,0.777,10.189,1.314c1.09,0.178,1.83,1.205,1.653,2.295C448.224,409.652,447.388,410.363,446.407,410.363z
M385.624,410.211c-1.105-0.002-1.998-0.899-1.996-2.004c0.002-1.015,0.764-1.868,1.772-1.983c3.444-0.393,6.871-0.733,10.186-1.011
c1.101-0.092,2.068,0.726,2.16,1.827c0.092,1.101-0.725,2.068-1.826,2.16c-3.275,0.274-6.662,0.61-10.066,1
C385.778,410.208,385.701,410.212,385.624,410.211L385.624,410.211z M410.988,408.333c-1.105,0.016-2.013-0.867-2.029-1.971
s0.867-2.013,1.971-2.029c3.483-0.1,6.945-0.13,10.261-0.08c1.105,0.017,1.987,0.925,1.97,2.03s-0.925,1.987-2.03,1.97
c-3.257-0.049-6.659-0.022-10.084,0.079L410.988,408.333z M649.878,407.698c-0.968-0.001-1.796-0.694-1.967-1.647
c-0.566-3.156-1.238-6.487-1.995-9.9c-0.185-1.089,0.547-2.122,1.636-2.307c1.013-0.172,1.991,0.451,2.264,1.441
c0.77,3.465,1.452,6.85,2.029,10.059c0.195,1.087-0.528,2.127-1.615,2.322c0,0-0.001,0-0.001,0
c-0.116,0.021-0.233,0.033-0.351,0.034L649.878,407.698z"/>
<path fill="#363A5A" d="M643.979,382.227c-0.897-0.001-1.684-0.598-1.925-1.462c-0.826-2.949-1.378-4.724-1.383-4.742
c-0.35-1.048,0.215-2.181,1.262-2.531c1.048-0.35,2.181,0.215,2.531,1.262c0.009,0.026,0.017,0.052,0.025,0.079
c0.024,0.074,0.573,1.843,1.416,4.854c0.298,1.064-0.322,2.167-1.386,2.466C644.343,382.202,644.162,382.227,643.979,382.227z"/>
<circle opacity="0.22" fill="#3DC0CB" enable-background="new " cx="353.612" cy="588.178" r="48.192"/>
<circle fill="#3DC0CB" cx="353.612" cy="588.178" r="27.946"/>
<path fill="#64C7CF" d="M353.612,560.232c-8.684-0.005-16.874,4.033-22.158,10.924c12.763-8.675,30.142-5.361,38.817,7.402
c6.78,9.975,6.394,23.175-0.957,32.737c12.767-8.673,16.087-26.053,7.414-38.82c-5.201-7.657-13.857-12.242-23.114-12.243H353.612z"/>
<path fill="#363A5A" d="M353.611,619.123c-17.091-0.001-30.946-13.856-30.945-30.947c0.001-17.091,13.856-30.946,30.947-30.945
c17.091,0,30.946,13.856,30.945,30.947C384.539,605.261,370.694,619.105,353.611,619.123z M353.611,563.232
c-13.777,0.001-24.946,11.17-24.945,24.947c0.001,13.777,11.17,24.946,24.947,24.945c13.777,0,24.945-11.169,24.945-24.946
C378.543,574.407,367.382,563.247,353.611,563.232z"/>
<path fill="#87D5F7" stroke="#259AD6" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" d="M366.347,338.84
l80.153,15.193l-18.407-32.352l-66.339-23.145c-7.749-2.703-16.255-2.217-23.645,1.352l-145.767,88.543
c-1.607,1.025-2.354,2.981-1.839,4.816l23.508,82.412l64.089-15.847L266.33,412.6L366.347,338.84z"/>
<polygon fill="#FDDCBF" stroke="#ECB072" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" points="493.37,542.929
539.109,554.445 561.222,605.126 511.949,597.049 "/>
<path fill="#EAF4F7" d="M643.426,391.11c-37.157,0-67.278-10.776-67.278-24.069s30.121-24.07,67.278-24.07
s67.277,10.777,67.277,24.07S680.582,391.11,643.426,391.11z"/>
<polygon fill="#FDDCBF" stroke="#ECB072" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" points="
664.538,527.486 748.465,490.952 781.62,591.961 645.718,669.193 620.808,598.893 673.948,569.002 "/>
<path fill="#EE4637" d="M742.481,249.681c0-57.8-46.914-104.344-103.761-101.642c-50.9,2.42-94.292,45.782-94.292,98.124
c0,75.717,99,134.1,99,134.1S742.481,321.88,742.481,249.681z"/>
<path fill="#CD3C27" d="M679.585,350.964c-16.066,12.534-38.62,12.456-54.6-0.188c-29.3-23.2-71.677-65.323-71.677-114.86
c0.073-21.033,7.03-41.463,19.808-58.17c-17.573,17.746-28.689,41.93-28.689,68.417c0,75.717,99,134.1,99,134.1
s40.374-23.8,69.571-59.8C702.692,331.506,691.519,341.705,679.585,350.964z"/>
<path fill="#F07378" d="M638.72,148.039c-17.847,0.92-35.103,6.702-49.9,16.723c11.652-5.619,24.313-8.844,37.234-9.485
c56.847-2.7,103.762,43.841,103.762,101.642c0,56.61-60.894,104.724-87.192,122.863c0.515,0.314,0.8,0.484,0.8,0.484
s99.055-58.386,99.055-130.585C742.481,191.881,695.567,145.337,638.72,148.039z"/>
<path fill="#FFFFFF" d="M643.426,288.605c-22.509,0.001-40.756-18.246-40.757-40.755s18.246-40.756,40.755-40.757
c22.509-0.001,40.756,18.246,40.757,40.755c0,0,0,0.001,0,0.001C684.181,270.358,665.935,288.604,643.426,288.605z"/>
<path fill="#363A5A" d="M643.426,291.605c-24.166,0.001-43.756-19.589-43.757-43.755s19.589-43.756,43.755-43.757
s43.756,19.589,43.757,43.755c0,0,0,0.001,0,0.001C687.154,272.003,667.58,291.577,643.426,291.605z M643.426,210.094
c-20.852-0.001-37.756,16.903-37.757,37.755s16.903,37.756,37.755,37.757c20.852,0.001,37.756-16.903,37.757-37.755
c0-0.001,0-0.001,0-0.002C681.156,227.008,664.267,210.119,643.426,210.094L643.426,210.094z"/>
<path fill="#363A5A" d="M643.426,383.266c-0.536,0-1.063-0.143-1.525-0.416c-18.023-11.225-34.805-24.328-50.065-39.091
c-32.978-32.059-50.408-65.807-50.408-97.6c0-53.212,43.581-98.575,97.149-101.122c27.552-1.369,54.444,8.721,74.295,27.877
c20.861,20.085,32.636,47.804,32.609,76.762c0,30.361-17.448,63.051-50.457,94.538c-15.338,14.543-32.116,27.487-50.075,38.632
C644.488,383.119,643.962,383.264,643.426,383.266z M643.447,150.927c-1.525,0-3.054,0.036-4.585,0.109
c-24.056,1.143-46.866,11.6-64.225,29.436c-17.546,18.03-27.209,41.36-27.209,65.692c0,20.989,8.414,54.2,48.5,93.205
c14.53,14.032,30.445,26.556,47.5,37.38c12.407-7.728,96.056-62.268,96.056-127.068c0.03-27.318-11.074-53.469-30.75-72.42
C691.206,160.354,667.8,150.913,643.447,150.927L643.447,150.927z"/>
</svg>

After

Width:  |  Height:  |  Size: 15 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 14 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 12 KiB