Merge branch 'meshtastic:master' into SF2_4

docs/community/local-groups.mdx

@@ -98,6 +98,9 @@ us on [Discord](https://discord.com/invite/ktMAKGBnBs) to add your group.
 ## United States
 - [Midwest Mesh](https://discord.gg/wYwD56K439)
 
+### Arizona
+- [Tucson Meshtastic Community](https://discord.gg/7MzbMMd2kg)
+
 ### Arkansas
 - [Fort Smith Mesh](https://discord.com/invite/nwsvcXeqMX)
 

docs/configuration/radio/position.mdx

@@ -140,7 +140,7 @@ All Position config commands are available in the python CLI. Example commands a
 |  position.position_broadcast_smart_enabled   |                                                              `true`, `false`                                                              |            `true`            |
 |  position.broadcast_smart_minimum_distance   |                                                             `integer` (meters)                                                            | Default of `0` is 100 Meters |
 |position.broadcast_smart_minimum_interval_secs|                                                            `integer` (seconds)                                                            | Default of `0` is 15 Minutes |
-|       position.position_broadcast_secs       |                                                            `integer` (seconds)                                                            | Default of `0` is 30 Seconds |
+|       position.position_broadcast_secs       |                                                            `integer` (seconds)                                                            | Default of `0` is 15 minutes |
 |                position.flags                | `UNSET`, `ALTITUDE`, `ALTITUDE_MSL`, `GEOIDAL_SEPARATION`, `DOP`, `HVDOP`, `PDOP`, `SATINVIEW`, `SEQ_NO`, `TIMESTAMP`, `HEADING`, `SPEED` |           `UNSET`            |
 |               position.rx_gpio               |                                                             `integer` (0-39)                                                              |           `UNSET`            |
 |               position.tx_gpio               |                                                             `integer` (0-34)                                                              |           `UNSET`            |

docs/getting-started/flashing-firmware/nrf52/swdio.mdx

@@ -7,7 +7,7 @@ description: Instructions for uploading firmware through SWDIO by using a Raspbe
 ---
 
 Most Meshtastic devices can be flashed simply using USB.
-However, some (eg Seeed WM1110) require the use of an external device that can connect via "SWDIO".
+However, some (eg Seeed WM1110 Dev Kit) require the use of an external device that can connect via "SWDIO".
 There are dedicated devices such as the [RAKDAP1](https://store.rakwireless.com/products/daplink-tool)
 that can do this work. However, for many people a Raspberry Pi is more convenient.
 
@@ -76,6 +76,7 @@ If you see “Error connecting DP: cannot read IDR”, then you've probably conn
  
 ## Obtaining Firmware
 Check the instructions for your [hardware](/docs/hardware/devices) to find the correct firmware for your device.
+For most devices following this guide, a .hex file is required.
 Then, copy the firmware file to your Raspberry Pi.
  
 
@@ -93,7 +94,7 @@ Open On-Chip Debugger
 > reset init
 > halt
 > nrf5 mass_erase
-> program new2.uf2 verify
+> program firmware.hex verify
 > reset
 > exit 0
 ```
@@ -102,4 +103,3 @@ Unplug the power and plug it back in after flashing.
 
 ## Connecting
 Congratulations, you should now be able to connect to your device through Bluetooth in the Meshtastic app.
-

docs/hardware/devices/index.mdx

@@ -131,13 +131,14 @@ Portable and durable devices designed for Meshtastic.
 | [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/)
+### [Station Series](./station-series/)
 
 High power LoRa transceiver designed for Meshtastic Licensed HAM operation.
 
-| Name                        | MCU         | Radio  |     WiFi     | BT  | GPS |
+| Name                            | MCU              | Radio  |     WiFi     | BT  |   GPS    |
-| :-------------------------- | :---------- | :----- | :----------: | :-: | :-: |
+| :------------------------------ | :--------------- | :----- | :----------: | :-: | :------: |
-| [Station G1](./station-g1/) | ESP32 WROOM | SX1262 | 2.4GHz b/g/n | 4.2 | YES |
+| [Station G1](./station-series/) | ESP32 WROOM      | SX1262 | 2.4GHz b/g/n | 4.2 | OPTIONAL |
+| [Station G2](./station-series/) | ESP32-S3 WROOM-1 | SX1262 | 2.4GHz b/g/n | 5.0 | OPTIONAL |
 
 ### [Raspberry Pi Pico](./raspberry-pi/)
 
@@ -164,8 +165,8 @@ Complete solution with battery, screen, case, and antenna. Ships pre-flashed wit
 
 All-in-one development device with LoRa, WiFi, BT, touchscreen, accelerometer, gyroscop, vibration motor, LiPo battery and more!
 
-| Name                  | MCU              | Radio  | WiFi | BT  | GPS |
+| Name                 | MCU              | Radio  | WiFi | BT  | GPS |
-| :-------------------- | :--------------- | :----- | :--: | :-: | :-: |
+| :------------------- | :--------------- | :----- | :--: | :-: | :-: |
 | [unPhone](./unPhone) | ESP32-S3-WROOM-1 | RF950W | YES  | 5.0 | NO  |
 
 ### [Seeed Wio-WM1110](./seeed-wm1110)

docs/hardware/devices/seeed-wm1110/index.mdx

@@ -12,20 +12,21 @@ import TabItem from "@theme/TabItem";
 <Tabs
 groupId="wm1110"
 queryString="wm1110"
-defaultValue="wio-sdk-wm1110"
+defaultValue="wio-tracker-wm1110"
 values={[
 {label: 'WM110 Dev Kit', value:'wio-sdk-wm1110'},
-{label: 'WM110 Tracker', value: 'wio-tracker-wm1110'},
+{label: 'Wio Tracker 1110', value: 'wio-tracker-wm1110'},
 ]}>
 
 <TabItem value="wio-sdk-wm1110">
 
 ## Seeed Wio-WM1110 Dev Kit
 
-:::caution Firmware Version Notice
+:::note External GPS Required
-Basic support for this device has only just been added, and not all features work
+The LR1110 GNSS functionality does not yet work. Seeed recommends at Grove - GPS (Air530).
 :::
 
+
 - **MCU**
   - Nordic nRF52840 (WiFi & Bluetooth)
 - **LoRa Transceiver**
@@ -63,15 +64,13 @@ Basic support for this device has only just been added, and not all features wor
   - International
     - [Seeed Studio](https://www.seeedstudio.com/Wio-WM1110-Dev-Kit-p-5677.html)
 
+![wio-wm1110-dev-kit](/img/hardware/seeed/wio-wm1110-dev-kit-font.webp)
+
 </TabItem>
 
 <TabItem value="wio-tracker-wm1110">
 
-## Seeed Wio Tracker 1110
+## Wio Tracker 1110 Dev Kit for Meshtastic
-
-:::caution Firmware Version Notice
-Basic support for this device has only just been added, and not all features work
-:::
 
 - **MCU**
   - Nordic nRF52840 (WiFi & Bluetooth)
@@ -102,7 +101,9 @@ Basic support for this device has only just been added, and not all features wor
 - Firmware file: `firmware-wio-tracker-wm1110-X.X.X.xxxxxxx.bin`
 - Purchase Links:
   - International
-    - [Seeed Studio](https://www.seeedstudio.com/Wio-Tracker-1110-Dev-Board-p-5799.html)
+    - [Seeed Studio](https://www.seeedstudio.com/Wio-Tracker-1110-Dev-Kit-for-Meshtastic.html)
+
+![wio-tracker-1110-dev-kit](/img/hardware/seeed/wio-tracker-1110-dev-kit.webp)
 
 </TabItem>
 </Tabs>

docs/hardware/devices/station-g1/buttons.mdx

@@ -1,12 +0,0 @@
----
-id: buttons
-title: Station G1 Hardware Buttons
-sidebar_label: Buttons
-sidebar_position: 1
----
-
-## Functionality
-
-- **User/Program Button:**
-  - **Single press:** Changes the information page displayed on the device's screen.
-  - **Double press:** Sends an adhoc ping of the device's position to the network.

docs/hardware/devices/station-g1/index.mdx

@@ -1,45 +0,0 @@
----
-id: station-g1
-title: Station G1 device
-sidebar_label: Station G1
-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.
-
-## Specifications
-
-- **MCU**
-  - ESP32 WROOM (WiFi & Bluetooth)
-    - Bluetooth 4.2
-- **LoRa Transceiver**
-  - Semtech SX1262
-  - Additional 35dBm LoRa Power Amplifier to boost transmit power
-- **Frequency options**
-  - US-915 MHz
-  - EU-868 MHz
-- **Navigation Module**
-  - ATGM336H-5N-71 (Supports GPS, BDS and GLONASS)
-- **Antenna**
-  - SMA Socket
-- **Connectors**
-  - USB-C
-
-## Features
-
-- Meshtastic pre-installed
-- User button
-- 1.3 inch OLED screen
-- Optional GPS Module and IO Extension Socket
-- Optional [12V Battery Docker](https://shop.uniteng.com/product/12v-battery-docker-for-station-edition-g1/) which can be used as Backup Power, or in scenarios that require mobility
-
-## Resources
-
-- Firmware file: `firmware-station-g1-X.X.X.xxxxxxx.bin`
-- [Unit Engineering's Official Wiki](https://uniteng.com/wiki/doku.php?id=meshtastic:station)
-- Purchase Links:
-  - International
-    - [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/)
-
-![Station G1](/img/hardware/station-g1.webp)

docs/hardware/devices/station-series/buttons.mdx

@@ -0,0 +1,47 @@
+---
+id: buttons
+title: Station Series Hardware Buttons
+sidebar_label: Buttons
+sidebar_position: 1
+---
+
+import Tabs from "@theme/Tabs";
+import TabItem from "@theme/TabItem";
+
+<Tabs
+groupId="station-buttons"
+queryString="station-buttons"
+defaultValue="g2"
+values={[
+{label: 'Station G1', value:'g1'},
+{label: 'Station G2', value: 'g2'}
+]}>
+
+<TabItem value="g1">
+
+## Functionality
+
+- **User/Program Button:**
+  - **Single press:** Changes the information page displayed on the device's screen.
+  - **Double press:** Sends an adhoc ping of the device's position to the network.
+
+</TabItem>
+
+<TabItem value="g2">
+
+## Functionality
+
+- **User/Program Button:**
+  - **Single press:** Changes the information page displayed on the device's screen.
+  - **Double press:** Sends an adhoc ping of the device's position to the network.
+  - **Long press:** Will signal the device to shutdown after 5 seconds.
+- **Firmware Download Button:** Places device into Firmware Download Mode.
+  1. Press and hold Firmware Download Button.
+  2. Then single press Reset Button.
+  3. Finally release the Firmware Download Button.
+- **Reset Button:**
+  - **Single press:** Resets the device.
+
+</TabItem>
+
+</Tabs>

docs/hardware/devices/station-series/index.mdx

@@ -0,0 +1,117 @@
+---
+id: station-series
+title: Station Series
+sidebar_label: Station Series
+sidebar_position: 9
+---
+
+import Tabs from "@theme/Tabs";
+import TabItem from "@theme/TabItem";
+
+The Station series of devices, designed by Neil Hao from B&Q Consulting and powered by Meshtastic, are compact and durable LoRa devices designed for high-performance radio frequency communication. They feature a powerful PA for LoRa communication, a rugged SMA antenna socket, and a variety of external IO interfaces.
+
+For more comprehensive information on the Station Series of devices, be sure to visit the B&Q Consulting Station Series [Wiki page.](https://wiki.uniteng.com/en/meshtastic/station-g2)
+
+<Tabs
+groupId="station-series"
+queryString="station-series"
+defaultValue="g2"
+values={[
+{label: 'Station G1', value:'g1'},
+{label: 'Station G2', value: 'g2'}
+]}>
+
+<TabItem value="g1">
+
+:::info
+
+The Station G1 has been discontinued and replaced by the upgraded Station G2. The Station G1 remains a supported device.
+
+:::
+
+## Specifications
+
+- **MCU**
+  - ESP32 WROOM
+    - WiFi
+    - Bluetooth 4.2
+- **LoRa Transceiver**
+  - Semtech SX1262
+  - Additional 35dBm LoRa Power Amplifier
+- **Frequency options**
+  - US-915 MHz
+  - EU-868 MHz
+- **Navigation Module**
+  - Optional
+- **Antenna**
+  - SMA Socket
+- **Connectors**
+  - USB-C (PD Protocol)
+
+## Features
+
+- Meshtastic pre-installed
+- User button
+- 1.3 inch OLED screen
+- Optional GPS Module and IO Extension Socket
+- Optional [12V Battery Docker](https://shop.uniteng.com/product/12v-battery-docker-for-station-edition-g1/) which can be used as Backup Power, or in scenarios that require mobility
+
+## Resources
+
+- Firmware file: `firmware-station-g1-X.X.X.xxxxxxx.bin`
+- [Unit Engineering's Official Wiki](https://uniteng.com/wiki/doku.php?id=meshtastic:station)
+- Purchase Links:
+  - International
+    - [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/)
+
+![Station G1](/img/hardware/station-series/station-g1.webp)
+
+</TabItem>
+
+<TabItem value="g2">
+
+## Specifications
+
+- **MCU**
+  - ESP32-S3 WROOM-1
+    - WiFi
+    - Bluetooth 5.0
+- **LoRa Transceiver**
+  - Semtech SX1262
+  - Additional 35dBm LoRa Power Amplifier
+  - Dedicated Ultra-Low Noise Figure LNA
+- **Frequency options**
+  - 864 - 928 MHz
+- **Navigation Module**
+  - Optional (1x GROVE GPS Socket)
+- **Antenna**
+  - SMA Socket
+- **Connectors**
+  - USB-C (PD Protocol)
+
+## Features
+
+- Meshtastic pre-installed
+- User button
+- 1.3 inch OLED screen
+- 1x5P Pitch=1.5mm Socket (9V-19V External Power Supply)
+- GROVE I2C Socket( 1x4P Pitch=2mm )
+- SparkFun QWIIC I2C Socket ( 1x4P Pitch=1mm )
+- GROVE GPS Socket ( 1x4P Pitch=2mm )
+- IO Extension Socket ( 1x10P Pitch=1.5mm )
+
+## Resources
+
+- Firmware file: `firmware-station-g2-X.X.X.xxxxxxx.bin`
+- [Unit Engineering's Official Wiki](https://uniteng.com/wiki/doku.php?id=meshtastic:station)
+- Purchase Links:
+  - International
+    - [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/)
+
+![Station G2 Front](/img/hardware/station-series/station-g2-front.webp)
+![Station G2 Back](/img/hardware/station-series/station-g2-back.webp)
+
+</TabItem>
+</Tabs>

vercel.json

@@ -45,6 +45,10 @@
       "source": "/docs/hardware/supported-hardware/",
       "destination": "/docs/hardware/devices/"
     },
+    {
+      "source": "/docs/hardware/devices/station-g1/",
+      "destination": "/docs/hardware/devices/station-series/"
+    },
     {
       "source": "/docs/legal/trademark/",
       "destination": "/docs/legal/licensing-and-trademark/"