From 3e64d9d7ae2f3e8f134aefc46825fba4ad15b28e Mon Sep 17 00:00:00 2001 From: Vladislav Osmanov <7123463+osmanovv@users.noreply.github.com> Date: Sun, 11 Sep 2022 17:22:33 +0300 Subject: [PATCH 1/7] param is case sensitive Using Python CLI v1.3.29: ``` >meshtastic --set device.role client Connected to radio device.role does not have an enum called client, so you can not set it. Choices in sorted order are: Client ClientMute Router RouterClient LocalConfig and LocalModuleConfig do not have attribute device.role. ``` --- docs/settings/config/device.mdx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/settings/config/device.mdx b/docs/settings/config/device.mdx index 8f26bd2b..676b6d60 100644 --- a/docs/settings/config/device.mdx +++ b/docs/settings/config/device.mdx @@ -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. ::: - \ No newline at end of file + From 5ccb5dfb37cec3e61f502fd156af3d14a0cb38f0 Mon Sep 17 00:00:00 2001 From: Vladislav Osmanov <7123463+osmanovv@users.noreply.github.com> Date: Sun, 11 Sep 2022 17:27:03 +0300 Subject: [PATCH 2/7] param value is case sensitive Using Python CLI v1.3.29: ``` >meshtastic --set bluetooth.mode randomPin Connected to radio bluetooth.mode does not have an enum called randomPin, so you can not set it. Choices in sorted order are: FixedPin NoPin RandomPin LocalConfig and LocalModuleConfig do not have attribute bluetooth.mode. ``` --- docs/settings/config/bluetooth.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/settings/config/bluetooth.mdx b/docs/settings/config/bluetooth.mdx index 7715969e..7c2fba84 100644 --- a/docs/settings/config/bluetooth.mdx +++ b/docs/settings/config/bluetooth.mdx @@ -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` | From f1f4f46f1dbb31cc0863bb7a039ac5132e0e7934 Mon Sep 17 00:00:00 2001 From: Vladislav Osmanov <7123463+osmanovv@users.noreply.github.com> Date: Sun, 11 Sep 2022 18:02:03 +0300 Subject: [PATCH 3/7] param value is case sensitive Using Python CLI v1.3.29: ``` >meshtastic --set lora.modem_preset longSlow Connected to radio lora.modem_preset does not have an enum called longSlow, so you can not set it. Choices in sorted order are: LongFast LongSlow MedFast MedSlow ShortFast ShortSlow VLongSlow LocalConfig and LocalModuleConfig do not have attribute lora.modem_preset. ``` --- docs/settings/config/lora.mdx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/settings/config/lora.mdx b/docs/settings/config/lora.mdx index bf3e8c17..16511eba 100644 --- a/docs/settings/config/lora.mdx +++ b/docs/settings/config/lora.mdx @@ -107,7 +107,7 @@ 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 | `LongFast`, `LongSlow`, `VLongSlow`, `MedSlow`, `MedFast`, `ShortSlow`, `ShortFast` | `LongFast` | | lora.region | `Unset`, `us`, `eu433`, `eu868`, `cn`, `jp`, `anz`, `kr`, `tw`, `ru` ,`in`, ` nz865`, `th` | `Unset` | | lora.hop_limit | `1`,`2`,`3`,`4`,`5`,`6`,`7` | `3` @@ -126,4 +126,4 @@ All lora config options are available in the Web UI. ::: - \ No newline at end of file + From a2f7def99a01f19deab26c1187bc5c61b39494a4 Mon Sep 17 00:00:00 2001 From: Vladislav Osmanov <7123463+osmanovv@users.noreply.github.com> Date: Sun, 11 Sep 2022 18:13:54 +0300 Subject: [PATCH 4/7] Added missing `Very Long Range - Slow` channel and fix default to `Long Fast` Needs to check data rate and other channel params --- docs/developers/Firmware/radio-settings.mdx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/developers/Firmware/radio-settings.mdx b/docs/developers/Firmware/radio-settings.mdx index 703a0dc3..5655f0ec 100644 --- a/docs/developers/Firmware/radio-settings.mdx +++ b/docs/developers/Firmware/radio-settings.mdx @@ -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 | VLongSlow | TBD kbps | 12 / 4096 | 4/8 | ??? | ???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. From aa1a938a4ecf063f6761edc4464222c290ab80d1 Mon Sep 17 00:00:00 2001 From: Vladislav Osmanov <7123463+osmanovv@users.noreply.github.com> Date: Mon, 12 Sep 2022 20:21:02 +0300 Subject: [PATCH 5/7] channel names updated for the latest protobufs --- docs/settings/config/lora.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/settings/config/lora.mdx b/docs/settings/config/lora.mdx index 16511eba..c292bb6b 100644 --- a/docs/settings/config/lora.mdx +++ b/docs/settings/config/lora.mdx @@ -107,7 +107,7 @@ 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 | `LongFast`, `LongSlow`, `VeryLongSlow`, `MediumSlow`, `MediumFast`, `ShortSlow`, `ShortFast` | `LongFast` | | lora.region | `Unset`, `us`, `eu433`, `eu868`, `cn`, `jp`, `anz`, `kr`, `tw`, `ru` ,`in`, ` nz865`, `th` | `Unset` | | lora.hop_limit | `1`,`2`,`3`,`4`,`5`,`6`,`7` | `3` From ffeba15437f07343ea356143501d52740f2018cf Mon Sep 17 00:00:00 2001 From: Vladislav Osmanov <7123463+osmanovv@users.noreply.github.com> Date: Mon, 12 Sep 2022 20:50:51 +0300 Subject: [PATCH 6/7] channel names updated according the latest protobufs https://github.com/meshtastic/Meshtastic-protobufs/blob/master/config.proto --- docs/settings/config/lora.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/settings/config/lora.mdx b/docs/settings/config/lora.mdx index c292bb6b..ea93668d 100644 --- a/docs/settings/config/lora.mdx +++ b/docs/settings/config/lora.mdx @@ -107,7 +107,7 @@ LoRa config conmmands are available in the python CLI. Example commands are belo | Setting | Acceptable Values | Default | | :----------: | :---------------------------------------------------------------------------: | :---------------: | -| lora.modem_preset | `LongFast`, `LongSlow`, `VeryLongSlow`, `MediumSlow`, `MediumFast`, `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`, `eu433`, `eu868`, `cn`, `jp`, `anz`, `kr`, `tw`, `ru` ,`in`, ` nz865`, `th` | `Unset` | | lora.hop_limit | `1`,`2`,`3`,`4`,`5`,`6`,`7` | `3` From 2008935b14afe2039a30fe1c2afe6ab8f7428001 Mon Sep 17 00:00:00 2001 From: Vladislav Osmanov <7123463+osmanovv@users.noreply.github.com> Date: Mon, 12 Sep 2022 21:07:25 +0300 Subject: [PATCH 7/7] fixed `VLongSlow` channel name & data rate still needs to verify link budget value --- docs/developers/Firmware/radio-settings.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developers/Firmware/radio-settings.mdx b/docs/developers/Firmware/radio-settings.mdx index 5655f0ec..e3e90d8f 100644 --- a/docs/developers/Firmware/radio-settings.mdx +++ b/docs/developers/Firmware/radio-settings.mdx @@ -67,7 +67,7 @@ We have six predefined channels. These are the most common settings and have bee | Medium Range / Slow | Medium Slow | 0.75 kbps | 11 / 2048 | 4/7 | 250 | 148dB | | 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 | VLongSlow | TBD kbps | 12 / 4096 | 4/8 | ??? | ???dB | +| 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.