CommonCLI.cpp: CommonCLI: Set limits for flood advert interval check to 12-48h

Set repeater default lower limit flood_advert_interval to 12h, set room server default to 48h/12h min.
Set lower limit of flood_advert_interval to 12h
2025-12-15 11:24:11 +01:00 · 2025-12-14 19:56:34 +01:00 · 2025-12-14 19:52:40 +01:00 · 2025-12-14 19:28:21 +01:00
138 changed files with 1819 additions and 5110 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)

@@ -106,7 +106,7 @@ There are a number of fairly major features in the pipeline, with no particular
 - [ ] 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

--- 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/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
@@ -67,10 +67,8 @@ author: https://github.com/LitBomb<!-- omit from toc -->
    - [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)
+  - [5.15. Q: Are there client applications for Windows or Mac?](#515-q-are-there-clientt-applications-for-windows-or-mac)
+  - [5.16. Q: Are there any resources that compare MeshCore to other LoRa systems?](#516-q-are-there-any-document-that-compares-meshcore-with-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)
@@ -88,8 +86,6 @@ author: https://github.com/LitBomb<!-- omit from toc -->
  - [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-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

@@ -273,7 +269,7 @@ You can get the latitude and longitude from Google Maps by right-clicking the lo
 **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
+`set prv.key <hex>` to set a repeater's private key on the serila console

 Reboot the repeater after `set prv.key <hex>` command for the new private key to take effect.

@@ -640,14 +636,6 @@ https://github.com/rightup/pyMC_core
 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:
@@ -802,22 +790,4 @@ 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/payloads.md
+++ b/docs/payloads.md
@@ -103,9 +103,7 @@ Request type
 | `0x02` | keepalive            | (deprecated) |
 | `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  |
+| `0x05` | get access list      | get node's approved access list       |

 ### 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();
-  esp_err_t nvs_err = nvs_flash_erase(); // no need to reinit, will be done by reboot
-  return fs_success && (nvs_err == ESP_OK);
+  return ((fs::SPIFFSFS *)_fs)->format();
 #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,54 +261,9 @@ 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 (!shouldAutoAddContactType(contact.type) && is_new) {
+    if (!isAutoAddEnabled() && is_new) {
      writeContactRespFrame(PUSH_CODE_NEW_ADVERT, contact);
    } else {
      out_frame[0] = PUSH_CODE_ADVERT;
@@ -799,8 +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.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
 }

@@ -838,8 +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.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) {
@@ -862,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);

@@ -964,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 {
@@ -1300,7 +1234,7 @@ void MyMesh::handleCmdFrame(size_t len) {
    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 {
@@ -1347,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);
@@ -1608,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);
@@ -1696,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();
@@ -1723,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]);
@@ -1976,4 +1865,4 @@ bool MyMesh::advert() {
  } else {
    return false;
  }
-}
+}
--- 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/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
@@ -132,7 +129,7 @@ class HomeScreen : public UIScreen {
  bool sensors_scroll = false;
  int sensors_scroll_offset = 0;
  int next_sensors_refresh = 0;
-  
+
  void refresh_sensors() {
    if (millis() > next_sensors_refresh) {
      sensors_lpp.reset();
@@ -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,13 +608,9 @@ 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()) {
-      _display->turnOn();
-    }
-    if (_display->isOn()) {
+    if (!_display->isOn()) _display->turnOn();
    _auto_off = millis() + AUTO_OFF_MILLIS;  // extend the auto-off timer
    _next_refresh = 100;  // trigger refresh
-    }
  }
 }

@@ -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
@@ -54,7 +50,7 @@ class UITask : public AbstractUITask {
  UIScreen* curr;

  void userLedHandler();
-
+  
  // Button action handlers
  char checkDisplayOn(char c);
  char handleLongPress(char c);
--- a/examples/companion_radio/ui-orig/UITask.cpp
+++ b/examples/companion_radio/ui-orig/UITask.cpp
@@ -137,13 +137,9 @@ 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()) {
-      _display->turnOn();
-    }
-    if (_display->isOn()) {
+    if (!_display->isOn()) _display->turnOn();
    _auto_off = millis() + AUTO_OFF_MILLIS;  // extend the auto-off timer
    _need_refresh = true;
-    }
  }
 }

--- 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
 }
@@ -390,14 +317,6 @@ bool MyMesh::allowPacketForward(const mesh::Packet *packet) {
    MESH_DEBUG_PRINTLN("allowPacketForward: unknown transport code, or wildcard not allowed for FLOOD packet");
    return false;
  }
-  // Limit flood advert paket forwarding using a probabilistic reduction defined by P(h) = 0.308^(hops-1)
-  // https://github.com/meshcore-dev/MeshCore/issues/1223
-  double_t roll_dice = (double)rand() / RAND_MAX;
-  double_t forw_prob = pow(_prefs.flood_advert_base, packet->path_len - 1);
-  if (packet->getPayloadType() == PAYLOAD_TYPE_ADVERT && packet->isRouteFlood() && roll_dice > forw_prob)
-    return false;
-
-  // all other packets
  return true;
 }

@@ -522,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()) {
-      reply_len = handleAnonRegionsReq(sender, timestamp, &data[5]);
-    } 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 if (data[4] == ANON_REQ_TYPE_*) {   // future type codes
+      // TODO
    } else {
-      reply_len = 0;  // unknown/invalid request type
+      reply_len = 0;  // unknown request type
    }

    if (reply_len == 0) return;   // invalid request
@@ -543,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);
    }
  }
 }
@@ -719,16 +629,8 @@ bool MyMesh::onPeerPathRecv(mesh::Packet *packet, int sender_idx, const uint8_t
 #define CTL_TYPE_NODE_DISCOVER_RESP  0x90

 void MyMesh::onControlDataRecv(mesh::Packet* packet) {
-  if (!packet->payload) {
-    MESH_DEBUG_PRINTLN("onControlDataRecv: packet->payload is null");
-    return;
-  }
-
-#if !defined(STEALTH_MODE)
  uint8_t type = packet->payload[0] & 0xF0;    // just test upper 4 bits
-  if (type == CTL_TYPE_NODE_DISCOVER_REQ && packet->payload_len >= 6
-      && !_prefs.disable_fwd && discover_limiter.allow(rtc_clock.getCurrentTime())
-  ) {
+  if (type == CTL_TYPE_NODE_DISCOVER_REQ && packet->payload_len >= 6 && discover_limiter.allow(rtc_clock.getCurrentTime())) {
    int i = 1;
    uint8_t  filter = packet->payload[i++];
    uint32_t tag;
@@ -753,15 +655,13 @@ void MyMesh::onControlDataRecv(mesh::Packet* packet) {
      }
    }
  }
-#endif
 }

 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, &_prefs, this), telemetry(MAX_PACKET_PAYLOAD - 4), region_map(key_store), temp_map(key_store),
-      discover_limiter(4, 120),  // max 4 every 2 minutes
-      anon_limiter(4, 180)   // max 4 every 3 minutes
+      discover_limiter(4, 120)  // max 4 every 2 minutes
 #if defined(WITH_RS232_BRIDGE)
      , bridge(&_prefs, WITH_RS232_BRIDGE, _mgr, &rtc)
 #endif
@@ -796,9 +696,8 @@ MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondCloc
  _prefs.bw = LORA_BW;
  _prefs.cr = LORA_CR;
  _prefs.tx_power_dbm = LORA_TX_POWER;
-  _prefs.advert_interval = DEF_LOCAL_ADVERT_INTERVAL;
-  _prefs.flood_advert_interval = DEF_FLOOD_ADVERT_INTERVAL;
-  _prefs.flood_advert_base = 0.308f;
+  _prefs.advert_interval = 1;        // default to 2 minutes for NEW installs
+  _prefs.flood_advert_interval = 48; // 48 hours, minimum is 12h
  _prefs.flood_max = 64;
  _prefs.interference_threshold = 0; // disabled

@@ -870,14 +769,10 @@ bool MyMesh::formatFileSystem() {
 #endif
 }

-void MyMesh::sendSelfAdvertisement(int delay_millis, bool flood) {
+void MyMesh::sendSelfAdvertisement(int delay_millis) {
  mesh::Packet *pkt = createSelfAdvert();
  if (pkt) {
-    if (flood) {
-      sendFlood(pkt, delay_millis);
-    } else {
-      sendZeroHop(pkt, delay_millis);
-    }
+    sendFlood(pkt, delay_millis);
  } else {
    MESH_DEBUG_PRINTLN("ERROR: unable to create advertisement packet!");
  }
@@ -892,7 +787,7 @@ void MyMesh::updateAdvertTimer() {
 }

 void MyMesh::updateFloodAdvertTimer() {
-  if (_prefs.flood_advert_interval > 0) { // schedule flood advert timer
+  if (_prefs.flood_advert_interval > 12) { // schedule flood advert timer, min. 12h
    next_flood_advert = futureMillis(((uint32_t)_prefs.flood_advert_interval) * 60 * 60 * 1000);
  } else {
    next_flood_advert = 0; // stop the timer
@@ -1214,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
@@ -88,14 +88,12 @@ class MyMesh : public mesh::Mesh, public CommonCLICallbacks {
  NodePrefs _prefs;
  CommonCLI _cli;
  uint8_t reply_data[MAX_PACKET_PAYLOAD];
-  uint8_t reply_path[MAX_PATH_SIZE];
-  int8_t  reply_path_len;
  ClientACL  acl;
  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();

@@ -186,7 +181,7 @@ public:

  void applyTempRadioParams(float freq, float bw, uint8_t sf, uint8_t cr, int timeout_mins) override;
  bool formatFileSystem() override;
-  void sendSelfAdvertisement(int delay_millis, bool flood = true) override;
+  void sendSelfAdvertisement(int delay_millis) override;
  void updateAdvertTimer() override;
  void updateFloodAdvertTimer() override;

@@ -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();
@@ -87,10 +80,8 @@ void setup() {
  ui_task.begin(the_mesh.getNodePrefs(), FIRMWARE_BUILD_DATE, FIRMWARE_VERSION);
 #endif

-#if !defined(STEALTH_MODE) && !defined(NO_BOOT_ADVERT)
-  // send out initial Zero Hop Advertisement to the mesh
-  the_mesh.sendSelfAdvertisement(16000, false);
-#endif
+  // send out initial Advertisement to the mesh
+  the_mesh.sendSelfAdvertisement(16000);
 }

 void loop() {
@@ -126,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
@@ -275,15 +275,6 @@ uint32_t MyMesh::getDirectRetransmitDelay(const mesh::Packet *packet) {
 bool MyMesh::allowPacketForward(const mesh::Packet *packet) {
  if (_prefs.disable_fwd) return false;
  if (packet->isRouteFlood() && packet->path_len >= _prefs.flood_max) return false;
-
-  // Limit flood advert paket forwarding using a probabilistic reduction defined by P(h) = 0.308^(hops-1)
-  // https://github.com/meshcore-dev/MeshCore/issues/1223
-  double_t roll_dice = (double)rand() / RAND_MAX;
-  double_t forw_prob = pow(_prefs.flood_advert_base, packet->path_len - 1);
-  if (packet->getPayloadType() == PAYLOAD_TYPE_ADVERT && packet->isRouteFlood() && roll_dice > forw_prob)
-    return false;
-
-  // all other packets
  return true;
 }

@@ -620,9 +611,8 @@ MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondCloc
  _prefs.cr = LORA_CR;
  _prefs.tx_power_dbm = LORA_TX_POWER;
  _prefs.disable_fwd = 1;
-  _prefs.advert_interval = DEF_LOCAL_ADVERT_INTERVAL;
-  _prefs.flood_advert_interval = DEF_FLOOD_ADVERT_INTERVAL;
-  _prefs.flood_advert_base = 0.308f;
+  _prefs.advert_interval = 1;        // default to 2 minutes for NEW installs
+  _prefs.flood_advert_interval = 48; // 48 hours
  _prefs.flood_max = 64;
  _prefs.interference_threshold = 0; // disabled
 #ifdef ROOM_PASSWORD
@@ -685,14 +675,10 @@ bool MyMesh::formatFileSystem() {
 #endif
 }

-void MyMesh::sendSelfAdvertisement(int delay_millis, bool flood) {
+void MyMesh::sendSelfAdvertisement(int delay_millis) {
  mesh::Packet *pkt = createSelfAdvert();
  if (pkt) {
-    if (flood) {
-      sendFlood(pkt, delay_millis);
-    } else {
-      sendZeroHop(pkt, delay_millis);
-    }
+    sendFlood(pkt, delay_millis);
  } else {
    MESH_DEBUG_PRINTLN("ERROR: unable to create advertisement packet!");
  }
@@ -706,7 +692,7 @@ void MyMesh::updateAdvertTimer() {
  }
 }
 void MyMesh::updateFloodAdvertTimer() {
-  if (_prefs.flood_advert_interval > 0) { // schedule flood advert timer
+  if (_prefs.flood_advert_interval > 12) { // schedule flood advert timer
    next_flood_advert = futureMillis(((uint32_t)_prefs.flood_advert_interval) * 60 * 60 * 1000);
  } else {
    next_flood_advert = 0; // stop the timer
--- a/examples/simple_room_server/MyMesh.h
+++ b/examples/simple_room_server/MyMesh.h
@@ -177,7 +177,7 @@ public:

  void applyTempRadioParams(float freq, float bw, uint8_t sf, uint8_t cr, int timeout_mins) override;
  bool formatFileSystem() override;
-  void sendSelfAdvertisement(int delay_millis, bool flood = true) override;
+  void sendSelfAdvertisement(int delay_millis) override;
  void updateAdvertTimer() override;
  void updateFloodAdvertTimer() override;

--- a/examples/simple_room_server/main.cpp
+++ b/examples/simple_room_server/main.cpp
@@ -76,10 +76,8 @@ void setup() {
  ui_task.begin(the_mesh.getNodePrefs(), FIRMWARE_BUILD_DATE, FIRMWARE_VERSION);
 #endif

-#if !defined(STEALTH_MODE) && !defined(NO_BOOT_ADVERT)
-  // send out initial Zero Hop Advertisement to the mesh
-  the_mesh.sendSelfAdvertisement(16000, false);
-#endif
+  // send out initial Advertisement to the mesh
+  the_mesh.sendSelfAdvertisement(16000);
 }

 void loop() {
--- a/examples/simple_sensor/SensorMesh.cpp
+++ b/examples/simple_sensor/SensorMesh.cpp
@@ -718,7 +718,7 @@ SensorMesh::SensorMesh(mesh::MainBoard& board, mesh::Radio& radio, mesh::Millise
  _prefs.bw = LORA_BW;
  _prefs.cr = LORA_CR;
  _prefs.tx_power_dbm = LORA_TX_POWER;
-  _prefs.advert_interval = DEF_LOCAL_ADVERT_INTERVAL;
+  _prefs.advert_interval = 1;  // default to 2 minutes for NEW installs
  _prefs.flood_advert_interval = 0;   // disabled
  _prefs.disable_fwd = true;
  _prefs.flood_max = 64;
@@ -788,14 +788,10 @@ void SensorMesh::applyTempRadioParams(float freq, float bw, uint8_t sf, uint8_t
  revert_radio_at = futureMillis(2000 + timeout_mins*60*1000);   // schedule when to revert radio params
 }

-void SensorMesh::sendSelfAdvertisement(int delay_millis, bool flood) {
+void SensorMesh::sendSelfAdvertisement(int delay_millis) {
  mesh::Packet* pkt = createSelfAdvert();
  if (pkt) {
-    if (flood) {
-      sendFlood(pkt, delay_millis);
-    } else {
-      sendZeroHop(pkt, delay_millis);
-    }
+    sendFlood(pkt, delay_millis);
  } else {
    MESH_DEBUG_PRINTLN("ERROR: unable to create advertisement packet!");
  }
--- a/examples/simple_sensor/SensorMesh.h
+++ b/examples/simple_sensor/SensorMesh.h
@@ -60,7 +60,7 @@ public:
  NodePrefs* getNodePrefs() { return &_prefs; }
  void savePrefs() override { _cli.savePrefs(_fs); }
  bool formatFileSystem() override;
-  void sendSelfAdvertisement(int delay_millis, bool flood = true) override;
+  void sendSelfAdvertisement(int delay_millis) override;
  void updateAdvertTimer() override;
  void updateFloodAdvertTimer() override;
  void setLoggingOn(bool enable) override {  }
--- a/examples/simple_sensor/main.cpp
+++ b/examples/simple_sensor/main.cpp
@@ -110,10 +110,8 @@ void setup() {
  ui_task.begin(the_mesh.getNodePrefs(), FIRMWARE_BUILD_DATE, FIRMWARE_VERSION);
 #endif

-#if !defined(STEALTH_MODE) && !defined(NO_BOOT_ADVERT)
-  // send out initial Zero Hop Advertisement to the mesh
-  the_mesh.sendSelfAdvertisement(16000, false);
-#endif
+  // send out initial Advertisement to the mesh
+  the_mesh.sendSelfAdvertisement(16000);
 }

 void loop() {
--- a/platformio.ini
+++ b/platformio.ini
@@ -23,16 +23,12 @@ lib_deps =
  adafruit/RTClib @ ^2.1.3
  melopero/Melopero RV3028 @ ^1.1.0
  electroniccats/CayenneLPP @ 1.6.1
-build_flags = -w -DNDEBUG
+build_flags = -w -DNDEBUG -DRADIOLIB_STATIC_ONLY=1 -DRADIOLIB_GODMODE=1
  -D LORA_FREQ=869.525
  -D LORA_BW=250
  -D LORA_SF=11
-  ;
  -D ENABLE_PRIVATE_KEY_IMPORT=1   ; NOTE: comment these out for more secure firmware
  -D ENABLE_PRIVATE_KEY_EXPORT=1
-  ;
-  -D RADIOLIB_STATIC_ONLY=1
-  -D RADIOLIB_GODMODE=1
  -D RADIOLIB_EXCLUDE_CC1101=1
  -D RADIOLIB_EXCLUDE_RF69=1
  -D RADIOLIB_EXCLUDE_SX1231=1
@@ -47,15 +43,6 @@ build_flags = -w -DNDEBUG
  -D RADIOLIB_EXCLUDE_BELL=1
  -D RADIOLIB_EXCLUDE_RTTY=1
  -D RADIOLIB_EXCLUDE_SSTV=1
-  ;
-  -D MIN_LOCAL_ADVERT_INTERVAL=60
-  -D MAX_LOCAL_ADVERT_INTERVAL=10000
-  -D DEF_LOCAL_ADVERT_INTERVAL=1    ; default to 2 minutes for NEW installs
-  -D MIN_FLOOD_ADVERT_INTERVAL=48
-  -D MAX_FLOOD_ADVERT_INTERVAL=10000
-  -D DEF_FLOOD_ADVERT_INTERVAL=48   ; default to 12 hours for NEW installs
-  ; -D NO_BOOT_ADVERT=1 ; disable boot advertisement
-  ; -D STEALTH_MODE=1   ; disable all advertisements and DISCOVER_REQ
 build_src_filter =
  +<*.cpp>
  +<helpers/*.cpp>
@@ -92,9 +79,7 @@ extends = arduino_base
 platform = nordicnrf52
 platform_packages =
  framework-arduinoadafruitnrf52 @ 1.10700.0
-extra_scripts = 
-  create-uf2.py
-  arch/nrf52/extra_scripts/patch_bluefruit.py
+extra_scripts = create-uf2.py
 build_flags = ${arduino_base.build_flags}
  -D NRF52_PLATFORM
  -D LFS_NO_ASSERT=1
--- 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,7 +49,6 @@ 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;
--- 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())) {
@@ -135,37 +87,49 @@ void BaseChatMesh::onAdvertRecv(mesh::Packet* packet, const mesh::Identity& id,

  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;
    }

    is_new = true;
-    from = allocateContactSlot();
-    if (from == NULL) {
-      ContactInfo ci;
-      populateContactFromAdvert(ci, id, parser, timestamp);
-      onDiscoveredContact(ci, true, packet->path_len, packet->path);
-      onContactsFull();
-      MESH_DEBUG_PRINTLN("onAdvertRecv: unable to allocate contact slot for new contact");
+    if (num_contacts < MAX_CONTACTS) {
+      from = &contacts[num_contacts++];
+      from->id = id;
+      from->out_path_len = -1;  // initially out_path is unknown
+      from->gps_lat = 0;   // initially unknown GPS loc
+      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();
-    if (parser.hasLatLon()) {
-      from->gps_lat = parser.getIntLat();
-      from->gps_lon = parser.getIntLon();
-    }
-    from->last_advert_timestamp = timestamp;
-    from->lastmod = getRTCClock()->getCurrentTime();
+  StrHelper::strncpy(from->name, parser.getName(), sizeof(from->name));
+  from->type = parser.getType();
+  if (parser.hasLatLon()) {
+    from->gps_lat = parser.getIntLat();
+    from->gps_lon = parser.getIntLon();
+  }
+  from->last_advert_timestamp = timestamp;
+  from->lastmod = getRTCClock()->getCurrentTime();

  onDiscoveredContact(*from, is_new, packet->path_len, packet->path);       // let UI know
 }
@@ -183,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);
  }
@@ -328,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
 }

@@ -377,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) {
@@ -408,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());
@@ -497,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);
-  }
-  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);
+    pkt = createAnonDatagram(PAYLOAD_TYPE_ANON_REQ, self_id, recipient.id, recipient.shared_secret, temp, tlen);
  }
  if (pkt) {
    uint32_t t = _radio->getEstAirtimeFor(pkt->getRawLength());
@@ -549,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());
@@ -576,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());
@@ -699,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);
      }
@@ -759,10 +699,13 @@ ContactInfo* BaseChatMesh::lookupContactByPubKey(const uint8_t* pub_key, int pre
 }

 bool BaseChatMesh::addContact(const ContactInfo& contact) {
-  ContactInfo* dest = allocateContactSlot();
-  if (dest) {
+  if (num_contacts < MAX_CONTACTS) {
+    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/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,17 +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, 3);                                                                             // 153
+    file.read(pad, 4);                                                                             // 152
    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
-    file.read((uint8_t *)&_prefs->flood_advert_base, sizeof(_prefs->flood_advert_base));                 // 290
-
-    // 294
+    // 170

    // sanitise bad pref values
    _prefs->rx_delay_base = constrain(_prefs->rx_delay_base, 0, 20.0f);
@@ -105,13 +93,9 @@ 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);

-    _prefs->flood_advert_base = constrain(_prefs->flood_advert_base, 0, 1);
-
    file.close();
  }
 }
@@ -161,22 +145,20 @@ 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, 3);                                                                             // 153
+    file.write(pad, 4);                                                                             // 152
    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
-    file.write((uint8_t *)&_prefs->flood_advert_base, sizeof(_prefs->flood_advert_base));                 // 290
-
-    // 294
+    // 170

    file.close();
  }
 }

+#define MIN_LOCAL_ADVERT_INTERVAL   60
+
 void CommonCLI::savePrefs() {
  if (_prefs->advert_interval * 2 < MIN_LOCAL_ADVERT_INTERVAL) {
    _prefs->advert_interval = 0;  // turn it off, now that device has been manually configured
@@ -201,7 +183,6 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
    if (memcmp(command, "reboot", 6) == 0) {
      _board->reboot();  // doesn't return
    } else if (memcmp(command, "advert", 6) == 0) {
-      // Keep "advert" as flood for backward compatibility
      _callbacks->sendSelfAdvertisement(1500);  // longer delay, give CLI response time to be sent first
      strcpy(reply, "OK - Advert sent");
    } else if (memcmp(command, "clock sync", 10) == 0) {
@@ -222,7 +203,7 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
      uint32_t now = getRTCClock()->getCurrentTime();
      DateTime dt = DateTime(now);
      sprintf(reply, "%02d:%02d - %d/%d/%d UTC", dt.hour(), dt.minute(), dt.day(), dt.month(), dt.year());
-    } else if (memcmp(command, "time ", 5) == 0) { // set time (to epoch seconds)
+    } else if (memcmp(command, "time ", 5) == 0) {  // set time (to epoch seconds)
      uint32_t secs = _atoi(&command[5]);
      uint32_t curr = getRTCClock()->getCurrentTime();
      if (secs > curr) {
@@ -316,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) {
@@ -369,8 +341,6 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
        } else {
          sprintf(reply, "> %.3f", adc_mult);
        }
-      } else if (memcmp(config, "flood.advert.base", 17) == 0) {
-          sprintf(reply, "> %s", StrHelper::ftoa(_prefs->flood_advert_base));
      } else {
        sprintf(reply, "??: %s", config);
      }
@@ -401,9 +371,8 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
        strcpy(reply, "OK");
      } else if (memcmp(config, "flood.advert.interval ", 22) == 0) {
        int hours = _atoi(&config[22]);
-        if ((hours > 0 && hours < MIN_FLOOD_ADVERT_INTERVAL) || (hours > MAX_FLOOD_ADVERT_INTERVAL)) {
-          sprintf(reply, "Error: interval range is %d-%d hours", MIN_FLOOD_ADVERT_INTERVAL,
-                  MAX_FLOOD_ADVERT_INTERVAL);
+        if ((hours > 0 && hours < 12) || (hours > 48)) {
+          strcpy(reply, "Error: interval range is 12-48 hours");
        } else {
          _prefs->flood_advert_interval = (uint8_t)(hours);
          _callbacks->updateFloodAdvertTimer();
@@ -412,9 +381,8 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
        }
      } else if (memcmp(config, "advert.interval ", 16) == 0) {
        int mins = _atoi(&config[16]);
-        if ((mins > 0 && mins < MIN_LOCAL_ADVERT_INTERVAL) || (mins > MAX_LOCAL_ADVERT_INTERVAL)) {
-          sprintf(reply, "Error: interval range is %d-%d minutes",MIN_LOCAL_ADVERT_INTERVAL,
-                  MAX_LOCAL_ADVERT_INTERVAL);
+        if ((mins > 0 && mins < MIN_LOCAL_ADVERT_INTERVAL) || (mins > 240)) {
+          sprintf(reply, "Error: interval range is %d-240 minutes", MIN_LOCAL_ADVERT_INTERVAL);
        } else {
          _prefs->advert_interval = (uint8_t)(mins / 2);
          _callbacks->updateAdvertTimer();
@@ -438,13 +406,9 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
          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");
-        }
+        StrHelper::strncpy(_prefs->node_name, &config[5], sizeof(_prefs->node_name));
+        savePrefs();
+        strcpy(reply, "OK");
      } else if (memcmp(config, "repeat ", 7) == 0) {
        _prefs->disable_fwd = memcmp(&config[7], "off", 3) == 0;
        savePrefs();
@@ -511,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();
@@ -592,15 +546,6 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
          _prefs->adc_multiplier = 0.0f;
          strcpy(reply, "Error: unsupported by this board");
        };
-      } else if (memcmp(config, "flood.advert.base ", 18) == 0) {
-        float f = atof(&config[18]);
-        if((f > 0) || (f<1)) {
-          _prefs->flood_advert_base = f;
-          savePrefs();
-          strcpy(reply, "OK");
-        } else {
-          strcpy(reply, "Error: base must be between 0 and 1");
-      }        
      } else {
        sprintf(reply, "unknown config: %s", config);
      }
@@ -731,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
@@ -35,7 +35,6 @@ struct NodePrefs { // persisted to file
  uint8_t flood_max;
  uint8_t interference_threshold;
  uint8_t agc_reset_interval; // secs / 4
-  float flood_advert_base;
  // Bridge settings
  uint8_t bridge_enabled; // boolean
  uint16_t bridge_delay;  // milliseconds (default 500 ms)
@@ -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 {
@@ -61,7 +57,7 @@ public:
  virtual const char* getBuildDate() = 0;
  virtual const char* getRole() = 0;
  virtual bool formatFileSystem() = 0;
-  virtual void sendSelfAdvertisement(int delay_millis, bool flood = true) = 0;
+  virtual void sendSelfAdvertisement(int delay_millis) = 0;
  virtual void updateAdvertTimer() = 0;
  virtual void updateFloodAdvertTimer() = 0;
  virtual void setLoggingOn(bool enable) = 0;
--- 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,104 +0,0 @@
-#if defined(NRF52_PLATFORM)
-#include "NRF52Board.h"
-
-#include <bluefruit.h>
-
-static BLEDfu bledfu;
-
-static void connect_callback(uint16_t conn_handle) {
-  (void)conn_handle;
-  MESH_DEBUG_PRINTLN("BLE client connected");
-}
-
-static void disconnect_callback(uint16_t conn_handle, uint8_t reason) {
-  (void)conn_handle;
-  (void)reason;
-
-  MESH_DEBUG_PRINTLN("BLE client disconnected");
-}
-
-void NRF52Board::begin() {
-  startup_reason = BD_STARTUP_NORMAL;
-}
-
-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,39 +0,0 @@
-#pragma once
-
-#include <Arduino.h>
-#include <MeshCore.h>
-
-#if defined(NRF52_PLATFORM)
-
-class NRF52Board : public mesh::MainBoard {
-protected:
-  uint8_t startup_reason;
-
-public:
-  virtual void begin();
-  virtual uint8_t getStartupReason() const override { return startup_reason; }
-  virtual float getMCUTemperature() override;
-  virtual void reboot() override { NVIC_SystemReset(); }
-};
-
-/*
- * 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
@@ -9,9 +9,8 @@ RegionMap::RegionMap(TransportKeyStore& store) : _store(&store) {
  strcpy(wildcard.name, "*");
 }

-bool RegionMap::is_name_char(uint8_t c) {
-  // accept all alpha-num or accented characters, but exclude most punctuation chars
-  return c == '-' || c == '#' || (c >= '0' && c <= '9') || c >= 'A';
+bool RegionMap::is_name_char(char c) {
+  return (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || c == '-' || c == '.' || c == '_' || c == '#';
 }

 static File openWrite(FILESYSTEM* _fs, const char* filename) {
@@ -25,12 +24,12 @@ static File openWrite(FILESYSTEM* _fs, const char* filename) {
  #endif
 }

-bool RegionMap::load(FILESYSTEM* _fs, const char* path) {
-  if (_fs->exists(path ? path : "/regions2")) {
+bool RegionMap::load(FILESYSTEM* _fs) {
+  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) {
@@ -68,8 +67,8 @@ bool RegionMap::load(FILESYSTEM* _fs, const char* path) {
  return false;  // failed
 }

-bool RegionMap::save(FILESYSTEM* _fs, const char* path) {
-  File file = openWrite(_fs, path ? path : "/regions2");
+bool RegionMap::save(FILESYSTEM* _fs) {
+  File file = openWrite(_fs, "/regions2");
  if (file) {
    uint8_t pad[128];
    memset(pad, 0, sizeof(pad));
@@ -236,27 +235,3 @@ void RegionMap::printChildRegions(int indent, const RegionEntry* parent, Stream&
 void RegionMap::exportTo(Stream& out) const {
  printChildRegions(0, &wildcard, out);   // recursive
 }
-
-int RegionMap::exportNamesTo(char *dest, int max_len, uint8_t mask) {
-  char *dp = dest;
-  if ((wildcard.flags & mask) == 0) {
-    *dp++ = '*';
-    *dp++ = ',';
-  }
-
-  for (int i = 0; i < num_regions; i++) {
-    auto region = &regions[i];
-    if ((region->flags & mask) == 0) {   // region allowed? (per 'mask' param)
-      int len = strlen(region->name);
-      if ((dp - dest) + len + 2 < max_len) {   // only append if name will fit
-        memcpy(dp, 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 save(FILESYSTEM* _fs, const char* path=NULL);
+  bool load(FILESYSTEM* _fs);
+  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,9 +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);

  void exportTo(Stream& out) 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)
-  // Tested with RAK_4631 and T114
+#elif defined(RAK_4631) 
  ((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/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();
@@ -63,9 +54,6 @@ size_t SerialWifiInterface::checkRecvFrame(uint8_t dest[]) {

    // switch active connection to new client
    client = newClient;
-
-    // forget received frame header
-    resetReceivedFrameHeader();
    
  }

@@ -98,69 +86,13 @@ size_t SerialWifiInterface::checkRecvFrame(uint8_t dest[]) {
        send_queue[i] = send_queue[i + 1];
      }
    } else {
-
-      // check if we are waiting for a frame header
-      if(!hasReceivedFrameHeader()){
-
-        // make sure we have received enough bytes for a frame header
-        // 3 bytes frame header = (1 byte frame type) + (2 bytes frame length as unsigned 16-bit little endian)
-        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);
-
-        }
-
+      int len = client.available();
+      if (len > 0) {
+        uint8_t buf[MAX_FRAME_SIZE + 4];
+        client.readBytes(buf, len);
+        memcpy(dest, buf+3, len-3); // remove header (don't even check ... problems are on the other dir)
+        return len-3;
      }
-
-      // 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,387 +1,193 @@
 #include "SerialBLEInterface.h"
-#include <stdio.h>
-#include <string.h>
-#include "ble_gap.h"
-#include "ble_hci.h"

-// Magic numbers came from actual testing
-#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;
+static SerialBLEInterface* instance;

 void SerialBLEInterface::onConnect(uint16_t connection_handle) {
-  BLE_DEBUG_PRINTLN("SerialBLEInterface: connected handle=0x%04X", connection_handle);
-  if (instance) {
-    instance->_conn_handle = connection_handle;
-    instance->_isDeviceConnected = false;
-    instance->clearBuffers();
-  }
+  BLE_DEBUG_PRINTLN("SerialBLEInterface: connected");
+  // we now set _isDeviceConnected=true in onSecured callback instead
 }

 void SerialBLEInterface::onDisconnect(uint16_t connection_handle, uint8_t reason) {
-  BLE_DEBUG_PRINTLN("SerialBLEInterface: disconnected handle=0x%04X reason=%u", connection_handle, reason);
-  if (instance) {
-    if (instance->_conn_handle == connection_handle) {
-      instance->_conn_handle = BLE_CONN_HANDLE_INVALID;
-      instance->_isDeviceConnected = false;
-      instance->clearBuffers();
-    }
+  BLE_DEBUG_PRINTLN("SerialBLEInterface: disconnected reason=%d", reason);
+  if(instance){
+    instance->_isDeviceConnected = false;
+    instance->startAdv();
  }
 }

 void SerialBLEInterface::onSecured(uint16_t connection_handle) {
-  BLE_DEBUG_PRINTLN("SerialBLEInterface: onSecured handle=0x%04X", connection_handle);
-  if (instance) {
-    if (instance->isValidConnection(connection_handle, true)) {
-      instance->_isDeviceConnected = true;
-      
-      // 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)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);
-    }
+  BLE_DEBUG_PRINTLN("SerialBLEInterface: onSecured");
+  if(instance){
+    instance->_isDeviceConnected = true;
+    // no need to stop advertising on connect, as the ble stack does this automatically
  }
 }

 void SerialBLEInterface::begin(const char* device_name, uint32_t pin_code) {
+
  instance = this;

  char charpin[20];
-  snprintf(charpin, sizeof(charpin), "%lu", (unsigned long)pin_code);
-  
-  // If we want to control BLE LED ourselves, uncomment this:
-  // Bluefruit.autoConnLed(false);
+  sprintf(charpin, "%d", pin_code);
+
  Bluefruit.configPrphBandwidth(BANDWIDTH_MAX);
-  Bluefruit.begin();
-  
-  // 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.configPrphConn(250, BLE_GAP_EVENT_LENGTH_MIN, 16, 16);  // increase MTU
  Bluefruit.setTxPower(BLE_TX_POWER);
+  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);
-  Bluefruit.Advertising.setFastTimeout(BLE_ADV_FAST_TIMEOUT);
-
-  Bluefruit.Advertising.restartOnDisconnect(true);
+  /* 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(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() {
-  send_queue_len = 0;
-  recv_queue_len = 0;
-  _last_retry_attempt = 0;
-  bleuart.flush();
-}
+void SerialBLEInterface::stopAdv() {

-void SerialBLEInterface::shiftSendQueueLeft() {
-  if (send_queue_len > 0) {
-    send_queue_len--;
-    for (uint8_t i = 0; i < send_queue_len; i++) {
-      send_queue[i] = send_queue[i + 1];
-    }
+  BLE_DEBUG_PRINTLN("SerialBLEInterface: stopping advertising");
+  
+  // 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;
  }
+
+  // stop advertising
+  Bluefruit.Advertising.stop();
+
 }

-void SerialBLEInterface::shiftRecvQueueLeft() {
-  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];
-    }
-  }
-}
+// ---------- public methods

-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() {
+void SerialBLEInterface::enable() { 
  if (_isEnabled) return;

  _isEnabled = true;
  clearBuffers();
-  _last_health_check = millis();

-  Bluefruit.Advertising.start(0);
-}
-
-void SerialBLEInterface::disconnect() {
-  if (_conn_handle != BLE_CONN_HANDLE_INVALID) {
-    sd_ble_gap_disconnect(_conn_handle, BLE_HCI_REMOTE_USER_TERMINATED_CONNECTION);
-  }
+  // Start advertising
+  startAdv();
 }

 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 (connected && len > 0) {
+  if (_isDeviceConnected && 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++;
-    
+
    return 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 (!isConnected()) {
-      BLE_DEBUG_PRINTLN("writeBytes: connection invalid, clearing send queue");
-      send_queue_len = 0;
-    } else {
-      unsigned long now = millis();
-      bool throttle_active = (_last_retry_attempt > 0 && (now - _last_retry_attempt) < BLE_RETRY_THROTTLE_MS);
+  if (send_queue_len > 0   // first, check send queue
+    && millis() >= _last_write + BLE_WRITE_MIN_INTERVAL    // space the writes apart
+  ) {
+    _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]);

-      if (!throttle_active) {
-        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;
-          }
-        }
-      }
+    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 {
+    int len = bleuart.available();
+    if (len > 0) {
+      bleuart.readBytes(dest, len);
+      BLE_DEBUG_PRINTLN("readBytes: sz=%d, hdr=%d", len, (uint32_t) dest[0]);
+      return len;
    }
  }
-  
-  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;
-}
-
-bool SerialBLEInterface::isWriteBusy() const {
-  return send_queue_len >= (FRAME_QUEUE_SIZE * 2 / 3);
+  return _isDeviceConnected;
 }
--- a/src/helpers/nrf52/SerialBLEInterface.h
+++ b/src/helpers/nrf52/SerialBLEInterface.h
@@ -11,53 +11,41 @@ class SerialBLEInterface : public BaseSerialInterface {
  BLEUart bleuart;
  bool _isEnabled;
  bool _isDeviceConnected;
-  uint16_t _conn_handle;
-  unsigned long _last_health_check;
-  unsigned long _last_retry_attempt;
+  unsigned long _last_write;

  struct Frame {
    uint8_t len;
    uint8_t buf[MAX_FRAME_SIZE];
  };

-  #define FRAME_QUEUE_SIZE  12
-  
-  uint8_t send_queue_len;
+  #define FRAME_QUEUE_SIZE  4
+  int send_queue_len;
  Frame send_queue[FRAME_QUEUE_SIZE];
-  
-  uint8_t recv_queue_len;
-  Frame recv_queue[FRAME_QUEUE_SIZE];

-  void clearBuffers();
-  void shiftSendQueueLeft();
-  void shiftRecvQueueLeft();
-  bool isValidConnection(uint16_t handle, bool requireWaitingForSecurity = false) const;
-  bool isAdvertising() const;
+  void clearBuffers() { send_queue_len = 0; }
  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_health_check = 0;
-    _last_retry_attempt = 0;
+    _last_write = 0;
    send_queue_len = 0;
-    recv_queue_len = 0;
  }

+  void startAdv();
+  void stopAdv();
  void begin(const char* device_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
@@ -192,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;
@@ -366,12 +359,10 @@ 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));
-      }
+      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

@@ -408,7 +399,7 @@ bool EnvironmentSensorManager::querySensors(uint8_t requester_permissions, Cayen
    #if ENV_INCLUDE_LPS22HB
    if (LPS22HB_initialized) {
      telemetry.addTemperature(TELEM_CHANNEL_SELF, BARO.readTemperature());
-      telemetry.addBarometricPressure(TELEM_CHANNEL_SELF, BARO.readPressure() * 10); // convert kPa to hPa
+      telemetry.addBarometricPressure(TELEM_CHANNEL_SELF, BARO.readPressure());
    }
    #endif

@@ -530,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
 }
@@ -615,7 +597,6 @@ void EnvironmentSensorManager::rakGPSInit(){
    MESH_DEBUG_PRINTLN("No GPS found");
    gps_active = false;
    gps_detected = false;
-    Serial1.end();
    return;
  }

@@ -654,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;
@@ -664,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;
 }
@@ -707,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()) {
@@ -728,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);
-    }
+    pinMode(PIN_TFT_LEDA_CTL, OUTPUT);
+    digitalWrite(PIN_TFT_LEDA_CTL, HIGH);
+    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);
-    }
+    digitalWrite(PIN_TFT_LEDA_CTL, HIGH);
+    digitalWrite(PIN_TFT_RST, LOW);
+    digitalWrite(PIN_TFT_LEDA_CTL, LOW);
    _isOn = false;

    if (_peripher_power) _peripher_power->release();
--- a/tools/maint/README.md
+++ b/tools/maint/README.md
@@ -1,56 +0,0 @@
-# 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
@@ -1,65 +0,0 @@
-#!/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,9 +2,25 @@

 #include <Arduino.h>
 #include <Wire.h>
+#include <bluefruit.h>
+
+static BLEDfu bledfu;
+
+static void connect_callback(uint16_t conn_handle) {
+  (void)conn_handle;
+  MESH_DEBUG_PRINTLN("BLE client connected");
+}
+
+static void disconnect_callback(uint16_t conn_handle, uint8_t reason) {
+  (void)conn_handle;
+  (void)reason;
+
+  MESH_DEBUG_PRINTLN("BLE client disconnected");
+}

 void 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);
@@ -23,4 +39,47 @@ void T114Board::begin() {
  pinMode(SX126X_POWER_EN, OUTPUT);
  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,17 +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:
+  uint8_t startup_reason;
+
 public:
-    T114Board() : NRF52BoardOTA("T114_OTA") {}
  void begin();
+  uint8_t getStartupReason() const override { return startup_reason; }

 #if defined(P_LORA_TX_LED)
  void onBeforeTransmit() override {
@@ -41,6 +43,10 @@ public:
    return "Heltec T114";
  }

+  void reboot() override {
+    NVIC_SystemReset();
+  }
+
  void powerOff() override {
    #ifdef LED_PIN
    digitalWrite(LED_PIN, HIGH);
@@ -51,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
@@ -59,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}
@@ -170,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_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/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]
-extends = nrf52_base
+[ikoka_nrf52]
+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]
-lib_deps = ${ikoka_handheld_nrf.lib_deps}
+[ikoka_nrf52_ssd1306_companion]
+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}
+  -D DISPLAY_ROTATION=2    
+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}
+  -D LORA_TX_POWER=20  
+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}
+  -D LORA_TX_POWER=20  
+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_RESET=D3
-  -D P_LORA_NSS=D0
+;  -D P_LORA_BUSY=D3
+  -D P_LORA_BUSY=D2 ; specific to ikoka nano variant.
+;  -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_SDA=4
-  -UENV_INCLUDE_GPS
+  -D PIN_WIRE_SCL=5 ; specific to ikoka nano variant.
+  -D PIN_WIRE_SDA=4 ; specific to ikoka nano variant.
+  -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
-lib_deps = ${nrf52_base.lib_deps}
-  ${sensor_base.lib_deps}
+  -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
+
+
+;;; 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);
@@ -14,4 +18,58 @@ void KeepteenLT1Board::begin() {
    #endif
    
    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);
-EnvironmentSensorManager sensors(gps);
+SensorManager sensors;

 #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);
@@ -26,4 +30,62 @@ void MinewsemiME25LS01Board::begin() {
 #endif

  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/variants/nibble_screen_connect/target.cpp
+++ b/variants/nibble_screen_connect/target.cpp
@@ -1,49 +0,0 @@
-#include <Arduino.h>
-#include "target.h"
-
-ESP32Board board;
-
-static SPIClass spi;
-RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, spi);
-WRAPPER_CLASS radio_driver(radio, board);
-
-ESP32RTCClock fallback_clock;
-AutoDiscoverRTCClock rtc_clock(fallback_clock);
-SensorManager sensors;
-
-#ifdef DISPLAY_CLASS
-  DISPLAY_CLASS display;
-  MomentaryButton user_btn(PIN_USER_BTN, 1000, true);
-#endif
-
-#ifndef LORA_CR
-  #define LORA_CR      5
-#endif
-
-bool radio_init() {
-  fallback_clock.begin();
-  rtc_clock.begin(Wire);
-  
-  return radio.std_init(&spi);
-}
-
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(uint8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
-mesh::LocalIdentity radio_new_identity() {
-  RadioNoiseListener rng(radio);
-  return mesh::LocalIdentity(&rng);
-}
-
--- a/variants/nibble_screen_connect/target.h
+++ b/variants/nibble_screen_connect/target.h
@@ -1,30 +0,0 @@
-#pragma once
-
-#define RADIOLIB_STATIC_ONLY 1
-#include <RadioLib.h>
-#include <helpers/radiolib/RadioLibWrappers.h>
-#include <helpers/ESP32Board.h>
-#include <helpers/radiolib/CustomSX1262Wrapper.h>
-#include <helpers/AutoDiscoverRTCClock.h>
-#include <helpers/SensorManager.h>
-#ifdef DISPLAY_CLASS
-  #include <helpers/ui/SSD1306Display.h>
-  #include <helpers/ui/MomentaryButton.h>
-#endif
-
-extern ESP32Board board;
-extern WRAPPER_CLASS radio_driver;
-extern AutoDiscoverRTCClock rtc_clock;
-extern SensorManager sensors;
-
-#ifdef DISPLAY_CLASS
-  extern DISPLAY_CLASS display;
-  extern MomentaryButton user_btn;
-#endif
-
-bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(uint8_t dbm);
-mesh::LocalIdentity radio_new_identity();
-
--- a/variants/promicro/PromicroBoard.cpp
+++ b/variants/promicro/PromicroBoard.cpp
@@ -1,10 +1,14 @@
 #include <Arduino.h>
-#include <Wire.h>
-
 #include "PromicroBoard.h"

+#include <bluefruit.h>
+#include <Wire.h>
+
+static BLEDfu bledfu;
+
 void PromicroBoard::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);
@@ -22,4 +26,58 @@ void PromicroBoard::begin() {
    pinMode(SX126X_POWER_EN, OUTPUT);
    digitalWrite(SX126X_POWER_EN, HIGH);
    delay(10);   // give sx1262 some time to power up
-}
+}
+
+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 PromicroBoard::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("ProMicro_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/promicro/PromicroBoard.h
+++ b/variants/promicro/PromicroBoard.h
@@ -2,7 +2,6 @@

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

 #define P_LORA_NSS 13 //P1.13 45
 #define P_LORA_DIO_1 11 //P0.10 10
@@ -20,15 +19,17 @@
 #define  PIN_VBAT_READ 17
 #define  ADC_MULTIPLIER   (1.815f) // dependent on voltage divider resistors. TODO: more accurate battery tracking

-class PromicroBoard : public NRF52BoardOTA {
+class PromicroBoard : public mesh::MainBoard {
 protected:
+  uint8_t startup_reason;
  uint8_t btn_prev_state;
  float adc_mult = ADC_MULTIPLIER;

 public:
-  PromicroBoard() : NRF52BoardOTA("ProMicro_OTA") {}
  void begin();

+  uint8_t getStartupReason() const override { return startup_reason; }
+
  #define BATTERY_SAMPLES 8

  uint16_t getBattMilliVolts() override {
@@ -73,7 +74,13 @@ public:
      return 0;
  }

+  void reboot() override {
+    NVIC_SystemReset();
+  }
+  
  void powerOff() override {
    sd_power_system_off();
  }
+
+  bool startOTAUpdate(const char* id, char reply[]) override;
 };
--- a/variants/promicro/platformio.ini
+++ b/variants/promicro/platformio.ini
@@ -53,31 +53,6 @@ build_flags =
 lib_deps = ${Promicro.lib_deps}
  adafruit/RTClib @ ^2.1.3

-[env:ProMicro_repeater_bridge_rs232_serial1]
-extends = Promicro
-build_src_filter = ${Promicro.build_src_filter}
-  +<../examples/simple_repeater>
-  +<helpers/ui/SSD1306Display.cpp>
-  +<helpers/ui/MomentaryButton.cpp>
-  +<helpers/bridges/RS232Bridge.cpp>
-build_flags =
-  ${Promicro.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 DISPLAY_CLASS=SSD1306Display
-  -D WITH_RS232_BRIDGE=Serial1
-  -D WITH_RS232_BRIDGE_RX=PIN_SERIAL1_RX
-  -D WITH_RS232_BRIDGE_TX=PIN_SERIAL1_TX
-  -UENV_INCLUDE_GPS
-;  -D BRIDGE_DEBUG=1
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-lib_deps = ${Promicro.lib_deps}
-  adafruit/RTClib @ ^2.1.3
-
 [env:ProMicro_room_server]
 extends = Promicro
 build_src_filter = ${Promicro.build_src_filter}
--- a/variants/rak11310/RAK11310Board.cpp
+++ b/variants/rak11310/RAK11310Board.cpp
@@ -1,30 +0,0 @@
-#include "RAK11310Board.h"
-
-#include <Arduino.h>
-#include <Wire.h>
-
-void RAK11310Board::begin() {
-  // for future use, sub-classes SHOULD call this from their begin()
-  startup_reason = BD_STARTUP_NORMAL;
-
-#ifdef P_LORA_TX_LED
-  pinMode(P_LORA_TX_LED, OUTPUT);
-#endif
-
-#ifdef PIN_VBAT_READ
-  pinMode(PIN_VBAT_READ, INPUT);
-#endif
-
-#if defined(PIN_BOARD_SDA) && defined(PIN_BOARD_SCL)
-  Wire.setSDA(PIN_BOARD_SDA);
-  Wire.setSCL(PIN_BOARD_SCL);
-#endif
-
-  Wire.begin();
-
-  delay(10); // give sx1262 some time to power up
-}
-
-bool RAK11310Board::startOTAUpdate(const char *id, char reply[]) {
-  return false;
-}
--- a/variants/rak11310/RAK11310Board.h
+++ b/variants/rak11310/RAK11310Board.h
@@ -1,49 +0,0 @@
-#pragma once
-
-#include <Arduino.h>
-#include <MeshCore.h>
-
-// from https://github.com/RAKWireless/RAK11300-AT-Command-Firmware/blob/9c48409a43620a828d653501d536473200aa33af/RAK11300-AT-Arduino/batt.cpp#L17-L19
-#define VBAT_MV_PER_LSB (0.806F)   // 3.0V ADC range and 12 - bit ADC resolution = 3300mV / 4096
-#define VBAT_DIVIDER (0.6F)		   // 1.5M + 1M voltage divider on VBAT = (1.5M / (1M + 1.5M))
-#define VBAT_DIVIDER_COMP (1.846F) //  // Compensation factor for the VBAT divider
-
-#define PIN_VBAT_READ            26
-#define BATTERY_SAMPLES          8
-#define ADC_MULTIPLIER           (VBAT_DIVIDER_COMP * VBAT_MV_PER_LSB)
-
-class RAK11310Board : public mesh::MainBoard {
-protected:
-  uint8_t startup_reason;
-
-public:
-  void begin();
-  uint8_t getStartupReason() const override { return startup_reason; }
-
-#ifdef P_LORA_TX_LED
-  void onBeforeTransmit() override { digitalWrite(P_LORA_TX_LED, HIGH); }
-  void onAfterTransmit() override { digitalWrite(P_LORA_TX_LED, LOW); }
-#endif
-
-  uint16_t getBattMilliVolts() override {
-#if defined(PIN_VBAT_READ) && defined(ADC_MULTIPLIER)
-    analogReadResolution(12);
-
-    uint32_t raw = 0;
-    for (int i = 0; i < BATTERY_SAMPLES; i++) {
-      raw += analogRead(PIN_VBAT_READ);
-    }
-    raw = raw / BATTERY_SAMPLES;
-
-    return (ADC_MULTIPLIER * raw);
-#else
-    return 0;
-#endif
-  }
-
-  const char *getManufacturerName() const override { return "RAK 11310"; }
-
-  void reboot() override { rp2040.reboot(); }
-
-  bool startOTAUpdate(const char *id, char reply[]) override;
-};
--- a/variants/rak11310/platformio.ini
+++ b/variants/rak11310/platformio.ini
@@ -1,132 +0,0 @@
-; RAK11310
-; Pinout from https://github.com/beegee-tokyo/SX126x-Arduino/blob/6be1f87b84ad4d445a38ec53d65be4425f2383f3/src/boards/mcu/board.cpp#L259
-
-[rak11310]
-extends = rp2040_base
-board = rakwireless_rak11300
-board_build.filesystem_size = 0.5m
-build_flags = ${rp2040_base.build_flags}
-  -I variants/rak11310
-  -D ARDUINO_RAKWIRELESS_RAK11300=1
-  -D SX126X_CURRENT_LIMIT=140
-  -D RADIO_CLASS=CustomSX1262
-  -D WRAPPER_CLASS=CustomSX1262Wrapper
-  -D P_LORA_DIO_1=29
-  -D P_LORA_NSS=13 ; CS
-  -D P_LORA_RESET=14
-  -D P_LORA_BUSY=15
-  -D P_LORA_SCLK=10
-  -D P_LORA_MISO=12
-  -D P_LORA_MOSI=11
-  -D P_LORA_TX_LED=24 ; green led = 23, blue led = 24
-  -D SX126X_DIO2_AS_RF_SWITCH=true
-  -D SX126X_DIO3_TCXO_VOLTAGE=1.8
-  -D SX126X_RX_BOOSTED_GAIN=1
-  -D LORA_TX_POWER=22
-; Debug options
-  ; -D DEBUG_RP2040_WIRE=1
-  ; -D DEBUG_RP2040_SPI=1
-  ; -D DEBUG_RP2040_CORE=1
-  ; -D RADIOLIB_DEBUG_SPI=1
-  ; -D DEBUG_RP2040_PORT=Serial
-build_src_filter = ${rp2040_base.build_src_filter}
-  +<RAK11310Board.cpp>
-  +<../variants/rak11310>
-lib_deps = ${rp2040_base.lib_deps}
-
-[env:rak11310_repeater]
-extends = rak11310
-build_flags = ${rak11310.build_flags}
-  -D ADVERT_NAME='"RAK11310 Repeater"'
-  -D ADVERT_LAT=0.0
-  -D ADVERT_LON=0.0
-  -D ADMIN_PASSWORD='"password"'
-  -D MAX_NEIGHBOURS=50
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-build_src_filter = ${rak11310.build_src_filter}
-  +<../examples/simple_repeater>
-
-[env:rak11310_repeater_bridge_rs232]
-extends = rak11310
-build_flags = ${rak11310.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=8
-;  -D BRIDGE_DEBUG=1
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-build_src_filter = ${rak11310.build_src_filter}
-  +<helpers/bridges/RS232Bridge.cpp>
-  +<../examples/simple_repeater>
-
-[env:rak11310_room_server]
-extends = rak11310
-build_flags = ${rak11310.build_flags}
-  -D ADVERT_NAME='"RAK11310 Room"'
-  -D ADVERT_LAT=0.0
-  -D ADVERT_LON=0.0
-  -D ADMIN_PASSWORD='"password"'
-  -D ROOM_PASSWORD='"hello"'
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-build_src_filter = ${rak11310.build_src_filter}
-  +<../examples/simple_room_server>
-
-[env:rak11310_companion_radio_usb]
-extends = rak11310
-build_flags = ${rak11310.build_flags}
-  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=8
-; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
-; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
-build_src_filter = ${rak11310.build_src_filter}
-  +<../examples/companion_radio/*.cpp>
-lib_deps = ${rak11310.lib_deps}
-  densaugeo/base64 @ ~1.4.0
-
-; [env:rak11310_companion_radio_ble]
-; extends = rak11310
-; build_flags = ${rak11310.build_flags}
-;   -D MAX_CONTACTS=100
-;   -D MAX_GROUP_CHANNELS=8
-;   -D BLE_PIN_CODE=123456
-;   -D BLE_DEBUG_LOGGING=1
-; ;  -D MESH_PACKET_LOGGING=1
-; ;  -D MESH_DEBUG=1
-; build_src_filter = ${rak11310.build_src_filter}
-;   +<../examples/companion_radio/*.cpp>
-; lib_deps = ${rak11310.lib_deps}
-;   densaugeo/base64 @ ~1.4.0
-
-; [env:rak11310_companion_radio_wifi]
-; extends = rak11310
-; build_flags = ${rak11310.build_flags}
-;   -D MAX_CONTACTS=100
-;   -D MAX_GROUP_CHANNELS=8
-;   -D WIFI_DEBUG_LOGGING=1
-;   -D WIFI_SSID='"myssid"'
-;   -D WIFI_PWD='"mypwd"'
-; ;  -D MESH_PACKET_LOGGING=1
-; ;  -D MESH_DEBUG=1
-; build_src_filter = ${rak11310.build_src_filter}
-;   +<../examples/companion_radio/*.cpp>
-; lib_deps = ${rak11310.lib_deps}
-;   densaugeo/base64 @ ~1.4.0
-
-[env:rak11310_terminal_chat]
-extends = rak11310
-build_flags = ${rak11310.build_flags}
-  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=1
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-build_src_filter = ${rak11310.build_src_filter}
-  +<../examples/simple_secure_chat/main.cpp>
-lib_deps = ${rak11310.lib_deps}
-  densaugeo/base64 @ ~1.4.0
--- a/variants/rak11310/target.cpp
+++ b/variants/rak11310/target.cpp
@@ -1,39 +0,0 @@
-#include <Arduino.h>
-#include "target.h"
-#include <helpers/ArduinoHelpers.h>
-
-RAK11310Board board;
-
-RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, SPI1);
-
-WRAPPER_CLASS radio_driver(radio, board);
-
-VolatileRTCClock fallback_clock;
-AutoDiscoverRTCClock rtc_clock(fallback_clock);
-SensorManager sensors;
-
-bool radio_init() {
-  rtc_clock.begin(Wire);
-  
-  return radio.std_init(&SPI1);
-}
-
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(uint8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
-mesh::LocalIdentity radio_new_identity() {
-  RadioNoiseListener rng(radio);
-  return mesh::LocalIdentity(&rng);  // create new random identity
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
mattzzw	bb8063b469	CommonCLI.cpp: CommonCLI: Set limits for flood advert interval check to 12-48h	2025-12-15 11:24:11 +01:00
mattzzw	cc7a0c07ea	Set repeater default lower limit flood_advert_interval to 12h, set room server default to 48h/12h min.	2025-12-14 19:56:34 +01:00
mattzzw	14c98d8cda	Set lower limit of flood_advert_interval to 12h	2025-12-14 19:52:40 +01:00
mattzzw	69d19ea6ca	Set default of flood_advert_interval to 48h This should help reducing congestion/noise in big meshes.	2025-12-14 19:28:21 +01:00