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/community/local-groups.mdx b/docs/community/local-groups.mdx
index 6157745c..5f47a7b1 100644
--- a/docs/community/local-groups.mdx
+++ b/docs/community/local-groups.mdx
@@ -64,6 +64,7 @@ us on [Discord](https://discord.com/invite/ktMAKGBnBs) to add your group.
- [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)
@@ -111,3 +112,9 @@ us on [Discord](https://discord.com/invite/ktMAKGBnBs) to add your group.
## The Netherlands
- [Meshtastic Netherlands](https://t.me/meshtastic_nl)
+
+## Taiwan
+- [Meshtastic Taiwan Community 臺灣鏈網 - Facebook](https://www.facebook.com/groups/413628121046386)
+- [Meshtastic Taiwan Community 臺灣鏈網 - Discord](https://discord.gg/2vZkuckp8E)
+
+
diff --git a/docs/configuration/module/range-test.mdx b/docs/configuration/module/range-test.mdx
index e31b975d..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. ** 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.
+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/radio/position.mdx b/docs/configuration/radio/position.mdx
index 15639acd..1a8885fe 100644
--- a/docs/configuration/radio/position.mdx
+++ b/docs/configuration/radio/position.mdx
@@ -8,26 +8,24 @@ description: GPS position configuration settings for your Meshtastic device incl
import Tabs from "@theme/Tabs";
import TabItem from "@theme/TabItem";
-The position config options are: GPS Enabled, GPS Update Interval, GPS Attempt Time, Fixed Position, Smart Broadcast, Smart Broadcast Minimum Distance, Smart Broadcast Minimum Interval, Broadcast Interval, Position Packet Flags, and GPS RX/TX Pins. Position config uses an admin message sending a `Config.Position` protobuf.
+Position data from GPS is provided by either the radio or your paired phone. It is not required to use Meshtastic, but time calculations require at least one device on the mesh to have either a GPS, RTC, or internet connection for NTP.
-Position data from GPS is provided by either the radio or your paired phone. Position data is not required to use Meshtastic but time calculations require at least one device on the mesh have either a GPS or internet connection for time.
+The position config uses an admin message to send a `Config.Position` protobuf. The position config options are: GPS Mode, GPS Update Interval, Fixed Position, Smart Broadcast, Smart Broadcast Minimum Distance, Smart Broadcast Minimum Interval, Broadcast Interval, Position Packet Flags, and GPS RX/TX Pins.
## Position Config Values
-### GPS Enabled
+### GPS Mode
-Acceptable values: `true` or `false`
+Configures whether the GPS functionality is enabled, disabled, or not present on the node.
-Defaults to true. Enables GPS on the node.
+Acceptable values: `Disabled`, `Enabled`, and `Not_Present`.
+
+Generally, depending on the device and its configuration, this value will default to either `Enabled` or `Not Present`.
### GPS Update Interval
How often we should try to get GPS position (in seconds), or zero for the default of once every 2 minutes, or a very large value (maxint) to update only once at boot.
-### GPS Attempt Time
-
-How long should we try to get our position during each GPS update interval attempt? (in seconds) Or if zero, use the default of 15 minutes.
-
### Fixed Position
Acceptable values: `true` or `false`
@@ -64,9 +62,9 @@ The minimum number of seconds (since the last send) before we can send a positio
Default of `0` is 15 minutes
-If smart broadcast is off we should send our position this often (but only if it has changed significantly)
+If smart broadcast is off we should send our position this often.
-The GPS updates will be sent out every Broadcast Interval, with either the actual GPS location, or an empty location if no GPS fix was achieved.
+The GPS updates will be sent out every broadcast interval, either with the actual GPS location or an empty location if no GPS fix was achieved.
### Position Flags
@@ -136,9 +134,8 @@ All Position config commands are available in the python CLI. Example commands a
| Setting | Acceptable Values | Default |
| :------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------: | :--------------------------: |
-| position.gps_enabled | `true`, `false` | `true` |
+| position.gps_mode | `enabled`, `disabled`, `not_present` | `Enabled` or `Not Present` |
| position.gps_update_interval | `integer` (seconds) | Default `0` is 2 Minutes |
-| position.gps_attempt_time | `integer` (seconds) | Default of `0` is 15 Minutes |
| position.fixed_position | `true`, `false` | `false` |
| position.position_broadcast_smart_enabled | `true`, `false` | `true` |
| position.broadcast_smart_minimum_distance | `integer` (meters) | Default of `0` is 100 Meters |
@@ -163,11 +160,6 @@ meshtastic --set position.gps_update_interval 0
meshtastic --set position.gps_update_interval 45
```
-```shell title="Set GPS attempt time (Default of 0 is 30 seconds)"
-meshtastic --set position.gps_attempt_time 0
-meshtastic --set position.gps_attempt_time 45
-```
-
```shell title="Set Fixed Position - Current Location"
meshtastic --set position.fixed_position true
```
@@ -214,7 +206,3 @@ All position config options are available in the Web UI.
-
-:::caution
-Altering/disabling the GPS functionality does not mean that you will be unable to be found. Via triangulation of your radio, location may be given up to someone if they are determined enough.
-:::
diff --git a/docs/configuration/region-by-country.mdx b/docs/configuration/region-by-country.mdx
index ac8c7c62..fbc3184d 100644
--- a/docs/configuration/region-by-country.mdx
+++ b/docs/configuration/region-by-country.mdx
@@ -14,12 +14,19 @@ If you'd like to contribute information for your country, click the "Edit this p
| 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
@@ -27,38 +34,48 @@ If you'd like to contribute information for your country, click the "Edit this p
| --- | --- | --- |
| 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
@@ -71,23 +88,31 @@ If you'd like to contribute information for your country, click the "Edit this p
| 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
@@ -98,6 +123,8 @@ If you'd like to contribute information for your country, click the "Edit this p
| Country | LoRa Region | Regulatory document |
| --- | --- | --- |
+| Poland | EU_868 EU_433 | |
+| Portugal | EU_868 EU_433 | |
### Q
@@ -108,13 +135,20 @@ If you'd like to contribute information for your country, click the "Edit this p
| 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
@@ -135,6 +169,7 @@ If you'd like to contribute information for your country, click the "Edit this p
| Country | LoRa Region | Regulatory document |
| --- | --- | --- |
+| Vatican City | EU_868 EU_433 | |
### Y
diff --git a/docs/getting-started/initial-config.mdx b/docs/getting-started/initial-config.mdx
index 24ba92da..810bae75 100644
--- a/docs/getting-started/initial-config.mdx
+++ b/docs/getting-started/initial-config.mdx
@@ -120,6 +120,8 @@ Configuration of Region, Modem Preset and Hop Limit is available on iOS, iPadOS
+Refer to [LoRa Region by Country](/docs/configuration/region-by-country) for a more comprehensive list.
+
## Continue Configuration
Now that you have set the LoRa region on your device, you can continue with configuring any additional configs to suit your needs.
diff --git a/docs/hardware/antennas/index.mdx b/docs/hardware/antennas/index.mdx
index 23215540..15ff6147 100644
--- a/docs/hardware/antennas/index.mdx
+++ b/docs/hardware/antennas/index.mdx
@@ -24,22 +24,23 @@ Antenna designs, tools, and coverage simulators.
These antennas have garnered positive feedback and frequent recommendations within our community. However, we encourage you to conduct your own research to ensure the best choice for your needs. We are not responsible for individual experiences or results.
### Compact / Handheld
-| Frequency | Model | Purchase Links |
-| :--: | :--: | :--: |
-| 915 or 868 | GIZONT 17cm | [AliExpress](https://www.aliexpress.us/item/3256804421300249.html) |
-| 915 or 868 | GIZONT 20cm | [AliExpress](https://www.aliexpress.us/item/3256804397374144.html) |
-| 915 | LINX ANT-916-CW-HW-SMA | [Mouser](https://www.mouser.com/ProductDetail/TE-Connectivity-Linx-Technologies/ANT-916-CW-HW-SMA?qs=PKuFCuYbGOfeZQiEfd4fWA%3D%3D) [DigiKey](https://www.digikey.com/en/products/detail/te-connectivity-linx/ANT-916-CW-HW-SMA/2694126) |
-| 915 | ZIISOR TX915-JKS-20 | [AliExpress](https://www.aliexpress.us/item/3256801688016561.html) |
-| 915 | CDEBYTE TX915-JKD-20 (5-pack)| [AliExpress](https://www.aliexpress.us/item/3256803106771365.html) |
+| Frequency | Model | Purchase Links |
+|:----------:|:-----------------------------:|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
+| 915 or 868 | GIZONT 17cm | [AliExpress](https://www.aliexpress.us/item/3256804421300249.html) |
+| 915 | LINX ANT-916-CW-HW-SMA | [Mouser](https://www.mouser.com/ProductDetail/TE-Connectivity-Linx-Technologies/ANT-916-CW-HW-SMA?qs=PKuFCuYbGOfeZQiEfd4fWA%3D%3D) [DigiKey](https://www.digikey.com/en/products/detail/te-connectivity-linx/ANT-916-CW-HW-SMA/2694126) |
+| 915 | ZIISOR TX915-JKS-20 | [AliExpress](https://www.aliexpress.us/item/3256801688016561.html) |
+| 915 | CDEBYTE TX915-JKD-20 (5-pack) | [AliExpress](https://www.aliexpress.us/item/3256803106771365.html) |
+| 915 | Rabbit Labs / ZIISOR | [Amazon US](https://www.amazon.com/gp/product/B0D19JJBKZ) |
+| 433 | Rabbit Labs / ZIISOR | [Amazon US](https://www.amazon.com/dp/B0D1MSPVQ5) |
### Base Station / Repeater
-| Frequency | Model | Purchase Links |
-| :--: | :--: | :--: |
-| 915 | Alfa AOA-915-5ACM | [Rokland](https://store.rokland.com/products/alfa-aoa-915-5acm-5-dbi-omni-outdoor-915mhz-802-11ah-mini-antenna-for-lora-halow-application) |
-| 915 | Rokland 32" 5.8 dBi | [Rokland](https://store.rokland.com/collections/802-11ah-wi-fi-halow/products/5-8-dbi-n-male-omni-outdoor-915-mhz-antenna-large-profile-32-height-for-helium-rak-miner-2-nebra-indoor-bobcat) |
+| Frequency | Model | Purchase Links |
+|:---------:|:-------------------:|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
+| 915 | Alfa AOA-915-5ACM | [Rokland](https://store.rokland.com/products/alfa-aoa-915-5acm-5-dbi-omni-outdoor-915mhz-802-11ah-mini-antenna-for-lora-halow-application) |
+| 915 | Rokland 32" 5.8 dBi | [Rokland](https://store.rokland.com/collections/802-11ah-wi-fi-halow/products/5-8-dbi-n-male-omni-outdoor-915-mhz-antenna-large-profile-32-height-for-helium-rak-miner-2-nebra-indoor-bobcat) |
### Automotive
-| Frequency | Model | Purchase Links |
-| :--: | :--: | :--: |
-| 915 | Laird MA9-5N | [DigiKey](https://www.digikey.com/en/products/detail/te-connectivity-laird/MA9-5N/3486940) |
-| 915 | Taoglas TI.16.5F11 | [DigiKey](https://www.digikey.com/en/products/detail/taoglas-limited/TI-16-5F11/3724558) |
+| Frequency | Model | Purchase Links |
+|:---------:|:------------------:|:------------------------------------------------------------------------------------------:|
+| 915 | Laird MA9-5N | [DigiKey](https://www.digikey.com/en/products/detail/te-connectivity-laird/MA9-5N/3486940) |
+| 915 | Taoglas TI.16.5F11 | [DigiKey](https://www.digikey.com/en/products/detail/taoglas-limited/TI-16-5F11/3724558) |
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/tdeck/index.mdx b/docs/hardware/devices/tdeck/index.mdx
index 27b67f35..0d28e873 100644
--- a/docs/hardware/devices/tdeck/index.mdx
+++ b/docs/hardware/devices/tdeck/index.mdx
@@ -31,9 +31,19 @@ The T-Deck is a compact device featuring a 2.8-inch IPS LCD touch screen with a
## Keyboard Shortcuts
-| Shortcut | Function |
-|-------------|-----------------------------------|
-| `alt` + `b` | Toggle keyboard backlight on/off. |
+| Shortcut | Function |
+|-------------------|-----------------------------------------------------|
+| `alt` & `b` | Toggle keyboard backlight on/off. |
+| `alt` & `c` | Toggle modifier function. `Fn` displayed on screen. |
+| `alt` & `c` + `m` | Disable/Enable notifications. |
+| `alt` & `c` + `q` | Quit/Cancel (message, canned message, etc.) |
+| `alt` & `c` + `t` | Tab Key (select channel/dm recipient) |
+| `alt` & `c` + `i` | Decrease screen brightness. |
+| `alt` & `c` + `o` | Increase screen brightness. |
+| `alt` & `c` + `g` | Toggle GPS. |
+| `alt` & `c` + `⎵` | Send network ping. |
+
+As of firmware version 2.3.9, there is a newly added modifier function key combo which allows additional shortcuts to be added. To enable the function key, you will press `alt` and `c` together; a small `Fn` will be displayed in the lower right of the screen. After the function key is enabled, you can press the key for the function you wish to execute. For example, to disable/enable notifications, you would press `alt` and `c` followed by `m`.
## Flashing
diff --git a/docs/hardware/devices/techo/buttons.mdx b/docs/hardware/devices/techo/buttons.mdx
index 62151081..af4d4b7a 100644
--- a/docs/hardware/devices/techo/buttons.mdx
+++ b/docs/hardware/devices/techo/buttons.mdx
@@ -8,7 +8,6 @@ sidebar_position: 1
## Functionality
- **Capacitive Touch Button (Top):**
- *If "Wake on Tap or Motion" setting enabled:*
- **Touch:**
- Update the display
- *(at screensaver)* Wake the display.
diff --git a/docs/legal/licensing-and-trademark.mdx b/docs/legal/licensing-and-trademark.mdx
index 53c459a2..bd3b38c9 100644
--- a/docs/legal/licensing-and-trademark.mdx
+++ b/docs/legal/licensing-and-trademark.mdx
@@ -16,7 +16,7 @@ Please ensure the inclusion of the following statement in your support documenta
> Meshtastic® is a registered trademark of Meshtastic LLC. Meshtastic software components are released under various licenses, see GitHub for details. No warranty is provided - use at your own risk.
-Alternatively, if you prefer, you can use our community project logos, "M-Powered" and "M-PWRD", which are specifically designed for projects that utilize Meshtastic technology. These logos offer a straightforward way to show compatibility with our platform without needing a trademark grant. For more information on these logos, including usage guidelines and design files, please refer to [Community Project Logos: M-Powered & M-PWRD](/docs/legal/licensing-and-trademark#community-project-logos-m-powered--m-pwrd).
+Alternatively, if you prefer, you can use our community project logos, nicknamed "M-Powered" and "M-PWRD", which are specifically designed for projects that utilize Meshtastic technology. These logos offer a straightforward way to show compatibility with our platform without needing a trademark grant. For more information on these logos, including usage guidelines and design files, please refer to [Community Project Logos: M-Powered & M-PWRD](/docs/legal/licensing-and-trademark#community-project-logos-m-powered--m-pwrd).
## Meshtastic Trademark Policy & Brand Guidelines
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index af0421a7..f6f4437d 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -87,6 +87,17 @@ const SocialCards: SocialCardProps[] = [
/>
),
},
+ {
+ color: "bg-[#24A1DE]",
+ link: "https://t.me/+hmKN0xOR73ExOTU6",
+ children: (
+
+ ),
+ },
];
function Home() {
diff --git a/static/img/homepage/telegram-single-path-240px.svg b/static/img/homepage/telegram-single-path-240px.svg
new file mode 100644
index 00000000..7880d035
--- /dev/null
+++ b/static/img/homepage/telegram-single-path-240px.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
+ ),
+ },
];
function Home() {
diff --git a/static/img/homepage/telegram-single-path-240px.svg b/static/img/homepage/telegram-single-path-240px.svg
new file mode 100644
index 00000000..7880d035
--- /dev/null
+++ b/static/img/homepage/telegram-single-path-240px.svg
@@ -0,0 +1 @@
+
\ No newline at end of file