From 21afbd1e448a0698e6d395e65581927dffb46dbe Mon Sep 17 00:00:00 2001 From: pdxlocations Date: Mon, 12 Feb 2024 22:24:32 -0800 Subject: [PATCH] Add SG_923 --- docs/blocks/_lora-regions.mdx | 1 + docs/configuration/radio/lora.mdx | 34 ++++++++++---------- docs/configuration/tips.mdx | 6 ++-- docs/hardware/devices/nano/index.mdx | 4 +-- src/components/tools/FrequencyCalculator.tsx | 10 ++++++ 5 files changed, 33 insertions(+), 22 deletions(-) diff --git a/docs/blocks/_lora-regions.mdx b/docs/blocks/_lora-regions.mdx index 2377213e..1e6e8525 100644 --- a/docs/blocks/_lora-regions.mdx +++ b/docs/blocks/_lora-regions.mdx @@ -17,6 +17,7 @@ | `UA_868` | Ukraine 868MHz | | `MY_433` | Malaysia 433MHz | | `MY_919` | Malaysia 919MHz | +| `SG_923` | Singapore 923MHz | | `LORA_24` | 2.4 GHz band worldwide | :::info diff --git a/docs/configuration/radio/lora.mdx b/docs/configuration/radio/lora.mdx index 12e1ed7e..dcf11e71 100644 --- a/docs/configuration/radio/lora.mdx +++ b/docs/configuration/radio/lora.mdx @@ -166,23 +166,23 @@ LoRa config commands are available in the python CLI. Example commands are below ::: -| Setting | Acceptable Values | Default | -|:---------------------------:|:-----------------------------------------------------------------------------------------------------------------------------------------------:|:----------------------------:| -| lora.modem_preset | `LONG_FAST`, `LONG_SLOW`, `VERY_LONG_SLOW`, `MEDIUM_SLOW`, `MEDIUM_FAST`, `SHORT_SLOW`, `SHORT_FAST` | `LONG_FAST`, `LONG_MODERATE` | -| lora.use_preset | `false`, `true` | `false` | -| lora.region | `UNSET`, `US`, `EU_433`, `EU_868`, `CN`, `JP`, `ANZ`, `KR`, `TW`, `RU` ,`IN`, `NZ_865`, `TH`, `LORA_24`, `UA_433`, `UA_868`, `MY_433`, `MY_919` | `UNSET` | -| lora.bandwidth | `31`, `62`, `125`, `250`, `500` | `250` | -| lora.spread_factor | `7`, `8`, `9`, `10`, `11`, `12` | `12` | -| lora.coding_rate | `5`, `6`, `7`, `8` | `8` | -| lora.frequency_offset | `0` to `1000000` | `0` | -| lora.hop_limit | `1`,`2`,`3`,`4`,`5`,`6`,`7` | `3` | -| lora.tx_power | `0` to `30` | `0` | -| lora.tx_enabled | `false`, `true` | `true` | -| lora.channel_num | `0`, `1` to `NUM_CHANNELS` | `0` | -| lora.ignore_mqtt | `false`, `true` | `false` | -| lora.override_duty_cycle | `false`, `true` | `false` | -| lora.sx126x_rx_boosted_gain | `false`, `true` | `false` | -| lora.override_frequency | Any supported frequency the LoRA radio is capable of. Please respect local rules and regulations | `0` | +| Setting | Acceptable Values | Default | +|:---------------------------:|:---------------------------------------------------------------------------------------------------------------------------------------------------------:|:----------------------------:| +| lora.modem_preset | `LONG_FAST`, `LONG_SLOW`, `VERY_LONG_SLOW`, `MEDIUM_SLOW`, `MEDIUM_FAST`, `SHORT_SLOW`, `SHORT_FAST` | `LONG_FAST`, `LONG_MODERATE` | +| lora.use_preset | `false`, `true` | `false` | +| lora.region | `UNSET`, `US`, `EU_433`, `EU_868`, `CN`, `JP`, `ANZ`, `KR`, `TW`, `RU` ,`IN`, `NZ_865`, `TH`, `LORA_24`, `UA_433`, `UA_868`, `MY_433`, `MY_919`, `SG_923` | `UNSET` | +| lora.bandwidth | `31`, `62`, `125`, `250`, `500` | `250` | +| lora.spread_factor | `7`, `8`, `9`, `10`, `11`, `12` | `12` | +| lora.coding_rate | `5`, `6`, `7`, `8` | `8` | +| lora.frequency_offset | `0` to `1000000` | `0` | +| lora.hop_limit | `1`,`2`,`3`,`4`,`5`,`6`,`7` | `3` | +| lora.tx_power | `0` to `30` | `0` | +| lora.tx_enabled | `false`, `true` | `true` | +| lora.channel_num | `0`, `1` to `NUM_CHANNELS` | `0` | +| lora.ignore_mqtt | `false`, `true` | `false` | +| lora.override_duty_cycle | `false`, `true` | `false` | +| lora.sx126x_rx_boosted_gain | `false`, `true` | `false` | +| lora.override_frequency | Any supported frequency the LoRA radio is capable of. Please respect local rules and regulations | `0` | :::tip diff --git a/docs/configuration/tips.mdx b/docs/configuration/tips.mdx index 5ec7b052..463392e9 100644 --- a/docs/configuration/tips.mdx +++ b/docs/configuration/tips.mdx @@ -33,9 +33,9 @@ If you'd like to connect with other Meshtastic users but only share your locatio ### Default Primary Channels by Region -| US | EU_433 | EU_868 | CN | JP | ANZ | KR | TW | RU | IN | NZ_865 | TH | UA_433 | UA_868 | MY_433 | MY_919 | LORA_24 | -| :--: | :----: | :----: | :--: | :-: | :--: | :--: | :--: | :--: | :--: | :----: | :--: | :----: | :----: | :----: | :----: | :-----: | -| 20 | 4 | 1 | 36 | 20 | 20 | 12 | 16 | 2 | 4 | 4 | 16 | 6 | 2 | 4 | 16 | 6 | +| US | EU_433 | EU_868 | CN | JP | ANZ | KR | TW | RU | IN | NZ_865 | TH | UA_433 | UA_868 | MY_433 | MY_919 | SG_923 | LORA_24 | +| :--: | :----: | :----: | :--: | :-: | :--: | :--: | :--: | :--: | :--: | :----: | :--: | :----: | :----: | :----: | :----: | :-----: | :-----: | +| 20 | 4 | 1 | 36 | 20 | 20 | 12 | 16 | 2 | 4 | 4 | 16 | 6 | 2 | 4 | 16 | | 6 | To quickly test this configuration, find and scan your region's QR from [this repository](https://github.com/meshtastic/meshtastic/tree/master/static/img/configuration/qr-private-primary-example/). Remember to generate a new PSK for your private channel before sharing with your trusted nodes. diff --git a/docs/hardware/devices/nano/index.mdx b/docs/hardware/devices/nano/index.mdx index 4c61b25f..0bbf6f2b 100644 --- a/docs/hardware/devices/nano/index.mdx +++ b/docs/hardware/devices/nano/index.mdx @@ -36,7 +36,7 @@ The Nano G2 Ultra and Nano G1 Explorer have exactly the same Lora front-end circ - **LoRa Transceiver:** - Semtech SX1262 - **Frequency Options:** - - _US (902.0Mhz to 928.0Mhz), EU_868 (869.4Mhz to 869.65Mhz), JP (920.8Mhz to 927.8Mhz), ANZ (915.0Mhz to 928.0Mhz), RU (868.7Mhz to 869.2Mhz), KR (920.0Mhz to 923.0Mhz), TW (920.0Mhz to 925.0Mhz), IN (865.0Mhz to 867.0Mhz), NZ_865 (864.0Mhz to 868.0Mhz), TH (920.0Mhz to 925.0Mhz), UA_868 (868.0Mhz to 868.6Mhz)._ + - _US (902.0Mhz to 928.0Mhz), EU_868 (869.4Mhz to 869.65Mhz), JP (920.8Mhz to 927.8Mhz), ANZ (915.0Mhz to 928.0Mhz), RU (868.7Mhz to 869.2Mhz), KR (920.0Mhz to 923.0Mhz), TW (920.0Mhz to 925.0Mhz), IN (865.0Mhz to 867.0Mhz), NZ_865 (864.0Mhz to 868.0Mhz), TH (920.0Mhz to 925.0Mhz), UA_868 (868.0Mhz to 868.6Mhz), MY_919 (919.0Mhz to 924.0Mhz), SG_923 (917.0Mhz to 925.0Mhz)._ - **Navigation Module:** - ATGM336H-5N-71 (Supports GPS, BDS and GLONASS) - **Antenna:** @@ -83,7 +83,7 @@ The Nano G1 Explorer, powered by Meshtastic, is a significant upgrade from the N - **LoRa Transceiver:** - Semtech SX1262 - **Frequency Options:** - - _US (902.0Mhz to 928.0Mhz), EU_868 (869.4Mhz to 869.65Mhz), JP (920.8Mhz to 927.8Mhz), ANZ (915.0Mhz to 928.0Mhz), RU (868.7Mhz to 869.2Mhz), KR (920.0Mhz to 923.0Mhz), TW (920.0Mhz to 925.0Mhz), IN (865.0Mhz to 867.0Mhz), NZ_865 (864.0Mhz to 868.0Mhz), TH (920.0Mhz to 925.0Mhz), UA_868 (868.0Mhz to 868.6Mhz)._ + - _US (902.0Mhz to 928.0Mhz), EU_868 (869.4Mhz to 869.65Mhz), JP (920.8Mhz to 927.8Mhz), ANZ (915.0Mhz to 928.0Mhz), RU (868.7Mhz to 869.2Mhz), KR (920.0Mhz to 923.0Mhz), TW (920.0Mhz to 925.0Mhz), IN (865.0Mhz to 867.0Mhz), NZ_865 (864.0Mhz to 868.0Mhz), TH (920.0Mhz to 925.0Mhz), UA_868 (868.0Mhz to 868.6Mhz), MY_919 (919.0Mhz to 924.0Mhz), SG_923 (917.0Mhz to 925.0Mhz)._ - **Navigation Module:** - ATGM336H-5N-71 (Supports GPS, BDS and GLONASS) - **Antenna:** diff --git a/src/components/tools/FrequencyCalculator.tsx b/src/components/tools/FrequencyCalculator.tsx index 475691e3..bd4aecee 100644 --- a/src/components/tools/FrequencyCalculator.tsx +++ b/src/components/tools/FrequencyCalculator.tsx @@ -179,6 +179,16 @@ const RegionData = new Map< power_limit: 27, }, ], + [ + Protobuf.Config.Config_LoRaConfig_RegionCode.SG_923, + { + freq_start: 917.0, + freq_end: 925.0, + duty_cycle: 100, + spacing: 0, + power_limit: 20, + }, + ], [ Protobuf.Config.Config_LoRaConfig_RegionCode.LORA_24, {