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

Integration of upstrem PR #1297
Integration of upstrem PR #1338
2026-01-26 12:50:18 +01:00 · 2026-01-26 12:50:18 +01:00 · 2026-01-26 12:50:18 +01:00 · 2026-01-26 12:47:53 +01:00 · 2026-01-26 12:47:35 +01:00 · 2026-01-26 12:46:23 +01:00
74 changed files with 1014 additions and 2267 deletions
--- a/.devcontainer/devcontainer.json
+++ b/.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"
--- a/.github/workflows/github-pages.yml
+++ b/.github/workflows/github-pages.yml
@@ -1,36 +0,0 @@
-name: Build and deploy Docs site to GitHub Pages
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-
-permissions:
-  contents: write
-
-jobs:
-  github-pages:
-    runs-on: ubuntu-latest
-    steps:
-
-      - name: Checkout Repo
-        uses: actions/checkout@v4
-
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          ruby-version: 3.x
-
-      - name: Build
-        run: |
-          pip install mkdocs-material
-          mkdocs build
-
-      - name: Deploy to GitHub Pages
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          cname: docs.meshcore.nz
-          publish_dir: ./site
-          publish_branch: 'gh-pages'
--- a/1
+++ b/1
@@ -1 +0,0 @@
-docs.meshcore.nz
--- a/boards/meshtiny.json
+++ b/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"
-}
--- a/docs/_assets/meshcore_tm.svg
+++ b/docs/_assets/meshcore_tm.svg
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 139 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <path d="M3.232,3.582C2.789,3.582 2.368,3.934 2.289,4.369L0.013,16.964C-0.066,17.399 0.229,17.751 0.671,17.751L3.087,17.751C3.529,17.751 3.951,17.399 4.03,16.964L4.935,11.951L6.592,17.293C6.672,17.572 6.923,17.751 7.235,17.751L10.434,17.751C10.746,17.751 11.062,17.572 11.243,17.293L14.835,11.925L13.924,16.964C13.844,17.399 14.14,17.751 14.583,17.751L16.998,17.751C17.44,17.751 17.862,17.399 17.941,16.964L20.217,4.369C20.298,3.934 20.002,3.582 19.56,3.582L16.46,3.582C16.147,3.582 15.831,3.761 15.65,4.04L9.76,12.872C9.668,13.013 9.446,12.975 9.397,12.81L6.976,4.04C6.895,3.761 6.645,3.582 6.332,3.582L3.232,3.582Z" style="fill:white;fill-rule:nonzero;"/>
-    <path d="M20.853,17.751C20.853,17.751 32.797,17.751 32.797,17.751C33.063,17.751 33.317,17.538 33.364,17.278L33.863,14.504C33.91,14.242 33.733,14.031 33.467,14.031L25.166,14.031C25.077,14.031 25.019,13.96 25.034,13.873L25.281,12.508C25.296,12.421 25.38,12.35 25.469,12.35L32.146,12.35C32.411,12.35 32.665,12.137 32.712,11.877L33.157,9.421C33.204,9.159 33.027,8.949 32.761,8.949L26.085,8.949C25.996,8.949 25.938,8.877 25.953,8.79L26.216,7.328C26.232,7.241 26.316,7.17 26.405,7.17L34.706,7.17C34.971,7.17 35.226,6.957 35.272,6.695L35.756,4.021C35.804,3.761 35.627,3.548 35.361,3.548L23.417,3.548C22.975,3.548 22.551,3.902 22.473,4.337L20.191,16.962C20.114,17.397 20.409,17.751 20.853,17.751Z" style="fill:white;fill-rule:nonzero;"/>
-    <path d="M45.291,17.749L45.291,17.751L45.705,17.751C47.783,17.751 49.767,16.095 50.136,14.052L50.375,12.727C50.744,10.685 49.359,9.029 47.28,9.029L40.882,9.029C40.617,9.029 40.44,8.818 40.487,8.556L40.649,7.664C40.696,7.402 40.95,7.191 41.215,7.191L49.87,7.191C50.313,7.191 50.735,6.839 50.814,6.404L51.183,4.368C51.262,3.931 50.966,3.579 50.523,3.579L41.063,3.579C38.985,3.579 37,5.235 36.631,7.278L36.37,8.723C36.001,10.767 37.386,12.422 39.465,12.422L45.863,12.422C46.128,12.422 46.305,12.633 46.258,12.895L46.138,13.565C46.091,13.826 45.837,14.037 45.571,14.037L36.675,14.037C36.233,14.037 35.811,14.389 35.732,14.824L35.346,16.962C35.267,17.397 35.562,17.749 36.005,17.749L45.291,17.749Z" style="fill:white;fill-rule:nonzero;"/>
-    <path d="M67.068,3.575C67.068,3.575 64.393,3.575 64.393,3.575C63.951,3.575 63.529,3.927 63.45,4.361L62.654,8.766C62.639,8.853 62.554,8.923 62.466,8.923L57.282,8.923C57.193,8.923 57.135,8.853 57.15,8.766L57.946,4.361C58.023,3.927 57.73,3.575 57.287,3.575L54.613,3.575C54.17,3.575 53.748,3.927 53.669,4.361L51.392,16.964C51.313,17.399 51.608,17.751 52.05,17.751L54.725,17.751C55.168,17.751 55.589,17.399 55.668,16.964L56.48,12.478C56.495,12.392 56.58,12.32 56.668,12.32L61.852,12.32C61.941,12.32 61.999,12.39 61.984,12.478L61.174,16.964C61.096,17.399 61.391,17.751 61.834,17.751L64.508,17.751C64.951,17.751 65.372,17.399 65.451,16.964L67.729,4.361C67.804,3.927 67.511,3.575 67.068,3.575Z" style="fill:white;fill-rule:nonzero;"/>
-    <path d="M71.102,17.751C71.102,17.751 78.96,17.751 78.96,17.751C79.402,17.751 79.824,17.399 79.903,16.964L80.288,14.824C80.367,14.389 80.072,14.037 79.629,14.037L72.808,14.037C72.542,14.037 72.365,13.826 72.412,13.565L73.48,7.686C73.527,7.426 73.781,7.213 74.045,7.213L80.866,7.213C81.309,7.213 81.73,6.861 81.81,6.427L82.188,4.335C82.267,3.9 81.971,3.548 81.529,3.548L73.691,3.548C71.618,3.548 69.638,5.197 69.265,7.234L68.011,14.046C67.639,16.091 69.022,17.751 71.102,17.751Z" style="fill:white;fill-rule:nonzero;"/>
-    <path d="M95.833,3.529C95.833,3.529 87.654,3.529 87.654,3.529C85.576,3.529 83.592,5.186 83.223,7.228L81.99,14.052C81.621,16.094 83.006,17.751 85.084,17.751L93.263,17.751C95.341,17.751 97.326,16.095 97.695,14.052L98.928,7.228C99.297,5.186 97.911,3.529 95.833,3.529ZM93.488,13.567C93.44,13.828 93.186,14.039 92.921,14.039L86.762,14.039C86.496,14.039 86.319,13.828 86.366,13.567L87.434,7.663C87.481,7.402 87.735,7.191 88,7.191L94.157,7.191C94.423,7.191 94.6,7.402 94.553,7.663L93.488,13.567Z" style="fill:white;fill-rule:nonzero;"/>
-    <path d="M99.884,17.751L102.557,17.751C102.999,17.751 103.421,17.399 103.5,16.965L103.973,14.348C103.988,14.261 104.073,14.19 104.161,14.19L107.397,14.186C107.557,14.186 107.69,14.265 107.756,14.395L109.281,17.37C109.458,17.722 109.78,17.764 110.751,17.749C111.32,17.756 112.184,17.713 113.577,17.713C114.025,17.713 114.3,17.244 114.079,16.853L112.413,13.953C112.37,13.876 112.417,13.772 112.509,13.727C113.795,13.102 114.814,11.889 115.068,10.487L115.649,7.262C116.02,5.218 114.635,3.562 112.557,3.562L102.448,3.562C102.006,3.562 101.584,3.914 101.505,4.349L99.225,16.964C99.146,17.399 99.442,17.751 99.884,17.751L99.884,17.751ZM105.255,7.268C105.27,7.181 105.354,7.11 105.443,7.11L110.674,7.11C111.069,7.11 111.331,7.424 111.261,7.812L110.877,9.933C110.806,10.319 110.431,10.634 110.038,10.634L104.806,10.634C104.718,10.634 104.66,10.564 104.675,10.475L105.255,7.268Z" style="fill:white;fill-rule:nonzero;"/>
-    <path d="M116.642,17.751C116.642,17.751 128.586,17.751 128.586,17.751C128.851,17.751 129.105,17.538 129.152,17.278L129.651,14.504C129.698,14.242 129.521,14.031 129.256,14.031L120.955,14.031C120.866,14.031 120.808,13.96 120.823,13.873L121.069,12.508C121.084,12.421 121.169,12.35 121.257,12.35L127.934,12.35C128.2,12.35 128.454,12.137 128.501,11.877L128.945,9.421C128.992,9.159 128.815,8.949 128.55,8.949L121.873,8.949C121.785,8.949 121.726,8.877 121.741,8.79L122.005,7.328C122.02,7.241 122.105,7.17 122.193,7.17L130.495,7.17C130.76,7.17 131.014,6.957 131.061,6.695L131.545,4.021C131.592,3.761 131.415,3.548 131.15,3.548L119.206,3.548C118.763,3.548 118.34,3.902 118.261,4.337L115.98,16.962C115.902,17.397 116.198,17.751 116.642,17.751Z" style="fill:white;fill-rule:nonzero;"/>
-    <path d="M134.674,0C134.674,0 132.059,0 132.059,0C131.965,0 131.877,0.074 131.86,0.166L131.783,0.594C131.766,0.686 131.828,0.76 131.921,0.76L132.745,0.76C132.764,0.76 132.776,0.775 132.773,0.793L132.406,2.819C132.39,2.91 132.452,2.984 132.545,2.984L133.108,2.984C133.201,2.984 133.29,2.91 133.307,2.819L133.673,0.793C133.676,0.775 133.694,0.76 133.713,0.76L134.536,0.76C134.629,0.76 134.718,0.686 134.735,0.594L134.812,0.166C134.828,0.074 134.767,0 134.674,0Z" style="fill:white;fill-rule:nonzero;"/>
-    <path d="M135.278,0.002C135.185,0.002 135.096,0.076 135.079,0.167L134.6,2.819C134.583,2.91 134.646,2.984 134.739,2.984L135.247,2.984C135.34,2.984 135.429,2.91 135.446,2.819L135.636,1.763L135.985,2.888C136.002,2.947 136.055,2.984 136.121,2.984L136.794,2.984C136.86,2.984 136.926,2.947 136.964,2.888L137.72,1.758L137.528,2.819C137.512,2.91 137.574,2.984 137.667,2.984L138.176,2.984C138.269,2.984 138.358,2.91 138.374,2.819L138.853,0.167C138.87,0.076 138.808,0.002 138.715,0.002L138.062,0.002C137.997,0.002 137.93,0.039 137.892,0.098L136.652,1.957C136.633,1.987 136.586,1.979 136.575,1.944L136.066,0.098C136.049,0.039 135.996,0.002 135.93,0.002L135.278,0.002Z" style="fill:white;fill-rule:nonzero;"/>
-</svg>
--- a/docs/_stylesheets/extra.css
+++ b/docs/_stylesheets/extra.css
@@ -1,16 +0,0 @@
-:root {
-    --md-primary-fg-color: #1F2937;
-    --md-primary-fg-color--light: #1F2937;
-    --md-primary-fg-color--dark: #1F2937;
-    --md-accent-fg-color: #1F2937;
-}
-
-/* hide git repo version */
-.md-source__fact--version {
-    display: none;
-}
-
-/* underline links */
-.md-typeset a {
-    text-decoration: underline;
-}
--- a/docs/cli_commands.md
+++ b/docs/cli_commands.md
@@ -1,883 +0,0 @@
-# CLI Commands
-
-This document provides an overview of CLI commands that can be sent to MeshCore Repeaters, Room Servers and Sensors.
-
-## 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
-
---
--- a/docs/docs.md
+++ b/docs/docs.md
@@ -1,13 +0,0 @@
-# Local Documentation
-
-This document explains how to build and view the MeshCore documentation locally.
-
-## Building and viewing Docs
-
-```
-pip install mkdocs
-pip install mkdocs-material
-```
-
- `mkdocs serve` - Start the live-reloading docs server.
- `mkdocs build` - Build the documentation site.
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -1,7 +1,12 @@
-# Frequently Asked Questions
-
+**MeshCore-FAQ**<!-- omit from toc -->
 A list of frequently-asked questions and answers for MeshCore

+The current version of this MeshCore FAQ is at https://github.com/meshcore-dev/MeshCore/blob/main/docs/faq.md.  
+This MeshCore FAQ is also mirrored at https://github.com/LitBomb/MeshCore-FAQ and might have newer updates if pull requests on Scott's MeshCore repo are not approved yet.
+
+author: https://github.com/LitBomb<!-- omit from toc -->
+---
+
 - [1. Introduction](#1-introduction)
  - [1.1. Q: What is MeshCore?](#11-q-what-is-meshcore)
  - [1.2. Q: What do you need to start using MeshCore?](#12-q-what-do-you-need-to-start-using-meshcore)
@@ -107,15 +112,15 @@ Anyone is able to build anything they like on top of MeshCore without paying any

 ### 1.2. Q: What do you need to start using MeshCore?
 **A:** Everything you need for MeshCore is available at:
+ Main web site: [https://meshcore.co.uk/](https://meshcore.co.uk/)
+ Firmware Flasher: https://flasher.meshcore.co.uk/
+ Phone Client Applications: https://meshcore.co.uk/apps.html
+ MeshCore Firmware GitHub: https://github.com/ripplebiz/MeshCore

- Main web site: [https://meshcore.co.uk](https://meshcore.co.uk)
- Firmware Flasher: [https://flasher.meshcore.co.uk](https://flasher.meshcore.co.uk)
- MeshCore Firmware on GitHub: [https://github.com/meshcore-dev/MeshCore](https://github.com/meshcore-dev/MeshCore)
- MeshCore Companion App: [https://meshcore.nz](https://meshcore.nz)
- MeshCore Map: [https://meshcore.co.uk/map.html](https://meshcore.co.uk/map.html)
- Andy Kirby has a very useful [intro video](https://www.youtube.com/watch?v=t1qne8uJBAc) for beginners.
+ NOTE: Andy Kirby has a very useful [intro video](https://www.youtube.com/watch?v=t1qne8uJBAc) for beginners.

-You need LoRa hardware devices to run MeshCore firmware as clients or server (repeater and room server).
+
+ You need LoRa hardware devices to run MeshCore firmware as clients or server (repeater and room server).

 #### 1.2.1. Hardware
 MeshCore is available on a variety of 433MHz, 868MHz and 915MHz LoRa devices. For example, Lilygo T-Deck, T-Pager, RAK Wireless WisBlock RAK4631 devices (e.g. 19003, 19007, 19026), Heltec V3, Xiao S3 WIO, Xiao C3, Heltec T114, Station G2, Nano G2 Ultra, Seeed Studio T1000-E. More devices are being added regularly.
@@ -290,7 +295,7 @@ This is a very low cost operation.  AGC reset is done by simply setting `state =

 ### 3.8 Q: How do I make my repeater an observer on the mesh

-**A:** The observer instruction is available here: https://analyzer.letsmesh.net/observer/onboard
+**A:** The observer instruction is available here: https://analyzer.letsme.sh/observer/onboard

 ---

@@ -530,7 +535,7 @@ MeshCore clients would need to reset path constantly and flood traffic across th
 This could change in the future if MeshCore develops a client firmware that repeats.
 [Source](https://discord.com/channels/826570251612323860/1330643963501351004/1354780032140054659)

-### 5.12. Q: How do I add a node to the [MeshCore Map](https://meshcore.co.uk/map.html)
+### 5.12. Q: How do I add a node to the [MeshCore Map]([url](https://meshcore.co.uk/map.html))
 **A:**

 To add a BLE Companion radio, connect to the BLE Companion radio from the MeshCore smartphone app.  In the app, tap the `3 dot` menu icon at the top right corner, then tap `Internet Map`.  Tap the `3 dot` menu icon again and choose `Add me to the Map`
@@ -607,7 +612,7 @@ From here, reference repeater and room server command line commands on MeshCore
 **A:** Yes.  See the following:

 #### 5.14.1. meshcoremqtt
-A Python script to send meshcore debug and packet capture data to MQTT for analysis.  Cisien's version is a fork of Andrew-a-g's and is being used to to collect data for https://map.w0z.is/messages and https://analyzer.letsmesh.net/
+A Python script to send meshcore debug and packet capture data to MQTT for analysis.  Cisien's version is a fork of Andrew-a-g's and is being used to to collect data for https://map.w0z.is/messages and https://analyzer.letsme.sh/
 https://github.com/Cisien/meshcoretomqtt
 https://github.com/Andrew-a-g/meshcoretomqtt

@@ -632,7 +637,7 @@ pyMC_Core is a Python port of MeshCore, designed for Raspberry Pi and similar ha
 https://github.com/rightup/pyMC_core

 #### 5.14.7. MeshCore Packet Decoder
-A TypeScript library for decoding MeshCore mesh networking packets with full cryptographic support. Uses WebAssembly (WASM) for Ed25519 key derivation through the orlp/ed25519 library.  It powers the [MeshCore Packet Analyzer](https://analyzer.letsmesh.net/packets).
+A TypeScript library for decoding MeshCore mesh networking packets with full cryptographic support. Uses WebAssembly (WASM) for Ed25519 key derivation through the orlp/ed25519 library.  It powers the [MeshCore Packet Analyzer](https://analyzer.letsme.sh/packets).
 https://github.com/michaelhart/meshcore-decoder

 #### 5.14.8. meshcore-pi
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,15 +0,0 @@
-# Introduction
-
-Welcome to the MeshCore documentation.
-
-Below are a few quick start guides.
-
- [Frequently Asked Questions](./faq.md)
- [CLI Commands](./cli_commands.md)
- [Companion Protocol](./companion_protocol.md)
- [Packet Structure](./packet_structure.md)
- [QR Codes](./qr_codes.md)
-
-If you find a mistake in any of our documentation, or find something is missing, please feel free to open a pull request for us to review.
-
- [Documentation Source](https://github.com/meshcore-dev/MeshCore/tree/main/docs)
--- a/docs/companion_protocol.md
+++ b/docs/companion_protocol.md
@@ -1,42 +1,26 @@
-# Companion Protocol
+# MeshCore Device Communication Protocol Guide

- **Last Updated**: 2026-01-03
- **Protocol Version**: Companion Firmware v1.12.0+
+This document provides a comprehensive guide for communicating with MeshCore devices over Bluetooth Low Energy (BLE). It is platform-agnostic and can be used for Android, iOS, Python, JavaScript, or any other platform that supports BLE.

-> NOTE: This document is still in development. Some information may be inaccurate.
+## ⚠️ Important Security Note

-This document provides a comprehensive guide for communicating with MeshCore devices over Bluetooth Low Energy (BLE).
+**All secrets, hashes, and cryptographic values shown in this guide are EXAMPLE VALUES ONLY and are NOT real secrets.** 

-It is platform-agnostic and can be used for Android, iOS, Python, JavaScript, or any other platform that supports BLE.
-
-## Official Libraries
-
-Please see the following repos for existing MeshCore Companion Protocol libraries.
-
- JavaScript: [https://github.com/meshcore-dev/meshcore.js](https://github.com/meshcore-dev/meshcore.js)
- Python: [https://github.com/meshcore-dev/meshcore_py](https://github.com/meshcore-dev/meshcore_py)
-
-## Important Security Note
-
-All secrets, hashes, and cryptographic values shown in this guide are example values only.
-
- All hex values, public keys and hashes are for demonstration purposes only
- Never use example secrets in production
- Always generate new cryptographically secure random secrets
- Please implement proper security practices in your implementation
- This guide is for protocol documentation only
+- The secret `9b647d242d6e1c5883fde0c5cf5c4c5e` used in examples is a made-up example value
+- All hex values, public keys, and hashes in examples are for demonstration purposes only
+- **Never use example secrets in production** - always generate new cryptographically secure random secrets
+- This guide is for protocol documentation only - implement proper security practices in your actual implementation

 ## Table of Contents

 1. [BLE Connection](#ble-connection)
-2. [Packet Structure](#packet-structure)
+2. [Protocol Overview](#protocol-overview)
 3. [Commands](#commands)
 4. [Channel Management](#channel-management)
-5. [Message Handling](#message-handling)
-6. [Response Parsing](#response-parsing)
-7. [Example Implementation Flow](#example-implementation-flow)
-8. [Best Practices](#best-practices)
-9. [Troubleshooting](#troubleshooting)
+5. [Secret Generation and QR Codes](#secret-generation-and-qr-codes)
+6. [Message Handling](#message-handling)
+7. [Response Parsing](#response-parsing)
+8. [Example Implementation Flow](#example-implementation-flow)

 ---

@@ -44,111 +28,181 @@ All secrets, hashes, and cryptographic values shown in this guide are example va

 ### Service and Characteristics

-MeshCore Companion devices expose a BLE service with the following UUIDs:
+MeshCore devices expose a BLE service with the following UUIDs:

- **Service UUID**: `6E400001-B5A3-F393-E0A9-E50E24DCCA9E`
- **RX Characteristic** (App → Firmware): `6E400002-B5A3-F393-E0A9-E50E24DCCA9E`
- **TX Characteristic** (Firmware → App): `6E400003-B5A3-F393-E0A9-E50E24DCCA9E`
+- **Service UUID**: `0000ff00-0000-1000-8000-00805f9b34fb`
+- **RX Characteristic** (Device → Client): `0000ff01-0000-1000-8000-00805f9b34fb`
+- **TX Characteristic** (Client → Device): `0000ff02-0000-1000-8000-00805f9b34fb`

 ### Connection Steps

 1. **Scan for Devices**
-    - Scan for BLE devices advertising the MeshCore Service UUID
-    - Optionally filter by device name (typically contains "MeshCore" prefix)
-    - Note the device MAC address for reconnection
+   - Scan for BLE devices advertising the MeshCore service UUID
+   - Filter by device name (typically contains "MeshCore" or similar)
+   - Note the device MAC address for reconnection

 2. **Connect to GATT**
-    - Connect to the device using the discovered MAC address
-    - Wait for connection to be established
+   - Connect to the device using the discovered MAC address
+   - Wait for connection to be established

 3. **Discover Services and Characteristics**
-    - Discover the service with UUID `6E400001-B5A3-F393-E0A9-E50E24DCCA9E`
-    - Discover the RX characteristic `6E400002-B5A3-F393-E0A9-E50E24DCCA9E`
-        - Your app writes to this, the firmware reads from this
-    - Discover the TX characteristic `6E400003-B5A3-F393-E0A9-E50E24DCCA9E`
-        - The firmware writes to this, your app reads from this
+   - Discover the service with UUID `0000ff00-0000-1000-8000-00805f9b34fb`
+   - Discover RX characteristic (`0000ff01-...`) for receiving data
+   - Discover TX characteristic (`0000ff02-...`) for sending commands

 4. **Enable Notifications**
-    - Subscribe to notifications on the TX characteristic to receive data from the firmware
+   - Subscribe to notifications on the RX characteristic
+   - Enable notifications/indications to receive data from the device
+   - On some platforms, you may need to write to a descriptor (e.g., `0x2902`) with value `0x01` or `0x02`

-5. **Send Initial Commands**
-    - Send `CMD_APP_START` to identify your app to firmware and get radio settings
-    - Send `CMD_DEVICE_QEURY` to fetch device info and negotiate supported protocol versions
-    - Send `CMD_SET_DEVICE_TIME` to set the firmware clock
-    - Send `CMD_GET_CONTACTS` to fetch all contacts
-    - Send `CMD_GET_CHANNEL` multiple times to fetch all channel slots
-    - Send `CMD_SYNC_NEXT_MESSAGE` to fetch the next message stored in firmware
-    - Setup listeners for push codes, such as `PUSH_CODE_MSG_WAITING` or `PUSH_CODE_ADVERT`
-    - See [Commands](#commands) section for information on other commands
+5. **Send AppStart Command**
+   - Send the app start command (see [Commands](#commands)) to initialize communication
+   - Wait for OK response before sending other commands
+
+### Connection State Management
+
+- **Disconnected**: No connection established
+- **Connecting**: Connection attempt in progress
+- **Connected**: GATT connection established, ready for commands
+- **Error**: Connection failed or lost

 **Note**: MeshCore devices may disconnect after periods of inactivity. Implement auto-reconnect logic with exponential backoff.

 ### BLE Write Type

-When writing commands to the RX characteristic, specify the write type:
+When writing commands to the TX characteristic, specify the write type:

 - **Write with Response** (default): Waits for acknowledgment from device
 - **Write without Response**: Faster but no acknowledgment

 **Platform-specific**:
-
 - **Android**: Use `BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT` or `WRITE_TYPE_NO_RESPONSE`
 - **iOS**: Use `CBCharacteristicWriteType.withResponse` or `.withoutResponse`
 - **Python (bleak)**: Use `write_gatt_char()` with `response=True` or `False`

-**Recommendation**: Use write with response for reliability.
+**Recommendation**: Use write with response for reliability, especially for critical commands like `SET_CHANNEL`.

 ### MTU (Maximum Transmission Unit)

 The default BLE MTU is 23 bytes (20 bytes payload). For larger commands like `SET_CHANNEL` (66 bytes), you may need to:

 1. **Request Larger MTU**: Request MTU of 512 bytes if supported
-    - Android: `gatt.requestMtu(512)`
-    - iOS: `peripheral.maximumWriteValueLength(for:)`
-    - Python (bleak): MTU is negotiated automatically
+   - Android: `gatt.requestMtu(512)`
+   - iOS: `peripheral.maximumWriteValueLength(for:)`
+   - Python (bleak): MTU is negotiated automatically

-### Command Sequencing
+2. **Handle Chunking**: If MTU is small, commands may be split automatically by the BLE stack
+   - Ensure all chunks are sent before waiting for response
+   - Responses may also arrive in chunks - buffer until complete
+
+### Command Sequencing and Timing

 **Critical**: Commands must be sent in the correct sequence:

 1. **After Connection**:
-    - Wait for BLE connection to be established
-    - Wait for services/characteristics to be discovered
-    - Wait for notifications to be enabled
-    - Now you can safely send commands to the firmware
+   - Wait for GATT connection established
+   - Wait for services/characteristics discovered
+   - Wait for notifications enabled (descriptor write complete)
+   - **Wait 200-1000ms** for device to be ready (some devices need initialization time)
+   - Send `APP_START` command
+   - **Wait for `PACKET_OK` response** before sending any other commands

 2. **Command-Response Matching**:
-    - Send one command at a time
-    - Wait for a response before sending another command
-    - Use a timeout (typically 5 seconds)
-    - Match response to command by type (e.g: `CMD_GET_CHANNEL` → `RESP_CODE_CHANNEL_INFO`)
+   - Send one command at a time
+   - Wait for response before sending next command
+   - Use timeout (typically 5 seconds)
+   - Match response to command by:
+     - Command type (e.g., `GET_CHANNEL` → `PACKET_CHANNEL_INFO`)
+     - Sequence number (if implemented)
+     - First-in-first-out queue
+
+3. **Timing Considerations**:
+   - Minimum delay between commands: 50-100ms
+   - After `APP_START`: Wait 200-500ms before next command
+   - After `SET_CHANNEL`: Wait 500-1000ms for channel to be created
+   - After enabling notifications: Wait 200ms before sending commands
+
+**Example Flow**:
+```python
+# 1. Connect and discover
+await connect_to_device(device)
+await discover_services()
+await enable_notifications()
+await asyncio.sleep(0.2)  # Wait for device ready
+
+# 2. Send AppStart
+send_command(build_app_start())
+response = await wait_for_response(PACKET_OK, timeout=5.0)
+if response.type != PACKET_OK:
+    raise Exception("AppStart failed")
+
+# 3. Now safe to send other commands
+await asyncio.sleep(0.1)  # Small delay between commands
+send_command(build_device_query())
+response = await wait_for_response(PACKET_DEVICE_INFO, timeout=5.0)
+```

 ### Command Queue Management

-For reliable operation, implement a command queue.
+For reliable operation, implement a command queue:

-**Queue Structure**:
+1. **Queue Structure**:
+   - Maintain a queue of pending commands
+   - Track which command is currently waiting for response
+   - Only send next command after receiving response or timeout

- Maintain a queue of pending commands
- Track which command is currently waiting for a response
- Only send next command after receiving response or timeout
+2. **Implementation**:
+```python
+class CommandQueue:
+    def __init__(self):
+        self.queue = []
+        self.waiting_for_response = False
+        self.current_command = None
+    
+    async def send_command(self, command, expected_response_type, timeout=5.0):
+        if self.waiting_for_response:
+            # Queue the command
+            self.queue.append((command, expected_response_type, timeout))
+            return
+        
+        self.waiting_for_response = True
+        self.current_command = (command, expected_response_type, timeout)
+        
+        # Send command
+        await write_to_tx_characteristic(command)
+        
+        # Wait for response
+        response = await wait_for_response(expected_response_type, timeout)
+        
+        self.waiting_for_response = False
+        self.current_command = None
+        
+        # Process next queued command
+        if self.queue:
+            next_cmd, next_type, next_timeout = self.queue.pop(0)
+            await self.send_command(next_cmd, next_type, next_timeout)
+        
+        return response
+```

-**Error Handling**:
-
- On timeout, clear current command, process next in queue
- On error, log error, clear current command, process next
+3. **Error Handling**:
+   - On timeout: Clear current command, process next in queue
+   - On error: Log error, clear current command, process next
+   - Don't block queue on single command failure

 ---

-## Packet Structure
+## Protocol Overview

 The MeshCore protocol uses a binary format with the following structure:

- **Commands**: Sent from app to firmware via RX characteristic
- **Responses**: Received from firmware via TX characteristic notifications
- **All multi-byte integers**: Little-endian byte order (except CayenneLPP which is Big-endian)
+- **Commands**: Sent from client to device via TX characteristic
+- **Responses**: Received from device via RX characteristic (notifications)
+- **All multi-byte integers**: Little-endian byte order
 - **All strings**: UTF-8 encoding

+### Packet Structure
+
 Most packets follow this format:
 ```
 [Packet Type (1 byte)] [Data (variable length)]
@@ -229,7 +283,7 @@ Byte 1: Channel Index (0-7)
 Byte 0: 0x20
 Byte 1: Channel Index (0-7)
 Bytes 2-33: Channel Name (32 bytes, UTF-8, null-padded)
-Bytes 34-65: Secret (32 bytes)
+Bytes 34-65: Secret (32 bytes, see [Secret Generation](#secret-generation))
 ```

 **Total Length**: 66 bytes
@@ -244,7 +298,7 @@ Bytes 34-65: Secret (32 bytes)
 - Padded with null bytes (0x00) if shorter

 **Secret Field** (32 bytes):
- For **private channels**: 32-byte secret
+- For **private channels**: 32-byte secret (see [Secret Generation](#secret-generation))
 - For **public channels**: All zeros (0x00)

 **Example** (create channel "YourChannelName" at index 1 with secret):
@@ -326,33 +380,170 @@ Byte 0: 0x14

 ### Channel Types

-1. **Public Channel**
-    - Uses a publicly known 16-byte key: `8b3387e9c5cdea6ac9e5edbaa115cd72`
-    - Anyone can join this channel, messages should be considered public
-    - Used as the default public group chat
-2. **Hashtag Channels**
-    - Uses a secret key derived from the channel name
-    - It is the first 16 bytes of `sha256("#test")`
-    - For example hashtag channel `#test` has the key: `9cd8fcf22a47333b591d96a2b848b73f`
-    - Used as a topic based public group chat, separate from the default public channel
-3. **Private Channels**
-    - Uses a randomly generated 16-byte secret key
-    - Messages should be considered private between those that know the secret
-    - Users should keep the key secret, and only share with those you want to communicate with
-    - Used as a secure private group chat
+1. **Public Channels** (Index 0)
+   - No secret required
+   - Anyone with the channel name can join
+   - Use for open communication
+
+2. **Private Channels** (Indices 1-7)
+   - Require a 16-byte secret
+   - Secret is expanded to 32 bytes using SHA-512 (see [Secret Generation](#secret-generation))
+   - Only devices with the secret can access the channel

 ### Channel Lifecycle

-1. **Set Channel**:
-    - Fetch all channel slots, and find one with empty name and all-zero secret
-    - Generate or provide a 16-byte secret
-    - Send `CMD_SET_CHANNEL` with name and secret
-2. **Get Channel**:
-    - Send `CMD_GET_CHANNEL` with channel index
-    - Parse `RESP_CODE_CHANNEL_INFO` response
+1. **Create Channel**:
+   - Choose an available index (1-7 for private channels)
+   - Generate or provide a 16-byte secret
+   - Send `SET_CHANNEL` command with name and secret
+   - **Store the secret locally** (device does not return it)
+
+2. **Query Channel**:
+   - Send `GET_CHANNEL` command with channel index
+   - Parse `PACKET_CHANNEL_INFO` response
+   - Note: Secret will be null in response (security feature)
+
 3. **Delete Channel**:
-    - Send `CMD_SET_CHANNEL` with empty name and all-zero secret
-    - Or overwrite with a new channel
+   - Send `SET_CHANNEL` command with empty name and all-zero secret
+   - Or overwrite with a new channel
+
+### Channel Index Management
+
+- **Index 0**: Reserved for public channels
+- **Indices 1-7**: Available for private channels
+- If a channel exists at index 0 but should be private, migrate it to index 1-7
+
+---
+
+## Secret Generation and QR Codes
+
+### Secret Generation
+
+For private channels, generate a cryptographically secure 16-byte secret:
+
+**Pseudocode**:
+```python
+import secrets
+
+# Generate 16 random bytes
+secret_bytes = secrets.token_bytes(16)
+
+# Convert to hex string for storage/sharing
+secret_hex = secret_bytes.hex()  # 32 hex characters
+```
+
+**Important**: Use a cryptographically secure random number generator (CSPRNG). Do not use predictable values.
+
+### Secret Expansion
+
+When sending the secret to the device via `SET_CHANNEL`, the 16-byte secret must be expanded to 32 bytes:
+
+**Process**:
+1. Take the 16-byte secret
+2. Compute SHA-512 hash: `hash = SHA-512(secret)`
+3. Use the first 32 bytes of the hash as the secret field in the command
+
+**Pseudocode**:
+```python
+import hashlib
+
+secret_16_bytes = ...  # Your 16-byte secret
+sha512_hash = hashlib.sha512(secret_16_bytes).digest()  # 64 bytes
+secret_32_bytes = sha512_hash[:32]  # First 32 bytes
+```
+
+This matches MeshCore's ED25519 key expansion method.
+
+### QR Code Format
+
+QR codes for sharing channel secrets use the following format:
+
+**URL Scheme**:
+```
+meshcore://channel/add?name=<ChannelName>&secret=<32HexChars>
+```
+
+**Parameters**:
+- `name`: Channel name (URL-encoded if needed)
+- `secret`: 32-character hexadecimal representation of the 16-byte secret
+
+**Example** (using example secret - NOT a real secret):
+```
+meshcore://channel/add?name=YourChannelName&secret=9b647d242d6e1c5883fde0c5cf5c4c5e
+```
+
+**Alternative Formats** (for backward compatibility):
+
+1. **JSON Format**:
+```json
+{
+  "name": "YourChannelName",
+  "secret": "9b647d242d6e1c5883fde0c5cf5c4c5e"
+}
+```
+*Note: The secret value above is an example only - generate your own secure random secret.*
+
+2. **Plain Hex** (32 hex characters):
+```
+9b647d242d6e1c5883fde0c5cf5c4c5e
+```
+*Note: This is an example hex value - always generate your own cryptographically secure random secret.*
+
+### QR Code Generation
+
+**Steps**:
+1. Generate or use existing 16-byte secret
+2. Convert to 32-character hex string (lowercase)
+3. URL-encode the channel name
+4. Construct the `meshcore://` URL
+5. Generate QR code from the URL string
+
+**Example** (Python with `qrcode` library):
+```python
+import qrcode
+from urllib.parse import quote
+import secrets
+
+channel_name = "YourChannelName"
+# Generate a real cryptographically secure secret (NOT the example value)
+secret_bytes = secrets.token_bytes(16)
+secret_hex = secret_bytes.hex()  # This will be a different value each time
+
+# Example value shown in documentation: "9b647d242d6e1c5883fde0c5cf5c4c5e"
+# DO NOT use the example value - always generate your own!
+
+url = f"meshcore://channel/add?name={quote(channel_name)}&secret={secret_hex}"
+qr = qrcode.QRCode(version=1, box_size=10, border=5)
+qr.add_data(url)
+qr.make(fit=True)
+img = qr.make_image(fill_color="black", back_color="white")
+img.save("channel_qr.png")
+```
+
+### QR Code Scanning
+
+When scanning a QR code:
+
+1. **Parse URL Format**:
+   - Extract `name` and `secret` query parameters
+   - Validate secret is 32 hex characters
+
+2. **Parse JSON Format**:
+   - Parse JSON object
+   - Extract `name` and `secret` fields
+
+3. **Parse Plain Hex**:
+   - Extract only hex characters (0-9, a-f, A-F)
+   - Validate length is 32 characters
+   - Convert to lowercase
+
+4. **Validate Secret**:
+   - Must be exactly 32 hex characters (16 bytes)
+   - Convert hex string to bytes
+
+5. **Create Channel**:
+   - Use extracted name and secret
+   - Send `SET_CHANNEL` command

 ---

@@ -502,28 +693,28 @@ Use the `SEND_CHANNEL_MESSAGE` command (see [Commands](#commands)).

 ### Packet Types

-| Value | Name                       | Description                   |
-|-------|----------------------------|-------------------------------|
-| 0x00  | PACKET_OK                  | Command succeeded             |
-| 0x01  | PACKET_ERROR               | Command failed                |
-| 0x02  | PACKET_CONTACT_START       | Start of contact list         |
-| 0x03  | PACKET_CONTACT             | Contact information           |
-| 0x04  | PACKET_CONTACT_END         | End of contact list           |
-| 0x05  | PACKET_SELF_INFO           | Device self-information       |
-| 0x06  | PACKET_MSG_SENT            | Message sent confirmation     |
-| 0x07  | PACKET_CONTACT_MSG_RECV    | Contact message (standard)    |
-| 0x08  | PACKET_CHANNEL_MSG_RECV    | Channel message (standard)    |
-| 0x09  | PACKET_CURRENT_TIME        | Current time response         |
-| 0x0A  | PACKET_NO_MORE_MSGS        | No more messages available    |
-| 0x0C  | PACKET_BATTERY             | Battery level                 |
-| 0x0D  | PACKET_DEVICE_INFO         | Device information            |
-| 0x10  | PACKET_CONTACT_MSG_RECV_V3 | Contact message (V3 with SNR) |
-| 0x11  | PACKET_CHANNEL_MSG_RECV_V3 | Channel message (V3 with SNR) |
-| 0x12  | PACKET_CHANNEL_INFO        | Channel information           |
-| 0x80  | PACKET_ADVERTISEMENT       | Advertisement packet          |
-| 0x82  | PACKET_ACK                 | Acknowledgment                |
-| 0x83  | PACKET_MESSAGES_WAITING    | Messages waiting notification |
-| 0x88  | PACKET_LOG_DATA            | RF log data (can be ignored)  |
+| Value | Name | Description |
+|-------|------|-------------|
+| 0x00 | PACKET_OK | Command succeeded |
+| 0x01 | PACKET_ERROR | Command failed |
+| 0x02 | PACKET_CONTACT_START | Start of contact list |
+| 0x03 | PACKET_CONTACT | Contact information |
+| 0x04 | PACKET_CONTACT_END | End of contact list |
+| 0x05 | PACKET_SELF_INFO | Device self-information |
+| 0x06 | PACKET_MSG_SENT | Message sent confirmation |
+| 0x07 | PACKET_CONTACT_MSG_RECV | Contact message (standard) |
+| 0x08 | PACKET_CHANNEL_MSG_RECV | Channel message (standard) |
+| 0x09 | PACKET_CURRENT_TIME | Current time response |
+| 0x0A | PACKET_NO_MORE_MSGS | No more messages available |
+| 0x0C | PACKET_BATTERY | Battery level |
+| 0x0D | PACKET_DEVICE_INFO | Device information |
+| 0x10 | PACKET_CONTACT_MSG_RECV_V3 | Contact message (V3 with SNR) |
+| 0x11 | PACKET_CHANNEL_MSG_RECV_V3 | Channel message (V3 with SNR) |
+| 0x12 | PACKET_CHANNEL_INFO | Channel information |
+| 0x80 | PACKET_ADVERTISEMENT | Advertisement packet |
+| 0x82 | PACKET_ACK | Acknowledgment |
+| 0x83 | PACKET_MESSAGES_WAITING | Messages waiting notification |
+| 0x88 | PACKET_LOG_DATA | RF log data (can be ignored) |

 ### Parsing Responses

@@ -890,6 +1081,33 @@ def on_notification_received(data):
        send_command(tx_char, build_get_message())
 ```

+### QR Code Sharing
+
+```python
+import secrets
+from urllib.parse import quote
+
+# 1. Generate QR code data
+channel_name = "YourChannelName"
+# Generate a real secret (NOT the example value from documentation)
+secret_bytes = secrets.token_bytes(16)
+secret_hex = secret_bytes.hex()
+
+# Example value in documentation: "9b647d242d6e1c5883fde0c5cf5c4c5e"
+# DO NOT use example values - always generate your own secure random secrets!
+
+url = f"meshcore://channel/add?name={quote(channel_name)}&secret={secret_hex}"
+
+# 2. Generate QR code image
+qr = qrcode.QRCode(version=1, box_size=10, border=5)
+qr.add_data(url)
+qr.make(fit=True)
+img = qr.make_image(fill_color="black", back_color="white")
+
+# 3. Display or save QR code
+img.save("channel_qr.png")
+```
+
 ---

 ## Best Practices
@@ -903,37 +1121,81 @@ def on_notification_received(data):
   - Always use cryptographically secure random number generators
   - Store secrets securely (encrypted storage)
   - Never log or transmit secrets in plain text
+   - Device does not return secrets - you must store them locally

 3. **Message Handling**:
-   - Send `CMD_SYNC_NEXT_MESSAGE` when `PUSH_CODE_MSG_WAITING` is received
-   - Implement message deduplication to avoid display the same message twice
+   - Poll `GET_MESSAGE` periodically or when `PACKET_MESSAGES_WAITING` is received
+   - Handle message chunking for long messages (>133 characters)
+   - Implement message deduplication to avoid processing the same message twice

-4. **Channel Management**:
-    - Fetch all channel slots even if you encounter an empty slot
-    - Ideally save new channels into the first empty slot
-
-5. **Error Handling**:
+4. **Error Handling**:
   - Implement timeouts for all commands (typically 5 seconds)
-   - Handle `RESP_CODE_ERR` responses appropriately
+   - Handle `PACKET_ERROR` responses appropriately
+   - Log errors for debugging but don't expose sensitive information
+
+5. **Channel Management**:
+   - Avoid using channel index 0 for private channels
+   - Migrate channels from index 0 to 1-7 if needed
+   - Query channels after connection to discover existing channels
+
+---
+
+## Platform-Specific Notes
+
+### Android
+- Use `BluetoothGatt` API
+- Request `BLUETOOTH_CONNECT` and `BLUETOOTH_SCAN` permissions (Android 12+)
+- Enable notifications by writing to descriptor `0x2902` with value `0x01` or `0x02`
+
+### iOS
+- Use `CoreBluetooth` framework
+- Implement `CBPeripheralDelegate` for notifications
+- Request Bluetooth permissions in Info.plist
+
+### Python
+- Use `bleak` library for cross-platform BLE support
+- Handle async/await for BLE operations
+- Use `asyncio` for command-response patterns
+
+### JavaScript/Node.js
+- Use `noble` or `@abandonware/noble` for BLE
+- Handle callbacks or promises for async operations
+- Use `Buffer` for binary data manipulation

 ---

 ## Troubleshooting

 ### Connection Issues
-
 - **Device not found**: Ensure device is powered on and advertising
 - **Connection timeout**: Check Bluetooth permissions and device proximity
 - **GATT errors**: Ensure proper service/characteristic discovery

 ### Command Issues
-
 - **No response**: Verify notifications are enabled, check connection state
- **Error responses**: Verify command format and check error code
- **Timeout**: Increase timeout value or try again
+- **Error responses**: Verify command format, check channel index validity
+- **Timeout**: Increase timeout value or check device responsiveness

 ### Message Issues
-
 - **Messages not received**: Poll `GET_MESSAGE` command periodically
- **Duplicate messages**: Implement message deduplication using timestamp/content as a unique id
- **Message truncation**: Send long messages as separate shorter messages
+- **Duplicate messages**: Implement message deduplication using timestamps/hashes
+- **Message truncation**: Split long messages into chunks
+
+### Secret/Channel Issues
+- **Secret not working**: Verify secret expansion (SHA-512) is correct
+- **Channel not found**: Query channels after connection to discover existing channels
+- **Channel index 0**: Migrate to index 1-7 for private channels
+
+---
+
+## References
+
+- MeshCore Python implementation: `meshcore_py-main/src/meshcore/`
+- BLE GATT Specification: Bluetooth SIG Core Specification
+- ED25519 Key Expansion: RFC 8032
+
+---
+
+**Last Updated**: 2025-01-01
+**Protocol Version**: Based on MeshCore v1.36.0+
+
--- a/docs/qr_codes.md
+++ b/docs/qr_codes.md
@@ -1,34 +0,0 @@
-# QR Codes
-
-This document provides an overview of QR Code formats that can be used for sharing MeshCore channels and contacts. The formats described below are supported by the MeshCore mobile app.
-
-## Add Channel
-
-**Example URL**:
-
-```
-meshcore://channel/add?name=Public&secret=8b3387e9c5cdea6ac9e5edbaa115cd72
-```
-
-**Parameters**:
-
- `name`: Channel name (URL-encoded if needed)
- `secret`: 16-byte secret represented as 32 hex characters
-
-## Add Contact
-
-**Example URL**:
-
-```
-meshcore://contact/add?name=Example+Contact&public_key=9cd8fcf22a47333b591d96a2b848b73f457b1bb1a3ea2453a885f9e5787765b1&type=1
-```
-
-**Parameters**:
-
- `name`: Contact name (URL-encoded if needed)
- `public_key`: 32-byte public key represented as 64 hex characters
- `type`: numeric contact type
-    - `1`: Companion
-    - `2`: Repeater
-    - `3`: Room Server
-    - `4`: Sensor
--- a/docs/terminal_chat_cli.md
+++ b/docs/terminal_chat_cli.md
@@ -1,96 +0,0 @@
-# Terminal Chat CLI
-
-Below are the commands you can enter into the Terminal Chat clients:
-
-```
-set freq {frequency}
-```
-Set the LoRa frequency. Example:  set freq 915.8
-
-```
-set tx {tx-power-dbm}
-```
-Sets LoRa transmit power in dBm.
-
-```
-set name {name}
-```
-Sets your advertisement name.
-
-```
-set lat {latitude}
-```
-Sets your advertisement map latitude. (decimal degrees)
-
-```
-set lon {longitude}
-```
-Sets your advertisement map longitude. (decimal degrees)
-
-```
-set af {air-time-factor}
-```
-Sets the transmit air-time-factor.
-
-
-```
-time {epoch-secs}
-```
-Set the device clock using UNIX epoch seconds. Example:  time 1738242833
-
-
-```
-advert
-```
-Sends an advertisement packet
-
-```
-clock
-```
-Displays current time per device's clock.
-
-
-```
-ver
-```
-Shows the device version and firmware build date.
-
-```
-card
-```
-Displays *your* 'business card', for other to manually _import_
-
-```
-import {card}
-```
-Imports the given card to your contacts.
-
-```
-list {n}
-```
-List all contacts by most recent. (optional {n}, is the last n by advertisement date)
-
-```
-to
-```
-Shows the name of current recipient contact. (for subsequent 'send' commands)
-
-```
-to {name-prefix}
-```
-Sets the recipient to the _first_ matching contact (in 'list') by the name prefix. (ie. you don't have to type whole name)
-
-```
-send {text}
-```
-Sends the text message (as DM) to current recipient.
-
-```
-reset path
-```
-Resets the path to current recipient, for new path discovery.
-
-```
-public {text}
-```
-Sends the text message to the built-in 'public' group channel
--- a/examples/companion_radio/MyMesh.h
+++ b/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)
--- a/examples/simple_repeater/MyMesh.cpp
+++ b/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 - ??");
    }
--- a/examples/simple_repeater/MyMesh.h
+++ b/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"
--- a/examples/simple_room_server/MyMesh.h
+++ b/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
--- a/examples/simple_sensor/SensorMesh.h
+++ b/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"
--- a/fetch_prs.sh
+++ b/fetch_prs.sh
@@ -2,9 +2,7 @@

 git branch -D pr-1297
 git branch -D pr-1338
-git branch -D pr-1398

 # fetch PRs
-git fetch upstream pull/1398/head:pr-1398
 git fetch upstream pull/1338/head:pr-1338
 git fetch upstream pull/1297/head:pr-1297
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,19 +0,0 @@
-site_name: MeshCore Docs
-site_url: https://meshcore-dev.github.io/meshcore/
-site_description: Documentation for the open source MeshCore firmware
-
-repo_name: meshcore-dev/meshcore
-repo_url: https://github.com/meshcore-dev/meshcore/
-edit_uri: edit/main/docs/
-
-theme:
-  name: material
-  logo: _assets/meshcore_tm.svg
-  features:
-    - content.action.edit
-    - content.code.copy
-    - search.highlight
-    - search.suggest
-
-extra_css:
-  - _stylesheets/extra.css
--- a/platformio.ini
+++ b/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
--- a/src/Dispatcher.cpp
+++ b/src/Dispatcher.cpp
@@ -8,9 +8,7 @@

 namespace mesh {

-#define MAX_RX_DELAY_MILLIS        32000  // 32 seconds
-#define MIN_TX_BUDGET_RESERVE_MS   100    // min budget (ms) required before allowing next TX
-#define MIN_TX_BUDGET_AIRTIME_DIV  2      // require at least 1/N of estimated airtime as budget before TX
+#define MAX_RX_DELAY_MILLIS   32000  // 32 seconds

 #ifndef NOISE_FLOOR_CALIB_INTERVAL
  #define NOISE_FLOOR_CALIB_INTERVAL   2000     // 2 seconds
@@ -41,15 +39,15 @@ void Dispatcher::updateTxBudget() {

  float duty_cycle = 1.0f / (1.0f + getAirtimeBudgetFactor());
  unsigned long max_budget = (unsigned long)(getDutyCycleWindowMs() * duty_cycle);
+
  unsigned long refill = (unsigned long)(elapsed * duty_cycle);
-  
-  if (refill > 0) {
-    tx_budget_ms += refill;
-    if (tx_budget_ms > max_budget) {
-      tx_budget_ms = max_budget;
-    }
-    last_budget_update = now;
+  tx_budget_ms += refill;
+
+  if (tx_budget_ms > max_budget) {
+    tx_budget_ms = max_budget;
  }
+
+  last_budget_update = now;
 }

 int Dispatcher::calcRxDelay(float score, uint32_t air_time) const {
@@ -96,9 +94,9 @@ void Dispatcher::loop() {
        tx_budget_ms -= t;
      }

-      if (tx_budget_ms < MIN_TX_BUDGET_RESERVE_MS) {
+      if (tx_budget_ms < 100) {
        float duty_cycle = 1.0f / (1.0f + getAirtimeBudgetFactor());
-        unsigned long needed = MIN_TX_BUDGET_RESERVE_MS - tx_budget_ms;
+        unsigned long needed = 100 - tx_budget_ms;
        next_tx_time = futureMillis((unsigned long)(needed / duty_cycle));
      } else {
        next_tx_time = _ms->getMillis();
@@ -266,9 +264,9 @@ void Dispatcher::checkSend() {
  updateTxBudget();
  
  uint32_t est_airtime = _radio->getEstAirtimeFor(MAX_TRANS_UNIT);
-  if (tx_budget_ms < est_airtime / MIN_TX_BUDGET_AIRTIME_DIV) {
+  if (tx_budget_ms < est_airtime / 2) {
    float duty_cycle = 1.0f / (1.0f + getAirtimeBudgetFactor());
-    unsigned long needed = est_airtime / MIN_TX_BUDGET_AIRTIME_DIV - tx_budget_ms;
+    unsigned long needed = est_airtime / 2 - tx_budget_ms;
    next_tx_time = futureMillis((unsigned long)(needed / duty_cycle));
    return;
  }
--- a/src/helpers/CommonCLI.cpp
+++ b/src/helpers/CommonCLI.cpp
@@ -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
--- a/src/helpers/NRF52Board.cpp
+++ b/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()
--- a/src/helpers/NRF52Board.h
+++ b/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
--- a/src/helpers/RegionMap.cpp
+++ b/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
--- a/src/helpers/RegionMap.h
+++ b/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;
 };
--- a/src/helpers/ui/SSD1306Display.cpp
+++ b/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() {
--- a/src/helpers/ui/SSD1306Display.h
+++ b/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; }
--- a/src/helpers/ui/ST7789LCDDisplay.cpp
+++ b/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

--- a/src/helpers/ui/ST7789LCDDisplay.h
+++ b/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),
--- a/tools/maint/README.md
+++ b/tools/maint/README.md
@@ -0,0 +1,56 @@
+# Maintenance Tools
+
+This directory contains automation for managing our **Friendly Fork**. It allows us to integrate community-submitted Pull Requests from the upstream repository into our local development branches.
+
+## Why this exists
+
+In firmware development, critical bug fixes or hardware support often exist in the upstream "Pull Request" queue long before they are officially merged. This tool allows us to build an integrated firmware version that includes those necessary patches while remaining syncable with the official source.
+
+## Usage
+
+### 1. Prerequisites
+
+You must have the original repository added as a remote named `upstream`:
+
+```bash
+git remote add upstream https://github.com/meshcore-dev/MeshCore.git
+```
+
+### 2. Basic Commands
+
+**Apply specific patches:**
+To pull in PR #1338 and PR #1400 from the upstream project:
+
+```bash
+./tools/maint/apply_patches.sh 1338 1400
+
+```
+
+**Start over (Reset):**
+To wipe the integrated branch and reset it to match the official upstream `main` branch exactly:
+
+```bash
+./tools/maint/apply_patches.sh --reset
+
+```
+
+## Traceability
+
+Every time this script runs, it updates `patch_manifest.log`. This file tracks:
+
+* The date of the integration.
+* The base commit SHA we started from.
+* The specific commit SHA of every PR applied.
+
+**This log is essential for debugging firmware regressions.** If the hardware fails, check the manifest to identify which experimental patch might be the cause.
+
+---
+
+### A Note on Merge Conflicts
+
+If a PR cannot be applied automatically, the script will abort the merge. You will need to:
+
+1. Manually merge the PR.
+2. Resolve the conflicts in your editor.
+3. Commit the result.
+4. Manually update the `patch_manifest.log`.
--- a/tools/maint/apply_patches.sh
+++ b/tools/maint/apply_patches.sh
@@ -0,0 +1,65 @@
+#!/bin/bash
+
+# Configuration
+UPSTREAM_REMOTE="upstream"
+BASE_BRANCH="main"        # Change to 'master' if that's what upstream uses
+TARGET_BRANCH="main-integrated"
+MANIFEST_FILE="tools/maint/patch_manifest.log"
+
+# Function to reset the branch
+reset_to_upstream() {
+    echo "Warning: This will wipe all local changes on $TARGET_BRANCH."
+    read -p "Are you sure you want to reset to $UPSTREAM_REMOTE/$BASE_BRANCH? (y/n) " -n 1 -r
+    echo
+    if [[ $REPLY =~ ^[Yy]$ ]]; then
+        git fetch "$UPSTREAM_REMOTE"
+        git checkout -B "$TARGET_BRANCH" "$UPSTREAM_REMOTE/$BASE_BRANCH"
+        echo "--- Reset to Upstream: $(date) ---" > "$MANIFEST_FILE"
+        echo "Base Commit: $(git rev-parse HEAD)" >> "$MANIFEST_FILE"
+        echo "Reset successful. Branch is now clean."
+    else
+        echo "Reset aborted."
+    fi
+}
+
+# Check for reset flag
+if [[ "$1" == "--reset" ]]; then
+    reset_to_upstream
+    exit 0
+fi
+
+# Standard PR application logic
+PR_IDS=("$@")
+if [ ${#PR_IDS[@]} -eq 0 ]; then
+    echo "Usage:"
+    echo "  Apply PRs: $0 <PR_ID1> <PR_ID2> ..."
+    echo "  Reset:     $0 --reset"
+    exit 1
+fi
+
+# Ensure target branch exists and is checked out
+git checkout -B "$TARGET_BRANCH"
+
+echo "--- Patch Session: $(date) ---" >> "$MANIFEST_FILE"
+
+for PR in "${PR_IDS[@]}"; do
+    echo "--------------------------------------"
+    echo "Fetching PR #$PR..."
+    
+    if git fetch "$UPSTREAM_REMOTE" "pull/$PR/head:PR_TEMP_FETCH"; then
+        if git merge PR_TEMP_FETCH --no-edit -m "Integrate upstream PR #$PR"; then
+            echo "Successfully integrated PR #$PR"
+            echo "PR #$PR SHA: $(git rev-parse PR_TEMP_FETCH)" >> "$MANIFEST_FILE"
+        else
+            echo "Conflict in PR #$PR. Aborting merge."
+            git merge --abort
+            exit 1
+        fi
+        git branch -D PR_TEMP_FETCH
+    else
+        echo "Error: PR #$PR not found."
+    fi
+done
+
+echo "--------------------------------------"
+echo "Done. See $MANIFEST_FILE for details."
--- a/tools/maint/patch_and_build_hansemesh_fw.sh
+++ b/tools/maint/patch_and_build_hansemesh_fw.sh
@@ -3,7 +3,7 @@
 export PATH="$HOME/.platformio/penv/bin:$PATH"

 LOGFILE="$PWD/meshcore-evo-fw.log"
-FIRMWARE_VERSION="v1.12.0-evo_0.1.6"
+FIRMWARE_VERSION="v1.11.0-evo_0.1.3"
 FIRMWARE_BUILD_DATE=$(date '+%d-%b-%Y')

 collect_bin_files(){
@@ -43,7 +43,7 @@ echo "-------------------------------------------------"
 # ./tools/maint/apply_patches.sh 1199 1338 1297

 # build all repeater firmwares, the will be in .out
-FIRMWARE_VERSION=$FIRMWARE_VERSION ./build.sh build-repeater-firmwares
+FIRMWARE_VERSION="v1.11_evo" ./build.sh build-repeater-firmwares

 # build single firmwares
 #FIRMWARE_VERSION=$FIRMWARE_VERSION FIRMWARE_BUILD_DATE=$FIRMWARE_BUILD_DATE ./build.sh build-firmware ProMicro_repeater
--- a/variants/heltec_mesh_solar/MeshSolarBoard.h
+++ b/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 {
--- a/variants/heltec_t114/T114Board.h
+++ b/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)
--- a/variants/heltec_v4/HeltecV4Board.cpp
+++ b/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";
  }
--- a/variants/heltec_v4/platformio.ini
+++ b/variants/heltec_v4/platformio.ini
@@ -20,9 +20,11 @@ build_flags =
  -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_DIO2_AS_RF_SWITCH=true
@@ -45,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
@@ -91,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
@@ -113,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
@@ -133,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
@@ -187,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
@@ -208,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}
--- a/variants/heltec_v4/target.cpp
+++ b/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

--- a/variants/heltec_v4/target.h
+++ b/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

--- a/variants/ikoka_handheld_nrf/IkokaNrf52Board.h
+++ b/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)
--- a/variants/ikoka_nano_nrf/IkokaNanoNRFBoard.h
+++ b/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)
--- a/variants/ikoka_stick_nrf/IkokaStickNRFBoard.h
+++ b/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)
--- a/variants/keepteen_lt1/KeepteenLT1Board.h
+++ b/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
--- a/variants/lilygo_techo/TechoBoard.h
+++ b/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;

--- a/variants/lilygo_techo_lite/TechoBoard.h
+++ b/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;

--- a/variants/mesh_pocket/MeshPocket.h
+++ b/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 {
--- a/variants/meshtiny/MeshtinyBoard.cpp
+++ b/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
-}
-
-
--- a/variants/meshtiny/MeshtinyBoard.h
+++ b/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();
-  }
-
-};
--- a/variants/meshtiny/platformio.ini
+++ b/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
--- a/variants/meshtiny/target.cpp
+++ b/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
-}
--- a/variants/meshtiny/target.h
+++ b/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();
--- a/variants/meshtiny/variant.cpp
+++ b/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);
-}
--- a/variants/meshtiny/variant.h
+++ b/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_
--- a/variants/minewsemi_me25ls01/MinewsemiME25LS01Board.h
+++ b/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
--- a/variants/nano_g2_ultra/nano-g2.cpp
+++ b/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
--- a/variants/nano_g2_ultra/nano-g2.h
+++ b/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"; }

--- a/variants/promicro/PromicroBoard.h
+++ b/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
--- a/variants/rak3401/RAK3401Board.h
+++ b/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
--- a/variants/rak3401/variant.h
+++ b/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
--- a/variants/rak4631/RAK4631Board.h
+++ b/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
--- a/variants/rak4631/variant.h
+++ b/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
 }
--- a/variants/rak_wismesh_tag/RAKWismeshTagBoard.h
+++ b/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)
--- a/variants/sensecap_solar/SenseCapSolarBoard.h
+++ b/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)
--- a/variants/t1000-e/T1000eBoard.h
+++ b/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;
 };
--- a/variants/thinknode_m1/ThinkNodeM1Board.h
+++ b/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;

--- a/variants/thinknode_m3/ThinknodeM3Board.cpp
+++ b/variants/thinknode_m3/ThinknodeM3Board.cpp
@@ -5,10 +5,76 @@
 #include <bluefruit.h>

 void ThinknodeM3Board::begin() {
-  Nrf52BoardDCDC::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
--- a/variants/thinknode_m3/ThinknodeM3Board.h
+++ b/variants/thinknode_m3/ThinknodeM3Board.h
@@ -1,13 +1,13 @@
 #pragma once

-#include <Arduino.h>
 #include <MeshCore.h>
-#include <helpers/NRF52Board.h>
+#include <Arduino.h>

 #define ADC_FACTOR ((1000.0*ADC_MULTIPLIER*AREF_VOLTAGE)/ADC_MAX)

-class ThinknodeM3Board : public Nrf52BoardDCDC {
+class ThinknodeM3Board : public mesh::MainBoard {
 protected:
+  uint8_t startup_reason;
  uint8_t btn_prev_state;

 public:
@@ -27,10 +27,12 @@ public:
    return (uint16_t)((float)adcvalue * ADC_FACTOR);
  }

-#if defined(P_LORA_TX_LED)
-#if !defined(P_LORA_TX_LED_ON)
-#define P_LORA_TX_LED_ON HIGH
-#endif
+  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
  }
@@ -54,5 +56,13 @@ public:
    return 0;
  }

-  void powerOff() override { sd_power_system_off(); }
+  void powerOff() override {
+    sd_power_system_off();
+  }
+
+  void reboot() override {
+    NVIC_SystemReset();
+  }
+
+//  bool startOTAUpdate(const char* id, char reply[]) override;
 };
--- a/variants/thinknode_m6/ThinkNodeM6Board.cpp
+++ b/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
--- a/variants/thinknode_m6/ThinkNodeM6Board.h
+++ b/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,13 +11,21 @@
 #define PIN_VBAT_READ     BATTERY_PIN
 #define REAL_VBAT_MV_PER_LSB (VBAT_DIVIDER_COMP * VBAT_MV_PER_LSB)

-class ThinkNodeM6Board : public Nrf52BoardOTA {
+class ThinkNodeM6Board : public mesh::MainBoard {
+protected:
+  uint8_t startup_reason;
+
 public:
-  ThinkNodeM6Board() : NRF52BoardOTA("THINKNODE_M1_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
  }
@@ -31,6 +38,10 @@ public:
    return "Elecrow ThinkNode-M6";
  }

+  void reboot() override {
+    NVIC_SystemReset();
+  }
+
  void powerOff() override {

    // turn off all leds, sd_power_system_off will not do this for us
@@ -40,5 +51,6 @@ public:

    // power off board
    sd_power_system_off();
+
  }
 };
--- a/variants/wio-tracker-l1/WioTrackerL1Board.h
+++ b/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)
--- a/variants/wio_wm1110/WioWM1110Board.cpp
+++ b/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

--- a/variants/wio_wm1110/WioWM1110Board.h
+++ b/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) {
--- a/variants/xiao_nrf52/XiaoNrf52Board.h
+++ b/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)
Author	SHA1	Message	Date
Matthias Wientapper	3b9315df8d	platformio.ini: Adjust defaults for LoRa frequncies and advert interval limits	2026-01-26 12:50:18 +01:00
Matthias Wientapper	bd10790c4a	Integration of upstrem PR #1297	2026-01-26 12:50:18 +01:00
Matthias Wientapper	60b72cc11b	Integration of upstrem PR #1338	2026-01-26 12:50:18 +01:00
Matthias Wientapper	3a16bd3f9d	Merge branch 'evo-build-scripts' into meshcore-evo_20260126	2026-01-26 12:47:53 +01:00
Matthias Wientapper	4a9137bf00	Remove PR-1199 as its functionality is part of dev now	2026-01-26 12:47:35 +01:00
Matthias Wientapper	ef5ac8177f	Merge branch 'evo-build-scripts' into meshcore-evo_20260126	2026-01-26 12:46:23 +01:00
Matthias Wientapper	864a0c0421	Set default to EU/UK narrow	2026-01-26 12:45:45 +01:00
Matthias Wientapper	4bcbd54964	Merge branch 'dev' into meshcore-evo	2026-01-26 12:16:06 +01:00
Matthias Wientapper	cb11809dff	Merge branch 'dev' into meshcore-evo	2026-01-26 11:10:20 +01:00
Matthias Wientapper	58decb74b8	Fix fetching same PR twice under wrong name	2026-01-26 11:09:03 +01:00
Matthias Wientapper	e6cab77670	Add scripts to help automate the fw build process	2026-01-21 09:54:56 +01:00
Matthias Wientapper	7682f1085c	Merge branch 'dev' of github.com:meshcore-dev/MeshCore into meshcore-evo	2026-01-17 14:08:39 +01:00
Matthias Wientapper	4fd7aa6ce8	Merge branch 'dev' into meshcore-evo	2026-01-13 23:21:57 +01:00
Matthias Wientapper	94d44eb47c	Merge branch 'dev' into meshcore-evo	2026-01-10 20:37:27 +01:00
Matthias Wientapper	f8f9cddb47	Integrate pending PRs from upstream repository	2026-01-09 23:23:39 +01:00