mudhorn/meshtastic
1
0
Fork 0
mirror of https://github.com/meshtastic/meshtastic.git synced 2025-03-05 21:00:08 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into patch-5

Browse source
This commit is contained in:
Garth Vander Houwen 2022-09-12 12:08:49 -07:00 committed by GitHub
parent 517ff71dcf c86edf7430
commit 5b2b00dd67
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
docs/developers/Firmware/radio-settings.mdx
View file

@ -65,8 +65,9 @@ We have six predefined channels. These are the most common settings and have bee
| Short Range / Slow | Short Slow | 4.69 kbps | 7 / 128 | 4/5 | 125 | 140dB |
| Medium Range / Fast | Medium Fast | 1.2 kbps | 10 / 1024 | 4/6 | 250 | 146dB |
| Medium Range / Slow | Medium Slow | 0.75 kbps | 11 / 2048 | 4/7 | 250 | 148dB |
| Long Range / Fast | Long Fast | 0.19 kbps | 9 / 512 | 4/8 | 31 | 153dB |
| Long Range / Slow | Long Slow | 0.13 kbps (default) | 12 / 4096 | 4/8 | 125 | 154dB |
| Long Range / Fast | Long Fast | 0.19 kbps (default) | 9 / 512 | 4/8 | 31 | 153dB |
| Long Range / Slow | Long Slow | 0.13 kbps | 12 / 4096 | 4/8 | 125 | 154dB |
| Very Long Range - Slow | Very Long Slow | 0.04 kbps | 12 / 4096 | 4/8 | 31.25 | ???dB |
Note: 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. Data-rate in this table is actual measured but doesn't count mesh overhead, hops and retransmissions.

2
docs/settings/config/bluetooth.mdx
View file

@ -26,7 +26,7 @@ If your pairing mode is set to fixed PIN this is the value of that fixed 6 digit
| Setting | Acceptable Values | Default |
| :-----------------------: | :-----------------: | :-----: |
| bluetooth.enabled | `true`, `false` | `true` |
| bluetooth.mode | `randomPin`, `fixedPin`, `noPin` | `randomPin` |
| bluetooth.mode | `RandomPin`, `FixedPin`, `NoPin` | `RandomPin` |
| bluetooth.fixedPin | `integer` 6 Digits | `123456` |

12
docs/settings/config/device.mdx
View file

@ -18,10 +18,10 @@ Acceptable values:
| Value | Description |
| :-------: | :---------------------------------------------------------------------------------------: |
| `client` | Client (default) - App connected client. |
| `clientMute` | Client Mute - Same as a client except packets will not hop over this node, does not contribute to routing packets for mesh. |
| `router` | Router - Mesh packets will prefer to be routed over this node. This node will not be used by client apps. The wifi/ble radios and the oled screen will be put to sleep. |
| `routerClient` | Router Client - Mesh packets will prefer to be routed over this node. The Router Client can be used as both a Router and an app connected Client. |
| `Client` | Client (default) - App connected client. |
| `ClientMute` | Client Mute - Same as a client except packets will not hop over this node, does not contribute to routing packets for mesh. |
| `Router` | Router - Mesh packets will prefer to be routed over this node. This node will not be used by client apps. The wifi/ble radios and the oled screen will be put to sleep. |
| `RouterClient` | Router Client - Mesh packets will prefer to be routed over this node. The Router Client can be used as both a Router and an app connected Client. |
### Serial Console
@ -75,7 +75,7 @@ All device config options other than NTP Server are available on iOS, iPadOS and
All device config options are available in the python CLI. Example commands are below:
```shell title="Set the role to client"
meshtastic --set device.role client
meshtastic --set device.role Client
```
```shell title="Disable serial console"
@ -105,4 +105,4 @@ All device config options are available in the Web UI.
:::
</TabItem>
</Tabs>
</Tabs>

5
docs/settings/config/lora.mdx
View file

@ -107,10 +107,9 @@ LoRa config conmmands are available in the python CLI. Example commands are belo
| Setting | Acceptable Values | Default |
| :----------: | :---------------------------------------------------------------------------: | :---------------: |
| lora.modem_preset | `longFast`, `longSlow`, `vlongSlow`, `medSlow`, `medFast`, `shortSlow`, `shortFast` | `longFast` |
| lora.modem_preset | `LONG_FAST`, `LONG_SLOW`, `VERY_LONG_SLOW`, `MEDIUM_SLOW`, `MEDIUM_FAST`, `SHORT_SLOW`, `SHORT_FAST` | `LONG_FAST` |
| lora.region | `UNSET`, `US`, `EU_433`, `EU_868`, `CN`, `JP`, `ANZ`, `KR`, `TW`, `RU` ,`IN`, `NZ_865`, `TH` | `UNSET` |
| lora.hop_limit | `1`,`2`,`3`,`4`,`5`,`6`,`7` | `3`
| lora.hop_limit | `1`,`2`,`3`,`4`,`5`,`6`,`7` | `3` |
</TabItem>
<TabItem value="flasher">