Merge branch 'master' into i18n

2024-11-09 23:24:10 -08:00 · 2023-12-17 14:43:20 +01:00 · 2023-12-17 14:43:20 +01:00 · ca3e0b36ad
parent c169766590 dc20393f19
commit ca3e0b36ad
24 changed files with 537 additions and 464 deletions
--- a/docs/about/faq.mdx
+++ b/docs/about/faq.mdx
@ -97,7 +97,7 @@ Push the left PWR button for about 1 second.

 ### Where do I purchase the device hardware?

-Each [supported device](/docs/supported-hardware) has a "Purchase Link".
+Each [supported device](/docs/hardware/devices/index.mdx) has a "Purchase Link".

 ### I have my hardware. How do I install the firmware and any required drivers?

--- a/docs/getting-started/index.mdx
+++ b/docs/getting-started/index.mdx
@ -14,7 +14,7 @@ import TabItem from "@theme/TabItem";

 :::note

-This guide assumes that you have already purchased the devices you will be using with Meshtastic. If you haven't, you can check out our list of [supported hardware](/docs/supported-hardware/)
+This guide assumes that you have already purchased the devices you will be using with Meshtastic. If you haven't, you can check out our list of [supported hardware](/docs/hardware/devices/index.mdx)
 to see your options.
 :::

@ -47,7 +47,7 @@ The RP2040 is a dual-core ARM chip developed by Raspberry Pi. Supported RP2040 d

 :::info

-If your device is not listed above, please review our [supported devices](/docs/supported-hardware) to determine which MCU your device has or contact us in [Discord](https://discord.gg/ktMAKGBnBs) with any questions.
+If your device is not listed above, please review our [supported devices](/docs/hardware/devices/index.mdx) to determine which MCU your device has or contact us in [Discord](https://discord.gg/ktMAKGBnBs) with any questions.

 :::

--- a/docs/hardware/devices/_category_.yml
+++ b/docs/hardware/devices/_category_.yml
@ -1,7 +0,0 @@
-label: Devices
-collapsible: true
-position: 1
-link:
-  type: generated-index
-  title: Supported Devices
-  slug: supported-hardware
--- a/docs/hardware/devices/heltec/index.mdx
+++ b/docs/hardware/devices/heltec/index.mdx
@ -2,7 +2,7 @@
 id: heltec
 title: HELTEC® LoRa 32
 sidebar_label: HELTEC® LoRa 32
-sidebar_position: 5
+sidebar_position: 7
 ---

 import Tabs from "@theme/Tabs";
@ -10,6 +10,7 @@ import TabItem from "@theme/TabItem";

 <Tabs
 groupId="heltec"
+queryString="heltec"
 defaultValue="v3"
 values={[
 {label: 'LoRa32 V2.1', value: 'v2.1'},
@ -77,9 +78,9 @@ This device may have issues charging a connected battery if utilizing a USB-C to

 ### Pin Map

-![HTIT-WSL_V3_PIN_MAP](/img/hardware/HTIT-WB32LA(F)_V3.png)
+![HTIT-WSL_V3_PIN_MAP](</img/hardware/HTIT-WB32LA(F)_V3.png>)

-Image Source: [Heltec](https://resource.heltec.cn/download/WiFi_LoRa32_V3/HTIT-WB32LA(F)_V3.png)
+Image Source: [Heltec](<https://resource.heltec.cn/download/WiFi_LoRa32_V3/HTIT-WB32LA(F)_V3.png>)

 ## Resources

@ -117,6 +118,7 @@ This device may have issues charging a connected battery if utilizing a USB-C to
 - No GPS

 ### Meshtastic I2C Definitions
+
 - SCL: GPIO47
 - SDA: GPIO48

@ -158,6 +160,25 @@ This device may have issues charging a connected battery if utilizing a USB-C to
 - Onboard 0.96-inch LCD display
 - User and Reset Buttons

+## Flashing the Wireless Tracker
+
+If you are having issues flashing the wireless tracker, especially if it's your first attempt, you may need to manually place the device into Espressif's Firmware Download mode. Please follow the process below to do so.
+
+:::warning
+
+Do not proceed unless an antenna is connected to avoid possible damage to the device's radio.
+
+:::
+
+The following process will manually place the device into the Espressif Firmware Download mode:
+
+1. Unplug the device.
+2. Press and hold the USER button.
+3. Plug device in.
+4. After 2-3 seconds, release the USER button.
+
+With the device now in the Espressif Firmware Download mode, you can proceed with flashing using one of the supported flashing methods. It's generally recommended to use the [Web Flasher](https://flasher.meshtastic.org/). You can select "Heltec Wireless Tracker" from the device drop-down.
+
 ## Pin Map

 ![HT-Tracker_V1 Pin Map](/img/hardware/HT-Tracker_V1_Pin_Map.png)
--- a/docs/hardware/devices/index.mdx
+++ b/docs/hardware/devices/index.mdx
@ -0,0 +1,139 @@
+---
+id: devices
+title: Devices
+sidebar_label: Devices
+sidebar_position: 1
+---
+
+## Supported Devices
+Meshtastic firmware can be installed on a wide range of development boards. The list below provides a brief comparison of currently supported hardware.
+
+### Which board should I choose?
+
+While all the boards listed on this page will run Meshtastic and mesh with each other, some current community favorites are:
+- RAK Meshtastic Start Kit
+- Station G1
+- LILYGO LoRa T3-S3
+- HELTEC LoRa V3
+
+Please do your research and choose the board that meets your needs (or maybe already have in a bin somewhere).
+
+:::info
+- The Semtech SX1262 transceiver is newer than the SX1276 and provides increased receive and transmit performance.
+- nRF52-based devices use a fraction of the power compared to ESP32-based devices and are therefore generally preferred for solar and handset applications.
+- ESP32-based devices require more power to operate but are typically lower-cost alternatives that do perform well when using house power, or for handsets that only require a day or two of runtime, and for applications that require WiFi connectivity.
+:::
+
+### [RAK Wisblock](./rak/)
+Modular hardware system with Base, Core and Peripheral modules including the low-power and solar ready nRF52840-based Meshtastic Starter Kit (19007 & 4631).
+
+[**WisBlock Core Modules**](./rak/core-module/)<br/>
+| Name                                           | MCU      | Radio  |     WiFi     | BT  |  GPS   |
+|:-----------------------------------------------|:---------|:-------|:------------:|:---:|:------:|
+| [RAK4631](./rak/core-module?rakcore=RAK4631)   | nRF52840 | SX1262 |      NO      | 5.0 | add-on |
+| [RAK11200](./rak/core-module?rakcore=RAK11200) | ESP32    | add-on | 2.4GHz b/g/n | 4.2 | add-on |
+| [RAK11310](./rak/core-module?rakcore=RAK11310) | RP2040   | SX1262 |      NO      | NO  | add-on |
+
+[**Base Boards**](./rak/base-board/)<br/>
+[RAK5005-O](./rak/base-board?rakbase=RAK5005-O)<br/>
+[RAK19007](./rak/base-board?rakbase=RAK19007)<br/>
+[RAK19003](./rak/base-board?rakbase=RAK19003)<br/>
+[RAK19001](./rak/base-board?rakbase=RAK19001)<br/>
+
+[**WisBlock Displays**](./rak/screens/)<br/>
+[RAK1921](./rak/screens?rakscreens=OLED)<br/>
+[RAK1400](./rak/screens?rakscreens=E-Ink)<br/>
+
+[**WisBlock Peripherals**](./rak/peripherals/)<br/>
+[RAK1910](./rak/peripherals?rakmodules=GPS) GPS<br/>
+[RAK12500](./rak/peripherals?rakmodules=GPS) GPS<br/>
+[RAK18001](./rak/peripherals?rakmodules=Buzzer) Buzzer<br/>
+[RAK13002](./rak/peripherals?rakmodules=IO) IO<br/>
+RAK14001 RGB LED<br/>
+RAK12002 RTC<br/>
+[RAK1910](./rak/peripherals?rakmodules=Sensors&sensors=RAK1901) Temperature and Humidity Sensor<br/>
+[RAK1902](./rak/peripherals?rakmodules=Sensors&sensors=RAK1902) Barometric Pressure Sensor<br/>
+[RAK1906](./rak/peripherals?rakmodules=Sensors&sensors=RAK1906) Environment Sensor<br/>
+RAK12013 Radar Sensor<br/>
+
+### [LILYGO® T-Beam](./tbeam/)
+Boards complete with GPS, 18650 battery holder, and optional screen.
+
+| Name                                     | MCU      | Radio             |     WiFi     | BT  | GPS |
+|:-----------------------------------------|:---------|:------------------|:------------:|:---:|:---:|
+| [T-Beam v0.7](./tbeam/?t-beam=0.7)       | ESP32    | SX1276            | 2.4GHz b/g/n | 4.2 | YES |
+| [T-Beam v1.1](./tbeam/?t-beam=1.1)       | ESP32    | SX1276            | 2.4GHz b/g/n | 4.2 | YES |
+| [T-Beam with M8N](./tbeam/?t-beam=m8n)   | ESP32    | SX1276<br/>SX1262 | 2.4GHz b/g/n | 4.2 | YES |
+| [T-Beam S3-Core](./tbeam/?t-beam=s3core) | ESP32-S3 | SX1262            | 2.4GHz b/g/n | 5.0 | YES |
+| [T-BeamSUPREME](./tbeam/?t-beam=supreme) | ESP32-S3 | SX1262            | 2.4GHz b/g/n | 5.0 | YES |
+
+### [LILYGO® T-Echo](./techo/)
+All-in-one unit with E-Ink screen, GPS and battery in injection-molded case.  Features the low-power nRF52840 for long battery life.
+
+| Name               | MCU      | Radio  | WiFi | BT  | GPS |
+|:-------------------|:---------|:-------|:----:|:---:|:---:|
+| [T-Echo](./techo/) | nRF52840 | SX1262 |  NO  | 5.0 | YES |
+
+### [LILYGO® LoRa](./lora/)
+Inexpensive basic ESP32-based boards.
+
+| Name                                       | MCU      | Radio                        |     WiFi     | BT  | GPS |
+|:-------------------------------------------|:---------|:-----------------------------|:------------:|:---:|:---:|
+| [LoRa32 V1](./lora/?t-lora=v1)             | ESP32    | SX127x                       | 2.4GHz b/g/n | 4.2 | NO  |
+| [LoRa32 V1.3](./lora/?t-lora=v1.3)         | ESP32    | SX127x                       | 2.4GHz b/g/n | 4.2 | NO  |
+| [LoRa32 V2.0](./lora/?t-lora=v2.0)         | ESP32    | SX127x                       | 2.4GHz b/g/n | 4.2 | NO  |
+| [LoRa32 V2.1-1.6](./lora/?t-lora=v2.1)     | ESP32    | SX127x                       | 2.4GHz b/g/n | 4.2 | NO  |
+| [LoRa32 V2.1-1.8](./lora/?t-lora=v2.1-1.8) | ESP32    | SX1280                       | 2.4GHz b/g/n | 4.2 | NO  |
+| [LoRa32 T3-S3 V1.0](./lora/?t-lora=S3-v1)  | ESP32-S3 | SX1262<br/>SX1276<br/>SX1280 | 2.4GHz b/g/n | 5.0 | NO  |
+
+### [LILYGO® T-Deck](./tdeck/)
+Standalone device with screen and keyboard
+
+| Name               | MCU         | Radio  | WiFi | BT  | GPS |
+|:-------------------|:------------|:-------|:----:|:---:|:---:|
+| [T-Deck](./tdeck/) | ESP32-S3FN8 | SX1262 | YES  | 5.0 | NO  |
+
+### [LILYGO® T-Watch S3](./twatch/)
+
+| Name                    | MCU      | Radio  | WiFi | BT  | GPS |
+|:------------------------|:---------|:-------|:----:|:---:|:---:|
+| [T-Watch S3](./twatch/) | ESP32-S3 | SX1262 | YES  | 5.0 | NO  |
+
+### [HELTEC® LoRa 32](./heltec/)
+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](./heltec/?heltec=v23)                                 | ESP32       | SX1262 | 2.4GHz b/g/n | 4.2 | 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  |
+
+### [Nano Series](./nano/)
+Portable and durable devices designed for Meshtastic.
+
+| Name                                         | MCU         | Radio  |     WiFi     | BT  | GPS |
+|:---------------------------------------------|:------------|:-------|:------------:|:---:|:---:|
+| [Nano G2 Ultra](./nano/?nano-series=g2)      | NRF52840    | SX1262 | 2.4GHz b/g/n | 5.0 | YES |
+| [Nano G1 Explorer](./nano/?nano-series=g1-e) | ESP32 WROOM | SX1262 | 2.4GHz b/g/n | 4.2 | YES |
+| [Nano G1](./nano/?nano-series=g1)            | ESP32 WROOM | SX1276 | 2.4GHz b/g/n | 4.2 | YES |
+
+### [Station G1](./station-g1/)
+High power LoRa transceiver designed for Meshtastic Licensed HAM operation.
+
+| Name                        | MCU         | Radio  |     WiFi     | BT  | GPS |
+|:----------------------------|:------------|:-------|:------------:|:---:|:---:|
+| [Station G1](./station-g1/) | ESP32 WROOM | SX1262 | 2.4GHz b/g/n | 4.2 | YES |
+
+### [Raspberry Pi Pico](./raspberry-pi/)
+Fast versatile boards using the RP2040.
+
+| Name                                 | MCU    | Radio  |     WiFi     |      BT       | GPS |
+|:-------------------------------------|:-------|:-------|:------------:|:-------------:|:---:|
+| [Raspberry Pi Pico](./raspberry-pi/) | RP2040 | SX1262 | 2.4GHz b/g/n | not supported | NO  |
+
+[**Pico Peripherals**](./raspberry-pi/peripherals/)<br/>
+SSD1306 OLED Display<br/>
+SH1106 OLED Display<br/>
+CardKB Keyboard<br/>
--- a/docs/hardware/devices/lora/index.mdx
+++ b/docs/hardware/devices/lora/index.mdx
@ -12,6 +12,7 @@ Further information on the LILYGO® LoRa devices can be found on LILYGO®'s [Git

 <Tabs
 groupId="t-lora"
+queryString="t-lora"
 defaultValue="v1"
 values={[
 {label: 'Lora V1', value: 'v1'},
--- a/docs/hardware/devices/nano/buttons.mdx
+++ b/docs/hardware/devices/nano/buttons.mdx
--- a/docs/hardware/devices/nano/index.mdx
+++ b/docs/hardware/devices/nano/index.mdx
@ -2,7 +2,7 @@
 id: nano-series
 title: Nano Series
 sidebar_label: Nano Series
-sidebar_position: 7
+sidebar_position: 8
 ---

 import Tabs from "@theme/Tabs";
@ -14,6 +14,7 @@ For a full and complete comparison of the different devices in the Nano series,

 <Tabs
 groupId="nano-series"
+queryString="nano-series"
 defaultValue="g2"
 values={[
 {label: 'Nano G2 Ultra', value:'g2'},
--- a/docs/hardware/devices/rak/base-boards.mdx
+++ b/docs/hardware/devices/rak/base-boards.mdx
@ -12,6 +12,7 @@ import TabItem from "@theme/TabItem";

 <Tabs
 groupId="rakbase board"
+queryString="rakbase"
 defaultValue="RAK19007"
 values={[
 {label: 'RAK5005-O', value: 'RAK5005-O'},
--- a/docs/hardware/devices/rak/core-modules.mdx
+++ b/docs/hardware/devices/rak/core-modules.mdx
@ -12,6 +12,7 @@ import TabItem from "@theme/TabItem";

 <Tabs
 groupId="rakcore"
+queryString="rakcore"
 defaultValue="RAK4631"
 values={[
 {label: 'RAK4631', value: 'RAK4631'},
--- a/docs/hardware/devices/rak/peripherals.mdx
+++ b/docs/hardware/devices/rak/peripherals.mdx
@ -10,6 +10,7 @@ import TabItem from "@theme/TabItem";

 <Tabs
 groupId="rakmodules"
+queryString="rakmodules"
 defaultValue="GPS"
 values={[
 {label: 'GPS Module', value: 'GPS'},
@ -63,6 +64,7 @@ Further information on the RAK13002 can be found on the [RAK Documentation Cente
 <TabItem value="Sensors">
 <Tabs
 groupId="sensors"
+queryString="sensors"
 defaultValue="RAK1901"
 values={[
 {label: 'RAK1901', value: 'RAK1901'},
--- a/docs/hardware/devices/rak/screens.mdx
+++ b/docs/hardware/devices/rak/screens.mdx
@ -12,6 +12,7 @@ There are currently two different screens supported by the RAK WisBlock system:

 <Tabs
 groupId="rakscreens"
+queryString="rakscreens"
 defaultValue="OLED"
 values={[
 {label: 'OLED Display', value: 'OLED'},
--- a/docs/hardware/devices/raspberry-pi/index.mdx
+++ b/docs/hardware/devices/raspberry-pi/index.mdx
@ -2,28 +2,26 @@
 id: raspberry-pi
 title: Raspberry Pi Pico
 sidebar_label: Raspberry Pi Pico
-sidebar_position: 8
+sidebar_position: 10
 ---

 import Tabs from "@theme/Tabs";
 import TabItem from "@theme/TabItem";

-
 The Raspberry Pi Pico series is a range of tiny, fast, and versatile boards built using RP2040, the flagship microcontroller chip designed by Raspberry Pi in the UK.

 :::info

-Only the Pico W has WiFi/BLE capabilities. However, Meshtastic does not currently support the Pico W's WiFi/BLE
+Only the Pico W has WiFi/BLE capabilities. Meshtastic supports WiFi on the Pico W, but does not currently support BLE
 :::

-
 ### Pico

-  - **MCU:**
+- **MCU:**
  - Raspberry Pi RP2040
    - Dual M0+ Core
    - 133MHz CPU Clock
-  - **Connectors (On Pico):**
+- **Connectors (On Pico):**
  - Micro-USB on Pico

 :::note
@ -32,19 +30,18 @@ Please be aware that the Raspberry Pi Pico must be used in combination with a [W

 :::

-  - **LoRa Transceiver (On LoRa Module):**
+- **LoRa Transceiver (On LoRa Module):**
  - SX1262
-  - **Frequency Options:**
+- **Frequency Options:**
  - 410 - 525 MHz
  - 863 - 870 MHz
  - 902 - 930 MHz
-  - **Connectors (On LoRa Module):**
+- **Connectors (On LoRa Module):**
  - U.FL/IPEX antenna connector for LoRa
  - 1.25mm 2-Pin JST for battery

 ### Pico Resources

 - Firmware file:`firmware-pico-X.X.X.xxxxxxx.uf2`
+- for Pico W use: `firmware-picow-X.X.X.xxxxxxx.uf2`
 - [Offical Website for the Raspberry Pi Pico](https://www.raspberrypi.com/products/raspberry-pi-pico/), including official reseller links.
-
-
--- a/docs/hardware/devices/station-g1/index.mdx
+++ b/docs/hardware/devices/station-g1/index.mdx
@ -2,7 +2,7 @@
 id: station-g1
 title: Station G1 device
 sidebar_label: Station G1
-sidebar_position: 6
+sidebar_position: 9
 ---

 The Station G1 is the second dedicated hardware device to be designed from scratch purely for Meshtastic Licensed (HAM) Operation by Neil Hao. It has been designed to be small and compact with the inclusion of 35dBm high power PA.
@ -39,9 +39,6 @@ The Station G1 is the second dedicated hardware device to be designed from scrat
 - [Official Store](https://shop.uniteng.com/product/meshtastic-mesh-device-station-edition/)
 - [Official Tindie Store](https://www.tindie.com/products/neilhao/meshtastic-mesh-device-station-edition/)

-
-
-
 Further information on the Station G1 can be found on [Unit Engineering's Wiki](https://uniteng.com/wiki/doku.php?id=meshtastic:station).

 ![Station G1](/img/hardware/station-g1.jpg)
--- a/docs/hardware/devices/tbeam/index.mdx
+++ b/docs/hardware/devices/tbeam/index.mdx
@ -14,6 +14,7 @@ Further information on the LILYGO® T-Beam devices can be found on LILYGO®'s [G

 <Tabs
 groupId="t-beam"
+queryString="t-beam"
 defaultValue="sx1262"
 values={[
 {label: 'T-Beam v0.7', value:'0.7'},
@ -160,8 +161,8 @@ This is an earlier version of the T-Beam board. Due to changes in the design thi
 </TabItem>
 <TabItem value = "s3core">

-  - **MCU**
-  - ESP32-S3 (WiFi & Bluetooth 5LE)
+- **MCU**
+- ESP32-S3 (WiFi & Bluetooth 5LE)
 - **LoRa Transceiver**
  - **Semtech SX1262** (improved performance)
 - **Frequency options**
@ -183,16 +184,16 @@ This is an earlier version of the T-Beam board. Due to changes in the design thi

 ## Resources

-  - Firmware file: `firmware-tbeam-s3-core-X.X.X.xxxxxxx.bin`
-  - Purchase Link: [AliExpress](https://www.aliexpress.com/item/1005005418286231.html)
+- Firmware file: `firmware-tbeam-s3-core-X.X.X.xxxxxxx.bin`
+- Purchase Link: [AliExpress](https://www.aliexpress.com/item/1005005418286231.html)

 ![T-Beam S3-Core](/img/hardware/T-BEAM-S3Core.jpg)

 </TabItem>
 <TabItem value = "supreme">

-  - **MCU**
-  - ESP32-S3 (WiFi & Bluetooth 5LE)
+- **MCU**
+- ESP32-S3 (WiFi & Bluetooth 5LE)
 - **LoRa Transceiver**
  - **Semtech SX1262** (improved performance)
 - **Frequency options**
@ -218,6 +219,25 @@ This is an earlier version of the T-Beam board. Due to changes in the design thi
 - PCF8563 RTC
 - Micro-SD reader (not implemented in Meshtastic)

+## Flashing the T-Beam Supreme
+
+If you are having issues flashing the T-Beam Supreme, especially if it's your first attempt, you may need to manually place the device into Espressif's Firmware Download mode. Please follow the process below to do so.
+
+:::warning
+
+Do not proceed unless an antenna is connected to avoid possible damage to the device's radio.
+
+:::
+
+The following process will manually place the device into the Espressif Firmware Download mode:
+
+1. Unplug the device.
+2. Press and hold the BOOT button.
+3. Plug device in.
+4. After 2-3 seconds, release the BOOT button.
+
+With the device now in the Espressif Firmware Download mode, you can proceed with flashing using one of the supported flashing methods. It's generally recommended to use the [Web Flasher](https://flasher.meshtastic.org/). You can select "Tbeam S3 Core from the device drop-down.
+
 ## Resources

 - Firmware file: `firmware-tbeam-s3-core-X.X.X.xxxxxxx.bin`
@ -226,7 +246,6 @@ This is an earlier version of the T-Beam board. Due to changes in the design thi
  - AliExpress: [Meshtastic T-Beam 868/915MHz](https://www.aliexpress.com/item/1005005418286231.html)
  - US Distributor - Purchase link: Rokland [NEO-M10S](https://store.rokland.com/products/lilygo-t-beam-supreme-esp32-s3-lora-development-board-sx1262-915mhz-gps-l76k-or-u-blox?variant=41051191378003), [Quectel L76K](https://store.rokland.com/products/lilygo-t-beam-supreme-esp32-s3-lora-development-board-sx1262-915mhz-gps-l76k-or-u-blox?variant=41051191345235)

-
 ![T-Beam Supreme](/img/hardware/T-BEAM-S3-Supreme.jpg)

 </TabItem>
--- a/docs/hardware/devices/tdeck/index.mdx
+++ b/docs/hardware/devices/tdeck/index.mdx
@ -0,0 +1,60 @@
+---
+id: tdeck
+title: LILYGO® T-Deck
+sidebar_label: LILYGO® T-Deck
+sidebar_position: 5
+---
+
+The T-Deck is a compact device featuring a 2.8-inch IPS LCD touch screen with a resolution of 320x240 pixels, integrated with a small keyboard, trackball, microphone and speaker running on an ESP32-S3 dual-core processor.
+
+### Specifications
+
+- **MCU**
+  - ESP32-S3FN16R8 (WiFi & Bluetooth 5 LE)
+- **LoRa Transceiver**
+  - Semtech SX1262
+- **Frequency options**
+  - 915 MHz
+  - 868 MHz
+  - 433 MHz
+- **Antenna**
+  - U.FL/IPEX antenna connector for LoRa
+- **Connectors**
+  - USB-C
+
+### Features
+
+- LILYGO® backlit T-Keyboard
+- Trackball
+- 2.8 inch ST7789 SPI Interface IPS LCD (Resolution: 320 x 240)
+- I2S Speaker/Microphone
+
+## Flashing the T-Deck
+
+If you are having issues flashing the T-Deck, especially if it's your first attempt, you may need to manually place the device into Espressif's Firmware Download mode. Please follow the process below to do so.
+
+:::warning
+
+Do not proceed unless an antenna is connected to avoid possible damage to the device's radio.
+
+:::
+
+The following process will manually place the device into the Espressif Firmware Download mode:
+
+1. Ensure the device's power switch is toggled OFF.
+2. Press and hold the TRACKBALL.
+3. Toggle device's power switch ON.
+4. After 2-3 seconds, release the TRACKBALL button.
+5. If the device screen is black and the backlight is off, the device is in the Firmware Download mode. If the backlight is on, repeat these steps.
+
+With the device now in the Espressif Firmware Download mode, you can proceed with flashing using one of the supported flashing methods. It's generally recommended to use the [Web Flasher](https://flasher.meshtastic.org/). You can select "T Deck" from the device drop-down.
+
+### Resources
+
+- Firmware file: `firmware-t-deck-X.X.X.xxxxxxx.bin`
+- Purchase links:
+  - LilyGO Store: [T-Deck 433/868/915Mhz](https://www.lilygo.cc/products/t-deck)
+  - AliExpress: [T-Deck 433/868/915MHz](https://www.aliexpress.us/item/3256805505920840.html)
+  - US Distributor - Purchase link: Rokland [915MHz](https://store.rokland.com/products/lilygo-t-deck-portable-microcontroller-programmer-lora-915-mhz-h642)
+
+![T-Deck](/img/hardware/LILYGO-T-DECK.jpg)
--- a/docs/hardware/devices/twatch/index.mdx
+++ b/docs/hardware/devices/twatch/index.mdx
@ -0,0 +1,65 @@
+---
+id: twatch
+title: LILYGO® T-Watch
+sidebar_label: LILYGO® T-Watch
+sidebar_position: 6
+---
+
+The T-Watch S3 is a compact wearable device featuring a 1.54-inch IPS LCD touch screen with a resolution of 240x240 pixels. It includes haptic feedback, an integrated microphone, speaker, real-time clock, and a three-axis accelerometer.
+
+### Specifications
+
+- **MCU**
+  - ESP32-S3 (WiFi & Bluetooth 5 LE)
+- **LoRa Transceiver**
+  - Semtech SX1262
+- **Frequency options**
+  - 915 MHz
+  - 868 MHz
+  - 433 MHz
+- **Antenna**
+  - U.FL/IPEX antenna connector for LoRa
+- **Connectors**
+  - Micro-USB
+
+### Features
+
+- 1.54 inch ST7789V TFT LCD (Resolution: 240 x 240)
+- DRV2605 Haptic Driver
+- I2S Speaker/Microphone & MAX98357 I2S Amp
+- AXP2101 PMU and 400mAh battery.
+- BMA423 Three Axis accelerometer
+- Real-Time Clock
+
+## Flashing the T-Watch S3
+
+If you are having issues flashing the T-Watch S3, especially if it's your first attempt, you may need to manually place the device into Espressif's Firmware Download mode. Please follow the process below to do so.
+
+:::warning
+
+Do not proceed unless an antenna is connected to avoid possible damage to the device's radio.
+
+:::
+
+The following process will manually place the device into the Espressif Firmware Download mode:
+
+1. Ensure the device is powered off by pressing and holding the crown button.
+2. Remove the device's back cover.
+3. Locate and press and hold the boot button.
+
+![T Watch S3 Boot Button](/img/hardware/T-Watch-S3-BUTTON.jpg)
+
+4. While holding the boot button, press the crown button once to turn the device on.
+5. After 2-3 seconds, release the BOOT button.
+
+With the device now in the Espressif Firmware Download mode, you can proceed with flashing using one of the supported flashing methods. It's generally recommended to use the [Web Flasher](https://flasher.meshtastic.org/). You can select "T Watch S3" from the device drop-down.
+
+### Resources
+
+- Firmware file: `firmware-t-watch-X.X.X.xxxxxxx.bin`
+- Purchase links:
+  - LilyGO Store: [T-Watch 433/868/915Mhz](https://www.lilygo.cc/products/t-watch-s3)
+  - AliExpress: [T-Watch 433/868/915MHz](https://www.aliexpress.us/item/3256805456685117.html)
+  - US Distributor - Purchase link: Rokland [915MHz](https://store.rokland.com/products/lilygo-t-watch-s3-open-source-smartwatch-with-lora-and-esp32)
+
+![T-Watch](/img/hardware/LILYGO-T-Watch-S3.jpg)
--- a/docs/software/android/installation.mdx
+++ b/docs/software/android/installation.mdx
@ -26,7 +26,7 @@ The minimum Android version is 5.0 (Lollipop 2014, first BLE support), however A
 1. Download and Install the F-Droid app from [f-droid.org](https://f-droid.org/)
 2. Open the F-Droid app and navigate to `Settings > Repositories`.
 3. Click on the `+` icon to add a new repo.
-4. Enter the Meshtastic repo address as follows: `https://apt.izzysoft.de/fdroid/repo/` (no fingerprint required)
+4. Enter the Meshtastic repo address as follows: `https://apt.izzysoft.de/fdroid/repo/` as repository address and `3BF0D6ABFEAE2F401707B6D966BE743BF0EEE49C2561B9BA39073711F628937A` as fingerprint
 5. Navigate to the `Categories` page and refresh (scroll down).
 6. Search for and install the `Meshtastic` App.

--- a/package.json
+++ b/package.json
@ -17,11 +17,11 @@
  "dependencies": {
     @crowdin/cli": "^3.2.2",
    "@algolia/client-search": "^4.20.0",
-    "@docusaurus/core": "3.0.0",
-    "@docusaurus/plugin-content-docs": "3.0.0",
-    "@docusaurus/preset-classic": "3.0.0",
-    "@docusaurus/theme-common": "3.0.0",
-    "@docusaurus/theme-mermaid": "3.0.0",
+    "@docusaurus/core": "3.0.1",
+    "@docusaurus/plugin-content-docs": "3.0.1",
+    "@docusaurus/preset-classic": "3.0.1",
+    "@docusaurus/theme-common": "3.0.1",
+    "@docusaurus/theme-mermaid": "3.0.1",
    "@heroicons/react": "^2.0.18",
    "@mdx-js/react": "^3.0.0",
    "@meshtastic/meshtasticjs": "2.2.13-1",
@ -37,7 +37,7 @@
    "tailwindcss": "^3.3.5"
  },
  "devDependencies": {
-    "@docusaurus/module-type-aliases": "3.0.0",
+    "@docusaurus/module-type-aliases": "3.0.1",
    "@tailwindcss/typography": "^0.5.10",
    "@tsconfig/docusaurus": "^2.0.2",
    "@types/node": "^20.9.3",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/static/img/hardware/LILYGO-T-DECK.jpg
+++ b/static/img/hardware/LILYGO-T-DECK.jpg
--- a/static/img/hardware/LILYGO-T-Watch-S3.jpg
+++ b/static/img/hardware/LILYGO-T-Watch-S3.jpg
--- a/static/img/hardware/T-Watch-S3-BUTTON.jpg
+++ b/static/img/hardware/T-Watch-S3-BUTTON.jpg
--- a/vercel.json
+++ b/vercel.json
@ -47,10 +47,14 @@
    {
      "source": "/docs/software/android/android-installation",
      "destination": "/docs/software/android/installation"
+    },
+    {
+      "source": "/docs/hardware/devices/Nano%20Series/",
+      "destination": "/docs/hardware/devices/nano/"
+    },
+    {
+      "source": "/docs/hardware/supported-hardware",
+      "destination": "/docs/hardware/devices"
    }
  ]
 }
-
-
-
-