Integrate pending PRs from upstream repository

Merge pull request #1310 from LitBomb/patch-22
fix Station G2 output dBm typo
2026-01-09 23:23:39 +01:00 · 2026-01-03 19:39:31 +13:00 · 2026-01-02 22:34:10 -08:00 · 2025-12-29 13:44:38 +11:00 · 2025-12-21 21:48:56 -08:00 · 2025-12-15 18:18:00 +13:00
166 changed files with 2223 additions and 6941 deletions
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,44 +0,0 @@
 {
 	"name": "MeshCore",
 	"image": "mcr.microsoft.com/devcontainers/python:3-bookworm",
 	"features": {
 		"ghcr.io/rocker-org/devcontainer-features/apt-packages:1": {
 			"packages": [
 				"sudo"
 			]
 		}
 	},
 	"runArgs": [
 		"--privileged",
 		// arch tty* is owned by uucp (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"
 	},
 	"customizations": {
 		"vscode": {
 			"settings": {
 				"platformio-ide.disablePIOHomeStartup": true,
 				"editor.formatOnSave": false,
 				"workbench.colorCustomizations": {
 					"titleBar.activeBackground": "#0d1a2b",
 					"titleBar.activeForeground": "#ffffff",
 					"titleBar.inactiveBackground": "#0d1a2b99",
 					"titleBar.inactiveForeground": "#ffffff99"
 				}
 			},
 			"extensions": [
 				"platformio.platformio-ide",
 				"github.vscode-github-actions",
 				"GitHub.vscode-pull-request-github"
 			],
 			"unwantedRecommendations": [
 				"ms-vscode.cpptools-extension-pack"
 			]
 		}
 	}
 }
--- a/.gitignore
+++ b/.gitignore
@@ -14,5 +14,3 @@ cmake-*
 .cache
 .ccls
 compile_commands.json
 .venv/
 venv/
--- a/README.md
+++ b/README.md
@@ -89,7 +89,7 @@ Please submit PR's using 'dev' as the base branch!
 For minor changes just submit your PR and I'll try to review it, but for anything more 'impactful' please open an Issue first and start a discussion. Is better to sound out what it is you want to achieve first, and try to come to a consensus on what the best approach is, especially when it impacts the structure or architecture of this codebase.
 Here are some general principals you should try to adhere to:
-* Keep it simple. Please, don't think like a high-level lang programmer. Think embedded, and keep code concise, without any unnecessary layers.
+* Keep it simple. Please, don't think like a high-level lang programmer. Think embedded, and keep code concise, without any unecessary layers.
 * No dynamic memory allocation, except during setup/begin functions.
 * Use the same brace and indenting style that's in the core source modules. (A .clang-format is prob going to be added soon, but please do NOT retroactively re-format existing code. This just creates unnecessary diffs that make finding problems harder)
@@ -97,28 +97,19 @@ Here are some general principals you should try to adhere to:
 There are a number of fairly major features in the pipeline, with no particular time-frames attached yet. In very rough chronological order:
 - [X] Companion radio: UI redesign
- [ ] Repeater + Room Server: add ACL's (like Sensor Node has)
+- [X] Repeater + Room Server: add ACL's (like Sensor Node has)
- [ ] Standardise Bridge mode for repeaters
+- [X] Standardise Bridge mode for repeaters
 - [ ] Repeater/Bridge: Standardise the Transport Codes for zoning/filtering
- [ ] Core + Repeater: enhanced zero-hop neighbour discovery
+- [X] Core + Repeater: enhanced zero-hop neighbour discovery
 - [ ] Core: round-trip manual path support
 - [ ] Companion + Apps: support for multiple sub-meshes (and 'off-grid' client repeat mode)
 - [ ] Core + Apps: support for LZW message compression
 - [ ] Core: dynamic CR (Coding Rate) for weak vs strong hops
 - [ ] Core: new framework for hosting multiple virtual nodes on one physical device
- [ ] V2 protocol spec: discussion and consensus around V2 packet protocol, including path hashes, new encryption specs, etc
+- [ ] V2 protocol spec: discussion and concensus around V2 packet protocol, including path hashes, new encryption specs, etc
 ## 📞 Get Support
 - Report bugs and request features on the [GitHub Issues](https://github.com/ripplebiz/MeshCore/issues) page.
 - Find additional guides and components on [my site](https://buymeacoffee.com/ripplebiz).
 - Join [MeshCore Discord](https://discord.gg/BMwCtwHj5V) to chat with the developers and get help from the community.
 ## RAK Wireless Board Support in PlatformIO
 Before building/flashing the RAK4631 targets in this project, there is, unfortunately, some patching you have to do to your platformIO packages to make it work. There is a guide here on the process:
   [RAK Wireless: How to Perform Installation of Board Support Package in PlatformIO](https://learn.rakwireless.com/hc/en-us/articles/26687276346775-How-To-Perform-Installation-of-Board-Support-Package-in-PlatformIO)
 After building, you will need to convert the output firmware.hex file into a .uf2 file you can copy over to your RAK4631 device (after doing a full erase) by using the command `uf2conv.py -f 0xADA52840 -c firmware.hex` with the python script available from:
   [GitHub: Microsoft - uf2](https://github.com/Microsoft/uf2/blob/master/utils/uf2conv.py)
--- a/arch/nrf52/extra_scripts/patch_bluefruit.py
+++ b/arch/nrf52/extra_scripts/patch_bluefruit.py
@@ -1,198 +0,0 @@
 """
 Bluefruit BLE Patch Script
 Patches Bluefruit library to fix semaphore leak bug that causes device lockup
 when BLE central disconnects unexpectedly (e.g., going out of range, supervision timeout).
 Patches applied:
 1. BLEConnection.h: Add _hvn_qsize member to track semaphore queue size
 2. BLEConnection.cpp: Store hvn_qsize and restore semaphore on disconnect
 Bug description:
 - When a BLE central disconnects unexpectedly (reason=8 supervision timeout),
  the BLE_GATTS_EVT_HVN_TX_COMPLETE event may never fire
 - This leaves the _hvn_sem counting semaphore in a decremented state
 - Since BLEConnection objects are reused (destructor never called), the
  semaphore count is never restored
 - Eventually all semaphore counts are exhausted and notify() blocks/fails
 """
 from pathlib import Path
 Import("env")  # pylint: disable=undefined-variable
 def _patch_ble_connection_header(source: Path) -> bool:
    """
    Add _hvn_qsize member variable to BLEConnection class.
    This is needed to restore the semaphore to its correct count on disconnect.
    Returns True if patch was applied or already applied, False on error.
    """
    try:
        content = source.read_text()
        # Check if already patched
        if "_hvn_qsize" in content:
            return True  # Already patched
        # Find the location to insert - after _phy declaration
        original_pattern = '''    uint8_t  _phy;
    uint8_t  _role;'''
        patched_pattern = '''    uint8_t  _phy;
    uint8_t  _hvn_qsize;
    uint8_t  _role;'''
        if original_pattern not in content:
            print("Bluefruit patch: WARNING - BLEConnection.h pattern not found")
            return False
        content = content.replace(original_pattern, patched_pattern)
        source.write_text(content)
        # Verify
        if "_hvn_qsize" not in source.read_text():
            return False
        return True
    except Exception as e:
        print(f"Bluefruit patch: ERROR patching BLEConnection.h: {e}")
        return False
 def _patch_ble_connection_source(source: Path) -> bool:
    """
    Patch BLEConnection.cpp to:
    1. Store hvn_qsize in constructor
    2. Restore _hvn_sem semaphore to full count on disconnect
    Returns True if patch was applied or already applied, False on error.
    """
    try:
        content = source.read_text()
        # Check if already patched (look for the restore loop)
        if "uxSemaphoreGetCount(_hvn_sem)" in content:
            return True  # Already patched
        # Patch 1: Store queue size in constructor
        constructor_original = '''  _hvn_sem   = xSemaphoreCreateCounting(hvn_qsize, hvn_qsize);'''
        constructor_patched = '''  _hvn_qsize = hvn_qsize;
  _hvn_sem   = xSemaphoreCreateCounting(hvn_qsize, hvn_qsize);'''
        if constructor_original not in content:
            print("Bluefruit patch: WARNING - BLEConnection.cpp constructor pattern not found")
            return False
        content = content.replace(constructor_original, constructor_patched)
        # Patch 2: Restore semaphore on disconnect
        disconnect_original = '''    case BLE_GAP_EVT_DISCONNECTED:
      // mark as disconnected
      _connected = false;
    break;'''
        disconnect_patched = '''    case BLE_GAP_EVT_DISCONNECTED:
      // Restore notification semaphore to full count
      // This fixes lockup when disconnect occurs with notifications in flight
      while (uxSemaphoreGetCount(_hvn_sem) < _hvn_qsize) {
        xSemaphoreGive(_hvn_sem);
      }
      // Release indication semaphore if waiting
      if (_hvc_sem) {
        _hvc_received = false;
        xSemaphoreGive(_hvc_sem);
      }
      // mark as disconnected
      _connected = false;
    break;'''
        if disconnect_original not in content:
            print("Bluefruit patch: WARNING - BLEConnection.cpp disconnect pattern not found")
            return False
        content = content.replace(disconnect_original, disconnect_patched)
        source.write_text(content)
        # Verify
        verify_content = source.read_text()
        if "uxSemaphoreGetCount(_hvn_sem)" not in verify_content:
            return False
        if "_hvn_qsize = hvn_qsize" not in verify_content:
            return False
        return True
    except Exception as e:
        print(f"Bluefruit patch: ERROR patching BLEConnection.cpp: {e}")
        return False
 def _apply_bluefruit_patches(target, source, env):  # pylint: disable=unused-argument
    framework_path = env.get("PLATFORMFW_DIR")
    if not framework_path:
        framework_path = env.PioPlatform().get_package_dir("framework-arduinoadafruitnrf52")
    if not framework_path:
        print("Bluefruit patch: ERROR - framework directory not found")
        env.Exit(1)
        return
    framework_dir = Path(framework_path)
    bluefruit_lib = framework_dir / "libraries" / "Bluefruit52Lib" / "src"
    patch_failed = False
    # Patch BLEConnection.h
    conn_header = bluefruit_lib / "BLEConnection.h"
    if conn_header.exists():
        before = conn_header.read_text()
        success = _patch_ble_connection_header(conn_header)
        after = conn_header.read_text()
        if success:
            if before != after:
                print("Bluefruit patch: OK - Applied BLEConnection.h fix (added _hvn_qsize member)")
            else:
                print("Bluefruit patch: OK - BLEConnection.h already patched")
        else:
            print("Bluefruit patch: FAILED - BLEConnection.h")
            patch_failed = True
    else:
        print(f"Bluefruit patch: ERROR - BLEConnection.h not found at {conn_header}")
        patch_failed = True
    # Patch BLEConnection.cpp
    conn_source = bluefruit_lib / "BLEConnection.cpp"
    if conn_source.exists():
        before = conn_source.read_text()
        success = _patch_ble_connection_source(conn_source)
        after = conn_source.read_text()
        if success:
            if before != after:
                print("Bluefruit patch: OK - Applied BLEConnection.cpp fix (restore semaphore on disconnect)")
            else:
                print("Bluefruit patch: OK - BLEConnection.cpp already patched")
        else:
            print("Bluefruit patch: FAILED - BLEConnection.cpp")
            patch_failed = True
    else:
        print(f"Bluefruit patch: ERROR - BLEConnection.cpp not found at {conn_source}")
        patch_failed = True
    if patch_failed:
        print("Bluefruit patch: CRITICAL - Patch failed! Build aborted.")
        env.Exit(1)
 # Register the patch to run before build
 bluefruit_action = env.VerboseAction(_apply_bluefruit_patches, "Applying Bluefruit BLE patches...")
 env.AddPreAction("$BUILD_DIR/${PROGNAME}.elf", bluefruit_action)
 # Also run immediately to patch before any compilation
 _apply_bluefruit_patches(None, None, env)
--- a/boards/esp32-s3-zero.json
+++ b/boards/esp32-s3-zero.json
@@ -1,40 +0,0 @@
 {
  "build": {
    "arduino": {
      "ldscript": "esp32s3_out.ld"
    },
    "core": "esp32",
    "extra_flags": [
      "-D ARDUINO_USB_CDC_ON_BOOT=1",
      "-D ARDUINO_USB_MSC_ON_BOOT=0",
      "-D ARDUINO_USB_DFU_ON_BOOT=0",
      "-D ARDUINO_USB_MODE=1",
      "-D ARDUINO_RUNNING_CORE=1",
      "-D ARDUINO_EVENT_RUNNING_CORE=1"
    ],
    "f_cpu": "240000000L",
    "f_flash": "80000000L",
    "flash_mode": "qio",
    "hwids": [["0x303A", "0x1001"]],
    "mcu": "esp32s3",
    "variant": "esp32s3"
  },
  "connectivity": ["wifi", "bluetooth"],
  "debug": {
    "default_tool": "esp-builtin",
    "onboard_tools": ["esp-builtin"],
    "openocd_target": "esp32s3.cfg"
  },
  "frameworks": ["arduino", "espidf"],
  "name": "ESP32-S3-Zero",
  "upload": {
    "flash_size": "4MB",
    "maximum_ram_size": 327680,
    "maximum_size": 4194304,
    "require_upload_port": true,
    "speed": 921600
  },
  "url": "https://www.espressif.com",
  "vendor": "Espressif"
 }
--- a/boards/rak3401.json
+++ b/boards/rak3401.json
@@ -1,72 +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": "WisCore RAK3401 Board",
    "mcu": "nrf52840",
    "variant": "WisCore_RAK3401_Board",
    "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"
  },
  "frameworks": [
    "arduino"
  ],
  "name": "WisCore RAK3401 Board",
  "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://www.rakwireless.com",
  "vendor": "RAKwireless"
 }
--- a/boards/thinknode_m3.json
+++ b/boards/thinknode_m3.json
@@ -1,72 +0,0 @@
 {
  "build": {
    "arduino": {
      "ldscript": "nrf52840_s140_v6.ld"
    },
    "core": "nRF5",
    "cpu": "cortex-m4",
    "extra_flags": "-DNRF52840_XXAA",
    "f_cpu": "64000000L",
    "hwids": [
      [
        "0x239A",
        "0x4405"
      ],
      [
        "0x239A",
        "0x0029"
      ],
      [
        "0x239A",
        "0x002A"
      ]
    ],
    "usb_product": "elecrow_eink",
    "mcu": "nrf52840",
    "variant": "ELECROW-ThinkNode-M3",
    "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",
    "onboard_tools": [
      "jlink"
    ],
    "svd_path": "nrf52840.svd",
    "openocd_target": "nrf52.cfg"
  },
  "frameworks": [
    "arduino"
  ],
  "name": "elecrow nrf",
  "upload": {
    "maximum_ram_size": 248832,
    "maximum_size": 815104,
    "speed": 115200,
    "use_1200bps_touch": true,
    "require_upload_port": true,
    "wait_for_upload_port": true,
    "protocol": "nrfutil",
    "protocols": [
      "jlink",
      "nrfjprog",
      "nrfutil",
      "stlink"
    ]
  },
  "url": "https://github.com/Elecrow-RD",
  "vendor": "ELECROW"
 }
--- a/boards/thinknode_m6.json
+++ b/boards/thinknode_m6.json
@@ -1,72 +0,0 @@
 {
  "build": {
    "arduino": {
      "ldscript": "nrf52840_s140_v6.ld"
    },
    "core": "nRF5",
    "cpu": "cortex-m4",
    "extra_flags": "-DARDUINO_NRF52840_ELECROW_M6 -DNRF52840_XXAA",
    "f_cpu": "64000000L",
    "hwids": [
      [
        "0x239A",
        "0x4405"
      ],
      [
        "0x239A",
        "0x0029"
      ],
      [
        "0x239A",
        "0x002A"
      ]
    ],
    "usb_product": "elecrow_solar",
    "mcu": "nrf52840",
    "variant": "ELECROW-ThinkNode-M6",
    "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",
    "onboard_tools": [
      "jlink"
    ],
    "svd_path": "nrf52840.svd",
    "openocd_target": "nrf52.cfg"
  },
  "frameworks": [
    "arduino"
  ],
  "name": "elecrow solar",
  "upload": {
    "maximum_ram_size": 248832,
    "maximum_size": 815104,
    "speed": 115200,
    "use_1200bps_touch": true,
    "require_upload_port": true,
    "wait_for_upload_port": true,
    "protocol": "nrfutil",
    "protocols": [
      "jlink",
      "nrfjprog",
      "nrfutil",
      "stlink"
    ]
  },
  "url": "https://github.com/Elecrow-RD",
  "vendor": "ELECROW"
 }
--- a/build.sh
+++ b/build.sh
@@ -29,20 +29,6 @@ $ sh build.sh build-repeater-firmwares
 Build all chat room server firmwares
 $ sh build.sh build-room-server-firmwares
 Environment Variables:
  DISABLE_DEBUG=1: Disables all debug logging flags (MESH_DEBUG, MESH_PACKET_LOGGING, etc.)
                   If not set, debug flags from variant platformio.ini files are used.
 Examples:
 Build without debug logging:
 $ export FIRMWARE_VERSION=v1.0.0
 $ export DISABLE_DEBUG=1
 $ sh build.sh build-firmware RAK_4631_repeater
 Build with debug logging (default, uses flags from variant files):
 $ export FIRMWARE_VERSION=v1.0.0
 $ sh build.sh build-firmware RAK_4631_repeater
 EOF
 }
@@ -82,13 +68,6 @@ get_pio_envs_ending_with_string() {
  done
 }
 # disable all debug logging flags if DISABLE_DEBUG=1 is set
 disable_debug_flags() {
  if [ "$DISABLE_DEBUG" == "1" ]; then
    export PLATFORMIO_BUILD_FLAGS="${PLATFORMIO_BUILD_FLAGS} -UMESH_DEBUG -UBLE_DEBUG_LOGGING -UWIFI_DEBUG_LOGGING -UBRIDGE_DEBUG -UGPS_NMEA_DEBUG -UCORE_DEBUG_LEVEL -UESPNOW_DEBUG_LOGGING -UDEBUG_RP2040_WIRE -UDEBUG_RP2040_SPI -UDEBUG_RP2040_CORE -UDEBUG_RP2040_PORT -URADIOLIB_DEBUG_SPI -UCFG_DEBUG -URADIOLIB_DEBUG_BASIC -URADIOLIB_DEBUG_PROTOCOL"
  fi
 }
 # build firmware for the provided pio env in $1
 build_firmware() {
@@ -115,9 +94,6 @@ build_firmware() {
  # add firmware version info to end of existing platformio build flags in environment vars
  export PLATFORMIO_BUILD_FLAGS="${PLATFORMIO_BUILD_FLAGS} -DFIRMWARE_BUILD_DATE='\"${FIRMWARE_BUILD_DATE}\"' -DFIRMWARE_VERSION='\"${FIRMWARE_VERSION_STRING}\"'"
  # disable debug flags if requested
  disable_debug_flags
  # build firmware target
  pio run -e $1
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -26,6 +26,10 @@ author: https://github.com/LitBomb<!-- omit from toc -->
  - [3.2. Q: Do I need to set the location for a repeater?](#32-q-do-i-need-to-set-the-location-for-a-repeater)
  - [3.3. Q: What is the password to administer a repeater or a room server?](#33-q-what-is-the-password-to-administer-a-repeater-or-a-room-server)
  - [3.4. Q: What is the password to join a room server?](#34-q-what-is-the-password-to-join-a-room-server)
  - [3.5. Q: Can I retrieve a repeater's private key or set a repeater's private key?](#35-q-can-i-retrieve-a-repeaters-private-key-or-set-a-repeaters-private-key)
  - [3.6. Q: The first byte of my repeater's public key collides with an exisitng repeater on the mesh.  How do I get a new private key with a matching public key that has its first byte of my choosing?](#36-q-the-first-byte-of-my-repeaters-public-key-collides-with-an-exisitng-repeater-on-the-mesh--how-do-i-get-a-new-private-key-with-a-matching-public-key-that-has-its-first-byte-of-my-choosing)
  - [3.7. Q: My repeater maybe suffering from deafness due to high power interference near my mesh's frequency, it is not hearing other in-range MeshCore radios.  what can I do?](#37-q-my-repeater-maybe-suffering-from-deafness-due-to-high-power-interference-near-my-meshs-frequency-it-is-not-hearing-other-in-range-meshcore-radios--what-can-i-do)
  - [3.8 Q: How do I make my repeater an observer on the mesh](#38-q-how-do-i-make-my-repeater-an-observer-on-the-mesh)
 - [4. T-Deck Related](#4-t-deck-related)
  - [4.1. Q: Is there a user guide for T-Deck, T-Pager, T-Watch, or T-Display Pro?](#41-q-is-there-a-user-guide-for-t-deck-t-pager-t-watch-or-t-display-pro)
  - [4.2. Q: What are the steps to get a T-Deck into DFU (Device Firmware Update) mode?](#42-q-what-are-the-steps-to-get-a-t-deck-into-dfu-device-firmware-update-mode)
@@ -61,22 +65,31 @@ author: https://github.com/LitBomb<!-- omit from toc -->
    - [5.14.3. Python MeshCore](#5143-python-meshcore)
    - [5.14.4. meshcore-cli](#5144-meshcore-cli)
    - [5.14.5. meshcore.js](#5145-meshcorejs)
    - [5.14.6. pyMC\_core](#5146-pymc_core)
    - [5.14.7. MeshCore Packet Decoder](#5147-meshcore-packet-decoder)
    - [5.14.8. meshcore-pi](#5148-meshcore-pi)
    - [5.14.9. pyMC\_Repeater](#5149-pymc_repeater)
  - [5.15. Q: Are there client applications for Windows or Mac?](#515-q-are-there-client-applications-for-windows-or-mac)
  - [5.16. Q: Are there any resources that compare MeshCore to other LoRa systems?](#516-q-are-there-any-resources-that-compare-meshcore-to-other-lora-systems)
 - [6. Troubleshooting](#6-troubleshooting)
  - [6.1. Q: My client says another client or a repeater or a room server was last seen many, many days ago.](#61-q-my-client-says-another-client-or-a-repeater-or-a-room-server-was-last-seen-many-many-days-ago)
  - [6.2. Q: A repeater or a client or a room server I expect to see on my discover list (on T-Deck) or contact list (on a smart device client) are not listed.](#62-q-a-repeater-or-a-client-or-a-room-server-i-expect-to-see-on-my-discover-list-on-t-deck-or-contact-list-on-a-smart-device-client-are-not-listed)
  - [6.3. Q: How to connect to a repeater via BLE (Bluetooth)?](#63-q-how-to-connect-to-a-repeater-via-ble-bluetooth)
  - [6.4. Q: My companion isn't showing up over Bluetooth?](#64-q-my-companion-isnt-showing-up-over-bluetooth)
-  - [6.5. Q: I can't connect via Bluetooth, what is the Bluetooth pairing code?](#64-q-i-cant-connect-via-bluetooth-what-is-the-bluetooth-pairing-code)
+  - [6.5. Q: I can't connect via Bluetooth, what is the Bluetooth pairing code?](#65-q-i-cant-connect-via-bluetooth-what-is-the-bluetooth-pairing-code)
-  - [6.6. Q: My Heltec V3 keeps disconnecting from my smartphone.  It can't hold a solid Bluetooth connection.](#65-q-my-heltec-v3-keeps-disconnecting-from-my-smartphone--it-cant-hold-a-solid-bluetooth-connection)
+  - [6.6. Q: My Heltec V3 keeps disconnecting from my smartphone.  It can't hold a solid Bluetooth connection.](#66-q-my-heltec-v3-keeps-disconnecting-from-my-smartphone--it-cant-hold-a-solid-bluetooth-connection)
-  - [6.7. Q: My RAK/T1000-E/xiao\_nRF52 device seems to be corrupted, how do I wipe it clean to start fresh?](#66-q-my-rakt1000-exiao_nrf52-device-seems-to-be-corrupted-how-do-i-wipe-it-clean-to-start-fresh)
+  - [6.7. Q: My RAK/T1000-E/xiao\_nRF52 device seems to be corrupted, how do I wipe it clean to start fresh?](#67-q-my-rakt1000-exiao_nrf52-device-seems-to-be-corrupted-how-do-i-wipe-it-clean-to-start-fresh)
-  - [6.8. Q: WebFlasher fails on Linux with failed to open](#67-q-webflasher-fails-on-linux-with-failed-to-open)
+  - [6.8. Q: WebFlasher fails on Linux with failed to open](#68-q-webflasher-fails-on-linux-with-failed-to-open)
 - [7. Other Questions:](#7-other-questions)
  - [7.1. Q: How to update nRF (RAK, T114, Seed XIAO) repeater and room server firmware over the air using the new simpler DFU app?](#71-q-how-to-update-nrf-rak-t114-seed-xiao-repeater-and-room-server-firmware-over-the-air-using-the-new-simpler-dfu-app)
    - [7.1.1 Q: Can I update Seeed Studio Wio Tracker L1 Pro using OTA?](#711-q-can-i-update-seeed-studio-wio-tracker-l1-pro-using-ota)
  - [7.2. Q: How to update ESP32-based devices over the air?](#72-q-how-to-update-esp32-based-devices-over-the-air)
  - [7.3. Q: Is there a way to lower the chance of a failed OTA device firmware update (DFU)?](#73-q-is-there-a-way-to-lower-the-chance-of-a-failed-ota-device-firmware-update-dfu)
  - [7.4. Q: are the MeshCore logo and font available?](#74-q-are-the-meshcore-logo-and-font-available)
  - [7.5. Q: What is the format of a contact or channel QR code?](#75-q-what-is-the-format-of-a-contact-or-channel-qr-code)
-  - [7.6. Q: How do I connect to the companion via WIFI, e.g. using a heltec v3?](#76-q-how-do-i-connect-to-the-comnpanion-via-wifi-eg-using-a-heltec-v3)
+  - [7.6. Q: How do I connect to the companion via WIFI, e.g. using a heltec v3?](#76-q-how-do-i-connect-to-the-companion-via-wifi-eg-using-a-heltec-v3)
  - [7.7. Q: I have a Station G2, or a Heltec V4, or an Ikoka Stick, or a radio with a EByte E22-900M30S or a E22-900M33S module, what should their transmit power be set to?](#77-q-i-have-a-station-g2-or-a-heltec-v4-or-an-ikoka-stick-or-a-radio-with-a-ebyte-e22-900m30s-or-a-e22-900m33s-module-what-should-their-transmit-power-be-set-to)
 - [| | High Output | 22 dBm | 28 dBm | |](#--high-output--22-dbm--28-dbm--)
 ## 1. Introduction
@@ -180,22 +193,17 @@ The T-Deck firmware is free to download and most features are available without
 ### 2.3. Q: What frequencies are supported by MeshCore?
-**A:** It supports the 868MHz range in the UK/EU and the 915MHz range in New Zealand, Australia, and the USA. Countries and regions in these two frequency ranges are also supported. The firmware and client allow users to set their preferred frequency.  
+**A:** It supports the 868MHz range in the UK/EU and the 915MHz range in New Zealand, Australia, and the USA. Countries and regions in these two frequency ranges are also supported.
 - Australia and New Zealand are on **915.8MHz**
 - UK and EU are on **869.525MHz**
 - Canada and USA are on **910.525MHz**
 - For other regions and countries, please check your local LoRa frequency
-In UK and EU, 867.5MHz is not allowed to use 250kHz bandwidth and it only allows 2.5% duty cycle for clients.  869.525Mhz allows an airtime of 10%, 250KHz bandwidth, and a higher EIRP, therefore MeshCore nodes can send more often and with more power. That is why this frequency is chosen for UK and EU.  This is also why Meshtastic also uses this frequency.  
+Use the smartphone client or the repeater setup feature on there web flasher to set your radios' RF settings by choosing the preset for your regions.
-[Source](https://discord.com/channels/826570251612323860/1330643963501351004/1356540643853209641)
+Recently, as of October 2025, many regions have moved to the "narrow" setting, aka using BW62.5 and a lower SF number (instead of the original SF11).  For example, USA/Canada (Recommended) preset is 910.525MHz, SF7, BW62.5, CR5.
 After extensive testing, many regions have switched or about to switch over to BW62.5 and SF7, 8, or 9.  Narrower bandwidth setting and lower SF setting allow MeshCore's radio signals to fit between interference in the ISM band, provide for a lower noise floor, better SNR, and faster transmissions.
 If you have consensus from your community in your region to update your region's preset recommendation, please post your update request on  the [#meshcore-app](https://discord.com/channels/1343693475589263471/1391681655911088241) channel on the [MeshCore Discord server ](https://discord.gg/cYtQNYCCRK) to let Liam Cottle know.
 the rest of the radio settings are the same for all frequencies:  
 - Spread Factor (SF): 11  
 - Coding Rate (CR): 5  
 - Bandwidth (BW): 250.00  
 (Originally MeshCore started with SF 10.  recently (as of late April 2025) the community has advocated SF 11 also a viable option for longer range but a little slower transmission. Currently there are MeshCore meshes with SF 10 and SF 11.  Liam Cottle's smartphone app's presets now recommend SF 10 for Australia and SF 11 for all other regions and countries.  EU and UK has SF 10 and SF 11 presets.  Work with your local meshers on deciding with SF number is best for your use cases.  In the future, there may be bridge nodes that can bridge SF 10 and SF 11 (or even different frequencies) traffic.)
 ### 2.4. Q: What is an "advert" in MeshCore?
 **A:**
@@ -243,7 +251,7 @@ Repeater or room server can be administered with one of the options below:
 ### 3.2. Q: Do I need to set the location for a repeater?
-**A:** With location set for a repeater, it can show up on a MeshCore map in the future. Set location with the following commands:
+**A:** While not required, with location set for a repeater it will show up on the MeshCore map in the future. Set location with the following command:
 `set lat <GPS Lat> set long <GPS Lon>`
@@ -260,6 +268,34 @@ You can get the latitude and longitude from Google Maps by right-clicking the lo
 `set guest.password {guest-password}`
 ### 3.5. Q: Can I retrieve a repeater's private key or set a repeater's private key?
 **A:** You can issue these commands to get or set a repeater's private key using a USB serial connection.
 `get prv.key` to print a repeater's private key on the serial console
 `set prv.key <hex>` to set a repeater's private key on the serial console
 Reboot the repeater after `set prv.key <hex>` command for the new private key to take effect.
 ### 3.6. Q: The first byte of my repeater's public key collides with an exisitng repeater on the mesh.  How do I get a new private key with a matching public key that has its first byte of my choosing?
 **A:** You can generate a new private key and specific the first byte of its public key here:  https://gessaman.com/mc-keygen/
 ### 3.7. Q: My repeater maybe suffering from deafness due to high power interference near my mesh's frequency, it is not hearing other in-range MeshCore radios.  what can I do?
 **A:** This may be due to the SX1262 radio's auto gain control feature.  You can use this command to preiodically reset its AGC.  
 `set agc.reset.interval <number>`
 The `<number>` unit is in seconds and is incremented by 4.  `set agc.reset.interval 4` works well to cure deafness.  
 This is a very low cost operation.  AGC reset is done by simply setting `state = STATE_IDLE;` in function `RadioLibWrapper::resetAGC()` in `RadioLibWrappers.cpp`
 ### 3.8 Q: How do I make my repeater an observer on the mesh
 **A:** The observer instruction is available here: https://analyzer.letsme.sh/observer/onboard
 ---
@@ -297,7 +333,9 @@ GPS on T-Deck is always enabled.  You can skip the "GPS clock sync" and the T-De
 **A:**
 T-Deck uses the same key the smartphone apps use but in base64
 `izOH6cXN6mrJ5e26oRXNcg==`
-The third character is the capital letter 'O', not zero `0`
+
 There is no `=` key on the T-Deck's hardware keyboard.  You can use the on-screen software keyboard to enter `=`.  Tap the text box to enable the on-screen software keyboard.
 The third character is the capital letter `O` (Oh), not zero `0`
 The smartphone app key is in hex:
 ` 8b3387e9c5cdea6ac9e5edbaa115cd72`
@@ -376,7 +414,23 @@ https://github.com/meshcore-dev/MeshCore/blob/main/src/Packet.h#L19
 **SF is spreading factor** - how much should the communication spread in time
-**CR is coding rate** - https://www.thethingsnetwork.org/docs/lorawan/fec-and-code-rate/
+**CR is coding rate** - from: https://www.thethingsnetwork.org/docs/lorawan/fec-and-code-rate/
 TL;DR: default CR to 5 for good stable links.  If it is not a solid link and is intermittent, change to CR to 7 or 8.
 Forward Error Correction is a process of adding redundant bits to the data to be transmitted. During the transmission, data may get corrupted by interference (changes from 0 to 1 / 1 to 0). These error correction bits are used at the receivers for restoring corrupted bits.
 The Code Rate of a forward error correction expresses the proportion of bits in a data stream that actually carry useful information.
 There are 4 code rates used in LoRaWAN:
 4/5
 4/6
 5/7
 4/8
 For example, if the code rate is 5/7, for every 5 bits of useful information, the coder generates a total of 7 bits of data, of which 2 bits are redundant.
 Making the bandwidth 2x wider (from BW125 to BW250) allows you to send 2x more bytes in the same time. Making the spreading factor 1 step lower (from SF10 to SF9) allows you to send 2x more bytes in the same time.
 Lowering the spreading factor makes it more difficult for the gateway to receive a transmission, as it will be more sensitive to noise. You could compare this to two people taking in a noisy place (a bar for example). If you’re far from each other, you have to talk slow (SF10), but if you’re close, you can talk faster (SF7)
@@ -558,7 +612,8 @@ 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 meshore debug and packet capture data to MQTT for analysis
+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
 #### 5.14.2. MeshCore for Home Assistant
@@ -577,6 +632,40 @@ CLI interface to MeshCore companion radio over BLE, TCP, or serial.  Uses Python
 A JavaScript library for interacting with a MeshCore device running the companion radio firmware
 https://github.com/liamcottle/meshcore.js
 #### 5.14.6. pyMC_core
 pyMC_Core is a Python port of MeshCore, designed for Raspberry Pi and similar hardware, it talks to LoRa modules over SPI.
 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.letsme.sh/packets).
 https://github.com/michaelhart/meshcore-decoder
 #### 5.14.8. meshcore-pi
 meshcore-pi is another Python port of MeshCore, designed for Raspberry Pi and similar hardware, it talks to LoRa modules over SPI or GPIO.
 https://github.com/brianwiddas/meshcore-pi
 #### 5.14.9. pyMC_Repeater
 pyMC_Repeater is a repeater daemon in Python built on top of the [`pymc_core`](#5146-pymc_core) library.
 https://github.com/rightup/pyMC_Repeater
 ### 5.15. Q: Are there client applications for Windows or Mac?
 **A:** Yes, the same iOS and Android client is also available for Windows and Intel Mac (sorry, not available for ARM-based Mac yet).  You can find them together with the Android APK here:
 https://files.liamcottle.net/MeshCore
 Both the Windows and Intel Mac versions of the client app are fully unlocked and are free to use.
 ### 5.16. Q: Are there any resources that compare MeshCore to other LoRa systems?
 **A:** Here is a list of MeshCore comparison resources:
 The Comms Channel on YouTube:
 https://www.youtube.com/watch?v=guDoKGs02Us
 MeshCore Advantages by MCarper:
 https://github.com/mikecarper/meshfirmware/blob/main/MeshCoreAdvantages.md
 Meshcore vs Meshtastic by austinmesh.org
 https://www.austinmesh.org/learn/meshcore-vs-meshtastic/
 ---
 ## 6. Troubleshooting
@@ -653,6 +742,12 @@ Allow the browser user on it:
 13. If it fails, try turning off and on Bluetooth on your phone.  If that doesn't work, try rebooting your phone.
 14. Wait for the update to complete.  It can take a few minutes.
 #### 7.1.1 Q: Can I update Seeed Studio Wio Tracker L1 Pro using OTA?
 **A:**  You can flash this safer bootloader to the Wio Tracker L1 Pro
 https://github.com/oltaco/Adafruit_nRF52_Bootloader_OTAFIX
 After this bootloader is flashed onto the device, you can trigger over the air update using bluetooth by holding the button next to the D-Pad and then click the reset button.  The follow the same OTA update instructions above.  You can skip pass the `start ota` instruction and start the update using the DFU app.
 ### 7.2. Q: How to update ESP32-based devices over the air?
@@ -673,10 +768,14 @@ Allow the browser user on it:
 Refer to https://github.com/oltaco/Adafruit_nRF52_Bootloader_OTAFIX for the latest information.
 Currently, the following boards are supported:
- Nologo ProMicro
+- Heltec Automation Mesh Node T114 / HT-nRF5262
 - Nologo ProMicro NRF52840 (aka SuperMini NRF52840)
 - Seeed Studio SenseCAP Card Tracker T1000-E
 - Seeed Studio Wio Tracker L1
 - Seeed Studio XIAO nRF52840 BLE
 - Seeed Studio XIAO nRF52840 BLE SENSE
- RAK 4631
+- RAK 4631 (See note)
 - RAK WisMesh Tag (new 28/11/2025)
 ### 7.4. Q: are the MeshCore logo and font available?
@@ -703,4 +802,22 @@ where `&type` is:
 WiFi firmware requires you to compile it yourself, as you need to set the wifi ssid and password.
 Edit WIFI_SSID and WIFI_PWD in `./variants/heltec_v3/platformio.ini` and then flash it to your device.
 ### 7.7. Q: I have a Station G2, or a Heltec V4, or an Ikoka Stick, or a radio with a EByte E22-900M30S or a E22-900M33S module, what should their transmit power be set to?
 **A:**
 For companion radios, you can set these radios' transmit power in the smartphone app.  For repeater and room server radios, you can set their transmit power using the command line command `set tx`.  You can get their current value using command line comand `get tx`
 > ### ⚠️ **WARNING: Set these values at your own risk. Incorrect power settings can permanently damage your radio hardware.**
 | Device / Model | Region / Description | In-App Setting (dBm) | Target Radio Output | Notes |
 | :--- | :--- | :--- | :--- | :--- |
 | **Station G2** <br> [Reference](https://wiki.uniteng.com/en/meshtastic/station-g2) | US915 Max Output | 19 dBm | 36.5 dBm (4.46W) | |
 | | US915 Recommended Max | 16 dBm | 35 dBm (3.16W) | 1dB compression point |
 | | EU868 Recommended Max | 15 dBm | 34.5 dBm (2.82W) | 1dB compression point |
 | | US915 1W Output | 10 dBm | 1W | |
 | | EU868 1W Output | 9 dBm | 1W | |
 | **Ikoka Stick E22-900M30S** | 1W Model | 19 dBm | 1W | **DO NOT EXCEED** (Risk of burn out) |
 | **Ikoka Stick E22-900M33S** | 2W Model | 9 dBm | 2W | **DO NOT EXCEED** (Risk of burn out) |
 | **Heltec V4** | Standard Output | 10 dBm | 22 dBm | |
 | | High Output | 22 dBm | 28 dBm | |
 ---
--- a/docs/nrf52_power_management.md
+++ b/docs/nrf52_power_management.md
@@ -1,213 +0,0 @@
 # nRF52 Power Management
 ## Overview
 The nRF52 Power Management module provides battery protection features to prevent over-discharge, minimise likelihood of brownout and flash corruption conditions existing, and enable safe voltage-based recovery.
 ## Features
 ### Boot Voltage Protection
 - Checks battery voltage immediately after boot and before mesh operations commence
 - If voltage is below a configurable threshold (e.g., 3300mV), the device configures voltage wake (LPCOMP + VBUS) and enters protective shutdown (SYSTEMOFF)
 - Prevents boot loops when battery is critically low
 - Skipped when external power (USB VBUS) is detected
 ### Voltage Wake (LPCOMP + VBUS)
 - Configures the nRF52's Low Power Comparator (LPCOMP) before entering SYSTEMOFF
 - Enables USB VBUS detection so external power can wake the device
 - Device automatically wakes when battery voltage rises above recovery threshold or when VBUS is detected
 ### Early Boot Register Capture
 - Captures RESETREAS (reset reason) and GPREGRET2 (shutdown reason) before SystemInit() clears them
 - Allows firmware to determine why it booted (cold boot, watchdog, LPCOMP wake, etc.)
 - Allows firmware to determine why it last shut down (user request, low voltage, boot protection)
 ### Shutdown Reason Tracking
 Shutdown reason codes (stored in GPREGRET2):
 | Code | Name | Description |
 |------|------|-------------|
 | 0x00 | NONE | Normal boot / no previous shutdown |
 | 0x4C | LOW_VOLTAGE | Runtime low voltage threshold reached |
 | 0x55 | USER | User requested powerOff() |
 | 0x42 | BOOT_PROTECT | Boot voltage protection triggered |
 ## Supported Boards
 | Board | Implemented | LPCOMP wake | VBUS wake |
 |-------|-------------|-------------|-----------|
 | Seeed Studio XIAO nRF52840 (`xiao_nrf52`) | Yes | Yes | Yes |
 | RAK4631 (`rak4631`) | Yes | Yes | Yes |
 | Heltec T114 (`heltec_t114`) | Yes | Yes | Yes |
 | Promicro nRF52840 | No | No | No |
 | RAK WisMesh Tag | No | No | No |
 | Heltec Mesh Solar | No | No | No |
 | LilyGo T-Echo / T-Echo Lite | No | No | No |
 | SenseCAP Solar | No | No | No |
 | WIO Tracker L1 / L1 E-Ink | No | No | No |
 | WIO WM1110 | No | No | No |
 | Mesh Pocket | No | No | No |
 | Nano G2 Ultra | No | No | No |
 | ThinkNode M1/M3/M6 | No | No | No |
 | T1000-E | No | No | No |
 | Ikoka Nano/Stick/Handheld (nRF) | No | No | No |
 | Keepteen LT1 | No | No | No |
 | Minewsemi ME25LS01 | No | No | No |
 Notes:
 - "Implemented" reflects Phase 1 (boot lockout + shutdown reason capture).
 - User power-off on Heltec T114 does not enable LPCOMP wake.
 - VBUS detection is used to skip boot lockout on external power, and VBUS wake is configured alongside LPCOMP when supported hardware exposes VBUS to the nRF52.
 ## Technical Details
 ### Architecture
 The power management functionality is integrated into the `NRF52Board` base class in `src/helpers/NRF52Board.cpp`. Board variants provide hardware-specific configuration via a `PowerMgtConfig` struct and override `initiateShutdown(uint8_t reason)` to perform board-specific power-down work and conditionally enable voltage wake (LPCOMP + VBUS).
 ### Early Boot Capture
 A static constructor with priority 101 in `NRF52Board.cpp` captures the RESETREAS and GPREGRET2 registers before:
 - SystemInit() (priority 102) - which clears RESETREAS
 - Static C++ constructors (default priority 65535)
 This ensures we capture the true reset reason before any initialisation code runs.
 ### Board Implementation
 To enable power management on a board variant:
 1. **Enable in platformio.ini**:
   ```ini
   -D NRF52_POWER_MANAGEMENT
   ```
 2. **Define configuration in variant.h**:
   ```c
   #define PWRMGT_VOLTAGE_BOOTLOCK    3300   // Won't boot below this voltage (mV)
   #define PWRMGT_LPCOMP_AIN          7      // AIN channel for voltage sensing
   #define PWRMGT_LPCOMP_REFSEL       2      // REFSEL (0-6=1/8..7/8, 7=ARef, 8-15=1/16..15/16)
   ```
 3. **Implement in board .cpp file**:
   ```cpp
   #ifdef NRF52_POWER_MANAGEMENT
   const PowerMgtConfig power_config = {
     .lpcomp_ain_channel = PWRMGT_LPCOMP_AIN,
     .lpcomp_refsel = PWRMGT_LPCOMP_REFSEL,
     .voltage_bootlock = PWRMGT_VOLTAGE_BOOTLOCK
   };
   void MyBoard::initiateShutdown(uint8_t reason) {
     // Board-specific shutdown preparation (e.g., disable peripherals)
     bool enable_lpcomp = (reason == SHUTDOWN_REASON_LOW_VOLTAGE ||
                           reason == SHUTDOWN_REASON_BOOT_PROTECT);
     if (enable_lpcomp) {
       configureVoltageWake(power_config.lpcomp_ain_channel, power_config.lpcomp_refsel);
     }
     enterSystemOff(reason);
   }
   #endif
   void MyBoard::begin() {
     NRF52Board::begin();  // or NRF52BoardDCDC::begin()
     // ... board setup ...
   #ifdef NRF52_POWER_MANAGEMENT
     checkBootVoltage(&power_config);
   #endif
   }
   ```
   For user-initiated shutdowns, `powerOff()` remains board-specific. Power management only arms LPCOMP for automated shutdown reasons (boot protection/low voltage).
 4. **Declare override in board .h file**:
   ```cpp
   #ifdef NRF52_POWER_MANAGEMENT
     void initiateShutdown(uint8_t reason) override;
   #endif
   ```
 ### Voltage Wake Configuration
 The LPCOMP (Low Power Comparator) is configured to:
 - Monitor the specified AIN channel (0-7 corresponding to P0.02-P0.05, P0.28-P0.31)
 - Compare against VDD fraction reference (REFSEL: 0-6=1/8..7/8, 7=ARef, 8-15=1/16..15/16)
 - Detect UP events (voltage rising above threshold)
 - Use 50mV hysteresis for noise immunity
 - Wake the device from SYSTEMOFF when triggered
 VBUS wake is enabled via the POWER peripheral USBDETECTED event whenever `configureVoltageWake()` is used. This requires USB VBUS to be routed to the nRF52 (typical on nRF52840 boards with native USB).
 **LPCOMP Reference Selection (PWRMGT_LPCOMP_REFSEL)**:
 | REFSEL | Fraction | VBAT @ 1M/1M divider (VDD=3.0-3.3) | VBAT @ 1.5M/1M divider (VDD=3.0-3.3) |
 |--------|----------|------------------------------------|--------------------------------------|
 | 0 | 1/8 | 0.75-0.82 V | 0.94-1.03 V |
 | 1 | 2/8 | 1.50-1.65 V | 1.88-2.06 V |
 | 2 | 3/8 | 2.25-2.47 V | 2.81-3.09 V |
 | 3 | 4/8 | 3.00-3.30 V | 3.75-4.12 V |
 | 4 | 5/8 | 3.75-4.12 V | 4.69-5.16 V |
 | 5 | 6/8 | 4.50-4.95 V | 5.62-6.19 V |
 | 6 | 7/8 | 5.25-5.77 V | 6.56-7.22 V |
 | 7 | ARef | - | - |
 | 8 | 1/16 | 0.38-0.41 V | 0.47-0.52 V |
 | 9 | 3/16 | 1.12-1.24 V | 1.41-1.55 V |
 | 10 | 5/16 | 1.88-2.06 V | 2.34-2.58 V |
 | 11 | 7/16 | 2.62-2.89 V | 3.28-3.61 V |
 | 12 | 9/16 | 3.38-3.71 V | 4.22-4.64 V |
 | 13 | 11/16 | 4.12-4.54 V | 5.16-5.67 V |
 | 14 | 13/16 | 4.88-5.36 V | 6.09-6.70 V |
 | 15 | 15/16 | 5.62-6.19 V | 7.03-7.73 V |
 **Important**: For boards with a voltage divider on the battery sense pin, LPCOMP measures the divided voltage. Use:
 `VBAT_threshold ≈ (VDD * fraction) * divider_scale`, where `divider_scale = (Rtop + Rbottom) / Rbottom` (e.g., 2.0 for 1M/1M, 2.5 for 1.5M/1M, 3.0 for XIAO).
 ### SoftDevice Compatibility
 The power management code checks whether SoftDevice is enabled and uses the appropriate API:
 - When SD enabled: `sd_power_*` functions
 - When SD disabled: Direct register access (NRF_POWER->*)
 This ensures compatibility regardless of BLE stack state.
 ## CLI Commands
 Power management status can be queried via the CLI:
 | Command | Description |
 |---------|-------------|
 | `get pwrmgt.support` | Returns "supported" or "unsupported" |
 | `get pwrmgt.source` | Returns current power source - "battery" or "external" (5V/USB power) |
 | `get pwrmgt.bootreason` | Returns reset and shutdown reason strings |
 | `get pwrmgt.bootmv` | Returns boot voltage in millivolts |
 On boards without power management enabled, all commands except `get pwrmgt.support` return:
 ```
 ERROR: Power management not supported
 ```
 ## Debug Output
 When `MESH_DEBUG=1` is enabled, the power management module outputs:
 ```
 DEBUG: PWRMGT: Reset = Wake from LPCOMP (0x20000); Shutdown = Low Voltage (0x4C)
 DEBUG: PWRMGT: Boot voltage = 3450 mV (threshold = 3300 mV)
 DEBUG: PWRMGT: LPCOMP wake configured (AIN7, ref=3/8 VDD)
 ```
 ## Phase 2 (Planned)
 - Runtime voltage monitoring
 - Voltage state machine (Normal -> Warning -> Critical -> Shutdown)
 - Configurable thresholds
 - Load shedding callbacks for power reduction
 - Deep sleep integration
 - Scheduled wake-up
 - Extended sleep with periodic monitoring
 ## References
 - [nRF52840 Product Specification - POWER](https://infocenter.nordicsemi.com/topic/ps_nrf52840/power.html)
 - [nRF52840 Product Specification - LPCOMP](https://infocenter.nordicsemi.com/topic/ps_nrf52840/lpcomp.html)
 - [SoftDevice S140 API - Power Management](https://infocenter.nordicsemi.com/topic/sdk_nrf5_v17.1.0/group__nrf__sdm__api.html)
--- a/docs/payloads.md
+++ b/docs/payloads.md
@@ -104,8 +104,6 @@ Request type
 | `0x03` | get telemetry data   | TODO |
 | `0x04` | get min,max,avg data | sensor nodes - get min, max, average for given time span |
 | `0x05` | get access list      | get node's approved access list       |
 | `0x06` | get neighbors        | get repeater node's neighbors              |
 | `0x07` | get owner info       | get repeater firmware-ver/name/owner info  |
 ### Get stats
@@ -134,27 +132,6 @@ Gets information about the node, possibly including the following:
 Request data about sensors on the node, including battery level.
 ### Get Telemetry
 TODO
 ### Get Min/Max/Ave  (Sensor nodes)
 TODO
 ### Get Access List
 TODO
 ### Get Neighors
 TODO
 ### Get Owner Info
 TODO
 ## Response
 | Field   | Size (bytes)    | Description |
@@ -202,34 +179,6 @@ txt_type
 | timestamp      | 4               | sender time (unix timestamp)                                                  |
 | password       | rest of message | password for repeater/sensor                                                  |
 ## Repeater - Regions request
 | Field          | Size (bytes)    | Description                                                                   |
 |----------------|-----------------|-------------------------------------------------------------------------------|
 | timestamp      | 4               | sender time (unix timestamp)                                                  |
 | req type       | 1               | 0x01 (request sub type)                                                       |
 | reply path len | 1               | path len for reply                                                       |
 | reply path     | (variable)      | reply path                                                       |
 ## Repeater - Owner info request
 | Field          | Size (bytes)    | Description                                                                   |
 |----------------|-----------------|-------------------------------------------------------------------------------|
 | timestamp      | 4               | sender time (unix timestamp)                                                  |
 | req type       | 1               | 0x02 (request sub type)                                                       |
 | reply path len | 1               | path len for reply                                                       |
 | reply path     | (variable)      | reply path                                                       |
 ## Repeater - Clock and status request
 | Field          | Size (bytes)    | Description                                                                   |
 |----------------|-----------------|-------------------------------------------------------------------------------|
 | timestamp      | 4               | sender time (unix timestamp)                                                  |
 | req type       | 1               | 0x03 (request sub type)                                                       |
 | reply path len | 1               | path len for reply                                                       |
 | reply path     | (variable)      | reply path                                                       |
 # Group text message / datagram
 | Field        | Size (bytes)    | Description                                |
--- a/docs/protocol_guide.md
+++ b/docs/protocol_guide.md
--- a/examples/companion_radio/DataStore.cpp
+++ b/examples/companion_radio/DataStore.cpp
@@ -65,7 +65,6 @@ void DataStore::begin() {
 #if defined(ESP32)
  #include <SPIFFS.h>
  #include <nvs_flash.h>
 #elif defined(RP2040_PLATFORM)
  #include <LittleFS.h>
 #elif defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
@@ -173,9 +172,7 @@ bool DataStore::formatFileSystem() {
 #elif defined(RP2040_PLATFORM)
  return LittleFS.format();
 #elif defined(ESP32)
-  bool fs_success = ((fs::SPIFFSFS *)_fs)->format();
+  return ((fs::SPIFFSFS *)_fs)->format();
  esp_err_t nvs_err = nvs_flash_erase(); // no need to reinit, will be done by reboot
  return fs_success && (nvs_err == ESP_OK);
 #else
  #error "need to implement format()"
 #endif
@@ -225,9 +222,6 @@ void DataStore::loadPrefsInt(const char *filename, NodePrefs& _prefs, double& no
    file.read(pad, 2);                                                                     // 78
    file.read((uint8_t *)&_prefs.ble_pin, sizeof(_prefs.ble_pin));                         // 80
    file.read((uint8_t *)&_prefs.buzzer_quiet, sizeof(_prefs.buzzer_quiet));               // 84
    file.read((uint8_t *)&_prefs.gps_enabled, sizeof(_prefs.gps_enabled));                 // 85
    file.read((uint8_t *)&_prefs.gps_interval, sizeof(_prefs.gps_interval));               // 86
    file.read((uint8_t *)&_prefs.autoadd_config, sizeof(_prefs.autoadd_config));           // 87
    file.close();
  }
@@ -260,9 +254,6 @@ void DataStore::savePrefs(const NodePrefs& _prefs, double node_lat, double node_
    file.write(pad, 2);                                                                     // 78
    file.write((uint8_t *)&_prefs.ble_pin, sizeof(_prefs.ble_pin));                         // 80
    file.write((uint8_t *)&_prefs.buzzer_quiet, sizeof(_prefs.buzzer_quiet));               // 84
    file.write((uint8_t *)&_prefs.gps_enabled, sizeof(_prefs.gps_enabled));                 // 85
    file.write((uint8_t *)&_prefs.gps_interval, sizeof(_prefs.gps_interval));               // 86
    file.write((uint8_t *)&_prefs.autoadd_config, sizeof(_prefs.autoadd_config));           // 87
    file.close();
  }
--- a/examples/companion_radio/MyMesh.cpp
+++ b/examples/companion_radio/MyMesh.cpp
@@ -53,9 +53,6 @@
 #define CMD_SET_FLOOD_SCOPE           54   // v8+
 #define CMD_SEND_CONTROL_DATA         55   // v8+
 #define CMD_GET_STATS                 56   // v8+, second byte is stats type
 #define CMD_SEND_ANON_REQ             57
 #define CMD_SET_AUTOADD_CONFIG        58
 #define CMD_GET_AUTOADD_CONFIG        59
 // Stats sub-types for CMD_GET_STATS
 #define STATS_TYPE_CORE               0
@@ -87,7 +84,6 @@
 #define RESP_CODE_ADVERT_PATH         22
 #define RESP_CODE_TUNING_PARAMS       23
 #define RESP_CODE_STATS               24   // v8+, second byte is stats type
 #define RESP_CODE_AUTOADD_CONFIG      25
 #define SEND_TIMEOUT_BASE_MILLIS        500
 #define FLOOD_SEND_TIMEOUT_FACTOR       16.0f
@@ -113,8 +109,6 @@
 #define PUSH_CODE_BINARY_RESPONSE       0x8C
 #define PUSH_CODE_PATH_DISCOVERY_RESPONSE 0x8D
 #define PUSH_CODE_CONTROL_DATA          0x8E   // v8+
 #define PUSH_CODE_CONTACT_DELETED       0x8F // used to notify client app of deleted contact when overwriting oldest
 #define PUSH_CODE_CONTACTS_FULL         0x90 // used to notify client app that contacts storage is full
 #define ERR_CODE_UNSUPPORTED_CMD        1
 #define ERR_CODE_NOT_FOUND              2
@@ -125,15 +119,6 @@
 #define MAX_SIGN_DATA_LEN               (8 * 1024) // 8K
 // Auto-add config bitmask
 // Bit 0: If set, overwrite oldest non-favourite contact when contacts file is full
 // Bits 1-4: these indicate which contact types to auto-add when manual_contact_mode = 0x01
 #define AUTO_ADD_OVERWRITE_OLDEST (1 << 0)  // 0x01 - overwrite oldest non-favourite when full
 #define AUTO_ADD_CHAT             (1 << 1)  // 0x02 - auto-add Chat (Companion) (ADV_TYPE_CHAT)
 #define AUTO_ADD_REPEATER         (1 << 2)  // 0x04 - auto-add Repeater (ADV_TYPE_REPEATER)
 #define AUTO_ADD_ROOM_SERVER      (1 << 3)  // 0x08 - auto-add Room Server (ADV_TYPE_ROOM)
 #define AUTO_ADD_SENSOR           (1 << 4)  // 0x10 - auto-add Sensor (ADV_TYPE_SENSOR)
 void MyMesh::writeOKFrame() {
  uint8_t buf[1];
  buf[0] = RESP_CODE_OK;
@@ -276,64 +261,20 @@ bool MyMesh::isAutoAddEnabled() const {
  return (_prefs.manual_add_contacts & 1) == 0;
 }
 bool MyMesh::shouldAutoAddContactType(uint8_t contact_type) const {
  if ((_prefs.manual_add_contacts & 1) == 0) {
    return true;
  }
  uint8_t type_bit = 0;
  switch (contact_type) {
    case ADV_TYPE_CHAT:
      type_bit = AUTO_ADD_CHAT;
      break;
    case ADV_TYPE_REPEATER:
      type_bit = AUTO_ADD_REPEATER;
      break;
    case ADV_TYPE_ROOM:
      type_bit = AUTO_ADD_ROOM_SERVER;
      break;
    case ADV_TYPE_SENSOR:
      type_bit = AUTO_ADD_SENSOR;
      break;
    default:
      return false;  // Unknown type, don't auto-add
  }
  return (_prefs.autoadd_config & type_bit) != 0;
 }
 bool MyMesh::shouldOverwriteWhenFull() const {
  return (_prefs.autoadd_config & AUTO_ADD_OVERWRITE_OLDEST) != 0;
 }
 void MyMesh::onContactOverwrite(const uint8_t* pub_key) {
  if (_serial->isConnected()) {
    out_frame[0] = PUSH_CODE_CONTACT_DELETED;
    memcpy(&out_frame[1], pub_key, PUB_KEY_SIZE);
    _serial->writeFrame(out_frame, 1 + PUB_KEY_SIZE);
  }
 }
 void MyMesh::onContactsFull() {
  if (_serial->isConnected()) {
    out_frame[0] = PUSH_CODE_CONTACTS_FULL;
    _serial->writeFrame(out_frame, 1);
  }
 }
 void MyMesh::onDiscoveredContact(ContactInfo &contact, bool is_new, uint8_t path_len, const uint8_t* path) {
  if (_serial->isConnected()) {
-    if (is_new) {
+    if (!isAutoAddEnabled() && is_new) {
      writeContactRespFrame(PUSH_CODE_NEW_ADVERT, contact);
    } else {
      out_frame[0] = PUSH_CODE_ADVERT;
      memcpy(&out_frame[1], contact.id.pub_key, PUB_KEY_SIZE);
      _serial->writeFrame(out_frame, 1 + PUB_KEY_SIZE);
    }
-  } 
+  } else {
 #ifdef DISPLAY_CLASS
-  if (_ui && !_prefs.buzzer_quiet) _ui->notify(UIEventType::newContactMessage); //buzz if enabled
+    if (_ui) _ui->notify(UIEventType::newContactMessage);
 #endif
  }
  // add inbound-path to mem cache
  if (path && path_len <= sizeof(AdvertPath::path)) {  // check path is valid
@@ -357,7 +298,7 @@ void MyMesh::onDiscoveredContact(ContactInfo &contact, bool is_new, uint8_t path
    memcpy(p->path, path, p->path_len);
  }
-  if (!is_new) dirty_contacts_expiry = futureMillis(LAZY_CONTACTS_WRITE_DELAY); // only schedule lazy write for contacts that are in contacts[]
+  dirty_contacts_expiry = futureMillis(LAZY_CONTACTS_WRITE_DELAY);
 }
 static int sort_by_recent(const void *a, const void *b) {
@@ -440,7 +381,9 @@ void MyMesh::queueMessage(const ContactInfo &from, uint8_t txt_type, mesh::Packe
  bool should_display = txt_type == TXT_TYPE_PLAIN || txt_type == TXT_TYPE_SIGNED_PLAIN;
  if (should_display && _ui) {
    _ui->newMsg(path_len, from.name, text, offline_queue_len);
-    if (!_prefs.buzzer_quiet) _ui->notify(UIEventType::contactMessage); //buzz if enabled
+    if (!_serial->isConnected()) {
      _ui->notify(UIEventType::contactMessage);
    }
  }
 #endif
 }
@@ -525,8 +468,11 @@ void MyMesh::onChannelMessageRecv(const mesh::GroupChannel &channel, mesh::Packe
    uint8_t frame[1];
    frame[0] = PUSH_CODE_MSG_WAITING; // send push 'tickle'
    _serial->writeFrame(frame, 1);
  } else {
 #ifdef DISPLAY_CLASS
    if (_ui) _ui->notify(UIEventType::channelMessage);
 #endif
  }
 #ifdef DISPLAY_CLASS
  // Get the channel name from the channel index
  const char *channel_name = "Unknown";
@@ -534,10 +480,7 @@ void MyMesh::onChannelMessageRecv(const mesh::GroupChannel &channel, mesh::Packe
  if (getChannel(channel_idx, channel_details)) {
    channel_name = channel_details.name;
  }
-  if (_ui) {
+  if (_ui) _ui->newMsg(path_len, channel_name, text, offline_queue_len);
    _ui->newMsg(path_len, channel_name, text, offline_queue_len);
    if (!_prefs.buzzer_quiet) _ui->notify(UIEventType::channelMessage); //buzz if enabled
  }
 #endif
 }
@@ -796,9 +739,6 @@ MyMesh::MyMesh(mesh::Radio &radio, mesh::RNG &rng, mesh::RTCClock &rtc, SimpleMe
  _prefs.bw = LORA_BW;
  _prefs.cr = LORA_CR;
  _prefs.tx_power_dbm = LORA_TX_POWER;
  _prefs.buzzer_quiet = 0;
  _prefs.gps_enabled = 0;       // GPS disabled by default
  _prefs.gps_interval = 0;      // No automatic GPS updates by default
  //_prefs.rx_delay_base = 10.0f;  enable once new algo fixed
 }
@@ -815,14 +755,14 @@ void MyMesh::begin(bool has_display) {
    _store->saveMainIdentity(self_id);
  }
 // if name is provided as a build flag, use that as default node name instead
 #ifdef ADVERT_NAME
  strcpy(_prefs.node_name, ADVERT_NAME);
 #else
  // use hex of first 4 bytes of identity public key as default node name
  char pub_key_hex[10];
  mesh::Utils::toHex(pub_key_hex, self_id.pub_key, 4);
  strcpy(_prefs.node_name, pub_key_hex);
 // if name is provided as a build flag, use that as default node name instead
 #ifdef ADVERT_NAME
  strcpy(_prefs.node_name, ADVERT_NAME);
 #endif
  // load persisted prefs
@@ -836,9 +776,6 @@ void MyMesh::begin(bool has_display) {
  _prefs.sf = constrain(_prefs.sf, 5, 12);
  _prefs.cr = constrain(_prefs.cr, 5, 8);
  _prefs.tx_power_dbm = constrain(_prefs.tx_power_dbm, 1, MAX_LORA_TX_POWER);
  _prefs.buzzer_quiet = constrain(_prefs.buzzer_quiet, 0, 1);  // Ensure boolean 0 or 1
  _prefs.gps_enabled = constrain(_prefs.gps_enabled, 0, 1);  // Ensure boolean 0 or 1
  _prefs.gps_interval = constrain(_prefs.gps_interval, 0, 86400);  // Max 24 hours
 #ifdef BLE_PIN_CODE // 123456 by default
  if (_prefs.ble_pin == 0) {
@@ -861,7 +798,6 @@ void MyMesh::begin(bool has_display) {
  resetContacts();
  _store->loadContacts(this);
  bootstrapRTCfromContacts();
  addChannel("Public", PUBLIC_GROUP_PSK); // pre-configure Andy's public channel
  _store->loadChannels(this);
@@ -963,7 +899,6 @@ void MyMesh::handleCmdFrame(size_t len) {
      int result;
      uint32_t expected_ack;
      if (txt_type == TXT_TYPE_CLI_DATA) {
        msg_timestamp = getRTCClock()->getCurrentTimeUnique(); // Use node's RTC instead of app timestamp to avoid tripping replay protection
        result = sendCommandData(*recipient, msg_timestamp, attempt, text, est_timeout);
        expected_ack = 0; // no Ack expected
      } else {
@@ -1294,21 +1229,17 @@ void MyMesh::handleCmdFrame(size_t len) {
 #endif
  } else if (cmd_frame[0] == CMD_IMPORT_PRIVATE_KEY && len >= 65) {
 #if ENABLE_PRIVATE_KEY_IMPORT
    if (!mesh::LocalIdentity::validatePrivateKey(&cmd_frame[1])) {
        writeErrFrame(ERR_CODE_ILLEGAL_ARG); // invalid key
    } else {
    mesh::LocalIdentity identity;
    identity.readFrom(&cmd_frame[1], 64);
    if (_store->saveMainIdentity(identity)) {
      self_id = identity;
      writeOKFrame();
-          // re-load contacts, to invalidate ecdh shared_secrets
+      // re-load contacts, to recalc shared secrets
      resetContacts();
      _store->loadContacts(this);
    } else {
      writeErrFrame(ERR_CODE_FILE_IO_ERROR);
    }
    }
 #else
    writeDisabledFrame();
 #endif
@@ -1350,27 +1281,6 @@ void MyMesh::handleCmdFrame(size_t len) {
    } else {
      writeErrFrame(ERR_CODE_NOT_FOUND); // contact not found
    }
  } else if (cmd_frame[0] == CMD_SEND_ANON_REQ && len > 1 + PUB_KEY_SIZE) {
    uint8_t *pub_key = &cmd_frame[1];
    ContactInfo *recipient = lookupContactByPubKey(pub_key, PUB_KEY_SIZE);
    uint8_t *data = &cmd_frame[1 + PUB_KEY_SIZE];
    if (recipient) {
      uint32_t tag, est_timeout;
      int result = sendAnonReq(*recipient, data, len - (1 + PUB_KEY_SIZE), tag, est_timeout);
      if (result == MSG_SEND_FAILED) {
        writeErrFrame(ERR_CODE_TABLE_FULL);
      } else {
        clearPendingReqs();
        pending_req = tag; // match this to onContactResponse()
        out_frame[0] = RESP_CODE_SENT;
        out_frame[1] = (result == MSG_SEND_SENT_FLOOD) ? 1 : 0;
        memcpy(&out_frame[2], &tag, 4);
        memcpy(&out_frame[6], &est_timeout, 4);
        _serial->writeFrame(out_frame, 10);
      }
    } else {
      writeErrFrame(ERR_CODE_NOT_FOUND); // contact not found
    }
  } else if (cmd_frame[0] == CMD_SEND_STATUS_REQ && len >= 1 + PUB_KEY_SIZE) {
    uint8_t *pub_key = &cmd_frame[1];
    ContactInfo *recipient = lookupContactByPubKey(pub_key, PUB_KEY_SIZE);
@@ -1611,17 +1521,6 @@ void MyMesh::handleCmdFrame(size_t len) {
      *np++ = 0; // modify 'cmd_frame', replace ':' with null
      bool success = sensors.setSettingValue(sp, np);
      if (success) {
        #if ENV_INCLUDE_GPS == 1
        // Update node preferences for GPS settings
        if (strcmp(sp, "gps") == 0) {
          _prefs.gps_enabled = (np[0] == '1') ? 1 : 0;
          savePrefs();
        } else if (strcmp(sp, "gps_interval") == 0) {
          uint32_t interval_seconds = atoi(np);
          _prefs.gps_interval = constrain(interval_seconds, 0, 86400);
          savePrefs();
        }
        #endif
        writeOKFrame();
      } else {
        writeErrFrame(ERR_CODE_ILLEGAL_ARG);
@@ -1699,10 +1598,6 @@ void MyMesh::handleCmdFrame(size_t len) {
      writeErrFrame(ERR_CODE_ILLEGAL_ARG); // invalid stats sub-type
    }
  } else if (cmd_frame[0] == CMD_FACTORY_RESET && memcmp(&cmd_frame[1], "reset", 5) == 0) {
    if (_serial) {
      MESH_DEBUG_PRINTLN("Factory reset: disabling serial interface to prevent reconnects (BLE/WiFi)");
      _serial->disable(); // Phone app disconnects before we can send OK frame so it's safe here
    }
    bool success = _store->formatFileSystem();
    if (success) {
      writeOKFrame();
@@ -1726,15 +1621,6 @@ void MyMesh::handleCmdFrame(size_t len) {
    } else {
      writeErrFrame(ERR_CODE_TABLE_FULL);
    }
  } else if (cmd_frame[0] == CMD_SET_AUTOADD_CONFIG) {
    _prefs.autoadd_config = cmd_frame[1];
    savePrefs();
    writeOKFrame();  
  } else if (cmd_frame[0] == CMD_GET_AUTOADD_CONFIG) {
    int i = 0;
    out_frame[i++] = RESP_CODE_AUTOADD_CONFIG;
    out_frame[i++] = _prefs.autoadd_config;
    _serial->writeFrame(out_frame, i);
  } else {
    writeErrFrame(ERR_CODE_UNSUPPORTED_CMD);
    MESH_DEBUG_PRINTLN("ERROR: unknown command: %02X", cmd_frame[0]);
--- a/examples/companion_radio/MyMesh.h
+++ b/examples/companion_radio/MyMesh.h
@@ -114,10 +114,6 @@ protected:
  void logRxRaw(float snr, float rssi, const uint8_t raw[], int len) override;
  bool isAutoAddEnabled() const override;
  bool shouldAutoAddContactType(uint8_t type) const override;
  bool shouldOverwriteWhenFull() const override;
  void onContactsFull() override;
  void onContactOverwrite(const uint8_t* pub_key) override;
  bool onContactPathRecv(ContactInfo& from, uint8_t* in_path, uint8_t in_path_len, uint8_t* out_path, uint8_t out_path_len, uint8_t extra_type, uint8_t* extra, uint8_t extra_len) override;
  void onDiscoveredContact(ContactInfo &contact, bool is_new, uint8_t path_len, const uint8_t* path) override;
  void onContactPathUpdated(const ContactInfo &contact) override;
--- a/examples/companion_radio/NodePrefs.h
+++ b/examples/companion_radio/NodePrefs.h
@@ -25,7 +25,4 @@ struct NodePrefs {  // persisted to file
  uint32_t ble_pin;
  uint8_t  advert_loc_policy;
  uint8_t  buzzer_quiet;
  uint8_t  gps_enabled;      // GPS enabled flag (0=disabled, 1=enabled)
  uint32_t gps_interval;     // GPS read interval in seconds
  uint8_t autoadd_config;    // bitmask for auto-add contacts config
 };
--- a/examples/companion_radio/main.cpp
+++ b/examples/companion_radio/main.cpp
@@ -151,7 +151,9 @@ void setup() {
  );
 #ifdef BLE_PIN_CODE
-  serial_interface.begin(BLE_NAME_PREFIX, the_mesh.getNodePrefs()->node_name, the_mesh.getBLEPin());
+  char dev_name[32+16];
  sprintf(dev_name, "%s%s", BLE_NAME_PREFIX, the_mesh.getNodeName());
  serial_interface.begin(dev_name, the_mesh.getBLEPin());
 #else
  serial_interface.begin(Serial);
 #endif
@@ -197,7 +199,9 @@ void setup() {
  WiFi.begin(WIFI_SSID, WIFI_PWD);
  serial_interface.begin(TCP_PORT);
 #elif defined(BLE_PIN_CODE)
-  serial_interface.begin(BLE_NAME_PREFIX, the_mesh.getNodePrefs()->node_name, the_mesh.getBLEPin());
+  char dev_name[32+16];
  sprintf(dev_name, "%s%s", BLE_NAME_PREFIX, the_mesh.getNodeName());
  serial_interface.begin(dev_name, the_mesh.getBLEPin());
 #elif defined(SERIAL_RX)
  companion_serial.setPins(SERIAL_RX, SERIAL_TX);
  companion_serial.begin(115200);
--- a/examples/companion_radio/ui-new/UITask.cpp
+++ b/examples/companion_radio/ui-new/UITask.cpp
@@ -2,9 +2,6 @@
 #include <helpers/TxtDataHelpers.h>
 #include "../MyMesh.h"
 #include "target.h"
 #ifdef WIFI_SSID
  #include <WiFi.h>
 #endif
 #ifndef AUTO_OFF_MILLIS
  #define AUTO_OFF_MILLIS     15000   // 15 seconds
@@ -195,17 +192,10 @@ public:
      sprintf(tmp, "MSG: %d", _task->getMsgCount());
      display.drawTextCentered(display.width() / 2, 20, tmp);
      #ifdef WIFI_SSID
        IPAddress ip = WiFi.localIP();
        snprintf(tmp, sizeof(tmp), "IP: %d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
        display.setTextSize(1);
        display.drawTextCentered(display.width() / 2, 54, tmp); 
      #endif
      if (_task->hasConnection()) {
        display.setColor(DisplayDriver::GREEN);
        display.setTextSize(1);
        display.drawTextCentered(display.width() / 2, 43, "< Connected >");
      } else if (the_mesh.getBLEPin() != 0) { // BT pin
        display.setColor(DisplayDriver::RED);
        display.setTextSize(2);
@@ -547,19 +537,6 @@ void UITask::begin(DisplayDriver* display, SensorManager* sensors, NodePrefs* no
 #endif
  _node_prefs = node_prefs;
 #if ENV_INCLUDE_GPS == 1
  // Apply GPS preferences from stored prefs
  if (_sensors != NULL && _node_prefs != NULL) {
    _sensors->setSettingValue("gps", _node_prefs->gps_enabled ? "1" : "0");
    if (_node_prefs->gps_interval > 0) {
      char interval_str[12];  // Max: 24 hours = 86400 seconds (5 digits + null)
      sprintf(interval_str, "%u", _node_prefs->gps_interval);
      _sensors->setSettingValue("gps_interval", interval_str);
    }
  }
 #endif
  if (_display != NULL) {
    _display->turnOn();
  }
@@ -631,15 +608,11 @@ void UITask::newMsg(uint8_t path_len, const char* from_name, const char* text, i
  setCurrScreen(msg_preview);
  if (_display != NULL) {
-    if (!_display->isOn() && !hasConnection()) {
+    if (!_display->isOn()) _display->turnOn();
      _display->turnOn();
    }
    if (_display->isOn()) {
    _auto_off = millis() + AUTO_OFF_MILLIS;  // extend the auto-off timer
    _next_refresh = 100;  // trigger refresh
  }
 }
 }
 void UITask::userLedHandler() {
 #ifdef PIN_STATUS_LED
@@ -890,15 +863,13 @@ void UITask::toggleGPS() {
      if (strcmp(_sensors->getSettingName(i), "gps") == 0) {
        if (strcmp(_sensors->getSettingValue(i), "1") == 0) {
          _sensors->setSettingValue("gps", "0");
          _node_prefs->gps_enabled = 0;
          notify(UIEventType::ack);
          showAlert("GPS: Disabled", 800);
        } else {
          _sensors->setSettingValue("gps", "1");
          _node_prefs->gps_enabled = 1;
          notify(UIEventType::ack);
          showAlert("GPS: Enabled", 800);
        }
        the_mesh.savePrefs();
        showAlert(_node_prefs->gps_enabled ? "GPS: Enabled" : "GPS: Disabled", 800);
        _next_refresh = 0;
        break;
      }
@@ -912,12 +883,13 @@ void UITask::toggleBuzzer() {
    if (buzzer.isQuiet()) {
      buzzer.quiet(false);
      notify(UIEventType::ack);
      showAlert("Buzzer: ON", 800);
    } else {
      buzzer.quiet(true);
      showAlert("Buzzer: OFF", 800);
    }
    _node_prefs->buzzer_quiet = buzzer.isQuiet();
    the_mesh.savePrefs();
    showAlert(buzzer.isQuiet() ? "Buzzer: OFF" : "Buzzer: ON", 800);
    _next_refresh = 0;  // trigger refresh
  #endif
 }
--- a/examples/companion_radio/ui-new/UITask.h
+++ b/examples/companion_radio/ui-new/UITask.h
@@ -8,10 +8,6 @@
 #include <Arduino.h>
 #include <helpers/sensors/LPPDataHelpers.h>
 #ifndef LED_STATE_ON
  #define LED_STATE_ON 1
 #endif
 #ifdef PIN_BUZZER
  #include <helpers/ui/buzzer.h>
 #endif
--- a/examples/companion_radio/ui-orig/UITask.cpp
+++ b/examples/companion_radio/ui-orig/UITask.cpp
@@ -137,15 +137,11 @@ void UITask::newMsg(uint8_t path_len, const char* from_name, const char* text, i
  StrHelper::strncpy(_msg, text, sizeof(_msg));
  if (_display != NULL) {
-    if (!_display->isOn() && !hasConnection()) {
+    if (!_display->isOn()) _display->turnOn();
      _display->turnOn();
    }
    if (_display->isOn()) {
    _auto_off = millis() + AUTO_OFF_MILLIS;  // extend the auto-off timer
    _need_refresh = true;
  }
 }
 }
 void UITask::renderBatteryIndicator(uint16_t batteryMilliVolts) {
  // Convert millivolts to percentage
--- a/examples/simple_repeater/MyMesh.cpp
+++ b/examples/simple_repeater/MyMesh.cpp
@@ -41,21 +41,16 @@
  #define TXT_ACK_DELAY 200
 #endif
-#define FIRMWARE_VER_LEVEL       2
+#define FIRMWARE_VER_LEVEL       1
 #define REQ_TYPE_GET_STATUS         0x01 // same as _GET_STATS
 #define REQ_TYPE_KEEP_ALIVE         0x02
 #define REQ_TYPE_GET_TELEMETRY_DATA 0x03
 #define REQ_TYPE_GET_ACCESS_LIST    0x05
 #define REQ_TYPE_GET_NEIGHBOURS     0x06
 #define REQ_TYPE_GET_OWNER_INFO     0x07     // FIRMWARE_VER_LEVEL >= 2
 #define RESP_SERVER_LOGIN_OK        0 // response to ANON_REQ
 #define ANON_REQ_TYPE_REGIONS      0x01
 #define ANON_REQ_TYPE_OWNER        0x02
 #define ANON_REQ_TYPE_BASIC        0x03   // just remote clock
 #define CLI_REPLY_DELAY_MILLIS      600
 #define LAZY_CONTACTS_WRITE_DELAY    5000
@@ -144,64 +139,6 @@ uint8_t MyMesh::handleLoginReq(const mesh::Identity& sender, const uint8_t* secr
  return 13;  // reply length
 }
 uint8_t MyMesh::handleAnonRegionsReq(const mesh::Identity& sender, uint32_t sender_timestamp, const uint8_t* data) {
  if (anon_limiter.allow(rtc_clock.getCurrentTime())) {
    // request data has: {reply-path-len}{reply-path}
    reply_path_len = *data++ & 0x3F;
    memcpy(reply_path, data, reply_path_len);
    // data += reply_path_len;
    memcpy(reply_data, &sender_timestamp, 4);   // prefix with sender_timestamp, like a tag
    uint32_t now = getRTCClock()->getCurrentTime();
    memcpy(&reply_data[4], &now, 4);     // include our clock (for easy clock sync, and packet hash uniqueness)
    return 8 + region_map.exportNamesTo((char *) &reply_data[8], sizeof(reply_data) - 12, REGION_DENY_FLOOD);   // reply length
  }
  return 0;
 }
 uint8_t MyMesh::handleAnonOwnerReq(const mesh::Identity& sender, uint32_t sender_timestamp, const uint8_t* data) {
  if (anon_limiter.allow(rtc_clock.getCurrentTime())) {
    // request data has: {reply-path-len}{reply-path}
    reply_path_len = *data++ & 0x3F;
    memcpy(reply_path, data, reply_path_len);
    // data += reply_path_len;
    memcpy(reply_data, &sender_timestamp, 4);   // prefix with sender_timestamp, like a tag
    uint32_t now = getRTCClock()->getCurrentTime();
    memcpy(&reply_data[4], &now, 4);     // include our clock (for easy clock sync, and packet hash uniqueness)
    sprintf((char *) &reply_data[8], "%s\n%s", _prefs.node_name, _prefs.owner_info);
    return 8 + strlen((char *) &reply_data[8]);   // reply length
  }
  return 0;
 }
 uint8_t MyMesh::handleAnonClockReq(const mesh::Identity& sender, uint32_t sender_timestamp, const uint8_t* data) {
  if (anon_limiter.allow(rtc_clock.getCurrentTime())) {
    // request data has: {reply-path-len}{reply-path}
    reply_path_len = *data++ & 0x3F;
    memcpy(reply_path, data, reply_path_len);
    // data += reply_path_len;
    memcpy(reply_data, &sender_timestamp, 4);   // prefix with sender_timestamp, like a tag
    uint32_t now = getRTCClock()->getCurrentTime();
    memcpy(&reply_data[4], &now, 4);     // include our clock (for easy clock sync, and packet hash uniqueness)
    reply_data[8] = 0;  // features
 #ifdef WITH_RS232_BRIDGE
    reply_data[8] |= 0x01;  // is bridge, type UART
 #elif WITH_ESPNOW_BRIDGE
    reply_data[8] |= 0x03;  // is bridge, type ESP-NOW
 #endif
    if (_prefs.disable_fwd) {   // is this repeater currently disabled
      reply_data[8] |= 0x80;  // is disabled
    }
    // TODO:  add some kind of moving-window utilisation metric, so can query 'how busy' is this repeater
    return 9;   // reply length
  }
  return 0;
 }
 int MyMesh::handleRequest(ClientInfo *sender, uint32_t sender_timestamp, uint8_t *payload, size_t payload_len) {
  // uint32_t now = getRTCClock()->getCurrentTimeUnique();
  // memcpy(reply_data, &now, 4);   // response packets always prefixed with timestamp
@@ -236,19 +173,12 @@ int MyMesh::handleRequest(ClientInfo *sender, uint32_t sender_timestamp, uint8_t
    telemetry.reset();
    telemetry.addVoltage(TELEM_CHANNEL_SELF, (float)board.getBattMilliVolts() / 1000.0f);
    // query other sensors -- target specific
    if ((sender->permissions & PERM_ACL_ROLE_MASK) == PERM_ACL_GUEST) {
      perm_mask = 0x00;  // just base telemetry allowed
    }
    sensors.querySensors(perm_mask, telemetry);
 	// This default temperature will be overridden by external sensors (if any)
    float temperature = board.getMCUTemperature();
    if(!isnan(temperature)) { // Supported boards with built-in temperature sensor. ESP32-C3 may return NAN
      telemetry.addTemperature(TELEM_CHANNEL_SELF, temperature); // Built-in MCU Temperature
    }
    uint8_t tlen = telemetry.getSize();
    memcpy(&reply_data[4], telemetry.getBuffer(), tlen);
    return 4 + tlen; // reply_len
@@ -359,9 +289,6 @@ int MyMesh::handleRequest(ClientInfo *sender, uint32_t sender_timestamp, uint8_t
      return reply_offset;
    }
  } else if (payload[0] == REQ_TYPE_GET_OWNER_INFO) {
    sprintf((char *) &reply_data[4], "%s\n%s\n%s", FIRMWARE_VERSION, _prefs.node_name, _prefs.owner_info);
    return 4 + strlen((char *) &reply_data[4]);
  }
  return 0; // unknown command
 }
@@ -514,18 +441,12 @@ void MyMesh::onAnonDataRecv(mesh::Packet *packet, const uint8_t *secret, const m
    data[len] = 0;  // ensure null terminator
    uint8_t reply_len;
    reply_path_len = -1;
    if (data[4] == 0 || data[4] >= ' ') {   // is password, ie. a login request
      reply_len = handleLoginReq(sender, secret, timestamp, &data[4], packet->isRouteFlood());
-    } else if (data[4] == ANON_REQ_TYPE_REGIONS && packet->isRouteDirect()) {
+    //} else if (data[4] == ANON_REQ_TYPE_*) {   // future type codes
-      reply_len = handleAnonRegionsReq(sender, timestamp, &data[5]);
+      // TODO
    } else if (data[4] == ANON_REQ_TYPE_OWNER && packet->isRouteDirect()) {
      reply_len = handleAnonOwnerReq(sender, timestamp, &data[5]);
    } else if (data[4] == ANON_REQ_TYPE_BASIC && packet->isRouteDirect()) {
      reply_len = handleAnonClockReq(sender, timestamp, &data[5]);
    } else {
-      reply_len = 0;  // unknown/invalid request type
+      reply_len = 0;  // unknown request type
    }
    if (reply_len == 0) return;   // invalid request
@@ -535,12 +456,9 @@ void MyMesh::onAnonDataRecv(mesh::Packet *packet, const uint8_t *secret, const m
      mesh::Packet* path = createPathReturn(sender, secret, packet->path, packet->path_len,
                                            PAYLOAD_TYPE_RESPONSE, reply_data, reply_len);
      if (path) sendFlood(path, SERVER_RESPONSE_DELAY);
    } else if (reply_path_len < 0) {
      mesh::Packet* reply = createDatagram(PAYLOAD_TYPE_RESPONSE, sender, secret, reply_data, reply_len);
      if (reply) sendFlood(reply, SERVER_RESPONSE_DELAY);
    } else {
      mesh::Packet* reply = createDatagram(PAYLOAD_TYPE_RESPONSE, sender, secret, reply_data, reply_len);
-      if (reply) sendDirect(reply, reply_path, reply_path_len, SERVER_RESPONSE_DELAY);
+      if (reply) sendFlood(reply, SERVER_RESPONSE_DELAY);
    }
  }
 }
@@ -712,9 +630,7 @@ bool MyMesh::onPeerPathRecv(mesh::Packet *packet, int sender_idx, const uint8_t
 void MyMesh::onControlDataRecv(mesh::Packet* packet) {
  uint8_t type = packet->payload[0] & 0xF0;    // just test upper 4 bits
-  if (type == CTL_TYPE_NODE_DISCOVER_REQ && packet->payload_len >= 6
+  if (type == CTL_TYPE_NODE_DISCOVER_REQ && packet->payload_len >= 6 && discover_limiter.allow(rtc_clock.getCurrentTime())) {
      && !_prefs.disable_fwd && discover_limiter.allow(rtc_clock.getCurrentTime())
  ) {
    int i = 1;
    uint8_t  filter = packet->payload[i++];
    uint32_t tag;
@@ -744,9 +660,8 @@ void MyMesh::onControlDataRecv(mesh::Packet* packet) {
 MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondClock &ms, mesh::RNG &rng,
               mesh::RTCClock &rtc, mesh::MeshTables &tables)
    : mesh::Mesh(radio, ms, rng, rtc, *new StaticPoolPacketManager(32), tables),
-      _cli(board, rtc, sensors, acl, &_prefs, this), telemetry(MAX_PACKET_PAYLOAD - 4), region_map(key_store), temp_map(key_store),
+      _cli(board, rtc, sensors, &_prefs, this), telemetry(MAX_PACKET_PAYLOAD - 4), region_map(key_store), temp_map(key_store),
-      discover_limiter(4, 120),  // max 4 every 2 minutes
+      discover_limiter(4, 120)  // max 4 every 2 minutes
      anon_limiter(4, 180)   // max 4 every 3 minutes
 #if defined(WITH_RS232_BRIDGE)
      , bridge(&_prefs, WITH_RS232_BRIDGE, _mgr, &rtc)
 #endif
@@ -808,7 +723,7 @@ void MyMesh::begin(FILESYSTEM *fs) {
  _fs = fs;
  // load persisted prefs
  _cli.loadPrefs(_fs);
-  acl.load(_fs, self_id);
+  acl.load(_fs);
  // TODO: key_store.begin();
  region_map.load(_fs);
@@ -968,6 +883,7 @@ void MyMesh::formatPacketStatsReply(char *reply) {
 }
 void MyMesh::saveIdentity(const mesh::LocalIdentity &new_id) {
  self_id = new_id;
 #if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
  IdentityStore store(*_fs, "");
 #elif defined(ESP32)
@@ -977,7 +893,7 @@ void MyMesh::saveIdentity(const mesh::LocalIdentity &new_id) {
 #else
 #error "need to define saveIdentity()"
 #endif
-  store.save("_main", new_id);
+  store.save("_main", self_id);
 }
 void MyMesh::clearStats() {
@@ -1068,8 +984,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) {
+    if (n == 1 && sender_timestamp == 0) {
-      region_map.exportTo(reply, 160);
+      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));
@@ -1142,25 +1058,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 - ??");
    }
@@ -1212,8 +1109,3 @@ void MyMesh::loop() {
  uptime_millis += now - last_millis;
  last_millis = now;
 }
 // To check if there is pending work
 bool MyMesh::hasPendingWork() const {
  return _mgr->getOutboundCount(0xFFFFFFFF) > 0;
 }
--- a/examples/simple_repeater/MyMesh.h
+++ b/examples/simple_repeater/MyMesh.h
@@ -86,16 +86,14 @@ class MyMesh : public mesh::Mesh, public CommonCLICallbacks {
  unsigned long next_local_advert, next_flood_advert;
  bool _logging;
  NodePrefs _prefs;
  ClientACL  acl;
  CommonCLI _cli;
  uint8_t reply_data[MAX_PACKET_PAYLOAD];
-  uint8_t reply_path[MAX_PATH_SIZE];
+  ClientACL  acl;
  int8_t  reply_path_len;
  TransportKeyStore key_store;
  RegionMap region_map, temp_map;
  RegionEntry* load_stack[8];
  RegionEntry* recv_pkt_region;
-  RateLimiter discover_limiter, anon_limiter;
+  RateLimiter discover_limiter;
  bool region_load_active;
  unsigned long dirty_contacts_expiry;
 #if MAX_NEIGHBOURS
@@ -116,9 +114,6 @@ class MyMesh : public mesh::Mesh, public CommonCLICallbacks {
  void putNeighbour(const mesh::Identity& id, uint32_t timestamp, float snr);
  uint8_t handleLoginReq(const mesh::Identity& sender, const uint8_t* secret, uint32_t sender_timestamp, const uint8_t* data, bool is_flood);
  uint8_t handleAnonRegionsReq(const mesh::Identity& sender, uint32_t sender_timestamp, const uint8_t* data);
  uint8_t handleAnonOwnerReq(const mesh::Identity& sender, uint32_t sender_timestamp, const uint8_t* data);
  uint8_t handleAnonClockReq(const mesh::Identity& sender, uint32_t sender_timestamp, const uint8_t* data);
  int handleRequest(ClientInfo* sender, uint32_t sender_timestamp, uint8_t* payload, size_t payload_len);
  mesh::Packet* createSelfAdvert();
@@ -230,7 +225,4 @@ public:
    bridge.begin();
  }
 #endif
  // To check if there is pending work
  bool hasPendingWork() const;
 };
--- a/examples/simple_repeater/main.cpp
+++ b/examples/simple_repeater/main.cpp
@@ -19,19 +19,12 @@ void halt() {
 static char command[160];
 // For power saving
 unsigned long lastActive = 0; // mark last active time
 unsigned long nextSleepinSecs = 120; // next sleep in seconds. The first sleep (if enabled) is after 2 minutes from boot
 void setup() {
  Serial.begin(115200);
  delay(1000);
  board.begin();
  // For power saving
  lastActive = millis(); // mark last active time since boot
 #ifdef DISPLAY_CLASS
  if (display.begin()) {
    display.startFrame();
@@ -124,15 +117,4 @@ void loop() {
  ui_task.loop();
 #endif
  rtc_clock.tick();
  if (the_mesh.getNodePrefs()->powersaving_enabled &&                     // To check if power saving is enabled
      the_mesh.millisHasNowPassed(lastActive + nextSleepinSecs * 1000)) { // To check if it is time to sleep
    if (!the_mesh.hasPendingWork()) { // No pending work. Safe to sleep
      board.sleep(1800);             // To sleep. Wake up after 30 minutes or when receiving a LoRa packet
      lastActive = millis();
      nextSleepinSecs = 5;  // Default: To work for 5s and sleep again
    } else {
      nextSleepinSecs += 5; // When there is pending work, to work another 5s
    }
  }
 }
--- a/examples/simple_room_server/MyMesh.cpp
+++ b/examples/simple_room_server/MyMesh.cpp
@@ -587,7 +587,7 @@ void MyMesh::onAckRecv(mesh::Packet *packet, uint32_t ack_crc) {
 MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondClock &ms, mesh::RNG &rng,
               mesh::RTCClock &rtc, mesh::MeshTables &tables)
    : mesh::Mesh(radio, ms, rng, rtc, *new StaticPoolPacketManager(32), tables),
-      _cli(board, rtc, sensors, acl, &_prefs, this), telemetry(MAX_PACKET_PAYLOAD - 4) {
+      _cli(board, rtc, sensors, &_prefs, this), telemetry(MAX_PACKET_PAYLOAD - 4) {
  last_millis = 0;
  uptime_millis = 0;
  next_local_advert = next_flood_advert = 0;
@@ -637,7 +637,7 @@ void MyMesh::begin(FILESYSTEM *fs) {
  // load persisted prefs
  _cli.loadPrefs(_fs);
-  acl.load(_fs, self_id);
+  acl.load(_fs);
  radio_set_params(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
  radio_set_tx_power(_prefs.tx_power_dbm);
@@ -720,6 +720,7 @@ void MyMesh::setTxPower(uint8_t power_dbm) {
 }
 void MyMesh::saveIdentity(const mesh::LocalIdentity &new_id) {
  self_id = new_id;
 #if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
  IdentityStore store(*_fs, "");
 #elif defined(ESP32)
@@ -729,7 +730,7 @@ void MyMesh::saveIdentity(const mesh::LocalIdentity &new_id) {
 #else
 #error "need to define saveIdentity()"
 #endif
-  store.save("_main", new_id);
+  store.save("_main", self_id);
 }
 void MyMesh::clearStats() {
--- a/examples/simple_room_server/MyMesh.h
+++ b/examples/simple_room_server/MyMesh.h
@@ -94,8 +94,8 @@ class MyMesh : public mesh::Mesh, public CommonCLICallbacks {
  unsigned long next_local_advert, next_flood_advert;
  bool _logging;
  NodePrefs _prefs;
  ClientACL acl;
  CommonCLI _cli;
  ClientACL acl;
  unsigned long dirty_contacts_expiry;
  uint8_t reply_data[MAX_PACKET_PAYLOAD];
  unsigned long next_push;
--- a/examples/simple_sensor/SensorMesh.cpp
+++ b/examples/simple_sensor/SensorMesh.cpp
@@ -695,7 +695,7 @@ void SensorMesh::onAckRecv(mesh::Packet* packet, uint32_t ack_crc) {
 SensorMesh::SensorMesh(mesh::MainBoard& board, mesh::Radio& radio, mesh::MillisecondClock& ms, mesh::RNG& rng, mesh::RTCClock& rtc, mesh::MeshTables& tables)
     : mesh::Mesh(radio, ms, rng, rtc, *new StaticPoolPacketManager(32), tables),
-      _cli(board, rtc, sensors, acl, &_prefs, this), telemetry(MAX_PACKET_PAYLOAD - 4)
+      _cli(board, rtc, sensors, &_prefs, this), telemetry(MAX_PACKET_PAYLOAD - 4)
 {
  next_local_advert = next_flood_advert = 0;
  dirty_contacts_expiry = 0;
@@ -736,7 +736,7 @@ void SensorMesh::begin(FILESYSTEM* fs) {
  // load persisted prefs
  _cli.loadPrefs(_fs);
-  acl.load(_fs, self_id);
+  acl.load(_fs);
  radio_set_params(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
  radio_set_tx_power(_prefs.tx_power_dbm);
@@ -765,6 +765,7 @@ bool SensorMesh::formatFileSystem() {
 }
 void SensorMesh::saveIdentity(const mesh::LocalIdentity& new_id) {
  self_id = new_id;
 #if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
  IdentityStore store(*_fs, "");
 #elif defined(ESP32)
@@ -774,7 +775,7 @@ void SensorMesh::saveIdentity(const mesh::LocalIdentity& new_id) {
 #else
  #error "need to define saveIdentity()"
 #endif
-  store.save("_main", new_id);
+  store.save("_main", self_id);
 }
 void SensorMesh::applyTempRadioParams(float freq, float bw, uint8_t sf, uint8_t cr, int timeout_mins) {
--- a/examples/simple_sensor/SensorMesh.h
+++ b/examples/simple_sensor/SensorMesh.h
@@ -133,9 +133,9 @@ private:
  FILESYSTEM* _fs;
  unsigned long next_local_advert, next_flood_advert;
  NodePrefs _prefs;
  ClientACL  acl;
  CommonCLI _cli;
  uint8_t reply_data[MAX_PACKET_PAYLOAD];
  ClientACL  acl;
  unsigned long dirty_contacts_expiry;
  CayenneLPP telemetry;
  uint32_t last_read_time;
--- a/platformio.ini
+++ b/platformio.ini
@@ -79,9 +79,7 @@ extends = arduino_base
 platform = nordicnrf52
 platform_packages =
  framework-arduinoadafruitnrf52 @ 1.10700.0
-extra_scripts = 
+extra_scripts = create-uf2.py
  create-uf2.py
  arch/nrf52/extra_scripts/patch_bluefruit.py
 build_flags = ${arduino_base.build_flags}
  -D NRF52_PLATFORM
  -D LFS_NO_ASSERT=1
--- a/src/Identity.cpp
+++ b/src/Identity.cpp
@@ -48,50 +48,6 @@ LocalIdentity::LocalIdentity(RNG* rng) {
  ed25519_create_keypair(pub_key, prv_key, seed);
 }
 bool LocalIdentity::validatePrivateKey(const uint8_t prv[64]) {
    uint8_t pub[32];
    ed25519_derive_pub(pub, prv); // derive public key from given private key
    // disallow 00 or FF prefixed public keys
    if (pub[0] == 0x00 || pub[0] == 0xFF) return false;
    // known good test client keypair
    const uint8_t test_client_prv[64] = {
      0x70, 0x65, 0xe1, 0x8f, 0xd9, 0xfa, 0xbb, 0x70,
      0xc1, 0xed, 0x90, 0xdc, 0xa1, 0x99, 0x07, 0xde,
      0x69, 0x8c, 0x88, 0xb7, 0x09, 0xea, 0x14, 0x6e,
      0xaf, 0xd9, 0x3d, 0x9b, 0x83, 0x0c, 0x7b, 0x60,
      0xc4, 0x68, 0x11, 0x93, 0xc7, 0x9b, 0xbc, 0x39,
      0x94, 0x5b, 0xa8, 0x06, 0x41, 0x04, 0xbb, 0x61,
      0x8f, 0x8f, 0xd7, 0xa8, 0x4a, 0x0a, 0xf6, 0xf5,
      0x70, 0x33, 0xd6, 0xe8, 0xdd, 0xcd, 0x64, 0x71
    };
    const uint8_t test_client_pub[32] = {
      0x1e, 0xc7, 0x71, 0x75, 0xb0, 0x91, 0x8e, 0xd2,
      0x06, 0xf9, 0xae, 0x04, 0xec, 0x13, 0x6d, 0x6d,
      0x5d, 0x43, 0x15, 0xbb, 0x26, 0x30, 0x54, 0x27,
      0xf6, 0x45, 0xb4, 0x92, 0xe9, 0x35, 0x0c, 0x10
    };
    uint8_t ss1[32], ss2[32];
    // shared secret we calculte from test client pubkey and given private key
    ed25519_key_exchange(ss1, test_client_pub, prv);
    // shared secret they calculate from our derived public key and test client private key
    ed25519_key_exchange(ss2, pub, test_client_prv);
    // check that both shared secrets match
    if (memcmp(ss1, ss2, 32) != 0) return false;
    // reject all-zero shared secret
    for (int i = 0; i < 32; i++) {
        if (ss1[i] != 0) return true;
    }
    return false;
 }
 bool LocalIdentity::readFrom(Stream& s) {
  bool success = (s.readBytes(pub_key, PUB_KEY_SIZE) == PUB_KEY_SIZE);
  success = success && (s.readBytes(prv_key, PRV_KEY_SIZE) == PRV_KEY_SIZE);
--- a/src/Identity.h
+++ b/src/Identity.h
@@ -76,13 +76,6 @@ public:
  */
  void calcSharedSecret(uint8_t* secret, const uint8_t* other_pub_key) const;
  /**
   * \brief  Validates that a given private key can be used for ECDH / shared-secret operations.
   * \param  prv IN - the private key to validate (must be PRV_KEY_SIZE bytes)
   * \returns true, if the private key is valid for login.
  */
  static bool validatePrivateKey(const uint8_t prv[64]);
  bool readFrom(Stream& s);
  bool writeTo(Stream& s) const;
  void printTo(Stream& s) const;
--- a/src/Mesh.cpp
+++ b/src/Mesh.cpp
@@ -78,16 +78,6 @@ DispatcherAction Mesh::onRecvPacket(Packet* pkt) {
  }
  if (pkt->isRouteDirect() && pkt->path_len >= PATH_HASH_SIZE) {
    // check for 'early received' ACK
    if (pkt->getPayloadType() == PAYLOAD_TYPE_ACK) {
      int i = 0;
      uint32_t ack_crc;
      memcpy(&ack_crc, &pkt->payload[i], 4); i += 4;
      if (i <= pkt->payload_len) {
        onAckRecv(pkt, ack_crc);
      }
    }
    if (self_id.isHashMatch(pkt->path) && allowPacketForward(pkt)) {
      if (pkt->getPayloadType() == PAYLOAD_TYPE_MULTIPART) {
        return forwardMultipartDirect(pkt);
--- a/src/MeshCore.h
+++ b/src/MeshCore.h
@@ -1,7 +1,6 @@
 #pragma once
 #include <stdint.h>
 #include <math.h>
 #define MAX_HASH_SIZE        8
 #define PUB_KEY_SIZE        32
@@ -43,7 +42,6 @@ namespace mesh {
 class MainBoard {
 public:
  virtual uint16_t getBattMilliVolts() = 0;
  virtual float getMCUTemperature() { return NAN; }
  virtual bool setAdcMultiplier(float multiplier) { return false; };
  virtual float getAdcMultiplier() const { return 0.0f; }
  virtual const char* getManufacturerName() const = 0;
@@ -51,19 +49,10 @@ public:
  virtual void onAfterTransmit() { }
  virtual void reboot() = 0;
  virtual void powerOff() { /* no op */ }
  virtual void sleep(uint32_t secs)  { /* no op */ }
  virtual uint32_t getGpio() { return 0; }
  virtual void setGpio(uint32_t values) {}
  virtual uint8_t getStartupReason() const = 0;
  virtual bool startOTAUpdate(const char* id, char reply[]) { return false; }   // not supported
  // Power management interface (boards with power management override these)
  virtual bool isExternalPowered() { return false; }
  virtual uint16_t getBootVoltage() { return 0; }
  virtual uint32_t getResetReason() const { return 0; }
  virtual const char* getResetReasonString(uint32_t reason) { return "Not available"; }
  virtual uint8_t getShutdownReason() const { return 0; }
  virtual const char* getShutdownReasonString(uint8_t reason) { return "Not available"; }
 };
 /**
--- a/src/helpers/BaseChatMesh.cpp
+++ b/src/helpers/BaseChatMesh.cpp
@@ -55,54 +55,6 @@ void BaseChatMesh::sendAckTo(const ContactInfo& dest, uint32_t ack_hash) {
  }
 }
 void BaseChatMesh::bootstrapRTCfromContacts() {
  uint32_t latest = 0;
  for (int i = 0; i < num_contacts; i++) {
    if (contacts[i].lastmod > latest) {
      latest = contacts[i].lastmod;
    }
  }
  if (latest != 0) {
    getRTCClock()->setCurrentTime(latest + 1);
  }
 }
 ContactInfo* BaseChatMesh::allocateContactSlot() {
  if (num_contacts < MAX_CONTACTS) {
    return &contacts[num_contacts++];
  } else if (shouldOverwriteWhenFull()) {
    // Find oldest non-favourite contact by oldest lastmod timestamp
    int oldest_idx = -1;
    uint32_t oldest_lastmod = 0xFFFFFFFF;
    for (int i = 0; i < num_contacts; i++) {
      bool is_favourite = (contacts[i].flags & 0x01) != 0;
      if (!is_favourite && contacts[i].lastmod < oldest_lastmod) {
        oldest_lastmod = contacts[i].lastmod;
        oldest_idx = i;
      }
    }
    if (oldest_idx >= 0) {
      onContactOverwrite(contacts[oldest_idx].id.pub_key);
      return &contacts[oldest_idx];
    }
  }
  return NULL; // no space, no overwrite or all contacts are all favourites
 }
 void BaseChatMesh::populateContactFromAdvert(ContactInfo& ci, const mesh::Identity& id, const AdvertDataParser& parser, uint32_t timestamp) {
  memset(&ci, 0, sizeof(ci));
  ci.id = id;
  ci.out_path_len = -1;  // initially out_path is unknown
  StrHelper::strncpy(ci.name, parser.getName(), sizeof(ci.name));
  ci.type = parser.getType();
  if (parser.hasLatLon()) {
    ci.gps_lat = parser.getIntLat();
    ci.gps_lon = parser.getIntLon();
  }
  ci.last_advert_timestamp = timestamp;
  ci.lastmod = getRTCClock()->getCurrentTime();
 }
 void BaseChatMesh::onAdvertRecv(mesh::Packet* packet, const mesh::Identity& id, uint32_t timestamp, const uint8_t* app_data, size_t app_data_len) {
  AdvertDataParser parser(app_data, app_data_len);
  if (!(parser.isValid() && parser.hasName())) {
@@ -133,29 +85,42 @@ void BaseChatMesh::onAdvertRecv(mesh::Packet* packet, const mesh::Identity& id,
  }
  putBlobByKey(id.pub_key, PUB_KEY_SIZE, temp_buf, plen);
-  bool is_new = false; // true = not in contacts[], false = exists in contacts[]
+  bool is_new = false;
  if (from == NULL) {
-    if (!shouldAutoAddContactType(parser.getType())) {
+    if (!isAutoAddEnabled()) {
      ContactInfo ci;
-      populateContactFromAdvert(ci, id, parser, timestamp);
+      memset(&ci, 0, sizeof(ci));
      ci.id = id;
      ci.out_path_len = -1;  // initially out_path is unknown
      StrHelper::strncpy(ci.name, parser.getName(), sizeof(ci.name));
      ci.type = parser.getType();
      if (parser.hasLatLon()) {
        ci.gps_lat = parser.getIntLat();
        ci.gps_lon = parser.getIntLon();
      }
      ci.last_advert_timestamp = timestamp;
      ci.lastmod = getRTCClock()->getCurrentTime();
      onDiscoveredContact(ci, true, packet->path_len, packet->path);       // let UI know
      return;
    }
-    from = allocateContactSlot();
+    is_new = true;
-    if (from == NULL) {
+    if (num_contacts < MAX_CONTACTS) {
-      ContactInfo ci;
+      from = &contacts[num_contacts++];
-      populateContactFromAdvert(ci, id, parser, timestamp);
+      from->id = id;
-      onDiscoveredContact(ci, true, packet->path_len, packet->path);
+      from->out_path_len = -1;  // initially out_path is unknown
-      onContactsFull();
+      from->gps_lat = 0;   // initially unknown GPS loc
-      MESH_DEBUG_PRINTLN("onAdvertRecv: unable to allocate contact slot for new contact");
+      from->gps_lon = 0;
      from->sync_since = 0;
      // only need to calculate the shared_secret once, for better performance
      self_id.calcSharedSecret(from->shared_secret, id);
    } else {
      MESH_DEBUG_PRINTLN("onAdvertRecv: contacts table is full!");
      return;
    }
    populateContactFromAdvert(*from, id, parser, timestamp);
    from->sync_since = 0;
    from->shared_secret_valid = false;
  }
  // update
  StrHelper::strncpy(from->name, parser.getName(), sizeof(from->name));
  from->type = parser.getType();
@@ -182,7 +147,8 @@ int BaseChatMesh::searchPeersByHash(const uint8_t* hash) {
 void BaseChatMesh::getPeerSharedSecret(uint8_t* dest_secret, int peer_idx) {
  int i = matching_peer_indexes[peer_idx];
  if (i >= 0 && i < num_contacts) {
-    memcpy(dest_secret, contacts[i].getSharedSecret(self_id), PUB_KEY_SIZE);
+    // lookup pre-calculated shared_secret
    memcpy(dest_secret, contacts[i].shared_secret, PUB_KEY_SIZE);
  } else {
    MESH_DEBUG_PRINTLN("getPeerSharedSecret: Invalid peer idx: %d", i);
  }
@@ -327,7 +293,7 @@ void BaseChatMesh::onAckRecv(mesh::Packet* packet, uint32_t ack_crc) {
 void BaseChatMesh::handleReturnPathRetry(const ContactInfo& contact, const uint8_t* path, uint8_t path_len) {
  // NOTE: simplest impl is just to re-send a reciprocal return path to sender (DIRECTLY)
  //        override this method in various firmwares, if there's a better strategy
-  mesh::Packet* rpath = createPathReturn(contact.id, contact.getSharedSecret(self_id), path, path_len, 0, NULL, 0);
+  mesh::Packet* rpath = createPathReturn(contact.id, contact.shared_secret, path, path_len, 0, NULL, 0);
  if (rpath) sendDirect(rpath, contact.out_path, contact.out_path_len, 3000);   // 3 second delay
 }
@@ -376,7 +342,7 @@ mesh::Packet* BaseChatMesh::composeMsgPacket(const ContactInfo& recipient, uint3
    temp[len++] = attempt;  // hide attempt number at tail end of payload
  }
-  return createDatagram(PAYLOAD_TYPE_TXT_MSG, recipient.id, recipient.getSharedSecret(self_id), temp, len);
+  return createDatagram(PAYLOAD_TYPE_TXT_MSG, recipient.id, recipient.shared_secret, temp, len);
 }
 int  BaseChatMesh::sendMessage(const ContactInfo& recipient, uint32_t timestamp, uint8_t attempt, const char* text, uint32_t& expected_ack, uint32_t& est_timeout) {
@@ -407,7 +373,7 @@ int  BaseChatMesh::sendCommandData(const ContactInfo& recipient, uint32_t timest
  temp[4] = (attempt & 3) | (TXT_TYPE_CLI_DATA << 2);
  memcpy(&temp[5], text, text_len + 1);
-  auto pkt = createDatagram(PAYLOAD_TYPE_TXT_MSG, recipient.id, recipient.getSharedSecret(self_id), temp, 5 + text_len);
+  auto pkt = createDatagram(PAYLOAD_TYPE_TXT_MSG, recipient.id, recipient.shared_secret, temp, 5 + text_len);
  if (pkt == NULL) return MSG_SEND_FAILED;
  uint32_t t = _radio->getEstAirtimeFor(pkt->getRawLength());
@@ -496,32 +462,7 @@ int BaseChatMesh::sendLogin(const ContactInfo& recipient, const char* password,
      tlen = 4 + len;
    }
-    pkt = createAnonDatagram(PAYLOAD_TYPE_ANON_REQ, self_id, recipient.id, recipient.getSharedSecret(self_id), temp, tlen);
+    pkt = createAnonDatagram(PAYLOAD_TYPE_ANON_REQ, self_id, recipient.id, recipient.shared_secret, temp, tlen);
  }
  if (pkt) {
    uint32_t t = _radio->getEstAirtimeFor(pkt->getRawLength());
    if (recipient.out_path_len < 0) {
      sendFloodScoped(recipient, pkt);
      est_timeout = calcFloodTimeoutMillisFor(t);
      return MSG_SEND_SENT_FLOOD;
    } else {
      sendDirect(pkt, recipient.out_path, recipient.out_path_len);
      est_timeout = calcDirectTimeoutMillisFor(t, recipient.out_path_len);
      return MSG_SEND_SENT_DIRECT;
    }
  }
  return MSG_SEND_FAILED;
 }
 int BaseChatMesh::sendAnonReq(const ContactInfo& recipient, const uint8_t* data, uint8_t len, uint32_t& tag, uint32_t& est_timeout) {
  mesh::Packet* pkt;
  {
    uint8_t temp[MAX_PACKET_PAYLOAD];
    tag = getRTCClock()->getCurrentTimeUnique();
    memcpy(temp, &tag, 4);   // tag to match later (also extra blob to help make packet_hash unique)
    memcpy(&temp[4], data, len);
    pkt = createAnonDatagram(PAYLOAD_TYPE_ANON_REQ, self_id, recipient.id, recipient.getSharedSecret(self_id), temp, 4 + len);
  }
  if (pkt) {
    uint32_t t = _radio->getEstAirtimeFor(pkt->getRawLength());
@@ -548,7 +489,7 @@ int  BaseChatMesh::sendRequest(const ContactInfo& recipient, const uint8_t* req_
    memcpy(temp, &tag, 4);   // mostly an extra blob to help make packet_hash unique
    memcpy(&temp[4], req_data, data_len);
-    pkt = createDatagram(PAYLOAD_TYPE_REQ, recipient.id, recipient.getSharedSecret(self_id), temp, 4 + data_len);
+    pkt = createDatagram(PAYLOAD_TYPE_REQ, recipient.id, recipient.shared_secret, temp, 4 + data_len);
  }
  if (pkt) {
    uint32_t t = _radio->getEstAirtimeFor(pkt->getRawLength());
@@ -575,7 +516,7 @@ int  BaseChatMesh::sendRequest(const ContactInfo& recipient, uint8_t req_type, u
    memset(&temp[5], 0, 4);  // reserved (possibly for 'since' param)
    getRNG()->random(&temp[9], 4);   // random blob to help make packet-hash unique
-    pkt = createDatagram(PAYLOAD_TYPE_REQ, recipient.id, recipient.getSharedSecret(self_id), temp, sizeof(temp));
+    pkt = createDatagram(PAYLOAD_TYPE_REQ, recipient.id, recipient.shared_secret, temp, sizeof(temp));
  }
  if (pkt) {
    uint32_t t = _radio->getEstAirtimeFor(pkt->getRawLength());
@@ -698,7 +639,7 @@ void BaseChatMesh::checkConnections() {
      // calc expected ACK reply
      mesh::Utils::sha256((uint8_t *)&connections[i].expected_ack, 4, data, 9, self_id.pub_key, PUB_KEY_SIZE);
-      auto pkt = createDatagram(PAYLOAD_TYPE_REQ, contact->id, contact->getSharedSecret(self_id), data, 9);
+      auto pkt = createDatagram(PAYLOAD_TYPE_REQ, contact->id, contact->shared_secret, data, 9);
      if (pkt) {
        sendDirect(pkt, contact->out_path, contact->out_path_len);
      }
@@ -758,10 +699,13 @@ ContactInfo* BaseChatMesh::lookupContactByPubKey(const uint8_t* pub_key, int pre
 }
 bool BaseChatMesh::addContact(const ContactInfo& contact) {
-  ContactInfo* dest = allocateContactSlot();
+  if (num_contacts < MAX_CONTACTS) {
-  if (dest) {
+    auto dest = &contacts[num_contacts++];
    *dest = contact;
-    dest->shared_secret_valid = false; // mark shared_secret as needing calculation
+
    // calc the ECDH shared secret (just once for performance)
    self_id.calcSharedSecret(dest->shared_secret, contact.id);
    return true;  // success
  }
  return false;
--- a/src/helpers/BaseChatMesh.h
+++ b/src/helpers/BaseChatMesh.h
@@ -88,17 +88,10 @@ protected:
    memset(connections, 0, sizeof(connections));
  }
  void bootstrapRTCfromContacts();
  void resetContacts() { num_contacts = 0; }
  void populateContactFromAdvert(ContactInfo& ci, const mesh::Identity& id, const AdvertDataParser& parser, uint32_t timestamp);
  ContactInfo* allocateContactSlot(); // helper to find slot for new contact
  // 'UI' concepts, for sub-classes to implement
  virtual bool isAutoAddEnabled() const { return true; }
  virtual bool shouldAutoAddContactType(uint8_t type) const { return true; }
  virtual void onContactsFull() {};
  virtual bool shouldOverwriteWhenFull() const { return false; }
  virtual void onContactOverwrite(const uint8_t* pub_key) {};
  virtual void onDiscoveredContact(ContactInfo& contact, bool is_new, uint8_t path_len, const uint8_t* path) = 0;
  virtual ContactInfo* processAck(const uint8_t *data) = 0;
  virtual void onContactPathUpdated(const ContactInfo& contact) = 0;
@@ -148,7 +141,6 @@ public:
  int  sendCommandData(const ContactInfo& recipient, uint32_t timestamp, uint8_t attempt, const char* text, uint32_t& est_timeout);
  bool sendGroupMessage(uint32_t timestamp, mesh::GroupChannel& channel, const char* sender_name, const char* text, int text_len);
  int  sendLogin(const ContactInfo& recipient, const char* password, uint32_t& est_timeout);
  int  sendAnonReq(const ContactInfo& recipient, const uint8_t* data, uint8_t len, uint32_t& tag, uint32_t& est_timeout);
  int  sendRequest(const ContactInfo& recipient, uint8_t req_type, uint32_t& tag, uint32_t& est_timeout);
  int  sendRequest(const ContactInfo& recipient, const uint8_t* req_data, uint8_t data_len, uint32_t& tag, uint32_t& est_timeout);
  bool shareContactZeroHop(const ContactInfo& contact);
--- a/src/helpers/ClientACL.cpp
+++ b/src/helpers/ClientACL.cpp
@@ -11,8 +11,7 @@ static File openWrite(FILESYSTEM* _fs, const char* filename) {
  #endif
 }
-void ClientACL::load(FILESYSTEM* fs, const mesh::LocalIdentity& self_id) {
+void ClientACL::load(FILESYSTEM* _fs) {
  _fs = fs;
  num_clients = 0;
  if (_fs->exists("/s_contacts")) {
  #if defined(RP2040_PLATFORM)
@@ -35,12 +34,11 @@ void ClientACL::load(FILESYSTEM* fs, const mesh::LocalIdentity& self_id) {
        success = success && (file.read(unused, 2) == 2);
        success = success && (file.read((uint8_t *)&c.out_path_len, 1) == 1);
        success = success && (file.read(c.out_path, 64) == 64);
-        success = success && (file.read(c.shared_secret, PUB_KEY_SIZE) == PUB_KEY_SIZE); // will be recalculated below
+        success = success && (file.read(c.shared_secret, PUB_KEY_SIZE) == PUB_KEY_SIZE);
        if (!success) break; // EOF
        c.id = mesh::Identity(pub_key);
        self_id.calcSharedSecret(c.shared_secret, pub_key);  // recalculate shared secrets in case our private key changed
        if (num_clients < MAX_CLIENTS) {
          clients[num_clients++] = c;
        } else {
@@ -52,8 +50,7 @@ void ClientACL::load(FILESYSTEM* fs, const mesh::LocalIdentity& self_id) {
  }
 }
-void ClientACL::save(FILESYSTEM* fs, bool (*filter)(ClientInfo*)) {
+void ClientACL::save(FILESYSTEM* _fs, bool (*filter)(ClientInfo*)) {
  _fs = fs;
  File file = openWrite(_fs, "/s_contacts");
  if (file) {
    uint8_t unused[2];
@@ -77,16 +74,6 @@ void ClientACL::save(FILESYSTEM* fs, bool (*filter)(ClientInfo*)) {
  }
 }
 bool ClientACL::clear() {
  if (!_fs) return false; // no filesystem, nothing to clear
  if (_fs->exists("/s_contacts")) {
    _fs->remove("/s_contacts");
  }
  memset(clients, 0, sizeof(clients));
  num_clients = 0;
  return true;
 }
 ClientInfo* ClientACL::getClient(const uint8_t* pubkey, int key_len) {
  for (int i = 0; i < num_clients; i++) {
    if (memcmp(pubkey, clients[i].id.pub_key, key_len) == 0) return &clients[i];  // already known
--- a/src/helpers/ClientACL.h
+++ b/src/helpers/ClientACL.h
@@ -36,7 +36,6 @@ struct ClientInfo {
 #endif
 class ClientACL {
  FILESYSTEM* _fs;
  ClientInfo clients[MAX_CLIENTS];
  int num_clients;
@@ -45,9 +44,8 @@ public:
    memset(clients, 0, sizeof(clients));
    num_clients = 0;
  }
-  void load(FILESYSTEM* _fs, const mesh::LocalIdentity& self_id);
+  void load(FILESYSTEM* _fs);
  void save(FILESYSTEM* _fs, bool (*filter)(ClientInfo*)=NULL);
  bool clear();
  ClientInfo* getClient(const uint8_t* pubkey, int key_len);
  ClientInfo* putClient(const mesh::Identity& id, uint8_t init_perms);
--- a/src/helpers/CommonCLI.cpp
+++ b/src/helpers/CommonCLI.cpp
@@ -14,14 +14,6 @@ static uint32_t _atoi(const char* sp) {
  return n;
 }
 static bool isValidName(const char *n) {
  while (*n) {
    if (*n == '[' || *n == ']' || *n == '/' || *n == '\\' || *n == ':' || *n == ',' || *n == '?' || *n == '*') return false;
    n++;
  }
  return true;
 }
 void CommonCLI::loadPrefs(FILESYSTEM* fs) {
  if (fs->exists("/com_prefs")) {
    loadPrefsInt(fs, "/com_prefs");   // new filename
@@ -73,15 +65,13 @@ void CommonCLI::loadPrefsInt(FILESYSTEM* fs, const char* filename) {
    file.read((uint8_t *)&_prefs->bridge_baud, sizeof(_prefs->bridge_baud));                       // 131
    file.read((uint8_t *)&_prefs->bridge_channel, sizeof(_prefs->bridge_channel));                 // 135
    file.read((uint8_t *)&_prefs->bridge_secret, sizeof(_prefs->bridge_secret));                   // 136
-    file.read((uint8_t *)&_prefs->powersaving_enabled, sizeof(_prefs->powersaving_enabled));       // 152
+    file.read(pad, 4);                                                                             // 152
    file.read(pad, 3);                                                                             // 153
    file.read((uint8_t *)&_prefs->gps_enabled, sizeof(_prefs->gps_enabled));                       // 156
    file.read((uint8_t *)&_prefs->gps_interval, sizeof(_prefs->gps_interval));                     // 157
    file.read((uint8_t *)&_prefs->advert_loc_policy, sizeof (_prefs->advert_loc_policy));          // 161
    file.read((uint8_t *)&_prefs->discovery_mod_timestamp, sizeof(_prefs->discovery_mod_timestamp)); // 162
    file.read((uint8_t *)&_prefs->adc_multiplier, sizeof(_prefs->adc_multiplier)); // 166
-    file.read((uint8_t *)_prefs->owner_info, sizeof(_prefs->owner_info));  // 170
+    // 170
    // 290
    // sanitise bad pref values
    _prefs->rx_delay_base = constrain(_prefs->rx_delay_base, 0, 20.0f);
@@ -103,8 +93,6 @@ void CommonCLI::loadPrefsInt(FILESYSTEM* fs, const char* filename) {
    _prefs->bridge_baud = constrain(_prefs->bridge_baud, 9600, 115200);
    _prefs->bridge_channel = constrain(_prefs->bridge_channel, 0, 14);
    _prefs->powersaving_enabled = constrain(_prefs->powersaving_enabled, 0, 1);
    _prefs->gps_enabled = constrain(_prefs->gps_enabled, 0, 1);
    _prefs->advert_loc_policy = constrain(_prefs->advert_loc_policy, 0, 2);
@@ -157,15 +145,13 @@ void CommonCLI::savePrefs(FILESYSTEM* fs) {
    file.write((uint8_t *)&_prefs->bridge_baud, sizeof(_prefs->bridge_baud));                       // 131
    file.write((uint8_t *)&_prefs->bridge_channel, sizeof(_prefs->bridge_channel));                 // 135
    file.write((uint8_t *)&_prefs->bridge_secret, sizeof(_prefs->bridge_secret));                   // 136
-    file.write((uint8_t *)&_prefs->powersaving_enabled, sizeof(_prefs->powersaving_enabled));       // 152
+    file.write(pad, 4);                                                                             // 152
    file.write(pad, 3);                                                                             // 153
    file.write((uint8_t *)&_prefs->gps_enabled, sizeof(_prefs->gps_enabled));                       // 156
    file.write((uint8_t *)&_prefs->gps_interval, sizeof(_prefs->gps_interval));                     // 157
    file.write((uint8_t *)&_prefs->advert_loc_policy, sizeof(_prefs->advert_loc_policy));           // 161
    file.write((uint8_t *)&_prefs->discovery_mod_timestamp, sizeof(_prefs->discovery_mod_timestamp)); // 162
    file.write((uint8_t *)&_prefs->adc_multiplier, sizeof(_prefs->adc_multiplier));                 // 166
-    file.write((uint8_t *)_prefs->owner_info, sizeof(_prefs->owner_info));  // 170
+    // 170
    // 290
    file.close();
  }
@@ -311,15 +297,6 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
        sprintf(reply, "> %d", (uint32_t)_prefs->flood_max);
      } else if (memcmp(config, "direct.txdelay", 14) == 0) {
        sprintf(reply, "> %s", StrHelper::ftoa(_prefs->direct_tx_delay_factor));
      } else if (memcmp(config, "owner.info", 10) == 0) {
        *reply++ = '>';
        *reply++ = ' ';
        const char* sp = _prefs->owner_info;
        while (*sp) {
          *reply++ = (*sp == '\n') ? '|' : *sp;    // translate newline back to orig '|'
          sp++;
        }
        *reply = 0;  // set null terminator
      } else if (memcmp(config, "tx", 2) == 0 && (config[2] == 0 || config[2] == ' ')) {
        sprintf(reply, "> %d", (uint32_t) _prefs->tx_power_dbm);
      } else if (memcmp(config, "freq", 4) == 0) {
@@ -364,33 +341,6 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
        } else {
          sprintf(reply, "> %.3f", adc_mult);
        }
      // Power management commands
      } else if (memcmp(config, "pwrmgt.support", 14) == 0) {
 #ifdef NRF52_POWER_MANAGEMENT
        strcpy(reply, "> supported");
 #else
        strcpy(reply, "> unsupported");
 #endif
      } else if (memcmp(config, "pwrmgt.source", 13) == 0) {
 #ifdef NRF52_POWER_MANAGEMENT
        strcpy(reply, _board->isExternalPowered() ? "> external" : "> battery");
 #else
        strcpy(reply, "ERROR: Power management not supported");
 #endif
      } else if (memcmp(config, "pwrmgt.bootreason", 17) == 0) {
 #ifdef NRF52_POWER_MANAGEMENT
        sprintf(reply, "> Reset: %s; Shutdown: %s",
          _board->getResetReasonString(_board->getResetReason()),
          _board->getShutdownReasonString(_board->getShutdownReason()));
 #else
        strcpy(reply, "ERROR: Power management not supported");
 #endif
      } else if (memcmp(config, "pwrmgt.bootmv", 13) == 0) {
 #ifdef NRF52_POWER_MANAGEMENT
        sprintf(reply, "> %u mV", _board->getBootVoltage());
 #else
        strcpy(reply, "ERROR: Power management not supported");
 #endif
      } else {
        sprintf(reply, "??: %s", config);
      }
@@ -443,27 +393,22 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
        StrHelper::strncpy(_prefs->guest_password, &config[15], sizeof(_prefs->guest_password));
        savePrefs();
        strcpy(reply, "OK");
-      } else if (memcmp(config, "prv.key ", 8) == 0) {
+      } else if (sender_timestamp == 0 &&
                 memcmp(config, "prv.key ", 8) == 0) { // from serial command line only
        uint8_t prv_key[PRV_KEY_SIZE];
        bool success = mesh::Utils::fromHex(prv_key, PRV_KEY_SIZE, &config[8]);
-        // only allow rekey if key is valid
+        if (success) {
        if (success && mesh::LocalIdentity::validatePrivateKey(prv_key)) {
          mesh::LocalIdentity new_id;
          new_id.readFrom(prv_key, PRV_KEY_SIZE);
          _callbacks->saveIdentity(new_id);
-          strcpy(reply, "OK, reboot to apply! New pubkey: ");
+          strcpy(reply, "OK");
          mesh::Utils::toHex(&reply[33], new_id.pub_key, PUB_KEY_SIZE);
        } else {
-          strcpy(reply, "Error, bad key");
+          strcpy(reply, "Error, invalid key");
        }
      } else if (memcmp(config, "name ", 5) == 0) {
        if (isValidName(&config[5])) {
        StrHelper::strncpy(_prefs->node_name, &config[5], sizeof(_prefs->node_name));
        savePrefs();
        strcpy(reply, "OK");
        } else {
          strcpy(reply, "Error, bad chars");
        }
      } else if (memcmp(config, "repeat ", 7) == 0) {
        _prefs->disable_fwd = memcmp(&config[7], "off", 3) == 0;
        savePrefs();
@@ -530,16 +475,6 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
        } else {
          strcpy(reply, "Error, cannot be negative");
        }
      } else if (memcmp(config, "owner.info ", 11) == 0) {
        config += 11;
        char *dp = _prefs->owner_info;
        while (*config && dp - _prefs->owner_info < sizeof(_prefs->owner_info)-1) {
          *dp++ = (*config == '|') ? '\n' : *config;    // translate '|' to newline chars
          config++;
        }
        *dp = 0;
        savePrefs();
        strcpy(reply, "OK");
      } else if (memcmp(config, "tx ", 3) == 0) {
        _prefs->tx_power_dbm = atoi(&config[3]);
        savePrefs();
@@ -741,20 +676,6 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
        strcpy(reply, "Can't find GPS");
      }
 #endif
    } else if (memcmp(command, "powersaving on", 14) == 0) {
      _prefs->powersaving_enabled = 1;
      savePrefs();
      strcpy(reply, "ok"); // TODO: to return Not supported if required
    } else if (memcmp(command, "powersaving off", 15) == 0) {
      _prefs->powersaving_enabled = 0;
      savePrefs();
      strcpy(reply, "ok");
    } else if (memcmp(command, "powersaving", 11) == 0) {
      if (_prefs->powersaving_enabled) {
        strcpy(reply, "on");
      } else {
        strcpy(reply, "off");
      }
    } else if (memcmp(command, "log start", 9) == 0) {
      _callbacks->setLoggingOn(true);
      strcpy(reply, "   logging on");
--- a/src/helpers/CommonCLI.h
+++ b/src/helpers/CommonCLI.h
@@ -3,7 +3,6 @@
 #include "Mesh.h"
 #include <helpers/IdentityStore.h>
 #include <helpers/SensorManager.h>
 #include <helpers/ClientACL.h>
 #if defined(WITH_RS232_BRIDGE) || defined(WITH_ESPNOW_BRIDGE)
 #define WITH_BRIDGE
@@ -43,15 +42,12 @@ struct NodePrefs { // persisted to file
  uint32_t bridge_baud;   // 9600, 19200, 38400, 57600, 115200 (default 115200)
  uint8_t bridge_channel; // 1-14 (ESP-NOW only)
  char bridge_secret[16]; // for XOR encryption of bridge packets (ESP-NOW only)
  // Power setting
  uint8_t powersaving_enabled; // boolean
  // Gps settings
  uint8_t gps_enabled;
  uint32_t gps_interval; // in seconds
  uint8_t advert_loc_policy;
  uint32_t discovery_mod_timestamp;
  float adc_multiplier;
  char owner_info[120];
 };
 class CommonCLICallbacks {
@@ -95,7 +91,6 @@ class CommonCLI {
  CommonCLICallbacks* _callbacks;
  mesh::MainBoard* _board;
  SensorManager* _sensors;
  ClientACL* _acl;
  char tmp[PRV_KEY_SIZE*2 + 4];
  mesh::RTCClock* getRTCClock() { return _rtc; }
@@ -103,8 +98,8 @@ class CommonCLI {
  void loadPrefsInt(FILESYSTEM* _fs, const char* filename);
 public:
-  CommonCLI(mesh::MainBoard& board, mesh::RTCClock& rtc, SensorManager& sensors, ClientACL& acl, NodePrefs* prefs, CommonCLICallbacks* callbacks)
+  CommonCLI(mesh::MainBoard& board, mesh::RTCClock& rtc, SensorManager& sensors, NodePrefs* prefs, CommonCLICallbacks* callbacks)
-      : _board(&board), _rtc(&rtc), _sensors(&sensors), _acl(&acl), _prefs(prefs), _callbacks(callbacks) { }
+      : _board(&board), _rtc(&rtc), _sensors(&sensors), _prefs(prefs), _callbacks(callbacks) { }
  void loadPrefs(FILESYSTEM* _fs);
  void savePrefs(FILESYSTEM* _fs);
--- a/src/helpers/ContactInfo.h
+++ b/src/helpers/ContactInfo.h
@@ -9,21 +9,10 @@ struct ContactInfo {
  uint8_t type;   // on of ADV_TYPE_*
  uint8_t flags;
  int8_t out_path_len;
  mutable bool shared_secret_valid; // flag to indicate if shared_secret has been calculated
  uint8_t out_path[MAX_PATH_SIZE];
  uint32_t last_advert_timestamp;   // by THEIR clock
  uint8_t shared_secret[PUB_KEY_SIZE];
  uint32_t lastmod;  // by OUR clock
  int32_t gps_lat, gps_lon;    // 6 dec places
  uint32_t sync_since;
  const uint8_t* getSharedSecret(const mesh::LocalIdentity& self_id) const {
    if (!shared_secret_valid) {
      self_id.calcSharedSecret(shared_secret, id.pub_key);
      shared_secret_valid = true;
    }
    return shared_secret;
  }
 private:
  mutable uint8_t shared_secret[PUB_KEY_SIZE];
 };
--- a/src/helpers/ESP32Board.h
+++ b/src/helpers/ESP32Board.h
@@ -8,8 +8,6 @@
 #include <rom/rtc.h>
 #include <sys/time.h>
 #include <Wire.h>
 #include "esp_wifi.h"
 #include "driver/rtc_io.h"
 class ESP32Board : public mesh::MainBoard {
 protected:
@@ -44,43 +42,6 @@ public:
  #endif
  }
  // Temperature from ESP32 MCU
  float getMCUTemperature() override {
    uint32_t raw = 0;
    // To get and average the temperature so it is more accurate, especially in low temperature
    for (int i = 0; i < 4; i++) {
      raw += temperatureRead();
    }
    return raw / 4;
  }
  void enterLightSleep(uint32_t secs) {
 #if defined(CONFIG_IDF_TARGET_ESP32S3) && defined(P_LORA_DIO_1) // Supported ESP32 variants
    if (rtc_gpio_is_valid_gpio((gpio_num_t)P_LORA_DIO_1)) { // Only enter sleep mode if P_LORA_DIO_1 is RTC pin
      esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON);
      esp_sleep_enable_ext1_wakeup((1L << P_LORA_DIO_1), ESP_EXT1_WAKEUP_ANY_HIGH); // To wake up when receiving a LoRa packet
      if (secs > 0) {
        esp_sleep_enable_timer_wakeup(secs * 1000000); // To wake up every hour to do periodically jobs
      }
      esp_light_sleep_start(); // CPU enters light sleep
    }
 #endif
  }
  void sleep(uint32_t secs) override {
    // To check for WiFi status to see if there is active OTA
    wifi_mode_t mode;
    esp_err_t err = esp_wifi_get_mode(&mode);
    if (err != ESP_OK) {          // WiFi is off ~ No active OTA, safe to go to sleep
      enterLightSleep(secs);      // To wake up after "secs" seconds or when receiving a LoRa packet
    }
  }
  uint8_t getStartupReason() const override { return startup_reason; }
 #if defined(P_LORA_TX_LED)
--- a/src/helpers/NRF52Board.cpp
+++ b/src/helpers/NRF52Board.cpp
@@ -1,321 +0,0 @@
 #if defined(NRF52_PLATFORM)
 #include "NRF52Board.h"
 #include <bluefruit.h>
 #include <nrf_soc.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 NRF52Board::begin() {
  startup_reason = BD_STARTUP_NORMAL;
 }
 #ifdef NRF52_POWER_MANAGEMENT
 #include "nrf.h"
 // Power Management global variables
 uint32_t g_nrf52_reset_reason = 0;     // Reset/Startup reason
 uint8_t g_nrf52_shutdown_reason = 0;   // Shutdown reason
 // Early constructor - runs before SystemInit() clears the registers
 // Priority 101 ensures this runs before SystemInit (102) and before
 // any C++ static constructors (default 65535)
 static void __attribute__((constructor(101))) nrf52_early_reset_capture() {
  g_nrf52_reset_reason = NRF_POWER->RESETREAS;
  g_nrf52_shutdown_reason = NRF_POWER->GPREGRET2;
 }
 void NRF52Board::initPowerMgr() {
  // Copy early-captured register values
  reset_reason = g_nrf52_reset_reason;
  shutdown_reason = g_nrf52_shutdown_reason;
  boot_voltage_mv = 0;  // Will be set by checkBootVoltage()
  // Clear registers for next boot
  // Note: At this point SoftDevice may or may not be enabled
  uint8_t sd_enabled = 0;
  sd_softdevice_is_enabled(&sd_enabled);
  if (sd_enabled) {
    sd_power_reset_reason_clr(0xFFFFFFFF);
    sd_power_gpregret_clr(1, 0xFF);
  } else {
    NRF_POWER->RESETREAS = 0xFFFFFFFF;  // Write 1s to clear
    NRF_POWER->GPREGRET2 = 0;
  }
  // Log reset/shutdown info
  if (shutdown_reason != SHUTDOWN_REASON_NONE) {
    MESH_DEBUG_PRINTLN("PWRMGT: Reset = %s (0x%lX); Shutdown = %s (0x%02X)",
      getResetReasonString(reset_reason), (unsigned long)reset_reason,
      getShutdownReasonString(shutdown_reason), shutdown_reason);
  } else {
    MESH_DEBUG_PRINTLN("PWRMGT: Reset = %s (0x%lX)",
      getResetReasonString(reset_reason), (unsigned long)reset_reason);
  }
 }
 bool NRF52Board::isExternalPowered() {
  // Check if SoftDevice is enabled before using its API
  uint8_t sd_enabled = 0;
  sd_softdevice_is_enabled(&sd_enabled);
  if (sd_enabled) {
    uint32_t usb_status;
    sd_power_usbregstatus_get(&usb_status);
    return (usb_status & POWER_USBREGSTATUS_VBUSDETECT_Msk) != 0;
  } else {
    return (NRF_POWER->USBREGSTATUS & POWER_USBREGSTATUS_VBUSDETECT_Msk) != 0;
  }
 }
 const char* NRF52Board::getResetReasonString(uint32_t reason) {
  if (reason & POWER_RESETREAS_RESETPIN_Msk) return "Reset Pin";
  if (reason & POWER_RESETREAS_DOG_Msk) return "Watchdog";
  if (reason & POWER_RESETREAS_SREQ_Msk) return "Soft Reset";
  if (reason & POWER_RESETREAS_LOCKUP_Msk) return "CPU Lockup";
  #ifdef POWER_RESETREAS_LPCOMP_Msk
    if (reason & POWER_RESETREAS_LPCOMP_Msk) return "Wake from LPCOMP";
  #endif
  #ifdef POWER_RESETREAS_VBUS_Msk
    if (reason & POWER_RESETREAS_VBUS_Msk) return "Wake from VBUS";
  #endif
  #ifdef POWER_RESETREAS_OFF_Msk
    if (reason & POWER_RESETREAS_OFF_Msk) return "Wake from GPIO";
  #endif
  #ifdef POWER_RESETREAS_DIF_Msk
    if (reason & POWER_RESETREAS_DIF_Msk) return "Debug Interface";
  #endif
  return "Cold Boot";
 }
 const char* NRF52Board::getShutdownReasonString(uint8_t reason) {
  switch (reason) {
    case SHUTDOWN_REASON_LOW_VOLTAGE:  return "Low Voltage";
    case SHUTDOWN_REASON_USER:         return "User Request";
    case SHUTDOWN_REASON_BOOT_PROTECT: return "Boot Protection";
  }
  return "Unknown";
 }
 bool NRF52Board::checkBootVoltage(const PowerMgtConfig* config) {
  initPowerMgr();
  // Read boot voltage
  boot_voltage_mv = getBattMilliVolts();
  if (config->voltage_bootlock == 0) return true;  // Protection disabled
  // Skip check if externally powered
  if (isExternalPowered()) {
    MESH_DEBUG_PRINTLN("PWRMGT: Boot check skipped (external power)");
    boot_voltage_mv = getBattMilliVolts();
    return true;
  }
  MESH_DEBUG_PRINTLN("PWRMGT: Boot voltage = %u mV (threshold = %u mV)",
      boot_voltage_mv, config->voltage_bootlock);
  // Only trigger shutdown if reading is valid (>1000mV) AND below threshold
  // This prevents spurious shutdowns on ADC glitches or uninitialized reads
  if (boot_voltage_mv > 1000 && boot_voltage_mv < config->voltage_bootlock) {
    MESH_DEBUG_PRINTLN("PWRMGT: Boot voltage too low - entering protective shutdown");
    initiateShutdown(SHUTDOWN_REASON_BOOT_PROTECT);
    return false;  // Should never reach this
  }
  return true;
 }
 void NRF52Board::initiateShutdown(uint8_t reason) {
  enterSystemOff(reason);
 }
 void NRF52Board::enterSystemOff(uint8_t reason) {
  MESH_DEBUG_PRINTLN("PWRMGT: Entering SYSTEMOFF (%s)", getShutdownReasonString(reason));
  // Record shutdown reason in GPREGRET2
  uint8_t sd_enabled = 0;
  sd_softdevice_is_enabled(&sd_enabled);
  if (sd_enabled) {
    sd_power_gpregret_clr(1, 0xFF);
    sd_power_gpregret_set(1, reason);
  } else {
    NRF_POWER->GPREGRET2 = reason;
  }
  // Flush serial buffers
  Serial.flush();
  delay(100);
  // Enter SYSTEMOFF
  if (sd_enabled) {
    uint32_t err = sd_power_system_off();
    if (err == NRF_ERROR_SOFTDEVICE_NOT_ENABLED) {  //SoftDevice not enabled
      sd_enabled = 0;
    }
  }
  if (!sd_enabled) {
    // SoftDevice not available; write directly to POWER->SYSTEMOFF
    NRF_POWER->SYSTEMOFF = POWER_SYSTEMOFF_SYSTEMOFF_Enter;
  }
  // If we get here, something went wrong. Reset to recover.
  NVIC_SystemReset();
 }
 void NRF52Board::configureVoltageWake(uint8_t ain_channel, uint8_t refsel) {
  // LPCOMP is not managed by SoftDevice - direct register access required
  // Halt and disable before reconfiguration
  NRF_LPCOMP->TASKS_STOP = 1;
  NRF_LPCOMP->ENABLE = LPCOMP_ENABLE_ENABLE_Disabled;
  // Select analog input (AIN0-7 maps to PSEL 0-7)
  NRF_LPCOMP->PSEL = ((uint32_t)ain_channel << LPCOMP_PSEL_PSEL_Pos) & LPCOMP_PSEL_PSEL_Msk;
  // Reference: REFSEL (0-6=1/8..7/8, 7=ARef, 8-15=1/16..15/16)
  NRF_LPCOMP->REFSEL = ((uint32_t)refsel << LPCOMP_REFSEL_REFSEL_Pos) & LPCOMP_REFSEL_REFSEL_Msk;
  // Detect UP events (voltage rises above threshold for battery recovery)
  NRF_LPCOMP->ANADETECT = LPCOMP_ANADETECT_ANADETECT_Up;
  // Enable 50mV hysteresis for noise immunity
  NRF_LPCOMP->HYST = LPCOMP_HYST_HYST_Hyst50mV;
  // Clear stale events/interrupts before enabling wake
  NRF_LPCOMP->EVENTS_READY = 0;
  NRF_LPCOMP->EVENTS_DOWN = 0;
  NRF_LPCOMP->EVENTS_UP = 0;
  NRF_LPCOMP->EVENTS_CROSS = 0;
  NRF_LPCOMP->INTENCLR = 0xFFFFFFFF;
  NRF_LPCOMP->INTENSET = LPCOMP_INTENSET_UP_Msk;
  // Enable LPCOMP
  NRF_LPCOMP->ENABLE = LPCOMP_ENABLE_ENABLE_Enabled;
  NRF_LPCOMP->TASKS_START = 1;
  // Wait for comparator to settle before entering SYSTEMOFF
  for (uint8_t i = 0; i < 20 && !NRF_LPCOMP->EVENTS_READY; i++) {
    delayMicroseconds(50);
  }
  if (refsel == 7) {
    MESH_DEBUG_PRINTLN("PWRMGT: LPCOMP wake configured (AIN%d, ref=ARef)", ain_channel);
  } else if (refsel <= 6) {
    MESH_DEBUG_PRINTLN("PWRMGT: LPCOMP wake configured (AIN%d, ref=%d/8 VDD)",
      ain_channel, refsel + 1);
  } else {
    uint8_t ref_num = (uint8_t)((refsel - 8) * 2 + 1);
    MESH_DEBUG_PRINTLN("PWRMGT: LPCOMP wake configured (AIN%d, ref=%d/16 VDD)",
      ain_channel, ref_num);
  }
  // Configure VBUS (USB power) wake alongside LPCOMP
  uint8_t sd_enabled = 0;
  sd_softdevice_is_enabled(&sd_enabled);
  if (sd_enabled) {
    sd_power_usbdetected_enable(1);
  } else {
    NRF_POWER->EVENTS_USBDETECTED = 0;
    NRF_POWER->INTENSET = POWER_INTENSET_USBDETECTED_Msk;
  }
  MESH_DEBUG_PRINTLN("PWRMGT: VBUS wake configured");
 }
 #endif
 void NRF52BoardDCDC::begin() {
  NRF52Board::begin();
  // Enable DC/DC converter for improved power efficiency
  uint8_t sd_enabled = 0;
  sd_softdevice_is_enabled(&sd_enabled);
  if (sd_enabled) {
    sd_power_dcdc_mode_set(NRF_POWER_DCDC_ENABLE);
  } else {
    NRF_POWER->DCDCEN = 1;
  }
 }
 // Temperature from NRF52 MCU
 float NRF52Board::getMCUTemperature() {
  NRF_TEMP->TASKS_START = 1; // Start temperature measurement
  long startTime = millis();  
  while (NRF_TEMP->EVENTS_DATARDY == 0) { // Wait for completion. Should complete in 50us
    if(millis() - startTime > 5) {  // To wait 5ms just in case
      NRF_TEMP->TASKS_STOP = 1;
      return NAN;
    }
  }
  NRF_TEMP->EVENTS_DATARDY = 0; // Clear event flag
  int32_t temp = NRF_TEMP->TEMP; // In 0.25 *C units
  NRF_TEMP->TASKS_STOP = 1;
  return temp * 0.25f; // Convert to *C
 }
 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()
  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(ota_name);
  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
  uint8_t mac_addr[6];
  memset(mac_addr, 0, sizeof(mac_addr));
  Bluefruit.getAddr(mac_addr);
  sprintf(reply, "OK - mac: %02X:%02X:%02X:%02X:%02X:%02X", mac_addr[5], mac_addr[4], mac_addr[3],
          mac_addr[2], mac_addr[1], mac_addr[0]);
  return true;
 }
 #endif
--- a/src/helpers/NRF52Board.h
+++ b/src/helpers/NRF52Board.h
@@ -1,82 +0,0 @@
 #pragma once
 #include <Arduino.h>
 #include <MeshCore.h>
 #if defined(NRF52_PLATFORM)
 #ifdef NRF52_POWER_MANAGEMENT
 // Shutdown Reason Codes (stored in GPREGRET before SYSTEMOFF)
 #define SHUTDOWN_REASON_NONE          0x00
 #define SHUTDOWN_REASON_LOW_VOLTAGE   0x4C  // 'L' - Runtime low voltage threshold
 #define SHUTDOWN_REASON_USER          0x55  // 'U' - User requested powerOff()
 #define SHUTDOWN_REASON_BOOT_PROTECT  0x42  // 'B' - Boot voltage protection
 // Boards provide this struct with their hardware-specific settings and callbacks.
 struct PowerMgtConfig {
  // LPCOMP wake configuration (for voltage recovery from SYSTEMOFF)
  uint8_t lpcomp_ain_channel;       // AIN0-7 for voltage sensing pin
  uint8_t lpcomp_refsel;            // REFSEL value: 0-6=1/8..7/8, 7=ARef, 8-15=1/16..15/16
  // Boot protection voltage threshold (millivolts)
  // Set to 0 to disable boot protection
  uint16_t voltage_bootlock;
 };
 #endif
 class NRF52Board : public mesh::MainBoard {
 #ifdef NRF52_POWER_MANAGEMENT
  void initPowerMgr();
 #endif
 protected:
  uint8_t startup_reason;
 #ifdef NRF52_POWER_MANAGEMENT
  uint32_t reset_reason;              // RESETREAS register value
  uint8_t shutdown_reason;            // GPREGRET value (why we entered last SYSTEMOFF)
  uint16_t boot_voltage_mv;           // Battery voltage at boot (millivolts)
  bool checkBootVoltage(const PowerMgtConfig* config);
  void enterSystemOff(uint8_t reason);
  void configureVoltageWake(uint8_t ain_channel, uint8_t refsel);
  virtual void initiateShutdown(uint8_t reason);
 #endif
 public:
  virtual void begin();
  virtual uint8_t getStartupReason() const override { return startup_reason; }
  virtual float getMCUTemperature() override;
  virtual void reboot() override { NVIC_SystemReset(); }
 #ifdef NRF52_POWER_MANAGEMENT
  bool isExternalPowered() override;
  uint16_t getBootVoltage() override { return boot_voltage_mv; }
  virtual uint32_t getResetReason() const override { return reset_reason; }
  uint8_t getShutdownReason() const override { return shutdown_reason; }
  const char* getResetReasonString(uint32_t reason) override;
  const char* getShutdownReasonString(uint8_t reason) override;
 #endif
 };
 /*
 * The NRF52 has an internal DC/DC regulator that allows increased efficiency
 * compared to the LDO regulator. For being able to use it, the module/board
 * needs to have the required inductors and and capacitors populated. If the
 * hardware requirements are met, this subclass can be used to enable the DC/DC
 * regulator.
 */
 class NRF52BoardDCDC : virtual public NRF52Board {
 public:
  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)
    : _buf(buf), _max(max), _pos(0) {
    if (_max > 0) _buf[0] = 0;
  }
  size_t write(uint8_t c) override {
    if (_pos + 1 >= _max) 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;
  size_t _pos;
 };
 RegionMap::RegionMap(TransportKeyStore& store) : _store(&store) {
  next_id = 1; num_regions = 0; home_id = 0;
  wildcard.id = wildcard.parent = 0;
@@ -48,13 +9,8 @@ RegionMap::RegionMap(TransportKeyStore& store) : _store(&store) {
  strcpy(wildcard.name, "*");
 }
-bool RegionMap::is_name_char(uint8_t c) {
+bool RegionMap::is_name_char(char c) {
-  // accept all alpha-num or accented characters, but exclude most punctuation chars
+  return (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || c == '-' || c == '.' || c == '_' || c == '#';
  return c == '-' || c == '$' || c == '#' || (c >= '0' && c <= '9') || c >= 'A';
 }
 static const char* skip_hash(const char* name) {
  return *name == '#' ? name + 1 : name;
 }
 static File openWrite(FILESYSTEM* _fs, const char* filename) {
@@ -68,12 +24,12 @@ static File openWrite(FILESYSTEM* _fs, const char* filename) {
  #endif
 }
-bool RegionMap::load(FILESYSTEM* _fs, const char* path) {
+bool RegionMap::load(FILESYSTEM* _fs) {
-  if (_fs->exists(path ? path : "/regions2")) {
+  if (_fs->exists("/regions2")) {
  #if defined(RP2040_PLATFORM)
-    File file = _fs->open(path ? path : "/regions2", "r");
+    File file = _fs->open("/regions2", "r");
  #else
-    File file = _fs->open(path ? path : "/regions2");
+    File file = _fs->open("/regions2");
  #endif
    if (file) {
@@ -111,8 +67,8 @@ bool RegionMap::load(FILESYSTEM* _fs, const char* path) {
  return false;  // failed
 }
-bool RegionMap::save(FILESYSTEM* _fs, const char* path) {
+bool RegionMap::save(FILESYSTEM* _fs) {
-  File file = openWrite(_fs, path ? path : "/regions2");
+  File file = openWrite(_fs, "/regions2");
  if (file) {
    uint8_t pad[128];
    memset(pad, 0, sizeof(pad));
@@ -170,17 +126,11 @@ RegionEntry* RegionMap::findMatch(mesh::Packet* packet, uint8_t mask) {
    if ((region->flags & mask) == 0) {   // does region allow this? (per 'mask' param)
      TransportKey keys[4];
      int num;
-      if (region->name[0] == '$') {   // private region
+      if (region->name[0] == '#') {   // auto hashtag region
        num = _store->loadKeysFor(region->id, keys, 4);
      } else if (region->name[0] == '#') {   // auto hashtag region
        _store->getAutoKeyFor(region->id, region->name, keys[0]);
        num = 1;
-      } else {   // new: implicit auto hashtag region
+      } else {
-        char tmp[sizeof(region->name)];
+        num = _store->loadKeysFor(region->id, keys, 4);
        tmp[0] = '#';
        strcpy(&tmp[1], region->name);
        _store->getAutoKeyFor(region->id, tmp, keys[0]);
        num = 1;
      }
      for (int j = 0; j < num; j++) {
        uint16_t code = keys[j].calcTransportCode(packet);
@@ -196,10 +146,9 @@ RegionEntry* RegionMap::findMatch(mesh::Packet* packet, uint8_t mask) {
 RegionEntry* RegionMap::findByName(const char* name) {
  if (strcmp(name, "*") == 0) return &wildcard;
  if (*name == '#') { name++; }  // ignore the '#' when matching by name
  for (int i = 0; i < num_regions; i++) {
    auto region = &regions[i];
-    if (strcmp(name, skip_hash(region->name)) == 0) return region;
+    if (strcmp(name, region->name) == 0) return region;
  }
  return NULL;  // not found
 }
@@ -207,12 +156,11 @@ RegionEntry* RegionMap::findByName(const char* name) {
 RegionEntry* RegionMap::findByNamePrefix(const char* prefix) {
  if (strcmp(prefix, "*") == 0) return &wildcard;
  if (*prefix == '#') { prefix++; }  // ignore the '#' when matching by name
  RegionEntry* partial = NULL;
  for (int i = 0; i < num_regions; i++) {
    auto region = &regions[i];
-    if (strcmp(prefix, skip_hash(region->name)) == 0) return region;  // is a complete match, preference this one
+    if (strcmp(prefix, region->name) == 0) return region;  // is a complete match, preference this one
-    if (memcmp(prefix, skip_hash(region->name), strlen(prefix)) == 0) {
+    if (memcmp(prefix, region->name, strlen(prefix)) == 0) {
      partial = region;
    }
  }
@@ -271,9 +219,9 @@ void RegionMap::printChildRegions(int indent, const RegionEntry* parent, Stream&
  }
  if (parent->flags & REGION_DENY_FLOOD) {
-    out.printf("%s%s\n", skip_hash(parent->name), parent->id == home_id ? "^" : "");
+    out.printf("%s%s\n", parent->name, parent->id == home_id ? "^" : "");
  } else {
-    out.printf("%s%s F\n", skip_hash(parent->name), parent->id == home_id ? "^" : "");
+    out.printf("%s%s F\n", parent->name, parent->id == home_id ? "^" : "");
  }
  for (int i = 0; i < num_regions; i++) {
@@ -287,43 +235,3 @@ void RegionMap::printChildRegions(int indent, const RegionEntry* parent, Stream&
 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) {
  char *dp = dest;
  // Check wildcard region
  bool wildcard_matches = invert ? (wildcard.flags & mask) : !(wildcard.flags & mask);
  if (wildcard_matches) {
    *dp++ = '*';
    *dp++ = ',';
  }
    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 ((dp - dest) + len + 2 < max_len) {   // only append if name will fit
        memcpy(dp, skip_hash(region->name), len);
        dp += len;
        *dp++ = ',';
      }
    }
  }
  if (dp > dest) { dp--; }   // don't include trailing comma
  *dp = 0;  // set null terminator
  return dp - dest;   // return length
 }
--- a/src/helpers/RegionMap.h
+++ b/src/helpers/RegionMap.h
@@ -30,10 +30,10 @@ class RegionMap {
 public:
  RegionMap(TransportKeyStore& store);
-  static bool is_name_char(uint8_t c);
+  static bool is_name_char(char c);
-  bool load(FILESYSTEM* _fs, const char* path=NULL);
+  bool load(FILESYSTEM* _fs);
-  bool save(FILESYSTEM* _fs, const char* path=NULL);
+  bool save(FILESYSTEM* _fs);
  RegionEntry* putRegion(const char* name, uint16_t parent_id, uint16_t id = 0);
  RegionEntry* findMatch(mesh::Packet* packet, uint8_t mask);
@@ -47,11 +47,6 @@ public:
  bool clear();
  void resetFrom(const RegionMap& src) { num_regions = 0; next_id = src.next_id; }
  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);
  void exportTo(Stream& out) const;
  size_t  exportTo(char *dest, size_t max_len) const;
 };
--- a/src/helpers/bridges/RS232Bridge.cpp
+++ b/src/helpers/bridges/RS232Bridge.cpp
@@ -15,9 +15,10 @@ void RS232Bridge::begin() {
 #if defined(ESP32)
  ((HardwareSerial *)_serial)->setPins(WITH_RS232_BRIDGE_RX, WITH_RS232_BRIDGE_TX);
-#elif defined(NRF52_PLATFORM)
+#elif defined(RAK_4631) 
  // Tested with RAK_4631 and T114
  ((Uart *)_serial)->setPins(WITH_RS232_BRIDGE_RX, WITH_RS232_BRIDGE_TX);
 #elif defined(NRF52_PLATFORM)
  ((HardwareSerial *)_serial)->setPins(WITH_RS232_BRIDGE_RX, WITH_RS232_BRIDGE_TX);
 #elif defined(RP2040_PLATFORM)
  ((SerialUART *)_serial)->setRX(WITH_RS232_BRIDGE_RX);
  ((SerialUART *)_serial)->setTX(WITH_RS232_BRIDGE_TX);
@@ -122,7 +123,8 @@ void RS232Bridge::sendPacket(mesh::Packet *packet) {
    // Check if packet fits within our maximum payload size
    if (len > (MAX_TRANS_UNIT + 1)) {
-      BRIDGE_DEBUG_PRINTLN("TX packet too large (payload=%d, max=%d)\n", len, MAX_TRANS_UNIT + 1);
+      BRIDGE_DEBUG_PRINTLN("TX packet too large (payload=%d, max=%d)\n", len,
                           MAX_TRANS_UNIT + 1);
      return;
    }
--- a/src/helpers/bridges/RS232Bridge.h
+++ b/src/helpers/bridges/RS232Bridge.h
@@ -40,7 +40,7 @@
 * Platform Support:
 * Different platforms require different pin configuration methods:
 * - ESP32: Uses HardwareSerial::setPins(rx, tx)
- * - NRF52: Uses Uart::setPins(rx, tx)
+ * - NRF52: Uses HardwareSerial::setPins(rx, tx)
 * - RP2040: Uses SerialUART::setRX(rx) and SerialUART::setTX(tx)
 * - STM32: Uses HardwareSerial::setRx(rx) and HardwareSerial::setTx(tx)
 */
--- a/src/helpers/esp32/SerialBLEInterface.cpp
+++ b/src/helpers/esp32/SerialBLEInterface.cpp
@@ -9,21 +9,11 @@
 #define ADVERT_RESTART_DELAY  1000   // millis
-void SerialBLEInterface::begin(const char* prefix, char* name, uint32_t pin_code) {
+void SerialBLEInterface::begin(const char* device_name, uint32_t pin_code) {
  _pin_code = pin_code;
  if (strcmp(name, "@@MAC") == 0) {
    uint8_t addr[8];
    memset(addr, 0, sizeof(addr));
    esp_efuse_mac_get_default(addr);
    sprintf(name, "%02X%02X%02X%02X%02X%02X",    // modify (IN-OUT param)
          addr[5], addr[4], addr[3], addr[2], addr[1], addr[0]);
  }
  char dev_name[32+16];
  sprintf(dev_name, "%s%s", prefix, name);
  // Create the BLE Device
-  BLEDevice::init(dev_name);
+  BLEDevice::init(device_name);
  BLEDevice::setSecurityCallbacks(this);
  BLEDevice::setMTU(MAX_FRAME_SIZE);
--- a/src/helpers/esp32/SerialBLEInterface.h
+++ b/src/helpers/esp32/SerialBLEInterface.h
@@ -61,13 +61,7 @@ public:
    send_queue_len = recv_queue_len = 0;
  }
-  /**
+  void begin(const char* device_name, uint32_t pin_code);
   * init the BLE interface.
   * @param prefix   a prefix for the device name
   * @param name  IN/OUT - a name for the device (combined with prefix). If "@@MAC", is modified and returned
   * @param pin_code   the BLE security pin
   */
  void begin(const char* prefix, char* name, uint32_t pin_code);
  // BaseSerialInterface methods
  void enable() override;
--- a/src/helpers/esp32/SerialWifiInterface.cpp
+++ b/src/helpers/esp32/SerialWifiInterface.cpp
@@ -43,15 +43,6 @@ bool SerialWifiInterface::isWriteBusy() const {
  return false;
 }
 bool SerialWifiInterface::hasReceivedFrameHeader() {
  return received_frame_header.type != 0 && received_frame_header.length != 0;
 }
 void SerialWifiInterface::resetReceivedFrameHeader() {
  received_frame_header.type = 0;
  received_frame_header.length = 0;
 }
 size_t SerialWifiInterface::checkRecvFrame(uint8_t dest[]) {
  // check if new client connected
  auto newClient = server.available();
@@ -64,9 +55,6 @@ size_t SerialWifiInterface::checkRecvFrame(uint8_t dest[]) {
    // switch active connection to new client
    client = newClient;
    // forget received frame header
    resetReceivedFrameHeader();
  }
  if (client.connected()) {
@@ -98,69 +86,13 @@ size_t SerialWifiInterface::checkRecvFrame(uint8_t dest[]) {
        send_queue[i] = send_queue[i + 1];
      }
    } else {
-
+      int len = client.available();
-      // check if we are waiting for a frame header
+      if (len > 0) {
-      if(!hasReceivedFrameHeader()){
+        uint8_t buf[MAX_FRAME_SIZE + 4];
-
+        client.readBytes(buf, len);
-        // make sure we have received enough bytes for a frame header
+        memcpy(dest, buf+3, len-3); // remove header (don't even check ... problems are on the other dir)
-        // 3 bytes frame header = (1 byte frame type) + (2 bytes frame length as unsigned 16-bit little endian)
+        return len-3;
        int frame_header_length = 3;
        if(client.available() >= frame_header_length){
          // read frame header
          client.readBytes(&received_frame_header.type, 1);
          client.readBytes((uint8_t*)&received_frame_header.length, 2);
      }
      }
      // check if we have received a frame header
      if(hasReceivedFrameHeader()){
        // make sure we have received enough bytes for the required frame length
        int available = client.available();
        int frame_type = received_frame_header.type;
        int frame_length = received_frame_header.length;
        if(frame_length > available){
          WIFI_DEBUG_PRINTLN("Waiting for %d more bytes", frame_length - available);
          return 0;
        }
        // skip frames that are larger than MAX_FRAME_SIZE
        if(frame_length > MAX_FRAME_SIZE){
          WIFI_DEBUG_PRINTLN("Skipping frame: length=%d is larger than MAX_FRAME_SIZE=%d", frame_length, MAX_FRAME_SIZE);
          while(frame_length > 0){
            uint8_t skip[1];
            int skipped = client.read(skip, 1);
            frame_length -= skipped;
          }
          resetReceivedFrameHeader();
          return 0;
        }
        // skip frames that are not expected type
        // '<' is 0x3c which indicates a frame sent from app to radio
        if(frame_type != '<'){
          WIFI_DEBUG_PRINTLN("Skipping frame: type=0x%x is unexpected", frame_type);
          while(frame_length > 0){
            uint8_t skip[1];
            int skipped = client.read(skip, 1);
            frame_length -= skipped;
          }
          resetReceivedFrameHeader();
          return 0;
        }
        // read frame data to provided buffer
        client.readBytes(dest, frame_length);
        // ready for next frame
        resetReceivedFrameHeader();
        return frame_length;
      }
    }
  }
--- a/src/helpers/esp32/SerialWifiInterface.h
+++ b/src/helpers/esp32/SerialWifiInterface.h
@@ -12,18 +12,11 @@ class SerialWifiInterface : public BaseSerialInterface {
  WiFiServer server;
  WiFiClient client;
  struct FrameHeader {
    uint8_t type;
    uint16_t length;
  };
  struct Frame {
    uint8_t len;
    uint8_t buf[MAX_FRAME_SIZE];
  };
  FrameHeader received_frame_header;
  #define FRAME_QUEUE_SIZE  4
  int recv_queue_len;
  Frame recv_queue[FRAME_QUEUE_SIZE];
@@ -40,8 +33,6 @@ public:
    _isEnabled = false;
    _last_write = 0;
    send_queue_len = recv_queue_len = 0;
    received_frame_header.type = 0;
    received_frame_header.length = 0;
  }
  void begin(int port);
@@ -56,9 +47,6 @@ public:
  size_t writeFrame(const uint8_t src[], size_t len) override;
  size_t checkRecvFrame(uint8_t dest[]) override;
  bool hasReceivedFrameHeader();
  void resetReceivedFrameHeader();
 };
 #if WIFI_DEBUG_LOGGING && ARDUINO
--- a/src/helpers/esp32/TBeamBoard.h
+++ b/src/helpers/esp32/TBeamBoard.h
@@ -2,7 +2,16 @@
 #if defined(TBEAM_SUPREME_SX1262) || defined(TBEAM_SX1262) || defined(TBEAM_SX1276)
-// Define pin mappings BEFORE including ESP32Board.h so sleep() can use P_LORA_DIO_1
+#include <Wire.h>
 #include <Arduino.h>
 #include "XPowersLib.h"
 #include "helpers/ESP32Board.h"
 #include <driver/rtc_io.h>
 //#include <RadioLib.h>
 //#include <helpers/RadioLibWrappers.h>
 //#include <helpers/CustomSX1262Wrapper.h>
 //#include <helpers/CustomSX1276Wrapper.h>
 #ifdef TBEAM_SUPREME_SX1262
  // LoRa radio module pins for TBeam S3 Supreme SX1262
  #define  P_LORA_DIO_0   -1   //NC
@@ -81,13 +90,6 @@
 //   SX1276
 // };
 // Include headers AFTER pin definitions so ESP32Board::sleep() can use P_LORA_DIO_1
 #include <Wire.h>
 #include <Arduino.h>
 #include "XPowersLib.h"
 #include "helpers/ESP32Board.h"
 #include <driver/rtc_io.h>
 class TBeamBoard : public ESP32Board {
 XPowersLibInterface *PMU = NULL;
 //PhysicalLayer * pl;
--- a/src/helpers/nrf52/SerialBLEInterface.cpp
+++ b/src/helpers/nrf52/SerialBLEInterface.cpp
@@ -1,283 +1,156 @@
 #include "SerialBLEInterface.h"
 #include <stdio.h>
 #include <string.h>
 #include "ble_gap.h"
 #include "ble_hci.h"
-// Magic numbers came from actual testing
+static SerialBLEInterface* instance;
 #define BLE_HEALTH_CHECK_INTERVAL  10000  // Advertising watchdog check every 10 seconds
 #define BLE_RETRY_THROTTLE_MS      250    // Throttle retries to 250ms when queue buildup detected
 // Connection parameters (units: interval=1.25ms, timeout=10ms)
 #define BLE_MIN_CONN_INTERVAL      12     // 15ms
 #define BLE_MAX_CONN_INTERVAL      24     // 30ms
 #define BLE_SLAVE_LATENCY          4
 #define BLE_CONN_SUP_TIMEOUT       200    // 2000ms
 // Advertising parameters
 #define BLE_ADV_INTERVAL_MIN       32     // 20ms (units: 0.625ms)
 #define BLE_ADV_INTERVAL_MAX       244    // 152.5ms (units: 0.625ms)
 #define BLE_ADV_FAST_TIMEOUT       30     // seconds
 // RX drain buffer size for overflow protection
 #define BLE_RX_DRAIN_BUF_SIZE      32
 static SerialBLEInterface* instance = nullptr;
 void SerialBLEInterface::onConnect(uint16_t connection_handle) {
-  BLE_DEBUG_PRINTLN("SerialBLEInterface: connected handle=0x%04X", connection_handle);
+  BLE_DEBUG_PRINTLN("SerialBLEInterface: connected");
-  if (instance) {
+  // we now set _isDeviceConnected=true in onSecured callback instead
    instance->_conn_handle = connection_handle;
    instance->_isDeviceConnected = false;
    instance->clearBuffers();
  }
 }
 void SerialBLEInterface::onDisconnect(uint16_t connection_handle, uint8_t reason) {
-  BLE_DEBUG_PRINTLN("SerialBLEInterface: disconnected handle=0x%04X reason=%u", connection_handle, reason);
+  BLE_DEBUG_PRINTLN("SerialBLEInterface: disconnected reason=%d", reason);
  if(instance){
    if (instance->_conn_handle == connection_handle) {
      instance->_conn_handle = BLE_CONN_HANDLE_INVALID;
    instance->_isDeviceConnected = false;
-      instance->clearBuffers();
+    instance->startAdv();
    }
  }
 }
 void SerialBLEInterface::onSecured(uint16_t connection_handle) {
-  BLE_DEBUG_PRINTLN("SerialBLEInterface: onSecured handle=0x%04X", connection_handle);
+  BLE_DEBUG_PRINTLN("SerialBLEInterface: onSecured");
  if(instance){
    if (instance->isValidConnection(connection_handle, true)) {
    instance->_isDeviceConnected = true;
-      
+    // no need to stop advertising on connect, as the ble stack does this automatically
      // Connection interval units: 1.25ms, supervision timeout units: 10ms
      // Apple: "The product will not read or use the parameters in the Peripheral Preferred Connection Parameters characteristic."
      // So we explicitly set it here to make Android & Apple match
      ble_gap_conn_params_t conn_params;
      conn_params.min_conn_interval = BLE_MIN_CONN_INTERVAL;
      conn_params.max_conn_interval = BLE_MAX_CONN_INTERVAL;
      conn_params.slave_latency = BLE_SLAVE_LATENCY;
      conn_params.conn_sup_timeout = BLE_CONN_SUP_TIMEOUT;
      uint32_t err_code = sd_ble_gap_conn_param_update(connection_handle, &conn_params);
      if (err_code == NRF_SUCCESS) {
        BLE_DEBUG_PRINTLN("Connection parameter update requested: %u-%ums interval, latency=%u, %ums timeout",
                         conn_params.min_conn_interval * 5 / 4,  // convert to ms (1.25ms units)
                         conn_params.max_conn_interval * 5 / 4,
                         conn_params.slave_latency,
                         conn_params.conn_sup_timeout * 10);  // convert to ms (10ms units)
      } else {
        BLE_DEBUG_PRINTLN("Failed to request connection parameter update: %lu", err_code);
      }
    } else {
      BLE_DEBUG_PRINTLN("onSecured: ignoring stale/duplicate callback");
    }
  }
 }
-bool SerialBLEInterface::onPairingPasskey(uint16_t connection_handle, uint8_t const passkey[6], bool match_request) {
+void SerialBLEInterface::begin(const char* device_name, uint32_t pin_code) {
  (void)connection_handle;
  (void)passkey;
  BLE_DEBUG_PRINTLN("SerialBLEInterface: pairing passkey request match=%d", match_request);
  return true;
 }
 void SerialBLEInterface::onPairingComplete(uint16_t connection_handle, uint8_t auth_status) {
  BLE_DEBUG_PRINTLN("SerialBLEInterface: pairing complete handle=0x%04X status=%u", connection_handle, auth_status);
  if (instance) {
    if (instance->isValidConnection(connection_handle)) {
      if (auth_status == BLE_GAP_SEC_STATUS_SUCCESS) {
        BLE_DEBUG_PRINTLN("SerialBLEInterface: pairing successful");
      } else {
        BLE_DEBUG_PRINTLN("SerialBLEInterface: pairing failed, disconnecting");
        instance->disconnect();
      }
    } else {
      BLE_DEBUG_PRINTLN("onPairingComplete: ignoring stale callback");
    }
  }
 }
 void SerialBLEInterface::onBLEEvent(ble_evt_t* evt) {
  if (!instance) return;
  if (evt->header.evt_id == BLE_GAP_EVT_CONN_PARAM_UPDATE_REQUEST) {
    uint16_t conn_handle = evt->evt.gap_evt.conn_handle;
    if (instance->isValidConnection(conn_handle)) {
      BLE_DEBUG_PRINTLN("CONN_PARAM_UPDATE_REQUEST: handle=0x%04X, min_interval=%u, max_interval=%u, latency=%u, timeout=%u",
                       conn_handle,
                       evt->evt.gap_evt.params.conn_param_update_request.conn_params.min_conn_interval,
                       evt->evt.gap_evt.params.conn_param_update_request.conn_params.max_conn_interval,
                       evt->evt.gap_evt.params.conn_param_update_request.conn_params.slave_latency,
                       evt->evt.gap_evt.params.conn_param_update_request.conn_params.conn_sup_timeout);
      uint32_t err_code = sd_ble_gap_conn_param_update(conn_handle, NULL);
      if (err_code == NRF_SUCCESS) {
        BLE_DEBUG_PRINTLN("Accepted CONN_PARAM_UPDATE_REQUEST (using PPCP)");
      } else {
        BLE_DEBUG_PRINTLN("ERROR: Failed to accept CONN_PARAM_UPDATE_REQUEST: 0x%08X", err_code);
      }
    } else {
      BLE_DEBUG_PRINTLN("CONN_PARAM_UPDATE_REQUEST: ignoring stale callback for handle=0x%04X", conn_handle);
    }
  }
 }
 void SerialBLEInterface::begin(const char* prefix, char* name, uint32_t pin_code) {
  instance = this;
  char charpin[20];
-  snprintf(charpin, sizeof(charpin), "%lu", (unsigned long)pin_code);
+  sprintf(charpin, "%d", pin_code);
  // If we want to control BLE LED ourselves, uncomment this:
  // Bluefruit.autoConnLed(false);
  Bluefruit.configPrphBandwidth(BANDWIDTH_MAX);
-  Bluefruit.begin();
+  Bluefruit.configPrphConn(250, BLE_GAP_EVENT_LENGTH_MIN, 16, 16);  // increase MTU
  char dev_name[32+16];
  if (strcmp(name, "@@MAC") == 0) {
    ble_gap_addr_t addr;
    if (sd_ble_gap_addr_get(&addr) == NRF_SUCCESS) {
      sprintf(name, "%02X%02X%02X%02X%02X%02X",    // modify (IN-OUT param)
          addr.addr[5], addr.addr[4], addr.addr[3], addr.addr[2], addr.addr[1], addr.addr[0]);
    }
  }
  sprintf(dev_name, "%s%s", prefix, name);
  // Connection interval units: 1.25ms, supervision timeout units: 10ms
  ble_gap_conn_params_t ppcp_params;
  ppcp_params.min_conn_interval = BLE_MIN_CONN_INTERVAL;
  ppcp_params.max_conn_interval = BLE_MAX_CONN_INTERVAL;
  ppcp_params.slave_latency = BLE_SLAVE_LATENCY;
  ppcp_params.conn_sup_timeout = BLE_CONN_SUP_TIMEOUT;
  uint32_t err_code = sd_ble_gap_ppcp_set(&ppcp_params);
  if (err_code == NRF_SUCCESS) {
    BLE_DEBUG_PRINTLN("PPCP set: %u-%ums interval, latency=%u, %ums timeout",
                     ppcp_params.min_conn_interval * 5 / 4,  // convert to ms (1.25ms units)
                     ppcp_params.max_conn_interval * 5 / 4,
                     ppcp_params.slave_latency,
                     ppcp_params.conn_sup_timeout * 10);  // convert to ms (10ms units)
  } else {
    BLE_DEBUG_PRINTLN("Failed to set PPCP: %lu", err_code);
  }
  Bluefruit.setTxPower(BLE_TX_POWER);
-  Bluefruit.setName(dev_name);
+  Bluefruit.begin();
  Bluefruit.setName(device_name);
  Bluefruit.Security.setMITM(true);
  Bluefruit.Security.setPIN(charpin);
  Bluefruit.Security.setIOCaps(true, false, false);
  Bluefruit.Security.setPairPasskeyCallback(onPairingPasskey);
  Bluefruit.Security.setPairCompleteCallback(onPairingComplete);
  Bluefruit.Periph.setConnectCallback(onConnect);
  Bluefruit.Periph.setDisconnectCallback(onDisconnect);
  Bluefruit.Security.setSecuredCallback(onSecured);
-  Bluefruit.setEventCallback(onBLEEvent);
+  // To be consistent OTA DFU should be added first if it exists
  //bledfu.begin();
  // Configure and start the BLE Uart service
  bleuart.setPermission(SECMODE_ENC_WITH_MITM, SECMODE_ENC_WITH_MITM);
  bleuart.begin();
  bleuart.setRxCallback(onBleUartRX);
 }
 void SerialBLEInterface::startAdv() {
  BLE_DEBUG_PRINTLN("SerialBLEInterface: starting advertising");
  // clean restart if already advertising
  if(Bluefruit.Advertising.isRunning()){
    BLE_DEBUG_PRINTLN("SerialBLEInterface: already advertising, stopping to allow clean restart");
    Bluefruit.Advertising.stop();
  }
  Bluefruit.Advertising.clearData(); // clear advertising data
  Bluefruit.ScanResponse.clearData(); // clear scan response data
  // Advertising packet
  Bluefruit.Advertising.addFlags(BLE_GAP_ADV_FLAGS_LE_ONLY_GENERAL_DISC_MODE);
  Bluefruit.Advertising.addTxPower();
  // Include the BLE UART (AKA 'NUS') 128-bit UUID
  Bluefruit.Advertising.addService(bleuart);
  // Secondary Scan Response packet (optional)
  // Since there is no room for 'Name' in Advertising packet
  Bluefruit.ScanResponse.addName();
-  Bluefruit.Advertising.setInterval(BLE_ADV_INTERVAL_MIN, BLE_ADV_INTERVAL_MAX);
+  /* Start Advertising
-  Bluefruit.Advertising.setFastTimeout(BLE_ADV_FAST_TIMEOUT);
+   * - Enable auto advertising if disconnected
-
+   * - Interval:  fast mode = 20 ms, slow mode = 152.5 ms
-  Bluefruit.Advertising.restartOnDisconnect(true);
+   * - 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(false); // don't restart automatically as we handle it in onDisconnect
  Bluefruit.Advertising.setInterval(32, 244);
  Bluefruit.Advertising.setFastTimeout(30);      // number of seconds in fast mode
  Bluefruit.Advertising.start(0);                // 0 = Don't stop advertising after n seconds
 }
-void SerialBLEInterface::clearBuffers() {
+void SerialBLEInterface::stopAdv() {
-  send_queue_len = 0;
+
-  recv_queue_len = 0;
+  BLE_DEBUG_PRINTLN("SerialBLEInterface: stopping advertising");
-  _last_retry_attempt = 0;
+  
-  bleuart.flush();
+  // we only want to stop advertising if it's running, otherwise an invalid state error is logged by ble stack
  if(!Bluefruit.Advertising.isRunning()){
    return;
  }
-void SerialBLEInterface::shiftSendQueueLeft() {
+  // stop advertising
-  if (send_queue_len > 0) {
+  Bluefruit.Advertising.stop();
-    send_queue_len--;
+
    for (uint8_t i = 0; i < send_queue_len; i++) {
      send_queue[i] = send_queue[i + 1];
    }
  }
 }
-void SerialBLEInterface::shiftRecvQueueLeft() {
+// ---------- public methods
  if (recv_queue_len > 0) {
    recv_queue_len--;
    for (uint8_t i = 0; i < recv_queue_len; i++) {
      recv_queue[i] = recv_queue[i + 1];
    }
  }
 }
 bool SerialBLEInterface::isValidConnection(uint16_t handle, bool requireWaitingForSecurity) const {
  if (_conn_handle != handle) {
    return false;
  }
  BLEConnection* conn = Bluefruit.Connection(handle);
  if (conn == nullptr || !conn->connected()) {
    return false;
  }
  if (requireWaitingForSecurity && _isDeviceConnected) {
    return false;
  }
  return true;
 }
 bool SerialBLEInterface::isAdvertising() const {
  ble_gap_addr_t adv_addr;
  uint32_t err_code = sd_ble_gap_adv_addr_get(0, &adv_addr);
  return (err_code == NRF_SUCCESS);
 }
 void SerialBLEInterface::enable() { 
  if (_isEnabled) return;
  _isEnabled = true;
  clearBuffers();
  _last_health_check = millis();
-  Bluefruit.Advertising.start(0);
+  // Start advertising
-}
+  startAdv();
 void SerialBLEInterface::disconnect() {
  if (_conn_handle != BLE_CONN_HANDLE_INVALID) {
    sd_ble_gap_disconnect(_conn_handle, BLE_HCI_REMOTE_USER_TERMINATED_CONNECTION);
  }
 }
 void SerialBLEInterface::disable() {
  _isEnabled = false;
-  BLE_DEBUG_PRINTLN("SerialBLEInterface: disable");
+  BLE_DEBUG_PRINTLN("SerialBLEInterface::disable");
-  disconnect();
+#ifdef RAK_BOARD
  Bluefruit.disconnect(Bluefruit.connHandle());
 #else
  uint16_t conn_id;
  if (Bluefruit.getConnectedHandles(&conn_id, 1) > 0) {
    Bluefruit.disconnect(conn_id);
  }
 #endif
  Bluefruit.Advertising.restartOnDisconnect(false);
  Bluefruit.Advertising.stop();
-  _last_health_check = 0;
+  Bluefruit.Advertising.clearData();
  stopAdv();
 }
 size_t SerialBLEInterface::writeFrame(const uint8_t src[], size_t len) {
  if (len > MAX_FRAME_SIZE) {
-    BLE_DEBUG_PRINTLN("writeFrame(), frame too big, len=%u", (unsigned)len);
+    BLE_DEBUG_PRINTLN("writeFrame(), frame too big, len=%d", len);
    return 0;
  }
-  bool connected = isConnected();
+  if (_isDeviceConnected && len > 0) {
  if (connected && len > 0) {
    if (send_queue_len >= FRAME_QUEUE_SIZE) {
      BLE_DEBUG_PRINTLN("writeFrame(), send_queue is full!");
      return 0;
    }
-    send_queue[send_queue_len].len = len;
+    send_queue[send_queue_len].len = len;  // add to send queue
    memcpy(send_queue[send_queue_len].buf, src, len);
    send_queue_len++;
@@ -286,112 +159,35 @@ size_t SerialBLEInterface::writeFrame(const uint8_t src[], size_t len) {
  return 0;
 }
 #define  BLE_WRITE_MIN_INTERVAL   60
 bool SerialBLEInterface::isWriteBusy() const {
  return millis() < _last_write + BLE_WRITE_MIN_INTERVAL;   // still too soon to start another write?
 }
 size_t SerialBLEInterface::checkRecvFrame(uint8_t dest[]) {
-  if (send_queue_len > 0) {
+  if (send_queue_len > 0   // first, check send queue
-    if (!isConnected()) {
+    && millis() >= _last_write + BLE_WRITE_MIN_INTERVAL    // space the writes apart
-      BLE_DEBUG_PRINTLN("writeBytes: connection invalid, clearing send queue");
+  ) {
-      send_queue_len = 0;
+    _last_write = millis();
    bleuart.write(send_queue[0].buf, send_queue[0].len);
    BLE_DEBUG_PRINTLN("writeBytes: sz=%d, hdr=%d", (uint32_t)send_queue[0].len, (uint32_t) send_queue[0].buf[0]);
    send_queue_len--;
    for (int i = 0; i < send_queue_len; i++) {   // delete top item from queue
      send_queue[i] = send_queue[i + 1];
    }
  } else {
-      unsigned long now = millis();
+    int len = bleuart.available();
-      bool throttle_active = (_last_retry_attempt > 0 && (now - _last_retry_attempt) < BLE_RETRY_THROTTLE_MS);
+    if (len > 0) {
-
+      bleuart.readBytes(dest, len);
-      if (!throttle_active) {
+      BLE_DEBUG_PRINTLN("readBytes: sz=%d, hdr=%d", len, (uint32_t) dest[0]);
        Frame frame_to_send = send_queue[0];
        size_t written = bleuart.write(frame_to_send.buf, frame_to_send.len);
        if (written == frame_to_send.len) {
          BLE_DEBUG_PRINTLN("writeBytes: sz=%u, hdr=%u", (unsigned)frame_to_send.len, (unsigned)frame_to_send.buf[0]);
          _last_retry_attempt = 0;
          shiftSendQueueLeft();
        } else if (written > 0) {
          BLE_DEBUG_PRINTLN("writeBytes: partial write, sent=%u of %u, dropping corrupted frame", (unsigned)written, (unsigned)frame_to_send.len);
          _last_retry_attempt = 0;
          shiftSendQueueLeft();
        } else {
          if (!isConnected()) {
            BLE_DEBUG_PRINTLN("writeBytes failed: connection lost, dropping frame");
            _last_retry_attempt = 0;
            shiftSendQueueLeft();
          } else {
            BLE_DEBUG_PRINTLN("writeBytes failed (buffer full), keeping frame for retry");
            _last_retry_attempt = now;
          }
        }
      }
    }
  }
  if (recv_queue_len > 0) {
    size_t len = recv_queue[0].len;
    memcpy(dest, recv_queue[0].buf, len);
    BLE_DEBUG_PRINTLN("readBytes: sz=%u, hdr=%u", (unsigned)len, (unsigned)dest[0]);
    shiftRecvQueueLeft();
      return len;
    }
  // Advertising watchdog: periodically check if advertising is running, restart if not
  // Only run when truly disconnected (no connection handle), not during connection establishment
  unsigned long now = millis();
  if (_isEnabled && !isConnected() && _conn_handle == BLE_CONN_HANDLE_INVALID) {
    if (now - _last_health_check >= BLE_HEALTH_CHECK_INTERVAL) {
      _last_health_check = now;
      if (!isAdvertising()) {
        BLE_DEBUG_PRINTLN("SerialBLEInterface: advertising watchdog - advertising stopped, restarting");
        Bluefruit.Advertising.start(0);
  }
    }
  }
  return 0;
 }
 void SerialBLEInterface::onBleUartRX(uint16_t conn_handle) {
  if (!instance) {
    return;
  }
  if (instance->_conn_handle != conn_handle || !instance->isConnected()) {
    while (instance->bleuart.available() > 0) {
      instance->bleuart.read();
    }
    return;
  }
  while (instance->bleuart.available() > 0) {
    if (instance->recv_queue_len >= FRAME_QUEUE_SIZE) {
      while (instance->bleuart.available() > 0) {
        instance->bleuart.read();
      }
      BLE_DEBUG_PRINTLN("onBleUartRX: recv queue full, dropping data");
      break;
    }
    int avail = instance->bleuart.available();
    if (avail > MAX_FRAME_SIZE) {
      BLE_DEBUG_PRINTLN("onBleUartRX: WARN: BLE RX overflow, avail=%d, draining all", avail);
      uint8_t drain_buf[BLE_RX_DRAIN_BUF_SIZE];
      while (instance->bleuart.available() > 0) {
        int chunk = instance->bleuart.available() > BLE_RX_DRAIN_BUF_SIZE ? BLE_RX_DRAIN_BUF_SIZE : instance->bleuart.available();
        instance->bleuart.readBytes(drain_buf, chunk);
      }
      continue;
    }
    int read_len = avail;
    instance->recv_queue[instance->recv_queue_len].len = read_len;
    instance->bleuart.readBytes(instance->recv_queue[instance->recv_queue_len].buf, read_len);
    instance->recv_queue_len++;
  }
 }
 bool SerialBLEInterface::isConnected() const {
-  return _isDeviceConnected && Bluefruit.connected() > 0;
+  return _isDeviceConnected;
 }
 bool SerialBLEInterface::isWriteBusy() const {
  return send_queue_len >= (FRAME_QUEUE_SIZE * 2 / 3);
 }
--- a/src/helpers/nrf52/SerialBLEInterface.h
+++ b/src/helpers/nrf52/SerialBLEInterface.h
@@ -11,60 +11,41 @@ class SerialBLEInterface : public BaseSerialInterface {
  BLEUart bleuart;
  bool _isEnabled;
  bool _isDeviceConnected;
-  uint16_t _conn_handle;
+  unsigned long _last_write;
  unsigned long _last_health_check;
  unsigned long _last_retry_attempt;
  struct Frame {
    uint8_t len;
    uint8_t buf[MAX_FRAME_SIZE];
  };
-  #define FRAME_QUEUE_SIZE  12
+  #define FRAME_QUEUE_SIZE  4
-  
+  int send_queue_len;
  uint8_t send_queue_len;
  Frame send_queue[FRAME_QUEUE_SIZE];
-  uint8_t recv_queue_len;
+  void clearBuffers() { send_queue_len = 0; }
  Frame recv_queue[FRAME_QUEUE_SIZE];
  void clearBuffers();
  void shiftSendQueueLeft();
  void shiftRecvQueueLeft();
  bool isValidConnection(uint16_t handle, bool requireWaitingForSecurity = false) const;
  bool isAdvertising() const;
  static void onConnect(uint16_t connection_handle);
  static void onDisconnect(uint16_t connection_handle, uint8_t reason);
  static void onSecured(uint16_t connection_handle);
  static bool onPairingPasskey(uint16_t connection_handle, uint8_t const passkey[6], bool match_request);
  static void onPairingComplete(uint16_t connection_handle, uint8_t auth_status);
  static void onBLEEvent(ble_evt_t* evt);
  static void onBleUartRX(uint16_t conn_handle);
 public:
  SerialBLEInterface() {
    _isEnabled = false;
    _isDeviceConnected = false;
-    _conn_handle = BLE_CONN_HANDLE_INVALID;
+    _last_write = 0;
    _last_health_check = 0;
    _last_retry_attempt = 0;
    send_queue_len = 0;
    recv_queue_len = 0;
  }
-  /**
+  void startAdv();
-   * init the BLE interface.
+  void stopAdv();
-   * @param prefix   a prefix for the device name
+  void begin(const char* device_name, uint32_t pin_code);
   * @param name  IN/OUT - a name for the device (combined with prefix). If "@@MAC", is modified and returned
   * @param pin_code   the BLE security pin
   */
  void begin(const char* prefix, char* name, uint32_t pin_code);
-  void disconnect();
+  // BaseSerialInterface methods
  void enable() override;
  void disable() override;
  bool isEnabled() const override { return _isEnabled; }
  bool isConnected() const override;
  bool isWriteBusy() const override;
  size_t writeFrame(const uint8_t src[], size_t len) override;
  size_t checkRecvFrame(uint8_t dest[]) override;
--- a/src/helpers/radiolib/CustomLR1110.h
+++ b/src/helpers/radiolib/CustomLR1110.h
@@ -10,7 +10,7 @@ class CustomLR1110 : public LR1110 {
    size_t getPacketLength(bool update) override {
      size_t len = LR1110::getPacketLength(update);
      if (len == 0 && getIrqStatus() & RADIOLIB_LR11X0_IRQ_HEADER_ERR) {
-        // we've just received a corrupted packet
+        // we've just recieved a corrupted packet
        // this may have triggered a bug causing subsequent packets to be shifted
        // call standby() to return radio to known-good state
        // recvRaw will call startReceive() to restart rx
--- a/src/helpers/radiolib/RadioLibWrappers.cpp
+++ b/src/helpers/radiolib/RadioLibWrappers.cpp
@@ -137,7 +137,6 @@ bool RadioLibWrapper::startSendRaw(const uint8_t* bytes, int len) {
  }
  MESH_DEBUG_PRINTLN("RadioLibWrapper: error: startTransmit(%d)", err);
  idle();   // trigger another startRecv()
  _board->onAfterTransmit();
  return false;
 }
--- a/src/helpers/sensors/EnvironmentSensorManager.cpp
+++ b/src/helpers/sensors/EnvironmentSensorManager.cpp
@@ -42,7 +42,7 @@ static Adafruit_BME280 BME280;
 #endif
 #define TELEM_BMP280_SEALEVELPRESSURE_HPA (1013.25)    // Athmospheric pressure at sea level
 #include <Adafruit_BMP280.h>
-static Adafruit_BMP280 BMP280(TELEM_WIRE);
+static Adafruit_BMP280 BMP280;
 #endif
 #if ENV_INCLUDE_SHTC3
@@ -58,7 +58,6 @@ static SensirionI2cSht4x SHT4X;
 #if ENV_INCLUDE_LPS22HB
 #include <Arduino_LPS22HB.h>
 LPS22HBClass LPS22HB(*TELEM_WIRE);
 #endif
 #if ENV_INCLUDE_INA3221
@@ -193,13 +192,6 @@ bool EnvironmentSensorManager::begin() {
  if (BME280.begin(TELEM_BME280_ADDRESS, TELEM_WIRE)) {
    MESH_DEBUG_PRINTLN("Found BME280 at address: %02X", TELEM_BME280_ADDRESS);
    MESH_DEBUG_PRINTLN("BME sensor ID: %02X", BME280.sensorID());
    // Reduce self-heating: single-shot conversions, light oversampling, long standby.
    BME280.setSampling(Adafruit_BME280::MODE_FORCED,
                       Adafruit_BME280::SAMPLING_X1,   // temperature
                       Adafruit_BME280::SAMPLING_X1,   // pressure
                       Adafruit_BME280::SAMPLING_X1,   // humidity
                       Adafruit_BME280::FILTER_OFF,
                       Adafruit_BME280::STANDBY_MS_1000);
    BME280_initialized = true;
  } else {
    BME280_initialized = false;
@@ -219,7 +211,7 @@ bool EnvironmentSensorManager::begin() {
  #endif
  #if ENV_INCLUDE_SHTC3
-  if (SHTC3.begin(TELEM_WIRE)) {
+  if (SHTC3.begin()) {
    MESH_DEBUG_PRINTLN("Found sensor: SHTC3");
    SHTC3_initialized = true;
  } else {
@@ -244,7 +236,7 @@ bool EnvironmentSensorManager::begin() {
  #endif
  #if ENV_INCLUDE_LPS22HB
-  if (LPS22HB.begin()) {
+  if (BARO.begin()) {
    MESH_DEBUG_PRINTLN("Found sensor: LPS22HB");
    LPS22HB_initialized = true;
  } else {
@@ -367,13 +359,11 @@ bool EnvironmentSensorManager::querySensors(uint8_t requester_permissions, Cayen
    #if ENV_INCLUDE_BME280
    if (BME280_initialized) {
      if (BME280.takeForcedMeasurement()) {  // trigger a fresh reading in forced mode
      telemetry.addTemperature(TELEM_CHANNEL_SELF, BME280.readTemperature());
      telemetry.addRelativeHumidity(TELEM_CHANNEL_SELF, BME280.readHumidity());
      telemetry.addBarometricPressure(TELEM_CHANNEL_SELF, BME280.readPressure()/100);
      telemetry.addAltitude(TELEM_CHANNEL_SELF, BME280.readAltitude(TELEM_BME280_SEALEVELPRESSURE_HPA));
    }
    }
    #endif
    #if ENV_INCLUDE_BMP280
@@ -408,8 +398,8 @@ bool EnvironmentSensorManager::querySensors(uint8_t requester_permissions, Cayen
    #if ENV_INCLUDE_LPS22HB
    if (LPS22HB_initialized) {
-      telemetry.addTemperature(TELEM_CHANNEL_SELF, LPS22HB.readTemperature());
+      telemetry.addTemperature(TELEM_CHANNEL_SELF, BARO.readTemperature());
-      telemetry.addBarometricPressure(TELEM_CHANNEL_SELF, LPS22HB.readPressure() * 10); // convert kPa to hPa
+      telemetry.addBarometricPressure(TELEM_CHANNEL_SELF, BARO.readPressure());
    }
    #endif
@@ -531,15 +521,6 @@ bool EnvironmentSensorManager::setSettingValue(const char* name, const char* val
    }
    return true;
  }
  if (strcmp(name, "gps_interval") == 0) {
    uint32_t interval_seconds = atoi(value);
    if (interval_seconds > 0) {
      gps_update_interval_sec = interval_seconds;
    } else {
      gps_update_interval_sec = 1;  // Default to 1 second if 0
    }
    return true;
  }
  #endif
  return false;  // not supported
 }
@@ -616,7 +597,6 @@ void EnvironmentSensorManager::rakGPSInit(){
    MESH_DEBUG_PRINTLN("No GPS found");
    gps_active = false;
    gps_detected = false;
    Serial1.end();
    return;
  }
@@ -655,7 +635,8 @@ bool EnvironmentSensorManager::gpsIsAwake(uint8_t ioPin){
    _location = &RAK12500_provider;
    return true;
-  } else if (Serial1.available()) {
+  }
  else if(Serial1){
    MESH_DEBUG_PRINTLN("Serial GPS init correctly and is turned on");
    if(PIN_GPS_EN){
      gpsResetPin = PIN_GPS_EN;
@@ -665,8 +646,6 @@ bool EnvironmentSensorManager::gpsIsAwake(uint8_t ioPin){
    gps_detected = true;
    return true;
  }
  pinMode(ioPin, INPUT);
  MESH_DEBUG_PRINTLN("GPS did not init with this IO pin... try the next");
  return false;
 }
@@ -708,8 +687,8 @@ void EnvironmentSensorManager::loop() {
  #if ENV_INCLUDE_GPS
  _location->loop();
  if (millis() > next_gps_update) {
  if (millis() > next_gps_update) {
    if(gps_active){
    #ifdef RAK_WISBLOCK_GPS
    if ((i2cGPSFlag || serialGPSFlag) && _location->isValid()) {
@@ -729,7 +708,7 @@ void EnvironmentSensorManager::loop() {
    }
    #endif
    }
-    next_gps_update = millis() + (gps_update_interval_sec * 1000);
+    next_gps_update = millis() + 1000;
  }
  #endif
 }
--- a/src/helpers/sensors/EnvironmentSensorManager.h
+++ b/src/helpers/sensors/EnvironmentSensorManager.h
@@ -25,7 +25,6 @@ protected:
  bool gps_detected = false;
  bool gps_active = false;
  uint32_t gps_update_interval_sec = 1;  // Default 1 second
  #if ENV_INCLUDE_GPS
  LocationProvider* _location;
--- a/src/helpers/sensors/LPPDataHelpers.h
+++ b/src/helpers/sensors/LPPDataHelpers.h
@@ -113,7 +113,7 @@ public:
    return _pos <= _len;
  }
  bool readCurrent(float& amps) {
-    amps = getFloat(&_buf[_pos], 2, 1000, true); _pos += 2;
+    amps = getFloat(&_buf[_pos], 2, 1000, false); _pos += 2;
    return _pos <= _len;
  }
  bool readPower(float& watts) {
--- a/src/helpers/ui/ST7789LCDDisplay.cpp
+++ b/src/helpers/ui/ST7789LCDDisplay.cpp
@@ -23,13 +23,9 @@ bool ST7789LCDDisplay::begin() {
  if (!_isOn) {
    if (_peripher_power) _peripher_power->claim();
    if (PIN_TFT_LEDA_CTL != -1) {
    pinMode(PIN_TFT_LEDA_CTL, OUTPUT);
    digitalWrite(PIN_TFT_LEDA_CTL, HIGH);
    }
    if (PIN_TFT_RST != -1) {
    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.
    #ifdef LILYGO_TDECK
@@ -58,15 +54,9 @@ void ST7789LCDDisplay::turnOn() {
 void ST7789LCDDisplay::turnOff() {
  if (_isOn) {
    if (PIN_TFT_LEDA_CTL != -1) {
    digitalWrite(PIN_TFT_LEDA_CTL, HIGH);
    }
    if (PIN_TFT_RST != -1) {
    digitalWrite(PIN_TFT_RST, LOW);
    }
    if (PIN_TFT_LEDA_CTL != -1) {
    digitalWrite(PIN_TFT_LEDA_CTL, LOW);
    }
    _isOn = false;
    if (_peripher_power) _peripher_power->release();
--- 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/variants/heltec_mesh_solar/MeshSolarBoard.cpp
+++ b/variants/heltec_mesh_solar/MeshSolarBoard.cpp
@@ -1,10 +1,28 @@
 #include <Arduino.h>
 #include <Wire.h>
 #include "MeshSolarBoard.h"
 #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 MeshSolarBoard::begin() {
-  NRF52Board::begin();
+  // for future use, sub-classes SHOULD call this from their begin()
  startup_reason = BD_STARTUP_NORMAL;
  meshSolarStart();
@@ -14,3 +32,46 @@ void MeshSolarBoard::begin() {
  Wire.begin();
 }
 bool MeshSolarBoard::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("MESH_SOLAR_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;
 }
--- a/variants/heltec_mesh_solar/MeshSolarBoard.h
+++ b/variants/heltec_mesh_solar/MeshSolarBoard.h
@@ -2,7 +2,6 @@
 #include <MeshCore.h>
 #include <Arduino.h>
 #include <helpers/NRF52Board.h>
 #ifdef HELTEC_MESH_SOLAR
 #include "meshSolarApp.h"
@@ -20,10 +19,14 @@
 #define SX126X_DIO2_AS_RF_SWITCH  true
 #define SX126X_DIO3_TCXO_VOLTAGE   1.8
-class MeshSolarBoard : public NRF52BoardOTA {
+
 class MeshSolarBoard : public mesh::MainBoard {
 protected:
  uint8_t startup_reason;
 public:
  MeshSolarBoard() : NRF52BoardOTA("MESH_SOLAR_OTA") {}
  void begin();
  uint8_t getStartupReason() const override { return startup_reason; }
  uint16_t getBattMilliVolts() override {
    return meshSolarGetBattVoltage();
@@ -32,4 +35,10 @@ public:
  const char* getManufacturerName() const override {
    return "Heltec Mesh Solar";
  }
  void reboot() override {
    NVIC_SystemReset();
  }
  bool startOTAUpdate(const char* id, char reply[]) override;
 };
--- a/variants/heltec_t114/T114Board.cpp
+++ b/variants/heltec_t114/T114Board.cpp
@@ -2,38 +2,25 @@
 #include <Arduino.h>
 #include <Wire.h>
 #include <bluefruit.h>
-#ifdef NRF52_POWER_MANAGEMENT
+static BLEDfu bledfu;
 // Static configuration for power management
 // Values come from variant.h defines
 const PowerMgtConfig power_config = {
  .lpcomp_ain_channel = PWRMGT_LPCOMP_AIN,
  .lpcomp_refsel = PWRMGT_LPCOMP_REFSEL,
  .voltage_bootlock = PWRMGT_VOLTAGE_BOOTLOCK
 };
-void T114Board::initiateShutdown(uint8_t reason) {
+static void connect_callback(uint16_t conn_handle) {
-#if ENV_INCLUDE_GPS == 1
+  (void)conn_handle;
-  pinMode(GPS_EN, OUTPUT);
+  MESH_DEBUG_PRINTLN("BLE client connected");
  digitalWrite(GPS_EN, LOW);
 #endif
  digitalWrite(SX126X_POWER_EN, LOW);
  bool enable_lpcomp = (reason == SHUTDOWN_REASON_LOW_VOLTAGE ||
                        reason == SHUTDOWN_REASON_BOOT_PROTECT);
  pinMode(PIN_BAT_CTL, OUTPUT);
  digitalWrite(PIN_BAT_CTL, enable_lpcomp ? HIGH : LOW);
  if (enable_lpcomp) {
    configureVoltageWake(power_config.lpcomp_ain_channel, power_config.lpcomp_refsel);
 }
-  enterSystemOff(reason);
+static void disconnect_callback(uint16_t conn_handle, uint8_t reason) {
  (void)conn_handle;
  (void)reason;
  MESH_DEBUG_PRINTLN("BLE client disconnected");
 }
 #endif // NRF52_POWER_MANAGEMENT
 void T114Board::begin() {
-  NRF52Board::begin();
+  // for future use, sub-classes SHOULD call this from their begin()
  startup_reason = BD_STARTUP_NORMAL;
  NRF_POWER->DCDCEN = 1;
  pinMode(PIN_VBAT_READ, INPUT);
@@ -50,11 +37,49 @@ void T114Board::begin() {
 #endif
  pinMode(SX126X_POWER_EN, OUTPUT);
 #ifdef NRF52_POWER_MANAGEMENT
  // Boot voltage protection check (may not return if voltage too low)
  // We need to call this after we configure SX126X_POWER_EN as output but before we pull high
  checkBootVoltage(&power_config);
 #endif
  digitalWrite(SX126X_POWER_EN, HIGH);
  delay(10); // give sx1262 some time to power up
 }
 bool T114Board::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("T114_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;
 }
--- a/variants/heltec_t114/T114Board.h
+++ b/variants/heltec_t114/T114Board.h
@@ -2,22 +2,19 @@
 #include <MeshCore.h>
 #include <Arduino.h>
 #include <helpers/NRF52Board.h>
 // built-ins
 #define  PIN_VBAT_READ    4
 #define  PIN_BAT_CTL      6
 #define  MV_LSB   (3000.0F / 4096.0F) // 12-bit ADC with 3.0V input range
-class T114Board : public NRF52BoardOTA {
+class T114Board : public mesh::MainBoard {
 protected:
-#ifdef NRF52_POWER_MANAGEMENT
+  uint8_t startup_reason;
  void initiateShutdown(uint8_t reason) override;
 #endif
 public:
    T114Board() : NRF52BoardOTA("T114_OTA") {}
  void begin();
  uint8_t getStartupReason() const override { return startup_reason; }
 #if defined(P_LORA_TX_LED)
  void onBeforeTransmit() override {
@@ -46,6 +43,10 @@ public:
    return "Heltec T114";
  }
  void reboot() override {
    NVIC_SystemReset();
  }
  void powerOff() override {
    #ifdef LED_PIN
    digitalWrite(LED_PIN, HIGH);
@@ -56,4 +57,6 @@ public:
    #endif
    sd_power_system_off();
  }
  bool startOTAUpdate(const char* id, char reply[]) override;
 };
--- a/variants/heltec_t114/platformio.ini
+++ b/variants/heltec_t114/platformio.ini
@@ -11,7 +11,6 @@ build_flags = ${nrf52_base.build_flags}
  -I variants/heltec_t114
  -I src/helpers/ui
  -D HELTEC_T114
  -D NRF52_POWER_MANAGEMENT
  -D P_LORA_DIO_1=20
  -D P_LORA_NSS=24
  -D P_LORA_RESET=25
@@ -60,25 +59,6 @@ build_flags =
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 [env:Heltec_t114_without_display_repeater_bridge_rs232]
 extends = Heltec_t114
 build_flags =
  ${Heltec_t114.build_flags}
  -D ADVERT_NAME='"RS232 Bridge"'
  -D ADVERT_LAT=0.0
  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
  -D MAX_NEIGHBOURS=50
  -D WITH_RS232_BRIDGE=Serial2
  -D WITH_RS232_BRIDGE_RX=9
  -D WITH_RS232_BRIDGE_TX=10
 ;  -D BRIDGE_DEBUG=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_t114.build_src_filter}
  +<helpers/bridges/RS232Bridge.cpp>
  +<../examples/simple_repeater>
 [env:Heltec_t114_without_display_room_server]
 extends = Heltec_t114
 build_src_filter = ${Heltec_t114.build_src_filter}
@@ -171,25 +151,6 @@ build_flags =
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 [env:Heltec_t114_repeater_bridge_rs232]
 extends = Heltec_t114
 build_flags =
  ${Heltec_t114.build_flags}
  -D ADVERT_NAME='"RS232 Bridge"'
  -D ADVERT_LAT=0.0
  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
  -D MAX_NEIGHBOURS=50
  -D WITH_RS232_BRIDGE=Serial2
  -D WITH_RS232_BRIDGE_RX=9
  -D WITH_RS232_BRIDGE_TX=10
 ;  -D BRIDGE_DEBUG=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_t114_with_display.build_src_filter}
  +<helpers/bridges/RS232Bridge.cpp>
  +<../examples/simple_repeater>
 [env:Heltec_t114_room_server]
 extends = Heltec_t114_with_display
 build_src_filter = ${Heltec_t114_with_display.build_src_filter}
--- a/variants/heltec_t114/variant.h
+++ b/variants/heltec_t114/variant.h
@@ -30,14 +30,6 @@
 #define AREF_VOLTAGE            (3.0)
 // Power management boot protection threshold (millivolts)
 // Set to 0 to disable boot protection
 #define PWRMGT_VOLTAGE_BOOTLOCK 3300   // Won't boot below this voltage (mV)
 // LPCOMP wake configuration (voltage recovery from SYSTEMOFF)
 // AIN2 = P0.04 = BATTERY_PIN / PIN_VBAT_READ
 #define PWRMGT_LPCOMP_AIN 2
 #define PWRMGT_LPCOMP_REFSEL 1  // 2/8 VDD (~3.68-4.04V)
 ////////////////////////////////////////////////////////////////////////////////
 // Number of pins
@@ -58,8 +50,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 // I2C pin definition
-#define PIN_WIRE_SDA            (16)             // P0.16
+#define PIN_WIRE_SDA            (26)             // P0.26
-#define PIN_WIRE_SCL            (13)             // P0.13
+#define PIN_WIRE_SCL            (27)             // P0.27
 ////////////////////////////////////////////////////////////////////////////////
 // SPI pin definition
--- a/variants/heltec_tracker_v2/platformio.ini
+++ b/variants/heltec_tracker_v2/platformio.ini
@@ -185,7 +185,6 @@ build_flags =
  -D WIFI_DEBUG_LOGGING=1
  -D WIFI_SSID='"myssid"'
  -D WIFI_PWD='"mypwd"'
  -D OFFLINE_QUEUE_SIZE=256  
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_tracker_v2.build_src_filter}
--- a/variants/heltec_v2/platformio.ini
+++ b/variants/heltec_v2/platformio.ini
@@ -183,7 +183,6 @@ build_flags =
  -D WIFI_DEBUG_LOGGING=1
  -D WIFI_SSID='"myssid"'
  -D WIFI_PWD='"mypwd"'
  -D OFFLINE_QUEUE_SIZE=256  
 ; -D MESH_PACKET_LOGGING=1
 ; -D MESH_DEBUG=1
 build_src_filter = ${Heltec_lora32_v2.build_src_filter}
--- a/variants/heltec_v3/platformio.ini
+++ b/variants/heltec_v3/platformio.ini
@@ -189,7 +189,6 @@ build_flags =
  -D WIFI_DEBUG_LOGGING=1
  -D WIFI_SSID='"myssid"'
  -D WIFI_PWD='"mypwd"'
  -D OFFLINE_QUEUE_SIZE=256
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_lora32_v3.build_src_filter}
@@ -323,7 +322,7 @@ lib_deps =
 extends = Heltec_lora32_v3
 build_flags =
  ${Heltec_lora32_v3.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=140
  -D MAX_GROUP_CHANNELS=40
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
@@ -342,7 +341,6 @@ build_flags =
  -D WIFI_DEBUG_LOGGING=1
  -D WIFI_SSID='"myssid"'
  -D WIFI_PWD='"mypwd"'
  -D OFFLINE_QUEUE_SIZE=256
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_lora32_v3.build_src_filter}
--- a/variants/heltec_v4/platformio.ini
+++ b/variants/heltec_v4/platformio.ini
@@ -176,7 +176,6 @@ build_flags =
  -D WIFI_DEBUG_LOGGING=1
  -D WIFI_SSID='"myssid"'
  -D WIFI_PWD='"mypwd"'
  -D OFFLINE_QUEUE_SIZE=256
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_lora32_v4.build_src_filter}
--- a/variants/heltec_wireless_paper/platformio.ini
+++ b/variants/heltec_wireless_paper/platformio.ini
@@ -5,7 +5,7 @@ build_flags =
  ${esp32_base.build_flags}
  -I variants/heltec_wireless_paper
  -D HELTEC_WIRELESS_PAPER
-  ;-D ARDUINO_USB_CDC_ON_BOOT=1      ; this breaks Serial
+  -D ARDUINO_USB_CDC_ON_BOOT=1      ; need for Serial
  -D P_LORA_DIO_1=14
  -D P_LORA_NSS=8
  -D P_LORA_RESET=RADIOLIB_NC
@@ -17,8 +17,8 @@ build_flags =
  -D WRAPPER_CLASS=CustomSX1262Wrapper
  -D LORA_TX_POWER=22
  -D P_LORA_TX_LED=18
-  ;-D PIN_BOARD_SDA=17
+  -D PIN_BOARD_SDA=17
-  ;-D PIN_BOARD_SCL=18               ; same GPIO as P_LORA_TX_LED
+  -D PIN_BOARD_SCL=18
  -D PIN_USER_BTN=0
  -D PIN_VEXT_EN=45
  -D PIN_VBAT_READ=20
--- a/variants/ikoka_handheld_nrf/IkokaNrf52Board.cpp
+++ b/variants/ikoka_handheld_nrf/IkokaNrf52Board.cpp
@@ -2,11 +2,27 @@
 #include <Arduino.h>
 #include <Wire.h>
 #include <bluefruit.h>
 #include "IkokaNrf52Board.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 IkokaNrf52Board::begin() {
-  NRF52Board::begin();
+  // for future use, sub-classes SHOULD call this from their begin()
  startup_reason = BD_STARTUP_NORMAL;
  // ensure we have pull ups on the screen i2c, this isn't always available
  // in hardware and it should only be 20k ohms. Disable the pullups if we
@@ -37,4 +53,48 @@ void IkokaNrf52Board::begin() {
  delay(10); // give sx1262 some time to power up
 }
 bool IkokaNrf52Board::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("XIAO_NRF52_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/ikoka_handheld_nrf/IkokaNrf52Board.h
+++ b/variants/ikoka_handheld_nrf/IkokaNrf52Board.h
@@ -1,15 +1,17 @@
 #pragma once
 #include <Arduino.h>
 #include <MeshCore.h>
-#include <helpers/NRF52Board.h>
+#include <Arduino.h>
 #ifdef IKOKA_NRF52
-class IkokaNrf52Board : public NRF52BoardOTA {
+class IkokaNrf52Board : public mesh::MainBoard {
 protected:
  uint8_t startup_reason;
 public:
  IkokaNrf52Board() : NRF52BoardOTA("XIAO_NRF52_OTA") {}
  void begin();
  uint8_t getStartupReason() const override { return startup_reason; }
 #if defined(P_LORA_TX_LED)
  void onBeforeTransmit() override {
@@ -39,6 +41,12 @@ public:
  const char* getManufacturerName() const override {
    return "Ikoka Handheld E22 30dBm (Xiao_nrf52)";
  }
  void reboot() override {
    NVIC_SystemReset();
  }
  bool startOTAUpdate(const char* id, char reply[]) override;
 };
 #endif
--- a/variants/ikoka_handheld_nrf/platformio.ini
+++ b/variants/ikoka_handheld_nrf/platformio.ini
@@ -1,5 +1,8 @@
-[ikoka_handheld_nrf]
+[ikoka_nrf52]
-extends = nrf52_base
+extends = Xiao_nrf52
 lib_deps = ${nrf52_base.lib_deps}
  ${sensor_base.lib_deps}
  densaugeo/base64 @ ~1.4.0  
 build_flags = ${nrf52_base.build_flags}
  ${sensor_base.build_flags}
  -I lib/nrf52/s140_nrf52_7.3.0_API/include
@@ -23,15 +26,12 @@ build_flags = ${nrf52_base.build_flags}
 build_src_filter = ${nrf52_base.build_src_filter}
  +<../variants/ikoka_handheld_nrf>
  +<helpers/sensors>
 lib_deps = ${nrf52_base.lib_deps}
  ${sensor_base.lib_deps}
  densaugeo/base64 @ ~1.4.0
 # larger screen has a different driver, this is for the 0.96 inch
-[ikoka_handheld_nrf_ssd1306_companion]
+[ikoka_nrf52_ssd1306_companion]
-lib_deps = ${ikoka_handheld_nrf.lib_deps}
+lib_deps = ${ikoka_nrf52.lib_deps}
  adafruit/Adafruit SSD1306 @ ^2.5.13
-build_flags = ${ikoka_handheld_nrf.build_flags}
+build_flags = ${ikoka_nrf52.build_flags}
  -D DISPLAY_CLASS=SSD1306Display
  -D DISPLAY_ROTATION=0
  -D PIN_WIRE_SCL=D6
@@ -42,62 +42,62 @@ build_flags = ${ikoka_handheld_nrf.build_flags}
  -D OFFLINE_QUEUE_SIZE=256
  -D QSPIFLASH=1
  -I examples/companion_radio/ui-new
-build_src_filter = ${ikoka_handheld_nrf.build_src_filter}
+build_src_filter = ${ikoka_nrf52.build_src_filter}
  +<helpers/ui/SSD1306Display.cpp>
  +<../examples/companion_radio/ui-new/UITask.cpp>
  +<../examples/companion_radio/*.cpp>
 [env:ikoka_handheld_nrf_e22_30dbm_096_companion_radio_ble]
 extends = ikoka_nrf52
-build_flags = ${ikoka_handheld_nrf_ssd1306_companion.build_flags}
+build_flags = ${ikoka_nrf52_ssd1306_companion.build_flags}
  -D BLE_PIN_CODE=123456
  -D LORA_TX_POWER=20
-build_src_filter = ${ikoka_handheld_nrf_ssd1306_companion.build_src_filter}
+build_src_filter = ${ikoka_nrf52_ssd1306_companion.build_src_filter}
  +<helpers/nrf52/SerialBLEInterface.cpp>
 [env:ikoka_handheld_nrf_e22_30dbm_096_rotated_companion_radio_ble]
 extends = ikoka_nrf52
-build_flags = ${ikoka_handheld_nrf_ssd1306_companion.build_flags}
+build_flags = ${ikoka_nrf52_ssd1306_companion.build_flags}
  -D BLE_PIN_CODE=123456
  -D LORA_TX_POWER=20
  -D DISPLAY_ROTATION=2    
-build_src_filter = ${ikoka_handheld_nrf_ssd1306_companion.build_src_filter}
+build_src_filter = ${ikoka_nrf52_ssd1306_companion.build_src_filter}
  +<helpers/nrf52/SerialBLEInterface.cpp>
 [env:ikoka_handheld_nrf_e22_30dbm_096_companion_radio_usb]
 extends = ikoka_nrf52
-build_flags = ${ikoka_handheld_nrf_ssd1306_companion.build_flags}
+build_flags = ${ikoka_nrf52_ssd1306_companion.build_flags}
  -D LORA_TX_POWER=20
-build_src_filter = ${ikoka_handheld_nrf_ssd1306_companion.build_src_filter}
+build_src_filter = ${ikoka_nrf52_ssd1306_companion.build_src_filter}
 [env:ikoka_handheld_nrf_e22_30dbm_096_rotated_companion_radio_usb]
 extends = ikoka_nrf52
-build_flags = ${ikoka_handheld_nrf_ssd1306_companion.build_flags}
+build_flags = ${ikoka_nrf52_ssd1306_companion.build_flags}
  -D LORA_TX_POWER=20
  -D DISPLAY_ROTATION=2
-build_src_filter = ${ikoka_handheld_nrf_ssd1306_companion.build_src_filter}
+build_src_filter = ${ikoka_nrf52_ssd1306_companion.build_src_filter}
 [env:ikoka_handheld_nrf_e22_30dbm_repeater]
 extends = ikoka_nrf52
 build_flags =
-  ${ikoka_handheld_nrf.build_flags}
+  ${ikoka_nrf52.build_flags}
  -D ADVERT_NAME='"ikoka_handheld Repeater"'
  -D ADVERT_LAT=0.0
  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
  -D MAX_NEIGHBOURS=50
  -D LORA_TX_POWER=20  
-build_src_filter = ${ikoka_handheld_nrf.build_src_filter}
+build_src_filter = ${ikoka_nrf52.build_src_filter}
  +<../examples/simple_repeater/*.cpp>
 [env:ikoka_handheld_nrf_e22_30dbm_room_server]
 extends = ikoka_nrf52
 build_flags =
-  ${ikoka_handheld_nrf.build_flags}
+  ${ikoka_nrf52.build_flags}
  -D ADVERT_NAME='"ikoka_handheld Room"'
  -D ADVERT_LAT=0.0
  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
  -D LORA_TX_POWER=20  
-build_src_filter = ${ikoka_handheld_nrf.build_src_filter}
+build_src_filter = ${ikoka_nrf52.build_src_filter}
  +<../examples/simple_room_server/*.cpp>
--- a/variants/ikoka_nano_nrf/IkokaNanoNRFBoard.cpp
+++ b/variants/ikoka_nano_nrf/IkokaNanoNRFBoard.cpp
@@ -1,12 +1,28 @@
 #ifdef XIAO_NRF52
 #include <Arduino.h>
 #include <Wire.h>
 #include "IkokaNanoNRFBoard.h"
 #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 IkokaNanoNRFBoard::begin() {
-  NRF52Board::begin();
+  // for future use, sub-classes SHOULD call this from their begin()
  startup_reason = BD_STARTUP_NORMAL;
  pinMode(PIN_VBAT, INPUT);
  pinMode(VBAT_ENABLE, OUTPUT);
@@ -32,4 +48,47 @@ void IkokaNanoNRFBoard::begin() {
  delay(10);   // give sx1262 some time to power up
 }
 bool IkokaNanoNRFBoard::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("XIAO_NRF52_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/ikoka_nano_nrf/IkokaNanoNRFBoard.h
+++ b/variants/ikoka_nano_nrf/IkokaNanoNRFBoard.h
@@ -2,14 +2,16 @@
 #include <MeshCore.h>
 #include <Arduino.h>
 #include <helpers/NRF52Board.h>
 #ifdef XIAO_NRF52
-class IkokaNanoNRFBoard : public NRF52BoardOTA {
+class IkokaNanoNRFBoard : public mesh::MainBoard {
 protected:
  uint8_t startup_reason;
 public:
  IkokaNanoNRFBoard() : NRF52BoardOTA("XIAO_NRF52_OTA") {}
  void begin();
  uint8_t getStartupReason() const override { return startup_reason; }
 #if defined(P_LORA_TX_LED)
  void onBeforeTransmit() override {
@@ -47,6 +49,12 @@ public:
  const char *getManufacturerName() const override {
    return MANUFACTURER_STRING;
  }
  void reboot() override {
    NVIC_SystemReset();
  }
  bool startOTAUpdate(const char *id, char reply[]) override;
 };
 #endif
--- a/variants/ikoka_nano_nrf/platformio.ini
+++ b/variants/ikoka_nano_nrf/platformio.ini
@@ -1,124 +1,151 @@
-[ikoka_nano_nrf]
+[nrf52840_xiao]
 extends = nrf52_base
 platform_packages =
  toolchain-gccarmnoneeabi@~1.100301.0
  framework-arduinoadafruitnrf52
 board = seeed-xiao-afruitnrf52-nrf52840
 board_build.ldscript = boards/nrf52840_s140_v7.ld
 build_flags = ${nrf52_base.build_flags}
   ${sensor_base.build_flags}
  -D NRF52_PLATFORM -D XIAO_NRF52
  -I lib/nrf52/s140_nrf52_7.3.0_API/include
  -I lib/nrf52/s140_nrf52_7.3.0_API/include/nrf52
 lib_ignore =
  BluetoothOTA
  lvgl
  lib5b4
 lib_deps =
  ${nrf52_base.lib_deps}
  rweather/Crypto @ ^0.4.0
  adafruit/Adafruit INA3221 Library @ ^1.0.1
  adafruit/Adafruit INA219 @ ^1.2.3
  adafruit/Adafruit AHTX0 @ ^2.0.5
  adafruit/Adafruit BME280 Library @ ^2.3.0
  adafruit/Adafruit SSD1306 @ ^2.5.13
 [ikoka_nano_nrf_baseboard]
 extends = nrf52840_xiao
 ;board_build.ldscript = boards/nrf52840_s140_v7.ld
 build_flags = ${nrf52840_xiao.build_flags}
  -D P_LORA_TX_LED=11
  -I variants/ikoka_nano_nrf
  -I src/helpers/nrf52
  -D P_LORA_TX_LED=11
  -D DISPLAY_CLASS=NullDisplayDriver
  -D RADIO_CLASS=CustomSX1262
  -D WRAPPER_CLASS=CustomSX1262Wrapper
  -D P_LORA_DIO_1=D1
-  -D P_LORA_BUSY=D2
+;  -D P_LORA_BUSY=D3
-  -D P_LORA_RESET=D3
+  -D P_LORA_BUSY=D2 ; specific to ikoka nano variant.
-  -D P_LORA_NSS=D0
+;  -D P_LORA_RESET=D2
  -D P_LORA_RESET=D3 ; specific to ikoka nano variant.
 ;  -D P_LORA_NSS=D4
  -D P_LORA_NSS=D0 ; specific to ikoka nano variant.
 ;  -D SX126X_RXEN=D5
  -D SX126X_RXEN=D7
  -D SX126X_TXEN=RADIOLIB_NC
  -D SX126X_DIO2_AS_RF_SWITCH=1
  -D SX126X_DIO3_TCXO_VOLTAGE=1.8
  -D SX126X_CURRENT_LIMIT=140
  -D SX126X_RX_BOOSTED_GAIN=1
-  -D PIN_WIRE_SCL=5
+  -D PIN_WIRE_SCL=5 ; specific to ikoka nano variant.
-  -D PIN_WIRE_SDA=4
+  -D PIN_WIRE_SDA=4 ; specific to ikoka nano variant.
-  -UENV_INCLUDE_GPS
+  -D ENV_INCLUDE_AHTX0=1
  -D ENV_INCLUDE_BME280=1
  -D ENV_INCLUDE_INA3221=1
  -D ENV_INCLUDE_INA219=1
 debug_tool = jlink
 upload_protocol = nrfutil
-lib_deps = ${nrf52_base.lib_deps}
+
-   ${sensor_base.lib_deps}
+
 ;;; abstracted hardware variants
 [ikoka_nano_nrf_e22_22dbm]
-extends = ikoka_nano_nrf
+extends = ikoka_nano_nrf_baseboard
 ; No PA in this model, full 22dBm
 build_flags =
-  ${ikoka_nano_nrf.build_flags}
+  ${ikoka_nano_nrf_baseboard.build_flags}
  -D MANUFACTURER_STRING='"Ikoka Nano-E22-22dBm (Xiao_nrf52)"'
  -D LORA_TX_POWER=22
-build_src_filter = ${ikoka_nano_nrf.build_src_filter}
+build_src_filter = ${nrf52840_xiao.build_src_filter}
  +<helpers/*.cpp>
  +<helpers/sensors>
  +<helpers/ui/NullDisplayDriver.cpp>
  +<../variants/ikoka_nano_nrf>
 [ikoka_nano_nrf_e22_30dbm]
-extends = ikoka_nano_nrf
+extends = ikoka_nano_nrf_baseboard
 ; limit txpower to 20dBm on E22-900M30S. Anything higher will
 ; cause distortion in the PA output. 20dBm in -> 30dBm out
 build_flags =
-  ${ikoka_nano_nrf.build_flags}
+  ${ikoka_nano_nrf_baseboard.build_flags}
  -D MANUFACTURER_STRING='"Ikoka Nano-E22-30dBm (Xiao_nrf52)"'
  -D LORA_TX_POWER=20
-build_src_filter = ${ikoka_nano_nrf.build_src_filter}
+build_src_filter = ${nrf52840_xiao.build_src_filter}
  +<helpers/*.cpp>
  +<helpers/sensors>
  +<helpers/ui/NullDisplayDriver.cpp>
  +<../variants/ikoka_nano_nrf>
 [ikoka_nano_nrf_e22_33dbm]
-extends = ikoka_nano_nrf
+extends = ikoka_nano_nrf_baseboard
 ; limit txpower to 9dBm on E22-900M33S to avoid hardware damage
 ; to the rf amplifier frontend. 9dBm in -> 33dBm out
 build_flags =
-  ${ikoka_nano_nrf.build_flags}
+  ${ikoka_nano_nrf_baseboard.build_flags}
  -D MANUFACTURER_STRING='"Ikoka Nano-E22-33dBm (Xiao_nrf52)"'
  -D LORA_TX_POWER=9
-build_src_filter = ${ikoka_nano_nrf.build_src_filter}
+build_src_filter = ${nrf52840_xiao.build_src_filter}
  +<helpers/*.cpp>
  +<helpers/sensors>
  +<helpers/ui/NullDisplayDriver.cpp>
  +<../variants/ikoka_nano_nrf>
 ;;; abstracted firmware roles
 [ikoka_nano_nrf_companion_radio_ble]
-extends = ikoka_nano_nrf
+extends = ikoka_nano_nrf_baseboard
 board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld
 board_upload.maximum_size = 708608
 build_flags =
-  ${ikoka_nano_nrf.build_flags}
+  ${ikoka_nano_nrf_baseboard.build_flags}
  -D MAX_CONTACTS=350
  -D MAX_GROUP_CHANNELS=40
  -D BLE_PIN_CODE=123456
  -D OFFLINE_QUEUE_SIZE=256
  -I examples/companion_radio/ui-new
  -D QSPIFLASH=1
 ;  -D BLE_DEBUG_LOGGING=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${ikoka_nano_nrf.build_src_filter}
+build_src_filter = ${ikoka_nano_nrf_baseboard.build_src_filter}
  +<helpers/nrf52/SerialBLEInterface.cpp>
  +<../examples/companion_radio/*.cpp>
  +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps =
-  ${ikoka_nano_nrf.lib_deps}
+  ${ikoka_nano_nrf_baseboard.lib_deps}
  densaugeo/base64 @ ~1.4.0
 [ikoka_nano_nrf_companion_radio_usb]
-extends = ikoka_nano_nrf
+extends = ikoka_nano_nrf_baseboard
 board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld
 board_upload.maximum_size = 708608
 build_flags =
-  ${ikoka_nano_nrf.build_flags}
+  ${ikoka_nano_nrf_baseboard.build_flags}
  -D MAX_CONTACTS=350
  -D MAX_GROUP_CHANNELS=40
  -I examples/companion_radio/ui-new
  -D QSPIFLASH=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${ikoka_nano_nrf.build_src_filter}
+build_src_filter = ${ikoka_nano_nrf_baseboard.build_src_filter}
  +<helpers/nrf52/SerialBLEInterface.cpp>
  +<../examples/companion_radio/*.cpp>
  +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps =
-  ${ikoka_nano_nrf.lib_deps}
+  ${ikoka_nano_nrf_baseboard.lib_deps}
  densaugeo/base64 @ ~1.4.0
 [ikoka_nano_nrf_repeater]
-extends = ikoka_nano_nrf
+extends = ikoka_nano_nrf_baseboard
 build_flags =
-  ${ikoka_nano_nrf.build_flags}
+  ${ikoka_nano_nrf_baseboard.build_flags}
  -D ADVERT_NAME='"Ikoka Nano Repeater"'
  -D ADVERT_LAT=0.0
  -D ADVERT_LON=0.0
@@ -126,23 +153,26 @@ build_flags =
  -D MAX_NEIGHBOURS=50
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${ikoka_nano_nrf.build_src_filter}
+build_src_filter = ${ikoka_nano_nrf_baseboard.build_src_filter}
  +<../examples/simple_repeater/*.cpp>
 [ikoka_nano_nrf_room_server]
-extends = ikoka_nano_nrf
+extends = ikoka_nano_nrf_baseboard
 build_flags =
-  ${ikoka_nano_nrf.build_flags}
+  ${ikoka_nano_nrf_baseboard.build_flags}
  -D ADVERT_NAME='"Ikoka Nano Room"'
  -D ADVERT_LAT=0.0
  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${ikoka_nano_nrf.build_src_filter}
+build_src_filter = ${ikoka_nano_nrf_baseboard.build_src_filter}
  +<../examples/simple_room_server/*.cpp>
 ;;; hardware + firmware variants
 ;;;    22dBm EBYTE E22-900M22 variants
 [env:ikoka_nano_nrf_22dbm_companion_radio_usb]
 extends =
   ikoka_nano_nrf_e22_22dbm
@@ -189,6 +219,7 @@ build_src_filter =
 ;;;    30dBm EBYTE E22-900M30 variants
 [env:ikoka_nano_nrf_30dbm_companion_radio_usb]
 extends =
   ikoka_nano_nrf_e22_30dbm
@@ -235,6 +266,7 @@ build_src_filter =
 ;;;    33dBm EBYTE E22-900M33 variants
 [env:ikoka_nano_nrf_33dbm_companion_radio_usb]
 extends =
   ikoka_nano_nrf_e22_33dbm
--- a/variants/ikoka_stick_nrf/IkokaStickNRFBoard.cpp
+++ b/variants/ikoka_stick_nrf/IkokaStickNRFBoard.cpp
@@ -1,12 +1,28 @@
 #ifdef XIAO_NRF52
 #include <Arduino.h>
 #include <Wire.h>
 #include "IkokaStickNRFBoard.h"
 #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 IkokaStickNRFBoard::begin() {
-  NRF52Board::begin();
+  // for future use, sub-classes SHOULD call this from their begin()
  startup_reason = BD_STARTUP_NORMAL;
  pinMode(PIN_VBAT, INPUT);
  pinMode(VBAT_ENABLE, OUTPUT);
@@ -32,4 +48,47 @@ void IkokaStickNRFBoard::begin() {
  delay(10);   // give sx1262 some time to power up
 }
 bool IkokaStickNRFBoard::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("XIAO_NRF52_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/ikoka_stick_nrf/IkokaStickNRFBoard.h
+++ b/variants/ikoka_stick_nrf/IkokaStickNRFBoard.h
@@ -2,14 +2,16 @@
 #include <MeshCore.h>
 #include <Arduino.h>
 #include <helpers/NRF52Board.h>
 #ifdef XIAO_NRF52
-class IkokaStickNRFBoard : public NRF52BoardOTA {
+class IkokaStickNRFBoard : public mesh::MainBoard {
 protected:
  uint8_t startup_reason;
 public:
  IkokaStickNRFBoard() : NRF52BoardOTA("XIAO_NRF52_OTA") {}
  void begin();
  uint8_t getStartupReason() const override { return startup_reason; }
 #if defined(P_LORA_TX_LED)
  void onBeforeTransmit() override {
@@ -47,6 +49,12 @@ public:
  const char *getManufacturerName() const override {
    return MANUFACTURER_STRING;
  }
  void reboot() override {
    NVIC_SystemReset();
  }
  bool startOTAUpdate(const char *id, char reply[]) override;
 };
 #endif
--- a/variants/ikoka_stick_nrf/platformio.ini
+++ b/variants/ikoka_stick_nrf/platformio.ini
@@ -1,15 +1,34 @@
-[ikoka_stick_nrf]
+[nrf52840_xiao]
 extends = nrf52_base
 platform_packages =
  toolchain-gccarmnoneeabi@~1.100301.0
  framework-arduinoadafruitnrf52
 board = seeed-xiao-afruitnrf52-nrf52840
 board_build.ldscript = boards/nrf52840_s140_v7.ld
 build_flags = ${nrf52_base.build_flags}
  ${sensor_base.build_flags}
  -D NRF52_PLATFORM -D XIAO_NRF52
  -I lib/nrf52/s140_nrf52_7.3.0_API/include
  -I lib/nrf52/s140_nrf52_7.3.0_API/include/nrf52
 lib_ignore =
  BluetoothOTA
  lvgl
  lib5b4
 lib_deps =
  ${nrf52_base.lib_deps}
  rweather/Crypto @ ^0.4.0
  adafruit/Adafruit INA3221 Library @ ^1.0.1
  adafruit/Adafruit INA219 @ ^1.2.3
  adafruit/Adafruit AHTX0 @ ^2.0.5
  adafruit/Adafruit BME280 Library @ ^2.3.0
  adafruit/Adafruit SSD1306 @ ^2.5.13
 [ikoka_stick_nrf_baseboard]
 extends = nrf52840_xiao
 ;board_build.ldscript = boards/nrf52840_s140_v7.ld
 build_flags = ${nrf52840_xiao.build_flags}
  -D P_LORA_TX_LED=11
  -I variants/ikoka_stick_nrf
  -I src/helpers/nrf52
  -D P_LORA_TX_LED=11
  -D DISPLAY_CLASS=SSD1306Display
  -D DISPLAY_ROTATION=2
  -D RADIO_CLASS=CustomSX1262
@@ -27,18 +46,24 @@ build_flags = ${nrf52_base.build_flags}
  -D PIN_USER_BTN=0
  -D PIN_WIRE_SCL=7
  -D PIN_WIRE_SDA=6
-  -UENV_INCLUDE_GPS
+  -D ENV_INCLUDE_AHTX0=1
-lib_deps = ${nrf52_base.lib_deps}
+  -D ENV_INCLUDE_BME280=1
-  ${sensor_base.lib_deps}
+  -D ENV_INCLUDE_INA3221=1
  -D ENV_INCLUDE_INA219=1
 debug_tool = jlink
 upload_protocol = nrfutil
 ;;; abstracted hardware variants
 [ikoka_stick_nrf_e22_22dbm]
-extends = ikoka_stick_nrf
+extends = ikoka_stick_nrf_baseboard
 ; No PA in this model, full 22dBm
 build_flags =
-  ${ikoka_stick_nrf.build_flags}
+  ${ikoka_stick_nrf_baseboard.build_flags}
  -D MANUFACTURER_STRING='"Ikoka Stick-E22-22dBm (Xiao_nrf52)"'
  -D LORA_TX_POWER=22
-build_src_filter = ${ikoka_stick_nrf.build_src_filter}
+build_src_filter = ${nrf52840_xiao.build_src_filter}
  +<helpers/*.cpp>
  +<helpers/sensors>
  +<helpers/ui/MomentaryButton.cpp>
@@ -46,14 +71,14 @@ build_src_filter = ${ikoka_stick_nrf.build_src_filter}
  +<../variants/ikoka_stick_nrf>
 [ikoka_stick_nrf_e22_30dbm]
-extends = ikoka_stick_nrf
+extends = ikoka_stick_nrf_baseboard
 ; limit txpower to 20dBm on E22-900M30S. Anything higher will
 ; cause distortion in the PA output. 20dBm in -> 30dBm out
 build_flags =
-  ${ikoka_stick_nrf.build_flags}
+  ${ikoka_stick_nrf_baseboard.build_flags}
  -D MANUFACTURER_STRING='"Ikoka Stick-E22-30dBm (Xiao_nrf52)"'
  -D LORA_TX_POWER=20
-build_src_filter = ${ikoka_stick_nrf.build_src_filter}
+build_src_filter = ${nrf52840_xiao.build_src_filter}
  +<helpers/*.cpp>
  +<helpers/sensors>
  +<helpers/ui/MomentaryButton.cpp>
@@ -61,14 +86,14 @@ build_src_filter = ${ikoka_stick_nrf.build_src_filter}
  +<../variants/ikoka_stick_nrf>
 [ikoka_stick_nrf_e22_33dbm]
-extends = ikoka_stick_nrf
+extends = ikoka_stick_nrf_baseboard
 ; limit txpower to 9dBm on E22-900M33S to avoid hardware damage
 ; to the rf amplifier frontend. 9dBm in -> 33dBm out
 build_flags =
-  ${ikoka_stick_nrf.build_flags}
+  ${ikoka_stick_nrf_baseboard.build_flags}
  -D MANUFACTURER_STRING='"Ikoka Stick-E22-33dBm (Xiao_nrf52)"'
  -D LORA_TX_POWER=9
-build_src_filter = ${ikoka_stick_nrf.build_src_filter}
+build_src_filter = ${nrf52840_xiao.build_src_filter}
  +<helpers/*.cpp>
  +<helpers/sensors>
  +<helpers/ui/MomentaryButton.cpp>
@@ -78,52 +103,50 @@ build_src_filter = ${ikoka_stick_nrf.build_src_filter}
 ;;; abstracted firmware roles
 [ikoka_stick_nrf_companion_radio_ble]
-extends = ikoka_stick_nrf
+extends = ikoka_stick_nrf_baseboard
 board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld
 board_upload.maximum_size = 708608
 build_flags =
-  ${ikoka_stick_nrf.build_flags}
+  ${ikoka_stick_nrf_baseboard.build_flags}
  -D MAX_CONTACTS=350
  -D MAX_GROUP_CHANNELS=40
  -D BLE_PIN_CODE=123456
  -D OFFLINE_QUEUE_SIZE=256
  -I examples/companion_radio/ui-new
  -D QSPIFLASH=1
 ;  -D BLE_DEBUG_LOGGING=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${ikoka_stick_nrf.build_src_filter}
+build_src_filter = ${ikoka_stick_nrf_baseboard.build_src_filter}
  +<helpers/nrf52/SerialBLEInterface.cpp>
  +<../examples/companion_radio/*.cpp>
  +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps =
-  ${ikoka_stick_nrf.lib_deps}
+  ${ikoka_stick_nrf_baseboard.lib_deps}
  densaugeo/base64 @ ~1.4.0
 [ikoka_stick_nrf_companion_radio_usb]
-extends = ikoka_stick_nrf
+extends = ikoka_stick_nrf_baseboard
 board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld
 board_upload.maximum_size = 708608
 build_flags =
-  ${ikoka_stick_nrf.build_flags}
+  ${ikoka_stick_nrf_baseboard.build_flags}
  -D MAX_CONTACTS=350
  -D MAX_GROUP_CHANNELS=40
  -I examples/companion_radio/ui-new
  -D QSPIFLASH=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${ikoka_stick_nrf.build_src_filter}
+build_src_filter = ${ikoka_stick_nrf_baseboard.build_src_filter}
  +<helpers/nrf52/SerialBLEInterface.cpp>
  +<../examples/companion_radio/*.cpp>
  +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps =
-  ${ikoka_stick_nrf.lib_deps}
+  ${ikoka_stick_nrf_baseboard.lib_deps}
  densaugeo/base64 @ ~1.4.0
 [ikoka_stick_nrf_repeater]
-extends = ikoka_stick_nrf
+extends = ikoka_stick_nrf_baseboard
 build_flags =
-  ${ikoka_stick_nrf.build_flags}
+  ${ikoka_stick_nrf_baseboard.build_flags}
  -D ADVERT_NAME='"Ikoka Stick Repeater"'
  -D ADVERT_LAT=0.0
  -D ADVERT_LON=0.0
@@ -131,21 +154,21 @@ build_flags =
  -D MAX_NEIGHBOURS=50
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${ikoka_stick_nrf.build_src_filter}
+build_src_filter = ${ikoka_stick_nrf_baseboard.build_src_filter}
  +<helpers/ui/SSD1306Display.cpp>
  +<../examples/simple_repeater/*.cpp>
 [ikoka_stick_nrf_room_server]
-extends = ikoka_stick_nrf
+extends = ikoka_stick_nrf_baseboard
 build_flags =
-  ${ikoka_stick_nrf.build_flags}
+  ${ikoka_stick_nrf_baseboard.build_flags}
  -D ADVERT_NAME='"Ikoka Stick Room"'
  -D ADVERT_LAT=0.0
  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${ikoka_stick_nrf.build_src_filter}
+build_src_filter = ${ikoka_stick_nrf_baseboard.build_src_filter}
  +<../examples/simple_room_server/*.cpp>
 ;;; hardware + firmware variants
--- a/variants/keepteen_lt1/KeepteenLT1Board.cpp
+++ b/variants/keepteen_lt1/KeepteenLT1Board.cpp
@@ -1,10 +1,14 @@
 #include <Arduino.h>
 #include <Wire.h>
 #include "KeepteenLT1Board.h"
 #include <bluefruit.h>
 #include <Wire.h>
 static BLEDfu bledfu;
 void KeepteenLT1Board::begin() {    
-    NRF52Board::begin();
+    // for future use, sub-classes SHOULD call this from their begin()
    startup_reason = BD_STARTUP_NORMAL;
    btn_prev_state = HIGH;
    pinMode(PIN_VBAT_READ, INPUT);
@@ -15,3 +19,57 @@ void KeepteenLT1Board::begin() {
    Wire.begin();
 }
 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 KeepteenLT1Board::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("KeepteenLT1_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;
 }
--- a/variants/keepteen_lt1/KeepteenLT1Board.h
+++ b/variants/keepteen_lt1/KeepteenLT1Board.h
@@ -2,16 +2,17 @@
 #include <MeshCore.h>
 #include <Arduino.h>
 #include <helpers/NRF52Board.h>
-class KeepteenLT1Board : public NRF52BoardOTA {
+class KeepteenLT1Board : public mesh::MainBoard {
 protected:
  uint8_t startup_reason;
  uint8_t btn_prev_state;
 public:
  KeepteenLT1Board() : NRF52BoardOTA("KeepteenLT1_OTA") {}
  void begin();
  uint8_t getStartupReason() const override { return startup_reason; }
  #define BATTERY_SAMPLES 8
  uint16_t getBattMilliVolts() override {
@@ -38,7 +39,13 @@ public:
  }
 #endif
  void reboot() override {
    NVIC_SystemReset();
  }
  void powerOff() override {
    sd_power_system_off();
  }
  bool startOTAUpdate(const char* id, char reply[]) override;
 };
--- a/variants/lilygo_t3s3_sx1276/platformio.ini
+++ b/variants/lilygo_t3s3_sx1276/platformio.ini
@@ -138,6 +138,8 @@ build_flags =
  -D DISPLAY_CLASS=SSD1306Display
  -D MAX_CONTACTS=350
  -D MAX_GROUP_CHANNELS=40
  -D MESH_PACKET_LOGGING=1
  -D MESH_DEBUG=1
 build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter}
  +<helpers/ui/SSD1306Display.cpp>
  +<helpers/ui/MomentaryButton.cpp>
--- a/variants/lilygo_tdeck/platformio.ini
+++ b/variants/lilygo_tdeck/platformio.ini
@@ -19,21 +19,6 @@ build_flags =
  -D SX126X_RX_BOOSTED_GAIN=1
  -D SX126X_DIO3_TCXO_VOLTAGE=1.8f
  -D P_LORA_DIO_1=45 ; LORA IRQ pin
  -D ENV_INCLUDE_GPS=1
  -D ENV_INCLUDE_AHTX0=0
  -D ENV_INCLUDE_BME280=0
  -D ENV_INCLUDE_BMP280=0
  -D ENV_INCLUDE_SHTC3=0
  -D ENV_INCLUDE_SHT4X=0
  -D ENV_INCLUDE_LPS22HB=0
  -D ENV_INCLUDE_INA3221=0
  -D ENV_INCLUDE_INA219=0
  -D ENV_INCLUDE_INA226=0
  -D ENV_INCLUDE_INA260=0
  -D ENV_INCLUDE_MLX90614=0
  -D ENV_INCLUDE_VL53L0X=0
  -D ENV_INCLUDE_BME680=0
  -D ENV_INCLUDE_BMP085=0
  -D P_LORA_NSS=9    ; LORA SS pin
  -D P_LORA_RESET=17 ; LORA RST pin
  -D P_LORA_BUSY=13  ; LORA Busy pin
@@ -50,12 +35,8 @@ build_flags =
  -D PIN_TFT_DC=11
  -D PIN_TFT_SCL=40
  -D PIN_TFT_SDA=41
  -D PIN_GPS_RX=43
  -D PIN_GPS_TX=44
  -D GPS_BAUD_RATE=38400
 build_src_filter = ${esp32_base.build_src_filter}
  +<../variants/lilygo_tdeck>
  +<helpers/sensors/*.cpp>
 lib_deps =
  ${esp32_base.lib_deps}
  ${sensor_base.lib_deps}
--- a/variants/lilygo_tdeck/target.cpp
+++ b/variants/lilygo_tdeck/target.cpp
@@ -14,8 +14,7 @@ WRAPPER_CLASS radio_driver(radio, board);
 ESP32RTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
-MicroNMEALocationProvider gps(Serial1, &rtc_clock);
+SensorManager sensors;
 EnvironmentSensorManager sensors(gps);
 #ifdef DISPLAY_CLASS
  DISPLAY_CLASS display;
@@ -25,7 +24,6 @@ EnvironmentSensorManager sensors(gps);
 bool radio_init() {
  fallback_clock.begin();
  rtc_clock.begin(Wire);
  Wire.begin(18, 8);
 #if defined(P_LORA_SCLK)
  return radio.std_init(&spi);
--- a/variants/lilygo_tdeck/target.h
+++ b/variants/lilygo_tdeck/target.h
@@ -11,13 +11,11 @@
  #include <helpers/ui/ST7789LCDDisplay.h>
  #include <helpers/ui/MomentaryButton.h>
 #endif
 #include "helpers/sensors/EnvironmentSensorManager.h"
 #include "helpers/sensors/MicroNMEALocationProvider.h"
 extern TDeckBoard board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
-extern EnvironmentSensorManager sensors;
+extern SensorManager sensors;
 #ifdef DISPLAY_CLASS
  extern DISPLAY_CLASS display;
--- a/variants/lilygo_techo/TechoBoard.cpp
+++ b/variants/lilygo_techo/TechoBoard.cpp
@@ -1,12 +1,28 @@
 #include <Arduino.h>
 #include <Wire.h>
 #include "TechoBoard.h"
 #ifdef LILYGO_TECHO
 #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 TechoBoard::begin() {
-  NRF52Board::begin();
+  // for future use, sub-classes SHOULD call this from their begin()
  startup_reason = BD_STARTUP_NORMAL;
  Wire.begin();
@@ -28,4 +44,47 @@ uint16_t TechoBoard::getBattMilliVolts() {
  // divider into account (providing the actual LIPO voltage)
  return (uint16_t)((float)adcvalue * REAL_VBAT_MV_PER_LSB);
 }
 bool TechoBoard::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("TECHO_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/lilygo_techo/TechoBoard.h
+++ b/variants/lilygo_techo/TechoBoard.h
@@ -2,7 +2,6 @@
 #include <MeshCore.h>
 #include <Arduino.h>
 #include <helpers/NRF52Board.h>
 // built-ins
 #define VBAT_MV_PER_LSB   (0.73242188F)   // 3.0V ADC range and 12-bit ADC resolution = 3000mV/4096
@@ -13,11 +12,19 @@
 #define PIN_VBAT_READ     (4)
 #define REAL_VBAT_MV_PER_LSB (VBAT_DIVIDER_COMP * VBAT_MV_PER_LSB)
-class TechoBoard : public NRF52BoardOTA {
+class TechoBoard : public mesh::MainBoard {
 protected:
  uint8_t startup_reason;
 public:
-  TechoBoard() : NRF52BoardOTA("TECHO_OTA") {}
+
  void begin();
  uint16_t getBattMilliVolts() override;
  bool startOTAUpdate(const char* id, char reply[]) override;
  uint8_t getStartupReason() const override {
    return startup_reason;
  }
  const char* getManufacturerName() const override {
    return "LilyGo T-Echo";
@@ -25,13 +32,13 @@ public:
  void powerOff() override {
    #ifdef LED_RED
-    digitalWrite(LED_RED, HIGH);
+    digitalWrite(LED_RED, LOW);
    #endif
    #ifdef LED_GREEN
-    digitalWrite(LED_GREEN, HIGH);
+    digitalWrite(LED_GREEN, LOW);
    #endif
    #ifdef LED_BLUE
-    digitalWrite(LED_BLUE, HIGH);
+    digitalWrite(LED_BLUE, LOW);
    #endif
    #ifdef DISP_BACKLIGHT
    digitalWrite(DISP_BACKLIGHT, LOW);
@@ -41,4 +48,8 @@ public:
    #endif
    sd_power_system_off();
  }
  void reboot() override {
    NVIC_SystemReset();
  }
 };
--- a/variants/lilygo_techo_lite/TechoBoard.cpp
+++ b/variants/lilygo_techo_lite/TechoBoard.cpp
@@ -1,12 +1,28 @@
 #include <Arduino.h>
 #include <Wire.h>
 #include "TechoBoard.h"
 #ifdef LILYGO_TECHO
 #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 TechoBoard::begin() {
-  NRF52Board::begin();
+  // for future use, sub-classes SHOULD call this from their begin()
  startup_reason = BD_STARTUP_NORMAL;
  Wire.begin();
@@ -28,4 +44,47 @@ uint16_t TechoBoard::getBattMilliVolts() {
  // divider into account (providing the actual LIPO voltage)
  return (uint16_t)((float)adcvalue * REAL_VBAT_MV_PER_LSB);
 }
 bool TechoBoard::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("TECHO_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/lilygo_techo_lite/TechoBoard.h
+++ b/variants/lilygo_techo_lite/TechoBoard.h
@@ -2,7 +2,6 @@
 #include <MeshCore.h>
 #include <Arduino.h>
 #include <helpers/NRF52Board.h>
 // built-ins
 #define VBAT_MV_PER_LSB   (0.73242188F)   // 3.0V ADC range and 12-bit ADC resolution = 3000mV/4096
@@ -13,11 +12,19 @@
 #define PIN_VBAT_READ     (4)
 #define REAL_VBAT_MV_PER_LSB (VBAT_DIVIDER_COMP * VBAT_MV_PER_LSB)
-class TechoBoard : public NRF52BoardOTA {
+class TechoBoard : public mesh::MainBoard {
 protected:
  uint8_t startup_reason;
 public:
-  TechoBoard() : NRF52BoardOTA("TECHO_OTA") {}
+
  void begin();
  uint16_t getBattMilliVolts() override;
  bool startOTAUpdate(const char* id, char reply[]) override;
  uint8_t getStartupReason() const override {
    return startup_reason;
  }
  const char* getManufacturerName() const override {
    return "LilyGo T-Echo";
@@ -41,4 +48,8 @@ public:
    #endif
    sd_power_system_off();
  }
  void reboot() override {
    NVIC_SystemReset();
  }
 };
--- a/variants/lilygo_tlora_v2_1/platformio.ini
+++ b/variants/lilygo_tlora_v2_1/platformio.ini
@@ -136,7 +136,6 @@ build_flags =
  -D WIFI_SSID='"ssid"'
  -D WIFI_PWD='"password"'
  -D WIFI_DEBUG_LOGGING=1
  -D OFFLINE_QUEUE_SIZE=256  
 build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter}
  +<helpers/esp32/*.cpp>
  +<helpers/ui/MomentaryButton.cpp>
--- a/variants/mesh_pocket/MeshPocket.cpp
+++ b/variants/mesh_pocket/MeshPocket.cpp
@@ -1,12 +1,72 @@
 #include <Arduino.h>
 #include "MeshPocket.h"
 #include <bluefruit.h>
 #include <Wire.h>
-#include "MeshPocket.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 HeltecMeshPocket::begin() {
-  NRF52Board::begin();
+  // for future use, sub-classes SHOULD call this from their begin()
  startup_reason = BD_STARTUP_NORMAL;
  Serial.begin(115200);
  pinMode(PIN_VBAT_READ, INPUT);
  pinMode(PIN_USER_BTN, INPUT);
 }
 bool HeltecMeshPocket::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("MESH_POCKET_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;
 }
--- a/variants/mesh_pocket/MeshPocket.h
+++ b/variants/mesh_pocket/MeshPocket.h
@@ -2,17 +2,21 @@
 #include <Arduino.h>
 #include <MeshCore.h>
 #include <helpers/NRF52Board.h>
 // built-ins
 #define  PIN_VBAT_READ    29
 #define  PIN_BAT_CTL      34
 #define  MV_LSB   (3000.0F / 4096.0F) // 12-bit ADC with 3.0V input range
-class HeltecMeshPocket : public NRF52BoardOTA {
+class HeltecMeshPocket : public mesh::MainBoard {
 protected:
  uint8_t startup_reason;
 public:
  HeltecMeshPocket() : NRF52BoardOTA("MESH_POCKET_OTA") {}
  void begin();
  uint8_t getStartupReason() const override { return startup_reason; }
  uint16_t getBattMilliVolts() override {
    int adcvalue = 0;
@@ -33,7 +37,13 @@ public:
    return "Heltec MeshPocket";
  }
  void reboot() override {
    NVIC_SystemReset();
  }
  void powerOff() override {
    sd_power_system_off();
  }
  bool startOTAUpdate(const char* id, char reply[]) override;
 };
--- a/variants/minewsemi_me25ls01/MinewsemiME25LS01Board.cpp
+++ b/variants/minewsemi_me25ls01/MinewsemiME25LS01Board.cpp
@@ -1,14 +1,18 @@
 #include <Arduino.h>
 #include "MinewsemiME25LS01Board.h"
 #include <Wire.h>
-#include "MinewsemiME25LS01Board.h"
+#include <bluefruit.h>
 void MinewsemiME25LS01Board::begin() {
-  NRF52Board::begin();
+  // for future use, sub-classes SHOULD call this from their begin()
  startup_reason = BD_STARTUP_NORMAL;
  btn_prev_state = HIGH;
  pinMode(PIN_VBAT_READ, INPUT);
  sd_power_mode_set(NRF_POWER_MODE_LOWPWR);
 #ifdef BUTTON_PIN
  pinMode(BUTTON_PIN, INPUT);
  pinMode(LED_PIN, OUTPUT);
@@ -27,3 +31,61 @@ void MinewsemiME25LS01Board::begin() {
  delay(10);   // give sx1262 some time to power up
 }
 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 MinewsemiME25LS01Board::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("Minewsemi_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;
 }
--- a/variants/minewsemi_me25ls01/MinewsemiME25LS01Board.h
+++ b/variants/minewsemi_me25ls01/MinewsemiME25LS01Board.h
@@ -2,7 +2,6 @@
 #include <MeshCore.h>
 #include <Arduino.h>
 #include <helpers/NRF52Board.h>
 // LoRa and SPI pins
@@ -20,12 +19,13 @@
 #define  PIN_VBAT_READ BATTERY_PIN
 #define  ADC_MULTIPLIER   (1.815f) // dependent on voltage divider resistors. TODO: more accurate battery tracking
-class MinewsemiME25LS01Board : public NRF52BoardOTA {
+
 class MinewsemiME25LS01Board : public mesh::MainBoard {
 protected:
  uint8_t startup_reason;
  uint8_t btn_prev_state;
 public:
  MinewsemiME25LS01Board() : NRF52BoardOTA("Minewsemi_OTA") {}
  void begin();
 #define BATTERY_SAMPLES 8
@@ -41,6 +41,8 @@ public:
    return (ADC_MULTIPLIER * raw);
  }
  uint8_t getStartupReason() const override { return startup_reason; }
  const char* getManufacturerName() const override {
    return "Minewsemi";
  }
@@ -76,4 +78,11 @@ public:
    digitalWrite(P_LORA_TX_LED, LOW); // turn TX LED off
  }
 #endif
  void reboot() override {
    NVIC_SystemReset();
  }
  bool startOTAUpdate(const char* id, char reply[]) override;
 };
--- a/variants/nano_g2_ultra/nano-g2.cpp
+++ b/variants/nano_g2_ultra/nano-g2.cpp
@@ -24,7 +24,8 @@ static void disconnect_callback(uint16_t conn_handle, uint8_t reason)
 void NanoG2Ultra::begin()
 {
-  NRF52Board::begin();
+  // for future use, sub-classes SHOULD call this from their begin()
  startup_reason = BD_STARTUP_NORMAL;
  // set user button
  pinMode(PIN_BUTTON1, INPUT);
--- a/variants/nano_g2_ultra/nano-g2.h
+++ b/variants/nano_g2_ultra/nano-g2.h
@@ -4,7 +4,6 @@
 #include <Arduino.h>
 #include <MeshCore.h>
 #include <helpers/NRF52Board.h>
 // LoRa radio module pins
 #define P_LORA_DIO_1             (32 + 10)
@@ -35,14 +34,21 @@
 #define PIN_VBAT_READ            (0 + 2)
 #define REAL_VBAT_MV_PER_LSB     (VBAT_DIVIDER_COMP * VBAT_MV_PER_LSB)
-class NanoG2Ultra : public NRF52Board {
+class NanoG2Ultra : public mesh::MainBoard {
 protected:
  uint8_t startup_reason;
 public:
  void begin();
  uint16_t getBattMilliVolts() override;
  bool startOTAUpdate(const char *id, char reply[]) override;
  uint8_t getStartupReason() const override { return startup_reason; }
  const char *getManufacturerName() const override { return "Nano G2 Ultra"; }
  void reboot() override { NVIC_SystemReset(); }
  void powerOff() override {
    // put GPS chip to sleep
    digitalWrite(PIN_GPS_STANDBY, LOW);
--- a/variants/nibble_screen_connect/platformio.ini
+++ b/variants/nibble_screen_connect/platformio.ini
@@ -1,160 +0,0 @@
 [nibble_screen_connect_base]
 extends = esp32_base
 board = esp32-s3-zero
 build_flags =
  ${esp32_base.build_flags}
  -I variants/nibble_screen_connect
  -D NIBBLE_SCREEN_CONNECT
  -D P_LORA_DIO_1=4
  -D P_LORA_NSS=10
  -D P_LORA_RESET=6
  -D P_LORA_BUSY=5
  -D P_LORA_SCLK=13
  -D P_LORA_MISO=12
  -D P_LORA_MOSI=11
  -D PIN_USER_BTN=1
  -D PIN_BOARD_SDA=8
  -D PIN_BOARD_SCL=7
  -D HAS_NEOPIXEL
  -D NEOPIXEL_COUNT=1
  -D NEOPIXEL_DATA=21
  -D NEOPIXEL_TYPE=(NEO_GRB+NEO_KHZ800)
  -D SX126X_DIO2_AS_RF_SWITCH=true
  -D SX126X_DIO3_TCXO_VOLTAGE=1.8
  -D SX126X_CURRENT_LIMIT=140
  -D RADIO_CLASS=CustomSX1262
  -D WRAPPER_CLASS=CustomSX1262Wrapper
  -D LORA_TX_POWER=22
  -D SX126X_RX_BOOSTED_GAIN=1
 build_src_filter = ${esp32_base.build_src_filter}
  +<../variants/nibble_screen_connect>
 lib_deps =
  ${esp32_base.lib_deps}
  adafruit/Adafruit SSD1306 @ ^2.5.13
  adafruit/Adafruit NeoPixel @ ^1.12.3
 [env:nibble_screen_connect_repeater]
 extends = nibble_screen_connect_base
 build_flags =
  ${nibble_screen_connect_base.build_flags}
  -D DISPLAY_CLASS=SSD1306Display
  -D ADVERT_NAME='"Nibble Repeater"'
  -D ADVERT_LAT=0.0
  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
  -D MAX_NEIGHBOURS=50
 build_src_filter = ${nibble_screen_connect_base.build_src_filter}
  +<helpers/ui/SSD1306Display.cpp>
  +<../examples/simple_repeater>
 lib_deps =
  ${nibble_screen_connect_base.lib_deps}
  ${esp32_ota.lib_deps}
 [env:nibble_screen_connect_repeater_bridge_espnow]
 extends = nibble_screen_connect_base
 build_flags =
  ${nibble_screen_connect_base.build_flags}
  -D DISPLAY_CLASS=SSD1306Display
  -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
 build_src_filter = ${nibble_screen_connect_base.build_src_filter}
  +<helpers/bridges/ESPNowBridge.cpp>
  +<helpers/ui/SSD1306Display.cpp>
  +<../examples/simple_repeater>
 lib_deps =
  ${nibble_screen_connect_base.lib_deps}
  ${esp32_ota.lib_deps}
 [env:nibble_screen_connect_terminal_chat]
 extends = nibble_screen_connect_base
 build_flags =
  ${nibble_screen_connect_base.build_flags}
  -D MAX_CONTACTS=300
  -D MAX_GROUP_CHANNELS=1
 build_src_filter = ${nibble_screen_connect_base.build_src_filter}
  +<../examples/simple_secure_chat/main.cpp>
 lib_deps =
  ${nibble_screen_connect_base.lib_deps}
  densaugeo/base64 @ ~1.4.0
 [env:nibble_screen_connect_room_server]
 extends = nibble_screen_connect_base
 build_flags =
  ${nibble_screen_connect_base.build_flags}
  -D DISPLAY_CLASS=SSD1306Display
  -D ADVERT_NAME='"Nibble Room"'
  -D ADVERT_LAT=0.0
  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
  -D ROOM_PASSWORD='"hello"'
 build_src_filter = ${nibble_screen_connect_base.build_src_filter}
  +<helpers/ui/SSD1306Display.cpp>
  +<../examples/simple_room_server>
 lib_deps =
  ${nibble_screen_connect_base.lib_deps}
  ${esp32_ota.lib_deps}
 [env:nibble_screen_connect_companion_radio_usb]
 extends = nibble_screen_connect_base
 build_flags =
  ${nibble_screen_connect_base.build_flags}
  -I examples/companion_radio/ui-new
  -D DISPLAY_CLASS=SSD1306Display
  -D MAX_CONTACTS=300
  -D MAX_GROUP_CHANNELS=8
 build_src_filter = ${nibble_screen_connect_base.build_src_filter}
  +<helpers/ui/SSD1306Display.cpp>
  +<helpers/ui/MomentaryButton.cpp>
  +<../examples/companion_radio/*.cpp>
  +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps =
  ${nibble_screen_connect_base.lib_deps}
  densaugeo/base64 @ ~1.4.0
 [env:nibble_screen_connect_companion_radio_ble]
 extends = nibble_screen_connect_base
 build_flags =
  ${nibble_screen_connect_base.build_flags}
  -I examples/companion_radio/ui-new
  -D DISPLAY_CLASS=SSD1306Display
  -D MAX_CONTACTS=300
  -D MAX_GROUP_CHANNELS=8
  -D BLE_PIN_CODE=123456
  -D BLE_DEBUG_LOGGING=1
  -D OFFLINE_QUEUE_SIZE=256
 build_src_filter = ${nibble_screen_connect_base.build_src_filter}
  +<helpers/esp32/*.cpp>
  +<helpers/ui/SSD1306Display.cpp>
  +<helpers/ui/MomentaryButton.cpp>
  +<../examples/companion_radio/*.cpp>
  +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps =
  ${nibble_screen_connect_base.lib_deps}
  densaugeo/base64 @ ~1.4.0
 [env:nibble_screen_connect_companion_radio_wifi]
 extends = nibble_screen_connect_base
 build_flags =
  ${nibble_screen_connect_base.build_flags}
  -I examples/companion_radio/ui-new
  -D DISPLAY_CLASS=SSD1306Display
  -D MAX_CONTACTS=300
  -D MAX_GROUP_CHANNELS=8
  -D WIFI_DEBUG_LOGGING=1
  -D WIFI_SSID='"myssid"'
  -D WIFI_PWD='"mypwd"'
  -D OFFLINE_QUEUE_SIZE=256  
 build_src_filter = ${nibble_screen_connect_base.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 =
  ${nibble_screen_connect_base.lib_deps}
  densaugeo/base64 @ ~1.4.0
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthias Wientapper	f8f9cddb47	Integrate pending PRs from upstream repository	2026-01-09 23:23:39 +01:00
Liam Cottle	6b52fb3230	Merge pull request #1310 from LitBomb/patch-22 fix Station G2 output dBm typo	2026-01-03 19:39:31 +13:00
uncle lit	a93527a474	fix Station G2 output dBm typo fix Station G2 output dBm typo reported on https://github.com/meshcore-dev/MeshCore/issues/1304 changed 26.5 dBm to 36.5 dBm	2026-01-02 22:34:10 -08:00
ripplebiz	9b08a9bd93	Merge pull request #1260 from LitBomb/patch-21 Update FAQ with new community projects and tx power settings for amped radios	2025-12-29 13:44:38 +11:00
uncle lit	27c92d2fe9	Update FAQ with new MeshCore applications and tx power settings for amped radios Added entries for meshcore-pi and pyMC_Repeater to the FAQ Added tx power settings for amped radios	2025-12-21 21:48:56 -08:00
Liam Cottle	2228214ded	Merge pull request #1216 from mattzzw/main Update faq.md	2025-12-15 18:18:00 +13:00
mattzzw	2bcc9c10d2	Update faq.md Fix typo	2025-12-14 18:29:49 +01:00
ripplebiz	922e378be5	Merge pull request #1192 from LitBomb/patch-20 Update faq.md	2025-12-11 10:21:19 +11:00
uncle lit	1f5659dd26	Update faq.md fix typo bugs found by @4np	2025-12-08 09:33:10 -08:00
uncle lit	cae37d8892	Update faq.md add get and set prv.key add web site to generate new private key and specific its public key's first byte value add link to repeater observer instruction add links to The Comms Channel's meshcore video, MCarper's Meshcore Advantages, and Austin Mesh's MeshCore vs Meshtastic comparison add deafness instruction for agc reset interval add reference to Liam's Windows and Intel Mac client apps add reference to Tree's Meshcore packet decoder add OTA BLE update addendum for Seeed Wio Tracker L1 Pro add instruction to use T-deck's software keyboard to enter `=` at the end of the base64 public key	2025-12-07 22:31:54 -08:00
Scott Powell	6d3219329f	Merge branch 'dev'	2025-11-30 18:32:49 +11:00
Scott Powell	9405e8bee3	Merge branch 'dev' # Conflicts: # docs/payloads.md	2025-11-13 20:47:52 +11:00
fdlamotte	8b68b5a689	Update README.md (RAK boards don't need pio patch)	2025-11-12 16:14:57 +01:00
Liam Cottle	b2dcb06197	Merge pull request #809 from tekstrand/fixup Change source of truth to this repo, remove whitespace	2025-10-19 12:07:53 +13:00
ripplebiz	da5dbcd274	Merge pull request #871 from spacepc-de/fix-debug-log-field Fix debug log: use c->extra.room.push_failures instead of c->push_failures	2025-10-07 09:45:11 +11:00
tekstrand	3e3fa5b443	trim trailing whitespace, clarify repeater gps, remove outdated instructions	2025-10-04 10:54:24 -05:00
Scott Powell	f5f5886327	Merge branch 'dev'	2025-10-02 12:52:48 +10:00
Jonathan Stöcklmayer	6ee0b85195	Fix debug log: use c->extra.room.push_failures instead of non-existent c->push_failures	2025-10-01 09:50:41 +02:00
ripplebiz	86225cd24a	Merge pull request #869 from LitBomb/patch-19 Update faq.md	2025-10-01 13:46:44 +10:00
uncle lit	f594f2c7e6	Update faq.md added pyMC_core to meshcore projects mentioned Cisien's meshcoretomqtt fork from Andrew-a-g updated Coding Rate explanation and recommendation updated radio presets and added how to update presets listed in the app	2025-09-30 16:01:11 -07:00
Liam Cottle	3dc04deabf	Merge pull request #837 from silverphish-io/typo-fix Typo fix	2025-09-29 10:42:23 +13:00
ripplebiz	c8a6bcf57f	Update README.md	2025-09-28 21:43:30 +10:00
silverphish-io	4e886bfa90	Typo fix in faq and payloads	2025-09-25 15:01:39 +01:00
silverphish-io	816d4e2fa3	Update faq.md	2025-09-25 14:59:25 +01:00