mirror of
https://github.com/meshtastic/meshtastic.git
synced 2024-12-26 22:19:46 -08:00
Merge branch 'master' into fixed-position-01
This commit is contained in:
commit
37f23130cf
|
@ -109,7 +109,7 @@ Some example settings:
|
|||
|
||||
The link budget used by these calculations assumes a transmit power of 17dBm and an antenna with 0dB gain. Adjust your link budget assumptions based on your actual devices.
|
||||
|
||||
These channel settings may not have been tested. Use at your own discretion. Share on <https://meshtastic.discourse.group> with your successes or failure.
|
||||
These channel settings may not have been tested. Use at your own discretion. Share on https://meshtastic.discourse.group with your successes or failure.
|
||||
|
||||
## Cryptography
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@ The presets are designed to provide further options for optimizing either speed
|
|||
1. A high number of devices exist in the mesh, or messages are sent very frequently. Faster speeds (and therefore lower radio time per device) can help with mesh network congestion.
|
||||
2. Maximum range is desired, for long range scenarios where a several second delay in message receipt is acceptable (for instance, attempting to send messages from a town to a distant mountain top).
|
||||
|
||||
The Presets available are as follows, and follow a linear pattern of Fastest <--> Slowest, and Shortest <--> Longest range:
|
||||
The Presets available are as follows, and follow a linear pattern of Fastest \<\-\-\> Slowest, and Shortest \<\-\-\> Longest range:
|
||||
|
||||
1. `SHORT_FAST` (Fastest, highest bandwidth, lowest airtime, shortest range)
|
||||
|
||||
|
@ -81,7 +81,7 @@ Please be aware that values < 62.5kHz may require a TCXO on some hardware device
|
|||
|
||||
### Spread Factor
|
||||
|
||||
A number from 7 to 12. Indicates the number of chirps per symbol as 1<<spread_factor.
|
||||
A number from 7 to 12. Indicates the number of chirps per symbol as 1[\<\<]spread_factor.
|
||||
|
||||
### Coding Rate
|
||||
|
||||
|
|
|
@ -84,13 +84,13 @@ Since authentication is also eventually needed for our other transports (TCP and
|
|||
|
||||
### JavaScript
|
||||
|
||||
See: <https://github.com/meshtastic/meshtastic.js>
|
||||
See: https://github.com/meshtastic/meshtastic.js
|
||||
|
||||
A reference client written in JavaScript will provide a JavaScript API for using this transport. That client will do HTTP connections, use the generated protobuf JavaScript code and provide an API that hides all of this REST plumbing. The two key methods will be `sendToRadio(packet)` and `onFromRadio(callback)`.
|
||||
|
||||
### Protoman
|
||||
|
||||
See: <https://github.com/spluxx/Protoman>
|
||||
See: [https://github.com/spluxx/Protoman]
|
||||
|
||||
Protoman is able to interface with the Meshtastic REST API out of the box. This is useful for manual testing of the endpoints.
|
||||
|
||||
|
@ -100,4 +100,4 @@ HTTP and HTTPS are both supported on the ESP32 using self signed certificates on
|
|||
|
||||
## Related documents
|
||||
|
||||
- Interesting slide pack on the concept: <https://www.slideshare.net/mokeefe/javaone-2009-ts5276-restful-protocol-buffers>
|
||||
- Interesting slide pack on the concept: [https://www.slideshare.net/mokeefe/javaone-2009-ts5276-restful-protocol-buffers]
|
||||
|
|
|
@ -9,8 +9,8 @@ Testing of antennas can be both simple and complex. At its simplest, testing inv
|
|||
|
||||
If you have sufficient range with your existing aerial, skip this section. If you don't, consider either getting more nodes and / or replace the stock aerial with one tuned (to your region transmitter's frequency):
|
||||
|
||||
- A quarter wave _tuned_ stubby aerial (<10cm for fit-in-pocket) should have a real-world range of a couple of km without significant obstacles (buildings / hills).
|
||||
- Aerial criteria: 50 Ohm, appropriate connector (usually SMA male or U.FL), low VSWR (<2) (at tuning frequency - see its datasheet), gain > 0 dBi .
|
||||
- A quarter wave _tuned_ stubby aerial (\<10cm for fit-in-pocket) should have a real-world range of a couple of km without significant obstacles (buildings / hills).
|
||||
- Aerial criteria: 50 Ohm, appropriate connector (usually SMA male or U.FL), low VSWR (\<2) (at tuning frequency - see its datasheet), gain > 0 dBi .
|
||||
- Caution, avoid suppliers who:
|
||||
- don't state the aerial's tuned frequency and its specific purpose (LoRa network)
|
||||
- claim huge gain figures on omni-directional aerials
|
||||
|
|
|
@ -20,7 +20,7 @@ The Nano G1 is the first dedicated hardware device to be designed from scratch p
|
|||
- **Navigation Module**
|
||||
- ATGM336H-5N-71 (Supports GPS, BDS and GLONASS)
|
||||
- **Antenna**
|
||||
- Built in 915Mhz Lora PCB Antenna (VSWR <=1.5 @ 915 MHz)
|
||||
- Built in 915Mhz Lora PCB Antenna (VSWR \<=1.5 @ 915 MHz)
|
||||
- **Connectors**
|
||||
- USB-C
|
||||
|
||||
|
|
50
package.json
50
package.json
|
@ -12,38 +12,38 @@
|
|||
"clear": "docusaurus clear"
|
||||
},
|
||||
"dependencies": {
|
||||
"@algolia/client-search": "^4.17.0",
|
||||
"@docusaurus/core": "2.4.1",
|
||||
"@docusaurus/plugin-content-docs": "2.4.1",
|
||||
"@docusaurus/preset-classic": "2.4.1",
|
||||
"@docusaurus/theme-common": "^2.4.1",
|
||||
"@docusaurus/theme-mermaid": "^2.4.1",
|
||||
"@headlessui/react": "^1.7.14",
|
||||
"@algolia/client-search": "^4.19.1",
|
||||
"@docusaurus/core": "3.0.0-alpha.0",
|
||||
"@docusaurus/plugin-content-docs": "3.0.0-alpha.0",
|
||||
"@docusaurus/preset-classic": "3.0.0-alpha.0",
|
||||
"@docusaurus/theme-common": "3.0.0-alpha.0",
|
||||
"@docusaurus/theme-mermaid": "3.0.0-alpha.0",
|
||||
"@headlessui/react": "^1.7.16",
|
||||
"@heroicons/react": "^2.0.18",
|
||||
"@mdx-js/react": "^1.6.22",
|
||||
"@meshtastic/meshtasticjs": "2.1.9-0",
|
||||
"@mdx-js/react": "^2.3.0",
|
||||
"@meshtastic/meshtasticjs": "2.1.22-3",
|
||||
"autoprefixer": "^10.4.14",
|
||||
"base64-js": "^1.5.1",
|
||||
"dotenv": "^16.0.3",
|
||||
"dotenv": "^16.3.1",
|
||||
"framer-motion": "^6.5.1",
|
||||
"postcss": "^8.4.23",
|
||||
"react": "^17.0.2",
|
||||
"react-dom": "^17.0.2",
|
||||
"react-icons": "^4.8.0",
|
||||
"postcss": "^8.4.27",
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0",
|
||||
"react-icons": "^4.10.1",
|
||||
"react-responsive-carousel": "^3.2.23",
|
||||
"swr": "^2.1.5",
|
||||
"tailwindcss": "^3.3.2",
|
||||
"url-search-params-polyfill": "^8.1.1",
|
||||
"use-breakpoint": "^3.0.7"
|
||||
"swr": "^2.2.0",
|
||||
"tailwindcss": "^3.3.3",
|
||||
"url-search-params-polyfill": "^8.2.4",
|
||||
"use-breakpoint": "^3.1.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@docusaurus/module-type-aliases": "2.4.1",
|
||||
"@docusaurus/module-type-aliases": "3.0.0-alpha.0",
|
||||
"@tailwindcss/typography": "^0.5.9",
|
||||
"@tsconfig/docusaurus": "^1.0.7",
|
||||
"@types/node": "^20.1.7",
|
||||
"@types/react": "^18.2.6",
|
||||
"@types/react-dom": "^18.2.4",
|
||||
"rome": "^12.1.0",
|
||||
"typescript": "^5.0.4"
|
||||
"@tsconfig/docusaurus": "^2.0.0",
|
||||
"@types/node": "^20.4.8",
|
||||
"@types/react": "^18.2.18",
|
||||
"@types/react-dom": "^18.2.7",
|
||||
"rome": "^12.1.3",
|
||||
"typescript": "^5.1.6"
|
||||
}
|
||||
}
|
||||
|
|
3427
pnpm-lock.yaml
3427
pnpm-lock.yaml
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue