platformio.ini: Adjust defaults for LoRa frequncies and advert interval limits

.devcontainer/devcontainer.json

@@ -10,12 +10,11 @@
 	},
 	"runArgs": [
 		"--privileged",
-		"--network=host",
-		"--volume=/dev/bus/usb:/dev/bus/usb:ro",
 		// arch tty* is owned by uucp (986)
-		// debian tty* is owned by dialout (20)
-		"--group-add=20",
-		"--group-add=986"
+		// debian tty* is owned by uucp (20) - no change needed
+		"--group-add=986",
+		"--network=host",
+		"--volume=/dev/bus/usb:/dev/bus/usb:ro"
 	],
 	"postCreateCommand": {
 		"platformio": "pipx install platformio"

boards/meshtiny.json

@@ -1,74 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "nrf52840_s140_v6.ld"
-    },
-    "core": "nRF5",
-    "cpu": "cortex-m4",
-    "extra_flags": "-DARDUINO_NRF52840_FEATHER -DNRF52840_XXAA",
-    "f_cpu": "64000000L",
-    "hwids": [
-      [
-        "0x239A",
-        "0x8029"
-      ],
-      [
-        "0x239A",
-        "0x0029"
-      ],
-      [
-        "0x239A",
-        "0x002A"
-      ],
-      [
-        "0x239A",
-        "0x802A"
-      ]
-    ],
-    "usb_product": "Meshtiny",
-    "mcu": "nrf52840",
-    "variant": "meshtiny",
-    "bsp": {
-      "name": "adafruit"
-    },
-    "softdevice": {
-      "sd_flags": "-DS140",
-      "sd_name": "s140",
-      "sd_version": "6.1.1",
-      "sd_fwid": "0x00B6"
-    },
-    "bootloader": {
-      "settings_addr": "0xFF000"
-    }
-  },
-  "connectivity": [
-    "bluetooth"
-  ],
-  "debug": {
-    "jlink_device": "nRF52840_xxAA",
-    "svd_path": "nrf52840.svd",
-    "openocd_target": "nrf52840-mdk-rs"
-  },
-  "frameworks": [
-    "arduino",
-    "freertos"
-  ],
-  "name": "Meshtiny",
-  "upload": {
-    "maximum_ram_size": 248832,
-    "maximum_size": 815104,
-    "speed": 115200,
-    "protocol": "nrfutil",
-    "protocols": [
-      "jlink",
-      "nrfjprog",
-      "nrfutil",
-      "stlink"
-    ],
-    "use_1200bps_touch": true,
-    "require_upload_port": true,
-    "wait_for_upload_port": true
-  },
-  "url": "https://shop.mtoolstec.com/product/meshtiny",
-  "vendor": "MTools Tec"
-}

boards/t_beam_1w.json

@@ -1,50 +0,0 @@
-{
-    "build": {
-        "arduino": {
-            "ldscript": "esp32s3_out.ld",
-            "memory_type": "qio_opi"
-        },
-        "core": "esp32",
-        "extra_flags": [
-            "-DBOARD_HAS_PSRAM",
-            "-DLILYGO_TBEAM_1W",
-            "-DARDUINO_USB_CDC_ON_BOOT=1",
-            "-DARDUINO_USB_MODE=0",
-            "-DARDUINO_RUNNING_CORE=1",
-            "-DARDUINO_EVENT_RUNNING_CORE=1"
-        ],
-        "f_cpu": "240000000L",
-        "f_flash": "80000000L",
-        "flash_mode": "qio",
-        "psram_type": "opi",
-        "hwids": [
-            [
-                "0x303A",
-                "0x1001"
-            ]
-        ],
-        "mcu": "esp32s3",
-        "variant": "lilygo_tbeam_1w"
-    },
-    "connectivity": [
-        "wifi",
-        "bluetooth",
-        "lora"
-    ],
-    "debug": {
-        "openocd_target": "esp32s3.cfg"
-    },
-    "frameworks": [
-        "arduino"
-    ],
-    "name": "LilyGo TBeam-1W",
-    "upload": {
-        "flash_size": "16MB",
-        "maximum_ram_size": 327680,
-        "maximum_size": 16777216,
-        "require_upload_port": true,
-        "speed": 921600
-    },
-    "url": "http://www.lilygo.cn/",
-    "vendor": "LilyGo"
-}

docs/cli_commands.md

@@ -1,881 +0,0 @@
-# MeshCore Repeater & Room Server CLI Commands
-
-## Navigation
-
-- [Operational](#operational)
-- [Neighbors](#neighbors-repeater-only)
-- [Statistics](#statistics)
-- [Logging](#logging)
-- [Information](#info)
-- [Configuration](#configuration)
-  - [Radio](#radio)
-  - [System](#system)
-  - [Routing](#routing)
-  - [ACL](#acl)
-  - [Region Management](#region-management-v110)
-    - [Region Examples](#region-examples)
-  - [GPS](#gps-when-gps-support-is-compiled-in)
-  - [Sensors](#sensors-when-sensor-support-is-compiled-in)
-  - [Bridge](#bridge-when-bridge-support-is-compiled-in)
-
----
-
-## Operational
-
-### Reboot the node
-**Usage:** 
-- `reboot`
-
----
-
-### Reset the clock and reboot
-**Usage:**
-- `clkreboot`
-
----
-
-### Sync the clock with the remote device
-**Usage:** 
-- `clock sync`
-
----
-
-### Display current time in UTC
-**Usage:**
-- `clock`
-
----
-
-### Set the time to a specific timestamp
-**Usage:** 
-- `time <epoch_seconds>`
-
-**Parameters:**
-- `epoc_seconds`: Unix epoc time
-
----
-
-### Send a flood advert
-**Usage:** 
-- `advert`
-
----
-
-### Start an Over-The-Air (OTA) firmware update
-**Usage:**
-- `start ota`
-
----
-
-### Erase/Factory Reset
-**Usage:**
-- `erase`
-
-**Serial Only:** Yes
-
-**Warning:** _**This is destructive!**_
-
----
-
-## Neighbors (Repeater Only)
-
-### List nearby neighbors
-**Usage:** 
-- `neighbors`
-
-**Note:** The output of this command is limited to the 8 most recent adverts.
-
-**Note:** Each line is encoded as `{pubkey-prefix}:{timestamp}:{snr*4}`
-
----
-
-### Remove a neighbor
-**Usage:** 
-- `neighbor.remove <pubkey_prefix>`
-
-**Parameters:** 
-- `pubkey_prefix`: The public key of the node to remove from the neighbors list
-
----
-
-## Statistics
-
-### Clear Stats
-**Usage:** `clear stats`
-
----
-
-### System Stats - Battery, Uptime, Queue Length and Debug Flags
-**Usage:** 
-- `stats-core`
-
-**Serial Only:** Yes
-
----
-
-### Radio Stats - Noise floor, Last RSSI/SNR, Airtime, Receive errors
-**Usage:** `stats-radio`
-
-**Serial Only:** Yes
-
----
-
-### Packet stats - Packet counters: Received, Sent
-**Usage:** `stats-packets`
-
-**Serial Only:** Yes
-
----
-
-## Logging
-
-### Begin capture of rx log to node storage
-**Usage:** `log start`
-
----
-
-### End capture of rx log to node sotrage
-**Usage:** `log stop`
-
----
-
-### Erase captured log
-**Usage:** `log erase`
-
----
-
-### Print the captured log to the serial terminal
-**Usage:** `log`
-
-**Serial Only:** Yes
-
----
-
-## Info
-
-### Get the Version
-**Usage:** `ver`
-
----
-
-### Show the hardware name
-**Usage:** `board`
-
----
-
-## Configuration
-
-### Radio
-
-#### View or change this node's radio parameters
-**Usage:**
-- `get radio`
-- `set radio <freq>,<bw>,<sf>,<cr>`
-
-**Parameters:**
-- `freq`: Frequency in MHz
-- `bw`: Bandwidth in kHz
-- `sf`: Spreading factor (5-12)
-- `cr`: Coding rate (5-8)
-
-**Set by build flag:** `LORA_FREQ`, `LORA_BW`, `LORA_SF`, `LORA_CR`
-
-**Default:** `869.525,250,11,5`
-
-**Note:** Requires reboot to apply
-
----
-
-#### View or change this node's transmit power
-**Usage:**
-- `get tx`
-- `set tx <dbm>`
-
-**Parameters:**
-- `dbm`: Power level in dBm (1-22)
-
-**Set by build flag:** `LORA_TX_POWER`
-
-**Default:** Varies by board
-
-**Notes:** This setting only controls the power level of the LoRa chip. Some nodes have an additional power amplifier stage which increases the total output. Referr to the node's manual for the correct setting to use. **Setting a value too high may violate the laws in your country.**
-
----
-
-#### Change the radio parameters for a set duration
-**Usage:** 
-- `tempradio <freq>,<bw>,<sf>,<cr>,<timeout_mins>`
-
-**Parameters:**
-- `freq`: Frequency in MHz (300-2500)
-- `bw`: Bandwidth in kHz (7.8-500)
-- `sf`: Spreading factor (5-12)
-- `cr`: Coding rate (5-8)
-- `timeout_mins`: Duration in minutes (must be > 0)
-
-**Note:** This is not saved to preferences and will clear on reboot
-
----
-
-#### View or change this node's frequency
-**Usage:**
-- `get freq`
-- `set freq <frequency>`
-
-**Parameters:**
-- `frequency`: Frequency in MHz
-
-**Default:** `869.525`
-
-**Note:** Requires reboot to apply
-
-### System
-
-#### View or change this node's name
-**Usage:**
-- `get name`
-- `set name <name>`
-
-**Parameters:**
-- `name`: Node name
-
-**Set by build flag:** `ADVERT_NAME`
-
-**Default:** Varies by board
-
-**Note:** Max length varies. If a location is set, the max length is 24 bytes; 32 otherwise. Emoji and unicode characters may take more than one byte.
-
----
-
-#### View or change this node's latitude
-**Usage:**
-- `get lat`
-- `set lat <degrees>`
-
-**Set by build flag:** `ADVERT_LAT`
-
-**Default:** `0`
-
-**Parameters:**
-- `degrees`: Latitude in degrees
-
----
-
-#### View or change this node's longitude
-**Usage:**
-- `get lon`
-- `set lon <degrees>`
-
-**Set by build flag:** `ADVERT_LON`
-
-**Default:** `0`
-
-**Parameters:**
-- `degrees`: Longitude in degrees
-
----
-
-#### View or change this node's identity (Private Key)
-**Usage:**
-- `get prv.key`
-- `set prv.key <private_key>`
-
-**Parameters:**
-- `private_key`: Private key in hex format (64 hex characters)
-
-**Serial Only:**
-- `get prv.key`: Yes
-- `set prv.key`: No
-
-**Note:** Requires reboot to take effect after setting
-
----
-
-#### View or change this node's admin password
-**Usage:**
-- `get password`
-- `set password <password>`
-
-**Parameters:**
-- `password`: Admin password
-
-**Set by build flag:** `ADMIN_PASSWORD`
-
-**Default:** `password`
-
-**Note:** Echoed back for confirmation
-
-**Note:** Any node using this password will be added to the admin ACL list.
-
----
-
-#### View or change this node's guest password
-**Usage:**
-- `get guest.password`
-- `set guest.password <password>`
-
-**Parameters:**
-- `password`: Guest password
-
-**Set by build flag:** `ROOM_PASSWORD` (Room Server only)
-
-**Default:** `<blank>`
-
----
-
-#### View or change this node's owner info
-**Usage:**
-- `get owner.info`
-- `set owner.info <text>`
-
-**Parameters:**
-- `text`: Owner information text
-
-**Default:** `<blank>`
-
-**Note:** `|` characters are translated to newlines
-
-**Note:** Requires firmware 1.12.+
-
----
-
-#### Fine-tune the battery reading
-**Usage:**
-- `get adc.multiplier`
-- `set adc.multiplier <value>`
-
-**Parameters:**
-- `value`: ADC multiplier (0.0-10.0)
-
-**Default:** `0.0` (value defined by board)
-
-**Note:** Returns "Error: unsupported by this board" if hardware doesn't support it
-
----
-
-#### View or change this node's power saving flag (Repeater Only)
-**Usage:**
-- `powersaving <state>`
-- `powersaving`
-
-**Parameters:** 
-- `state`: `on`|`off` 
-
-**Default:** `on`
-
-**Note:** When enabled, device enters sleep mode between radio transmissions
-
----
-
-### Routing
-
-#### View or change this node's repeat flag
-**Usage:**
-- `get repeat`
-- `set repeat <state>`
-
-**Parameters:**
-  - `state`: `on`|`off`
-
-**Default:** `on`
-
----
-
-#### View or change the retransmit delay factor for flood traffic
-**Usage:**
-- `get txdelay`
-- `set txdelay <value>`
-
-**Parameters:**
-- `value`: Transmit delay factor (0-2)
-
-**Default:** `0.5`
-
----
-
-#### View or change the retransmit delay factor for direct traffic
-**Usage:**
-- `get direct.txdelay`
-- `set direct.txdelay <value>`
-
-**Parameters:**
-- `value`: Direct transmit delay factor (0-2)
-
-**Default:** `0.2`
-
----
-
-#### [Experimental] View or change the processing delay for received traffic
-**Usage:**
-- `get rxdelay`
-- `set rxdelay <value>`
-
-**Parameters:**
-- `value`: Receive delay base (0-20)
-
-**Default:** `0.0`
-
----
-
-#### View or change the airtime factor (duty cycle limit)
-**Usage:**
-- `get af`
-- `set af <value>`
-
-**Parameters:**
-- `value`: Airtime factor (0-9)
-
-**Default:** `1.0`
-
----
-
-#### View or change the local interference threshold
-**Usage:**
-- `get int.thresh`
-- `set int.thresh <value>`
-
-**Parameters:**
-- `value`: Interference threshold value
-
-**Default:** `0.0`
-
----
-
-#### View or change the AGC Reset Interval
-**Usage:**
-- `get agc.reset.interval`
-- `set agc.reset.interval <value>`
-
-**Parameters:**
-- `value`: Interval in seconds rounded down to a multiple of 4 (17 becomes 16)
-
-**Default:** `0.0`
-
----
-
-#### Enable or disable Multi-Acks support
-**Usage:**
-- `get multi.acks`
-- `set multi.acks <state>`
-
-**Parameters:**
-- `state`: `0` (disable) or `1` (enable)
-
-**Default:** `0`
-
----
-
-#### View or change the flood advert interval
-**Usage:**
-- `get flood.advert.interval`
-- `set flood.advert.interval <hours>`
-
-**Parameters:**
-- `hours`: Interval in hours (3-168)
-
-**Default:** `12` (Repeater) - `0` (Sensor)
-
----
-
-#### View or change the zero-hop advert interval
-**Usage:**
-- `get advert.interval`
-- `set advert.interval <minutes>`
-
-**Parameters:**
-- `minutes`: Interval in minutes rounded down to the nearest multiple of 2 (61 becomes 60) (60-240)
-
-**Default:** `0`
-
----
-
-#### Limit the number of hops for a flood message
-**Usage:**
-- `get flood.max`
-- `set flood.max <value>`
-
-**Parameters:**
-- `value`: Maximum flood hop count (0-64)
-
-**Default:** `64`
-
----
-
-### ACL
-
-#### Add, update or remove permissions for a companion
-**Usage:** 
-- `setperm <pubkey> <permissions>`
-
-**Parameters:**
-- `pubkey`: Companion public key
-- `permissions`: 
-  - `0`: Guest
-  - `1`: Read-only
-  - `2`: Read-write
-  - `3`: Admin
-
-**Note:** Removes the entry when `permissions` is omitted
-
----
-
-#### View the current ACL
-**Usage:** 
-- `get acl`
-
-**Serial Only:** Yes
-
----
-
-#### View or change this room server's 'read-only' flag
-**Usage:**
-- `get allow.read.only`
-- `set allow.read.only <state>`
-
-**Parameters:**
-- `state`: `on` (enable) or `off` (disable)
-
-**Default:** `off`
-
----
-
-### Region Management (v1.10.+)
-
-#### Bulk-load region lists
-**Usage:** 
-- `region load`
-- `region load <name> [flood_flag]`
-
-**Parameters:**
-- `name`: A name of a region. `*` represents the wildcard region
-
-**Note:** `flood_flag`: Optional `F` to allow flooding
-
-**Note:** Indentation creates parent-child relationships (max 8 levels)
-
-**Note:** `region load` with an empty name will not work remotely (it's interactive)
-
----
-
-#### Save any changes to regions made since reboot
-**Usage:** 
-- `region save`
-
----
-
-#### Allow a region
-**Usage:** 
-- `region allowf <name>`
-
-**Parameters:** 
-- `name`: Region name (or `*` for wildcard)
-
-**Note:** Setting on wildcard `*` allows packets without region transport codes
-
----
-
-#### Block a region
-**Usage:** 
-- `region denyf <name>`
-
-**Parameters:** 
-- `name`: Region name (or `*` for wildcard)
-
-**Note:** Setting on wildcard `*` drops packets without region transport codes
-
----
-
-#### Show information for a region
-**Usage:** 
-- `region get <name>`
-
-**Parameters:**
-- `name`: Region name (or `*` for wildcard)
-
----
-
-#### View or change the home region for this node
-**Usage:** 
-- `region home`
-- `region home <name>`
-
-**Parameters:**
-- `name`: Region name
-
----
-
-#### Create a new region
-**Usage:** 
-- `region put <name> [parent_name]`
-
-**Parameters:**
-- `name`: Region name
-- `parent_name`: Parent region name (optional, defaults to wildcard)
-
----
-
-#### Remove a region
-**Usage:** 
-- `region remove <name>`
-
-**Parameters:**
-- `name`: Region name
-
-**Note:** Must remove all child regions before the region can be removed 
-
----
-
-#### View all regions
-**Usage:** 
-- `region list <filter>`
-
-**Serial Only:** Yes
-
-**Parameters:**
-- `filter`: `allowed`|`denied`
-
-**Note:** Requires firmware 1.12.+
-
----
-
-#### Dump all defined regions and flood permissions
-**Usage:** 
-- `region`
-
-**Serial Only:** Yes
-
----
-
-### Region Examples
-
-**Example 1: Using F Flag with Named Public Region**
-```
-region load
-#Europe F
-<blank line to end region load>
-region save
-```
-
-**Explanation:**
-- Creates a region named `#Europe` with flooding enabled
-- Packets from this region will be flooded to other nodes
-
----
-
-**Example 2: Using Wildcard with F Flag**
-```
-region load 
-* F
-<blank line to end region load>
-region save
-```
-
-**Explanation:**
-- Creates a wildcard region `*` with flooding enabled
-- Enables flooding for all regions automatically
-- Applies only to packets without transport codes
-
----
-
-**Example 3: Using Wildcard Without F Flag**
-```
-region load 
-*
-<blank line to end region load>
-region save
-```
-**Explanation:**
-- Creates a wildcard region `*` without flooding
-- This region exists but doesn't affect packet distribution
-- Used as a default/empty region
-
----
-
-**Example 4: Nested Public Region with F Flag**
-```
-region load 
-#Europe F
-  #UK
-    #London
-    #Manchester
-  #France
-    #Paris
-    #Lyon
-<blank line to end region load>
-region save
-```
-
-**Explanation:**
-- Creates `#Europe` region with flooding enabled
-- Adds nested child regions (`#UK`, `#France`)
-- All nested regions inherit the flooding flag from parent
-
----
-
-**Example 5: Wildcard with Nested Public Regions**
-```
-region load 
-* F
-  #NorthAmerica
-    #USA
-      #NewYork
-      #California
-    #Canada
-      #Ontario
-      #Quebec
-<blank line to end region load>
-region save
-```
-
-**Explanation:**
-- Creates wildcard region `*` with flooding enabled
-- Adds nested `#NorthAmerica` hierarchy
-- Enables flooding for all child regions automatically
-- Useful for global networks with specific regional rules
-
----
-### GPS (When GPS support is compiled in)
-
-#### View or change GPS state
-**Usage:**
-- `gps`
-- `gps <state>`
-
-**Parameters:**
-- `state`: `on`|`off`
-
-**Default:** `off`
-
-**Note:** Output format: `{status}, {fix}, {sat count}` (when enabled)
-
----
-
-#### Sync this node's clock with GPS time
-**Usage:** 
-- `gps sync`
-
----
-
-#### Set this node's location based on the GPS coordinates
-**Usage:** 
-- `gps setloc`
-
----
-
-#### View or change the GPS advert policy
-**Usage:**
-- `gps advert`
-- `gps advert <policy>`
-
-**Parameters:** 
-- `policy`: `none`|`shared`|`prefs` 
-  - `none`: don't include location in adverts
-  - `share`: share gps location (from SensorManager)
-  - `prefs`: location stored in node's lat and lon settings
-
-**Default:** `prefs`
-
----
-
-### Sensors (When sensor support is compiled in)
-
-#### View the list of sensors on this node
-**Usage:** `sensor list [start]`
-
-**Parameters:**
-- `start`: Optional starting index (defaults to 0)
-
-**Note:** Output format: `<var_name>=<value>\n`
-
----
-
-#### View or change thevalue of a sensor
-**Usage:** 
-- `sensor get <key>`
-- `sensor set <key> <value>`
-
-**Parameters:**
-- `key`: Sensor setting name
-- `value`: The value to set the sensor to
-
----
-
-### Bridge (When bridge support is compiled in)
-
-#### View or change the bridge enabled flag
-**Usage:**
-- `get bridge.enabled`
-- `set bridge.enabled <state>`
-
-**Parameters:**
-- `state`: `on`|`off`
-
-**Default:** `off`
-
----
-
-#### View the bridge source
-**Usage:**
-- `get bridge.source`
-
----
-
-#### Add a delay to packets routed through this bridge
-**Usage:**
-- `get bridge.delay`
-- `set bridge.delay <ms>`
-
-**Parameters:**
-- `ms`: Delay in milliseconds (0-10000)
-
-**Default:** `500`
-
----
-
-#### View or change the source of packets bridged to the external interface
-**Usage:**
-- `get bridge.source`
-- `set bridge.source <source>`
-
-**Parameters:**
-- `source`: 
-  - `rx`: bridges received packets
-  - `tx`: bridges transmitted packets
-
-**Default:** `tx`
-
----
-
-#### View or change the speed of the bridge (RS-232 only)
-**Usage:**
-- `get bridge.baud`
-- `set bridge.baud <rate>`
-
-**Parameters:**
-- `rate`: Baud rate (`9600`, `19200`, `38400`, `57600`, or `115200`)
-
-**Default:** `115200`
-
----
-
-#### View or change the channel used for bridging (ESPNow only)
-**Usage:**
-- `get bridge.channel`
-- `set bridge.channel <channel>`
-
-**Parameters:**
-- `channel`: Channel number (1-14)
-
----
-
-#### Set the ESP-Now secret
-**Usage:** 
-- `get bridge.secret`
-- `set bridge.secret <secret>`
-
-**Parameters:**
-- `secret`: 16-character encryption secret
-
-**Default:** Varies by board
-
----

docs/stats_binary_frames.md

@@ -94,7 +94,7 @@ struct StatsRadio {
 
 ## RESP_CODE_STATS + STATS_TYPE_PACKETS (24, 2)
 
-**Total Frame Size:** 26 bytes (legacy) or 30 bytes (includes `recv_errors`)
+**Total Frame Size:** 26 bytes
 
 | Offset | Size | Type | Field Name | Description | Range/Notes |
 |--------|------|------|------------|-------------|-------------|
@@ -106,14 +106,12 @@ struct StatsRadio {
 | 14 | 4 | uint32_t | direct_tx | Packets sent via direct routing | 0 - 4,294,967,295 |
 | 18 | 4 | uint32_t | flood_rx | Packets received via flood routing | 0 - 4,294,967,295 |
 | 22 | 4 | uint32_t | direct_rx | Packets received via direct routing | 0 - 4,294,967,295 |
-| 26 | 4 | uint32_t | recv_errors | Receive/CRC errors (RadioLib); present only in 30-byte frame | 0 - 4,294,967,295 |
 
 ### Notes
 
 - Counters are cumulative from boot and may wrap.
 - `recv = flood_rx + direct_rx`
 - `sent = flood_tx + direct_tx`
-- Clients should accept frame length ≥ 26; if length ≥ 30, parse `recv_errors` at offset 26.
 
 ### Example Structure (C/C++)
 
@@ -127,7 +125,6 @@ struct StatsPackets {
     uint32_t direct_tx;
     uint32_t flood_rx;
     uint32_t direct_rx;
-    uint32_t recv_errors;    // present when frame size is 30
 } __attribute__((packed));
 ```
 
@@ -186,12 +183,11 @@ def parse_stats_radio(frame):
     }
 
 def parse_stats_packets(frame):
-    """Parse RESP_CODE_STATS + STATS_TYPE_PACKETS frame (26 or 30 bytes)"""
-    assert len(frame) >= 26, "STATS_TYPE_PACKETS frame too short"
+    """Parse RESP_CODE_STATS + STATS_TYPE_PACKETS frame (26 bytes)"""
     response_code, stats_type, recv, sent, flood_tx, direct_tx, flood_rx, direct_rx = \
-        struct.unpack('<B B I I I I I I', frame[:26])
+        struct.unpack('<B B I I I I I I', frame)
     assert response_code == 24 and stats_type == 2, "Invalid response type"
-    result = {
+    return {
         'recv': recv,
         'sent': sent,
         'flood_tx': flood_tx,
@@ -199,10 +195,6 @@ def parse_stats_packets(frame):
         'flood_rx': flood_rx,
         'direct_rx': direct_rx
     }
-    if len(frame) >= 30:
-        (recv_errors,) = struct.unpack('<I', frame[26:30])
-        result['recv_errors'] = recv_errors
-    return result
 ```
 
 ---
@@ -259,7 +251,6 @@ interface StatsPackets {
     direct_tx: number;
     flood_rx: number;
     direct_rx: number;
-    recv_errors?: number;  // present when frame is 30 bytes
 }
 
 function parseStatsCore(buffer: ArrayBuffer): StatsCore {
@@ -295,15 +286,12 @@ function parseStatsRadio(buffer: ArrayBuffer): StatsRadio {
 
 function parseStatsPackets(buffer: ArrayBuffer): StatsPackets {
     const view = new DataView(buffer);
-    if (buffer.byteLength < 26) {
-        throw new Error('STATS_TYPE_PACKETS frame too short');
-    }
     const response_code = view.getUint8(0);
     const stats_type = view.getUint8(1);
     if (response_code !== 24 || stats_type !== 2) {
         throw new Error('Invalid response type');
     }
-    const result: StatsPackets = {
+    return {
         recv: view.getUint32(2, true),
         sent: view.getUint32(6, true),
         flood_tx: view.getUint32(10, true),
@@ -311,10 +299,6 @@ function parseStatsPackets(buffer: ArrayBuffer): StatsPackets {
         flood_rx: view.getUint32(18, true),
         direct_rx: view.getUint32(22, true)
     };
-    if (buffer.byteLength >= 30) {
-        result.recv_errors = view.getUint32(26, true);
-    }
-    return result;
 }
 ```
 

examples/companion_radio/DataStore.cpp

@@ -560,20 +560,14 @@ bool DataStore::putBlobByKey(const uint8_t key[], int key_len, const uint8_t src
   }
   return false; // error
 }
-bool DataStore::deleteBlobByKey(const uint8_t key[], int key_len) {
-  return true; // this is just a stub on NRF52/STM32 platforms
-}
 #else
-inline void makeBlobPath(const uint8_t key[], int key_len, char* path, size_t path_size) {
+uint8_t DataStore::getBlobByKey(const uint8_t key[], int key_len, uint8_t dest_buf[]) {
+  char path[64];
   char fname[18];
+
   if (key_len > 8) key_len = 8; // just use first 8 bytes (prefix)
   mesh::Utils::toHex(fname, key, key_len);
   sprintf(path, "/bl/%s", fname);
-}
-
-uint8_t DataStore::getBlobByKey(const uint8_t key[], int key_len, uint8_t dest_buf[]) {
-  char path[64];
-  makeBlobPath(key, key_len, path, sizeof(path));
 
   if (_fs->exists(path)) {
     File f = openRead(_fs, path);
@@ -588,7 +582,11 @@ uint8_t DataStore::getBlobByKey(const uint8_t key[], int key_len, uint8_t dest_b
 
 bool DataStore::putBlobByKey(const uint8_t key[], int key_len, const uint8_t src_buf[], uint8_t len) {
   char path[64];
-  makeBlobPath(key, key_len, path, sizeof(path));
+  char fname[18];
+
+  if (key_len > 8) key_len = 8; // just use first 8 bytes (prefix)
+  mesh::Utils::toHex(fname, key, key_len);
+  sprintf(path, "/bl/%s", fname);
 
   File f = openWrite(_fs, path);
   if (f) {
@@ -600,13 +598,4 @@ bool DataStore::putBlobByKey(const uint8_t key[], int key_len, const uint8_t src
   }
   return false; // error
 }
-
-bool DataStore::deleteBlobByKey(const uint8_t key[], int key_len) {
-  char path[64];
-  makeBlobPath(key, key_len, path, sizeof(path));
-
-  _fs->remove(path);
-  
-  return true; // return true even if file did not exist
-}
 #endif

examples/companion_radio/DataStore.h

@@ -42,7 +42,6 @@ public:
   void migrateToSecondaryFS();
   uint8_t getBlobByKey(const uint8_t key[], int key_len, uint8_t dest_buf[]);
   bool putBlobByKey(const uint8_t key[], int key_len, const uint8_t src_buf[], uint8_t len);
-  bool deleteBlobByKey(const uint8_t key[], int key_len);
   File openRead(const char* filename);
   File openRead(FILESYSTEM* fs, const char* filename);
   bool removeFile(const char* filename);

examples/companion_radio/MyMesh.cpp

@@ -307,7 +307,6 @@ bool MyMesh::shouldOverwriteWhenFull() const {
 }
 
 void MyMesh::onContactOverwrite(const uint8_t* pub_key) {
-    _store->deleteBlobByKey(pub_key, PUB_KEY_SIZE); // delete from storage
   if (_serial->isConnected()) {
     out_frame[0] = PUSH_CODE_CONTACT_DELETED;
     memcpy(&out_frame[1], pub_key, PUB_KEY_SIZE);
@@ -331,11 +330,10 @@ void MyMesh::onDiscoveredContact(ContactInfo &contact, bool is_new, uint8_t path
       memcpy(&out_frame[1], contact.id.pub_key, PUB_KEY_SIZE);
       _serial->writeFrame(out_frame, 1 + PUB_KEY_SIZE);
     }
-  } else {
+  } 
 #ifdef DISPLAY_CLASS
-    if (_ui) _ui->notify(UIEventType::newContactMessage);
+  if (_ui && !_prefs.buzzer_quiet) _ui->notify(UIEventType::newContactMessage); //buzz if enabled
 #endif
-  }
 
   // add inbound-path to mem cache
   if (path && path_len <= sizeof(AdvertPath::path)) {  // check path is valid
@@ -442,9 +440,7 @@ void MyMesh::queueMessage(const ContactInfo &from, uint8_t txt_type, mesh::Packe
   bool should_display = txt_type == TXT_TYPE_PLAIN || txt_type == TXT_TYPE_SIGNED_PLAIN;
   if (should_display && _ui) {
     _ui->newMsg(path_len, from.name, text, offline_queue_len);
-    if (!_serial->isConnected()) {
-      _ui->notify(UIEventType::contactMessage);
-    }
+    if (!_prefs.buzzer_quiet) _ui->notify(UIEventType::contactMessage); //buzz if enabled
   }
 #endif
 }
@@ -529,11 +525,8 @@ void MyMesh::onChannelMessageRecv(const mesh::GroupChannel &channel, mesh::Packe
     uint8_t frame[1];
     frame[0] = PUSH_CODE_MSG_WAITING; // send push 'tickle'
     _serial->writeFrame(frame, 1);
-  } else {
-#ifdef DISPLAY_CLASS
-    if (_ui) _ui->notify(UIEventType::channelMessage);
-#endif
   }
+
 #ifdef DISPLAY_CLASS
   // Get the channel name from the channel index
   const char *channel_name = "Unknown";
@@ -541,7 +534,10 @@ void MyMesh::onChannelMessageRecv(const mesh::GroupChannel &channel, mesh::Packe
   if (getChannel(channel_idx, channel_details)) {
     channel_name = channel_details.name;
   }
-  if (_ui) _ui->newMsg(path_len, channel_name, text, offline_queue_len);
+  if (_ui) {
+    _ui->newMsg(path_len, channel_name, text, offline_queue_len);
+    if (!_prefs.buzzer_quiet) _ui->notify(UIEventType::channelMessage); //buzz if enabled
+  }
 #endif
 }
 
@@ -800,6 +796,7 @@ MyMesh::MyMesh(mesh::Radio &radio, mesh::RNG &rng, mesh::RTCClock &rtc, SimpleMe
   _prefs.bw = LORA_BW;
   _prefs.cr = LORA_CR;
   _prefs.tx_power_dbm = LORA_TX_POWER;
+  _prefs.buzzer_quiet = 0;
   _prefs.gps_enabled = 0;       // GPS disabled by default
   _prefs.gps_interval = 0;      // No automatic GPS updates by default
   //_prefs.rx_delay_base = 10.0f;  enable once new algo fixed
@@ -839,6 +836,7 @@ void MyMesh::begin(bool has_display) {
   _prefs.sf = constrain(_prefs.sf, 5, 12);
   _prefs.cr = constrain(_prefs.cr, 5, 8);
   _prefs.tx_power_dbm = constrain(_prefs.tx_power_dbm, 1, MAX_LORA_TX_POWER);
+  _prefs.buzzer_quiet = constrain(_prefs.buzzer_quiet, 0, 1);  // Ensure boolean 0 or 1
   _prefs.gps_enabled = constrain(_prefs.gps_enabled, 0, 1);  // Ensure boolean 0 or 1
   _prefs.gps_interval = constrain(_prefs.gps_interval, 0, 86400);  // Max 24 hours
 
@@ -1125,7 +1123,6 @@ void MyMesh::handleCmdFrame(size_t len) {
     uint8_t *pub_key = &cmd_frame[1];
     ContactInfo *recipient = lookupContactByPubKey(pub_key, PUB_KEY_SIZE);
     if (recipient && removeContact(*recipient)) {
-      _store->deleteBlobByKey(pub_key, PUB_KEY_SIZE);
       dirty_contacts_expiry = futureMillis(LAZY_CONTACTS_WRITE_DELAY);
       writeOKFrame();
     } else {
@@ -1691,14 +1688,12 @@ void MyMesh::handleCmdFrame(size_t len) {
       uint32_t n_sent_direct = getNumSentDirect();
       uint32_t n_recv_flood = getNumRecvFlood();
       uint32_t n_recv_direct = getNumRecvDirect();
-      uint32_t n_recv_errors = radio_driver.getPacketsRecvErrors();
       memcpy(&out_frame[i], &recv, 4); i += 4;
       memcpy(&out_frame[i], &sent, 4); i += 4;
       memcpy(&out_frame[i], &n_sent_flood, 4); i += 4;
       memcpy(&out_frame[i], &n_sent_direct, 4); i += 4;
       memcpy(&out_frame[i], &n_recv_flood, 4); i += 4;
       memcpy(&out_frame[i], &n_recv_direct, 4); i += 4;
-      memcpy(&out_frame[i], &n_recv_errors, 4); i += 4;
       _serial->writeFrame(out_frame, i);
     } else {
       writeErrFrame(ERR_CODE_ILLEGAL_ARG); // invalid stats sub-type

examples/companion_radio/MyMesh.h

@@ -8,11 +8,11 @@
 #define FIRMWARE_VER_CODE 8
 
 #ifndef FIRMWARE_BUILD_DATE
-#define FIRMWARE_BUILD_DATE "29 Jan 2026"
+#define FIRMWARE_BUILD_DATE "30 Nov 2025"
 #endif
 
 #ifndef FIRMWARE_VERSION
-#define FIRMWARE_VERSION "v1.12.0"
+#define FIRMWARE_VERSION "v1.11.0"
 #endif
 
 #if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)

examples/companion_radio/ui-new/UITask.cpp

@@ -103,14 +103,8 @@ class HomeScreen : public UIScreen {
 
   void renderBatteryIndicator(DisplayDriver& display, uint16_t batteryMilliVolts) {
     // Convert millivolts to percentage
-#ifndef BATT_MIN_MILLIVOLTS
-  #define BATT_MIN_MILLIVOLTS 3000
-#endif
-#ifndef BATT_MAX_MILLIVOLTS
-  #define BATT_MAX_MILLIVOLTS 4200
-#endif
-    const int minMilliVolts = BATT_MIN_MILLIVOLTS;
-    const int maxMilliVolts = BATT_MAX_MILLIVOLTS;
+    const int minMilliVolts = 3000; // Minimum voltage (e.g., 3.0V)
+    const int maxMilliVolts = 4200; // Maximum voltage (e.g., 4.2V)
     int batteryPercentage = ((batteryMilliVolts - minMilliVolts) * 100) / (maxMilliVolts - minMilliVolts);
     if (batteryPercentage < 0) batteryPercentage = 0; // Clamp to 0%
     if (batteryPercentage > 100) batteryPercentage = 100; // Clamp to 100%

examples/companion_radio/ui-orig/UITask.cpp

@@ -149,14 +149,8 @@ void UITask::newMsg(uint8_t path_len, const char* from_name, const char* text, i
 
 void UITask::renderBatteryIndicator(uint16_t batteryMilliVolts) {
   // Convert millivolts to percentage
-#ifndef BATT_MIN_MILLIVOLTS
-  #define BATT_MIN_MILLIVOLTS 3000
-#endif
-#ifndef BATT_MAX_MILLIVOLTS
-  #define BATT_MAX_MILLIVOLTS 4200
-#endif
-  const int minMilliVolts = BATT_MIN_MILLIVOLTS;
-  const int maxMilliVolts = BATT_MAX_MILLIVOLTS;
+  const int minMilliVolts = 3000; // Minimum voltage (e.g., 3.0V)
+  const int maxMilliVolts = 4200; // Maximum voltage (e.g., 4.2V)
   int batteryPercentage = ((batteryMilliVolts - minMilliVolts) * 100) / (maxMilliVolts - minMilliVolts);
   if (batteryPercentage < 0) batteryPercentage = 0; // Clamp to 0%
   if (batteryPercentage > 100) batteryPercentage = 100; // Clamp to 100%

examples/simple_repeater/MyMesh.cpp

@@ -1081,8 +1081,8 @@ void MyMesh::handleCommand(uint32_t sender_timestamp, char *command, char *reply
 
     const char* parts[4];
     int n = mesh::Utils::parseTextParts(command, parts, 4, ' ');
-    if (n == 1) {
-      region_map.exportTo(reply, 160);
+    if (n == 1 && sender_timestamp == 0) {
+      region_map.exportTo(Serial);
     } else if (n >= 2 && strcmp(parts[1], "load") == 0) {
       temp_map.resetFrom(region_map);   // rebuild regions in a temp instance
       memset(load_stack, 0, sizeof(load_stack));
@@ -1155,25 +1155,6 @@ void MyMesh::handleCommand(uint32_t sender_timestamp, char *command, char *reply
       } else {
         strcpy(reply, "Err - not found");
       }
-    } else if (n >= 3 && strcmp(parts[1], "list") == 0) {
-      uint8_t mask = 0;
-      bool invert = false;
-      
-      if (strcmp(parts[2], "allowed") == 0) {
-        mask = REGION_DENY_FLOOD;
-        invert = false;  // list regions that DON'T have DENY flag
-      } else if (strcmp(parts[2], "denied") == 0) {
-        mask = REGION_DENY_FLOOD;
-        invert = true;   // list regions that DO have DENY flag
-      } else {
-        strcpy(reply, "Err - use 'allowed' or 'denied'");
-        return;
-      }
-      
-      int len = region_map.exportNamesTo(reply, 160, mask, invert);
-      if (len == 0) {
-        strcpy(reply, "-none-");
-      }
     } else {
       strcpy(reply, "Err - ??");
     }

examples/simple_repeater/MyMesh.h

@@ -69,11 +69,11 @@ struct NeighbourInfo {
 };
 
 #ifndef FIRMWARE_BUILD_DATE
-  #define FIRMWARE_BUILD_DATE   "29 Jan 2026"
+  #define FIRMWARE_BUILD_DATE   "30 Nov 2025"
 #endif
 
 #ifndef FIRMWARE_VERSION
-  #define FIRMWARE_VERSION   "v1.12.0"
+  #define FIRMWARE_VERSION   "v1.11.0"
 #endif
 
 #define FIRMWARE_ROLE "repeater"

examples/simple_room_server/MyMesh.h

@@ -26,11 +26,11 @@
 /* ------------------------------ Config -------------------------------- */
 
 #ifndef FIRMWARE_BUILD_DATE
-  #define FIRMWARE_BUILD_DATE   "29 Jan 2026"
+  #define FIRMWARE_BUILD_DATE   "30 Nov 2025"
 #endif
 
 #ifndef FIRMWARE_VERSION
-  #define FIRMWARE_VERSION   "v1.12.0"
+  #define FIRMWARE_VERSION   "v1.11.0"
 #endif
 
 #ifndef LORA_FREQ

examples/simple_sensor/SensorMesh.h

@@ -33,11 +33,11 @@
 #define PERM_RECV_ALERTS_HI    (1 << 7)   // high priority alerts
 
 #ifndef FIRMWARE_BUILD_DATE
-  #define FIRMWARE_BUILD_DATE   "29 Jan 2026"
+  #define FIRMWARE_BUILD_DATE   "30 Nov 2025"
 #endif
 
 #ifndef FIRMWARE_VERSION
-  #define FIRMWARE_VERSION   "v1.12.0"
+  #define FIRMWARE_VERSION   "v1.11.0"
 #endif
 
 #define FIRMWARE_ROLE "sensor"

platformio.ini

@@ -24,9 +24,10 @@ lib_deps =
   melopero/Melopero RV3028 @ ^1.1.0
   electroniccats/CayenneLPP @ 1.6.1
 build_flags = -w -DNDEBUG -DRADIOLIB_STATIC_ONLY=1 -DRADIOLIB_GODMODE=1
-  -D LORA_FREQ=869.525
-  -D LORA_BW=250
-  -D LORA_SF=11
+  -D LORA_FREQ=869.618
+  -D LORA_BW=62.5
+  -D LORA_SF=8
+  -D LORA_CR=8
   -D ENABLE_ADVERT_ON_BOOT=1
   -D ENABLE_PRIVATE_KEY_IMPORT=1   ; NOTE: comment these out for more secure firmware
   -D ENABLE_PRIVATE_KEY_EXPORT=1

src/helpers/BaseChatMesh.cpp

@@ -131,6 +131,7 @@ void BaseChatMesh::onAdvertRecv(mesh::Packet* packet, const mesh::Identity& id,
     plen = packet->writeTo(temp_buf);
     packet->header = save;
   }
+  putBlobByKey(id.pub_key, PUB_KEY_SIZE, temp_buf, plen);
 
   bool is_new = false; // true = not in contacts[], false = exists in contacts[]
   if (from == NULL) {
@@ -156,7 +157,6 @@ void BaseChatMesh::onAdvertRecv(mesh::Packet* packet, const mesh::Identity& id,
     from->shared_secret_valid = false;
   }
   // update
-    putBlobByKey(id.pub_key, PUB_KEY_SIZE, temp_buf, plen);
     StrHelper::strncpy(from->name, parser.getName(), sizeof(from->name));
     from->type = parser.getType();
     if (parser.hasLatLon()) {

src/helpers/CommonCLI.cpp

@@ -16,7 +16,7 @@ static uint32_t _atoi(const char* sp) {
 
 static bool isValidName(const char *n) {
   while (*n) {
-    if (*n == '[' || *n == ']' || *n == '\\' || *n == ':' || *n == ',' || *n == '?' || *n == '*') return false;
+    if (*n == '[' || *n == ']' || *n == '/' || *n == '\\' || *n == ':' || *n == ',' || *n == '?' || *n == '*') return false;
     n++;
   }
   return true;
@@ -202,10 +202,6 @@ uint8_t CommonCLI::buildAdvertData(uint8_t node_type, uint8_t* app_data) {
 void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, char* reply) {
     if (memcmp(command, "reboot", 6) == 0) {
       _board->reboot();  // doesn't return
-    } else if (memcmp(command, "clkreboot", 9) == 0) {
-      // Reset clock
-      getRTCClock()->setCurrentTime(1715770351);  // 15 May 2024, 8:50pm
-      _board->reboot();  // doesn't return
     } else if (memcmp(command, "advert", 6) == 0) {
       // send flood advert
       _callbacks->sendSelfAdvertisement(1500, true);  // longer delay, give CLI response time to be sent first

src/helpers/NRF52Board.cpp

@@ -271,7 +271,7 @@ float NRF52Board::getMCUTemperature() {
   return temp * 0.25f; // Convert to *C
 }
 
-bool NRF52Board::startOTAUpdate(const char *id, char reply[]) {
+bool NRF52BoardOTA::startOTAUpdate(const char *id, char reply[]) {
   // Config the peripheral connection with maximum bandwidth
   // more SRAM required by SoftDevice
   // Note: All config***() function must be called before begin()

src/helpers/NRF52Board.h

@@ -31,7 +31,6 @@ class NRF52Board : public mesh::MainBoard {
 
 protected:
   uint8_t startup_reason;
-  char *ota_name;
 
 #ifdef NRF52_POWER_MANAGEMENT
   uint32_t reset_reason;              // RESETREAS register value
@@ -45,12 +44,10 @@ protected:
 #endif
 
 public:
-  NRF52Board(char *otaname) : ota_name(otaname) {}
   virtual void begin();
   virtual uint8_t getStartupReason() const override { return startup_reason; }
   virtual float getMCUTemperature() override;
   virtual void reboot() override { NVIC_SystemReset(); }
-  virtual bool startOTAUpdate(const char *id, char reply[]) override;
 
 #ifdef NRF52_POWER_MANAGEMENT
   bool isExternalPowered() override;
@@ -71,7 +68,15 @@ public:
  */
 class NRF52BoardDCDC : virtual public NRF52Board {
 public:
-  NRF52BoardDCDC() {}
   virtual void begin() override;
 };
+
+class NRF52BoardOTA : virtual public NRF52Board {
+private:
+  char *ota_name;
+
+public:
+  NRF52BoardOTA(char *name) : ota_name(name) {}
+  virtual bool startOTAUpdate(const char *id, char reply[]) override;
+};
 #endif

src/helpers/RegionMap.cpp

@@ -2,45 +2,6 @@
 #include <helpers/TxtDataHelpers.h>
 #include <SHA256.h>
 
-// helper class for region map exporter, we emulate Stream with a safe buffer writer.
-
-class BufStream : public Stream {
-public:
-  BufStream(char *buf, size_t max_len)
-    : _buf(buf), _max_len(max_len), _pos(0) {
-    if (_max_len > 0) _buf[0] = 0;
-  }
-
-  size_t write(uint8_t c) override {
-    if (_pos + 1 >= _max_len) return 0;
-    _buf[_pos++] = c;
-    _buf[_pos] = 0;
-    return 1;
-  }
-
-  size_t write(const uint8_t *buffer, size_t size) override {
-    size_t written = 0;
-    while (written < size) {
-      if (!write(buffer[written])) break;
-      written++;
-    }
-    return written;
-  }
-
-  int available() override { return 0; }
-  int read() override { return -1; }
-  int peek() override { return -1; }
-  void flush() override {}
-
-  size_t length() const { return _pos; }
-
-private:
-  char *_buf;
-  size_t _max_len;
-  size_t _pos;
-};
-
-
 RegionMap::RegionMap(TransportKeyStore& store) : _store(&store) {
   next_id = 1; num_regions = 0; home_id = 0;
   wildcard.id = wildcard.parent = 0;
@@ -288,40 +249,25 @@ void RegionMap::exportTo(Stream& out) const {
   printChildRegions(0, &wildcard, out);   // recursive
 }
 
-size_t RegionMap::exportTo(char *dest, size_t max_len) const {
-  if (!dest || max_len == 0) return 0;
-
-  BufStream bs(dest, max_len);
-  exportTo(bs);              // ← reuse existing logic
-  return bs.length();
-}
-
-int RegionMap::exportNamesTo(char *dest, int max_len, uint8_t mask, bool invert) {
+int RegionMap::exportNamesTo(char *dest, int max_len, uint8_t mask) {
   char *dp = dest;
-  
-  // Check wildcard region
-  bool wildcard_matches = invert ? (wildcard.flags & mask) : !(wildcard.flags & mask);
-  if (wildcard_matches) {
+  if ((wildcard.flags & mask) == 0) {
     *dp++ = '*';
     *dp++ = ',';
   }
 
-    for (int i = 0; i < num_regions; i++) {
+  for (int i = 0; i < num_regions; i++) {
     auto region = &regions[i];
-    
-    // Check if region matches the filter criteria
-    bool region_matches = invert ? (region->flags & mask) : !(region->flags & mask);
-    
-    if (region_matches) {
-      int len = strlen(skip_hash(region->name));
+    if ((region->flags & mask) == 0) {   // region allowed? (per 'mask' param)
+      const char* name = skip_hash(region->name);
+      int len = strlen(name);
       if ((dp - dest) + len + 2 < max_len) {   // only append if name will fit
-        memcpy(dp, skip_hash(region->name), len);
+        memcpy(dp, name, len);
         dp += len;
         *dp++ = ',';
       }
     }
   }
-
   if (dp > dest) { dp--; }   // don't include trailing comma
 
   *dp = 0;  // set null terminator

src/helpers/RegionMap.h

@@ -49,9 +49,7 @@ public:
   int getCount() const { return num_regions; }
   const RegionEntry* getByIdx(int i) const { return &regions[i]; }
   const RegionEntry* getRoot() const { return &wildcard; }
-  int exportNamesTo(char *dest, int max_len, uint8_t mask, bool invert = false);
+  int exportNamesTo(char *dest, int max_len, uint8_t mask);
 
-  void    exportTo(Stream& out) const;
-  size_t  exportTo(char *dest, size_t max_len) const;
- 
+  void exportTo(Stream& out) const;
 };

src/helpers/radiolib/CustomSX1262.h

@@ -76,14 +76,6 @@ class CustomSX1262 : public SX1262 {
       setRfSwitchPins(SX126X_RXEN, SX126X_TXEN);
   #endif 
 
-  // for improved RX with Heltec v4
-  #ifdef SX126X_REGISTER_PATCH
-    uint8_t r_data = 0;
-    readRegister(0x8B5, &r_data, 1);
-    r_data |= 0x01;
-    writeRegister(0x8B5, &r_data, 1);
-  #endif
-
       return true;  // success
     }
 

src/helpers/sensors/EnvironmentSensorManager.cpp

@@ -284,7 +284,7 @@ bool EnvironmentSensorManager::begin() {
     INA260_initialized = true;
   } else {
     INA260_initialized = false;
-    MESH_DEBUG_PRINTLN("INA260 was not found at I2C address %02X", TELEM_INA260_ADDRESS);
+    MESH_DEBUG_PRINTLN("INA260 was not found at I2C address %02X", TELEM_INA219_ADDRESS);
   }
   #endif
 

src/helpers/ui/SSD1306Display.cpp

@@ -7,10 +7,6 @@ bool SSD1306Display::i2c_probe(TwoWire& wire, uint8_t addr) {
 }
 
 bool SSD1306Display::begin() {
-  if (!_isOn) {
-    if (_peripher_power) _peripher_power->claim();
-    _isOn = true;
-  }
   #ifdef DISPLAY_ROTATION
   display.setRotation(DISPLAY_ROTATION);
   #endif
@@ -19,18 +15,12 @@ bool SSD1306Display::begin() {
 
 void SSD1306Display::turnOn() {
   display.ssd1306_command(SSD1306_DISPLAYON);
-  if (!_isOn) {
-    if (_peripher_power) _peripher_power->claim();
-    _isOn = true;
-  }
+  _isOn = true;
 }
 
 void SSD1306Display::turnOff() {
   display.ssd1306_command(SSD1306_DISPLAYOFF);
-  if (_isOn) {
-    if (_peripher_power) _peripher_power->release();
-    _isOn = false;
-  }
+  _isOn = false;
 }
 
 void SSD1306Display::clear() {

src/helpers/ui/SSD1306Display.h

@@ -5,7 +5,6 @@
 #include <Adafruit_GFX.h>
 #define SSD1306_NO_SPLASH
 #include <Adafruit_SSD1306.h>
-#include <helpers/RefCountedDigitalPin.h>
 
 #ifndef PIN_OLED_RESET
   #define PIN_OLED_RESET        21 // Reset pin # (or -1 if sharing Arduino reset pin)
@@ -19,16 +18,10 @@ class SSD1306Display : public DisplayDriver {
   Adafruit_SSD1306 display;
   bool _isOn;
   uint8_t _color;
-  RefCountedDigitalPin* _peripher_power;
 
   bool i2c_probe(TwoWire& wire, uint8_t addr);
 public:
-  SSD1306Display(RefCountedDigitalPin* peripher_power=NULL) : DisplayDriver(128, 64), 
-      display(128, 64, &Wire, PIN_OLED_RESET),
-      _peripher_power(peripher_power)
-  {
-    _isOn = false; 
-  }
+  SSD1306Display() : DisplayDriver(128, 64), display(128, 64, &Wire, PIN_OLED_RESET) { _isOn = false; }
   bool begin();
 
   bool isOn() override { return _isOn; }

src/helpers/ui/ST7789Display.cpp

@@ -10,13 +10,8 @@
 #define Y_OFFSET 1  // Vertical offset to prevent top row cutoff
 #endif
 
-#ifdef HELTEC_VISION_MASTER_T190
-  #define SCALE_X  2.5f        // 320 / 128
-  #define SCALE_Y  2.65625f    // 170 / 64
-#else
-  #define SCALE_X  1.875f      // 240 / 128
-  #define SCALE_Y  2.109375f   // 135 / 64
-#endif
+#define SCALE_X  1.875f     // 240 / 128
+#define SCALE_Y  2.109375f   // 135 / 64
 
 bool ST7789Display::begin() {
   if(!_isOn) {

src/helpers/ui/ST7789LCDDisplay.cpp

@@ -28,14 +28,11 @@ bool ST7789LCDDisplay::begin() {
       digitalWrite(PIN_TFT_LEDA_CTL, HIGH);
     }
     if (PIN_TFT_RST != -1) {
-      pinMode(PIN_TFT_RST, OUTPUT);
-      digitalWrite(PIN_TFT_RST, LOW); 
-      delay(10);
       digitalWrite(PIN_TFT_RST, HIGH);
     }
 
     // Im not sure if this is just a t-deck problem or not, if your display is slow try this.
-    #if defined(LILYGO_TDECK) || defined(HELTEC_LORA_V4_TFT)
+    #ifdef LILYGO_TDECK
       displaySPI.begin(PIN_TFT_SCL, -1, PIN_TFT_SDA, PIN_TFT_CS);
     #endif
 

src/helpers/ui/ST7789LCDDisplay.h

@@ -8,7 +8,7 @@
 #include <helpers/RefCountedDigitalPin.h>
 
 class ST7789LCDDisplay : public DisplayDriver {
-  #if defined(LILYGO_TDECK) || defined(HELTEC_LORA_V4_TFT)
+  #ifdef LILYGO_TDECK
     SPIClass displaySPI;
   #endif
   Adafruit_ST7789 display;
@@ -25,7 +25,7 @@ public:
   {
     _isOn = false;
   }
-#elif defined(LILYGO_TDECK) || defined(HELTEC_LORA_V4_TFT)
+#elif LILYGO_TDECK
   ST7789LCDDisplay(RefCountedDigitalPin* peripher_power=NULL) : DisplayDriver(128, 64),
       displaySPI(HSPI),
       display(&displaySPI, PIN_TFT_CS, PIN_TFT_DC, PIN_TFT_RST),

variants/heltec_mesh_solar/MeshSolarBoard.h

@@ -20,9 +20,9 @@
 #define SX126X_DIO2_AS_RF_SWITCH  true
 #define SX126X_DIO3_TCXO_VOLTAGE   1.8
 
-class MeshSolarBoard : public NRF52BoardDCDC {
+class MeshSolarBoard : public NRF52BoardOTA {
 public:
-  MeshSolarBoard() : NRF52Board("MESH_SOLAR_OTA") {}
+  MeshSolarBoard() : NRF52BoardOTA("MESH_SOLAR_OTA") {}
   void begin();
 
   uint16_t getBattMilliVolts() override {

variants/heltec_t114/T114Board.cpp

@@ -34,6 +34,7 @@ void T114Board::initiateShutdown(uint8_t reason) {
 
 void T114Board::begin() {
   NRF52Board::begin();
+  NRF_POWER->DCDCEN = 1;
 
   pinMode(PIN_VBAT_READ, INPUT);
 

variants/heltec_t114/T114Board.h

@@ -9,14 +9,14 @@
 #define  PIN_BAT_CTL      6
 #define  MV_LSB   (3000.0F / 4096.0F) // 12-bit ADC with 3.0V input range
 
-class T114Board : public NRF52BoardDCDC {
+class T114Board : public NRF52BoardOTA {
 protected:
 #ifdef NRF52_POWER_MANAGEMENT
   void initiateShutdown(uint8_t reason) override;
 #endif
 
 public:
-  T114Board() : NRF52Board("T114_OTA") {}
+    T114Board() : NRF52BoardOTA("T114_OTA") {}
   void begin();
 
 #if defined(P_LORA_TX_LED)

variants/heltec_v4/HeltecV4Board.cpp

@@ -86,9 +86,5 @@ void HeltecV4Board::begin() {
   }
 
   const char* HeltecV4Board::getManufacturerName() const {
-  #ifdef HELTEC_LORA_V4_TFT
-    return "Heltec V4 TFT";
-  #else
-    return "Heltec V4 OLED";
-  #endif
+    return "Heltec V4";
   }

variants/heltec_v4/platformio.ini

@@ -17,19 +17,20 @@ build_flags =
   -D P_LORA_SCLK=9
   -D P_LORA_MISO=11
   -D P_LORA_MOSI=10
-  -D P_LORA_PA_POWER=7   ; VFEM_Ctrl - Power on GC1109
-  -D P_LORA_PA_EN=2      ; PA CSD - Enable GC1109
-  -D P_LORA_PA_TX_EN=46  ; PA CPS - GC1109 TX PA full(High) / bypass(Low)
+  -D P_LORA_PA_POWER=7   ;power en
+  -D P_LORA_PA_EN=2
+  -D P_LORA_PA_TX_EN=46  ;enable tx
+  -D PIN_BOARD_SDA=17
+  -D PIN_BOARD_SCL=18
   -D PIN_USER_BTN=0
   -D PIN_VEXT_EN=36
-  -D PIN_VEXT_EN_ACTIVE=LOW
+  -D PIN_VEXT_EN_ACTIVE=HIGH
   -D LORA_TX_POWER=10 ;If it is configured as 10 here, the final output will be 22 dbm.
   -D MAX_LORA_TX_POWER=22 ; Max SX1262 output
-  -D SX126X_REGISTER_PATCH=1       ; Patch register 0x8B5 for improved RX
-  -D SX126X_DIO2_AS_RF_SWITCH=true ; GC1109 CTX is controlled by SX1262 DIO2
+  -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1      ; In some cases, commenting this out will improve RX
+  -D SX126X_RX_BOOSTED_GAIN=1
   -D PIN_GPS_RX=38
   -D PIN_GPS_TX=39
   -D PIN_GPS_RESET=42
@@ -46,44 +47,10 @@ lib_deps =
   ${esp32_base.lib_deps}
   ${sensor_base.lib_deps}
 
-[heltec_v4_oled]
-extends = Heltec_lora32_v4
-build_flags =
-  ${Heltec_lora32_v4.build_flags}
-  -D HELTEC_LORA_V4_OLED
-  -D PIN_BOARD_SDA=17
-  -D PIN_BOARD_SCL=18
-  -D ENV_PIN_SDA=4
-  -D ENV_PIN_SCL=3
-build_src_filter= ${Heltec_lora32_v4.build_src_filter}
-lib_deps = ${Heltec_lora32_v4.lib_deps}
-
-[heltec_v4_tft]
-extends = Heltec_lora32_v4
-build_flags =
-  ${Heltec_lora32_v4.build_flags}
-  -D HELTEC_LORA_V4_TFT
-  -D PIN_BOARD_SDA=4
-  -D PIN_BOARD_SCL=3
-  -D DISPLAY_SCALE_X=2.5
-  -D DISPLAY_SCALE_Y=3.75
-  -D PIN_TFT_RST=18
-  -D PIN_TFT_VDD_CTL=-1
-  -D PIN_TFT_LEDA_CTL=21
-  -D PIN_TFT_LEDA_CTL_ACTIVE=HIGH
-  -D PIN_TFT_CS=15
-  -D PIN_TFT_DC=16
-  -D PIN_TFT_SCL=17
-  -D PIN_TFT_SDA=33
-build_src_filter= ${Heltec_lora32_v4.build_src_filter}
-lib_deps = 
-  ${Heltec_lora32_v4.lib_deps}
-  adafruit/Adafruit ST7735 and ST7789 Library @ ^1.11.0
-
 [env:heltec_v4_repeater]
-extends = heltec_v4_oled
+extends = Heltec_lora32_v4
 build_flags =
-  ${heltec_v4_oled.build_flags}
+  ${Heltec_lora32_v4.build_flags}
   -D DISPLAY_CLASS=SSD1306Display
   -D ADVERT_NAME='"Heltec Repeater"'
   -D ADVERT_LAT=0.0
@@ -92,18 +59,18 @@ build_flags =
   -D MAX_NEIGHBOURS=50
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${heltec_v4_oled.build_src_filter}
+build_src_filter = ${Heltec_lora32_v4.build_src_filter}
   +<helpers/ui/SSD1306Display.cpp>
   +<../examples/simple_repeater>
 lib_deps =
-  ${heltec_v4_oled.lib_deps}
+  ${Heltec_lora32_v4.lib_deps}
   ${esp32_ota.lib_deps}
   bakercp/CRC32 @ ^2.0.0
 
 [env:heltec_v4_repeater_bridge_espnow]
-extends = heltec_v4_oled
+extends = Heltec_lora32_v4
 build_flags =
-  ${heltec_v4_oled.build_flags}
+  ${Heltec_lora32_v4.build_flags}
   -D DISPLAY_CLASS=SSD1306Display
   -D ADVERT_NAME='"ESPNow Bridge"'
   -D ADVERT_LAT=0.0
@@ -114,18 +81,18 @@ build_flags =
 ;  -D BRIDGE_DEBUG=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${heltec_v4_oled.build_src_filter}
+build_src_filter = ${Heltec_lora32_v4.build_src_filter}
   +<helpers/bridges/ESPNowBridge.cpp>
   +<helpers/ui/SSD1306Display.cpp>
   +<../examples/simple_repeater>
 lib_deps =
-  ${heltec_v4_oled.lib_deps}
+  ${Heltec_lora32_v4.lib_deps}
   ${esp32_ota.lib_deps}
 
 [env:heltec_v4_room_server]
-extends = heltec_v4_oled
+extends = Heltec_lora32_v4
 build_flags =
-  ${heltec_v4_oled.build_flags}
+  ${Heltec_lora32_v4.build_flags}
   -D DISPLAY_CLASS=SSD1306Display
   -D ADVERT_NAME='"Heltec Room"'
   -D ADVERT_LAT=0.0
@@ -134,50 +101,50 @@ build_flags =
   -D ROOM_PASSWORD='"hello"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${heltec_v4_oled.build_src_filter}
+build_src_filter = ${Heltec_lora32_v4.build_src_filter}
   +<helpers/ui/SSD1306Display.cpp>
   +<../examples/simple_room_server>
 lib_deps =
-  ${heltec_v4_oled.lib_deps}
+  ${Heltec_lora32_v4.lib_deps}
   ${esp32_ota.lib_deps}
 
 [env:heltec_v4_terminal_chat]
-extends = heltec_v4_oled
+extends = Heltec_lora32_v4
 build_flags =
-  ${heltec_v4_oled.build_flags}
+  ${Heltec_lora32_v4.build_flags}
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${heltec_v4_oled.build_src_filter}
+build_src_filter = ${Heltec_lora32_v4.build_src_filter}
   +<../examples/simple_secure_chat/main.cpp>
 lib_deps =
-  ${heltec_v4_oled.lib_deps}
+  ${Heltec_lora32_v4.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
 [env:heltec_v4_companion_radio_usb]
-extends = heltec_v4_oled
+extends = Heltec_lora32_v4
 build_flags =
-  ${heltec_v4_oled.build_flags}
+  ${Heltec_lora32_v4.build_flags}
   -I examples/companion_radio/ui-new
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=SSD1306Display
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
-build_src_filter = ${heltec_v4_oled.build_src_filter}
+build_src_filter = ${Heltec_lora32_v4.build_src_filter}
   +<helpers/ui/SSD1306Display.cpp>
   +<helpers/ui/MomentaryButton.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps =
-  ${heltec_v4_oled.lib_deps}
+  ${Heltec_lora32_v4.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
 [env:heltec_v4_companion_radio_ble]
-extends = heltec_v4_oled
+extends = Heltec_lora32_v4
 build_flags =
-  ${heltec_v4_oled.build_flags}
+  ${Heltec_lora32_v4.build_flags}
   -I examples/companion_radio/ui-new
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
@@ -188,20 +155,20 @@ build_flags =
   -D OFFLINE_QUEUE_SIZE=256
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${heltec_v4_oled.build_src_filter}
+build_src_filter = ${Heltec_lora32_v4.build_src_filter}
   +<helpers/ui/SSD1306Display.cpp>
   +<helpers/ui/MomentaryButton.cpp>
   +<helpers/esp32/*.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps =
-  ${heltec_v4_oled.lib_deps}
+  ${Heltec_lora32_v4.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
 [env:heltec_v4_companion_radio_wifi]
-extends = heltec_v4_oled
+extends = Heltec_lora32_v4
 build_flags =
-  ${heltec_v4_oled.build_flags}
+  ${Heltec_lora32_v4.build_flags}
   -I examples/companion_radio/ui-new
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
@@ -209,197 +176,35 @@ build_flags =
   -D WIFI_DEBUG_LOGGING=1
   -D WIFI_SSID='"myssid"'
   -D WIFI_PWD='"mypwd"'
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-build_src_filter = ${heltec_v4_oled.build_src_filter}
-  +<helpers/ui/SSD1306Display.cpp>
-  +<helpers/ui/MomentaryButton.cpp>
-  +<helpers/esp32/*.cpp>
-  +<../examples/companion_radio/*.cpp>
-  +<../examples/companion_radio/ui-new/*.cpp>
-lib_deps =
-  ${heltec_v4_oled.lib_deps}
-  densaugeo/base64 @ ~1.4.0
-
-[env:heltec_v4_sensor]
-extends = heltec_v4_oled
-build_flags =
-  ${heltec_v4_oled.build_flags}
-  -D ADVERT_NAME='"Heltec v4 Sensor"'
-  -D ADVERT_LAT=0.0
-  -D ADVERT_LON=0.0
-  -D ADMIN_PASSWORD='"password"'
-  -D ENV_PIN_SDA=3
-  -D ENV_PIN_SCL=4
-  -D DISPLAY_CLASS=SSD1306Display
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-build_src_filter = ${heltec_v4_oled.build_src_filter}
-  +<helpers/ui/SSD1306Display.cpp>
-  +<../examples/simple_sensor>
-lib_deps =
-  ${heltec_v4_oled.lib_deps}
-  ${esp32_ota.lib_deps}
-
-
-[env:heltec_v4_tft_repeater]
-extends = heltec_v4_tft
-build_flags =
-  ${heltec_v4_tft.build_flags}
-  -D DISPLAY_CLASS=ST7789LCDDisplay
-  -D ADVERT_NAME='"Heltec Repeater"'
-  -D ADVERT_LAT=0.0
-  -D ADVERT_LON=0.0
-  -D ADMIN_PASSWORD='"password"'
-  -D MAX_NEIGHBOURS=50
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-build_src_filter = ${heltec_v4_tft.build_src_filter}
-  +<helpers/ui/ST7789LCDDisplay.cpp>
-  +<../examples/simple_repeater>
-lib_deps =
-  ${heltec_v4_tft.lib_deps}
-  ${esp32_ota.lib_deps}
-  bakercp/CRC32 @ ^2.0.0
-
-
-[env:heltec_v4_tft_repeater_bridge_espnow]
-extends = heltec_v4_tft
-build_flags =
-  ${heltec_v4_tft.build_flags}
-  -D DISPLAY_CLASS=ST7789LCDDisplay
-  -D ADVERT_NAME='"ESPNow Bridge"'
-  -D ADVERT_LAT=0.0
-  -D ADVERT_LON=0.0
-  -D ADMIN_PASSWORD='"password"'
-  -D MAX_NEIGHBOURS=50
-  -D WITH_ESPNOW_BRIDGE=1
-;  -D BRIDGE_DEBUG=1
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-build_src_filter = ${heltec_v4_tft.build_src_filter}
-  +<helpers/bridges/ESPNowBridge.cpp>
-  +<helpers/ui/ST7789LCDDisplay.cpp>
-  +<../examples/simple_repeater>
-lib_deps =
-  ${heltec_v4_tft.lib_deps}
-  ${esp32_ota.lib_deps}
-
-[env:heltec_v4_tft_room_server]
-extends = heltec_v4_tft
-build_flags =
-  ${heltec_v4_tft.build_flags}
-  -D DISPLAY_CLASS=ST7789LCDDisplay
-  -D ADVERT_NAME='"Heltec Room"'
-  -D ADVERT_LAT=0.0
-  -D ADVERT_LON=0.0
-  -D ADMIN_PASSWORD='"password"'
-  -D ROOM_PASSWORD='"hello"'
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-build_src_filter = ${heltec_v4_tft.build_src_filter}
-  +<helpers/ui/ST7789LCDDisplay.cpp>
-  +<../examples/simple_room_server>
-lib_deps =
-  ${heltec_v4_tft.lib_deps}
-  ${esp32_ota.lib_deps}
-
-[env:heltec_v4_tft_terminal_chat]
-extends = heltec_v4_tft
-build_flags =
-  ${heltec_v4_tft.build_flags}
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=1
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-build_src_filter = ${heltec_v4_tft.build_src_filter}
-  +<../examples/simple_secure_chat/main.cpp>
-lib_deps =
-  ${heltec_v4_tft.lib_deps}
-  densaugeo/base64 @ ~1.4.0
-
-[env:heltec_v4_tft_companion_radio_usb]
-extends = heltec_v4_tft
-build_flags =
-  ${heltec_v4_tft.build_flags}
-  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
-  -D DISPLAY_CLASS=ST7789LCDDisplay
-; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
-; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
-build_src_filter = ${heltec_v4_tft.build_src_filter}
-  +<helpers/ui/ST7789LCDDisplay.cpp>
-  +<helpers/ui/MomentaryButton.cpp>
-  +<../examples/companion_radio/*.cpp>
-  +<../examples/companion_radio/ui-new/*.cpp>
-lib_deps =
-  ${heltec_v4_tft.lib_deps}
-  densaugeo/base64 @ ~1.4.0
-
-[env:heltec_v4_tft_companion_radio_ble]
-extends = heltec_v4_tft
-build_flags =
-  ${heltec_v4_tft.build_flags}
-  -I examples/companion_radio/ui-new
-  -D DISPLAY_CLASS=ST7789LCDDisplay
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
-  -D BLE_PIN_CODE=123456   ; dynamic, random PIN
-  -D AUTO_SHUTDOWN_MILLIVOLTS=3400
-  -D BLE_DEBUG_LOGGING=1
   -D OFFLINE_QUEUE_SIZE=256
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${heltec_v4_tft.build_src_filter}
-  +<helpers/ui/ST7789LCDDisplay.cpp>
+build_src_filter = ${Heltec_lora32_v4.build_src_filter}
+  +<helpers/ui/SSD1306Display.cpp>
   +<helpers/ui/MomentaryButton.cpp>
   +<helpers/esp32/*.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps =
-  ${heltec_v4_tft.lib_deps}
+  ${Heltec_lora32_v4.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-[env:heltec_v4_tft_companion_radio_wifi]
-extends = heltec_v4_tft
+[env:heltec_v4_sensor]
+extends = Heltec_lora32_v4
 build_flags =
-  ${heltec_v4_tft.build_flags}
-  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
-  -D DISPLAY_CLASS=ST7789LCDDisplay
-  -D WIFI_DEBUG_LOGGING=1
-  -D WIFI_SSID='"myssid"'
-  -D WIFI_PWD='"mypwd"'
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-build_src_filter = ${heltec_v4_tft.build_src_filter}
-  +<helpers/ui/ST7789LCDDisplay.cpp>
-  +<helpers/ui/MomentaryButton.cpp>
-  +<helpers/esp32/*.cpp>
-  +<../examples/companion_radio/*.cpp>
-  +<../examples/companion_radio/ui-new/*.cpp>
-lib_deps =
-  ${heltec_v4_tft.lib_deps}
-  densaugeo/base64 @ ~1.4.0
-
-[env:heltec_v4_tft_sensor]
-extends = heltec_v4_tft
-build_flags =
-  ${heltec_v4_tft.build_flags}
-  -D ADVERT_NAME='"Heltec v4 Sensor"'
+  ${Heltec_lora32_v4.build_flags}
+  -D ADVERT_NAME='"Heltec v3 Sensor"'
   -D ADVERT_LAT=0.0
   -D ADVERT_LON=0.0
   -D ADMIN_PASSWORD='"password"'
   -D ENV_PIN_SDA=3
   -D ENV_PIN_SCL=4
-  -D DISPLAY_CLASS=ST7789LCDDisplay
+  -D DISPLAY_CLASS=SSD1306Display
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${heltec_v4_tft.build_src_filter}
-  +<helpers/ui/ST7789LCDDisplay.cpp>
+build_src_filter = ${Heltec_lora32_v4.build_src_filter}
+  +<helpers/ui/SSD1306Display.cpp>
   +<../examples/simple_sensor>
 lib_deps =
-  ${heltec_v4_tft.lib_deps}
+  ${Heltec_lora32_v4.lib_deps}
   ${esp32_ota.lib_deps}

variants/heltec_v4/target.cpp

@@ -24,7 +24,7 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock);
 #endif
 
 #ifdef DISPLAY_CLASS
-  DISPLAY_CLASS display(&(board.periph_power));
+  DISPLAY_CLASS display;
   MomentaryButton user_btn(PIN_USER_BTN, 1000, true);
 #endif
 

variants/heltec_v4/target.h

@@ -9,11 +9,7 @@
 #include <helpers/SensorManager.h>
 #include <helpers/sensors/EnvironmentSensorManager.h>
 #ifdef DISPLAY_CLASS
-#ifdef HELTEC_LORA_V4_OLED
-    #include <helpers/ui/SSD1306Display.h>
-#elif defined(HELTEC_LORA_V4_TFT)
-    #include <helpers/ui/ST7789LCDDisplay.h>
-#endif
+  #include <helpers/ui/SSD1306Display.h>
   #include <helpers/ui/MomentaryButton.h>
 #endif
 

variants/ikoka_handheld_nrf/IkokaNrf52Board.h

@@ -6,9 +6,9 @@
 
 #ifdef IKOKA_NRF52
 
-class IkokaNrf52Board : public NRF52BoardDCDC {
+class IkokaNrf52Board : public NRF52BoardOTA {
 public:
-  IkokaNrf52Board() : NRF52Board("XIAO_NRF52_OTA") {}
+  IkokaNrf52Board() : NRF52BoardOTA("XIAO_NRF52_OTA") {}
   void begin();
 
 #if defined(P_LORA_TX_LED)

variants/ikoka_nano_nrf/IkokaNanoNRFBoard.h

@@ -6,9 +6,9 @@
 
 #ifdef XIAO_NRF52
 
-class IkokaNanoNRFBoard : public NRF52BoardDCDC {
+class IkokaNanoNRFBoard : public NRF52BoardOTA {
 public:
-  IkokaNanoNRFBoard() : NRF52Board("XIAO_NRF52_OTA") {}
+  IkokaNanoNRFBoard() : NRF52BoardOTA("XIAO_NRF52_OTA") {}
   void begin();
 
 #if defined(P_LORA_TX_LED)

variants/ikoka_stick_nrf/IkokaStickNRFBoard.h

@@ -6,9 +6,9 @@
 
 #ifdef XIAO_NRF52
 
-class IkokaStickNRFBoard : public NRF52BoardDCDC {
+class IkokaStickNRFBoard : public NRF52BoardOTA {
 public:
-  IkokaStickNRFBoard() : NRF52Board("XIAO_NRF52_OTA") {}
+  IkokaStickNRFBoard() : NRF52BoardOTA("XIAO_NRF52_OTA") {}
   void begin();
 
 #if defined(P_LORA_TX_LED)

variants/keepteen_lt1/KeepteenLT1Board.h

@@ -4,12 +4,12 @@
 #include <Arduino.h>
 #include <helpers/NRF52Board.h>
 
-class KeepteenLT1Board : public NRF52Board {
+class KeepteenLT1Board : public NRF52BoardOTA {
 protected:
   uint8_t btn_prev_state;
 
 public:
-  KeepteenLT1Board() : NRF52Board("KeepteenLT1_OTA") {}
+  KeepteenLT1Board() : NRF52BoardOTA("KeepteenLT1_OTA") {}
   void begin();
 
   #define BATTERY_SAMPLES 8

variants/lilygo_tbeam_1w/TBeam1WBoard.cpp

@@ -1,71 +0,0 @@
-#include "TBeam1WBoard.h"
-
-void TBeam1WBoard::begin() {
-  ESP32Board::begin();
-
-  // Power on radio module (must be done before radio init)
-  pinMode(SX126X_POWER_EN, OUTPUT);
-  digitalWrite(SX126X_POWER_EN, HIGH);
-  radio_powered = true;
-  delay(10);  // Allow radio to power up
-
-  // RF switch RXEN pin handled by RadioLib via setRfSwitchPins()
-
-  // Initialize LED
-  pinMode(LED_PIN, OUTPUT);
-  digitalWrite(LED_PIN, LOW);
-
-  // Initialize fan control (on by default - 1W PA can overheat)
-  pinMode(FAN_CTRL_PIN, OUTPUT);
-  digitalWrite(FAN_CTRL_PIN, HIGH);
-}
-
-void TBeam1WBoard::onBeforeTransmit() {
-  // RF switching handled by RadioLib via SX126X_DIO2_AS_RF_SWITCH and setRfSwitchPins()
-  digitalWrite(LED_PIN, HIGH);  // TX LED on
-}
-
-void TBeam1WBoard::onAfterTransmit() {
-  digitalWrite(LED_PIN, LOW);   // TX LED off
-}
-
-uint16_t TBeam1WBoard::getBattMilliVolts() {
-  // T-Beam 1W uses 7.4V battery with voltage divider
-  // ADC reads through divider - adjust multiplier based on actual divider ratio
-  analogReadResolution(12);
-  uint32_t raw = 0;
-  for (int i = 0; i < 8; i++) {
-    raw += analogRead(BATTERY_PIN);
-  }
-  raw = raw / 8;
-  // Assuming voltage divider ratio from ADC_MULTIPLIER
-  // 3.3V reference, 12-bit ADC (4095 max)
-  return static_cast<uint16_t>((raw * 3300 * ADC_MULTIPLIER) / 4095);
-}
-
-const char* TBeam1WBoard::getManufacturerName() const {
-  return "LilyGo T-Beam 1W";
-}
-
-void TBeam1WBoard::powerOff() {
-  // Turn off radio LNA (CTRL pin must be LOW when not receiving)
-  digitalWrite(SX126X_RXEN, LOW);
-
-  // Turn off radio power
-  digitalWrite(SX126X_POWER_EN, LOW);
-  radio_powered = false;
-
-  // Turn off LED and fan
-  digitalWrite(LED_PIN, LOW);
-  digitalWrite(FAN_CTRL_PIN, LOW);
-
-  ESP32Board::powerOff();
-}
-
-void TBeam1WBoard::setFanEnabled(bool enabled) {
-  digitalWrite(FAN_CTRL_PIN, enabled ? HIGH : LOW);
-}
-
-bool TBeam1WBoard::isFanEnabled() const {
-  return digitalRead(FAN_CTRL_PIN) == HIGH;
-}

variants/lilygo_tbeam_1w/TBeam1WBoard.h

@@ -1,45 +0,0 @@
-#pragma once
-
-#include <Arduino.h>
-#include <helpers/ESP32Board.h>
-#include "variant.h"
-
-// LilyGo T-Beam 1W with SX1262 + external PA (XY16P35 module)
-//
-// Power architecture (LDO is separate chip on T-Beam board, not inside XY16P35):
-//
-//   VCC (+4.0~+8.0V) ──┬──────────────────► XY16P35 VCC pin 5 (PA direct)
-//   (USB or Battery)   │
-//                      │   ┌───────────┐
-//                      └──►│ LDO Chip  │──► +3.3V ──► XY16P35 (SX1262 + LNA)
-//                          │ EN=GPIO40 │
-//                          └───────────┘
-//                      LDO_EN (GPIO 40): H @ +1.2V~VIN, active high, not floating
-//
-// Control signals:
-//   - LDO_EN (GPIO 40): HIGH enables LDO → powers SX1262 + LNA
-//   - TCXO_EN (DIO3):   HIGH enables TCXO (set to 1.8V per Meshtastic)
-//   - CTL (GPIO 21):    HIGH=RX (LNA on), LOW=TX (LNA off)
-//   - DIO2:             AUTO via SX126X_DIO2_AS_RF_SWITCH (TX path)
-//
-// Power notes:
-//   - PA needs VCC 4.0-8.0V for full 32dBm output
-//   - USB-C (3.9-6V) marginal; 7.4V battery recommended
-//   - Battery must support 2A+ discharge for high-power TX
-
-class TBeam1WBoard : public ESP32Board {
-private:
-  bool radio_powered = false;
-
-public:
-  void begin();
-  void onBeforeTransmit() override;
-  void onAfterTransmit() override;
-  uint16_t getBattMilliVolts() override;
-  const char* getManufacturerName() const override;
-  void powerOff() override;
-
-  // Fan control methods
-  void setFanEnabled(bool enabled);
-  bool isFanEnabled() const;
-};

variants/lilygo_tbeam_1w/pins_arduino.h

@@ -1,26 +0,0 @@
-#ifndef Pins_Arduino_h
-#define Pins_Arduino_h
-
-#include <stdint.h>
-
-#define USB_VID 0x303a
-#define USB_PID 0x1001
-
-// Serial (USB CDC)
-static const uint8_t TX = 43;
-static const uint8_t RX = 44;
-
-// I2C for OLED and sensors
-static const uint8_t SDA = 8;
-static const uint8_t SCL = 9;
-
-// Default SPI mapped to Radio/SD
-static const uint8_t SS = 15;   // LoRa CS
-static const uint8_t MOSI = 11;
-static const uint8_t MISO = 12;
-static const uint8_t SCK = 13;
-
-// SD Card CS
-#define SDCARD_CS 10
-
-#endif /* Pins_Arduino_h */

variants/lilygo_tbeam_1w/platformio.ini

@@ -1,193 +0,0 @@
-[LilyGo_TBeam_1W]
-extends = esp32_base
-board = t_beam_1w
-build_flags =
-  ${esp32_base.build_flags}
-  -I variants/lilygo_tbeam_1w
-  -D TBEAM_1W
-
-  ; Radio - SX1262 with high-power PA (32dBm max output)
-  ; Note: Set SX1262 output to 22dBm max, external PA provides additional gain
-  -D RADIO_CLASS=CustomSX1262
-  -D WRAPPER_CLASS=CustomSX1262Wrapper
-  -D P_LORA_DIO_1=1
-  -D P_LORA_NSS=15
-  -D P_LORA_RESET=3
-  -D P_LORA_BUSY=38
-  -D P_LORA_SCLK=13
-  -D P_LORA_MISO=12
-  -D P_LORA_MOSI=11
-
-  ; RF switch configuration:
-  ;   DIO2 controls TX path (PA enable) via SX126X_DIO2_AS_RF_SWITCH
-  ;   GPIO21 controls RX path (LNA enable) via SX126X_RXEN
-  ; Truth table: DIO2=1,RXEN=0 → TX | DIO2=0,RXEN=1 → RX
-  -D SX126X_DIO2_AS_RF_SWITCH=true
-  -D SX126X_RXEN=21
-  -D SX126X_DIO3_TCXO_VOLTAGE=3.0
-  -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
-
-  ; TX power: 22dBm to SX1262, PA module adds ~10dB for 32dBm total
-  -D LORA_TX_POWER=22
-
-  ; Battery - 2S 7.4V LiPo (6.0V min, 8.4V max)
-  -D BATT_MIN_MILLIVOLTS=6000
-  -D BATT_MAX_MILLIVOLTS=8400
-
-  ; Display - SH1106 OLED at 0x3C
-  -D DISPLAY_CLASS=SH1106Display
-
-  ; I2C pins
-  -D PIN_BOARD_SDA=8
-  -D PIN_BOARD_SCL=9
-
-  ; GPS - L76K module
-  ; GNSS_TXD (IO5) = GPS transmits → MCU RX
-  ; GNSS_RXD (IO6) = GPS receives → MCU TX
-  -D PIN_GPS_TX=5
-  -D PIN_GPS_RX=6
-  -D PIN_GPS_EN=16
-  -D ENV_INCLUDE_GPS=1
-
-  ; User interface
-  -D PIN_USER_BTN=17
-
-build_src_filter = ${esp32_base.build_src_filter}
-  +<../variants/lilygo_tbeam_1w>
-  +<helpers/ui/SH1106Display.cpp>
-  +<helpers/ui/MomentaryButton.cpp>
-  +<helpers/sensors>
-
-lib_deps =
-  ${esp32_base.lib_deps}
-  adafruit/Adafruit SH110X @ ~2.1.13
-  stevemarple/MicroNMEA @ ~2.0.6
-
-; === LILYGO T-Beam 1W Repeater ===
-[env:LilyGo_TBeam_1W_repeater]
-extends = LilyGo_TBeam_1W
-build_flags =
-  ${LilyGo_TBeam_1W.build_flags}
-  -D ADVERT_NAME='"T-Beam 1W Repeater"'
-  -D ADVERT_LAT=0.0
-  -D ADVERT_LON=0.0
-  -D ADMIN_PASSWORD='"password"'
-  -D MAX_NEIGHBOURS=50
-  -D PERSISTANT_GPS=1
-  -D ENV_SKIP_GPS_DETECT=1
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-build_src_filter = ${LilyGo_TBeam_1W.build_src_filter}
-  +<../examples/simple_repeater>
-lib_deps =
-  ${LilyGo_TBeam_1W.lib_deps}
-  ${esp32_ota.lib_deps}
-
-; === LILYGO T-Beam 1W Room Server ===
-[env:LilyGo_TBeam_1W_room_server]
-extends = LilyGo_TBeam_1W
-build_flags =
-  ${LilyGo_TBeam_1W.build_flags}
-  -D ADVERT_NAME='"T-Beam 1W Room"'
-  -D ADVERT_LAT=0.0
-  -D ADVERT_LON=0.0
-  -D ADMIN_PASSWORD='"password"'
-  -D ROOM_PASSWORD='"hello"'
-  -D PERSISTANT_GPS=1
-  -D ENV_SKIP_GPS_DETECT=1
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-build_src_filter = ${LilyGo_TBeam_1W.build_src_filter}
-  +<../examples/simple_room_server>
-lib_deps =
-  ${LilyGo_TBeam_1W.lib_deps}
-  ${esp32_ota.lib_deps}
-
-; === LILYGO T-Beam 1W Companion Radio (USB) ===
-[env:LilyGo_TBeam_1W_companion_radio_usb]
-extends = LilyGo_TBeam_1W
-build_flags =
-  ${LilyGo_TBeam_1W.build_flags}
-  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
-  -D PERSISTANT_GPS=1
-  -D ENV_SKIP_GPS_DETECT=1
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-build_src_filter = ${LilyGo_TBeam_1W.build_src_filter}
-  +<../examples/companion_radio/*.cpp>
-  +<../examples/companion_radio/ui-new/*.cpp>
-lib_deps =
-  ${LilyGo_TBeam_1W.lib_deps}
-  densaugeo/base64 @ ~1.4.0
-
-; === LILYGO T-Beam 1W Companion Radio (BLE) ===
-[env:LilyGo_TBeam_1W_companion_radio_ble]
-extends = LilyGo_TBeam_1W
-build_flags =
-  ${LilyGo_TBeam_1W.build_flags}
-  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
-  -D BLE_PIN_CODE=123456
-  -D OFFLINE_QUEUE_SIZE=256
-  -D PERSISTANT_GPS=1
-  -D ENV_SKIP_GPS_DETECT=1
-;  -D BLE_DEBUG_LOGGING=1
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-build_src_filter = ${LilyGo_TBeam_1W.build_src_filter}
-  +<helpers/esp32/*.cpp>
-  +<../examples/companion_radio/*.cpp>
-  +<../examples/companion_radio/ui-new/*.cpp>
-lib_deps =
-  ${LilyGo_TBeam_1W.lib_deps}
-  densaugeo/base64 @ ~1.4.0
-
-; === LILYGO T-Beam 1W Companion Radio (WiFi) ===
-[env:LilyGo_TBeam_1W_companion_radio_wifi]
-extends = LilyGo_TBeam_1W
-build_flags =
-  ${LilyGo_TBeam_1W.build_flags}
-  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
-  -D WIFI_DEBUG_LOGGING=1
-  -D WIFI_SSID='"myssid"'
-  -D WIFI_PWD='"mypwd"'
-  -D PERSISTANT_GPS=1
-  -D ENV_SKIP_GPS_DETECT=1
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-build_src_filter = ${LilyGo_TBeam_1W.build_src_filter}
-  +<helpers/esp32/*.cpp>
-  +<../examples/companion_radio/*.cpp>
-  +<../examples/companion_radio/ui-new/*.cpp>
-lib_deps =
-  ${LilyGo_TBeam_1W.lib_deps}
-  densaugeo/base64 @ ~1.4.0
-
-; === LILYGO T-Beam 1W Repeater with ESPNow Bridge ===
-[env:LilyGo_TBeam_1W_repeater_bridge_espnow]
-extends = LilyGo_TBeam_1W
-build_flags =
-  ${LilyGo_TBeam_1W.build_flags}
-  -D ADVERT_NAME='"T-Beam 1W ESPNow Bridge"'
-  -D ADVERT_LAT=0.0
-  -D ADVERT_LON=0.0
-  -D ADMIN_PASSWORD='"password"'
-  -D MAX_NEIGHBOURS=50
-  -D WITH_ESPNOW_BRIDGE=1
-  -D PERSISTANT_GPS=1
-  -D ENV_SKIP_GPS_DETECT=1
-;  -D BRIDGE_DEBUG=1
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-build_src_filter = ${LilyGo_TBeam_1W.build_src_filter}
-  +<helpers/bridges/ESPNowBridge.cpp>
-  +<../examples/simple_repeater>
-lib_deps =
-  ${LilyGo_TBeam_1W.lib_deps}
-  ${esp32_ota.lib_deps}

variants/lilygo_tbeam_1w/target.cpp

@@ -1,64 +0,0 @@
-#include <Arduino.h>
-#include "target.h"
-
-TBeam1WBoard board;
-
-#ifdef DISPLAY_CLASS
-  DISPLAY_CLASS display;
-  MomentaryButton user_btn(PIN_USER_BTN, 1000, true);
-#endif
-
-static SPIClass spi;
-
-RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, spi);
-
-WRAPPER_CLASS radio_driver(radio, board);
-
-ESP32RTCClock fallback_clock;
-AutoDiscoverRTCClock rtc_clock(fallback_clock);
-
-#if ENV_INCLUDE_GPS
-  #include <helpers/sensors/MicroNMEALocationProvider.h>
-  MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1);
-  EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea);
-#else
-  EnvironmentSensorManager sensors;
-#endif
-
-bool radio_init() {
-  fallback_clock.begin();
-  rtc_clock.begin(Wire);
-
-  // Initialize SPI for radio
-  spi.begin(P_LORA_SCLK, P_LORA_MISO, P_LORA_MOSI);
-
-  // GPS serial initialized by EnvironmentSensorManager::begin()
-
-  bool success = radio.std_init(&spi);
-  if (success) {
-    // T-Beam 1W has external PA requiring longer ramp time (>800us recommended)
-    // RADIOLIB_SX126X_PA_RAMP_800U = 0x05
-    radio.setTxParams(LORA_TX_POWER, RADIOLIB_SX126X_PA_RAMP_800U);
-  }
-  return success;
-}
-
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(uint8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
-mesh::LocalIdentity radio_new_identity() {
-  RadioNoiseListener rng(radio);
-  return mesh::LocalIdentity(&rng);
-}

variants/lilygo_tbeam_1w/target.h

@@ -1,27 +0,0 @@
-#pragma once
-
-#define RADIOLIB_STATIC_ONLY 1
-#include <RadioLib.h>
-#include <helpers/radiolib/RadioLibWrappers.h>
-#include <helpers/radiolib/CustomSX1262Wrapper.h>
-#include <helpers/AutoDiscoverRTCClock.h>
-#include <helpers/sensors/EnvironmentSensorManager.h>
-#include "TBeam1WBoard.h"
-
-#ifdef DISPLAY_CLASS
-  #include <helpers/ui/SH1106Display.h>
-  #include <helpers/ui/MomentaryButton.h>
-  extern DISPLAY_CLASS display;
-  extern MomentaryButton user_btn;
-#endif
-
-extern TBeam1WBoard board;
-extern WRAPPER_CLASS radio_driver;
-extern AutoDiscoverRTCClock rtc_clock;
-extern EnvironmentSensorManager sensors;
-
-bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(uint8_t dbm);
-mesh::LocalIdentity radio_new_identity();

variants/lilygo_tbeam_1w/variant.h

@@ -1,96 +0,0 @@
-// LilyGo T-Beam-1W variant.h
-// Configuration based on Meshtastic PR #8967 and LilyGO documentation
-
-#pragma once
-
-// I2C for OLED display (SH1106 at 0x3C)
-#define I2C_SDA 8
-#define I2C_SCL 9
-
-// GPS - Quectel L76K
-// GNSS_TXD (IO5) = GPS transmits → MCU RX (setPins rxPin)
-// GNSS_RXD (IO6) = GPS receives → MCU TX (setPins txPin)
-#define PIN_GPS_TX 5       // MCU receives from GPS TX
-#define PIN_GPS_RX 6       // MCU transmits to GPS RX
-#define PIN_GPS_PPS 7      // GPS PPS output
-#define PIN_GPS_EN 16      // GPS wake-up/enable (GPS_EN_PIN in LilyGO code)
-#define HAS_GPS 1
-#define GPS_BAUDRATE 9600
-
-// Buttons
-#define BUTTON_PIN 0         // BUTTON 1 (boot)
-#define BUTTON_PIN_ALT 17    // BUTTON 2
-
-// SPI (shared by LoRa and SD)
-#define SPI_MOSI 11
-#define SPI_SCK 13
-#define SPI_MISO 12
-#define SPI_CS 10
-
-// SD Card
-#define HAS_SDCARD
-#define SDCARD_USE_SPI1
-#define SDCARD_CS SPI_CS
-
-// LoRa Radio - SX1262 with 1W PA
-#define USE_SX1262
-
-#define LORA_SCK SPI_SCK
-#define LORA_MISO SPI_MISO
-#define LORA_MOSI SPI_MOSI
-#define LORA_CS 15
-#define LORA_RESET 3
-#define LORA_DIO1 1
-#define LORA_BUSY 38
-
-// CRITICAL: Radio power enable - MUST be HIGH before lora.begin()!
-// GPIO 40 powers the SX1262 + PA module via LDO
-#define SX126X_POWER_EN 40
-
-#ifdef USE_SX1262
-#define SX126X_CS LORA_CS
-#define SX126X_DIO1 LORA_DIO1
-#define SX126X_BUSY LORA_BUSY
-#define SX126X_RESET LORA_RESET
-
-// RF switching configuration for 1W PA module
-// DIO2 controls PA (via SX126X_DIO2_AS_RF_SWITCH)
-// CTRL PIN (GPIO 21) controls LNA - must be HIGH during RX
-// Truth table: DIO2=1,CTRL=0 -> TX (PA on, LNA off)
-//              DIO2=0,CTRL=1 -> RX (PA off, LNA on)
-#define SX126X_DIO2_AS_RF_SWITCH
-#define SX126X_RXEN 21  // LNA enable - HIGH during RX
-
-// TCXO voltage - required for radio init
-#define SX126X_DIO3_TCXO_VOLTAGE 3.0
-
-#define SX126X_MAX_POWER 22
-#endif
-
-// LED
-#define LED_PIN 18
-#define LED_STATE_ON 1  // HIGH = ON
-
-// Battery ADC
-#define BATTERY_PIN 4
-#define ADC_CHANNEL ADC1_GPIO4_CHANNEL
-#define BATTERY_SENSE_SAMPLES 30
-#define ADC_MULTIPLIER 3.0
-
-// NTC temperature sensor
-#define NTC_PIN 14
-
-// Fan control
-#define FAN_CTRL_PIN 41
-
-// PA Ramp Time - T-Beam 1W requires >800us stabilization (default is 200us)
-// Value 0x05 = RADIOLIB_SX126X_PA_RAMP_800U
-#define SX126X_PA_RAMP_US 0x05
-
-// Display - SH1106 OLED (128x64)
-#define USE_SH1106
-#define OLED_WIDTH 128
-#define OLED_HEIGHT 64
-
-// 32768 Hz crystal present
-#define HAS_32768HZ 1

variants/lilygo_techo/TechoBoard.h

@@ -13,9 +13,9 @@
 #define PIN_VBAT_READ     (4)
 #define REAL_VBAT_MV_PER_LSB (VBAT_DIVIDER_COMP * VBAT_MV_PER_LSB)
 
-class TechoBoard : public NRF52BoardDCDC {
+class TechoBoard : public NRF52BoardOTA {
 public:
-  TechoBoard() : NRF52Board("TECHO_OTA") {}
+  TechoBoard() : NRF52BoardOTA("TECHO_OTA") {}
   void begin();
   uint16_t getBattMilliVolts() override;
 

variants/lilygo_techo_lite/TechoBoard.h

@@ -13,9 +13,9 @@
 #define PIN_VBAT_READ     (4)
 #define REAL_VBAT_MV_PER_LSB (VBAT_DIVIDER_COMP * VBAT_MV_PER_LSB)
 
-class TechoBoard : public NRF52BoardDCDC {
+class TechoBoard : public NRF52BoardOTA {
 public:
-  TechoBoard() : NRF52Board("TECHO_OTA") {}
+  TechoBoard() : NRF52BoardOTA("TECHO_OTA") {}
   void begin();
   uint16_t getBattMilliVolts() override;
 

variants/mesh_pocket/MeshPocket.h

@@ -9,9 +9,9 @@
 #define  PIN_BAT_CTL      34
 #define  MV_LSB   (3000.0F / 4096.0F) // 12-bit ADC with 3.0V input range
 
-class HeltecMeshPocket : public NRF52BoardDCDC {
+class HeltecMeshPocket : public NRF52BoardOTA {
 public:
-  HeltecMeshPocket() : NRF52Board("MESH_POCKET_OTA") {}
+  HeltecMeshPocket() : NRF52BoardOTA("MESH_POCKET_OTA") {}
   void begin();
 
   uint16_t getBattMilliVolts() override {

variants/meshtiny/MeshtinyBoard.cpp

@@ -1,44 +0,0 @@
-#include "MeshtinyBoard.h"
-
-#include <Arduino.h>
-#include <Wire.h>
-#include <bluefruit.h>
-
-static BLEDfu bledfu;
-
-static void connect_callback(uint16_t conn_handle) {
-  (void)conn_handle;
-  MESH_DEBUG_PRINTLN("BLE client connected");
-}
-
-static void disconnect_callback(uint16_t conn_handle, uint8_t reason) {
-  (void)conn_handle;
-  (void)reason;
-
-  MESH_DEBUG_PRINTLN("BLE client disconnected");
-}
-
-void MeshtinyBoard::begin() {
-  NRF52BoardDCDC::begin();
-  btn_prev_state = HIGH;
-
-  pinMode(PIN_VBAT_READ, INPUT); // VBAT ADC input
-
-  // Set all button pins to INPUT_PULLUP
-  pinMode(PIN_BUTTON1, INPUT_PULLUP);
-  pinMode(PIN_BUTTON2, INPUT_PULLUP);
-  pinMode(PIN_BUTTON3, INPUT_PULLUP);
-  pinMode(PIN_BUTTON4, INPUT_PULLUP);
-
-#if defined(PIN_WIRE_SDA) && defined(PIN_WIRE_SCL)
-  Wire.setPins(PIN_WIRE_SDA, PIN_WIRE_SCL);
-#endif
-
-  Wire.begin();
-
-  pinMode(SX126X_POWER_EN, OUTPUT);
-  digitalWrite(SX126X_POWER_EN, HIGH);
-  delay(10);   // give sx1262 some time to power up
-}
-
-

variants/meshtiny/MeshtinyBoard.h

@@ -1,66 +0,0 @@
-#pragma once
-
-#include <Arduino.h>
-#include <MeshCore.h>
-#include <helpers/NRF52Board.h>
-
-class MeshtinyBoard : public NRF52BoardDCDC {
-protected:
-  uint8_t btn_prev_state;
-
-public:
-  MeshtinyBoard() : NRF52Board("Meshtiny OTA") {}
-  void begin();
-
-#if defined(P_LORA_TX_LED)
-  void onBeforeTransmit() override {
-    digitalWrite(P_LORA_TX_LED, HIGH);   // turn TX LED on
-  }
-  void onAfterTransmit() override {
-    digitalWrite(P_LORA_TX_LED, LOW);   // turn TX LED off
-  }
-#endif
-
-  uint16_t getBattMilliVolts() override {
-    int adcvalue = 0;
-    analogReadResolution(12);
-    analogReference(AR_INTERNAL_3_0);
-    delay(10);
-    adcvalue = analogRead(PIN_VBAT_READ);
-    return (adcvalue * ADC_MULTIPLIER * AREF_VOLTAGE) / 4.096;
-  }
-
-  const char *getManufacturerName() const override { return "Meshtiny"; }
-
-  void reboot() override { NVIC_SystemReset(); }
-
-  void powerOff() override {
-
-#ifdef PIN_USER_BTN
-    while (digitalRead(PIN_USER_BTN) == LOW) {
-      delay(10);
-    }
-#endif
-
-#ifdef PIN_3V3_EN
-    pinMode(PIN_3V3_EN, OUTPUT);
-    digitalWrite(PIN_3V3_EN, LOW);
-#endif
-
-
-#ifdef PIN_LED1
-    digitalWrite(PIN_LED1, LOW);
-#endif
-
-#ifdef PIN_LED2
-    digitalWrite(PIN_LED2, LOW);
-#endif
-
-#ifdef PIN_USER_BTN
-    nrf_gpio_cfg_sense_input(g_ADigitalPinMap[PIN_USER_BTN], NRF_GPIO_PIN_PULLUP, NRF_GPIO_PIN_SENSE_LOW);
-#endif
-
-    sd_power_system_off();
-  }
-
-};

variants/meshtiny/platformio.ini

@@ -1,68 +0,0 @@
-[Meshtiny]
-extends = nrf52_base
-board = meshtiny
-board_build.ldscript = boards/nrf52840_s140_v6.ld
-build_flags = ${nrf52_base.build_flags}
-  -I lib/nrf52/s140_nrf52_6.1.1_API/include
-  -I lib/nrf52/s140_nrf52_6.1.1_API/include/nrf52
-  -I variants/meshtiny
-  -D RADIO_CLASS=CustomSX1262
-  -D WRAPPER_CLASS=CustomSX1262Wrapper
-  -D LORA_TX_POWER=22
-  -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
-  -D PIN_3V3_EN=34
-  -D MESHTINY
-  -D UI_HAS_JOYSTICK
-build_src_filter = ${nrf52_base.build_src_filter}
-  +<../variants/meshtiny>
-  +<helpers/ui/SSD1306Display.cpp>
-  +<helpers/ui/buzzer.cpp>
-  +<helpers/sensors>
-lib_deps =
-  ${nrf52_base.lib_deps}
-  adafruit/Adafruit SSD1306 @ ^2.5.13
-  end2endzone/NonBlockingRTTTL@^1.3.0
-
-[env:Meshtiny_companion_radio_usb]
-extends = Meshtiny
-build_flags =
-  ${Meshtiny.build_flags}
-  -I examples/companion_radio/ui-new
-  -D MESHTINY
-  -D PIN_BUZZER=30
-  -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
-  -D OFFLINE_QUEUE_SIZE=256
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-build_src_filter = ${Meshtiny.build_src_filter}
-  +<../examples/companion_radio/*.cpp>
-  +<../examples/companion_radio/ui-new/*.cpp>
-lib_deps =
-  ${Meshtiny.lib_deps}
-  densaugeo/base64 @ ~1.4.0
-
-[env:Meshtiny_companion_radio_ble]
-extends = Meshtiny
-build_flags =
-  ${Meshtiny.build_flags}
-  -I examples/companion_radio/ui-new
-  -D MESHTINY
-  -D PIN_BUZZER=30
-  -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
-  -D BLE_PIN_CODE=123456
-  -D OFFLINE_QUEUE_SIZE=256
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-;  -D BLE_DEBUG_LOGGING=1
-build_src_filter = ${Meshtiny.build_src_filter}
-  +<helpers/nrf52/SerialBLEInterface.cpp>
-  +<../examples/companion_radio/*.cpp>
-  +<../examples/companion_radio/ui-new/*.cpp>
-lib_deps =
-  ${Meshtiny.lib_deps}
-  densaugeo/base64 @ ~1.4.0

variants/meshtiny/target.cpp

@@ -1,47 +0,0 @@
-#include "target.h"
-
-#include <Arduino.h>
-#include <helpers/ArduinoHelpers.h>
-
-MeshtinyBoard board;
-
-RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, SPI);
-
-WRAPPER_CLASS radio_driver(radio, board);
-
-VolatileRTCClock fallback_clock;
-AutoDiscoverRTCClock rtc_clock(fallback_clock);
-EnvironmentSensorManager sensors = EnvironmentSensorManager();
-
-#ifdef DISPLAY_CLASS
-DISPLAY_CLASS display;
-  MomentaryButton user_btn(ENCODER_PRESS, 1000, true, true);
-  MomentaryButton joystick_left(ENCODER_LEFT, 1000, true, true);
-  MomentaryButton joystick_right(ENCODER_RIGHT, 1000, true, true);
-  MomentaryButton back_btn(PIN_SIDE_BUTTON, 1000, true, true);
-#endif
-
-bool radio_init() {
-  rtc_clock.begin(Wire);
-  return radio.std_init(&SPI);
-}
-
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(uint8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
-mesh::LocalIdentity radio_new_identity() {
-  RadioNoiseListener rng(radio);
-  return mesh::LocalIdentity(&rng); // create new random identity
-}

variants/meshtiny/target.h

@@ -1,33 +0,0 @@
-#pragma once
-
-#define RADIOLIB_STATIC_ONLY 1
-#include <MeshtinyBoard.h>
-#include <RadioLib.h>
-#include <helpers/ArduinoHelpers.h>
-#include <helpers/AutoDiscoverRTCClock.h>
-#include <helpers/radiolib/CustomSX1262Wrapper.h>
-#include <helpers/radiolib/RadioLibWrappers.h>
-#ifdef DISPLAY_CLASS
-#include <helpers/ui/MomentaryButton.h>
-#include <helpers/ui/SSD1306Display.h>
-#endif
-#include <helpers/sensors/EnvironmentSensorManager.h>
-
-extern MeshtinyBoard board;
-extern WRAPPER_CLASS radio_driver;
-extern AutoDiscoverRTCClock rtc_clock;
-extern EnvironmentSensorManager sensors;
-
-#ifdef DISPLAY_CLASS
-extern DISPLAY_CLASS display;
-extern MomentaryButton user_btn;
-extern MomentaryButton joystick_left;
-extern MomentaryButton joystick_right;
-extern MomentaryButton back_btn;
-#endif
-
-bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(uint8_t dbm);
-mesh::LocalIdentity radio_new_identity();

variants/meshtiny/variant.cpp

@@ -1,51 +0,0 @@
-/*
-  Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
-  Copyright (c) 2016 Sandeep Mistry All right reserved.
-  Copyright (c) 2018, Adafruit Industries (adafruit.com)
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the GNU Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#include "variant.h"
-
-#include "nrf.h"
-#include "wiring_constants.h"
-#include "wiring_digital.h"
-
-const uint32_t g_ADigitalPinMap[] = {
-  // P0
-  0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
-  29, 30, 31,
-
-  // P1
-  32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47
-};
-
-void initVariant() {
-  // LED1 & LED2
-#ifdef PIN_LED1
-  pinMode(PIN_LED1, OUTPUT);
-  ledOff(PIN_LED1);
-#endif
-
-#ifdef PIN_LED2
-  pinMode(PIN_LED2, OUTPUT);
-  ledOff(PIN_LED2);
-#endif
-
-  // 3V3 Power Rail - nothing connected on meshtiny
-  pinMode(PIN_3V3_EN, OUTPUT);
-  digitalWrite(PIN_3V3_EN, LOW);
-}

variants/meshtiny/variant.h

@@ -1,98 +0,0 @@
-#ifndef _MESHTINY_H_
-#define _MESHTINY_H_
-
-/** Master clock frequency */
-#define VARIANT_MCK                     (64000000ul)
-
-#define USE_LFXO                        // Board uses 32khz crystal for LF
-
-/*----------------------------------------------------------------------------
- *        Headers
- *----------------------------------------------------------------------------*/
-
-#include "WVariant.h"
-
-#define PINS_COUNT                      (48)
-#define NUM_DIGITAL_PINS                (48)
-#define NUM_ANALOG_INPUTS               (6)
-#define NUM_ANALOG_OUTPUTS              (0)
-
-// LEDs
-#define PIN_LED1                        (35) // Green LED
-#define PIN_LED2                        (36) // Blue LED
-
-#define LED_RED                         (-1)
-#define LED_GREEN                       PIN_LED1
-#define LED_BLUE                        (-1)  // Disable annoying flashing caused by Bluefruit
-
-#define P_LORA_TX_LED                   PIN_LED2 // Blue LED
-// #define PIN_STATUS_LED                  LED_GREEN  // disable status led.
-#define LED_BUILTIN                     LED_GREEN
-#define PIN_LED                         LED_BUILTIN
-#define LED_PIN                         LED_BUILTIN
-#define LED_STATE_ON                    HIGH
-
-// Buttons
-#define PIN_BUTTON1                     (9)   // side button
-#define PIN_BUTTON2                     (4)   // encoder left
-#define PIN_BUTTON3                     (26)  // encoder right
-#define PIN_BUTTON4                     (28)  // encoder press
-#define PIN_SIDE_BUTTON                 PIN_BUTTON1
-#define ENCODER_LEFT                    PIN_BUTTON2
-#define ENCODER_RIGHT                   PIN_BUTTON3
-#define ENCODER_PRESS                   PIN_BUTTON4
-#define PIN_USER_BTN                    PIN_SIDE_BUTTON
-
-// VBAT sensing
-#define PIN_VBAT_READ                   (5)
-#define BATTERY_SENSE_RESOLUTION_BITS   12
-#define BATTERY_SENSE_RESOLUTION        4096.0
-#define AREF_VOLTAGE                    3.0
-#define VBAT_AR_INTERNAL                AR_INTERNAL_3_0
-#define ADC_MULTIPLIER                  1.73
-#define ADC_RESOLUTION                  14
-
-// Serial interfaces
-#define PIN_SERIAL1_RX                  (15)
-#define PIN_SERIAL1_TX                  (16)
-#define PIN_SERIAL2_RX                  (8)     // Connected to Jlink CDC
-#define PIN_SERIAL2_TX                  (6)
-
-// SPI Interfaces
-#define SPI_INTERFACES_COUNT            2
-
-#define PIN_SPI_MISO                    (45)
-#define PIN_SPI_MOSI                    (44)
-#define PIN_SPI_SCK                     (43)
-
-#define PIN_SPI1_MISO                   (29)
-#define PIN_SPI1_MOSI                   (30)
-#define PIN_SPI1_SCK                    (3)
-
-// LoRa SX1262 module pins
-#define P_LORA_SCLK                     PIN_SPI_SCK
-#define P_LORA_MISO                     PIN_SPI_MISO
-#define P_LORA_MOSI                     PIN_SPI_MOSI
-#define P_LORA_DIO_1                    (47)
-#define P_LORA_RESET                    (38)
-#define P_LORA_BUSY                     (46)
-#define P_LORA_NSS                      (42)
-#define SX126X_POWER_EN                 (37)
-
-#define SX126X_RXEN                     RADIOLIB_NC
-#define SX126X_TXEN                     RADIOLIB_NC
-
-#define SX126X_DIO2_AS_RF_SWITCH        true
-#define SX126X_DIO3_TCXO_VOLTAGE        (1.8f)
-
-// Wire Interfaces
-#define WIRE_INTERFACES_COUNT           1
-#define PIN_WIRE_SDA                    (13)
-#define PIN_WIRE_SCL                    (14)
-#define PIN_BOARD_SDA                   (13)
-#define PIN_BOARD_SCL                   (14)
-
-// Power control
-#define PIN_3V3_EN                      (34)    // nothing connected on meshtiny board
-
-#endif // _MESHTINY_H_

variants/minewsemi_me25ls01/MinewsemiME25LS01Board.h

@@ -20,12 +20,12 @@
 #define  PIN_VBAT_READ BATTERY_PIN
 #define  ADC_MULTIPLIER   (1.815f) // dependent on voltage divider resistors. TODO: more accurate battery tracking
 
-class MinewsemiME25LS01Board : public NRF52BoardDCDC {
+class MinewsemiME25LS01Board : public NRF52BoardOTA {
 protected:
   uint8_t btn_prev_state;
 
 public:
-  MinewsemiME25LS01Board() : NRF52Board("Minewsemi_OTA") {}
+  MinewsemiME25LS01Board() : NRF52BoardOTA("Minewsemi_OTA") {}
   void begin();
 
 #define BATTERY_SAMPLES 8

variants/nano_g2_ultra/nano-g2.cpp

@@ -3,8 +3,25 @@
 
 #ifdef NANO_G2_ULTRA
 
+#include <bluefruit.h>
 #include <Wire.h>
 
+static BLEDfu bledfu;
+
+static void connect_callback(uint16_t conn_handle)
+{
+  (void)conn_handle;
+  MESH_DEBUG_PRINTLN("BLE client connected");
+}
+
+static void disconnect_callback(uint16_t conn_handle, uint8_t reason)
+{
+  (void)conn_handle;
+  (void)reason;
+
+  MESH_DEBUG_PRINTLN("BLE client disconnected");
+}
+
 void NanoG2Ultra::begin()
 {
   NRF52Board::begin();
@@ -39,4 +56,48 @@ uint16_t NanoG2Ultra::getBattMilliVolts()
   // divider into account (providing the actual LIPO voltage)
   return (uint16_t)((float)adcvalue * REAL_VBAT_MV_PER_LSB);
 }
+
+bool NanoG2Ultra::startOTAUpdate(const char *id, char reply[])
+{
+  // Config the peripheral connection with maximum bandwidth
+  // more SRAM required by SoftDevice
+  // Note: All config***() function must be called before begin()
+  Bluefruit.configPrphBandwidth(BANDWIDTH_MAX);
+  Bluefruit.configPrphConn(92, BLE_GAP_EVENT_LENGTH_MIN, 16, 16);
+
+  Bluefruit.begin(1, 0);
+  // Set max power. Accepted values are: -40, -30, -20, -16, -12, -8, -4, 0, 4
+  Bluefruit.setTxPower(4);
+  // Set the BLE device name
+  Bluefruit.setName("NANO_G2_OTA");
+
+  Bluefruit.Periph.setConnectCallback(connect_callback);
+  Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
+
+  // To be consistent OTA DFU should be added first if it exists
+  bledfu.begin();
+
+  // Set up and start advertising
+  // Advertising packet
+  Bluefruit.Advertising.addFlags(BLE_GAP_ADV_FLAGS_LE_ONLY_GENERAL_DISC_MODE);
+  Bluefruit.Advertising.addTxPower();
+  Bluefruit.Advertising.addName();
+
+  /* Start Advertising
+    - Enable auto advertising if disconnected
+    - Interval:  fast mode = 20 ms, slow mode = 152.5 ms
+    - Timeout for fast mode is 30 seconds
+    - Start(timeout) with timeout = 0 will advertise forever (until connected)
+
+    For recommended advertising interval
+    https://developer.apple.com/library/content/qa/qa1931/_index.html
+  */
+  Bluefruit.Advertising.restartOnDisconnect(true);
+  Bluefruit.Advertising.setInterval(32, 244); // in unit of 0.625 ms
+  Bluefruit.Advertising.setFastTimeout(30);   // number of seconds in fast mode
+  Bluefruit.Advertising.start(0);             // 0 = Don't stop advertising after n seconds
+
+  strcpy(reply, "OK - started");
+  return true;
+}
 #endif

variants/nano_g2_ultra/nano-g2.h

@@ -37,9 +37,9 @@
 
 class NanoG2Ultra : public NRF52Board {
 public:
-  NanoG2Ultra() : NRF52Board("NANO_G2_OTA") {}
   void begin();
   uint16_t getBattMilliVolts() override;
+  bool startOTAUpdate(const char *id, char reply[]) override;
 
   const char *getManufacturerName() const override { return "Nano G2 Ultra"; }
 

variants/promicro/PromicroBoard.h

@@ -20,13 +20,13 @@
 #define  PIN_VBAT_READ 17
 #define  ADC_MULTIPLIER   (1.815f) // dependent on voltage divider resistors. TODO: more accurate battery tracking
 
-class PromicroBoard : public NRF52BoardDCDC {
+class PromicroBoard : public NRF52BoardOTA {
 protected:
   uint8_t btn_prev_state;
   float adc_mult = ADC_MULTIPLIER;
 
 public:
-  PromicroBoard() : NRF52Board("ProMicro_OTA") {}
+  PromicroBoard() : NRF52BoardOTA("ProMicro_OTA") {}
   void begin();
 
   #define BATTERY_SAMPLES 8

variants/rak3401/RAK3401Board.h

@@ -4,6 +4,30 @@
 #include <Arduino.h>
 #include <helpers/NRF52Board.h>
 
+// LoRa radio module pins for RAK13302
+#define  P_LORA_SCLK    3
+#define  P_LORA_MISO    29
+#define  P_LORA_MOSI    30
+#define  P_LORA_NSS     26
+#define  P_LORA_DIO_1   10
+#define  P_LORA_BUSY    9
+#define  P_LORA_RESET   4
+#ifndef  P_LORA_PA_EN
+  #define  P_LORA_PA_EN  31
+#endif
+
+//#define PIN_GPS_SDA       13  //GPS SDA pin (output option)
+//#define PIN_GPS_SCL       14  //GPS SCL pin (output option)
+// #define PIN_GPS_TX        16  //GPS TX pin
+// #define PIN_GPS_RX        15  //GPS RX pin
+#define PIN_GPS_1PPS      17  //GPS PPS pin
+#define GPS_BAUD_RATE   9600
+#define GPS_ADDRESS   0x42  //i2c address for GPS
+
+#define SX126X_DIO2_AS_RF_SWITCH
+#define SX126X_DIO3_TCXO_VOLTAGE   1.8
+
+
 // built-ins
 #define  PIN_VBAT_READ    5
 #define  ADC_MULTIPLIER   (3 * 1.73 * 1.187 * 1000)
@@ -11,13 +35,9 @@
 #define PIN_3V3_EN (34)
 #define WB_IO2 PIN_3V3_EN
 
-class RAK3401Board : public NRF52BoardDCDC {
-protected:
-#ifdef NRF52_POWER_MANAGEMENT
-  void initiateShutdown(uint8_t reason) override;
-#endif
+class RAK3401Board : public NRF52BoardDCDC, public NRF52BoardOTA {
 public:
-  RAK3401Board() : NRF52Board("RAK3401_OTA") {}
+  RAK3401Board() : NRF52BoardOTA("RAK3401_OTA") {}
   void begin();
 
   #define BATTERY_SAMPLES 8

variants/rak3401/variant.h

@@ -141,6 +141,11 @@ static const uint8_t AREF = PIN_AREF;
 #define EXTERNAL_FLASH_DEVICES IS25LP080D
 #define EXTERNAL_FLASH_USE_QSPI
 
+#define P_LORA_SCK PIN_SPI1_SCK
+#define P_LORA_MISO PIN_SPI1_MISO
+#define P_LORA_MOSI PIN_SPI1_MOSI
+#define P_LORA_CS 26
+
 #define USE_SX1262
 #define SX126X_CS (26)
 #define SX126X_DIO1 (10)
@@ -152,15 +157,6 @@ static const uint8_t AREF = PIN_AREF;
 #define SX126X_DIO2_AS_RF_SWITCH
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8
 
-#define P_LORA_SCLK PIN_SPI1_SCK
-#define P_LORA_MISO PIN_SPI1_MISO
-#define P_LORA_MOSI PIN_SPI1_MOSI
-#define P_LORA_NSS SX126X_CS
-#define P_LORA_DIO_1 SX126X_DIO1
-#define P_LORA_BUSY SX126X_BUSY
-#define P_LORA_RESET SX126X_RESET
-#define P_LORA_PA_EN  31
-
 // enables 3.3V periphery like GPS or IO Module
 // Do not toggle this for GPS power savings
 #define PIN_3V3_EN (34)
@@ -177,10 +173,6 @@ static const uint8_t AREF = PIN_AREF;
 #define PIN_GPS_RX PIN_SERIAL1_RX
 #define PIN_GPS_TX PIN_SERIAL1_TX
 
-#define PIN_GPS_1PPS PIN_GPS_PPS
-#define GPS_BAUD_RATE 9600
-#define GPS_ADDRESS 0x42  //i2c address for GPS
-
 // Battery
 // The battery sense is hooked to pin A0 (5)
 #define BATTERY_PIN PIN_A0

variants/rak4631/RAK4631Board.h

@@ -4,18 +4,39 @@
 #include <Arduino.h>
 #include <helpers/NRF52Board.h>
 
+// LoRa radio module pins for RAK4631
+#define  P_LORA_DIO_1   47
+#define  P_LORA_NSS     42
+#define  P_LORA_RESET  RADIOLIB_NC   // 38
+#define  P_LORA_BUSY    46
+#define  P_LORA_SCLK    43
+#define  P_LORA_MISO    45
+#define  P_LORA_MOSI    44
+#define  SX126X_POWER_EN  37
+
+//#define PIN_GPS_SDA       13  //GPS SDA pin (output option)
+//#define PIN_GPS_SCL       14  //GPS SCL pin (output option)
+//#define PIN_GPS_TX        16  //GPS TX pin
+//#define PIN_GPS_RX        15  //GPS RX pin
+#define PIN_GPS_1PPS      17  //GPS PPS pin
+#define GPS_BAUD_RATE   9600
+#define GPS_ADDRESS   0x42  //i2c address for GPS
+ 
+#define SX126X_DIO2_AS_RF_SWITCH  true
+#define SX126X_DIO3_TCXO_VOLTAGE   1.8
+
 // built-ins
 #define  PIN_VBAT_READ    5
 #define  ADC_MULTIPLIER   (3 * 1.73 * 1.187 * 1000)
 
-class RAK4631Board : public NRF52BoardDCDC {
+class RAK4631Board : public NRF52BoardDCDC, public NRF52BoardOTA {
 protected:
 #ifdef NRF52_POWER_MANAGEMENT
   void initiateShutdown(uint8_t reason) override;
 #endif
 
 public:
-  RAK4631Board() : NRF52Board("RAK4631_OTA") {}
+  RAK4631Board() : NRF52BoardOTA("RAK4631_OTA") {}
   void begin();
 
   #define BATTERY_SAMPLES 8

variants/rak4631/variant.h

@@ -144,19 +144,6 @@ extern "C"
 	static const uint8_t MISO = PIN_SPI_MISO;
 	static const uint8_t SCK = PIN_SPI_SCK;
 
-// LoRa radio module pins for RAK4631
-#define  P_LORA_DIO_1 (47)
-#define  P_LORA_NSS (42)
-#define  P_LORA_RESET (-1)
-#define  P_LORA_BUSY (46)
-#define  P_LORA_SCLK (43)
-#define  P_LORA_MISO (45)
-#define  P_LORA_MOSI (44)
-#define  SX126X_POWER_EN (37)
-
-#define SX126X_DIO2_AS_RF_SWITCH  true
-#define SX126X_DIO3_TCXO_VOLTAGE   1.8
-
 /*
  * Wire Interfaces
  */
@@ -168,23 +155,19 @@ extern "C"
 #define PIN_WIRE1_SDA (24)
 #define PIN_WIRE1_SCL (25)
 
-// QSPI Pins
-// QSPI occupied by GPIO's
-#define PIN_QSPI_SCK 3	// 19
-#define PIN_QSPI_CS 26	// 17
-#define PIN_QSPI_IO0 30 // 20
-#define PIN_QSPI_IO1 29 // 21
-#define PIN_QSPI_IO2 28 // 22
-#define PIN_QSPI_IO3 2	// 23
+	// QSPI Pins
+	// QSPI occupied by GPIO's
+	#define PIN_QSPI_SCK 3	// 19
+	#define PIN_QSPI_CS 26	// 17
+	#define PIN_QSPI_IO0 30 // 20
+	#define PIN_QSPI_IO1 29 // 21
+	#define PIN_QSPI_IO2 28 // 22
+	#define PIN_QSPI_IO3 2	// 23
 
-// On-board QSPI Flash
-// No onboard flash
-#define EXTERNAL_FLASH_DEVICES IS25LP080D
-#define EXTERNAL_FLASH_USE_QSPI
-
-#define PIN_GPS_1PPS      17  //GPS PPS pin
-#define GPS_BAUD_RATE   9600
-#define GPS_ADDRESS   0x42  //i2c address for GPS
+	// On-board QSPI Flash
+	// No onboard flash
+	#define EXTERNAL_FLASH_DEVICES IS25LP080D
+	#define EXTERNAL_FLASH_USE_QSPI
 
 #ifdef __cplusplus
 }

variants/rak_wismesh_tag/RAKWismeshTagBoard.h

@@ -8,9 +8,9 @@
 #define  PIN_VBAT_READ    5
 #define  ADC_MULTIPLIER   (3 * 1.73 * 1.187 * 1000)
 
-class RAKWismeshTagBoard : public NRF52BoardDCDC {
+class RAKWismeshTagBoard : public NRF52BoardDCDC, public NRF52BoardOTA {
 public:
-  RAKWismeshTagBoard() : NRF52Board("WISMESHTAG_OTA") {}
+  RAKWismeshTagBoard() : NRF52BoardOTA("WISMESHTAG_OTA") {}
   void begin();
 
 #if defined(P_LORA_TX_LED) && defined(LED_STATE_ON)

variants/sensecap_solar/SenseCapSolarBoard.h

@@ -4,9 +4,9 @@
 #include <Arduino.h>
 #include <helpers/NRF52Board.h>
 
-class SenseCapSolarBoard : public NRF52BoardDCDC {
+class SenseCapSolarBoard : public NRF52BoardOTA {
 public:
-  SenseCapSolarBoard() : NRF52Board("SENSECAP_SOLAR_OTA") {}
+  SenseCapSolarBoard() : NRF52BoardOTA("SENSECAP_SOLAR_OTA") {}
   void begin();
 
 #if defined(P_LORA_TX_LED)

variants/t1000-e/T1000eBoard.h

@@ -9,7 +9,6 @@ protected:
   uint8_t btn_prev_state;
 
 public:
-  T1000eBoard() : NRF52Board("T1000E_OTA") {}
   void begin();
 
   uint16_t getBattMilliVolts() override {
@@ -90,4 +89,6 @@ public:
 
     sd_power_system_off();
   }
+
+//  bool startOTAUpdate(const char* id, char reply[]) override;
 };

variants/thinknode_m1/ThinkNodeM1Board.h

@@ -13,9 +13,9 @@
 #define PIN_VBAT_READ     (4)
 #define REAL_VBAT_MV_PER_LSB (VBAT_DIVIDER_COMP * VBAT_MV_PER_LSB)
 
-class ThinkNodeM1Board : public NRF52Board {
+class ThinkNodeM1Board : public NRF52BoardOTA {
 public:
-  ThinkNodeM1Board() : NRF52Board("THINKNODE_M1_OTA") {}
+  ThinkNodeM1Board() : NRF52BoardOTA("THINKNODE_M1_OTA") {}
   void begin();
   uint16_t getBattMilliVolts() override;
 

variants/thinknode_m3/ThinkNodeM3Board.cpp

@@ -1,28 +0,0 @@
-#include <Arduino.h>
-#include "ThinkNodeM3Board.h"
-#include <Wire.h>
-
-#include <bluefruit.h>
-
-void ThinkNodeM3Board::begin() {
-  NRF52Board::begin();
-  btn_prev_state = HIGH;
-
-  Wire.begin();
-
-  delay(10);   // give sx1262 some time to power up
-}
-
-uint16_t ThinkNodeM3Board::getBattMilliVolts() {
-  int adcvalue = 0;
-
-  analogReference(AR_INTERNAL_2_4);
-  analogReadResolution(ADC_RESOLUTION);
-  delay(10);
-
-  // ADC range is 0..2400mV and resolution is 12-bit (0..4095)
-  adcvalue = analogRead(PIN_VBAT_READ);
-  // Convert the raw value to compensated mv, taking the resistor-
-  // divider into account (providing the actual LIPO voltage)
-  return (uint16_t)((float)adcvalue * ADC_FACTOR);
-}

variants/thinknode_m3/ThinkNodeM3Board.h

@@ -1,54 +0,0 @@
-#pragma once
-
-#include <Arduino.h>
-#include <MeshCore.h>
-#include <helpers/NRF52Board.h>
-
-#define ADC_FACTOR ((1000.0*ADC_MULTIPLIER*AREF_VOLTAGE)/ADC_MAX)
-
-class ThinkNodeM3Board : public NRF52BoardDCDC {
-protected:
-#if NRF52_POWER_MANAGEMENT
-  void initiateShutdown(uint8_t reason) override;
-#endif
-  uint8_t btn_prev_state;
-
-public:
-  ThinkNodeM3Board() : NRF52Board("THINKNODE_M3_OTA") {}
-  void begin();
-  uint16_t getBattMilliVolts() override;
-
-#if defined(P_LORA_TX_LED)
-  void onBeforeTransmit() override {
-    digitalWrite(P_LORA_TX_LED, HIGH);   // turn TX LED on
-  }
-  void onAfterTransmit() override {
-    digitalWrite(P_LORA_TX_LED, LOW);   // turn TX LED off
-  }
-#endif
-
-  const char* getManufacturerName() const override {
-    return "Elecrow ThinkNode M3";
-  }
-
-  int buttonStateChanged() {
-  #ifdef BUTTON_PIN
-    uint8_t v = digitalRead(BUTTON_PIN);
-    if (v != btn_prev_state) {
-      btn_prev_state = v;
-      return (v == LOW) ? 1 : -1;
-    }
-  #endif
-    return 0;
-  }
-
-  void powerOff() override {
-    // turn off all leds, sd_power_system_off will not do this for us
-    #ifdef P_LORA_TX_LED
-    digitalWrite(P_LORA_TX_LED, LOW);
-    #endif
-
-    // power off board
-    sd_power_system_off();
-  }
-};

variants/thinknode_m3/ThinknodeM3Board.cpp

@@ -0,0 +1,80 @@
+#include <Arduino.h>
+#include "ThinknodeM3Board.h"
+#include <Wire.h>
+
+#include <bluefruit.h>
+
+void ThinknodeM3Board::begin() {
+  // for future use, sub-classes SHOULD call this from their begin()
+  startup_reason = BD_STARTUP_NORMAL;
+  btn_prev_state = HIGH;
+
+  sd_power_mode_set(NRF_POWER_MODE_LOWPWR);
+
+  // Enable DC/DC converter for improved power efficiency
+  NRF_POWER->DCDCEN = 1;
+
+  Wire.begin();
+
+  delay(10);   // give sx1262 some time to power up
+}
+
+#if 0
+static BLEDfu bledfu;
+
+static void connect_callback(uint16_t conn_handle) {
+  (void)conn_handle;
+  MESH_DEBUG_PRINTLN("BLE client connected");
+}
+
+static void disconnect_callback(uint16_t conn_handle, uint8_t reason) {
+  (void)conn_handle;
+  (void)reason;
+
+  MESH_DEBUG_PRINTLN("BLE client disconnected");
+}
+
+
+bool TrackerThinknodeM3Board::startOTAUpdate(const char* id, char reply[]) {
+  // Config the peripheral connection with maximum bandwidth
+  // more SRAM required by SoftDevice
+  // Note: All config***() function must be called before begin()
+  Bluefruit.configPrphBandwidth(BANDWIDTH_MAX);
+  Bluefruit.configPrphConn(92, BLE_GAP_EVENT_LENGTH_MIN, 16, 16);
+
+  Bluefruit.begin(1, 0);
+  // Set max power. Accepted values are: -40, -30, -20, -16, -12, -8, -4, 0, 4
+  Bluefruit.setTxPower(4);
+  // Set the BLE device name
+  Bluefruit.setName("T1000E_OTA");
+
+  Bluefruit.Periph.setConnectCallback(connect_callback);
+  Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
+
+  // To be consistent OTA DFU should be added first if it exists
+  bledfu.begin();
+
+  // Set up and start advertising
+  // Advertising packet
+  Bluefruit.Advertising.addFlags(BLE_GAP_ADV_FLAGS_LE_ONLY_GENERAL_DISC_MODE);
+  Bluefruit.Advertising.addTxPower();
+  Bluefruit.Advertising.addName();
+
+  /* Start Advertising
+    - Enable auto advertising if disconnected
+    - Interval:  fast mode = 20 ms, slow mode = 152.5 ms
+    - Timeout for fast mode is 30 seconds
+    - Start(timeout) with timeout = 0 will advertise forever (until connected)
+
+    For recommended advertising interval
+    https://developer.apple.com/library/content/qa/qa1931/_index.html
+  */
+  Bluefruit.Advertising.restartOnDisconnect(true);
+  Bluefruit.Advertising.setInterval(32, 244); // in unit of 0.625 ms
+  Bluefruit.Advertising.setFastTimeout(30);   // number of seconds in fast mode
+  Bluefruit.Advertising.start(0);             // 0 = Don't stop advertising after n seconds
+
+  strcpy(reply, "OK - started");
+  return true;
+}
+#endif

variants/thinknode_m3/ThinknodeM3Board.h

@@ -0,0 +1,68 @@
+#pragma once
+
+#include <MeshCore.h>
+#include <Arduino.h>
+
+#define ADC_FACTOR ((1000.0*ADC_MULTIPLIER*AREF_VOLTAGE)/ADC_MAX)
+
+class ThinknodeM3Board : public mesh::MainBoard {
+protected:
+  uint8_t startup_reason;
+  uint8_t btn_prev_state;
+
+public:
+  void begin();
+
+  uint16_t getBattMilliVolts() override {
+    int adcvalue = 0;
+
+    analogReference(AR_INTERNAL_2_4);
+    analogReadResolution(ADC_RESOLUTION);
+    delay(10);
+
+    // ADC range is 0..2400mV and resolution is 12-bit (0..4095)
+    adcvalue = analogRead(PIN_VBAT_READ);
+    // Convert the raw value to compensated mv, taking the resistor-
+    // divider into account (providing the actual LIPO voltage)
+    return (uint16_t)((float)adcvalue * ADC_FACTOR);
+  }
+
+  uint8_t getStartupReason() const override { return startup_reason; }
+
+  #if defined(P_LORA_TX_LED)
+  #if !defined(P_LORA_TX_LED_ON)
+    #define P_LORA_TX_LED_ON HIGH
+  #endif
+  void onBeforeTransmit() override {
+    digitalWrite(P_LORA_TX_LED, P_LORA_TX_LED_ON);   // turn TX LED on
+  }
+  void onAfterTransmit() override {
+    digitalWrite(P_LORA_TX_LED, !P_LORA_TX_LED_ON);   // turn TX LED off
+  }
+  #endif
+
+  const char* getManufacturerName() const override {
+    return "Elecrow ThinkNode M3";
+  }
+
+  int buttonStateChanged() {
+  #ifdef BUTTON_PIN
+    uint8_t v = digitalRead(BUTTON_PIN);
+    if (v != btn_prev_state) {
+      btn_prev_state = v;
+      return (v == LOW) ? 1 : -1;
+    }
+  #endif
+    return 0;
+  }
+
+  void powerOff() override {
+    sd_power_system_off();
+  }
+
+  void reboot() override {
+    NVIC_SystemReset();
+  }
+
+//  bool startOTAUpdate(const char* id, char reply[]) override;
+};

variants/thinknode_m3/target.cpp

@@ -2,7 +2,7 @@
 #include "target.h"
 #include <helpers/sensors/MicroNMEALocationProvider.h>
 
-ThinkNodeM3Board board;
+ThinknodeM3Board board;
 
 RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, SPI);
 
@@ -30,26 +30,26 @@ static const uint32_t rfswitch_dios[Module::RFSWITCH_MAX_PINS] = {
   RADIOLIB_LR11X0_DIO5,
   RADIOLIB_LR11X0_DIO6,
   RADIOLIB_NC,
-  RADIOLIB_NC,
+  RADIOLIB_NC, 
   RADIOLIB_NC
 };
 
 static const Module::RfSwitchMode_t rfswitch_table[] = {
-  // mode                 DIO5  DIO6
-  { LR11x0::MODE_STBY,   {LOW , LOW  }},
+  // mode                 DIO5  DIO6 
+  { LR11x0::MODE_STBY,   {LOW , LOW  }},  
   { LR11x0::MODE_RX,     {HIGH, LOW  }},
   { LR11x0::MODE_TX,     {HIGH, HIGH }},
   { LR11x0::MODE_TX_HP,  {LOW , HIGH }},
-  { LR11x0::MODE_TX_HF,  {LOW , LOW  }},
+  { LR11x0::MODE_TX_HF,  {LOW , LOW  }}, 
   { LR11x0::MODE_GNSS,   {LOW , LOW  }},
-  { LR11x0::MODE_WIFI,   {LOW , LOW  }},
+  { LR11x0::MODE_WIFI,   {LOW , LOW  }},  
   END_OF_MODE_TABLE,
 };
 #endif
 
 bool radio_init() {
   rtc_clock.begin(Wire);
-
+  
 #ifdef LR11X0_DIO3_TCXO_VOLTAGE
   float tcxo = LR11X0_DIO3_TCXO_VOLTAGE;
 #else
@@ -64,7 +64,7 @@ bool radio_init() {
     Serial.println(status);
     return false;  // fail
   }
-
+  
   radio.setCRC(2);
   radio.explicitHeader();
 

variants/thinknode_m3/target.h

@@ -3,7 +3,7 @@
 #define RADIOLIB_STATIC_ONLY 1
 #include <RadioLib.h>
 #include <helpers/radiolib/RadioLibWrappers.h>
-#include "ThinkNodeM3Board.h"
+#include "ThinknodeM3Board.h"
 #include <helpers/radiolib/CustomLR1110Wrapper.h>
 #include <helpers/ArduinoHelpers.h>
 #include <helpers/sensors/EnvironmentSensorManager.h>
@@ -17,7 +17,7 @@
   extern NullDisplayDriver display;
 #endif
 
-extern ThinkNodeM3Board board;
+extern ThinknodeM3Board board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
 extern EnvironmentSensorManager sensors;

variants/thinknode_m6/ThinkNodeM6Board.cpp

@@ -4,9 +4,25 @@
 #ifdef THINKNODE_M6
 
 #include <Wire.h>
+#include <bluefruit.h>
+
+static BLEDfu bledfu;
+
+static void connect_callback(uint16_t conn_handle) {
+  (void)conn_handle;
+  MESH_DEBUG_PRINTLN("BLE client connected");
+}
+
+static void disconnect_callback(uint16_t conn_handle, uint8_t reason) {
+  (void)conn_handle;
+  (void)reason;
+
+  MESH_DEBUG_PRINTLN("BLE client disconnected");
+}
 
 void ThinkNodeM6Board::begin() {
-  NRF52Board::begin();
+  // for future use, sub-classes SHOULD call this from their begin()
+  startup_reason = BD_STARTUP_NORMAL;
 
   Wire.begin();
 
@@ -33,4 +49,47 @@ uint16_t ThinkNodeM6Board::getBattMilliVolts() {
   // divider into account (providing the actual LIPO voltage)
   return (uint16_t)((float)adcvalue * REAL_VBAT_MV_PER_LSB);
 }
+
+bool ThinkNodeM6Board::startOTAUpdate(const char *id, char reply[]) {
+  // Config the peripheral connection with maximum bandwidth
+  // more SRAM required by SoftDevice
+  // Note: All config***() function must be called before begin()
+  Bluefruit.configPrphBandwidth(BANDWIDTH_MAX);
+  Bluefruit.configPrphConn(92, BLE_GAP_EVENT_LENGTH_MIN, 16, 16);
+
+  Bluefruit.begin(1, 0);
+  // Set max power. Accepted values are: -40, -30, -20, -16, -12, -8, -4, 0, 4
+  Bluefruit.setTxPower(4);
+  // Set the BLE device name
+  Bluefruit.setName("THINKNODE_M1_OTA");
+
+  Bluefruit.Periph.setConnectCallback(connect_callback);
+  Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
+
+  // To be consistent OTA DFU should be added first if it exists
+  bledfu.begin();
+
+  // Set up and start advertising
+  // Advertising packet
+  Bluefruit.Advertising.addFlags(BLE_GAP_ADV_FLAGS_LE_ONLY_GENERAL_DISC_MODE);
+  Bluefruit.Advertising.addTxPower();
+  Bluefruit.Advertising.addName();
+
+  /* Start Advertising
+    - Enable auto advertising if disconnected
+    - Interval:  fast mode = 20 ms, slow mode = 152.5 ms
+    - Timeout for fast mode is 30 seconds
+    - Start(timeout) with timeout = 0 will advertise forever (until connected)
+
+    For recommended advertising interval
+    https://developer.apple.com/library/content/qa/qa1931/_index.html
+  */
+  Bluefruit.Advertising.restartOnDisconnect(true);
+  Bluefruit.Advertising.setInterval(32, 244); // in unit of 0.625 ms
+  Bluefruit.Advertising.setFastTimeout(30);   // number of seconds in fast mode
+  Bluefruit.Advertising.start(0);             // 0 = Don't stop advertising after n seconds
+
+  strcpy(reply, "OK - started");
+  return true;
+}
 #endif

variants/thinknode_m6/ThinkNodeM6Board.h

@@ -1,8 +1,7 @@
 #pragma once
 
-#include <Arduino.h>
 #include <MeshCore.h>
-#include <helpers/NRF52Board.h>
+#include <Arduino.h>
 
 // built-ins
 #define VBAT_MV_PER_LSB   (0.73242188F)   // 3.0V ADC range and 12-bit ADC resolution = 3000mV/4096
@@ -12,28 +11,35 @@
 #define PIN_VBAT_READ     BATTERY_PIN
 #define REAL_VBAT_MV_PER_LSB (VBAT_DIVIDER_COMP * VBAT_MV_PER_LSB)
 
-class ThinkNodeM6Board : public NRF52BoardDCDC {
+class ThinkNodeM6Board : public mesh::MainBoard {
 protected:
-#if NRF52_POWER_MANAGEMENT
-  void initiateShutdown(uint8_t reason) override;
-#endif
+  uint8_t startup_reason;
 
 public:
-  ThinkNodeM6Board() : NRF52Board("THINKNODE_M6_OTA") {}
+
   void begin();
   uint16_t getBattMilliVolts() override;
+  bool startOTAUpdate(const char* id, char reply[]) override;
 
-#if defined(P_LORA_TX_LED)
+  uint8_t getStartupReason() const override {
+    return startup_reason;
+  }
+
+  #if defined(P_LORA_TX_LED)
   void onBeforeTransmit() override {
     digitalWrite(P_LORA_TX_LED, HIGH);   // turn TX LED on
   }
   void onAfterTransmit() override {
     digitalWrite(P_LORA_TX_LED, LOW);   // turn TX LED off
   }
-#endif
+  #endif
 
   const char* getManufacturerName() const override {
-    return "Elecrow ThinkNode M6";
+    return "Elecrow ThinkNode-M6";
+  }
+
+  void reboot() override {
+    NVIC_SystemReset();
   }
 
   void powerOff() override {
@@ -45,5 +51,6 @@ public:
 
     // power off board
     sd_power_system_off();
+
   }
 };

variants/wio-tracker-l1/WioTrackerL1Board.h

@@ -4,12 +4,12 @@
 #include <Arduino.h>
 #include <helpers/NRF52Board.h>
 
-class WioTrackerL1Board : public NRF52BoardDCDC {
+class WioTrackerL1Board : public NRF52BoardDCDC, public NRF52BoardOTA {
 protected:
   uint8_t btn_prev_state;
 
 public:
-  WioTrackerL1Board() : NRF52Board("WioTrackerL1 OTA") {}
+  WioTrackerL1Board() : NRF52BoardOTA("WioTrackerL1 OTA") {}
   void begin();
 
 #if defined(P_LORA_TX_LED)

variants/wio_wm1110/WioWM1110Board.cpp

@@ -1,9 +1,24 @@
 #ifdef WIO_WM1110
 
-#include "WioWM1110Board.h"
-
 #include <Arduino.h>
 #include <Wire.h>
+#include <bluefruit.h>
+
+#include "WioWM1110Board.h"
+
+static BLEDfu bledfu;
+
+static void connect_callback(uint16_t conn_handle) {
+  (void)conn_handle;
+  MESH_DEBUG_PRINTLN("BLE client connected");
+}
+
+static void disconnect_callback(uint16_t conn_handle, uint8_t reason) {
+  (void)conn_handle;
+  (void)reason;
+
+  MESH_DEBUG_PRINTLN("BLE client disconnected");
+}
 
 void WioWM1110Board::begin() {
   NRF52BoardDCDC::begin();
@@ -27,5 +42,31 @@ void WioWM1110Board::begin() {
 
   delay(10);
 }
+
+bool WioWM1110Board::startOTAUpdate(const char *id, char reply[]) {
+  Bluefruit.configPrphBandwidth(BANDWIDTH_MAX);
+  Bluefruit.configPrphConn(92, BLE_GAP_EVENT_LENGTH_MIN, 16, 16);
+
+  Bluefruit.begin(1, 0);
+  Bluefruit.setTxPower(4);
+  Bluefruit.setName("WM1110_OTA");
+
+  Bluefruit.Periph.setConnectCallback(connect_callback);
+  Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
+
+  bledfu.begin();
+
+  Bluefruit.Advertising.addFlags(BLE_GAP_ADV_FLAGS_LE_ONLY_GENERAL_DISC_MODE);
+  Bluefruit.Advertising.addTxPower();
+  Bluefruit.Advertising.addName();
+  Bluefruit.Advertising.restartOnDisconnect(true);
+  Bluefruit.Advertising.setInterval(32, 244);
+  Bluefruit.Advertising.setFastTimeout(30);
+  Bluefruit.Advertising.start(0);
+
+  strcpy(reply, "OK - started");
+  return true;
+}
+
 #endif
 

variants/wio_wm1110/WioWM1110Board.h

@@ -13,7 +13,6 @@
 
 class WioWM1110Board : public NRF52BoardDCDC {
 public:
-  WioWM1110Board() : NRF52Board("WM1110_OTA") {}
   void begin();
 
 #if defined(LED_GREEN)
@@ -38,6 +37,8 @@ public:
     return "Seeed Wio WM1110";
   }
 
+  bool startOTAUpdate(const char* id, char reply[]) override;
+
   void enableSensorPower(bool enable) {
     digitalWrite(SENSOR_POWER_PIN, enable ? HIGH : LOW);
     if (enable) {

variants/xiao_nrf52/XiaoNrf52Board.h

@@ -6,14 +6,14 @@
 
 #ifdef XIAO_NRF52
 
-class XiaoNrf52Board : public NRF52BoardDCDC {
+class XiaoNrf52Board : public NRF52BoardDCDC, public NRF52BoardOTA { 
 protected:
 #if NRF52_POWER_MANAGEMENT
   void initiateShutdown(uint8_t reason) override;
 #endif
 
 public:
-  XiaoNrf52Board() : NRF52Board("XIAO_NRF52_OTA") {}
+  XiaoNrf52Board() : NRF52BoardOTA("XIAO_NRF52_OTA") {}
   void begin();
 
 #if defined(P_LORA_TX_LED)