From ba287af89651943c865ea2f0c3494f483992c6c4 Mon Sep 17 00:00:00 2001
From: Nestpebble <116762865+Nestpebble@users.noreply.github.com>
Date: Thu, 6 Jun 2024 00:54:49 +0100
Subject: [PATCH 1/7] Update UK regulatory doc & include note for EU
Following discussion on the Discord, some additional notes to help locate the specific parts of the UK and EU regulations for local frequency bands, duty cycles, etc.
---
docs/configuration/region-by-country.mdx | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/docs/configuration/region-by-country.mdx b/docs/configuration/region-by-country.mdx
index 859b2974..36d73aef 100644
--- a/docs/configuration/region-by-country.mdx
+++ b/docs/configuration/region-by-country.mdx
@@ -10,6 +10,11 @@ This table provides a summary of LoRa regions used for each country.
If you'd like to contribute information for your country, click the "Edit this page" link at the bottom.
+:::note
+EU countries will generally be covered by the Radio Equipment Directive ([2014/53/EU](http://data.europa.eu/eli/dir/2014/53/2023-10-01))) and subsequent amendments.
+Useful information on this is located [here](https://single-market-economy.ec.europa.eu/single-market/european-standards/harmonised-standards/radio-equipment_en).
+:::
+
### A
| Country | LoRa Region | Regulatory document |
@@ -159,11 +164,11 @@ If you'd like to contribute information for your country, click the "Edit this p
### U
-| Country | LoRa Region | Regulatory document |
-| --- | --- | --- |
-| Ukraine | UA_868
UA_433 | |
-| United Kingdom (UK) | EU_868
EU_433 | |
-| United States of America (USA) | US | |
+| Country | LoRa Region | Regulatory document |
+| ------------------------------ | ------------------ | ---------------------------------------------------------------------------------------------------------------------------- |
+| Ukraine | UA_868
UA_433 | |
+| United Kingdom (UK) | EU_868
EU_433 | [IR2030](https://www.ofcom.org.uk/__data/assets/pdf_file/0028/84970/ir-2030.pdf)
IR2030/1/19 and IR2030/1/10 respectively |
+| United States of America (USA) | US | |
### V
From 13c246a5e52b2ea17383d490a070185d59e85db7 Mon Sep 17 00:00:00 2001
From: Nestpebble <116762865+Nestpebble@users.noreply.github.com>
Date: Thu, 6 Jun 2024 23:43:22 +0100
Subject: [PATCH 2/7] Update region-by-country.mdx
---
docs/configuration/region-by-country.mdx | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/docs/configuration/region-by-country.mdx b/docs/configuration/region-by-country.mdx
index 36d73aef..c9396f85 100644
--- a/docs/configuration/region-by-country.mdx
+++ b/docs/configuration/region-by-country.mdx
@@ -10,11 +10,6 @@ This table provides a summary of LoRa regions used for each country.
If you'd like to contribute information for your country, click the "Edit this page" link at the bottom.
-:::note
-EU countries will generally be covered by the Radio Equipment Directive ([2014/53/EU](http://data.europa.eu/eli/dir/2014/53/2023-10-01))) and subsequent amendments.
-Useful information on this is located [here](https://single-market-economy.ec.europa.eu/single-market/european-standards/harmonised-standards/radio-equipment_en).
-:::
-
### A
| Country | LoRa Region | Regulatory document |
@@ -164,11 +159,11 @@ Useful information on this is located [here](https://single-market-economy.ec.eu
### U
-| Country | LoRa Region | Regulatory document |
-| ------------------------------ | ------------------ | ---------------------------------------------------------------------------------------------------------------------------- |
-| Ukraine | UA_868
UA_433 | |
-| United Kingdom (UK) | EU_868
EU_433 | [IR2030](https://www.ofcom.org.uk/__data/assets/pdf_file/0028/84970/ir-2030.pdf)
IR2030/1/19 and IR2030/1/10 respectively |
-| United States of America (USA) | US | |
+| Country | LoRa Region | Regulatory document |
+| ------------------------------ | ------------------ | -------------------------------------------------------------------------------- |
+| Ukraine | UA_868
UA_433 | |
+| United Kingdom (UK) | EU_868
EU_433 | [IR2030](https://www.ofcom.org.uk/__data/assets/pdf_file/0028/84970/ir-2030.pdf) |
+| United States of America (USA) | US | |
### V
From 59421a134ca15dda890b506eea4748c13f3607ad Mon Sep 17 00:00:00 2001
From: Nestpebble <116762865+Nestpebble@users.noreply.github.com>
Date: Thu, 6 Jun 2024 23:47:57 +0100
Subject: [PATCH 3/7] Update radio-settings.mdx
Added info on the EU and the selection of bands.
---
docs/about/overview/radio-settings.mdx | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/docs/about/overview/radio-settings.mdx b/docs/about/overview/radio-settings.mdx
index 2556e510..3efbab69 100644
--- a/docs/about/overview/radio-settings.mdx
+++ b/docs/about/overview/radio-settings.mdx
@@ -25,13 +25,16 @@ Power limits will generally be lifted in the software if `is_licensed` is set to
## Europe Frequency Bands
+EU countries will generally be covered by the Radio Equipment Directive ([2014/53/EU](http://data.europa.eu/eli/dir/2014/53/2023-10-01))) and subsequent amendments, which is then enacted in local laws. Useful information on this is located [here](https://single-market-economy.ec.europa.eu/single-market/european-standards/harmonised-standards/radio-equipment_en).
+The bands below were selected based on the maximum power and the duty cycle availalbe. It may be possible to use other frequency bands for specific applications, but these are not currently supported "out of the box".
+
### 433 MHz
The maximum power allowed for Europe is +10 dBm ERP ([Effective Radiated Power](https://en.wikipedia.org/wiki/Effective_radiated_power)).
The band range is from 433 to 434 MHz.
-There are four frequendy slots defined with the standard radio preset `LongFast`. After factory reset the radio will be set to frequency slot 4 with a center frequency of 433.875 MHz.
+There are four frequency slots defined with the standard radio preset `LongFast`. After factory reset the radio will be set to frequency slot 4 with a center frequency of 433.875 MHz.
### 868 MHz
From 86becff264e87a693783f2363fe9fec0bb25431a Mon Sep 17 00:00:00 2001
From: Nestpebble <116762865+Nestpebble@users.noreply.github.com>
Date: Fri, 7 Jun 2024 08:25:53 +0100
Subject: [PATCH 4/7] Update docs/about/overview/radio-settings.mdx
Corrected one typo, another one appears. C'est la vie...
Co-authored-by: Alice <84906+wheresalice@users.noreply.github.com>
---
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 3efbab69..12ed6992 100644
--- a/docs/about/overview/radio-settings.mdx
+++ b/docs/about/overview/radio-settings.mdx
@@ -26,7 +26,7 @@ Power limits will generally be lifted in the software if `is_licensed` is set to
## Europe Frequency Bands
EU countries will generally be covered by the Radio Equipment Directive ([2014/53/EU](http://data.europa.eu/eli/dir/2014/53/2023-10-01))) and subsequent amendments, which is then enacted in local laws. Useful information on this is located [here](https://single-market-economy.ec.europa.eu/single-market/european-standards/harmonised-standards/radio-equipment_en).
-The bands below were selected based on the maximum power and the duty cycle availalbe. It may be possible to use other frequency bands for specific applications, but these are not currently supported "out of the box".
+The bands below were selected based on the maximum power and the duty cycle available. It may be possible to use other frequency bands for specific applications, but these are not currently supported "out of the box".
### 433 MHz
From 91afc1c8b72a87de5c7a376fae39c4ab3ffff46b Mon Sep 17 00:00:00 2001
From: Nestpebble <116762865+Nestpebble@users.noreply.github.com>
Date: Fri, 7 Jun 2024 10:27:15 +0100
Subject: [PATCH 5/7] Update radio-settings.mdx
---
docs/about/overview/radio-settings.mdx | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/docs/about/overview/radio-settings.mdx b/docs/about/overview/radio-settings.mdx
index 12ed6992..af7c519d 100644
--- a/docs/about/overview/radio-settings.mdx
+++ b/docs/about/overview/radio-settings.mdx
@@ -25,7 +25,7 @@ Power limits will generally be lifted in the software if `is_licensed` is set to
## Europe Frequency Bands
-EU countries will generally be covered by the Radio Equipment Directive ([2014/53/EU](http://data.europa.eu/eli/dir/2014/53/2023-10-01))) and subsequent amendments, which is then enacted in local laws. Useful information on this is located [here](https://single-market-economy.ec.europa.eu/single-market/european-standards/harmonised-standards/radio-equipment_en).
+EU countries will generally be covered by the Radio Equipment Directive ([2014/53/EU](http://data.europa.eu/eli/dir/2014/53/2023-10-01)) and subsequent amendments, which is then enacted in local laws. Useful information on this is located [here](https://single-market-economy.ec.europa.eu/single-market/european-standards/harmonised-standards/radio-equipment_en).
The bands below were selected based on the maximum power and the duty cycle available. It may be possible to use other frequency bands for specific applications, but these are not currently supported "out of the box".
### 433 MHz
@@ -38,6 +38,10 @@ There are four frequency slots defined with the standard radio preset `LongFast`
### 868 MHz
+:::info
+868 MHz is generally the most popular band for Meshtastic in the EU.
+:::
+
The maximum power allowed for Europe is +27 dBm ERP ([Effective Radiated Power](https://en.wikipedia.org/wiki/Effective_radiated_power)).
The band range is from 869.40 to 869.65 MHz. This is less than the 863–870 MHz range defined as SRD Band, but allows for a higher ERP and a duty cycle of 10%.
From c0d157987708029d5e675b23a017d65b53caaf5d Mon Sep 17 00:00:00 2001
From: Nestpebble <116762865+Nestpebble@users.noreply.github.com>
Date: Sun, 9 Jun 2024 21:19:09 +0100
Subject: [PATCH 6/7] Update _lora-regions to clarify rolling hour
The rolling 1-hour window isn't clear in the docs.
---
docs/blocks/_lora-regions.mdx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/blocks/_lora-regions.mdx b/docs/blocks/_lora-regions.mdx
index 082d608d..c6780e83 100644
--- a/docs/blocks/_lora-regions.mdx
+++ b/docs/blocks/_lora-regions.mdx
@@ -21,5 +21,5 @@
| `LORA_24` | 2.4 GHz band worldwide | 2400.0 - 2483.5 | 100 | 10 |
:::info
-EU_433 and EU_868 have to adhere to an hourly duty cycle limitation of 10%. Your device will stop transmitting if you reach it, until it is allowed again.
+EU_433 and EU_868 have to adhere to an hourly duty cycle limitation of 10%, calculated every minute on a rolling 1-hour basis. Your device will stop transmitting if you reach it, until it is allowed again.
:::
From 1c25b8e59310afe9e737ec941ea72fba8687232b Mon Sep 17 00:00:00 2001
From: Nestpebble <116762865+Nestpebble@users.noreply.github.com>
Date: Sun, 9 Jun 2024 21:56:05 +0100
Subject: [PATCH 7/7] Update radio-settings.mdx
---
docs/about/overview/radio-settings.mdx | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/docs/about/overview/radio-settings.mdx b/docs/about/overview/radio-settings.mdx
index af7c519d..258120be 100644
--- a/docs/about/overview/radio-settings.mdx
+++ b/docs/about/overview/radio-settings.mdx
@@ -38,16 +38,14 @@ There are four frequency slots defined with the standard radio preset `LongFast`
### 868 MHz
-:::info
-868 MHz is generally the most popular band for Meshtastic in the EU.
-:::
-
The maximum power allowed for Europe is +27 dBm ERP ([Effective Radiated Power](https://en.wikipedia.org/wiki/Effective_radiated_power)).
-The band range is from 869.40 to 869.65 MHz. This is less than the 863–870 MHz range defined as SRD Band, but allows for a higher ERP and a duty cycle of 10%.
+The band range is from 869.40 to 869.65 MHz. This is less than the 863–870 MHz range defined as SRD ([Short Range Devices](https://www.etsi.org/technologies/short-range-devices)) Band, but allows for a higher ERP and a duty cycle of 10%.
There is one frequency slot defined with the standard radio preset `LongFast`. After factory reset the radio will be set to frequency slot 1 with a center frequency of 869.525 MHz.
+It is worth noting that 868 MHz is generally the most popular frequency band for Meshtastic in Europe.
+
## North America Frequency Bands
### 915 MHz (ISM Band)