From 4fd6bc7529f36c7cfd9e83743f1829c5470734a1 Mon Sep 17 00:00:00 2001 From: rcarteraz Date: Fri, 1 Mar 2024 15:08:51 -0700 Subject: [PATCH 1/5] Update lora.mdx change channel number to frequency slot --- docs/configuration/radio/lora.mdx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/configuration/radio/lora.mdx b/docs/configuration/radio/lora.mdx index 4d1ea645..3d012813 100644 --- a/docs/configuration/radio/lora.mdx +++ b/docs/configuration/radio/lora.mdx @@ -100,9 +100,9 @@ Allows you to enable and disable transmit (TX) from the LoRa radio. Useful for h Defaults to true -### Channel Number +### Frequency Slot -This is controlling the actual hardware frequency the radio is transmitting on. A channel number between 1 and NUM_CHANNELS (whatever the max is in the current region). If this is ZERO/UNSET then the rule is "use the old channel name hash based algorithm to derive the channel number". +This setting controls the actual hardware frequency at which the radio transmits, represented by a frequency slot between 1 and NUM_SLOTS (the maximum for the current region). If set to `0`/UNSET, the device reverts to the older channel name hash-based algorithm for determining the frequency slot. :::info LoRa Channel Configuration should not to be confused with messaging [Channel Configuration](/docs/configuration/radio/channels). See [Chat Channels VS Lora Modem Channels](/docs/configuration/tips#chat-channels-vs-lora-modem-channels) for further clarification. From 20555585cf4d79de1bef3f19ac3c6c417b949596 Mon Sep 17 00:00:00 2001 From: rcarteraz Date: Fri, 1 Mar 2024 15:13:46 -0700 Subject: [PATCH 2/5] Update FrequencyCalculator.tsx change channel references to slot --- src/components/tools/FrequencyCalculator.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/tools/FrequencyCalculator.tsx b/src/components/tools/FrequencyCalculator.tsx index d66dd227..029072f6 100644 --- a/src/components/tools/FrequencyCalculator.tsx +++ b/src/components/tools/FrequencyCalculator.tsx @@ -356,12 +356,12 @@ export const FrequencyCalculator = (): JSX.Element => {
- +
- +
From ed42ae81b42948c38b68091b405341eb80e6e061 Mon Sep 17 00:00:00 2001 From: rcarteraz Date: Fri, 1 Mar 2024 15:16:24 -0700 Subject: [PATCH 3/5] Update radio-settings.mdx change channel calculator to frequency slot calculator --- docs/about/overview/radio-settings.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/about/overview/radio-settings.mdx b/docs/about/overview/radio-settings.mdx index b703bbdd..2ff2c7bd 100644 --- a/docs/about/overview/radio-settings.mdx +++ b/docs/about/overview/radio-settings.mdx @@ -17,7 +17,7 @@ Meshtastic is **not** LoRaWAN, Helium or TTN (TheThingsNetwork). Meshtastic uses Power limits will generally be lifted in the software if `is_licensed` is set to `true`. See [HAM Mode](/docs/faq#amateur-radio-ham) for more information. ::: -## Channel Frequency Calculator +## Frequency Slot Calculator From 0bdedb1c3f81eec47ec5e7589dd7a801983d11c9 Mon Sep 17 00:00:00 2001 From: rcarteraz Date: Fri, 1 Mar 2024 15:19:31 -0700 Subject: [PATCH 4/5] frequency of slot --- src/components/tools/FrequencyCalculator.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/tools/FrequencyCalculator.tsx b/src/components/tools/FrequencyCalculator.tsx index 029072f6..76f9309a 100644 --- a/src/components/tools/FrequencyCalculator.tsx +++ b/src/components/tools/FrequencyCalculator.tsx @@ -375,7 +375,7 @@ export const FrequencyCalculator = (): JSX.Element => {
- +
From 53acb00348638b90238206d8dd3c33b2f15076f5 Mon Sep 17 00:00:00 2001 From: rcarteraz Date: Fri, 1 Mar 2024 15:22:43 -0700 Subject: [PATCH 5/5] remove admonition --- docs/configuration/radio/lora.mdx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/docs/configuration/radio/lora.mdx b/docs/configuration/radio/lora.mdx index 3d012813..29c4cb6d 100644 --- a/docs/configuration/radio/lora.mdx +++ b/docs/configuration/radio/lora.mdx @@ -102,11 +102,7 @@ Defaults to true ### Frequency Slot -This setting controls the actual hardware frequency at which the radio transmits, represented by a frequency slot between 1 and NUM_SLOTS (the maximum for the current region). If set to `0`/UNSET, the device reverts to the older channel name hash-based algorithm for determining the frequency slot. - -:::info -LoRa Channel Configuration should not to be confused with messaging [Channel Configuration](/docs/configuration/radio/channels). See [Chat Channels VS Lora Modem Channels](/docs/configuration/tips#chat-channels-vs-lora-modem-channels) for further clarification. -::: +This setting controls the actual hardware frequency at which the radio transmits, represented by a frequency slot between 1 and NUM_SLOTS (the maximum for the current region and modem preset). If set to `0`/UNSET, the device reverts to the older channel name hash-based algorithm for determining the frequency slot. ### Ignore Incoming Array