diff --git a/docs/about/faq.mdx b/docs/about/faq.mdx
index 98a86321..c137c414 100644
--- a/docs/about/faq.mdx
+++ b/docs/about/faq.mdx
@@ -25,6 +25,14 @@ export const Faq = {
title: "Can I update my node's firmware over the mesh?",
content: `No, Meshtastic does not support OTA updates over LoRa. Please visit [Flash Firmware](/docs/getting-started/flashing-firmware/) for update options.`,
},
+ {
+ title: "Which version of firmware should I use?",
+ content: `Currently, there are two types of Meshtastic firmware releases, "Alpha" and "Beta". Firmware releases are labeled with the version number, commit hash and the type. Installing the latest beta release recommended for most cases. Alpha release are geared towards users interested in testing the new features, fixes or enhancements with the understanding there are additional risks and potential for instability compared to running a beta release.`,
+ },
+ {
+ title: "How often should I update firmware?",
+ content: `Firmware should be kept up to date. While it is not necessary to update whenever a new release comes out it's a good idea to follow the Discord Server and Forums linked in the [Introduction](/docs/introduction/#contributors) where developers may advise the community about important updates. The Meshtastic [firmware releases page](https://github.com/meshtastic/firmware/releases) on Github has a summary of what has changed in each release.`,
+ },
],
"android": [
{
diff --git a/docs/blocks/_lora-regions.mdx b/docs/blocks/_lora-regions.mdx
index 067ae95e..082d608d 100644
--- a/docs/blocks/_lora-regions.mdx
+++ b/docs/blocks/_lora-regions.mdx
@@ -1,24 +1,24 @@
-| Region Code | Description |
-|:-----------:|:-----------------------:|
-| `UNSET` | Unset |
-| `US` | United States |
-| `EU_433` | European Union 433MHz |
-| `EU_868` | European Union 868MHz |
-| `CN` | China |
-| `JP` | Japan |
-| `ANZ` | Australia & New Zealand |
-| `KR` | Korea |
-| `TW` | Taiwan |
-| `RU` | Russia |
-| `IN` | India |
-| `NZ_865` | New Zealand 865MHz |
-| `TH` | Thailand |
-| `UA_433` | Ukraine 433MHz |
-| `UA_868` | Ukraine 868MHz |
-| `MY_433` | Malaysia 433MHz |
-| `MY_919` | Malaysia 919MHz |
-| `SG_923` | Singapore 923MHz |
-| `LORA_24` | 2.4 GHz band worldwide |
+| Region Code | Description | Frequency Range (MHz) | Duty Cycle (%) | Power Limit (dBm) |
+|:-----------:|:-----------------------:|:---------------------:|:--------------:|:-----------------:|
+| `UNSET` | Unset | N/A | N/A | N/A |
+| `US` | United States | 902.0 - 928.0 | 100 | 30 |
+| `EU_433` | European Union 433MHz | 433.0 - 434.0 | 10 | 12 |
+| `EU_868` | European Union 868MHz | 869.4 - 869.65 | 10 | 27 |
+| `CN` | China | 470.0 - 510.0 | 100 | 19 |
+| `JP` | Japan | 920.8 - 927.8 | 100 | 16 |
+| `ANZ` | Australia & New Zealand | 915.0 - 928.0 | 100 | 30 |
+| `KR` | Korea | 920.0 - 923.0 | 100 | |
+| `TW` | Taiwan | 920.0 - 925.0 | 100 | 27 |
+| `RU` | Russia | 868.7 - 869.2 | 100 | 20 |
+| `IN` | India | 865.0 - 867.0 | 100 | 30 |
+| `NZ_865` | New Zealand 865MHz | 864.0 - 868.0 | 100 | 36 |
+| `TH` | Thailand | 920.0 - 925.0 | 100 | 16 |
+| `UA_433` | Ukraine 433MHz | 433.0 - 434.7 | 10 | 10 |
+| `UA_868` | Ukraine 868MHz | 868.0 - 868.6 | 1 | 14 |
+| `MY_433` | Malaysia 433MHz | 433.0 - 435.0 | 100 | 20 |
+| `MY_919` | Malaysia 919MHz | 919.0 - 924.0 | 100 | 27 |
+| `SG_923` | Singapore 923MHz | 917.0 - 925.0 | 100 | 20 |
+| `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.
diff --git a/docs/community/enclosures/heltec-v2.mdx b/docs/community/enclosures/heltec-v2.mdx
index 54ee5804..19eced42 100644
--- a/docs/community/enclosures/heltec-v2.mdx
+++ b/docs/community/enclosures/heltec-v2.mdx
@@ -12,7 +12,12 @@ import Tropho from "/img/enclosures/3dp-tropho-heltec32.webp";
### Heltec LoRa32 v2.1+ Case
-Download from [Printables](https://www.printables.com/model/118750-heltec-lora-32-case-for-meshtastic) or purchase from the creator's [Etsy Store](https://www.etsy.com/listing/1170868625/meshtastic-heltec-lora-32-case).
+Download from [Printables](https://www.printables.com/model/118750-heltec-lora-32-case-for-meshtastic) or purchase an already printed case below.
+
+- US
+ - [QuantumShadow3D](https://www.etsy.com/listing/1170868625/meshtastic-heltec-lora-32-case).
+- UK/EU
+ - [3DChicken](https://3dchicken.co.uk/)
#### Required Hardware
diff --git a/docs/community/enclosures/rak/index.mdx b/docs/community/enclosures/rak/index.mdx
index d0ff123d..588d98f5 100644
--- a/docs/community/enclosures/rak/index.mdx
+++ b/docs/community/enclosures/rak/index.mdx
@@ -10,7 +10,10 @@ sidebar_position: 1
### Solar Base Station
-Download from [Printables](https://www.printables.com/model/297089-meshtastic-solar-base-station-node-enclosure-for-3) or purchase from the creator's [Etsy Store](https://www.etsy.com/listing/1312727008/meshtastic-solar-base-station-off-grid).
+Download from [Printables](https://www.printables.com/model/297089-meshtastic-solar-base-station-node-enclosure-for-3) or purchase an already printed case below.
+
+- International
+ - [VoltaicEnclosures](https://www.etsy.com/listing/1312727008/meshtastic-solar-base-station-off-grid)

@@ -18,25 +21,45 @@ Download from [Printables](https://www.printables.com/model/297089-meshtastic-so
### RAK5005 Case
-Download from [Printables](https://www.printables.com/model/286651-rak5005-case-for-meshtastic) or purchase from the creator's [Etsy Store](https://www.etsy.com/listing/1158237722/meshtastic-rak5005-case).
+Download from [Printables](https://www.printables.com/model/286651-rak5005-case-for-meshtastic) or purchase an already printed case below.
+
+- US
+ - [QuantumShadow3D](https://www.etsy.com/listing/1158237722/meshtastic-rak5005-case).
+- UK/EU
+ - [3DChicken](https://3dchicken.co.uk/)

### RAK19007 Case
-Download from [Printables](https://www.printables.com/model/286657-rak19007-case-for-meshtastic) or purchase from the creator's [Etsy Store](https://www.etsy.com/listing/1302265084/meshtastic-rak19007-case).
+Download from [Printables](https://www.printables.com/model/286657-rak19007-case-for-meshtastic) or purchase an already printed case below.
+
+- US
+ - [QuantumShadow3D](https://www.etsy.com/listing/1302265084/meshtastic-rak19007-case).
+- UK/EU
+ - [3DChicken](https://3dchicken.co.uk/)

### RAK19003 Case
-Download from [Printables](https://www.printables.com/model/286662-rak19003-case-for-meshtastic) or purchase from the creator's [Etsy Store](https://www.etsy.com/listing/1316287559/meshtastic-rak19003-case).
+Download from [Printables](https://www.printables.com/model/286662-rak19003-case-for-meshtastic) or purchase an already printed case below.
+
+- US
+ - [QuantumShadow3D](https://www.etsy.com/listing/1316287559/meshtastic-rak19003-case).
+- UK/EU
+ - [3DChicken](https://3dchicken.co.uk/)

### RAK19003 (Micro) Case
-Download from [Printables](https://www.printables.com/model/286664-rak19003-micro-case-for-meshtastic) or purchase from the creator's [Etsy Store](https://www.etsy.com/listing/1302260756/meshtastic-rak19003-micro-case).
+Download from [Printables](https://www.printables.com/model/286664-rak19003-micro-case-for-meshtastic) or purchase an already printed case below.
+
+- US
+ - [Etsy Store](https://www.etsy.com/listing/1302260756/meshtastic-rak19003-micro-case).
+- UK/EU
+ - [3DChicken](https://3dchicken.co.uk/)

diff --git a/docs/community/enclosures/tbeam.mdx b/docs/community/enclosures/tbeam.mdx
index 9141a9df..393d320a 100644
--- a/docs/community/enclosures/tbeam.mdx
+++ b/docs/community/enclosures/tbeam.mdx
@@ -10,7 +10,13 @@ sidebar_position: 2
### T-Beam V5 Case
-Download from [Printables](https://www.printables.com/model/127253-t-beam-case-for-meshtastic-v5) or purchase from the creator's [Etsy Store](https://www.etsy.com/listing/1173559418/meshtastic-t-beam-case-for-neo-m8n).
+Download from [Printables](https://www.printables.com/model/127253-t-beam-case-for-meshtastic-v5) or purchase an already printed case below.
+
+Purchase Links:
+- US
+ - [QuantumShadow3D](https://www.etsy.com/listing/1173559418/meshtastic-t-beam-case-for-neo-m8n)
+- UK/EU
+ - [3DChicken](https://3dchicken.co.uk/)
#### Required Hardware
diff --git a/docs/community/local-groups.mdx b/docs/community/local-groups.mdx
index 1d897804..59f2e7b4 100644
--- a/docs/community/local-groups.mdx
+++ b/docs/community/local-groups.mdx
@@ -59,10 +59,12 @@ us on [Discord](https://discord.com/invite/ktMAKGBnBs) to add your group.
- [SoCal Mesh](https://socalmesh.org)
- [Laguna Mesh](https://lagunamesh.com)
- [Mission Viejo Mesh](https://missionviejomesh.org/)
-- [Bay Area Mesh](https://canvis.app/z2k8a8)
+- [Meshtastic Bay Area Group](https://discord.gg/u2gxYu7RYQ)
- [San Diego Mesh](https://discord.gg/k8RputgWgD)
- [Antelope Valley Mesh](https://www.avmesh.org/)
- [AltaMesh](https://altamesh.net/)
+- [Central Valley](https://centralvalleymesh.net/)
+- [Sac Valley Mesh](http://www.sacvalleymesh.com)
### Colorado
- [Denver Mesh](https://denvermesh.org)
@@ -82,9 +84,15 @@ us on [Discord](https://discord.com/invite/ktMAKGBnBs) to add your group.
### Oklahoma
- [Oklahoma Meshtastic Group](https://www.facebook.com/groups/942404880478488)
+### Tennessee
+- [Nashville Meshville](https://meshville.org/)
+
### Texas
- [Austin Mesh](https://austinmesh.org/)
+## Germany
+- [Meshtastic Users D-A-CH](https://t.me/meshtasticgermany) for technical chat
+
## Italy
- [Meshtastic Italia](https://t.me/meshtastic_italia)
- [Mesh_ITA Discord Server](https://discord.gg/ETFmtyzbFT)
diff --git a/docs/community/software/index.mdx b/docs/community/software/index.mdx
index 9a4865fd..0f5bdc1a 100644
--- a/docs/community/software/index.mdx
+++ b/docs/community/software/index.mdx
@@ -11,5 +11,7 @@ Current community projects:
- [Meshtasticator (Simulator)](/docs/community/software/community-meshtasticator) - Meshtasticator is a discrete-event and interactive simulator that mimics the radio section of the device software.
- [Meshtastic Web API](/docs/community/software/meshtastic-web-api) - Meshtastic Web API provides a RESTful interface to interact with a Meshtastic node via a serial connection.
+- [Mesh-metrics](/docs/community/software/community-mesh-metrics) - Meshtastic repeater metrics scraper using meshtastic-cli to be ingested by node_exporter for use in Prometheus or Victoria Metrics Time series DB with a Grafana dashboard and sample alerting rules.
Support for these projects should be sought from their respective authors.
+
diff --git a/docs/community/software/mesh-metrics.mdx b/docs/community/software/mesh-metrics.mdx
new file mode 100644
index 00000000..fe1bd5bd
--- /dev/null
+++ b/docs/community/software/mesh-metrics.mdx
@@ -0,0 +1,16 @@
+---
+id: community-mesh-metrics
+title: Mesh-metrics
+sidebar_label: Mesh-metrics
+sidebar_position: 3
+---
+
+:::note
+
+This is a community project maintained by @cordelster.
+Development can be followed on [GitHub](https://github.com/cordelster/mesh-metrics).
+Support should be sought from the respective authors.
+
+:::
+
+Mesh-metrics is a script that uses the meshtastic-cli and a device connected by usb to send metrics-requests from a list of devices and output the results in a format to be ingested by node_exporter to populate a Prometheus/Victoria Metrics Time series DB. Along with the script, a Grafana dashboard and some alert examples are included. Mesh-metrics was created and is maintained by cordel and more information on its use and setup can be found on the [Mesh-metrics Github page](https://github.com/cordelster/mesh-metrics)
diff --git a/docs/configuration/module/range-test.mdx b/docs/configuration/module/range-test.mdx
index ee7f304c..4fbcd539 100644
--- a/docs/configuration/module/range-test.mdx
+++ b/docs/configuration/module/range-test.mdx
@@ -29,7 +29,7 @@ The range test module config options are: Enabled, Sender, and Save. Range Test
### Enabled
-Enables the range test module. **Both Sender and Receiver must have the module enabled.**
+Enables the range test module. **Both Sender and Receiver must have the module enabled.** On the Apple and Android apps to receive any range test messages the module must be enabled. The device screen may continue to show range test packets from older firmware versions even if the module is disabled.
### Sender Interval
diff --git a/docs/configuration/module/remote-hardware.mdx b/docs/configuration/module/remote-hardware.mdx
index 20eb8245..db6ebfcc 100644
--- a/docs/configuration/module/remote-hardware.mdx
+++ b/docs/configuration/module/remote-hardware.mdx
@@ -96,21 +96,29 @@ The result of reading a GPIO or notifications of GPIO changes will also be sent
You can get the latest python tool/library with `pip3 install --upgrade meshtastic` on Windows/Linux/OS-X. See the [python section](/docs/software/python/cli/installation) for more details.
-To prevent access from untrusted users, you must first make a `gpio` channel that is used for authenticated access to this feature. You'll need to install this channel on both the local and remote node.
+To prevent access from untrusted users, you must first make a `gpio` channel that is used for authenticated access to this feature. You'll need to install this channel on both the local and remote node. Furthermore, you need to enable the module on both units.
The procedure using the python command line tool is:
1. Connect local device via USB
-2. Create a GPIO channel:
+2. Enable the Remote Hardware module:
+ ```shell
+ meshtastic --set remote_hardware.enabled true
+ ```
+3. Create a GPIO channel:
```shell
meshtastic --ch-add gpio
```
-3. Check the channel has been created and copy the long "Complete URL" that contains all the channels on that device:
+4. Check the channel has been created and copy the long "Complete URL" that contains all the channels on that device:
```shell
meshtastic --info
```
-4. Connect the remote device via USB (or use the [remote admin](/docs/configuration/remote-admin) feature to reach it through the mesh)
-5. Set it to join the gpio channel you created:
+5. Connect the remote device via USB (or use the [remote admin](/docs/configuration/remote-admin) feature to reach it through the mesh)
+6. Enable the Remote Hardware module:
+ ```shell
+ meshtastic --set remote_hardware.enabled true
+ ```
+7. Set it to join the gpio channel you created:
```shell
meshtastic --seturl theurlyoucopiedinstep3
```
diff --git a/docs/configuration/radio/device.mdx b/docs/configuration/radio/device.mdx
index e2dca790..71b224f3 100644
--- a/docs/configuration/radio/device.mdx
+++ b/docs/configuration/radio/device.mdx
@@ -21,7 +21,7 @@ The device config options are: Role, Serial Output, and Debug Log. Device config
| TRACKER | Broadcasts GPS position packets as priority. | Tracking the location of individuals or assets, especially in scenarios where timely and efficient location updates are critical. |
| LOST_AND_FOUND | Broadcasts location as message to default channel regularly for to assist with device recovery. | Used for recovery efforts of a lost device. |
| SENSOR | Broadcasts telemetry packets as priority. | Deploying in scenarios where gathering environmental or other sensor data is crucial, with efficient power usage and frequent updates. |
-| TAK | Optimized for ATAK system communication, reduces routine broadcasts. | Integration with ATAK systems (via the Mesthastic ATAK Plugin) for communication in tactical or coordinated operations. |
+| TAK | Optimized for ATAK system communication, reduces routine broadcasts. | Integration with ATAK systems (via the Meshtastic ATAK Plugin) for communication in tactical or coordinated operations. |
| TAK_TRACKER | Enables automatic TAK PLI broadcasts and reduces routine broadcasts. | Standalone PLI integration with ATAK systems for communication in tactical or coordinated operations. |
| REPEATER | Infrastructure node for extending network coverage by relaying messages with minimal overhead. Not visible in Nodes list. | Best positioned in strategic locations to maximize the network's overall coverage. Device is not shown in topology. |
| ROUTER | Infrastructure node for extending network coverage by relaying messages. Visible in Nodes list. | Best positioned in strategic locations to maximize the network's overall coverage. Device is shown in topology. |
diff --git a/docs/configuration/radio/power.mdx b/docs/configuration/radio/power.mdx
index 7621cfd9..7ddc1bcf 100644
--- a/docs/configuration/radio/power.mdx
+++ b/docs/configuration/radio/power.mdx
@@ -30,6 +30,9 @@ When activated, this feature disables Bluetooth, Serial, WiFi, and the device's
Automatically shut down a device after a defined time period if power is lost.
+Before setting this, ensure your board correctly detects when it is connected to external power (the "🔌" icon in the app). Otherwise, your device could shut down even when power is present.
+Many devices detect power status correctly, however for some devices, you will need to modify the ADC Multiplier (below).
+
### ADC Multiplier Override
Ratio of voltage divider for battery pin e.g. 3.20 (R1=100k, R2=220k)
diff --git a/docs/configuration/region-by-country.mdx b/docs/configuration/region-by-country.mdx
new file mode 100644
index 00000000..fbc3184d
--- /dev/null
+++ b/docs/configuration/region-by-country.mdx
@@ -0,0 +1,182 @@
+---
+id: region-by-country
+title: LoRa Region by Country
+description: List countries associated to their respective LoRa Region settings.
+sidebar_label: LoRa Region by Country
+sidebar_position: 5
+---
+
+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.
+
+### A
+
+| Country | LoRa Region | Regulatory document |
+| --- | --- | --- |
+| Albania | EU_868
EU_433 | |
+| Australia | ANZ | |
+| Austria | EU_868
EU_433 | |
+
+### B
+
+| Country | LoRa Region | Regulatory document |
+| --- | --- | --- |
+| Belgium | EU_868
EU_433 | |
+| Bosnia-Herzegowina | EU_868
EU_433 | |
+| Brazil | ANZ | https://www.gov.br/anatel/pt-br/regulado/radiofrequencia/radiacao-restrita |
+| Bulgaria | EU_868
EU_433 | |
+
+
+### C
+
+| Country | LoRa Region | Regulatory document |
+| --- | --- | --- |
+| Canada | US | |
+| China | CN | |
+| Cyprus | EU_868
EU_433 | |
+| Czech Republic | EU_868
EU_433 | |
+
+### D
+
+| Country | LoRa Region | Regulatory document |
+| --- | --- | --- |
+| Denmark | EU_868
EU_433 | |
+
+### E
+
+| Country | LoRa Region | Regulatory document |
+| --- | --- | --- |
+| Estonia | EU_868
EU_433 | |
+
+### F
+
+| Country | LoRa Region | Regulatory document |
+| --- | --- | --- |
+| France | EU_868
EU_433 | |
+| Finland | EU_868
EU_433 | |
+
+### G
+
+| Country | LoRa Region | Regulatory document |
+| --- | --- | --- |
+| Germany | EU_868
EU_433 | |
+| Greece | EU_868
EU_433 | |
+
+### H
+
+| Country | LoRa Region | Regulatory document |
+| --- | --- | --- |
+| Hungary | EU_868
EU_433 | |
+
+### I
+
+| Country | LoRa Region | Regulatory document |
+| --- | --- | --- |
+| India | IN | |
+| Ireland | EU_868
EU_433 | |
+| Italy | EU_868
EU_433 | |
+
+### J
+
+| Country | LoRa Region | Regulatory document |
+| --- | --- | --- |
+| Japan | JP | |
+
+### K
+
+| Country | LoRa Region | Regulatory document |
+| --- | --- | --- |
+| Korea | KR | |
+| Kroatia | EU_868
EU_433 | |
+
+### L
+
+| Country | LoRa Region | Regulatory document |
+| --- | --- | --- |
+| Latvia | EU_868
EU_433 | |
+| Lithauania | EU_868
EU_433 | |
+| Luxembourg | EU_868
EU_433 | |
+
+### M
+
+| Country | LoRa Region | Regulatory document |
+| --- | --- | --- |
+| Malaysia | MY_919
MY_433 | |
+| Montenegro | EU_868
EU_433 | |
+
+### N
+
+| Country | LoRa Region | Regulatory document |
+| --- | --- | --- |
+| Netherlands | EU_868
EU_433 | |
+| New Zealand | ANZ
NZ_865 | |
+| North Macedonia | EU_868
EU_433 | |
+| Norway | EU_868
EU_433 | |
+
+### O
+
+| Country | LoRa Region | Regulatory document |
+| --- | --- | --- |
+
+### P
+
+| Country | LoRa Region | Regulatory document |
+| --- | --- | --- |
+| Poland | EU_868
EU_433 | |
+| Portugal | EU_868
EU_433 | |
+
+### Q
+
+| Country | LoRa Region | Regulatory document |
+| --- | --- | --- |
+
+### R
+
+| Country | LoRa Region | Regulatory document |
+| --- | --- | --- |
+| Romania | EU_868
EU_433 | |
+| Russia | RU | |
+
+### S
+
+| Country | LoRa Region | Regulatory document |
+| --- | --- | --- |
+| Serbia | EU_868
EU_433 | |
+| Singapore | SG_923 | |
+| Slowakia | EU_868
EU_433 | |
+| Slowenia | EU_868
EU_433 | |
+| Spain | EU_868
EU_433 | |
+| Sweden | EU_868
EU_433 | |
+| Switzerland | EU_868
EU_433 | |
+
+### T
+
+| Country | LoRa Region | Regulatory document |
+| --- | --- | --- |
+| Taiwan | TW | |
+| Thailand | TH | |
+
+### U
+
+| Country | LoRa Region | Regulatory document |
+| --- | --- | --- |
+| Ukraine | UA_868
UA_433 | |
+| United Kingdom (UK) | EU_868
EU_433 | |
+| United States of America (USA) | US | |
+
+### V
+
+| Country | LoRa Region | Regulatory document |
+| --- | --- | --- |
+| Vatican City | EU_868
EU_433 | |
+
+### Y
+
+| Country | LoRa Region | Regulatory document |
+| --- | --- | --- |
+
+### Z
+
+| Country | LoRa Region | Regulatory document |
+| --- | --- | --- |
diff --git a/docs/getting-started/initial-config.mdx b/docs/getting-started/initial-config.mdx
index 13fe5740..24ba92da 100644
--- a/docs/getting-started/initial-config.mdx
+++ b/docs/getting-started/initial-config.mdx
@@ -39,7 +39,6 @@ values={[
- [Android App](/docs/category/android-app)
- [Web Client](https://client.meshtastic.org)
-- [iOS/iPadOS/macOS App](/docs/category/apple-apps)
[RAK13002](./rak/peripherals?rakmodules=IO) IO
RAK14001 RGB LED
-RAK12002 RTC
+[RAK12002](./rak/peripherals?rakmodules=RTC) RTC
[RAK1901](./rak/peripherals?rakmodules=Sensors&sensors=RAK1901) Temperature and Humidity Sensor
[RAK1902](./rak/peripherals?rakmodules=Sensors&sensors=RAK1902) Barometric Pressure Sensor
[RAK1906](./rak/peripherals?rakmodules=Sensors&sensors=RAK1906) Environment Sensor
@@ -107,7 +107,7 @@ Inexpensive basic ESP32-based boards.
| Name | MCU | Radio | WiFi | BT | GPS |
|:------------------------------------------------------------------|:------------|:-------|:------------:|:---:|:---:|
| [LoRa32 V2.1](./heltec/?heltec=v2.1) | ESP32 | SX127x | 2.4GHz b/g/n | 4.2 | NO |
-| [LoRa32 V3/3.1](./heltec/?heltec=v23) | ESP32-S3FN8 | SX1262 | 2.4GHz b/g/n | 5.0 | NO |
+| [LoRa32 V3/3.1](./heltec/?heltec=v23) | ESP32-S3FN8 | SX1262 | 2.4GHz b/g/n | 5.0 | NO |
| [Wireless Stick Lite V3](./heltec/?heltec=Wireless+Stick+Lite+V3) | ESP32-S3FN8 | SX1262 | 2.4GHz b/g/n | 5.0 | NO |
| [Wireless Tracker](./heltec/?heltec=tracker) | ESP32-S3FN8 | SX1262 | 2.4GHz b/g/n | 5.0 | YES |
| [Wireless Paper](./heltec/?heltec=paper) | ESP32-S3FN8 | SX1262 | 2.4GHz b/g/n | 5.0 | NO |
@@ -139,3 +139,10 @@ Fast versatile boards using the RP2040.
SSD1306 OLED Display
SH1106 OLED Display
CardKB Keyboard
+
+### [CanaryOne](./canary)
+Complete solution with battery, screen, case, and antenna. Ships pre-flashed with latest Meshtastic firmware.
+
+| Name | MCU | Radio | WiFi | BT | GPS |
+|:----------------------|:---------|:-------|:----:|:---:|:---:|
+| [CanaryOne](./canary) | nRF52840 | SX1262 | NO | 5.0 | YES |
diff --git a/docs/hardware/devices/rak/index.mdx b/docs/hardware/devices/rak/index.mdx
index 0850e037..479a8e23 100644
--- a/docs/hardware/devices/rak/index.mdx
+++ b/docs/hardware/devices/rak/index.mdx
@@ -29,3 +29,4 @@ Please see the RAK documentation for the correct way to connect your hardware to
- China RAK Direct [RAK Wireless Starter Kit w/ Gen2 Base board](https://store.rakwireless.com/products/wisblock-meshtastic-starter-kit)
- US Distributor Rokland [RAK Wireless Starter Kit w/ Gen2 Base board](https://store.rokland.com/products/rak-wireless-wisblock-meshtastic-starter-kit)
- US Distributor Rokland [RAK Wireless Starter Kit w/ Gen1 Base board](https://store.rokland.com/products/rakwireless-meshtastic-starter-kit-alternative-with-rak5005-o-base)
+ - UK/EU Distributor ConnectedThings [RAK Wireless Starter Kit w/ Gen2 Base board](https://connectedthings.store/gb/meshtastic/rak-wisblock-meshtastic-starter-kit.html)
diff --git a/docs/hardware/devices/rak/peripherals.mdx b/docs/hardware/devices/rak/peripherals.mdx
index 385c686d..3ccbf07d 100644
--- a/docs/hardware/devices/rak/peripherals.mdx
+++ b/docs/hardware/devices/rak/peripherals.mdx
@@ -34,6 +34,7 @@ The RAK12500 is supported on the following base boards & slots:
- RAK19007 on slot A
- RAK19003 on slot C
+- RAK19001 on slot F
### RAK1910
@@ -47,6 +48,7 @@ The RAK1910 is supported on the following base boards & slots:
- RAK5005-0 on slot A
- RAK19007 on slot A
- RAK19003 on slot C
+- RAK19001 on slot F
### Resources
- RAK Documentation Center
diff --git a/docs/legal/privacy.mdx b/docs/legal/privacy.mdx
index 032f7398..06d9beb1 100644
--- a/docs/legal/privacy.mdx
+++ b/docs/legal/privacy.mdx
@@ -2,6 +2,7 @@
id: privacy
title: Meshtastic privacy policy
sidebar_label: Privacy
+custom_edit_url: null
sidebar_position: 2
---
@@ -9,8 +10,6 @@ We don't collect any personal identifying information. We never capture username
If you opt-in to analytics on the Android app (thank you - that helps us know what things we need to improve), we will receive anonymized information about user behavior. This includes crash reports, screens used in the app, etc... Analytics is provided by [Firebase Crashlytics](https://firebase.google.com/products/crashlytics).
-Maps provided by Mapbox require analytics to work. For more information about what they collect, please see the [Mapbox privacy policy](https://www.mapbox.com/legal/privacy).
-
The search engine for this website is provided by Algolia, please see their [privacy policy](https://www.algolia.com/policies/privacy) for details of what information they collect.
This is an open-source project run by hobbyists, and we try to be completely transparent. If you have questions on this policy, please post on the forum, and we'll reply/clarify/correct.
diff --git a/src/theme/NotFound/Content/index.js b/src/theme/NotFound/Content/index.js
index 114b279f..0ab18ab5 100644
--- a/src/theme/NotFound/Content/index.js
+++ b/src/theme/NotFound/Content/index.js
@@ -31,7 +31,12 @@ export default function NotFoundContent({ className }) {
original URL and let them know their link is broken.