* Regenerate keys with public key matching user defined first byte

.devcontainer/devcontainer.json

@@ -1,45 +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",
-		"--network=host",
-		"--volume=/dev/bus/usb:/dev/bus/usb:ro",
-		// arch tty* is owned by uucp (986)
-		// debian tty* is owned by dialout (20)
-		"--group-add=20",
-		"--group-add=986"
-	],
-	"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"
-			]
-		}
-	}
-}

.gitignore

@@ -14,5 +14,3 @@ cmake-*
 .cache
 .ccls
 compile_commands.json
-.venv/
-venv/

README.md

@@ -89,7 +89,7 @@ Please submit PR's using 'dev' as the base branch!
 For minor changes just submit your PR and I'll try to review it, but for anything more 'impactful' please open an Issue first and start a discussion. Is better to sound out what it is you want to achieve first, and try to come to a consensus on what the best approach is, especially when it impacts the structure or architecture of this codebase.
 
 Here are some general principals you should try to adhere to:
-* Keep it simple. Please, don't think like a high-level lang programmer. Think embedded, and keep code concise, without any unnecessary layers.
+* Keep it simple. Please, don't think like a high-level lang programmer. Think embedded, and keep code concise, without any unecessary layers.
 * No dynamic memory allocation, except during setup/begin functions.
 * Use the same brace and indenting style that's in the core source modules. (A .clang-format is prob going to be added soon, but please do NOT retroactively re-format existing code. This just creates unnecessary diffs that make finding problems harder)
 
@@ -97,19 +97,28 @@ Here are some general principals you should try to adhere to:
 
 There are a number of fairly major features in the pipeline, with no particular time-frames attached yet. In very rough chronological order:
 - [X] Companion radio: UI redesign
-- [X] Repeater + Room Server: add ACL's (like Sensor Node has)
-- [X] Standardise Bridge mode for repeaters
+- [ ] Repeater + Room Server: add ACL's (like Sensor Node has)
+- [ ] Standardise Bridge mode for repeaters
 - [ ] Repeater/Bridge: Standardise the Transport Codes for zoning/filtering
-- [X] Core + Repeater: enhanced zero-hop neighbour discovery
+- [ ] Core + Repeater: enhanced zero-hop neighbour discovery
 - [ ] Core: round-trip manual path support
 - [ ] Companion + Apps: support for multiple sub-meshes (and 'off-grid' client repeat mode)
 - [ ] Core + Apps: support for LZW message compression
 - [ ] Core: dynamic CR (Coding Rate) for weak vs strong hops
 - [ ] Core: new framework for hosting multiple virtual nodes on one physical device
-- [ ] V2 protocol spec: discussion and consensus around V2 packet protocol, including path hashes, new encryption specs, etc
+- [ ] V2 protocol spec: discussion and concensus around V2 packet protocol, including path hashes, new encryption specs, etc
 
 ## 📞 Get Support
 
 - Report bugs and request features on the [GitHub Issues](https://github.com/ripplebiz/MeshCore/issues) page.
 - Find additional guides and components on [my site](https://buymeacoffee.com/ripplebiz).
 - Join [MeshCore Discord](https://discord.gg/BMwCtwHj5V) to chat with the developers and get help from the community.
+
+## RAK Wireless Board Support in PlatformIO
+
+Before building/flashing the RAK4631 targets in this project, there is, unfortunately, some patching you have to do to your platformIO packages to make it work. There is a guide here on the process:
+   [RAK Wireless: How to Perform Installation of Board Support Package in PlatformIO](https://learn.rakwireless.com/hc/en-us/articles/26687276346775-How-To-Perform-Installation-of-Board-Support-Package-in-PlatformIO)
+
+After building, you will need to convert the output firmware.hex file into a .uf2 file you can copy over to your RAK4631 device (after doing a full erase) by using the command `uf2conv.py -f 0xADA52840 -c firmware.hex` with the python script available from:
+   [GitHub: Microsoft - uf2](https://github.com/Microsoft/uf2/blob/master/utils/uf2conv.py)
+

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)

boards/ESP32-S3-WROOM-1-N4.json

@@ -1,39 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "esp32s3_out.ld"
-    },
-    "core": "esp32",
-    "extra_flags": [
-      "-D ARDUINO_USB_CDC_ON_BOOT=0",
-      "-D ARDUINO_USB_MSC_ON_BOOT=0",
-      "-D ARDUINO_USB_DFU_ON_BOOT=0",
-      "-D ARDUINO_USB_MODE=0",
-      "-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": "ESP32-S3-WROOM-1-N4"
-  },
-  "connectivity": ["wifi", "bluetooth"],
-  "debug": {
-    "default_tool": "esp-builtin",
-    "onboard_tools": ["esp-builtin"],
-    "openocd_target": "esp32s3.cfg"
-  },
-  "frameworks": ["arduino", "espidf"],
-  "name": "ESP32-S3-WROOM-1-N4 (4 MB Flash, No PSRAM)",
-  "upload": {
-    "flash_size": "4MB",
-    "maximum_ram_size": 524288,
-    "maximum_size": 4194304,
-    "require_upload_port": true,
-    "speed": 921600
-  },
-  "url": "https://www.espressif.com/sites/default/files/documentation/esp32-s3-wroom-1_wroom-1u_datasheet_en.pdf",
-  "vendor": "Espressif"
-}

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

boards/keepteen_lt1.json

@@ -1,79 +0,0 @@
-{
-    "build": {
-      "arduino":{
-        "ldscript": "nrf52840_s140_v6.ld"
-      },
-      "core": "nRF5",
-      "cpu": "cortex-m4",
-      "extra_flags": "-DARDUINO_NRF52840_FEATHER -DNRF52840_XXAA",
-      "f_cpu": "64000000L",
-      "hwids": [
-        [
-          "0x239A",
-          "0x00B3"
-        ],
-        [
-          "0x239A",
-          "0x8029"
-        ],
-        [
-          "0x239A",
-          "0x0029"
-        ],
-        [
-          "0x239A",
-          "0x002A"
-        ],
-        [
-          "0x239A",
-          "0x802A"
-        ]
-      ],
-      "usb_product": "Keepteen LT1",
-      "mcu": "nrf52840",
-      "variant": "Keepteen LT1",
-      "variants_dir": "variants",
-      "bsp": {
-        "name": "adafruit"
-      },
-      "softdevice": {
-        "sd_flags": "-DS140",
-        "sd_name": "s140",
-        "sd_version": "6.1.1",
-        "sd_fwid": "0x00B6"
-      },
-      "bootloader": {
-        "settings_addr": "0xFF000"
-      }
-    },
-    "connectivity": [
-      "bluetooth"
-    ],
-    "debug": {
-      "jlink_device": "nRF52840_xxAA",
-      "svd_path": "nrf52840.svd",
-      "openocd_target": "nrf52.cfg"
-    },
-    "frameworks": [
-      "arduino",
-      "zephyr"
-    ],
-    "name": "Keepteen LT1",
-    "upload": {
-      "maximum_ram_size": 248832,
-      "maximum_size": 815104,
-      "speed": 115200,
-      "protocol": "nrfutil",
-      "protocols": [
-        "jlink",
-        "nrfjprog",
-        "nrfutil",
-        "stlink"
-      ],
-      "use_1200bps_touch": true,
-      "require_upload_port": true,
-      "wait_for_upload_port": true
-    },
-    "url": "http://www.keepteen.com/",
-    "vendor": "Keepteen"
-  }

boards/meshtiny.json

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

boards/rak3401.json

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

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

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

build.sh

@@ -15,8 +15,8 @@ Commands:
   build-room-server-firmwares: Build all chat room server firmwares for all build targets.
 
 Examples:
-Build firmware for the "RAK_4631_repeater" device target
-$ sh build.sh build-firmware RAK_4631_repeater
+Build firmware for the "RAK_4631_Repeater" device target
+$ sh build.sh build-firmware RAK_4631_Repeater
 
 Build all firmwares for device targets containing the string "RAK_4631"
 $ sh build.sh build-matching-firmwares <build-match-spec>
@@ -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
 

docs/cli_commands.md

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

docs/faq.md

@@ -26,10 +26,6 @@ author: https://github.com/LitBomb<!-- omit from toc -->
   - [3.2. Q: Do I need to set the location for a repeater?](#32-q-do-i-need-to-set-the-location-for-a-repeater)
   - [3.3. Q: What is the password to administer a repeater or a room server?](#33-q-what-is-the-password-to-administer-a-repeater-or-a-room-server)
   - [3.4. Q: What is the password to join a room server?](#34-q-what-is-the-password-to-join-a-room-server)
-  - [3.5. Q: Can I retrieve a repeater's private key or set a repeater's private key?](#35-q-can-i-retrieve-a-repeaters-private-key-or-set-a-repeaters-private-key)
-  - [3.6. Q: The first byte of my repeater's public key collides with an exisitng repeater on the mesh.  How do I get a new private key with a matching public key that has its first byte of my choosing?](#36-q-the-first-byte-of-my-repeaters-public-key-collides-with-an-exisitng-repeater-on-the-mesh--how-do-i-get-a-new-private-key-with-a-matching-public-key-that-has-its-first-byte-of-my-choosing)
-  - [3.7. Q: My repeater maybe suffering from deafness due to high power interference near my mesh's frequency, it is not hearing other in-range MeshCore radios.  what can I do?](#37-q-my-repeater-maybe-suffering-from-deafness-due-to-high-power-interference-near-my-meshs-frequency-it-is-not-hearing-other-in-range-meshcore-radios--what-can-i-do)
-  - [3.8 Q: How do I make my repeater an observer on the mesh](#38-q-how-do-i-make-my-repeater-an-observer-on-the-mesh)
 - [4. T-Deck Related](#4-t-deck-related)
   - [4.1. Q: Is there a user guide for T-Deck, T-Pager, T-Watch, or T-Display Pro?](#41-q-is-there-a-user-guide-for-t-deck-t-pager-t-watch-or-t-display-pro)
   - [4.2. Q: What are the steps to get a T-Deck into DFU (Device Firmware Update) mode?](#42-q-what-are-the-steps-to-get-a-t-deck-into-dfu-device-firmware-update-mode)
@@ -65,31 +61,22 @@ author: https://github.com/LitBomb<!-- omit from toc -->
     - [5.14.3. Python MeshCore](#5143-python-meshcore)
     - [5.14.4. meshcore-cli](#5144-meshcore-cli)
     - [5.14.5. meshcore.js](#5145-meshcorejs)
-    - [5.14.6. pyMC\_core](#5146-pymc_core)
-    - [5.14.7. MeshCore Packet Decoder](#5147-meshcore-packet-decoder)
-    - [5.14.8. meshcore-pi](#5148-meshcore-pi)
-    - [5.14.9. pyMC\_Repeater](#5149-pymc_repeater)
-  - [5.15. Q: Are there client applications for Windows or Mac?](#515-q-are-there-client-applications-for-windows-or-mac)
-  - [5.16. Q: Are there any resources that compare MeshCore to other LoRa systems?](#516-q-are-there-any-resources-that-compare-meshcore-to-other-lora-systems)
 - [6. Troubleshooting](#6-troubleshooting)
   - [6.1. Q: My client says another client or a repeater or a room server was last seen many, many days ago.](#61-q-my-client-says-another-client-or-a-repeater-or-a-room-server-was-last-seen-many-many-days-ago)
   - [6.2. Q: A repeater or a client or a room server I expect to see on my discover list (on T-Deck) or contact list (on a smart device client) are not listed.](#62-q-a-repeater-or-a-client-or-a-room-server-i-expect-to-see-on-my-discover-list-on-t-deck-or-contact-list-on-a-smart-device-client-are-not-listed)
   - [6.3. Q: How to connect to a repeater via BLE (Bluetooth)?](#63-q-how-to-connect-to-a-repeater-via-ble-bluetooth)
   - [6.4. Q: My companion isn't showing up over Bluetooth?](#64-q-my-companion-isnt-showing-up-over-bluetooth)
-  - [6.5. Q: I can't connect via Bluetooth, what is the Bluetooth pairing code?](#65-q-i-cant-connect-via-bluetooth-what-is-the-bluetooth-pairing-code)
-  - [6.6. Q: My Heltec V3 keeps disconnecting from my smartphone.  It can't hold a solid Bluetooth connection.](#66-q-my-heltec-v3-keeps-disconnecting-from-my-smartphone--it-cant-hold-a-solid-bluetooth-connection)
-  - [6.7. Q: My RAK/T1000-E/xiao\_nRF52 device seems to be corrupted, how do I wipe it clean to start fresh?](#67-q-my-rakt1000-exiao_nrf52-device-seems-to-be-corrupted-how-do-i-wipe-it-clean-to-start-fresh)
-  - [6.8. Q: WebFlasher fails on Linux with failed to open](#68-q-webflasher-fails-on-linux-with-failed-to-open)
+  - [6.5. Q: I can't connect via Bluetooth, what is the Bluetooth pairing code?](#64-q-i-cant-connect-via-bluetooth-what-is-the-bluetooth-pairing-code)
+  - [6.6. Q: My Heltec V3 keeps disconnecting from my smartphone.  It can't hold a solid Bluetooth connection.](#65-q-my-heltec-v3-keeps-disconnecting-from-my-smartphone--it-cant-hold-a-solid-bluetooth-connection)
+  - [6.7. Q: My RAK/T1000-E/xiao\_nRF52 device seems to be corrupted, how do I wipe it clean to start fresh?](#66-q-my-rakt1000-exiao_nrf52-device-seems-to-be-corrupted-how-do-i-wipe-it-clean-to-start-fresh)
+  - [6.8. Q: WebFlasher fails on Linux with failed to open](#67-q-webflasher-fails-on-linux-with-failed-to-open)
 - [7. Other Questions:](#7-other-questions)
   - [7.1. Q: How to update nRF (RAK, T114, Seed XIAO) repeater and room server firmware over the air using the new simpler DFU app?](#71-q-how-to-update-nrf-rak-t114-seed-xiao-repeater-and-room-server-firmware-over-the-air-using-the-new-simpler-dfu-app)
-    - [7.1.1 Q: Can I update Seeed Studio Wio Tracker L1 Pro using OTA?](#711-q-can-i-update-seeed-studio-wio-tracker-l1-pro-using-ota)
   - [7.2. Q: How to update ESP32-based devices over the air?](#72-q-how-to-update-esp32-based-devices-over-the-air)
   - [7.3. Q: Is there a way to lower the chance of a failed OTA device firmware update (DFU)?](#73-q-is-there-a-way-to-lower-the-chance-of-a-failed-ota-device-firmware-update-dfu)
   - [7.4. Q: are the MeshCore logo and font available?](#74-q-are-the-meshcore-logo-and-font-available)
   - [7.5. Q: What is the format of a contact or channel QR code?](#75-q-what-is-the-format-of-a-contact-or-channel-qr-code)
-  - [7.6. Q: How do I connect to the companion via WIFI, e.g. using a heltec v3?](#76-q-how-do-i-connect-to-the-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--)
+  - [7.6. Q: How do I connect to the companion via WIFI, e.g. using a heltec v3?](#76-q-how-do-i-connect-to-the-comnpanion-via-wifi-eg-using-a-heltec-v3)
 
 ## 1. Introduction
 
@@ -104,7 +91,7 @@ MeshCore is free and open source:
 * The T-Deck firmware is developed by Scott at Ripple Radios, the creator of MeshCore, is also free to flash on your devices and use
 
 
-Some more advanced, but optional features are available on T-Deck if you register your device for a key to unlock.  On the MeshCore smartphone clients for Android and iOS/iPadOS, you can unlock the wait timer for repeater and room server remote management over RF feature.
+Some more advanced, but optional features are available on T-Deck if you register your device for a key to unlock.  On the MeshCore smartphone clients for Android and iOS/iPadOS, you can unlock the wait timer for repeater and room server remote management over RF feature. 
 
 These features are completely optional and aren't needed for the core messaging experience. They're like super bonus features and to help the developers continue to work on these amazing features, they may charge a small fee for an unlock code to utilise the advanced features.
 
@@ -118,7 +105,7 @@ Anyone is able to build anything they like on top of MeshCore without paying any
  MeshCore Firmware GitHub: https://github.com/ripplebiz/MeshCore
 
  NOTE: Andy Kirby has a very useful [intro video](https://www.youtube.com/watch?v=t1qne8uJBAc) for beginners.
-
+ 
 
  You need LoRa hardware devices to run MeshCore firmware as clients or server (repeater and room server).
 
@@ -127,7 +114,7 @@ MeshCore is available on a variety of 433MHz, 868MHz and 915MHz LoRa devices. Fo
 
 For an up-to-date list of supported devices, please go to https://flasher.meshcore.co.uk/
 
-To use MeshCore without using a phone as the client interface, you can run MeshCore on a LiLygo's T-Deck, T-Deck Plus, T-Pager, T-Watch, or T-Display Pro. MeshCore Ultra firmware running on these devices are a complete off-grid secure communication solution.
+To use MeshCore without using a phone as the client interface, you can run MeshCore on a LiLygo's T-Deck, T-Deck Plus, T-Pager, T-Watch, or T-Display Pro. MeshCore Ultra firmware running on these devices are a complete off-grid secure communication solution.  
 
 #### 1.2.2. Firmware
 MeshCore has four firmware types that are not available on other LoRa systems. MeshCore has the following:
@@ -135,30 +122,30 @@ MeshCore has four firmware types that are not available on other LoRa systems. M
 #### 1.2.3. Companion Radio Firmware
 Companion radios are for connecting to the Android app or web app as a messenger client. There are two different companion radio firmware versions:
 
-1. **BLE Companion**
-   BLE Companion firmware runs on a supported LoRa device and connects to a smart device running the Android or iOS MeshCore client over BLE
+1. **BLE Companion**  
+   BLE Companion firmware runs on a supported LoRa device and connects to a smart device running the Android or iOS MeshCore client over BLE 
    <https://meshcore.co.uk/apps.html>
 
-2. **USB Serial Companion**
-   USB Serial Companion firmware runs on a supported LoRa device and connects to a smart device or a computer over USB Serial running the MeshCore web client
-   <https://meshcore.liamcottle.net/#/>
+2. **USB Serial Companion**  
+   USB Serial Companion firmware runs on a supported LoRa device and connects to a smart device or a computer over USB Serial running the MeshCore web client  
+   <https://meshcore.liamcottle.net/#/>  
    <https://client.meshcore.co.uk/tabs/devices>
 
 #### 1.2.4. Repeater
-Repeaters are used to extend the range of a MeshCore network. Repeater firmware runs on the same devices that run client firmware. A repeater's job is to forward MeshCore packets to the destination device. It does **not** forward or retransmit every packet it receives, unlike other LoRa mesh systems.
+Repeaters are used to extend the range of a MeshCore network. Repeater firmware runs on the same devices that run client firmware. A repeater's job is to forward MeshCore packets to the destination device. It does **not** forward or retransmit every packet it receives, unlike other LoRa mesh systems.  
 
 A repeater can be remotely administered using a T-Deck running the MeshCore firmware with remote administration features unlocked, or from a BLE Companion client connected to a smartphone running the MeshCore app.
 
 #### 1.2.5. Room Server
-A room server is a simple BBS server for sharing posts. T-Deck devices running MeshCore firmware or a BLE Companion client connected to a smartphone running the MeshCore app can connect to a room server.
+A room server is a simple BBS server for sharing posts. T-Deck devices running MeshCore firmware or a BLE Companion client connected to a smartphone running the MeshCore app can connect to a room server. 
 
 Room servers store message history on them and push the stored messages to users.  Room servers allow roaming users to come back later and retrieve message history.  With channels, messages are either received when it's sent, or not received and missed if the channel user is out of range.  Room servers are different and more like email servers where you can come back later and get your emails from your mail server.
 
-A room server can be remotely administered using a T-Deck running the MeshCore firmware with remote administration features unlocked, or from a BLE Companion client connected to a smartphone running the MeshCore app.
+A room server can be remotely administered using a T-Deck running the MeshCore firmware with remote administration features unlocked, or from a BLE Companion client connected to a smartphone running the MeshCore app.  
 
 When a client logs into a room server, the client will receive the previously 32 unseen messages.
 
-Although room server can also repeat with the command line command `set repeat on`, it is not recommended nor encouraged.  A room server with repeat set to `on` lacks the full set of repeater and remote administration features that are only available in the repeater firmware.
+Although room server can also repeat with the command line command `set repeat on`, it is not recommended nor encouraged.  A room server with repeat set to `on` lacks the full set of repeater and remote administration features that are only available in the repeater firmware.  
 
 The recommendation is to run repeater and room server on separate devices for the best experience.
 
@@ -181,32 +168,37 @@ After you flashed the latest firmware onto your repeater device, keep the device
 
 The repeater and room server CLI reference is here: https://github.com/meshcore-dev/MeshCore/wiki/Repeater-&-Room-Server-CLI-Reference
 
-If you have more supported devices, you can use your additional devices with the room server firmware.
+If you have more supported devices, you can use your additional devices with the room server firmware.  
 
 ### 2.2. Q: Does MeshCore cost any money?
 
-**A:** All radio firmware versions (e.g. for Heltec V3, RAK, T-1000E, etc) are free and open source developed by Scott at Ripple Radios.
+**A:** All radio firmware versions (e.g. for Heltec V3, RAK, T-1000E, etc) are free and open source developed by Scott at Ripple Radios.  
 
-The native Android and iOS client uses the freemium model and is developed by Liam Cottle, developer of meshtastic map at [meshtastic.liamcottle.net](https://meshtastic.liamcottle.net) on [GitHub](https://github.com/liamcottle/meshtastic-map) and [reticulum-meshchat on github](https://github.com/liamcottle/reticulum-meshchat).
+The native Android and iOS client uses the freemium model and is developed by Liam Cottle, developer of meshtastic map at [meshtastic.liamcottle.net](https://meshtastic.liamcottle.net) on [GitHub](https://github.com/liamcottle/meshtastic-map) and [reticulum-meshchat on github](https://github.com/liamcottle/reticulum-meshchat). 
 
-The T-Deck firmware is free to download and most features are available without cost.  To support the firmware developer, you can pay for a registration key to unlock your T-Deck for deeper map zoom and remote server administration over RF using the T-Deck.  You do not need to pay for the registration to use your T-Deck for direct messaging and connecting to repeaters and room servers.
+The T-Deck firmware is free to download and most features are available without cost.  To support the firmware developer, you can pay for a registration key to unlock your T-Deck for deeper map zoom and remote server administration over RF using the T-Deck.  You do not need to pay for the registration to use your T-Deck for direct messaging and connecting to repeaters and room servers. 
 
 
 ### 2.3. Q: What frequencies are supported by MeshCore?
-**A:** It supports the 868MHz range in the UK/EU and the 915MHz range in New Zealand, Australia, and the USA. Countries and regions in these two frequency ranges are also supported.
+**A:** It supports the 868MHz range in the UK/EU and the 915MHz range in New Zealand, Australia, and the USA. Countries and regions in these two frequency ranges are also supported. The firmware and client allow users to set their preferred frequency.  
+- Australia and New Zealand are on **915.8MHz**
+- UK and EU are on **869.525MHz**
+- Canada and USA are on **910.525MHz**
+- For other regions and countries, please check your local LoRa frequency
 
-Use the smartphone client or the repeater setup feature on there web flasher to set your radios' RF settings by choosing the preset for your regions.
+In UK and EU, 867.5MHz is not allowed to use 250kHz bandwidth and it only allows 2.5% duty cycle for clients.  869.525Mhz allows an airtime of 10%, 250KHz bandwidth, and a higher EIRP, therefore MeshCore nodes can send more often and with more power. That is why this frequency is chosen for UK and EU.  This is also why Meshtastic also uses this frequency.  
 
-Recently, as of October 2025, many regions have moved to the "narrow" setting, aka using BW62.5 and a lower SF number (instead of the original SF11).  For example, USA/Canada (Recommended) preset is 910.525MHz, SF7, BW62.5, CR5.
-
-After extensive testing, many regions have switched or about to switch over to BW62.5 and SF7, 8, or 9.  Narrower bandwidth setting and lower SF setting allow MeshCore's radio signals to fit between interference in the ISM band, provide for a lower noise floor, better SNR, and faster transmissions.
-
-If you have consensus from your community in your region to update your region's preset recommendation, please post your update request on  the [#meshcore-app](https://discord.com/channels/1343693475589263471/1391681655911088241) channel on the [MeshCore Discord server ](https://discord.gg/cYtQNYCCRK) to let Liam Cottle know.
+[Source](https://discord.com/channels/826570251612323860/1330643963501351004/1356540643853209641)
 
+the rest of the radio settings are the same for all frequencies:  
+- Spread Factor (SF): 11  
+- Coding Rate (CR): 5  
+- Bandwidth (BW): 250.00  
 
+(Originally MeshCore started with SF 10.  recently (as of late April 2025) the community has advocated SF 11 also a viable option for longer range but a little slower transmission. Currently there are MeshCore meshes with SF 10 and SF 11.  Liam Cottle's smartphone app's presets now recommend SF 10 for Australia and SF 11 for all other regions and countries.  EU and UK has SF 10 and SF 11 presets.  Work with your local meshers on deciding with SF number is best for your use cases.  In the future, there may be bridge nodes that can bridge SF 10 and SF 11 (or even different frequencies) traffic.)
 
 ### 2.4. Q: What is an "advert" in MeshCore?
-**A:**
+**A:** 
 Advert means to advertise yourself on the network. In Reticulum terms it would be to announce. In Meshtastic terms it would be the node sending its node info.
 
 MeshCore allows you to manually broadcast your name, position and public encryption key, which is also signed to prevent spoofing.  When you click the advert button, it broadcasts that data over LoRa.  MeshCore calls that an Advert. There's two ways to advert, "zero hop" and "flood".
@@ -222,7 +214,7 @@ As of Aug 20 2025, a pending PR on github will change the flood advert to 12 hou
 
 ### 2.5. Q: Is there a hop limit?
 
-**A:** Internally the firmware has maximum limit of 64 hops.  In real world settings it will be difficult to get close to the limit due to the environments and timing as packets travel further and further.  We want to hear how far your MeshCore conversations go.
+**A:** Internally the firmware has maximum limit of 64 hops.  In real world settings it will be difficult to get close to the limit due to the environments and timing as packets travel further and further.  We want to hear how far your MeshCore conversations go. 
 
 
 ---
@@ -232,14 +224,14 @@ As of Aug 20 2025, a pending PR on github will change the flood advert to 12 hou
 
 ### 3.1. Q: How do you configure a repeater or a room server?
 
-**A:** - When MeshCore is flashed onto a LoRa device is for the first time, it is necessary to set the server device's frequency to make it utilize the frequency that is legal in your country or region.
+**A:** - When MeshCore is flashed onto a LoRa device is for the first time, it is necessary to set the server device's frequency to make it utilize the frequency that is legal in your country or region.  
 
 Repeater or room server can be administered with one of the options below:
-
+  
 - After a repeater or room server firmware is flashed on to a LoRa device, go to <https://config.meshcore.dev> and use the web user interface to connect to the LoRa device via USB serial.  From there you can set the name of the server, its frequency and other related settings, location, passwords etc.
 
 ![image](https://github.com/user-attachments/assets/2a9d9894-e34d-4dbe-b57c-fc3c250a2d34)
-
+ 
 - Connect the server device using a USB cable to a computer running Chrome on https://flasher.meshcore.co.uk/, then use the `console` feature to connect to the device
 
 - Use a MeshCore smartphone clients  to remotely administer servers via LoRa.
@@ -248,10 +240,10 @@ Repeater or room server can be administered with one of the options below:
 
 <https://buymeacoffee.com/ripplebiz/e/249834>
 
-
+  
 
 ### 3.2. Q: Do I need to set the location for a repeater?
-**A:** While not required, with location set for a repeater it will show up on the MeshCore map in the future. Set location with the following command:
+**A:** With location set for a repeater, it can show up on a MeshCore map in the future. Set location with the following commands:
 
 `set lat <GPS Lat> set long <GPS Lon>`
 
@@ -268,34 +260,6 @@ You can get the latitude and longitude from Google Maps by right-clicking the lo
 
 `set guest.password {guest-password}`
 
-### 3.5. Q: Can I retrieve a repeater's private key or set a repeater's private key?
-
-**A:** You can issue these commands to get or set a repeater's private key using a USB serial connection.
-
-`get prv.key` to print a repeater's private key on the serial console
-`set prv.key <hex>` to set a repeater's private key on the serial console
-
-Reboot the repeater after `set prv.key <hex>` command for the new private key to take effect.
-
-### 3.6. Q: The first byte of my repeater's public key collides with an exisitng repeater on the mesh.  How do I get a new private key with a matching public key that has its first byte of my choosing?
-
-**A:** You can generate a new private key and specific the first byte of its public key here:  https://gessaman.com/mc-keygen/
-
-
-### 3.7. Q: My repeater maybe suffering from deafness due to high power interference near my mesh's frequency, it is not hearing other in-range MeshCore radios.  what can I do?
-
-**A:** This may be due to the SX1262 radio's auto gain control feature.  You can use this command to preiodically reset its AGC.  
-
-`set agc.reset.interval <number>`
-
-The `<number>` unit is in seconds and is incremented by 4.  `set agc.reset.interval 4` works well to cure deafness.  
-
-This is a very low cost operation.  AGC reset is done by simply setting `state = STATE_IDLE;` in function `RadioLibWrapper::resetAGC()` in `RadioLibWrappers.cpp`
-
-
-### 3.8 Q: How do I make my repeater an observer on the mesh
-
-**A:** The observer instruction is available here: https://analyzer.letsme.sh/observer/onboard
 
 ---
 
@@ -306,14 +270,14 @@ This is a very low cost operation.  AGC reset is done by simply setting `state =
 **A:** Yes, it is available on https://buymeacoffee.com/ripplebiz/ultra-v7-7-guide-meshcore-users
 
 ### 4.2. Q: What are the steps to get a T-Deck into DFU (Device Firmware Update) mode?
-**A:**
-1. Device off
-2. Connect USB cable to device
-3. Hold down trackball (keep holding)
-4. Turn on device
-5. Hear USB connection sound
-6. Release trackball
-7. T-Deck in DFU mode now
+**A:**  
+1. Device off  
+2. Connect USB cable to device  
+3. Hold down trackball (keep holding)  
+4. Turn on device  
+5. Hear USB connection sound  
+6. Release trackball  
+7. T-Deck in DFU mode now  
 8. At this point you can begin flashing using <https://flasher.meshcore.co.uk/>
 
 ### 4.3. Q: Why is my T-Deck Plus not getting any satellite lock?
@@ -330,12 +294,10 @@ GPS on T-Deck is always enabled.  You can skip the "GPS clock sync" and the T-De
 **A:** Users have had no issues using 16GB or 32GB SD cards. Format the SD card to **FAT32**.
 
 ### 4.6. Q: what is the public key for the default public channel?
-**A:**
-T-Deck uses the same key the smartphone apps use but in base64
+**A:** 
+T-Deck uses the same key the smartphone apps use but in base64 
 `izOH6cXN6mrJ5e26oRXNcg==`
-
-There is no `=` key on the T-Deck's hardware keyboard.  You can use the on-screen software keyboard to enter `=`.  Tap the text box to enable the on-screen software keyboard.
-The third character is the capital letter `O` (Oh), not zero `0`
+The third character is the capital letter 'O', not zero `0`
 
 The smartphone app key is in hex:
 ` 8b3387e9c5cdea6ac9e5edbaa115cd72`
@@ -343,24 +305,24 @@ The smartphone app key is in hex:
 [Source](https://discord.com/channels/826570251612323860/1330643963501351004/1354194409213792388)
 
 ### 4.7. Q: How do I get maps on T-Deck?
-**A:** You need map tiles. You can get pre-downloaded map tiles here (a good way to support development):
-- <https://buymeacoffee.com/ripplebiz/e/342543> (Europe)
+**A:** You need map tiles. You can get pre-downloaded map tiles here (a good way to support development):  
+- <https://buymeacoffee.com/ripplebiz/e/342543> (Europe)  
 - <https://buymeacoffee.com/ripplebiz/e/342542> (US)
 
-Another way to download map tiles is to use this Python script to get the tiles in the areas you want:
-<https://github.com/fistulareffigy/MTD-Script>
+Another way to download map tiles is to use this Python script to get the tiles in the areas you want:  
+<https://github.com/fistulareffigy/MTD-Script>  
 
-There is also a modified script that adds additional error handling and parallel downloads:
-<https://discord.com/channels/826570251612323860/1330643963501351004/1338775811548905572>
+There is also a modified script that adds additional error handling and parallel downloads:  
+<https://discord.com/channels/826570251612323860/1330643963501351004/1338775811548905572>  
 
-UK map tiles are available separately from Andy Kirby on his discord server:
+UK map tiles are available separately from Andy Kirby on his discord server:  
 <https://discord.com/channels/826570251612323860/1330643963501351004/1331346597367386224>
 
 ### 4.8. Q: Where do the map tiles go?
 Once you have the tiles downloaded, copy the `\tiles` folder to the root of your T-Deck's SD card.
 
 ### 4.9. Q: How to unlock deeper map zoom and server management features on T-Deck?
-**A:** You can download, install, and use the T-Deck firmware for free, but it has some features (map zoom, server administration) that are enabled if you purchase an unlock code for \$10 per T-Deck device.
+**A:** You can download, install, and use the T-Deck firmware for free, but it has some features (map zoom, server administration) that are enabled if you purchase an unlock code for \$10 per T-Deck device.  
 Unlock page: <https://buymeacoffee.com/ripplebiz/e/249834>
 
 ### 4.10. Q: How to decipher the diagnostics screen on T-Deck?
@@ -368,17 +330,17 @@ Unlock page: <https://buymeacoffee.com/ripplebiz/e/249834>
 **A: ** Space is tight on T-Deck's screen, so the information is a bit cryptic.  The format is :
 `{hops} l:{packet-length}({payload-len}) t:{packet-type} snr:{n} rssi:{n}`
 
-See here for packet-type:
+See here for packet-type: 
 https://github.com/meshcore-dev/MeshCore/blob/main/src/Packet.h#L19
+ 
 
-
-    #define PAYLOAD_TYPE_REQ 0x00 // request (prefixed with dest/src hashes, MAC) (enc data: timestamp, blob)
-    #define PAYLOAD_TYPE_RESPONSE 0x01 // response to REQ or ANON_REQ (prefixed with dest/src hashes, MAC) (enc data: timestamp, blob)
-    #define PAYLOAD_TYPE_TXT_MSG 0x02 // a plain text message (prefixed with dest/src hashes, MAC) (enc data: timestamp, text)
-    #define PAYLOAD_TYPE_ACK 0x03 // a simple ack #define PAYLOAD_TYPE_ADVERT 0x04 // a node advertising its Identity
-    #define PAYLOAD_TYPE_GRP_TXT 0x05 // an (unverified) group text message (prefixed with channel hash, MAC) (enc data: timestamp, "name: msg")
-    #define PAYLOAD_TYPE_GRP_DATA 0x06 // an (unverified) group datagram (prefixed with channel hash, MAC) (enc data: timestamp, blob)
-    #define PAYLOAD_TYPE_ANON_REQ 0x07 // generic request (prefixed with dest_hash, ephemeral pub_key, MAC) (enc data: ...)
+    #define PAYLOAD_TYPE_REQ 0x00 // request (prefixed with dest/src hashes, MAC) (enc data: timestamp, blob) 
+    #define PAYLOAD_TYPE_RESPONSE 0x01 // response to REQ or ANON_REQ (prefixed with dest/src hashes, MAC) (enc data: timestamp, blob) 
+    #define PAYLOAD_TYPE_TXT_MSG 0x02 // a plain text message (prefixed with dest/src hashes, MAC) (enc data: timestamp, text) 
+    #define PAYLOAD_TYPE_ACK 0x03 // a simple ack #define PAYLOAD_TYPE_ADVERT 0x04 // a node advertising its Identity 
+    #define PAYLOAD_TYPE_GRP_TXT 0x05 // an (unverified) group text message (prefixed with channel hash, MAC) (enc data: timestamp, "name: msg") 
+    #define PAYLOAD_TYPE_GRP_DATA 0x06 // an (unverified) group datagram (prefixed with channel hash, MAC) (enc data: timestamp, blob) 
+    #define PAYLOAD_TYPE_ANON_REQ 0x07 // generic request (prefixed with dest_hash, ephemeral pub_key, MAC) (enc data: ...) 
     #define PAYLOAD_TYPE_PATH 0x08 // returned path (prefixed with dest/src hashes, MAC) (enc data: path, extra)
 
 [Source](https://discord.com/channels/1343693475589263471/1343693475589263474/1350611321040932966)
@@ -408,30 +370,14 @@ https://github.com/meshcore-dev/MeshCore/blob/main/src/Packet.h#L19
 
 ### 5.1. Q: What are BW, SF, and CR?
 
-**A:**
+**A:** 
 
 **BW is bandwidth** - width of frequency spectrum that is used for transmission
 
 **SF is spreading factor** - how much should the communication spread in time
 
-**CR is coding rate** - from: https://www.thethingsnetwork.org/docs/lorawan/fec-and-code-rate/
-
-TL;DR: default CR to 5 for good stable links.  If it is not a solid link and is intermittent, change to CR to 7 or 8.
-
-Forward Error Correction is a process of adding redundant bits to the data to be transmitted. During the transmission, data may get corrupted by interference (changes from 0 to 1 / 1 to 0). These error correction bits are used at the receivers for restoring corrupted bits.
-
-The Code Rate of a forward error correction expresses the proportion of bits in a data stream that actually carry useful information.
-
-There are 4 code rates used in LoRaWAN:
-
-4/5
-4/6
-5/7
-4/8
-
-For example, if the code rate is 5/7, for every 5 bits of useful information, the coder generates a total of 7 bits of data, of which 2 bits are redundant.
-
-Making the bandwidth 2x wider (from BW125 to BW250) allows you to send 2x more bytes in the same time. Making the spreading factor 1 step lower (from SF10 to SF9) allows you to send 2x more bytes in the same time.
+**CR is coding rate** - https://www.thethingsnetwork.org/docs/lorawan/fec-and-code-rate/
+Making the bandwidth 2x wider (from BW125 to BW250) allows you to send 2x more bytes in the same time. Making the spreading factor 1 step lower (from SF10 to SF9) allows you to send 2x more bytes in the same time. 
 
 Lowering the spreading factor makes it more difficult for the gateway to receive a transmission, as it will be more sensitive to noise. You could compare this to two people taking in a noisy place (a bar for example). If you’re far from each other, you have to talk slow (SF10), but if you’re close, you can talk faster (SF7)
 
@@ -439,14 +385,14 @@ So, it's balancing act between speed of the transmission and resistance to noise
 things network is mainly focused on LoRaWAN, but the LoRa low-level stuff still checks out for any LoRa project
 
 ### 5.2. Q: Do MeshCore clients repeat?
-**A:** No, MeshCore clients do not repeat.  This is the core of MeshCore's messaging-first design.  This is to avoid devices flooding the air ware and create endless collisions, so messages sent aren't received.
-In MeshCore, only repeaters and room server with `set repeat on` repeat.
+**A:** No, MeshCore clients do not repeat.  This is the core of MeshCore's messaging-first design.  This is to avoid devices flooding the air ware and create endless collisions, so messages sent aren't received.  
+In MeshCore, only repeaters and room server with `set repeat on` repeat.  
 
 ### 5.3. Q: What happens when a node learns a route via a mobile repeater, and that repeater is gone?
 
 **A:** If you used to reach a node through a repeater and the repeater is no longer reachable, the client will send the message using the existing (but now broken) known path, the message will fail after 3 retries, and the app will reset the path and send the message as flood on the last retry by default.  This can be turned off in settings.  If the destination is reachable directly or through another repeater, the new path will be used going forward.  Or you can set the path manually if you know a specific repeater to use to reach that destination.
 
-In the case if users are moving around frequently, and the paths are breaking, they just see the phone client retries and revert to flood to attempt to re-establish a path.
+In the case if users are moving around frequently, and the paths are breaking, they just see the phone client retries and revert to flood to attempt to re-establish a path. 
 
 ### 5.4. Q: How does a node discovery a path to its destination and then use it to send messages in the future, instead of flooding every message it sends like Meshtastic?
 
@@ -465,14 +411,14 @@ Routes are stored in sender's contact list.  When you send a message the first t
 **A:** The smartphone app key is in hex:
 ` 8b3387e9c5cdea6ac9e5edbaa115cd72`
 
-T-Deck uses the same key but in base64
+T-Deck uses the same key but in base64 
 `izOH6cXN6mrJ5e26oRXNcg==`
 The third character is the capital letter 'O', not zero `0`
 [Source](https://discord.com/channels/826570251612323860/1330643963501351004/1354194409213792388)
 
 ### 5.7. Q: Is MeshCore open source?
-**A:** Most of the firmware is freely available. Everything is open source except the T-Deck firmware and Liam's native mobile apps.
-- Firmware repo: https://github.com/meshcore-dev/MeshCore
+**A:** Most of the firmware is freely available. Everything is open source except the T-Deck firmware and Liam's native mobile apps.  
+- Firmware repo: https://github.com/meshcore-dev/MeshCore  
 
 ### 5.8. Q: How can I support MeshCore?
 **A:** Provide your honest feedback on GitHub and on [MeshCore Discord server](https://discord.gg/BMwCtwHj5V). Spread the word of MeshCore to your friends and communities; help them get started with MeshCore. Support Scott's MeshCore development at <https://buymeacoffee.com/ripplebiz>.
@@ -482,7 +428,7 @@ Support Liam Cottle's smartphone client development by unlocking the server admi
 Support Rastislav Vysoky (recrof)'s flasher web site and the map web site development through [PayPal](https://www.paypal.com/donate/?business=DREHF5HM265ES&no_recurring=0&item_name=If+you+enjoy+my+work%2C+you+can+support+me+here%3A&currency_code=EUR) or [Revolut](https://revolut.me/recrof)
 
 ### 5.9. Q: How do I build MeshCore firmware from source?
-**A:** See instructions here:
+**A:** See instructions here:  
 https://discord.com/channels/826570251612323860/1330643963501351004/1341826372120608769
 
 Build instructions for MeshCore:
@@ -502,7 +448,7 @@ Then it should be the same for all platforms:
 python3 -m venv meshcore
 cd meshcore && source bin/activate
 pip install -U platformio
-git clone https://github.com/ripplebiz/MeshCore.git
+git clone https://github.com/ripplebiz/MeshCore.git 
 cd MeshCore
 ```
 open platformio.ini and in `[arduino_base]` edit the `LORA_FREQ=867.5`
@@ -512,8 +458,8 @@ pio run -e RAK_4631_Repeater
 ```
 then you'll find `firmware.zip` in `.pio/build/RAK_4631_Repeater`
 
-Andy also has a video on how to build using VS Code:
-*How to build and flash Meshcore repeater firmware | Heltec V3*
+Andy also has a video on how to build using VS Code:  
+*How to build and flash Meshcore repeater firmware | Heltec V3*  
 <https://www.youtube.com/watch?v=WJvg6dt13hk> *(Link referenced in the Discord post)*
 
 ### 5.10. Q: Are there other MeshCore related open source projects?
@@ -530,13 +476,13 @@ Meshcore would not be best suited to ATAK because MeshCore:
 clients do not repeat and therefore you would need a network of repeaters in place
 will not have a stable path where all clients are constantly moving between repeaters
 
-MeshCore clients would need to reset path constantly and flood traffic across the network which could lead to lots of collisions with something as chatty as ATAK.
+MeshCore clients would need to reset path constantly and flood traffic across the network which could lead to lots of collisions with something as chatty as ATAK. 
 
 This could change in the future if MeshCore develops a client firmware that repeats.
 [Source](https://discord.com/channels/826570251612323860/1330643963501351004/1354780032140054659)
 
 ### 5.12. Q: How do I add a node to the [MeshCore Map]([url](https://meshcore.co.uk/map.html))
-**A:**
+**A:** 
 
 To add a BLE Companion radio, connect to the BLE Companion radio from the MeshCore smartphone app.  In the app, tap the `3 dot` menu icon at the top right corner, then tap `Internet Map`.  Tap the `3 dot` menu icon again and choose `Add me to the Map`
 
@@ -555,7 +501,7 @@ For ESP-based devices (e.g. Heltec V3) you need:
 - Download firmware file from flasher.meshcore.co.uk
     - Go to the web site on a browser, find the section that has the firmware up need
     - Click the Download button, right click on the file you need, for example,
-        - `Heltec_V3_companion_radio_ble-v1.7.1-165fb33.bin`
+        - `Heltec_V3_companion_radio_ble-v1.7.1-165fb33.bin` 
             - Non-merged bin keeps the existing Bluetooth pairing database
         - `Heltec_v3_companion_radio_usb-v1.7.1-165fb33-merged.bin`
             - Merged bin overwrites everything including the bootloader, existing Bluetooth pairing database, but keeps configurations.
@@ -574,7 +520,7 @@ For ESP-based devices (e.g. Heltec V3) you need:
             - `esptool.py -p /dev/ttyUSB0 --chip esp32-s3 write_flash 0x10000 <non-merged_firmware>.bin`
         - For merged bin:
             - `esptool.py -p /dev/ttyUSB0 --chip esp32-s3 write_flash 0x00000 <merged_firmware>.bin`
-
+	
 
 
 **Instructions for nRF devices:**
@@ -595,25 +541,24 @@ For nRF devices (e.g. RAK, Heltec T114) you need the following:
         - `pip install adafruit-nrfutil --break-system-packages`
         - Use this command to flash the nRF device:
             - `adafruit-nrfutil --verbose dfu serial --package RAK_4631_companion_radio_usb-v1.7.1-165fb33.zip -p /dev/ttyACM0 -b 115200 --singlebank --touch 1200`
-
-
+		
+		
 To manage a repeater or room server connected to a Pi over USB serial using shell commands, you need to install `picocom`.  To install `picocom`, run the following command:
 - `sudo apt install picocom`
 
 To start managing your USB serial-connected device using picocom, use the following command:
     - `picocom -b 115200 /dev/ttyUSB0 --imap lfcrlf`
 
-From here, reference repeater and room server command line commands on MeshCore github wiki here:
+From here, reference repeater and room server command line commands on MeshCore github wiki here: 
     - https://github.com/meshcore-dev/MeshCore/wiki/Repeater-&-Room-Server-CLI-Reference
 
-
+  
 ### 5.14. Q: Are there are projects built around MeshCore?
 
 **A:** Yes.  See the following:
 
 #### 5.14.1. meshcoremqtt
-A Python script to send meshcore debug and packet capture data to MQTT for analysis.  Cisien's version is a fork of Andrew-a-g's and is being used to to collect data for https://map.w0z.is/messages and https://analyzer.letsme.sh/
-https://github.com/Cisien/meshcoretomqtt
+A Python script to send meshore debug and packet capture data to MQTT for analysis
 https://github.com/Andrew-a-g/meshcoretomqtt
 
 #### 5.14.2. MeshCore for Home Assistant
@@ -624,7 +569,7 @@ https://github.com/awolden/meshcore-ha
 Bindings to access your MeshCore companion radio nodes in python.
 https://github.com/fdlamotte/meshcore_py
 
-#### 5.14.4. meshcore-cli
+#### 5.14.4. meshcore-cli  
 CLI interface to MeshCore companion radio over BLE, TCP, or serial.  Uses Python MeshCore above.
  https://github.com/fdlamotte/meshcore-cli
 
@@ -632,49 +577,15 @@ CLI interface to MeshCore companion radio over BLE, TCP, or serial.  Uses Python
 A JavaScript library for interacting with a MeshCore device running the companion radio firmware
 https://github.com/liamcottle/meshcore.js
 
-#### 5.14.6. pyMC_core
-pyMC_Core is a Python port of MeshCore, designed for Raspberry Pi and similar hardware, it talks to LoRa modules over SPI.
-https://github.com/rightup/pyMC_core
-
-#### 5.14.7. MeshCore Packet Decoder
-A TypeScript library for decoding MeshCore mesh networking packets with full cryptographic support. Uses WebAssembly (WASM) for Ed25519 key derivation through the orlp/ed25519 library.  It powers the [MeshCore Packet Analyzer](https://analyzer.letsme.sh/packets).
-https://github.com/michaelhart/meshcore-decoder
-
-#### 5.14.8. meshcore-pi
-meshcore-pi is another Python port of MeshCore, designed for Raspberry Pi and similar hardware, it talks to LoRa modules over SPI or GPIO.
-https://github.com/brianwiddas/meshcore-pi
-
-#### 5.14.9. pyMC_Repeater
-pyMC_Repeater is a repeater daemon in Python built on top of the [`pymc_core`](#5146-pymc_core) library.
-https://github.com/rightup/pyMC_Repeater
-
-
-### 5.15. Q: Are there client applications for Windows or Mac?
-**A:** Yes, the same iOS and Android client is also available for Windows and Intel Mac (sorry, not available for ARM-based Mac yet).  You can find them together with the Android APK here:
-https://files.liamcottle.net/MeshCore
-
-Both the Windows and Intel Mac versions of the client app are fully unlocked and are free to use.
-
-### 5.16. Q: Are there any resources that compare MeshCore to other LoRa systems?
-
-**A:** Here is a list of MeshCore comparison resources:
-The Comms Channel on YouTube:
-https://www.youtube.com/watch?v=guDoKGs02Us
-MeshCore Advantages by MCarper:
-https://github.com/mikecarper/meshfirmware/blob/main/MeshCoreAdvantages.md
-Meshcore vs Meshtastic by austinmesh.org
-https://www.austinmesh.org/learn/meshcore-vs-meshtastic/
-
-
 ---
 
 ## 6. Troubleshooting
 
 ### 6.1. 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.
-**A:**
-- If your client is a T-Deck, it may not have its time set (no GPS installed, no GPS lock, or wrong GPS baud rate).
-- If you are using the Android or iOS client, the other client, repeater, or room server may have the wrong time.
+**A:**  
+- If your client is a T-Deck, it may not have its time set (no GPS installed, no GPS lock, or wrong GPS baud rate).  
+- If you are using the Android or iOS client, the other client, repeater, or room server may have the wrong time.  
 
 You can get the epoch time on <https://www.epochconverter.com/> and use it to set your T-Deck clock. For a repeater and room server, the admin can use a T-Deck to remotely set their clock (clock sync), or use the `time` command in the USB serial console with the server device connected.
 
@@ -695,23 +606,23 @@ You can get the epoch time on <https://www.epochconverter.com/> and use it to se
 
 ### 6.7. Q: My RAK/T1000-E/xiao_nRF52 device seems to be corrupted, how do I wipe it clean to start fresh?
 
-**A:**
+**A:** 
 1. Connect USB-C cable to your device, per your device's instruction, get it to flash mode:
     - For RAK, click the reset button **TWICE**
     - For T1000-e, quickly disconnect and reconnect the magnetic side of the cable from the device **TWICE**
     - For Heltec T114, click the reset button **TWICE** (the bottom button)
     - For Xiao nRF52, click the reset button once.  If that doesn't work, quickly double click the reset button twice.  If that doesn't work, disconnection the board from your PC and reconnect again ([seeed studio wiki](https://wiki.seeedstudio.com/XIAO_BLE/#access-the-swd-pins-for-debugging-and-reflashing-bootloader))
 5. A new folder will appear on your computer's desktop
-6. Download the `flash_erase*.uf2` file for your device on flasher.meshcore.co.uk
+6. Download the `flash_erase*.uf2` file for your device on flasher.meshcore.co.uk 
     - RAK WisBlock and Heltec T114: `Flash_erase-nRF32_softdevice_v6.uf2`
     - Seeed Studio Xiao nRF52 WIO: `Flash_erase-nRF52_softdevice_v7.uf2`
 8. drag and drop the uf2 file for your device to the root of the new folder
 9. Wait for the copy to complete.  You might get an error dialog, you can ignore it
-10. Go to https://flasher.meshcore.co.uk/, click `Console` and select the serial port for your connected device
+10. Go to https://flasher.meshcore.co.uk/, click `Console` and select the serial port for your connected device 
 11. In the console, press enter.  Your flash should now be erased
 12. You may now flash the latest MeshCore firmware onto your device
 
-Separately, starting in firmware version 1.7.0, there is a CLI Rescue mode.  If your device has a user button (e.g. some RAK, T114), you can activate the rescue mode by hold down the user button of the device within 8 seconds of boot.  Then you can use the 'Console' on flasher.meshcore.co.uk
+Separately, starting in firmware version 1.7.0, there is a CLI Rescue mode.  If your device has a user button (e.g. some RAK, T114), you can activate the rescue mode by hold down the user button of the device within 8 seconds of boot.  Then you can use the 'Console' on flasher.meshcore.co.uk 
 
 ### 6.8. Q: WebFlasher fails on Linux with failed to open
 
@@ -734,20 +645,14 @@ Allow the browser user on it:
 4. Go to the Command Line tab, type `start ota` and hit enter.
 5. you should see `OK` to confirm the repeater device is now in OTA mode
 6. Run the DFU app,tab `Settings` on the top right corner
-7. Enable `Packets receipt notifications`, and change `Number of Packets` to 10 for RAK, 8 for T114.  8 also works for RAK.
+7. Enable `Packets receipt notifications`, and change `Number of Packets` to 10 for RAK, 8 for T114.  8 also works for RAK.  
 9. Select the firmware zip file you downloaded
 10. Select the device you want to update. If the device you want to update is not on the list, try enabling`OTA` on the device again
 11. If the device is not found, enable `Force Scanning` in the DFU app
 12. Tab the `Upload` to begin OTA update
-13. If it fails, try turning off and on Bluetooth on your phone.  If that doesn't work, try rebooting your phone.
+13. If it fails, try turning off and on Bluetooth on your phone.  If that doesn't work, try rebooting your phone.  
 14. Wait for the update to complete.  It can take a few minutes.
 
-#### 7.1.1 Q: Can I update Seeed Studio Wio Tracker L1 Pro using OTA?
-**A:**  You can flash this safer bootloader to the Wio Tracker L1 Pro
-https://github.com/oltaco/Adafruit_nRF52_Bootloader_OTAFIX
-
-After this bootloader is flashed onto the device, you can trigger over the air update using bluetooth by holding the button next to the D-Pad and then click the reset button.  The follow the same OTA update instructions above.  You can skip pass the `start ota` instruction and start the update using the DFU app.
-
 
 ### 7.2. Q: How to update ESP32-based devices over the air?
 
@@ -757,29 +662,25 @@ After this bootloader is flashed onto the device, you can trigger over the air u
 4. Go to the Command Line tab, type `start ota` and hit enter.
 5. you should see `OK` to confirm the repeater device is now in OTA mode
 6. The command `start ota` on an ESP32-based device starts a wifi hotspot named `MeshCore OTA`
-7. From your phone or computer connect to the 'MeshCore OTA' hotspot
+7. From your phone or computer connect to the 'MeshCore OTA' hotspot 
 8. From a browser, go to http://192.168.4.1/update and upload the non-merged bin from the flasher
 
 
 ### 7.3. Q: Is there a way to lower the chance of a failed OTA device firmware update (DFU)?
 
-**A:** Yes, developer `che aporeps` has an enhanced OTA DFU bootloader for nRF52 based devices.  With this bootloader, if it detects that the application firmware is invalid, it falls back to OTA DFU mode so you can attempt to flash again to recover.  This bootloader has other changes to make the OTA DFU process more fault tolerant.
+**A:** Yes, developer `che aporeps` has an enhanced OTA DFU bootloader for nRF52 based devices.  With this bootloader, if it detects that the application firmware is invalid, it falls back to OTA DFU mode so you can attempt to flash again to recover.  This bootloader has other changes to make the OTA DFU process more fault tolerant. 
 
 Refer to https://github.com/oltaco/Adafruit_nRF52_Bootloader_OTAFIX for the latest information.
 
 Currently, the following boards are supported:
-- Heltec Automation Mesh Node T114 / HT-nRF5262
-- Nologo ProMicro NRF52840 (aka SuperMini NRF52840)
-- Seeed Studio SenseCAP Card Tracker T1000-E
-- Seeed Studio Wio Tracker L1
+- Nologo ProMicro
 - Seeed Studio XIAO nRF52840 BLE
 - Seeed Studio XIAO nRF52840 BLE SENSE
-- RAK 4631 (See note)
-- RAK WisMesh Tag (new 28/11/2025)
+- RAK 4631
 
 ### 7.4. Q: are the MeshCore logo and font available?
 
-**A:** Yes, it is on the MeshCore github repo here:
+**A:** Yes, it is on the MeshCore github repo here: 
 https://github.com/meshcore-dev/MeshCore/tree/main/logo
 
 ### 7.5. Q: What is the format of a contact or channel QR code?
@@ -798,26 +699,8 @@ where `&type` is:
 `sensor = 4`
 
 ### 7.6. Q: How do I connect to the companion via WIFI, e.g. using a heltec v3?
- **A:**
+ **A:** 
 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 | |
 ---

docs/nrf52_power_management.md

@@ -1,213 +0,0 @@
-# nRF52 Power Management
-
-## Overview
-
-The nRF52 Power Management module provides battery protection features to prevent over-discharge, minimise likelihood of brownout and flash corruption conditions existing, and enable safe voltage-based recovery.
-
-## Features
-
-### Boot Voltage Protection
-- Checks battery voltage immediately after boot and before mesh operations commence
-- If voltage is below a configurable threshold (e.g., 3300mV), the device configures voltage wake (LPCOMP + VBUS) and enters protective shutdown (SYSTEMOFF)
-- Prevents boot loops when battery is critically low
-- Skipped when external power (USB VBUS) is detected
-
-### Voltage Wake (LPCOMP + VBUS)
-- Configures the nRF52's Low Power Comparator (LPCOMP) before entering SYSTEMOFF
-- Enables USB VBUS detection so external power can wake the device
-- Device automatically wakes when battery voltage rises above recovery threshold or when VBUS is detected
-
-### Early Boot Register Capture
-- Captures RESETREAS (reset reason) and GPREGRET2 (shutdown reason) before SystemInit() clears them
-- Allows firmware to determine why it booted (cold boot, watchdog, LPCOMP wake, etc.)
-- Allows firmware to determine why it last shut down (user request, low voltage, boot protection)
-
-### Shutdown Reason Tracking
-Shutdown reason codes (stored in GPREGRET2):
-| Code | Name | Description |
-|------|------|-------------|
-| 0x00 | NONE | Normal boot / no previous shutdown |
-| 0x4C | LOW_VOLTAGE | Runtime low voltage threshold reached |
-| 0x55 | USER | User requested powerOff() |
-| 0x42 | BOOT_PROTECT | Boot voltage protection triggered |
-
-## Supported Boards
-
-| Board | Implemented | LPCOMP wake | VBUS wake |
-|-------|-------------|-------------|-----------|
-| Seeed Studio XIAO nRF52840 (`xiao_nrf52`) | Yes | Yes | Yes |
-| RAK4631 (`rak4631`) | Yes | Yes | Yes |
-| Heltec T114 (`heltec_t114`) | Yes | Yes | Yes |
-| Promicro nRF52840 | No | No | No |
-| RAK WisMesh Tag | No | No | No |
-| Heltec Mesh Solar | No | No | No |
-| LilyGo T-Echo / T-Echo Lite | No | No | No |
-| SenseCAP Solar | No | No | No |
-| WIO Tracker L1 / L1 E-Ink | No | No | No |
-| WIO WM1110 | No | No | No |
-| Mesh Pocket | No | No | No |
-| Nano G2 Ultra | No | No | No |
-| ThinkNode M1/M3/M6 | No | No | No |
-| T1000-E | No | No | No |
-| Ikoka Nano/Stick/Handheld (nRF) | No | No | No |
-| Keepteen LT1 | No | No | No |
-| Minewsemi ME25LS01 | No | No | No |
-
-Notes:
-- "Implemented" reflects Phase 1 (boot lockout + shutdown reason capture).
-- User power-off on Heltec T114 does not enable LPCOMP wake.
-- VBUS detection is used to skip boot lockout on external power, and VBUS wake is configured alongside LPCOMP when supported hardware exposes VBUS to the nRF52.
-
-## Technical Details
-
-### Architecture
-
-The power management functionality is integrated into the `NRF52Board` base class in `src/helpers/NRF52Board.cpp`. Board variants provide hardware-specific configuration via a `PowerMgtConfig` struct and override `initiateShutdown(uint8_t reason)` to perform board-specific power-down work and conditionally enable voltage wake (LPCOMP + VBUS).
-
-### Early Boot Capture
-
-A static constructor with priority 101 in `NRF52Board.cpp` captures the RESETREAS and GPREGRET2 registers before:
-- SystemInit() (priority 102) - which clears RESETREAS
-- Static C++ constructors (default priority 65535)
-
-This ensures we capture the true reset reason before any initialisation code runs.
-
-### Board Implementation
-
-To enable power management on a board variant:
-
-1. **Enable in platformio.ini**:
-   ```ini
-   -D NRF52_POWER_MANAGEMENT
-   ```
-
-2. **Define configuration in variant.h**:
-   ```c
-   #define PWRMGT_VOLTAGE_BOOTLOCK    3300   // Won't boot below this voltage (mV)
-   #define PWRMGT_LPCOMP_AIN          7      // AIN channel for voltage sensing
-   #define PWRMGT_LPCOMP_REFSEL       2      // REFSEL (0-6=1/8..7/8, 7=ARef, 8-15=1/16..15/16)
-   ```
-
-3. **Implement in board .cpp file**:
-   ```cpp
-   #ifdef NRF52_POWER_MANAGEMENT
-   const PowerMgtConfig power_config = {
-     .lpcomp_ain_channel = PWRMGT_LPCOMP_AIN,
-     .lpcomp_refsel = PWRMGT_LPCOMP_REFSEL,
-     .voltage_bootlock = PWRMGT_VOLTAGE_BOOTLOCK
-   };
-
-   void MyBoard::initiateShutdown(uint8_t reason) {
-     // Board-specific shutdown preparation (e.g., disable peripherals)
-     bool enable_lpcomp = (reason == SHUTDOWN_REASON_LOW_VOLTAGE ||
-                           reason == SHUTDOWN_REASON_BOOT_PROTECT);
-
-     if (enable_lpcomp) {
-       configureVoltageWake(power_config.lpcomp_ain_channel, power_config.lpcomp_refsel);
-     }
-
-     enterSystemOff(reason);
-   }
-   #endif
-
-   void MyBoard::begin() {
-     NRF52Board::begin();  // or NRF52BoardDCDC::begin()
-     // ... board setup ...
-
-   #ifdef NRF52_POWER_MANAGEMENT
-     checkBootVoltage(&power_config);
-   #endif
-   }
-   ```
-
-   For user-initiated shutdowns, `powerOff()` remains board-specific. Power management only arms LPCOMP for automated shutdown reasons (boot protection/low voltage).
-
-4. **Declare override in board .h file**:
-   ```cpp
-   #ifdef NRF52_POWER_MANAGEMENT
-     void initiateShutdown(uint8_t reason) override;
-   #endif
-   ```
-
-### Voltage Wake Configuration
-
-The LPCOMP (Low Power Comparator) is configured to:
-- Monitor the specified AIN channel (0-7 corresponding to P0.02-P0.05, P0.28-P0.31)
-- Compare against VDD fraction reference (REFSEL: 0-6=1/8..7/8, 7=ARef, 8-15=1/16..15/16)
-- Detect UP events (voltage rising above threshold)
-- Use 50mV hysteresis for noise immunity
-- Wake the device from SYSTEMOFF when triggered
-
-VBUS wake is enabled via the POWER peripheral USBDETECTED event whenever `configureVoltageWake()` is used. This requires USB VBUS to be routed to the nRF52 (typical on nRF52840 boards with native USB).
-
-**LPCOMP Reference Selection (PWRMGT_LPCOMP_REFSEL)**:
-| REFSEL | Fraction | VBAT @ 1M/1M divider (VDD=3.0-3.3) | VBAT @ 1.5M/1M divider (VDD=3.0-3.3) |
-|--------|----------|------------------------------------|--------------------------------------|
-| 0 | 1/8 | 0.75-0.82 V | 0.94-1.03 V |
-| 1 | 2/8 | 1.50-1.65 V | 1.88-2.06 V |
-| 2 | 3/8 | 2.25-2.47 V | 2.81-3.09 V |
-| 3 | 4/8 | 3.00-3.30 V | 3.75-4.12 V |
-| 4 | 5/8 | 3.75-4.12 V | 4.69-5.16 V |
-| 5 | 6/8 | 4.50-4.95 V | 5.62-6.19 V |
-| 6 | 7/8 | 5.25-5.77 V | 6.56-7.22 V |
-| 7 | ARef | - | - |
-| 8 | 1/16 | 0.38-0.41 V | 0.47-0.52 V |
-| 9 | 3/16 | 1.12-1.24 V | 1.41-1.55 V |
-| 10 | 5/16 | 1.88-2.06 V | 2.34-2.58 V |
-| 11 | 7/16 | 2.62-2.89 V | 3.28-3.61 V |
-| 12 | 9/16 | 3.38-3.71 V | 4.22-4.64 V |
-| 13 | 11/16 | 4.12-4.54 V | 5.16-5.67 V |
-| 14 | 13/16 | 4.88-5.36 V | 6.09-6.70 V |
-| 15 | 15/16 | 5.62-6.19 V | 7.03-7.73 V |
-
-**Important**: For boards with a voltage divider on the battery sense pin, LPCOMP measures the divided voltage. Use:
-`VBAT_threshold ≈ (VDD * fraction) * divider_scale`, where `divider_scale = (Rtop + Rbottom) / Rbottom` (e.g., 2.0 for 1M/1M, 2.5 for 1.5M/1M, 3.0 for XIAO).
-
-### SoftDevice Compatibility
-
-The power management code checks whether SoftDevice is enabled and uses the appropriate API:
-- When SD enabled: `sd_power_*` functions
-- When SD disabled: Direct register access (NRF_POWER->*)
-
-This ensures compatibility regardless of BLE stack state.
-
-## CLI Commands
-
-Power management status can be queried via the CLI:
-
-| Command | Description |
-|---------|-------------|
-| `get pwrmgt.support` | Returns "supported" or "unsupported" |
-| `get pwrmgt.source` | Returns current power source - "battery" or "external" (5V/USB power) |
-| `get pwrmgt.bootreason` | Returns reset and shutdown reason strings |
-| `get pwrmgt.bootmv` | Returns boot voltage in millivolts |
-
-On boards without power management enabled, all commands except `get pwrmgt.support` return:
-```
-ERROR: Power management not supported
-```
-
-## Debug Output
-
-When `MESH_DEBUG=1` is enabled, the power management module outputs:
-```
-DEBUG: PWRMGT: Reset = Wake from LPCOMP (0x20000); Shutdown = Low Voltage (0x4C)
-DEBUG: PWRMGT: Boot voltage = 3450 mV (threshold = 3300 mV)
-DEBUG: PWRMGT: LPCOMP wake configured (AIN7, ref=3/8 VDD)
-```
-
-## Phase 2 (Planned)
-
-- Runtime voltage monitoring
-- Voltage state machine (Normal -> Warning -> Critical -> Shutdown)
-- Configurable thresholds
-- Load shedding callbacks for power reduction
-- Deep sleep integration
-- Scheduled wake-up
-- Extended sleep with periodic monitoring
-
-## References
-
-- [nRF52840 Product Specification - POWER](https://infocenter.nordicsemi.com/topic/ps_nrf52840/power.html)
-- [nRF52840 Product Specification - LPCOMP](https://infocenter.nordicsemi.com/topic/ps_nrf52840/lpcomp.html)
-- [SoftDevice S140 API - Power Management](https://infocenter.nordicsemi.com/topic/sdk_nrf5_v17.1.0/group__nrf__sdm__api.html)

docs/packet_structure.md

@@ -44,10 +44,6 @@ bit 0 means the lowest bit (1s place)
 | `0x08` | `PAYLOAD_TYPE_PATH`       | Returned path.                                |
 | `0x09` | `PAYLOAD_TYPE_TRACE`      | trace a path, collecting SNI for each hop.    |
 | `0x0A` | `PAYLOAD_TYPE_MULTIPART`  | packet is part of a sequence of packets.      |
-| `0x0B` | `PAYLOAD_TYPE_CONTROL`    | control packet data (unencrypted)             |
-| `0x0C` | .                         | reserved                                      |
-| `0x0D` | .                         | reserved                                      |
-| `0x0E` | .                         | reserved                                      |
 | `0x0F` | `PAYLOAD_TYPE_RAW_CUSTOM` | Custom packet (raw bytes, custom encryption). |
 
 ## Payload Version Values

docs/payloads.md

@@ -11,7 +11,6 @@ Inside of each [meshcore packet](./packet_structure.md) is a payload, identified
 * Group text message (unverified).
 * Group datagram (unverified).
 * Multi-part packet
-* Control data packet
 * Custom packet (raw bytes, custom encryption).
 
 This document defines the structure of each of these payload types.
@@ -58,7 +57,7 @@ Appdata Flags
 
 # Acknowledgement
 
-An acknowledgement that a message was received. Note that for returned path messages, an acknowledgement can be sent in the "extra" payload (see [Returned Path](#returned-path)) instead of as a separate ackowledgement packet. CLI commands do not cause acknowledgement responses, neither discrete nor extra.
+An acknowledgement that a message was received. Note that for returned path messages, an acknowledgement will be sent in the "extra" payload (see [Returned Path](#returned-path)) and not as a discrete ackowledgement. CLI commands do not require an acknowledgement, neither discrete nor extra.
 
 | Field    | Size (bytes) | Description                                                |
 |----------|--------------|------------------------------------------------------------|
@@ -103,9 +102,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 +131,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 |
@@ -164,13 +140,13 @@ TODO
 
 ## Plain text message
 
-| Field              | Size (bytes)    | Description                                                  |
-|--------------------|-----------------|--------------------------------------------------------------|
-| timestamp          | 4               | send time (unix timestamp)                                   |
-| txt_type + attempt | 1               | upper six bits are txt_type (see below), lower two bits are attempt number (0..3) |
-| message            | rest of payload | the message content, see next table                          |
+| Field           | Size (bytes)    | Description                                                  |
+|-----------------|-----------------|--------------------------------------------------------------|
+| timestamp       | 4               | send time (unix timestamp)                                   |
+| flags + attempt | 1               | upper six bits are flags (see below), lower two bits are attempt number (0..3) |
+| message         | rest of payload | the message content, see next table                          |
 
-txt_type
+Flags
 
 | Value  | Description               | Message content                                            |
 |--------|---------------------------|------------------------------------------------------------|
@@ -187,48 +163,13 @@ txt_type
 | cipher MAC       | 2               | MAC for encrypted data in next field      |
 | ciphertext       | rest of payload | encrypted message, see below for details  |
 
-## Room server login
+Plaintext message
 
 | Field          | Size (bytes)    | Description                                                                   |
 |----------------|-----------------|-------------------------------------------------------------------------------|
-| timestamp      | 4               | sender time (unix timestamp)                                                  |
-| sync timestamp | 4               | sender's "sync messages SINCE x" timestamp                                    |
-| password       | rest of message | password for room                                                             |
-
-## Repeater/Sensor login
-
-| Field          | Size (bytes)    | Description                                                                   |
-|----------------|-----------------|-------------------------------------------------------------------------------|
-| 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                                                       |
-
+| timestamp      | 4               | send time (unix timestamp)                                                    |
+| sync timestamp | 4               | NOTE: room server only! - sender's "sync messages SINCE x" timestamp |
+| password       | rest of message | password for repeater/room                                                    |
 
 # Group text message / datagram
 
@@ -241,32 +182,8 @@ txt_type
 The plaintext contained in the ciphertext matches the format described in [plain text message](#plain-text-message). Specifically, it consists of a four byte timestamp, a flags byte, and the message. The flags byte will generally be `0x00` because it is a "plain text message". The message will be of the form `<sender name>: <message body>` (eg., `user123: I'm on my way`).
 
 
-# Control data
-
-| Field        | Size (bytes)    | Description                                |
-|--------------|-----------------|--------------------------------------------|
-| flags        | 1               | upper 4 bits is sub_type                   |
-| data         | rest of payload | typically unencrypted data                 |
-
-## DISCOVER_REQ (sub_type)
-
-| Field        | Size (bytes)    | Description                                  |
-|--------------|-----------------|----------------------------------------------|
-| flags        | 1               | 0x8 (upper 4 bits), prefix_only (lowest bit) |
-| type_filter  | 1               | bit for each ADV_TYPE_*                      |
-| tag          | 4               | randomly generate by sender                  |
-| since        | 4               | (optional) epoch timestamp (0 by default)    |
-
-## DISCOVER_RESP (sub_type)
-
-| Field        | Size (bytes)    | Description                                |
-|--------------|-----------------|--------------------------------------------|
-| flags        | 1               | 0x9 (upper 4 bits), node_type (lower 4)    |
-| snr          | 1               | signed, SNR*4                              |
-| tag          | 4               | reflected back from DISCOVER_REQ           |
-| pubkey       | 8 or 32         | node's ID (or prefix)                      |
-
+TODO: describe what datagram looks like
 
 # Custom packet
 
-Custom packets have no defined format.
+Custom packets have no defined format.

docs/stats_binary_frames.md

@@ -1,312 +0,0 @@
-# Stats Binary Frame Structures
-
-Binary frame structures for companion radio stats commands. All multi-byte integers use little-endian byte order.
-
-## Command Codes
-
-| Command | Code | Description |
-|---------|------|-------------|
-| `CMD_GET_STATS` | 56 | Get statistics (2-byte command: code + sub-type) |
-
-### Stats Sub-Types
-
-The `CMD_GET_STATS` command uses a 2-byte frame structure:
-- **Byte 0:** `CMD_GET_STATS` (56)
-- **Byte 1:** Stats sub-type:
-  - `STATS_TYPE_CORE` (0) - Get core device statistics
-  - `STATS_TYPE_RADIO` (1) - Get radio statistics
-  - `STATS_TYPE_PACKETS` (2) - Get packet statistics
-
-## Response Codes
-
-| Response | Code | Description |
-|----------|------|-------------|
-| `RESP_CODE_STATS` | 24 | Statistics response (2-byte response: code + sub-type) |
-
-### Stats Response Sub-Types
-
-The `RESP_CODE_STATS` response uses a 2-byte header structure:
-- **Byte 0:** `RESP_CODE_STATS` (24)
-- **Byte 1:** Stats sub-type (matches command sub-type):
-  - `STATS_TYPE_CORE` (0) - Core device statistics response
-  - `STATS_TYPE_RADIO` (1) - Radio statistics response
-  - `STATS_TYPE_PACKETS` (2) - Packet statistics response
-
----
-
-## RESP_CODE_STATS + STATS_TYPE_CORE (24, 0)
-
-**Total Frame Size:** 11 bytes
-
-| Offset | Size | Type | Field Name | Description | Range/Notes |
-|--------|------|------|------------|-------------|-------------|
-| 0 | 1 | uint8_t | response_code | Always `0x18` (24) | - |
-| 1 | 1 | uint8_t | stats_type | Always `0x00` (STATS_TYPE_CORE) | - |
-| 2 | 2 | uint16_t | battery_mv | Battery voltage in millivolts | 0 - 65,535 |
-| 4 | 4 | uint32_t | uptime_secs | Device uptime in seconds | 0 - 4,294,967,295 |
-| 8 | 2 | uint16_t | errors | Error flags bitmask | - |
-| 10 | 1 | uint8_t | queue_len | Outbound packet queue length | 0 - 255 |
-
-### Example Structure (C/C++)
-
-```c
-struct StatsCore {
-    uint8_t  response_code;  // 0x18
-    uint8_t  stats_type;     // 0x00 (STATS_TYPE_CORE)
-    uint16_t battery_mv;
-    uint32_t uptime_secs;
-    uint16_t errors;
-    uint8_t  queue_len;
-} __attribute__((packed));
-```
-
----
-
-## RESP_CODE_STATS + STATS_TYPE_RADIO (24, 1)
-
-**Total Frame Size:** 14 bytes
-
-| Offset | Size | Type | Field Name | Description | Range/Notes |
-|--------|------|------|------------|-------------|-------------|
-| 0 | 1 | uint8_t | response_code | Always `0x18` (24) | - |
-| 1 | 1 | uint8_t | stats_type | Always `0x01` (STATS_TYPE_RADIO) | - |
-| 2 | 2 | int16_t | noise_floor | Radio noise floor in dBm | -140 to +10 |
-| 4 | 1 | int8_t | last_rssi | Last received signal strength in dBm | -128 to +127 |
-| 5 | 1 | int8_t | last_snr | SNR scaled by 4 | Divide by 4.0 for dB |
-| 6 | 4 | uint32_t | tx_air_secs | Cumulative transmit airtime in seconds | 0 - 4,294,967,295 |
-| 10 | 4 | uint32_t | rx_air_secs | Cumulative receive airtime in seconds | 0 - 4,294,967,295 |
-
-### Example Structure (C/C++)
-
-```c
-struct StatsRadio {
-    uint8_t  response_code;  // 0x18
-    uint8_t  stats_type;     // 0x01 (STATS_TYPE_RADIO)
-    int16_t  noise_floor;
-    int8_t   last_rssi;
-    int8_t   last_snr;       // Divide by 4.0 to get actual SNR in dB
-    uint32_t tx_air_secs;
-    uint32_t rx_air_secs;
-} __attribute__((packed));
-```
-
----
-
-## RESP_CODE_STATS + STATS_TYPE_PACKETS (24, 2)
-
-**Total Frame Size:** 26 bytes
-
-| Offset | Size | Type | Field Name | Description | Range/Notes |
-|--------|------|------|------------|-------------|-------------|
-| 0 | 1 | uint8_t | response_code | Always `0x18` (24) | - |
-| 1 | 1 | uint8_t | stats_type | Always `0x02` (STATS_TYPE_PACKETS) | - |
-| 2 | 4 | uint32_t | recv | Total packets received | 0 - 4,294,967,295 |
-| 6 | 4 | uint32_t | sent | Total packets sent | 0 - 4,294,967,295 |
-| 10 | 4 | uint32_t | flood_tx | Packets sent via flood routing | 0 - 4,294,967,295 |
-| 14 | 4 | uint32_t | direct_tx | Packets sent via direct routing | 0 - 4,294,967,295 |
-| 18 | 4 | uint32_t | flood_rx | Packets received via flood routing | 0 - 4,294,967,295 |
-| 22 | 4 | uint32_t | direct_rx | Packets received via direct routing | 0 - 4,294,967,295 |
-
-### Notes
-
-- Counters are cumulative from boot and may wrap.
-- `recv = flood_rx + direct_rx`
-- `sent = flood_tx + direct_tx`
-
-### Example Structure (C/C++)
-
-```c
-struct StatsPackets {
-    uint8_t  response_code;  // 0x18
-    uint8_t  stats_type;     // 0x02 (STATS_TYPE_PACKETS)
-    uint32_t recv;
-    uint32_t sent;
-    uint32_t flood_tx;
-    uint32_t direct_tx;
-    uint32_t flood_rx;
-    uint32_t direct_rx;
-} __attribute__((packed));
-```
-
----
-
-## Command Usage Example (Python)
-
-```python
-# Send CMD_GET_STATS command
-def send_get_stats_core(serial_interface):
-    """Send command to get core stats"""
-    cmd = bytes([56, 0])  # CMD_GET_STATS (56) + STATS_TYPE_CORE (0)
-    serial_interface.write(cmd)
-
-def send_get_stats_radio(serial_interface):
-    """Send command to get radio stats"""
-    cmd = bytes([56, 1])  # CMD_GET_STATS (56) + STATS_TYPE_RADIO (1)
-    serial_interface.write(cmd)
-
-def send_get_stats_packets(serial_interface):
-    """Send command to get packet stats"""
-    cmd = bytes([56, 2])  # CMD_GET_STATS (56) + STATS_TYPE_PACKETS (2)
-    serial_interface.write(cmd)
-```
-
----
-
-## Response Parsing Example (Python)
-
-```python
-import struct
-
-def parse_stats_core(frame):
-    """Parse RESP_CODE_STATS + STATS_TYPE_CORE frame (11 bytes)"""
-    response_code, stats_type, battery_mv, uptime_secs, errors, queue_len = \
-        struct.unpack('<B B H I H B', frame)
-    assert response_code == 24 and stats_type == 0, "Invalid response type"
-    return {
-        'battery_mv': battery_mv,
-        'uptime_secs': uptime_secs,
-        'errors': errors,
-        'queue_len': queue_len
-    }
-
-def parse_stats_radio(frame):
-    """Parse RESP_CODE_STATS + STATS_TYPE_RADIO frame (14 bytes)"""
-    response_code, stats_type, noise_floor, last_rssi, last_snr, tx_air_secs, rx_air_secs = \
-        struct.unpack('<B B h b b I I', frame)
-    assert response_code == 24 and stats_type == 1, "Invalid response type"
-    return {
-        'noise_floor': noise_floor,
-        'last_rssi': last_rssi,
-        'last_snr': last_snr / 4.0,  # Unscale SNR
-        'tx_air_secs': tx_air_secs,
-        'rx_air_secs': rx_air_secs
-    }
-
-def parse_stats_packets(frame):
-    """Parse RESP_CODE_STATS + STATS_TYPE_PACKETS frame (26 bytes)"""
-    response_code, stats_type, recv, sent, flood_tx, direct_tx, flood_rx, direct_rx = \
-        struct.unpack('<B B I I I I I I', frame)
-    assert response_code == 24 and stats_type == 2, "Invalid response type"
-    return {
-        'recv': recv,
-        'sent': sent,
-        'flood_tx': flood_tx,
-        'direct_tx': direct_tx,
-        'flood_rx': flood_rx,
-        'direct_rx': direct_rx
-    }
-```
-
----
-
-## Command Usage Example (JavaScript/TypeScript)
-
-```typescript
-// Send CMD_GET_STATS command
-const CMD_GET_STATS = 56;
-const STATS_TYPE_CORE = 0;
-const STATS_TYPE_RADIO = 1;
-const STATS_TYPE_PACKETS = 2;
-
-function sendGetStatsCore(serialInterface: SerialPort): void {
-    const cmd = new Uint8Array([CMD_GET_STATS, STATS_TYPE_CORE]);
-    serialInterface.write(cmd);
-}
-
-function sendGetStatsRadio(serialInterface: SerialPort): void {
-    const cmd = new Uint8Array([CMD_GET_STATS, STATS_TYPE_RADIO]);
-    serialInterface.write(cmd);
-}
-
-function sendGetStatsPackets(serialInterface: SerialPort): void {
-    const cmd = new Uint8Array([CMD_GET_STATS, STATS_TYPE_PACKETS]);
-    serialInterface.write(cmd);
-}
-```
-
----
-
-## Response Parsing Example (JavaScript/TypeScript)
-
-```typescript
-interface StatsCore {
-    battery_mv: number;
-    uptime_secs: number;
-    errors: number;
-    queue_len: number;
-}
-
-interface StatsRadio {
-    noise_floor: number;
-    last_rssi: number;
-    last_snr: number;
-    tx_air_secs: number;
-    rx_air_secs: number;
-}
-
-interface StatsPackets {
-    recv: number;
-    sent: number;
-    flood_tx: number;
-    direct_tx: number;
-    flood_rx: number;
-    direct_rx: number;
-}
-
-function parseStatsCore(buffer: ArrayBuffer): StatsCore {
-    const view = new DataView(buffer);
-    const response_code = view.getUint8(0);
-    const stats_type = view.getUint8(1);
-    if (response_code !== 24 || stats_type !== 0) {
-        throw new Error('Invalid response type');
-    }
-    return {
-        battery_mv: view.getUint16(2, true),
-        uptime_secs: view.getUint32(4, true),
-        errors: view.getUint16(8, true),
-        queue_len: view.getUint8(10)
-    };
-}
-
-function parseStatsRadio(buffer: ArrayBuffer): StatsRadio {
-    const view = new DataView(buffer);
-    const response_code = view.getUint8(0);
-    const stats_type = view.getUint8(1);
-    if (response_code !== 24 || stats_type !== 1) {
-        throw new Error('Invalid response type');
-    }
-    return {
-        noise_floor: view.getInt16(2, true),
-        last_rssi: view.getInt8(4),
-        last_snr: view.getInt8(5) / 4.0,  // Unscale SNR
-        tx_air_secs: view.getUint32(6, true),
-        rx_air_secs: view.getUint32(10, true)
-    };
-}
-
-function parseStatsPackets(buffer: ArrayBuffer): StatsPackets {
-    const view = new DataView(buffer);
-    const response_code = view.getUint8(0);
-    const stats_type = view.getUint8(1);
-    if (response_code !== 24 || stats_type !== 2) {
-        throw new Error('Invalid response type');
-    }
-    return {
-        recv: view.getUint32(2, true),
-        sent: view.getUint32(6, true),
-        flood_tx: view.getUint32(10, true),
-        direct_tx: view.getUint32(14, true),
-        flood_rx: view.getUint32(18, true),
-        direct_rx: view.getUint32(22, true)
-    };
-}
-```
-
----
-
-## Field Size Considerations
-
-- Packet counters (uint32_t): May wrap after extended high-traffic operation.
-- Time fields (uint32_t): Max ~136 years.
-- SNR (int8_t, scaled by 4): Range -32 to +31.75 dB, 0.25 dB precision.
-

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
@@ -200,7 +197,11 @@ void DataStore::loadPrefs(NodePrefs& prefs, double& node_lat, double& node_lon)
 }
 
 void DataStore::loadPrefsInt(const char *filename, NodePrefs& _prefs, double& node_lat, double& node_lon) {
-  File file = openRead(_fs, filename);
+#if defined(RP2040_PLATFORM)
+  File file = _fs->open(filename, "r");
+#else
+  File file = _fs->open(filename);
+#endif
   if (file) {
     uint8_t pad[8];
 
@@ -224,10 +225,6 @@ void DataStore::loadPrefsInt(const char *filename, NodePrefs& _prefs, double& no
     file.read((uint8_t *)&_prefs.multi_acks, sizeof(_prefs.multi_acks));                   // 77
     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();
   }
@@ -259,17 +256,22 @@ void DataStore::savePrefs(const NodePrefs& _prefs, double node_lat, double node_
     file.write((uint8_t *)&_prefs.multi_acks, sizeof(_prefs.multi_acks));                   // 77
     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();
   }
 }
 
 void DataStore::loadContacts(DataStoreHost* host) {
-File file = openRead(_getContactsChannelsFS(), "/contacts3");
+#if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
+  if (_getContactsChannelsFS()->exists("/contacts3")) {
+    File file = _getContactsChannelsFS()->open("/contacts3");
+#elif defined(RP2040_PLATFORM)
+    if (_fs->exists("/contacts3")) {
+    File file = _fs->open("/contacts3", "r");
+#else
+    if (_fs->exists("/contacts3")) {
+      File file = _fs->open("/contacts3", "r", false);
+#endif
     if (file) {
       bool full = false;
       while (!full) {
@@ -297,6 +299,7 @@ File file = openRead(_getContactsChannelsFS(), "/contacts3");
       }
       file.close();
     }
+  }
 }
 
 void DataStore::saveContacts(DataStoreHost* host) {
@@ -329,7 +332,16 @@ void DataStore::saveContacts(DataStoreHost* host) {
 }
 
 void DataStore::loadChannels(DataStoreHost* host) {
-    File file = openRead(_getContactsChannelsFS(), "/channels2");
+#if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
+  if (_getContactsChannelsFS()->exists("/channels2")) {
+    File file = _getContactsChannelsFS()->open("/channels2");
+#elif defined(RP2040_PLATFORM)
+  if (_fs->exists("/channels2")) {
+    File file = _fs->open("/channels2", "r");
+#else
+  if (_fs->exists("/channels2")) {
+    File file = _fs->open("/channels2", "r", false);
+#endif
     if (file) {
       bool full = false;
       uint8_t channel_idx = 0;
@@ -351,6 +363,7 @@ void DataStore::loadChannels(DataStoreHost* host) {
       }
       file.close();
     }
+  }
 }
 
 void DataStore::saveChannels(DataStoreHost* host) {
@@ -507,7 +520,7 @@ void DataStore::migrateToSecondaryFS() {
 }
 
 uint8_t DataStore::getBlobByKey(const uint8_t key[], int key_len, uint8_t dest_buf[]) {
-  File file = openRead(_getContactsChannelsFS(), "/adv_blobs");
+  File file = _getContactsChannelsFS()->open("/adv_blobs");
   uint8_t len = 0;  // 0 = not found
   if (file) {
     BlobRec tmp;
@@ -570,7 +583,11 @@ uint8_t DataStore::getBlobByKey(const uint8_t key[], int key_len, uint8_t dest_b
   sprintf(path, "/bl/%s", fname);
 
   if (_fs->exists(path)) {
-    File f = openRead(_fs, path);
+#if defined(RP2040_PLATFORM)
+    File f = _fs->open(path, "r");
+#else
+    File f = _fs->open(path);
+#endif
     if (f) {
       int len = f.read(dest_buf, 255); // currently MAX 255 byte blob len supported!!
       f.close();

examples/companion_radio/MyMesh.cpp

@@ -50,17 +50,6 @@
 #define CMD_SEND_BINARY_REQ           50
 #define CMD_FACTORY_RESET             51
 #define CMD_SEND_PATH_DISCOVERY_REQ   52
-#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
-#define STATS_TYPE_RADIO              1
-#define STATS_TYPE_PACKETS             2
 
 #define RESP_CODE_OK                  0
 #define RESP_CODE_ERR                 1
@@ -86,8 +75,6 @@
 #define RESP_CODE_CUSTOM_VARS         21
 #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
@@ -112,9 +99,6 @@
 #define PUSH_CODE_TELEMETRY_RESPONSE    0x8B
 #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 +109,6 @@
 
 #define MAX_SIGN_DATA_LEN               (8 * 1024) // 8K
 
-// Auto-add config bitmask
-// Bit 0: If set, overwrite oldest non-favourite contact when contacts file is full
-// Bits 1-4: these indicate which contact types to auto-add when manual_contact_mode = 0x01
-#define AUTO_ADD_OVERWRITE_OLDEST (1 << 0)  // 0x01 - overwrite oldest non-favourite when full
-#define AUTO_ADD_CHAT             (1 << 1)  // 0x02 - auto-add Chat (Companion) (ADV_TYPE_CHAT)
-#define AUTO_ADD_REPEATER         (1 << 2)  // 0x04 - auto-add Repeater (ADV_TYPE_REPEATER)
-#define AUTO_ADD_ROOM_SERVER      (1 << 3)  // 0x08 - auto-add Room Server (ADV_TYPE_ROOM)
-#define AUTO_ADD_SENSOR           (1 << 4)  // 0x10 - auto-add Sensor (ADV_TYPE_SENSOR)
-
 void MyMesh::writeOKFrame() {
   uint8_t buf[1];
   buf[0] = RESP_CODE_OK;
@@ -276,64 +251,20 @@ bool MyMesh::isAutoAddEnabled() const {
   return (_prefs.manual_add_contacts & 1) == 0;
 }
 
-bool MyMesh::shouldAutoAddContactType(uint8_t contact_type) const {
-  if ((_prefs.manual_add_contacts & 1) == 0) {
-    return true;
-  }
-  
-  uint8_t type_bit = 0;
-  switch (contact_type) {
-    case ADV_TYPE_CHAT:
-      type_bit = AUTO_ADD_CHAT;
-      break;
-    case ADV_TYPE_REPEATER:
-      type_bit = AUTO_ADD_REPEATER;
-      break;
-    case ADV_TYPE_ROOM:
-      type_bit = AUTO_ADD_ROOM_SERVER;
-      break;
-    case ADV_TYPE_SENSOR:
-      type_bit = AUTO_ADD_SENSOR;
-      break;
-    default:
-      return false;  // Unknown type, don't auto-add
-  }
-  
-  return (_prefs.autoadd_config & type_bit) != 0;
-}
-
-bool MyMesh::shouldOverwriteWhenFull() const {
-  return (_prefs.autoadd_config & AUTO_ADD_OVERWRITE_OLDEST) != 0;
-}
-
-void MyMesh::onContactOverwrite(const uint8_t* pub_key) {
-  if (_serial->isConnected()) {
-    out_frame[0] = PUSH_CODE_CONTACT_DELETED;
-    memcpy(&out_frame[1], pub_key, PUB_KEY_SIZE);
-    _serial->writeFrame(out_frame, 1 + PUB_KEY_SIZE);
-  }
-}
-
-void MyMesh::onContactsFull() {
-  if (_serial->isConnected()) {
-    out_frame[0] = PUSH_CODE_CONTACTS_FULL;
-    _serial->writeFrame(out_frame, 1);
-  }
-}
-
 void MyMesh::onDiscoveredContact(ContactInfo &contact, bool is_new, uint8_t path_len, const uint8_t* path) {
   if (_serial->isConnected()) {
-    if (is_new) {
+    if (!isAutoAddEnabled() && is_new) {
       writeContactRespFrame(PUSH_CODE_NEW_ADVERT, contact);
     } else {
       out_frame[0] = PUSH_CODE_ADVERT;
       memcpy(&out_frame[1], contact.id.pub_key, PUB_KEY_SIZE);
       _serial->writeFrame(out_frame, 1 + PUB_KEY_SIZE);
     }
-  } 
+  } else {
 #ifdef DISPLAY_CLASS
-  if (_ui && !_prefs.buzzer_quiet) _ui->notify(UIEventType::newContactMessage); //buzz if enabled
+    if (_ui) _ui->notify(UIEventType::newContactMessage);
 #endif
+  }
 
   // add inbound-path to mem cache
   if (path && path_len <= sizeof(AdvertPath::path)) {  // check path is valid
@@ -357,7 +288,7 @@ void MyMesh::onDiscoveredContact(ContactInfo &contact, bool is_new, uint8_t path
     memcpy(p->path, path, p->path_len);
   }
 
-  if (!is_new) dirty_contacts_expiry = futureMillis(LAZY_CONTACTS_WRITE_DELAY); // only schedule lazy write for contacts that are in contacts[]
+  dirty_contacts_expiry = futureMillis(LAZY_CONTACTS_WRITE_DELAY);
 }
 
 static int sort_by_recent(const void *a, const void *b) {
@@ -440,40 +371,13 @@ void MyMesh::queueMessage(const ContactInfo &from, uint8_t txt_type, mesh::Packe
   bool should_display = txt_type == TXT_TYPE_PLAIN || txt_type == TXT_TYPE_SIGNED_PLAIN;
   if (should_display && _ui) {
     _ui->newMsg(path_len, from.name, text, offline_queue_len);
-    if (!_prefs.buzzer_quiet) _ui->notify(UIEventType::contactMessage); //buzz if enabled
+    if (!_serial->isConnected()) {
+      _ui->notify(UIEventType::contactMessage);
+    }
   }
 #endif
 }
 
-bool MyMesh::filterRecvFloodPacket(mesh::Packet* packet) {
-  // REVISIT: try to determine which Region (from transport_codes[1]) that Sender is indicating for replies/responses
-  //    if unknown, fallback to finding Region from transport_codes[0], the 'scope' used by Sender
-  return false;
-}
-
-void MyMesh::sendFloodScoped(const ContactInfo& recipient, mesh::Packet* pkt, uint32_t delay_millis) {
-  // TODO: dynamic send_scope, depending on recipient and current 'home' Region
-  if (send_scope.isNull()) {
-    sendFlood(pkt, delay_millis);
-  } else {
-    uint16_t codes[2];
-    codes[0] = send_scope.calcTransportCode(pkt);
-    codes[1] = 0;  // REVISIT: set to 'home' Region, for sender/return region?
-    sendFlood(pkt, codes, delay_millis);
-  }
-}
-void MyMesh::sendFloodScoped(const mesh::GroupChannel& channel, mesh::Packet* pkt, uint32_t delay_millis) {
-  // TODO: have per-channel send_scope
-  if (send_scope.isNull()) {
-    sendFlood(pkt, delay_millis);
-  } else {
-    uint16_t codes[2];
-    codes[0] = send_scope.calcTransportCode(pkt);
-    codes[1] = 0;  // REVISIT: set to 'home' Region, for sender/return region?
-    sendFlood(pkt, codes, delay_millis);
-  }
-}
-
 void MyMesh::onMessageRecv(const ContactInfo &from, mesh::Packet *pkt, uint32_t sender_timestamp,
                            const char *text) {
   markConnectionActive(from); // in case this is from a server, and we have a connection
@@ -525,8 +429,11 @@ void MyMesh::onChannelMessageRecv(const mesh::GroupChannel &channel, mesh::Packe
     uint8_t frame[1];
     frame[0] = PUSH_CODE_MSG_WAITING; // send push 'tickle'
     _serial->writeFrame(frame, 1);
+  } else {
+#ifdef DISPLAY_CLASS
+    if (_ui) _ui->notify(UIEventType::channelMessage);
+#endif
   }
-
 #ifdef DISPLAY_CLASS
   // Get the channel name from the channel index
   const char *channel_name = "Unknown";
@@ -534,10 +441,7 @@ void MyMesh::onChannelMessageRecv(const mesh::GroupChannel &channel, mesh::Packe
   if (getChannel(channel_idx, channel_details)) {
     channel_name = channel_details.name;
   }
-  if (_ui) {
-    _ui->newMsg(path_len, channel_name, text, offline_queue_len);
-    if (!_prefs.buzzer_quiet) _ui->notify(UIEventType::channelMessage); //buzz if enabled
-  }
+  if (_ui) _ui->newMsg(path_len, channel_name, text, offline_queue_len);
 #endif
 }
 
@@ -692,26 +596,6 @@ bool MyMesh::onContactPathRecv(ContactInfo& contact, uint8_t* in_path, uint8_t i
   return BaseChatMesh::onContactPathRecv(contact, in_path, in_path_len, out_path, out_path_len, extra_type, extra, extra_len);
 }
 
-void MyMesh::onControlDataRecv(mesh::Packet *packet) {
-  if (packet->payload_len + 4 > sizeof(out_frame)) {
-    MESH_DEBUG_PRINTLN("onControlDataRecv(), payload_len too long: %d", packet->payload_len);
-    return;
-  }
-  int i = 0;
-  out_frame[i++] = PUSH_CODE_CONTROL_DATA;
-  out_frame[i++] = (int8_t)(_radio->getLastSNR() * 4);
-  out_frame[i++] = (int8_t)(_radio->getLastRSSI());
-  out_frame[i++] = packet->path_len;
-  memcpy(&out_frame[i], packet->payload, packet->payload_len);
-  i += packet->payload_len;
-
-  if (_serial->isConnected()) {
-    _serial->writeFrame(out_frame, i);
-  } else {
-    MESH_DEBUG_PRINTLN("onControlDataRecv(), data received while app offline");
-  }
-}
-
 void MyMesh::onRawDataRecv(mesh::Packet *packet) {
   if (packet->payload_len + 4 > sizeof(out_frame)) {
     MESH_DEBUG_PRINTLN("onRawDataRecv(), payload_len too long: %d", packet->payload_len);
@@ -734,11 +618,6 @@ void MyMesh::onRawDataRecv(mesh::Packet *packet) {
 
 void MyMesh::onTraceRecv(mesh::Packet *packet, uint32_t tag, uint32_t auth_code, uint8_t flags,
                          const uint8_t *path_snrs, const uint8_t *path_hashes, uint8_t path_len) {
-  uint8_t path_sz = flags & 0x03;  // NEW v1.11+
-  if (12 + path_len + (path_len >> path_sz) + 1 > sizeof(out_frame)) {
-    MESH_DEBUG_PRINTLN("onTraceRecv(), path_len is too long: %d", (uint32_t)path_len);
-    return;
-  }
   int i = 0;
   out_frame[i++] = PUSH_CODE_TRACE_DATA;
   out_frame[i++] = 0; // reserved
@@ -750,9 +629,8 @@ void MyMesh::onTraceRecv(mesh::Packet *packet, uint32_t tag, uint32_t auth_code,
   i += 4;
   memcpy(&out_frame[i], path_hashes, path_len);
   i += path_len;
-
-  memcpy(&out_frame[i], path_snrs, path_len >> path_sz);
-  i += path_len >> path_sz;
+  memcpy(&out_frame[i], path_snrs, path_len);
+  i += path_len;
   out_frame[i++] = (int8_t)(packet->getSNR() * 4); // extra/final SNR (to this node)
 
   if (_serial->isConnected()) {
@@ -785,20 +663,16 @@ MyMesh::MyMesh(mesh::Radio &radio, mesh::RNG &rng, mesh::RTCClock &rtc, SimpleMe
   sign_data = NULL;
   dirty_contacts_expiry = 0;
   memset(advert_paths, 0, sizeof(advert_paths));
-  memset(send_scope.key, 0, sizeof(send_scope.key));
 
   // defaults
   memset(&_prefs, 0, sizeof(_prefs));
-  _prefs.airtime_factor = 1.0;
+  _prefs.airtime_factor = 1.0; // one half
   strcpy(_prefs.node_name, "NONAME");
   _prefs.freq = LORA_FREQ;
   _prefs.sf = LORA_SF;
   _prefs.bw = LORA_BW;
   _prefs.cr = LORA_CR;
   _prefs.tx_power_dbm = LORA_TX_POWER;
-  _prefs.buzzer_quiet = 0;
-  _prefs.gps_enabled = 0;       // GPS disabled by default
-  _prefs.gps_interval = 0;      // No automatic GPS updates by default
   //_prefs.rx_delay_base = 10.0f;  enable once new algo fixed
 }
 
@@ -815,14 +689,14 @@ void MyMesh::begin(bool has_display) {
     _store->saveMainIdentity(self_id);
   }
 
-// if name is provided as a build flag, use that as default node name instead
-#ifdef ADVERT_NAME
-  strcpy(_prefs.node_name, ADVERT_NAME);
-#else
   // use hex of first 4 bytes of identity public key as default node name
   char pub_key_hex[10];
   mesh::Utils::toHex(pub_key_hex, self_id.pub_key, 4);
   strcpy(_prefs.node_name, pub_key_hex);
+
+// if name is provided as a build flag, use that as default node name instead
+#ifdef ADVERT_NAME
+  strcpy(_prefs.node_name, ADVERT_NAME);
 #endif
 
   // load persisted prefs
@@ -832,13 +706,10 @@ void MyMesh::begin(bool has_display) {
   _prefs.rx_delay_base = constrain(_prefs.rx_delay_base, 0, 20.0f);
   _prefs.airtime_factor = constrain(_prefs.airtime_factor, 0, 9.0f);
   _prefs.freq = constrain(_prefs.freq, 400.0f, 2500.0f);
-  _prefs.bw = constrain(_prefs.bw, 7.8f, 500.0f);
-  _prefs.sf = constrain(_prefs.sf, 5, 12);
+  _prefs.bw = constrain(_prefs.bw, 62.5f, 500.0f);
+  _prefs.sf = constrain(_prefs.sf, 7, 12);
   _prefs.cr = constrain(_prefs.cr, 5, 8);
   _prefs.tx_power_dbm = constrain(_prefs.tx_power_dbm, 1, MAX_LORA_TX_POWER);
-  _prefs.buzzer_quiet = constrain(_prefs.buzzer_quiet, 0, 1);  // Ensure boolean 0 or 1
-  _prefs.gps_enabled = constrain(_prefs.gps_enabled, 0, 1);  // Ensure boolean 0 or 1
-  _prefs.gps_interval = constrain(_prefs.gps_interval, 0, 86400);  // Max 24 hours
 
 #ifdef BLE_PIN_CODE // 123456 by default
   if (_prefs.ble_pin == 0) {
@@ -861,7 +732,6 @@ void MyMesh::begin(bool has_display) {
 
   resetContacts();
   _store->loadContacts(this);
-  bootstrapRTCfromContacts();
   addChannel("Public", PUBLIC_GROUP_PSK); // pre-configure Andy's public channel
   _store->loadChannels(this);
 
@@ -963,7 +833,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 {
@@ -1206,7 +1075,7 @@ void MyMesh::handleCmdFrame(size_t len) {
     uint8_t sf = cmd_frame[i++];
     uint8_t cr = cmd_frame[i++];
 
-    if (freq >= 300000 && freq <= 2500000 && sf >= 5 && sf <= 12 && cr >= 5 && cr <= 8 && bw >= 7000 &&
+    if (freq >= 300000 && freq <= 2500000 && sf >= 7 && sf <= 12 && cr >= 5 && cr <= 8 && bw >= 7000 &&
         bw <= 500000) {
       _prefs.sf = sf;
       _prefs.cr = cr;
@@ -1294,20 +1163,16 @@ void MyMesh::handleCmdFrame(size_t len) {
 #endif
   } else if (cmd_frame[0] == CMD_IMPORT_PRIVATE_KEY && len >= 65) {
 #if ENABLE_PRIVATE_KEY_IMPORT
-    if (!mesh::LocalIdentity::validatePrivateKey(&cmd_frame[1])) {
-        writeErrFrame(ERR_CODE_ILLEGAL_ARG); // invalid key
+    mesh::LocalIdentity identity;
+    identity.readFrom(&cmd_frame[1], 64);
+    if (_store->saveMainIdentity(identity)) {
+      self_id = identity;
+      writeOKFrame();
+      // re-load contacts, to recalc shared secrets
+      resetContacts();
+      _store->loadContacts(this);
     } else {
-        mesh::LocalIdentity identity;
-        identity.readFrom(&cmd_frame[1], 64);
-        if (_store->saveMainIdentity(identity)) {
-          self_id = identity;
-          writeOKFrame();
-          // re-load contacts, to invalidate ecdh shared_secrets
-          resetContacts();
-          _store->loadContacts(this);
-        } else {
-          writeErrFrame(ERR_CODE_FILE_IO_ERROR);
-        }
+      writeErrFrame(ERR_CODE_FILE_IO_ERROR);
     }
 #else
     writeDisabledFrame();
@@ -1350,27 +1215,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);
@@ -1549,31 +1393,25 @@ void MyMesh::handleCmdFrame(size_t len) {
     } else {
       writeErrFrame(ERR_CODE_BAD_STATE);
     }
-  } else if (cmd_frame[0] == CMD_SEND_TRACE_PATH && len > 10 && len - 10 < MAX_PACKET_PAYLOAD-5) {
-    uint8_t path_len = len - 10;
-    uint8_t flags = cmd_frame[9];
-    uint8_t path_sz = flags & 0x03;  // NEW v1.11+ 
-    if ((path_len >> path_sz) > MAX_PATH_SIZE || (path_len % (1 << path_sz)) != 0) { // make sure is multiple of path_sz
-      writeErrFrame(ERR_CODE_ILLEGAL_ARG);
+  } else if (cmd_frame[0] == CMD_SEND_TRACE_PATH && len > 10 && len - 10 < MAX_PATH_SIZE) {
+    uint32_t tag, auth;
+    memcpy(&tag, &cmd_frame[1], 4);
+    memcpy(&auth, &cmd_frame[5], 4);
+    auto pkt = createTrace(tag, auth, cmd_frame[9]);
+    if (pkt) {
+      uint8_t path_len = len - 10;
+      sendDirect(pkt, &cmd_frame[10], path_len);
+
+      uint32_t t = _radio->getEstAirtimeFor(pkt->payload_len + pkt->path_len + 2);
+      uint32_t est_timeout = calcDirectTimeoutMillisFor(t, path_len);
+
+      out_frame[0] = RESP_CODE_SENT;
+      out_frame[1] = 0;
+      memcpy(&out_frame[2], &tag, 4);
+      memcpy(&out_frame[6], &est_timeout, 4);
+      _serial->writeFrame(out_frame, 10);
     } else {
-      uint32_t tag, auth;
-      memcpy(&tag, &cmd_frame[1], 4);
-      memcpy(&auth, &cmd_frame[5], 4);
-      auto pkt = createTrace(tag, auth, flags);
-      if (pkt) {
-        sendDirect(pkt, &cmd_frame[10], path_len);
-
-        uint32_t t = _radio->getEstAirtimeFor(pkt->payload_len + pkt->path_len + 2);
-        uint32_t est_timeout = calcDirectTimeoutMillisFor(t, path_len);
-
-        out_frame[0] = RESP_CODE_SENT;
-        out_frame[1] = 0;
-        memcpy(&out_frame[2], &tag, 4);
-        memcpy(&out_frame[6], &est_timeout, 4);
-        _serial->writeFrame(out_frame, 10);
-      } else {
-        writeErrFrame(ERR_CODE_TABLE_FULL);
-      }
+      writeErrFrame(ERR_CODE_TABLE_FULL);
     }
   } else if (cmd_frame[0] == CMD_SET_DEVICE_PIN && len >= 5) {
 
@@ -1611,17 +1449,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);
@@ -1649,60 +1476,7 @@ void MyMesh::handleCmdFrame(size_t len) {
     } else {
       writeErrFrame(ERR_CODE_NOT_FOUND);
     }
-  } else if (cmd_frame[0] == CMD_GET_STATS && len >= 2) {
-    uint8_t stats_type = cmd_frame[1];
-    if (stats_type == STATS_TYPE_CORE) {
-      int i = 0;
-      out_frame[i++] = RESP_CODE_STATS;
-      out_frame[i++] = STATS_TYPE_CORE;
-      uint16_t battery_mv = board.getBattMilliVolts();
-      uint32_t uptime_secs = _ms->getMillis() / 1000;
-      uint8_t queue_len = (uint8_t)_mgr->getOutboundCount(0xFFFFFFFF);
-      memcpy(&out_frame[i], &battery_mv, 2); i += 2;
-      memcpy(&out_frame[i], &uptime_secs, 4); i += 4;
-      memcpy(&out_frame[i], &_err_flags, 2); i += 2;
-      out_frame[i++] = queue_len;
-      _serial->writeFrame(out_frame, i);
-    } else if (stats_type == STATS_TYPE_RADIO) {
-      int i = 0;
-      out_frame[i++] = RESP_CODE_STATS;
-      out_frame[i++] = STATS_TYPE_RADIO;
-      int16_t noise_floor = (int16_t)_radio->getNoiseFloor();
-      int8_t last_rssi = (int8_t)radio_driver.getLastRSSI();
-      int8_t last_snr = (int8_t)(radio_driver.getLastSNR() * 4); // scaled by 4 for 0.25 dB precision
-      uint32_t tx_air_secs = getTotalAirTime() / 1000;
-      uint32_t rx_air_secs = getReceiveAirTime() / 1000;
-      memcpy(&out_frame[i], &noise_floor, 2); i += 2;
-      out_frame[i++] = last_rssi;
-      out_frame[i++] = last_snr;
-      memcpy(&out_frame[i], &tx_air_secs, 4); i += 4;
-      memcpy(&out_frame[i], &rx_air_secs, 4); i += 4;
-      _serial->writeFrame(out_frame, i);
-    } else if (stats_type == STATS_TYPE_PACKETS) {
-      int i = 0;
-      out_frame[i++] = RESP_CODE_STATS;
-      out_frame[i++] = STATS_TYPE_PACKETS;
-      uint32_t recv = radio_driver.getPacketsRecv();
-      uint32_t sent = radio_driver.getPacketsSent();
-      uint32_t n_sent_flood = getNumSentFlood();
-      uint32_t n_sent_direct = getNumSentDirect();
-      uint32_t n_recv_flood = getNumRecvFlood();
-      uint32_t n_recv_direct = getNumRecvDirect();
-      memcpy(&out_frame[i], &recv, 4); i += 4;
-      memcpy(&out_frame[i], &sent, 4); i += 4;
-      memcpy(&out_frame[i], &n_sent_flood, 4); i += 4;
-      memcpy(&out_frame[i], &n_sent_direct, 4); i += 4;
-      memcpy(&out_frame[i], &n_recv_flood, 4); i += 4;
-      memcpy(&out_frame[i], &n_recv_direct, 4); i += 4;
-      _serial->writeFrame(out_frame, i);
-    } else {
-      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();
@@ -1711,30 +1485,6 @@ void MyMesh::handleCmdFrame(size_t len) {
     } else {
       writeErrFrame(ERR_CODE_FILE_IO_ERROR);
     }
-  } else if (cmd_frame[0] == CMD_SET_FLOOD_SCOPE && len >= 2 && cmd_frame[1] == 0) {
-    if (len >= 2 + 16) {
-      memcpy(send_scope.key, &cmd_frame[2], sizeof(send_scope.key));  // set curr scope TransportKey
-    } else {
-      memset(send_scope.key, 0, sizeof(send_scope.key));  // set scope to null
-    }
-    writeOKFrame();
-  } else if (cmd_frame[0] == CMD_SEND_CONTROL_DATA && len >= 2 && (cmd_frame[1] & 0x80) != 0) {
-    auto resp = createControlData(&cmd_frame[1], len - 1);
-    if (resp) {
-      sendZeroHop(resp);
-      writeOKFrame();
-    } 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]);
@@ -1979,4 +1729,4 @@ bool MyMesh::advert() {
   } else {
     return false;
   }
-}
+}

examples/companion_radio/MyMesh.h

@@ -5,14 +5,14 @@
 #include "AbstractUITask.h"
 
 /*------------ Frame Protocol --------------*/
-#define FIRMWARE_VER_CODE 8
+#define FIRMWARE_VER_CODE 7
 
 #ifndef FIRMWARE_BUILD_DATE
-#define FIRMWARE_BUILD_DATE "30 Nov 2025"
+#define FIRMWARE_BUILD_DATE "2 Oct 2025"
 #endif
 
 #ifndef FIRMWARE_VERSION
-#define FIRMWARE_VERSION "v1.11.0"
+#define FIRMWARE_VERSION "v1.9.1"
 #endif
 
 #if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
@@ -68,7 +68,6 @@
 #endif
 
 #include <helpers/BaseChatMesh.h>
-#include <helpers/TransportKeyStore.h>
 
 /* -------------------------------------------------------------------------------------- */
 
@@ -107,17 +106,9 @@ protected:
   int getInterferenceThreshold() const override;
   int calcRxDelay(float score, uint32_t air_time) const override;
   uint8_t getExtraAckTransmitCount() const override;
-  bool filterRecvFloodPacket(mesh::Packet* packet) override;
-
-  void sendFloodScoped(const ContactInfo& recipient, mesh::Packet* pkt, uint32_t delay_millis=0) override;
-  void sendFloodScoped(const mesh::GroupChannel& channel, mesh::Packet* pkt, uint32_t delay_millis=0) override;
 
   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;
@@ -137,7 +128,6 @@ protected:
   uint8_t onContactRequest(const ContactInfo &contact, uint32_t sender_timestamp, const uint8_t *data,
                            uint8_t len, uint8_t *reply) override;
   void onContactResponse(const ContactInfo &contact, const uint8_t *data, uint8_t len) override;
-  void onControlDataRecv(mesh::Packet *packet) override;
   void onRawDataRecv(mesh::Packet *packet) override;
   void onTraceRecv(mesh::Packet *packet, uint32_t tag, uint32_t auth_code, uint8_t flags,
                    const uint8_t *path_snrs, const uint8_t *path_hashes, uint8_t path_len) override;
@@ -156,9 +146,6 @@ protected:
     pending_login = pending_status = pending_telemetry = pending_discovery = pending_req = 0;
   }
 
-public:
-  void savePrefs() { _store->savePrefs(_prefs, sensors.node_lat, sensors.node_lon); }
-
 private:
   void writeOKFrame();
   void writeErrFrame(uint8_t err_code);
@@ -178,9 +165,11 @@ private:
   void checkSerialInterface();
 
   // helpers, short-cuts
+  void savePrefs() { _store->savePrefs(_prefs, sensors.node_lat, sensors.node_lon); }
   void saveChannels() { _store->saveChannels(this); }
   void saveContacts() { _store->saveContacts(this); }
 
+private:
   DataStore* _store;
   NodePrefs _prefs;
   uint32_t pending_login;
@@ -202,8 +191,6 @@ private:
   uint32_t sign_data_len;
   unsigned long dirty_contacts_expiry;
 
-  TransportKey send_scope;
-
   uint8_t cmd_frame[MAX_FRAME_SIZE + 1];
   uint8_t out_frame[MAX_FRAME_SIZE + 1];
   CayenneLPP telemetry;

examples/companion_radio/NodePrefs.h

@@ -24,8 +24,4 @@ struct NodePrefs {  // persisted to file
   float rx_delay_base;
   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
 };

examples/companion_radio/main.cpp

@@ -151,7 +151,9 @@ void setup() {
   );
 
 #ifdef BLE_PIN_CODE
-  serial_interface.begin(BLE_NAME_PREFIX, the_mesh.getNodePrefs()->node_name, the_mesh.getBLEPin());
+  char dev_name[32+16];
+  sprintf(dev_name, "%s%s", BLE_NAME_PREFIX, the_mesh.getNodeName());
+  serial_interface.begin(dev_name, the_mesh.getBLEPin());
 #else
   serial_interface.begin(Serial);
 #endif
@@ -197,7 +199,9 @@ void setup() {
   WiFi.begin(WIFI_SSID, WIFI_PWD);
   serial_interface.begin(TCP_PORT);
 #elif defined(BLE_PIN_CODE)
-  serial_interface.begin(BLE_NAME_PREFIX, the_mesh.getNodePrefs()->node_name, the_mesh.getBLEPin());
+  char dev_name[32+16];
+  sprintf(dev_name, "%s%s", BLE_NAME_PREFIX, the_mesh.getNodeName());
+  serial_interface.begin(dev_name, the_mesh.getBLEPin());
 #elif defined(SERIAL_RX)
   companion_serial.setPins(SERIAL_RX, SERIAL_TX);
   companion_serial.begin(115200);
@@ -223,5 +227,4 @@ void loop() {
 #ifdef DISPLAY_CLASS
   ui_task.loop();
 #endif
-  rtc_clock.tick();
 }

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);
@@ -270,24 +260,13 @@ public:
 #if ENV_INCLUDE_GPS == 1
     } else if (_page == HomePage::GPS) {
       LocationProvider* nmea = sensors.getLocationProvider();
-      char buf[50];
       int y = 18;
-      bool gps_state = _task->getGPSState();
-#ifdef PIN_GPS_SWITCH
-      bool hw_gps_state = digitalRead(PIN_GPS_SWITCH);
-      if (gps_state != hw_gps_state) {
-        strcpy(buf, gps_state ? "gps off(hw)" : "gps off(sw)");
-      } else {
-        strcpy(buf, gps_state ? "gps on" : "gps off");
-      }
-#else
-      strcpy(buf, gps_state ? "gps on" : "gps off");
-#endif
-      display.drawTextLeftAlign(0, y, buf);
+      display.drawTextLeftAlign(0, y, _task->getGPSState() ? "gps on" : "gps off");
       if (nmea == NULL) {
         y = y + 12;
         display.drawTextLeftAlign(0, y, "Can't access GPS");
       } else {
+        char buf[50];
         strcpy(buf, nmea->isValid()?"fix":"no fix");
         display.drawTextRightAlign(display.width()-1, y, buf);
         y = y + 12;
@@ -547,26 +526,12 @@ 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();
   }
 
 #ifdef PIN_BUZZER
   buzzer.begin();
-  buzzer.quiet(_node_prefs->buzzer_quiet);
 #endif
 
 #ifdef PIN_VIBRATION
@@ -631,13 +596,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
-    }
   }
 }
 
@@ -657,7 +618,7 @@ void UITask::userLedHandler() {
       led_state = 0;
       next_led_change = cur_time + LED_CYCLE_MILLIS - last_led_increment;
     }
-    digitalWrite(PIN_STATUS_LED, led_state == LED_STATE_ON);
+    digitalWrite(PIN_STATUS_LED, led_state);
   }
 #endif
 }
@@ -689,7 +650,6 @@ void UITask::shutdown(bool restart){
     _board->reboot();
   } else {
     _display->turnOff();
-    radio_driver.powerOff();
     _board->powerOff();
   }
 }
@@ -740,28 +700,21 @@ void UITask::loop() {
   }
 #endif
 #if defined(PIN_USER_BTN_ANA)
-  if (abs(millis() - _analogue_pin_read_millis) > 10) {
-    ev = analog_btn.check();
-    if (ev == BUTTON_EVENT_CLICK) {
-      c = checkDisplayOn(KEY_NEXT);
-    } else if (ev == BUTTON_EVENT_LONG_PRESS) {
-      c = handleLongPress(KEY_ENTER);
-    } else if (ev == BUTTON_EVENT_DOUBLE_CLICK) {
-      c = handleDoubleClick(KEY_PREV);
-    } else if (ev == BUTTON_EVENT_TRIPLE_CLICK) {
-      c = handleTripleClick(KEY_SELECT);
-    }
-    _analogue_pin_read_millis = millis();
+  ev = analog_btn.check();
+  if (ev == BUTTON_EVENT_CLICK) {
+    c = checkDisplayOn(KEY_NEXT);
+  } else if (ev == BUTTON_EVENT_LONG_PRESS) {
+    c = handleLongPress(KEY_ENTER);
+  } else if (ev == BUTTON_EVENT_DOUBLE_CLICK) {
+    c = handleDoubleClick(KEY_PREV);
+  } else if (ev == BUTTON_EVENT_TRIPLE_CLICK) {
+    c = handleTripleClick(KEY_SELECT);
   }
 #endif
-#if defined(BACKLIGHT_BTN)
+#if defined(DISP_BACKLIGHT) && defined(BACKLIGHT_BTN)
   if (millis() > next_backlight_btn_check) {
     bool touch_state = digitalRead(PIN_BUTTON2);
-#if defined(DISP_BACKLIGHT)
     digitalWrite(DISP_BACKLIGHT, !touch_state);
-#elif defined(EXP_PIN_BACKLIGHT)
-    expander.digitalWrite(EXP_PIN_BACKLIGHT, !touch_state);
-#endif
     next_backlight_btn_check = millis() + 300;
   }
 #endif
@@ -890,15 +843,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 +863,11 @@ 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
 }

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
@@ -44,17 +40,13 @@ class UITask : public AbstractUITask {
   int last_led_increment = 0;
 #endif
 
-#ifdef PIN_USER_BTN_ANA
-  unsigned long _analogue_pin_read_millis = millis();
-#endif
-
   UIScreen* splash;
   UIScreen* home;
   UIScreen* msg_preview;
   UIScreen* curr;
 
   void userLedHandler();
-
+  
   // Button action handlers
   char checkDisplayOn(char c);
   char handleLongPress(char c);

examples/companion_radio/ui-orig/UITask.cpp

@@ -56,7 +56,6 @@ void UITask::begin(DisplayDriver* display, SensorManager* sensors, NodePrefs* no
 
 #ifdef PIN_BUZZER
   buzzer.begin();
-  buzzer.quiet(_node_prefs->buzzer_quiet);
 #endif
 
   // Initialize digital button if available
@@ -137,13 +136,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;
-    }
   }
 }
 
@@ -274,7 +269,7 @@ void UITask::userLedHandler() {
       state = 0;
       next_change = cur_time + LED_CYCLE_MILLIS - last_increment;
     }
-    digitalWrite(PIN_STATUS_LED, state == LED_STATE_ON);
+    digitalWrite(PIN_STATUS_LED, state);
   }
 #endif
 }
@@ -297,12 +292,10 @@ void UITask::shutdown(bool restart){
 
   #endif // PIN_BUZZER
 
-  if (restart) {
+  if (restart)
     _board->reboot();
-  } else {
-    radio_driver.powerOff();
+  else
     _board->powerOff();
-  }
 }
 
 void UITask::loop() {
@@ -401,8 +394,6 @@ void UITask::handleButtonTriplePress() {
       buzzer.quiet(true);
       sprintf(_alert, "Buzzer: OFF");
     }
-    _node_prefs->buzzer_quiet = buzzer.isQuiet();
-    the_mesh.savePrefs();
     _need_refresh = true;
   #endif
 }

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
@@ -87,7 +82,7 @@ void MyMesh::putNeighbour(const mesh::Identity &id, uint32_t timestamp, float sn
 #endif
 }
 
-uint8_t MyMesh::handleLoginReq(const mesh::Identity& sender, const uint8_t* secret, uint32_t sender_timestamp, const uint8_t* data, bool is_flood) {
+uint8_t MyMesh::handleLoginReq(const mesh::Identity& sender, const uint8_t* secret, uint32_t sender_timestamp, const uint8_t* data) {
   ClientInfo* client = NULL;
   if (data[0] == 0) {   // blank password, just check if sender is in ACL
     client = acl.getClient(sender.pub_key, PUB_KEY_SIZE);
@@ -128,10 +123,6 @@ uint8_t MyMesh::handleLoginReq(const mesh::Identity& sender, const uint8_t* secr
     }
   }
 
-  if (is_flood) {
-    client->out_path_len = -1;  // need to rediscover out_path
-  }
-
   uint32_t now = getRTCClock()->getCurrentTimeUnique();
   memcpy(reply_data, &now, 4);   // response packets always prefixed with timestamp
   reply_data[4] = RESP_SERVER_LOGIN_OK;
@@ -144,64 +135,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
@@ -226,7 +159,7 @@ int MyMesh::handleRequest(ClientInfo *sender, uint32_t sender_timestamp, uint8_t
     stats.n_direct_dups = ((SimpleMeshTables *)getTables())->getNumDirectDups();
     stats.n_flood_dups = ((SimpleMeshTables *)getTables())->getNumFloodDups();
     stats.total_rx_air_time_secs = getReceiveAirTime() / 1000;
-    stats.n_recv_errors = radio_driver.getPacketsRecvErrors();
+
     memcpy(&reply_data[4], &stats, sizeof(stats));
 
     return 4 + sizeof(stats); //  reply_len
@@ -236,18 +169,8 @@ 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
-    }
+    sensors.querySensors((sender->isAdmin() ? 0xFF : 0x00) & perm_mask, telemetry);
 
     uint8_t tlen = telemetry.getSize();
     memcpy(&reply_data[4], telemetry.getBuffer(), tlen);
@@ -359,9 +282,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
 }
@@ -386,18 +306,6 @@ File MyMesh::openAppend(const char *fname) {
 bool MyMesh::allowPacketForward(const mesh::Packet *packet) {
   if (_prefs.disable_fwd) return false;
   if (packet->isRouteFlood() && packet->path_len >= _prefs.flood_max) return false;
-  if (packet->isRouteFlood() && recv_pkt_region == NULL) {
-    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;
 }
 
@@ -489,28 +397,11 @@ int MyMesh::calcRxDelay(float score, uint32_t air_time) const {
 
 uint32_t MyMesh::getRetransmitDelay(const mesh::Packet *packet) {
   uint32_t t = (_radio->getEstAirtimeFor(packet->path_len + packet->payload_len + 2) * _prefs.tx_delay_factor);
-  return getRNG()->nextInt(0, 5*t + 1);
+  return getRNG()->nextInt(0, 6) * t;
 }
 uint32_t MyMesh::getDirectRetransmitDelay(const mesh::Packet *packet) {
   uint32_t t = (_radio->getEstAirtimeFor(packet->path_len + packet->payload_len + 2) * _prefs.direct_tx_delay_factor);
-  return getRNG()->nextInt(0, 5*t + 1);
-}
-
-bool MyMesh::filterRecvFloodPacket(mesh::Packet* pkt) {
-  // just try to determine region for packet (apply later in allowPacketForward())
-  if (pkt->getRouteType() == ROUTE_TYPE_TRANSPORT_FLOOD) {
-    recv_pkt_region = region_map.findMatch(pkt, REGION_DENY_FLOOD);
-  } else if (pkt->getRouteType() == ROUTE_TYPE_FLOOD) {
-    if (region_map.getWildcard().flags & REGION_DENY_FLOOD) {
-      recv_pkt_region = NULL;
-    } else {
-      recv_pkt_region =  &region_map.getWildcard();
-    }
-  } else {
-    recv_pkt_region = NULL;
-  }
-  // do normal processing
-  return false;
+  return getRNG()->nextInt(0, 6) * t;
 }
 
 void MyMesh::onAnonDataRecv(mesh::Packet *packet, const uint8_t *secret, const mesh::Identity &sender,
@@ -521,20 +412,7 @@ void MyMesh::onAnonDataRecv(mesh::Packet *packet, const uint8_t *secret, const m
     memcpy(&timestamp, data, 4);
 
     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 {
-      reply_len = 0;  // unknown/invalid request type
-    }
+    uint8_t reply_len = handleLoginReq(sender, secret, timestamp, &data[4]);
 
     if (reply_len == 0) return;   // invalid request
 
@@ -543,12 +421,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);
     }
   }
 }
@@ -573,19 +448,12 @@ void MyMesh::getPeerSharedSecret(uint8_t *dest_secret, int peer_idx) {
   }
 }
 
-static bool isShare(const mesh::Packet *packet) {
-  if (packet->hasTransportCodes()) {
-    return packet->transport_codes[0] == 0 && packet->transport_codes[1] == 0;  // codes { 0, 0 } means 'send to nowhere'
-  }
-  return false;
-}
-
 void MyMesh::onAdvertRecv(mesh::Packet *packet, const mesh::Identity &id, uint32_t timestamp,
                           const uint8_t *app_data, size_t app_data_len) {
   mesh::Mesh::onAdvertRecv(packet, id, timestamp, app_data, app_data_len); // chain to super impl
 
-  // if this a zero hop advert (and not via 'Share'), add it to neighbours
-  if (packet->path_len == 0 && !isShare(packet)) {
+  // if this a zero hop advert, add it to neighbours
+  if (packet->path_len == 0) {
     AdvertDataParser parser(app_data, app_data_len);
     if (parser.isValid() && parser.getType() == ADV_TYPE_REPEATER) { // just keep neigbouring Repeaters
       putNeighbour(id, timestamp, packet->getSNR());
@@ -635,7 +503,7 @@ void MyMesh::onPeerDataRecv(mesh::Packet *packet, uint8_t type, int sender_idx,
   } else if (type == PAYLOAD_TYPE_TXT_MSG && len > 5 && client->isAdmin()) { // a CLI command
     uint32_t sender_timestamp;
     memcpy(&sender_timestamp, data, 4); // timestamp (by sender's RTC clock - which could be wrong)
-    uint8_t flags = (data[4] >> 2);        // message attempt number, and other flags
+    uint flags = (data[4] >> 2);        // message attempt number, and other flags
 
     if (!(flags == TXT_TYPE_PLAIN || flags == TXT_TYPE_CLI_DATA)) {
       MESH_DEBUG_PRINTLN("onPeerDataRecv: unsupported text type received: flags=%02x", (uint32_t)flags);
@@ -715,46 +583,10 @@ bool MyMesh::onPeerPathRecv(mesh::Packet *packet, int sender_idx, const uint8_t
   return false;
 }
 
-#define CTL_TYPE_NODE_DISCOVER_REQ   0x80
-#define CTL_TYPE_NODE_DISCOVER_RESP  0x90
-
-void MyMesh::onControlDataRecv(mesh::Packet* packet) {
-  uint8_t type = packet->payload[0] & 0xF0;    // just test upper 4 bits
-  if (type == CTL_TYPE_NODE_DISCOVER_REQ && packet->payload_len >= 6
-      && !_prefs.disable_fwd && discover_limiter.allow(rtc_clock.getCurrentTime())
-  ) {
-    int i = 1;
-    uint8_t  filter = packet->payload[i++];
-    uint32_t tag;
-    memcpy(&tag, &packet->payload[i], 4); i += 4;
-    uint32_t since;
-    if (packet->payload_len >= i+4) {   // optional since field
-      memcpy(&since, &packet->payload[i], 4); i += 4;
-    } else {
-      since = 0;
-    }
-
-    if ((filter & (1 << ADV_TYPE_REPEATER)) != 0 && _prefs.discovery_mod_timestamp >= since) {
-      bool prefix_only = packet->payload[0] & 1;
-      uint8_t data[6 + PUB_KEY_SIZE];
-      data[0] = CTL_TYPE_NODE_DISCOVER_RESP | ADV_TYPE_REPEATER;   // low 4-bits for node type
-      data[1] = packet->_snr;   // let sender know the inbound SNR ( x 4)
-      memcpy(&data[2], &tag, 4);     // include tag from request, for client to match to
-      memcpy(&data[6], self_id.pub_key, PUB_KEY_SIZE);
-      auto resp = createControlData(data, prefix_only ? 6 + 8 : 6 + PUB_KEY_SIZE);
-      if (resp) {
-        sendZeroHop(resp, getRetransmitDelay(resp)*4);  // apply random delay (widened x4), as multiple nodes can respond to this
-      }
-    }
-  }
-}
-
 MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondClock &ms, mesh::RNG &rng,
                mesh::RTCClock &rtc, mesh::MeshTables &tables)
     : mesh::Mesh(radio, ms, rng, rtc, *new StaticPoolPacketManager(32), tables),
-      _cli(board, rtc, sensors, acl, &_prefs, this), telemetry(MAX_PACKET_PAYLOAD - 4), region_map(key_store), temp_map(key_store),
-      discover_limiter(4, 120),  // max 4 every 2 minutes
-      anon_limiter(4, 180)   // max 4 every 3 minutes
+      _cli(board, rtc, sensors, &_prefs, this), telemetry(MAX_PACKET_PAYLOAD - 4)
 #if defined(WITH_RS232_BRIDGE)
       , bridge(&_prefs, WITH_RS232_BRIDGE, _mgr, &rtc)
 #endif
@@ -768,7 +600,6 @@ MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondCloc
   dirty_contacts_expiry = 0;
   set_radio_at = revert_radio_at = 0;
   _logging = false;
-  region_load_active = false;
 
 #if MAX_NEIGHBOURS
   memset(neighbours, 0, sizeof(neighbours));
@@ -776,10 +607,9 @@ MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondCloc
 
   // defaults
   memset(&_prefs, 0, sizeof(_prefs));
-  _prefs.airtime_factor = 1.0;
+  _prefs.airtime_factor = 1.0;   // one half
   _prefs.rx_delay_base = 0.0f;   // turn off by default, was 10.0;
   _prefs.tx_delay_factor = 0.5f; // was 0.25f
-  _prefs.direct_tx_delay_factor = 0.2f; // was zero
   StrHelper::strncpy(_prefs.node_name, ADVERT_NAME, sizeof(_prefs.node_name));
   _prefs.node_lat = ADVERT_LAT;
   _prefs.node_lon = ADVERT_LON;
@@ -791,7 +621,6 @@ MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondCloc
   _prefs.tx_power_dbm = LORA_TX_POWER;
   _prefs.advert_interval = 1;        // default to 2 minutes for NEW installs
   _prefs.flood_advert_interval = 12; // 12 hours
-  _prefs.flood_advert_base = 0.308f;
   _prefs.flood_max = 64;
   _prefs.interference_threshold = 0; // disabled
 
@@ -808,8 +637,6 @@ MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondCloc
   _prefs.gps_enabled = 0;
   _prefs.gps_interval = 0;
   _prefs.advert_loc_policy = ADVERT_LOC_PREFS;
-
-  _prefs.adc_multiplier = 0.0f; // 0.0f means use default board multiplier
 }
 
 void MyMesh::begin(FILESYSTEM *fs) {
@@ -817,9 +644,8 @@ void MyMesh::begin(FILESYSTEM *fs) {
   _fs = fs;
   // load persisted prefs
   _cli.loadPrefs(_fs);
-  acl.load(_fs, self_id);
-  // TODO: key_store.begin();
-  region_map.load(_fs);
+
+  acl.load(_fs);
 
 #if defined(WITH_BRIDGE)
   if (_prefs.bridge_enabled) {
@@ -833,8 +659,6 @@ void MyMesh::begin(FILESYSTEM *fs) {
   updateAdvertTimer();
   updateFloodAdvertTimer();
 
-  board.setAdcMultiplier(_prefs.adc_multiplier);
-
 #if ENV_INCLUDE_GPS == 1
   applyGpsPrefs();
 #endif
@@ -863,14 +687,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!");
   }
@@ -967,20 +787,8 @@ void MyMesh::removeNeighbor(const uint8_t *pubkey, int key_len) {
 #endif
 }
 
-void MyMesh::formatStatsReply(char *reply) {
-  StatsFormatHelper::formatCoreStats(reply, board, *_ms, _err_flags, _mgr);
-}
-
-void MyMesh::formatRadioStatsReply(char *reply) {
-  StatsFormatHelper::formatRadioStats(reply, _radio, radio_driver, getTotalAirTime(), getReceiveAirTime());
-}
-
-void MyMesh::formatPacketStatsReply(char *reply) {
-  StatsFormatHelper::formatPacketStats(reply, radio_driver, getNumSentFlood(), getNumSentDirect(), 
-                                       getNumRecvFlood(), getNumRecvDirect());
-}
-
 void MyMesh::saveIdentity(const mesh::LocalIdentity &new_id) {
+  self_id = new_id;
 #if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
   IdentityStore store(*_fs, "");
 #elif defined(ESP32)
@@ -990,7 +798,7 @@ void MyMesh::saveIdentity(const mesh::LocalIdentity &new_id) {
 #else
 #error "need to define saveIdentity()"
 #endif
-  store.save("_main", new_id);
+  store.save("_main", self_id);
 }
 
 void MyMesh::clearStats() {
@@ -999,42 +807,21 @@ void MyMesh::clearStats() {
   ((SimpleMeshTables *)getTables())->resetStats();
 }
 
-void MyMesh::handleCommand(uint32_t sender_timestamp, char *command, char *reply) {
-  if (region_load_active) {
-    if (StrHelper::isBlank(command)) {  // empty/blank line, signal to terminate 'load' operation
-      region_map = temp_map;  // copy over the temp instance as new current map
-      region_load_active = false;
-
-      sprintf(reply, "OK - loaded %d regions", region_map.getCount());
-    } else {
-      char *np = command;
-      while (*np == ' ') np++;   // skip indent
-      int indent = np - command;
-
-      char *ep = np;
-      while (RegionMap::is_name_char(*ep)) ep++;
-      if (*ep) { *ep++ = 0; }  // set null terminator for end of name
-
-      while (*ep && *ep != 'F') ep++;  // look for (optional) flags
-
-      if (indent > 0 && indent < 8 && strlen(np) > 0) {
-        auto parent = load_stack[indent - 1];
-        if (parent) {
-          auto old = region_map.findByName(np);
-          auto nw = temp_map.putRegion(np, parent->id, old ? old->id : 0);  // carry-over the current ID (if name already exists)
-          if (nw) {
-            nw->flags = old ? old->flags : (*ep == 'F' ? 0 : REGION_DENY_FLOOD);   // carry-over flags from curr
-
-            load_stack[indent] = nw;  // keep pointers to parent regions, to resolve parent_id's
-          }
-        }
-      }
-      reply[0] = 0;
+void MyMesh::regenerateKeys(uint8_t byte) { 
+  if (byte >0 && byte < 0xff){
+    MESH_DEBUG_PRINTLN("Generating new keypair");
+    mesh::LocalIdentity new_id = radio_new_identity();
+    
+    while (new_id.pub_key[0] != byte) {
+      new_id = radio_new_identity();
     }
-    return;
+    saveIdentity(new_id);
   }
+}
 
-  while (*command == ' ') command++; // skip leading spaces
+void MyMesh::handleCommand(uint32_t sender_timestamp, char *command, char *reply) {
+  while (*command == ' ')
+    command++; // skip leading spaces
 
   if (strlen(command) > 4 && command[2] == '|') { // optional prefix (for companion radio CLI)
     memcpy(reply, command, 3);                    // reflect the prefix back
@@ -1076,107 +863,6 @@ void MyMesh::handleCommand(uint32_t sender_timestamp, char *command, char *reply
       Serial.printf("\n");
     }
     reply[0] = 0;
-  } else if (memcmp(command, "region", 6) == 0) {
-    reply[0] = 0;
-
-    const char* parts[4];
-    int n = mesh::Utils::parseTextParts(command, parts, 4, ' ');
-    if (n == 1) {
-      region_map.exportTo(reply, 160);
-    } else if (n >= 2 && strcmp(parts[1], "load") == 0) {
-      temp_map.resetFrom(region_map);   // rebuild regions in a temp instance
-      memset(load_stack, 0, sizeof(load_stack));
-      load_stack[0] = &temp_map.getWildcard();
-      region_load_active = true;
-    } else if (n >= 2 && strcmp(parts[1], "save") == 0) {
-      _prefs.discovery_mod_timestamp = rtc_clock.getCurrentTime();   // this node is now 'modified' (for discovery info)
-      savePrefs();
-      bool success = region_map.save(_fs);
-      strcpy(reply, success ? "OK" : "Err - save failed");
-    } else if (n >= 3 && strcmp(parts[1], "allowf") == 0) {
-      auto region = region_map.findByNamePrefix(parts[2]);
-      if (region) {
-        region->flags &= ~REGION_DENY_FLOOD;
-        strcpy(reply, "OK");
-      } else {
-        strcpy(reply, "Err - unknown region");
-      }
-    } else if (n >= 3 && strcmp(parts[1], "denyf") == 0) {
-      auto region = region_map.findByNamePrefix(parts[2]);
-      if (region) {
-        region->flags |= REGION_DENY_FLOOD;
-        strcpy(reply, "OK");
-      } else {
-        strcpy(reply, "Err - unknown region");
-      }
-    } else if (n >= 3 && strcmp(parts[1], "get") == 0) {
-      auto region = region_map.findByNamePrefix(parts[2]);
-      if (region) {
-        auto parent = region_map.findById(region->parent);
-        if (parent && parent->id != 0) {
-          sprintf(reply, " %s (%s) %s", region->name, parent->name, (region->flags & REGION_DENY_FLOOD) ? "" : "F");
-        } else {
-          sprintf(reply, " %s %s", region->name, (region->flags & REGION_DENY_FLOOD) ? "" : "F");
-        }
-      } else {
-        strcpy(reply, "Err - unknown region");
-      }
-    } else if (n >= 3 && strcmp(parts[1], "home") == 0) {
-      auto home = region_map.findByNamePrefix(parts[2]);
-      if (home) {
-        region_map.setHomeRegion(home);
-        sprintf(reply, " home is now %s", home->name);
-      } else {
-        strcpy(reply, "Err - unknown region");
-      }
-    } else if (n == 2 && strcmp(parts[1], "home") == 0) {
-      auto home = region_map.getHomeRegion();
-      sprintf(reply, " home is %s", home ? home->name : "*");
-    } else if (n >= 3 && strcmp(parts[1], "put") == 0) {
-      auto parent = n >= 4 ? region_map.findByNamePrefix(parts[3]) : &region_map.getWildcard();
-      if (parent == NULL) {
-        strcpy(reply, "Err - unknown parent");
-      } else {
-        auto region = region_map.putRegion(parts[2], parent->id);
-        if (region == NULL) {
-          strcpy(reply, "Err - unable to put");
-        } else {
-          strcpy(reply, "OK");
-        }
-      }
-    } else if (n >= 3 && strcmp(parts[1], "remove") == 0) {
-      auto region = region_map.findByName(parts[2]);
-      if (region) {
-        if (region_map.removeRegion(*region)) {
-          strcpy(reply, "OK");
-        } else {
-          strcpy(reply, "Err - not empty");
-        }
-      } else {
-        strcpy(reply, "Err - not found");
-      }
-    } else if (n >= 3 && strcmp(parts[1], "list") == 0) {
-      uint8_t mask = 0;
-      bool invert = false;
-      
-      if (strcmp(parts[2], "allowed") == 0) {
-        mask = REGION_DENY_FLOOD;
-        invert = false;  // list regions that DON'T have DENY flag
-      } else if (strcmp(parts[2], "denied") == 0) {
-        mask = REGION_DENY_FLOOD;
-        invert = true;   // list regions that DO have DENY flag
-      } else {
-        strcpy(reply, "Err - use 'allowed' or 'denied'");
-        return;
-      }
-      
-      int len = region_map.exportNamesTo(reply, 160, mask, invert);
-      if (len == 0) {
-        strcpy(reply, "-none-");
-      }
-    } else {
-      strcpy(reply, "Err - ??");
-    }
   } else{
     _cli.handleCommand(sender_timestamp, command, reply);  // common CLI commands
   }
@@ -1225,8 +911,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;
-}

examples/simple_repeater/MyMesh.h

@@ -30,10 +30,7 @@
 #include <helpers/IdentityStore.h>
 #include <helpers/SimpleMeshTables.h>
 #include <helpers/StaticPoolPacketManager.h>
-#include <helpers/StatsFormatHelper.h>
 #include <helpers/TxtDataHelpers.h>
-#include <helpers/RegionMap.h>
-#include "RateLimiter.h"
 
 #ifdef WITH_BRIDGE
 extern AbstractBridge* bridge;
@@ -54,7 +51,6 @@ struct RepeaterStats {
   int16_t  last_snr;   // x 4
   uint16_t n_direct_dups, n_flood_dups;
   uint32_t total_rx_air_time_secs;
-  uint32_t n_recv_errors;
 };
 
 #ifndef MAX_CLIENTS
@@ -69,11 +65,11 @@ struct NeighbourInfo {
 };
 
 #ifndef FIRMWARE_BUILD_DATE
-  #define FIRMWARE_BUILD_DATE   "30 Nov 2025"
+  #define FIRMWARE_BUILD_DATE   "2 Oct 2025"
 #endif
 
 #ifndef FIRMWARE_VERSION
-  #define FIRMWARE_VERSION   "v1.11.0"
+  #define FIRMWARE_VERSION   "v1.9.1"
 #endif
 
 #define FIRMWARE_ROLE "repeater"
@@ -87,17 +83,9 @@ class MyMesh : public mesh::Mesh, public CommonCLICallbacks {
   unsigned long next_local_advert, next_flood_advert;
   bool _logging;
   NodePrefs _prefs;
-  ClientACL  acl;
   CommonCLI _cli;
   uint8_t reply_data[MAX_PACKET_PAYLOAD];
-  uint8_t reply_path[MAX_PATH_SIZE];
-  int8_t  reply_path_len;
-  TransportKeyStore key_store;
-  RegionMap region_map, temp_map;
-  RegionEntry* load_stack[8];
-  RegionEntry* recv_pkt_region;
-  RateLimiter discover_limiter, anon_limiter;
-  bool region_load_active;
+  ClientACL  acl;
   unsigned long dirty_contacts_expiry;
 #if MAX_NEIGHBOURS
   NeighbourInfo neighbours[MAX_NEIGHBOURS];
@@ -116,10 +104,7 @@ class MyMesh : public mesh::Mesh, public CommonCLICallbacks {
 #endif
 
   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);
+  uint8_t handleLoginReq(const mesh::Identity& sender, const uint8_t* secret, 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();
 
@@ -154,19 +139,16 @@ protected:
 
 #if ENV_INCLUDE_GPS == 1
   void applyGpsPrefs() {
-    sensors.setSettingValue("gps", _prefs.gps_enabled?"1":"0");
+    sensors.setSettingByKey("gps", _prefs.gps_enabled?"1":"0");
   }
 #endif
 
-  bool filterRecvFloodPacket(mesh::Packet* pkt) override;
-
   void onAnonDataRecv(mesh::Packet* packet, const uint8_t* secret, const mesh::Identity& sender, uint8_t* data, size_t len) override;
   int searchPeersByHash(const uint8_t* hash) override;
   void getPeerSharedSecret(uint8_t* dest_secret, int peer_idx) override;
   void onAdvertRecv(mesh::Packet* packet, const mesh::Identity& id, uint32_t timestamp, const uint8_t* app_data, size_t app_data_len);
   void onPeerDataRecv(mesh::Packet* packet, uint8_t type, int sender_idx, const uint8_t* secret, uint8_t* data, size_t len) override;
   bool onPeerPathRecv(mesh::Packet* packet, int sender_idx, const uint8_t* secret, uint8_t* path, uint8_t path_len, uint8_t extra_type, uint8_t* extra, uint8_t extra_len) override;
-  void onControlDataRecv(mesh::Packet* packet) override;
 
 public:
   MyMesh(mesh::MainBoard& board, mesh::Radio& radio, mesh::MillisecondClock& ms, mesh::RNG& rng, mesh::RTCClock& rtc, mesh::MeshTables& tables);
@@ -187,7 +169,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) override;
+  void sendSelfAdvertisement(int delay_millis) override;
   void updateAdvertTimer() override;
   void updateFloodAdvertTimer() override;
 
@@ -201,14 +183,12 @@ public:
   void setTxPower(uint8_t power_dbm) override;
   void formatNeighborsReply(char *reply) override;
   void removeNeighbor(const uint8_t* pubkey, int key_len) override;
-  void formatStatsReply(char *reply) override;
-  void formatRadioStatsReply(char *reply) override;
-  void formatPacketStatsReply(char *reply) override;
 
   mesh::LocalIdentity& getSelfId() override { return self_id; }
 
   void saveIdentity(const mesh::LocalIdentity& new_id) override;
   void clearStats() override;
+  void regenerateKeys(uint8_t byte);  
   void handleCommand(uint32_t sender_timestamp, char* command, char* reply);
   void loop();
 
@@ -231,7 +211,4 @@ public:
     bridge.begin();
   }
 #endif
-
-  // To check if there is pending work
-  bool hasPendingWork() const;
 };

examples/simple_repeater/RateLimiter.h

@@ -1,23 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-
-class RateLimiter {
-  uint32_t _start_timestamp;
-  uint32_t _secs;
-  uint16_t _maximum, _count;
-
-public:
-  RateLimiter(uint16_t maximum, uint32_t secs): _maximum(maximum), _secs(secs), _start_timestamp(0), _count(0) { }
-
-  bool allow(uint32_t now) {
-    if (now < _start_timestamp + _secs) {
-      _count++;
-      if (_count > _maximum) return false;   // deny
-    } else {   // time window now expired
-      _start_timestamp = now;
-      _count = 1;
-    }
-    return true;
-  }
-};

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
 
-  // send out initial zero hop Advertisement to the mesh
-#if ENABLE_ADVERT_ON_BOOT == 1
-  the_mesh.sendSelfAdvertisement(16000, false);
-#endif
+  // send out initial Advertisement to the mesh
+  the_mesh.sendSelfAdvertisement(16000);
 }
 
 void loop() {
@@ -100,16 +91,14 @@ void loop() {
     if (c != '\n') {
       command[len++] = c;
       command[len] = 0;
-      Serial.print(c);
     }
-    if (c == '\r') break;
+    Serial.print(c);
   }
   if (len == sizeof(command)-1) {  // command buffer full
     command[sizeof(command)-1] = '\r';
   }
 
   if (len > 0 && command[len - 1] == '\r') {  // received complete line
-    Serial.print('\n');
     command[len - 1] = 0;  // replace newline with C string null terminator
     char reply[160];
     the_mesh.handleCommand(0, command, reply);  // NOTE: there is no sender_timestamp via serial!
@@ -125,16 +114,4 @@ void loop() {
 #ifdef DISPLAY_CLASS
   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
-    }
-  }
 }

examples/simple_room_server/MyMesh.cpp

@@ -165,10 +165,7 @@ 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);
+    sensors.querySensors((sender->isAdmin() ? 0xFF : 0x00) & perm_mask, telemetry);
 
     uint8_t tlen = telemetry.getSize();
     memcpy(&reply_data[4], telemetry.getBuffer(), tlen);
@@ -265,25 +262,16 @@ const char *MyMesh::getLogDateTime() {
 
 uint32_t MyMesh::getRetransmitDelay(const mesh::Packet *packet) {
   uint32_t t = (_radio->getEstAirtimeFor(packet->path_len + packet->payload_len + 2) * _prefs.tx_delay_factor);
-  return getRNG()->nextInt(0, 5*t + 1);
+  return getRNG()->nextInt(0, 6) * t;
 }
 uint32_t MyMesh::getDirectRetransmitDelay(const mesh::Packet *packet) {
   uint32_t t = (_radio->getEstAirtimeFor(packet->path_len + packet->payload_len + 2) * _prefs.direct_tx_delay_factor);
-  return getRNG()->nextInt(0, 5*t + 1);
+  return getRNG()->nextInt(0, 6) * t;
 }
 
 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;
 }
 
@@ -341,10 +329,6 @@ void MyMesh::onAnonDataRecv(mesh::Packet *packet, const uint8_t *secret, const m
       dirty_contacts_expiry = futureMillis(LAZY_CONTACTS_WRITE_DELAY);
     }
 
-    if (packet->isRouteFlood()) {
-      client->out_path_len = -1;  // need to rediscover out_path
-    }
-
     uint32_t now = getRTCClock()->getCurrentTimeUnique();
     memcpy(reply_data, &now, 4); // response packets always prefixed with timestamp
     // TODO: maybe reply with count of messages waiting to be synced for THIS client?
@@ -407,7 +391,7 @@ void MyMesh::onPeerDataRecv(mesh::Packet *packet, uint8_t type, int sender_idx,
   if (type == PAYLOAD_TYPE_TXT_MSG && len > 5) { // a CLI command or new Post
     uint32_t sender_timestamp;
     memcpy(&sender_timestamp, data, 4); // timestamp (by sender's RTC clock - which could be wrong)
-    uint8_t flags = (data[4] >> 2);        // message attempt number, and other flags
+    uint flags = (data[4] >> 2);        // message attempt number, and other flags
 
     if (!(flags == TXT_TYPE_PLAIN || flags == TXT_TYPE_CLI_DATA)) {
       MESH_DEBUG_PRINTLN("onPeerDataRecv: unsupported command flags received: flags=%02x", (uint32_t)flags);
@@ -596,7 +580,7 @@ void MyMesh::onAckRecv(mesh::Packet *packet, uint32_t ack_crc) {
 MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondClock &ms, mesh::RNG &rng,
                mesh::RTCClock &rtc, mesh::MeshTables &tables)
     : mesh::Mesh(radio, ms, rng, rtc, *new StaticPoolPacketManager(32), tables),
-      _cli(board, rtc, sensors, acl, &_prefs, this), telemetry(MAX_PACKET_PAYLOAD - 4) {
+      _cli(board, rtc, sensors, &_prefs, this), telemetry(MAX_PACKET_PAYLOAD - 4) {
   last_millis = 0;
   uptime_millis = 0;
   next_local_advert = next_flood_advert = 0;
@@ -606,10 +590,9 @@ MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondCloc
 
   // defaults
   memset(&_prefs, 0, sizeof(_prefs));
-  _prefs.airtime_factor = 1.0;
+  _prefs.airtime_factor = 1.0;   // one half
   _prefs.rx_delay_base = 0.0f;   // off by default, was 10.0
   _prefs.tx_delay_factor = 0.5f; // was 0.25f;
-  _prefs.direct_tx_delay_factor = 0.2f; // was zero
   StrHelper::strncpy(_prefs.node_name, ADVERT_NAME, sizeof(_prefs.node_name));
   _prefs.node_lat = ADVERT_LAT;
   _prefs.node_lon = ADVERT_LON;
@@ -622,7 +605,6 @@ MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondCloc
   _prefs.disable_fwd = 1;
   _prefs.advert_interval = 1;        // default to 2 minutes for NEW installs
   _prefs.flood_advert_interval = 12; // 12 hours
-  _prefs.flood_advert_base = 0.308f;
   _prefs.flood_max = 64;
   _prefs.interference_threshold = 0; // disabled
 #ifdef ROOM_PASSWORD
@@ -647,7 +629,7 @@ void MyMesh::begin(FILESYSTEM *fs) {
   // load persisted prefs
   _cli.loadPrefs(_fs);
 
-  acl.load(_fs, self_id);
+  acl.load(_fs);
 
   radio_set_params(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
   radio_set_tx_power(_prefs.tx_power_dbm);
@@ -655,8 +637,6 @@ void MyMesh::begin(FILESYSTEM *fs) {
   updateAdvertTimer();
   updateFloodAdvertTimer();
 
-  board.setAdcMultiplier(_prefs.adc_multiplier);
-
 #if ENV_INCLUDE_GPS == 1
   applyGpsPrefs();
 #endif
@@ -685,14 +665,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!");
   }
@@ -734,6 +710,7 @@ void MyMesh::setTxPower(uint8_t power_dbm) {
 }
 
 void MyMesh::saveIdentity(const mesh::LocalIdentity &new_id) {
+  self_id = new_id;
 #if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
   IdentityStore store(*_fs, "");
 #elif defined(ESP32)
@@ -743,7 +720,7 @@ void MyMesh::saveIdentity(const mesh::LocalIdentity &new_id) {
 #else
 #error "need to define saveIdentity()"
 #endif
-  store.save("_main", new_id);
+  store.save("_main", self_id);
 }
 
 void MyMesh::clearStats() {
@@ -752,19 +729,6 @@ void MyMesh::clearStats() {
   ((SimpleMeshTables *)getTables())->resetStats();
 }
 
-void MyMesh::formatStatsReply(char *reply) {
-  StatsFormatHelper::formatCoreStats(reply, board, *_ms, _err_flags, _mgr);
-}
-
-void MyMesh::formatRadioStatsReply(char *reply) {
-  StatsFormatHelper::formatRadioStats(reply, _radio, radio_driver, getTotalAirTime(), getReceiveAirTime());
-}
-
-void MyMesh::formatPacketStatsReply(char *reply) {
-  StatsFormatHelper::formatPacketStats(reply, radio_driver, getNumSentFlood(), getNumSentDirect(), 
-                                       getNumRecvFlood(), getNumRecvDirect());
-}
-
 void MyMesh::handleCommand(uint32_t sender_timestamp, char *command, char *reply) {
   while (*command == ' ')
     command++; // skip leading spaces
@@ -828,7 +792,7 @@ void MyMesh::loop() {
       if (c->extra.room.pending_ack && millisHasNowPassed(c->extra.room.ack_timeout)) {
         c->extra.room.push_failures++;
         c->extra.room.pending_ack = 0; // reset  (TODO: keep prev expected_ack's in a list, incase they arrive LATER, after we retry)
-        MESH_DEBUG_PRINTLN("pending ACK timed out: push_failures: %d", (uint32_t)c->extra.room.push_failures);
+        MESH_DEBUG_PRINTLN("pending ACK timed out: push_failures: %d", (uint32_t)c->push_failures);
       }
     }
     // check next Round-Robin client, and sync next new post

examples/simple_room_server/MyMesh.h

@@ -18,7 +18,6 @@
 #include <helpers/AdvertDataHelpers.h>
 #include <helpers/TxtDataHelpers.h>
 #include <helpers/CommonCLI.h>
-#include <helpers/StatsFormatHelper.h>
 #include <helpers/ClientACL.h>
 #include <RTClib.h>
 #include <target.h>
@@ -26,11 +25,11 @@
 /* ------------------------------ Config -------------------------------- */
 
 #ifndef FIRMWARE_BUILD_DATE
-  #define FIRMWARE_BUILD_DATE   "30 Nov 2025"
+  #define FIRMWARE_BUILD_DATE   "2 Oct 2025"
 #endif
 
 #ifndef FIRMWARE_VERSION
-  #define FIRMWARE_VERSION   "v1.11.0"
+  #define FIRMWARE_VERSION   "v1.9.1"
 #endif
 
 #ifndef LORA_FREQ
@@ -94,8 +93,8 @@ class MyMesh : public mesh::Mesh, public CommonCLICallbacks {
   unsigned long next_local_advert, next_flood_advert;
   bool _logging;
   NodePrefs _prefs;
-  ClientACL acl;
   CommonCLI _cli;
+  ClientACL acl;
   unsigned long dirty_contacts_expiry;
   uint8_t reply_data[MAX_PACKET_PAYLOAD];
   unsigned long next_push;
@@ -154,7 +153,7 @@ protected:
 
 #if ENV_INCLUDE_GPS == 1
   void applyGpsPrefs() {
-    sensors.setSettingValue("gps", _prefs.gps_enabled?"1":"0");
+    sensors.setSettingByKey("gps", _prefs.gps_enabled?"1":"0");
   }
 #endif
 
@@ -177,7 +176,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) override;
+  void sendSelfAdvertisement(int delay_millis) override;
   void updateAdvertTimer() override;
   void updateFloodAdvertTimer() override;
 
@@ -193,9 +192,6 @@ public:
   void formatNeighborsReply(char *reply) override {
     strcpy(reply, "not supported");
   }
-  void formatStatsReply(char *reply) override;
-  void formatRadioStatsReply(char *reply) override;
-  void formatPacketStatsReply(char *reply) override;
 
   mesh::LocalIdentity& getSelfId() override { return self_id; }
 

examples/simple_room_server/main.cpp

@@ -76,10 +76,8 @@ void setup() {
   ui_task.begin(the_mesh.getNodePrefs(), FIRMWARE_BUILD_DATE, FIRMWARE_VERSION);
 #endif
 
-  // send out initial zero hop Advertisement to the mesh
-#if ENABLE_ADVERT_ON_BOOT == 1
-  the_mesh.sendSelfAdvertisement(16000, false);
-#endif
+  // send out initial Advertisement to the mesh
+  the_mesh.sendSelfAdvertisement(16000);
 }
 
 void loop() {
@@ -112,5 +110,4 @@ void loop() {
 #ifdef DISPLAY_CLASS
   ui_task.loop();
 #endif
-  rtc_clock.tick();
 }

examples/simple_secure_chat/main.cpp

@@ -280,7 +280,7 @@ public:
   {
     // defaults
     memset(&_prefs, 0, sizeof(_prefs));
-    _prefs.airtime_factor = 1.0;
+    _prefs.airtime_factor = 2.0;    // one third
     strcpy(_prefs.node_name, "NONAME");
     _prefs.freq = LORA_FREQ;
     _prefs.tx_power_dbm = LORA_TX_POWER;
@@ -548,7 +548,7 @@ public:
 
 StdRNG fast_rng;
 SimpleMeshTables tables;
-MyMesh the_mesh(radio_driver, fast_rng, rtc_clock, tables);
+MyMesh the_mesh(radio_driver, fast_rng, *new VolatileRTCClock(), tables); // TODO: test with 'rtc_clock' in target.cpp
 
 void halt() {
   while (1) ;
@@ -582,12 +582,9 @@ void setup() {
   the_mesh.showWelcome();
 
   // send out initial Advertisement to the mesh
-#if ENABLE_ADVERT_ON_BOOT == 1
   the_mesh.sendSelfAdvert(1200);   // add slight delay
-#endif
 }
 
 void loop() {
   the_mesh.loop();
-  rtc_clock.tick();
 }

examples/simple_sensor/SensorMesh.cpp

@@ -326,7 +326,7 @@ int SensorMesh::getAGCResetInterval() const {
   return ((int)_prefs.agc_reset_interval) * 4000;   // milliseconds
 }
 
-uint8_t SensorMesh::handleLoginReq(const mesh::Identity& sender, const uint8_t* secret, uint32_t sender_timestamp, const uint8_t* data, bool is_flood) {
+uint8_t SensorMesh::handleLoginReq(const mesh::Identity& sender, const uint8_t* secret, uint32_t sender_timestamp, const uint8_t* data) {
   ClientInfo* client;
   if (data[0] == 0) {   // blank password, just check if sender is in ACL
     client = acl.getClient(sender.pub_key, PUB_KEY_SIZE);
@@ -359,10 +359,6 @@ uint8_t SensorMesh::handleLoginReq(const mesh::Identity& sender, const uint8_t*
     dirty_contacts_expiry = futureMillis(LAZY_CONTACTS_WRITE_DELAY);
   }
 
-  if (is_flood) {
-    client->out_path_len = -1;  // need to rediscover out_path
-  }
-
   uint32_t now = getRTCClock()->getCurrentTimeUnique();
   memcpy(reply_data, &now, 4);   // response packets always prefixed with timestamp
   reply_data[4] = RESP_SERVER_LOGIN_OK;
@@ -453,14 +449,7 @@ void SensorMesh::onAnonDataRecv(mesh::Packet* packet, const uint8_t* secret, con
     memcpy(&timestamp, data, 4);
 
     data[len] = 0;  // ensure null terminator
-    uint8_t reply_len;
-    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_*) {   // future type codes
-      // TODO
-    } else {
-      reply_len = 0;  // unknown request type
-    }
+    uint8_t reply_len = handleLoginReq(sender, secret, timestamp, &data[4]);
 
     if (reply_len == 0) return;   // invalid request
 
@@ -554,7 +543,7 @@ void SensorMesh::onPeerDataRecv(mesh::Packet* packet, uint8_t type, int sender_i
   } else if (type == PAYLOAD_TYPE_TXT_MSG && len > 5 && from->isAdmin()) {   // a CLI command
     uint32_t sender_timestamp;
     memcpy(&sender_timestamp, data, 4);  // timestamp (by sender's RTC clock - which could be wrong)
-    uint8_t flags = (data[4] >> 2);   // message attempt number, and other flags
+    uint flags = (data[4] >> 2);   // message attempt number, and other flags
 
     if (sender_timestamp > from->last_timestamp) {  // prevent replay attacks
       if (flags == TXT_TYPE_PLAIN) {
@@ -612,7 +601,7 @@ void SensorMesh::onPeerDataRecv(mesh::Packet* packet, uint8_t type, int sender_i
   }
 }
 
-bool SensorMesh::handleIncomingMsg(ClientInfo& from, uint32_t timestamp, uint8_t* data, uint8_t flags, size_t len) {
+bool SensorMesh::handleIncomingMsg(ClientInfo& from, uint32_t timestamp, uint8_t* data, uint flags, size_t len) {
   MESH_DEBUG_PRINT("handleIncomingMsg: unhandled msg from ");
   #ifdef MESH_DEBUG
   mesh::Utils::printHex(Serial, from.id.pub_key, PUB_KEY_SIZE);
@@ -621,39 +610,6 @@ bool SensorMesh::handleIncomingMsg(ClientInfo& from, uint32_t timestamp, uint8_t
   return false;
 }
 
-#define CTL_TYPE_NODE_DISCOVER_REQ   0x80
-#define CTL_TYPE_NODE_DISCOVER_RESP  0x90
-
-void SensorMesh::onControlDataRecv(mesh::Packet* packet) {
-  uint8_t type = packet->payload[0] & 0xF0;    // just test upper 4 bits
-  if (type == CTL_TYPE_NODE_DISCOVER_REQ && packet->payload_len >= 6) {
-    // TODO: apply rate limiting to these!
-    int i = 1;
-    uint8_t  filter = packet->payload[i++];
-    uint32_t tag;
-    memcpy(&tag, &packet->payload[i], 4); i += 4;
-    uint32_t since;
-    if (packet->payload_len >= i+4) {   // optional since field
-      memcpy(&since, &packet->payload[i], 4); i += 4;
-    } else {
-      since = 0;
-    }
-
-    if ((filter & (1 << ADV_TYPE_SENSOR)) != 0 && _prefs.discovery_mod_timestamp >= since) {
-      bool prefix_only = packet->payload[0] & 1;
-      uint8_t data[6 + PUB_KEY_SIZE];
-      data[0] = CTL_TYPE_NODE_DISCOVER_RESP | ADV_TYPE_SENSOR;   // low 4-bits for node type
-      data[1] = packet->_snr;   // let sender know the inbound SNR ( x 4)
-      memcpy(&data[2], &tag, 4);     // include tag from request, for client to match to
-      memcpy(&data[6], self_id.pub_key, PUB_KEY_SIZE);
-      auto resp = createControlData(data,  prefix_only ? 6 + 8 : 6 + PUB_KEY_SIZE);
-      if (resp) {
-        sendZeroHop(resp, getRetransmitDelay(resp)*4);  // apply random delay (widened x4), as multiple nodes can respond to this
-      }
-    }
-  }
-}
-
 bool SensorMesh::onPeerPathRecv(mesh::Packet* packet, int sender_idx, const uint8_t* secret, uint8_t* path, uint8_t path_len, uint8_t extra_type, uint8_t* extra, uint8_t extra_len) {
   int i = matching_peer_indexes[sender_idx];
   if (i < 0 || i >= acl.getNumClients()) {
@@ -695,7 +651,7 @@ void SensorMesh::onAckRecv(mesh::Packet* packet, uint32_t ack_crc) {
 
 SensorMesh::SensorMesh(mesh::MainBoard& board, mesh::Radio& radio, mesh::MillisecondClock& ms, mesh::RNG& rng, mesh::RTCClock& rtc, mesh::MeshTables& tables)
      : mesh::Mesh(radio, ms, rng, rtc, *new StaticPoolPacketManager(32), tables),
-      _cli(board, rtc, sensors, acl, &_prefs, this), telemetry(MAX_PACKET_PAYLOAD - 4)
+      _cli(board, rtc, sensors, &_prefs, this), telemetry(MAX_PACKET_PAYLOAD - 4)
 {
   next_local_advert = next_flood_advert = 0;
   dirty_contacts_expiry = 0;
@@ -705,10 +661,9 @@ SensorMesh::SensorMesh(mesh::MainBoard& board, mesh::Radio& radio, mesh::Millise
 
   // defaults
   memset(&_prefs, 0, sizeof(_prefs));
-  _prefs.airtime_factor = 1.0;
+  _prefs.airtime_factor = 1.0;    // one half
   _prefs.rx_delay_base =   0.0f;  // turn off by default, was 10.0;
   _prefs.tx_delay_factor = 0.5f;   // was 0.25f
-  _prefs.direct_tx_delay_factor = 0.2f; // was zero
   StrHelper::strncpy(_prefs.node_name, ADVERT_NAME, sizeof(_prefs.node_name));
   _prefs.node_lat = ADVERT_LAT;
   _prefs.node_lon = ADVERT_LON;
@@ -736,7 +691,7 @@ void SensorMesh::begin(FILESYSTEM* fs) {
   // load persisted prefs
   _cli.loadPrefs(_fs);
 
-  acl.load(_fs, self_id);
+  acl.load(_fs);
 
   radio_set_params(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
   radio_set_tx_power(_prefs.tx_power_dbm);
@@ -744,8 +699,6 @@ void SensorMesh::begin(FILESYSTEM* fs) {
   updateAdvertTimer();
   updateFloodAdvertTimer();
 
-   board.setAdcMultiplier(_prefs.adc_multiplier);
-
 #if ENV_INCLUDE_GPS == 1
   applyGpsPrefs();
 #endif
@@ -765,6 +718,7 @@ bool SensorMesh::formatFileSystem() {
 }
 
 void SensorMesh::saveIdentity(const mesh::LocalIdentity& new_id) {
+  self_id = new_id;
 #if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
   IdentityStore store(*_fs, "");
 #elif defined(ESP32)
@@ -774,7 +728,7 @@ void SensorMesh::saveIdentity(const mesh::LocalIdentity& new_id) {
 #else
   #error "need to define saveIdentity()"
 #endif
-  store.save("_main", new_id);
+  store.save("_main", self_id);
 }
 
 void SensorMesh::applyTempRadioParams(float freq, float bw, uint8_t sf, uint8_t cr, int timeout_mins) {
@@ -787,14 +741,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!");
   }
@@ -819,19 +769,6 @@ void SensorMesh::setTxPower(uint8_t power_dbm) {
   radio_set_tx_power(power_dbm);
 }
 
-void SensorMesh::formatStatsReply(char *reply) {
-  StatsFormatHelper::formatCoreStats(reply, board, *_ms, _err_flags, _mgr);
-}
-
-void SensorMesh::formatRadioStatsReply(char *reply) {
-  StatsFormatHelper::formatRadioStats(reply, _radio, radio_driver, getTotalAirTime(), getReceiveAirTime());
-}
-
-void SensorMesh::formatPacketStatsReply(char *reply) {
-  StatsFormatHelper::formatPacketStats(reply, radio_driver, getNumSentFlood(), getNumSentDirect(), 
-                                       getNumRecvFlood(), getNumRecvDirect());
-}
-
 float SensorMesh::getTelemValue(uint8_t channel, uint8_t type) {
   auto buf = telemetry.getBuffer();
   uint8_t size = telemetry.getSize();

examples/simple_sensor/SensorMesh.h

@@ -20,7 +20,6 @@
 #include <helpers/AdvertDataHelpers.h>
 #include <helpers/TxtDataHelpers.h>
 #include <helpers/CommonCLI.h>
-#include <helpers/StatsFormatHelper.h>
 #include <helpers/ClientACL.h>
 #include <RTClib.h>
 #include <target.h>
@@ -33,11 +32,11 @@
 #define PERM_RECV_ALERTS_HI    (1 << 7)   // high priority alerts
 
 #ifndef FIRMWARE_BUILD_DATE
-  #define FIRMWARE_BUILD_DATE   "30 Nov 2025"
+  #define FIRMWARE_BUILD_DATE   "2 Oct 2025"
 #endif
 
 #ifndef FIRMWARE_VERSION
-  #define FIRMWARE_VERSION   "v1.11.0"
+  #define FIRMWARE_VERSION   "v1.9.1"
 #endif
 
 #define FIRMWARE_ROLE "sensor"
@@ -60,7 +59,7 @@ public:
   NodePrefs* getNodePrefs() { return &_prefs; }
   void savePrefs() override { _cli.savePrefs(_fs); }
   bool formatFileSystem() override;
-  void sendSelfAdvertisement(int delay_millis, bool flood) override;
+  void sendSelfAdvertisement(int delay_millis) override;
   void updateAdvertTimer() override;
   void updateFloodAdvertTimer() override;
   void setLoggingOn(bool enable) override {  }
@@ -70,9 +69,6 @@ public:
   void formatNeighborsReply(char *reply) override {
     strcpy(reply, "not supported");
   }
-  void formatStatsReply(char *reply) override;
-  void formatRadioStatsReply(char *reply) override;
-  void formatPacketStatsReply(char *reply) override;
   mesh::LocalIdentity& getSelfId() override { return self_id; }
   void saveIdentity(const mesh::LocalIdentity& new_id) override;
   void clearStats() override { }
@@ -125,17 +121,16 @@ protected:
   void getPeerSharedSecret(uint8_t* dest_secret, int peer_idx) override;
   void onPeerDataRecv(mesh::Packet* packet, uint8_t type, int sender_idx, const uint8_t* secret, uint8_t* data, size_t len) override;
   bool onPeerPathRecv(mesh::Packet* packet, int sender_idx, const uint8_t* secret, uint8_t* path, uint8_t path_len, uint8_t extra_type, uint8_t* extra, uint8_t extra_len) override;
-  void onControlDataRecv(mesh::Packet* packet) override;
   void onAckRecv(mesh::Packet* packet, uint32_t ack_crc) override;
-  virtual bool handleIncomingMsg(ClientInfo& from, uint32_t timestamp, uint8_t* data, uint8_t flags, size_t len);
+  virtual bool handleIncomingMsg(ClientInfo& from, uint32_t timestamp, uint8_t* data, uint flags, size_t len);
   void sendAckTo(const ClientInfo& dest, uint32_t ack_hash);
 private:
   FILESYSTEM* _fs;
   unsigned long next_local_advert, next_flood_advert;
   NodePrefs _prefs;
-  ClientACL  acl;
   CommonCLI _cli;
   uint8_t reply_data[MAX_PACKET_PAYLOAD];
+  ClientACL  acl;
   unsigned long dirty_contacts_expiry;
   CayenneLPP telemetry;
   uint32_t last_read_time;
@@ -148,7 +143,7 @@ private:
   uint8_t pending_sf;
   uint8_t pending_cr;
 
-  uint8_t handleLoginReq(const mesh::Identity& sender, const uint8_t* secret, uint32_t sender_timestamp, const uint8_t* data, bool is_flood);
+  uint8_t handleLoginReq(const mesh::Identity& sender, const uint8_t* secret, uint32_t sender_timestamp, const uint8_t* data);
   uint8_t handleRequest(uint8_t perms, uint32_t sender_timestamp, uint8_t req_type, uint8_t* payload, size_t payload_len);
   mesh::Packet* createSelfAdvert();
 
@@ -156,7 +151,7 @@ private:
 
   #if ENV_INCLUDE_GPS == 1
   void applyGpsPrefs() {
-    sensors.setSettingValue("gps", _prefs.gps_enabled?"1":"0");
+    sensors.setSettingByKey("gps", _prefs.gps_enabled?"1":"0");
   }
 #endif
 };

examples/simple_sensor/main.cpp

@@ -110,10 +110,8 @@ void setup() {
   ui_task.begin(the_mesh.getNodePrefs(), FIRMWARE_BUILD_DATE, FIRMWARE_VERSION);
 #endif
 
-  // send out initial zero hop Advertisement to the mesh
-#if ENABLE_ADVERT_ON_BOOT == 1
-  the_mesh.sendSelfAdvertisement(16000, false);
-#endif
+  // send out initial Advertisement to the mesh
+  the_mesh.sendSelfAdvertisement(16000);
 }
 
 void loop() {
@@ -146,5 +144,4 @@ void loop() {
 #ifdef DISPLAY_CLASS
   ui_task.loop();
 #endif
-  rtc_clock.tick();
 }

fetch_prs.sh

@@ -1,8 +0,0 @@
-#!/bin/sh
-
-git branch -D pr-1297
-git branch -D pr-1338
-
-# fetch PRs
-git fetch upstream pull/1338/head:pr-1338
-git fetch upstream pull/1297/head:pr-1297

library.json

@@ -1,14 +1,14 @@
 {
     "name": "MeshCore",
-    "version" : "1.10.0",
+    "version" : "1.8.0",
     "dependencies": {
         "SPI": "*",
         "Wire": "*",
-        "jgromes/RadioLib": "^7.3.0",
+        "jgromes/RadioLib": "^7.1.2",
         "rweather/Crypto": "^0.4.0",
         "adafruit/RTClib": "^2.1.3",
         "melopero/Melopero RV3028": "^1.1.0",
-        "electroniccats/CayenneLPP": "1.6.1"
+        "electroniccats/CayenneLPP": "1.4.0"
     },
     "build": {
         "extraScript": "build_as_lib.py"

merge_prs.sh

@@ -1,8 +0,0 @@
-#!/bin/sh
-
-git merge pr-1338 --no-edit -m "Integration of upstrem PR #1338"
-git merge pr-1297 --no-edit -m "Integration of upstrem PR #1297"
-
-git merge pio-ini-adjustments -m "platformio.ini: Adjust defaults for LoRa frequncies and advert interval limits"
-
-

platformio.ini

@@ -24,11 +24,9 @@ lib_deps =
   melopero/Melopero RV3028 @ ^1.1.0
   electroniccats/CayenneLPP @ 1.6.1
 build_flags = -w -DNDEBUG -DRADIOLIB_STATIC_ONLY=1 -DRADIOLIB_GODMODE=1
-  -D LORA_FREQ=869.618
-  -D LORA_BW=62.5
-  -D LORA_SF=8
-  -D LORA_CR=8
-  -D ENABLE_ADVERT_ON_BOOT=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_EXCLUDE_CC1101=1
@@ -69,7 +67,6 @@ lib_deps =
   file://arch/esp32/AsyncElegantOTA
 
 ; esp32c6 uses arduino framework 3.x
-; WARNING: experimental. pioarduino on esp32c6 needs work - it's not considered stable and has issues.
 [esp32c6_base]
 extends = esp32_base
 platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.12/platform-espressif32.zip
@@ -81,9 +78,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
@@ -133,7 +128,6 @@ build_flags =
   -D ENV_INCLUDE_MLX90614=1
   -D ENV_INCLUDE_VL53L0X=1
   -D ENV_INCLUDE_BME680=1
-  -D ENV_INCLUDE_BMP085=1
 lib_deps =
   adafruit/Adafruit INA3221 Library @ ^1.0.1
   adafruit/Adafruit INA219 @ ^1.2.3
@@ -149,4 +143,3 @@ lib_deps =
   adafruit/Adafruit_VL53L0X @ ^1.2.4
   stevemarple/MicroNMEA @ ^2.0.6
   adafruit/Adafruit BME680 Library @ ^2.0.4
-  adafruit/Adafruit BMP085 Library @ ^1.2.4

src/Dispatcher.cpp

@@ -20,34 +20,12 @@ void Dispatcher::begin() {
   _err_flags = 0;
   radio_nonrx_start = _ms->getMillis();
 
-  duty_cycle_window_ms = getDutyCycleWindowMs();
-  float duty_cycle = 1.0f / (1.0f + getAirtimeBudgetFactor());
-  tx_budget_ms = (unsigned long)(duty_cycle_window_ms * duty_cycle);
-  last_budget_update = _ms->getMillis();
-
   _radio->begin();
   prev_isrecv_mode = _radio->isInRecvMode();
 }
 
 float Dispatcher::getAirtimeBudgetFactor() const {
-  return 1.0;
-}
-
-void Dispatcher::updateTxBudget() {
-  unsigned long now = _ms->getMillis();
-  unsigned long elapsed = now - last_budget_update;
-
-  float duty_cycle = 1.0f / (1.0f + getAirtimeBudgetFactor());
-  unsigned long max_budget = (unsigned long)(getDutyCycleWindowMs() * duty_cycle);
-
-  unsigned long refill = (unsigned long)(elapsed * duty_cycle);
-  tx_budget_ms += refill;
-
-  if (tx_budget_ms > max_budget) {
-    tx_budget_ms = max_budget;
-  }
-
-  last_budget_update = now;
+  return 2.0;   // default, 33.3%  (1/3rd)
 }
 
 int Dispatcher::calcRxDelay(float score, uint32_t air_time) const {
@@ -83,24 +61,11 @@ void Dispatcher::loop() {
   if (outbound) {  // waiting for outbound send to be completed
     if (_radio->isSendComplete()) {
       long t = _ms->getMillis() - outbound_start;
-      total_air_time += t;
+      total_air_time += t;  // keep track of how much air time we are using
       //Serial.print("  airtime="); Serial.println(t);
 
-      updateTxBudget();
-
-      if (t > tx_budget_ms) {
-        tx_budget_ms = 0;
-      } else {
-        tx_budget_ms -= t;
-      }
-
-      if (tx_budget_ms < 100) {
-        float duty_cycle = 1.0f / (1.0f + getAirtimeBudgetFactor());
-        unsigned long needed = 100 - tx_budget_ms;
-        next_tx_time = futureMillis((unsigned long)(needed / duty_cycle));
-      } else {
-        next_tx_time = _ms->getMillis();
-      }
+      // will need radio silence up to next_tx_time
+      next_tx_time = futureMillis(t * getAirtimeBudgetFactor());
 
       _radio->onSendFinished();
       logTx(outbound, 2 + outbound->path_len + outbound->payload_len);
@@ -259,20 +224,9 @@ void Dispatcher::processRecvPacket(Packet* pkt) {
 }
 
 void Dispatcher::checkSend() {
-  if (_mgr->getOutboundCount(_ms->getMillis()) == 0) return;
-  
-  updateTxBudget();
-  
-  uint32_t est_airtime = _radio->getEstAirtimeFor(MAX_TRANS_UNIT);
-  if (tx_budget_ms < est_airtime / 2) {
-    float duty_cycle = 1.0f / (1.0f + getAirtimeBudgetFactor());
-    unsigned long needed = est_airtime / 2 - tx_budget_ms;
-    next_tx_time = futureMillis((unsigned long)(needed / duty_cycle));
-    return;
-  }
-  
-  if (!millisHasNowPassed(next_tx_time)) return;
-  if (_radio->isReceiving()) {
+  if (_mgr->getOutboundCount(_ms->getMillis()) == 0) return;  // nothing waiting to send
+  if (!millisHasNowPassed(next_tx_time)) return;   // still in 'radio silence' phase (from airtime budget setting)
+  if (_radio->isReceiving()) {   // LBT - check if radio is currently mid-receive, or if channel activity
     if (cad_busy_start == 0) {
       cad_busy_start = _ms->getMillis();   // record when CAD busy state started
     }

src/Dispatcher.h

@@ -122,12 +122,8 @@ class Dispatcher {
   bool  prev_isrecv_mode;
   uint32_t n_sent_flood, n_sent_direct;
   uint32_t n_recv_flood, n_recv_direct;
-  unsigned long tx_budget_ms;
-  unsigned long last_budget_update;
-  unsigned long duty_cycle_window_ms;
 
   void processRecvPacket(Packet* pkt);
-  void updateTxBudget();
 
 protected:
   PacketManager* _mgr;
@@ -146,9 +142,6 @@ protected:
     _err_flags = 0;
     radio_nonrx_start = 0;
     prev_isrecv_mode = true;
-    tx_budget_ms = 0;
-    last_budget_update = 0;
-    duty_cycle_window_ms = 3600000;
   }
 
   virtual DispatcherAction onRecvPacket(Packet* pkt) = 0;
@@ -166,7 +159,6 @@ protected:
   virtual uint32_t getCADFailMaxDuration() const;
   virtual int getInterferenceThreshold() const { return 0; }    // disabled by default
   virtual int getAGCResetInterval() const { return 0; }    // disabled by default
-  virtual unsigned long getDutyCycleWindowMs() const { return 3600000; }
 
 public:
   void begin();
@@ -176,9 +168,8 @@ public:
   void releasePacket(Packet* packet);
   void sendPacket(Packet* packet, uint8_t priority, uint32_t delay_millis=0);
 
-  unsigned long getTotalAirTime() const { return total_air_time; }
+  unsigned long getTotalAirTime() const { return total_air_time; }  // in milliseconds
   unsigned long getReceiveAirTime() const {return rx_air_time; }
-  unsigned long getRemainingTxBudget() const { return tx_budget_ms; }
   uint32_t getNumSentFlood() const { return n_sent_flood; }
   uint32_t getNumSentDirect() const { return n_sent_direct; }
   uint32_t getNumRecvFlood() const { return n_recv_flood; }

src/Identity.cpp

@@ -48,50 +48,6 @@ LocalIdentity::LocalIdentity(RNG* rng) {
   ed25519_create_keypair(pub_key, prv_key, seed);
 }
 
-bool LocalIdentity::validatePrivateKey(const uint8_t prv[64]) {
-    uint8_t pub[32];
-    ed25519_derive_pub(pub, prv); // derive public key from given private key
-
-    // disallow 00 or FF prefixed public keys
-    if (pub[0] == 0x00 || pub[0] == 0xFF) return false;
-
-    // known good test client keypair
-    const uint8_t test_client_prv[64] = {
-      0x70, 0x65, 0xe1, 0x8f, 0xd9, 0xfa, 0xbb, 0x70,
-      0xc1, 0xed, 0x90, 0xdc, 0xa1, 0x99, 0x07, 0xde,
-      0x69, 0x8c, 0x88, 0xb7, 0x09, 0xea, 0x14, 0x6e,
-      0xaf, 0xd9, 0x3d, 0x9b, 0x83, 0x0c, 0x7b, 0x60,
-      0xc4, 0x68, 0x11, 0x93, 0xc7, 0x9b, 0xbc, 0x39,
-      0x94, 0x5b, 0xa8, 0x06, 0x41, 0x04, 0xbb, 0x61,
-      0x8f, 0x8f, 0xd7, 0xa8, 0x4a, 0x0a, 0xf6, 0xf5,
-      0x70, 0x33, 0xd6, 0xe8, 0xdd, 0xcd, 0x64, 0x71
-    };
-    const uint8_t test_client_pub[32] = {
-      0x1e, 0xc7, 0x71, 0x75, 0xb0, 0x91, 0x8e, 0xd2,
-      0x06, 0xf9, 0xae, 0x04, 0xec, 0x13, 0x6d, 0x6d,
-      0x5d, 0x43, 0x15, 0xbb, 0x26, 0x30, 0x54, 0x27,
-      0xf6, 0x45, 0xb4, 0x92, 0xe9, 0x35, 0x0c, 0x10
-    };
-
-    uint8_t ss1[32], ss2[32];
-
-    // shared secret we calculte from test client pubkey and given private key
-    ed25519_key_exchange(ss1, test_client_pub, prv);
-
-    // shared secret they calculate from our derived public key and test client private key
-    ed25519_key_exchange(ss2, pub, test_client_prv);
-
-    // check that both shared secrets match
-    if (memcmp(ss1, ss2, 32) != 0) return false;
-
-    // reject all-zero shared secret
-    for (int i = 0; i < 32; i++) {
-        if (ss1[i] != 0) return true;
-    }
-
-    return false;
-}
-
 bool LocalIdentity::readFrom(Stream& s) {
   bool success = (s.readBytes(pub_key, PUB_KEY_SIZE) == PUB_KEY_SIZE);
   success = success && (s.readBytes(prv_key, PRV_KEY_SIZE) == PRV_KEY_SIZE);

src/Identity.h

@@ -23,9 +23,6 @@ public:
   bool isHashMatch(const uint8_t* hash) const {
     return memcmp(hash, pub_key, PATH_HASH_SIZE) == 0;
   }
-  bool isHashMatch(const uint8_t* hash, uint8_t len) const {
-    return memcmp(hash, pub_key, len) == 0;
-  }
 
   /**
    * \brief  Performs Ed25519 signature verification.
@@ -76,13 +73,6 @@ public:
   */
   void calcSharedSecret(uint8_t* secret, const uint8_t* other_pub_key) const;
 
-  /**
-   * \brief  Validates that a given private key can be used for ECDH / shared-secret operations.
-   * \param  prv IN - the private key to validate (must be PRV_KEY_SIZE bytes)
-   * \returns true, if the private key is valid for login.
-  */
-  static bool validatePrivateKey(const uint8_t prv[64]);
-
   bool readFrom(Stream& s);
   bool writeTo(Stream& s) const;
   void printTo(Stream& s) const;

src/Mesh.cpp

@@ -52,15 +52,14 @@ DispatcherAction Mesh::onRecvPacket(Packet* pkt) {
       uint32_t auth_code;
       memcpy(&auth_code, &pkt->payload[i], 4); i += 4;
       uint8_t flags = pkt->payload[i++];
-      uint8_t path_sz = flags & 0x03;  // NEW v1.11+: lower 2 bits is path hash size
 
       uint8_t len = pkt->payload_len - i;
-      uint8_t offset = pkt->path_len << path_sz;
-      if (offset >= len) {   // TRACE has reached end of given path
+      if (pkt->path_len >= len) {   // TRACE has reached end of given path
         onTraceRecv(pkt, trace_tag, auth_code, flags, pkt->path, &pkt->payload[i], len);
-      } else if (self_id.isHashMatch(&pkt->payload[i + offset], 1 << path_sz) && allowPacketForward(pkt) && !_tables->hasSeen(pkt)) {
+      } else if (self_id.isHashMatch(&pkt->payload[i + pkt->path_len]) && allowPacketForward(pkt) && !_tables->hasSeen(pkt)) {
         // append SNR (Not hash!)
-        pkt->path[pkt->path_len++] = (int8_t) (pkt->getSNR()*4);
+        pkt->path[pkt->path_len] = (int8_t) (pkt->getSNR()*4);
+        pkt->path_len += PATH_HASH_SIZE;
 
         uint32_t d = getDirectRetransmitDelay(pkt);
         return ACTION_RETRANSMIT_DELAYED(5, d);  // schedule with priority 5 (for now), maybe make configurable?
@@ -69,25 +68,7 @@ DispatcherAction Mesh::onRecvPacket(Packet* pkt) {
     return ACTION_RELEASE;
   }
 
-  if (pkt->isRouteDirect() && pkt->getPayloadType() == PAYLOAD_TYPE_CONTROL && (pkt->payload[0] & 0x80) != 0) {
-    if (pkt->path_len == 0) {
-      onControlDataRecv(pkt);
-    }
-    // just zero-hop control packets allowed (for this subset of payloads)
-    return ACTION_RELEASE;
-  }
-
   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);
@@ -109,8 +90,6 @@ DispatcherAction Mesh::onRecvPacket(Packet* pkt) {
     return ACTION_RELEASE;   // this node is NOT the next hop (OR this packet has already been forwarded), so discard.
   }
 
-  if (pkt->isRouteFlood() && filterRecvFloodPacket(pkt)) return ACTION_RELEASE;
-
   DispatcherAction action = ACTION_RELEASE;
 
   switch (pkt->getPayloadType()) {
@@ -222,9 +201,9 @@ DispatcherAction Mesh::onRecvPacket(Packet* pkt) {
       if (i + 2 >= pkt->payload_len) {
         MESH_DEBUG_PRINTLN("%s Mesh::onRecvPacket(): incomplete data packet", getLogDateTime());
       } else if (!_tables->hasSeen(pkt)) {
-        // scan channels DB, for all matching hashes of 'channel_hash' (max 4 matches supported ATM)
-        GroupChannel channels[4];
-        int num = searchChannelsByHash(&channel_hash, channels, 4);
+        // scan channels DB, for all matching hashes of 'channel_hash' (max 2 matches supported ATM)
+        GroupChannel channels[2];
+        int num = searchChannelsByHash(&channel_hash, channels, 2);
         // for each matching channel, try to decrypt data
         for (int j = 0; j < num; j++) {
           // decrypt, checking MAC is valid
@@ -608,22 +587,6 @@ Packet* Mesh::createTrace(uint32_t tag, uint32_t auth_code, uint8_t flags) {
   return packet;
 }
 
-Packet* Mesh::createControlData(const uint8_t* data, size_t len) {
-  if (len > sizeof(Packet::payload)) return NULL;  // invalid arg
-
-  Packet* packet = obtainNewPacket();
-  if (packet == NULL) {
-    MESH_DEBUG_PRINTLN("%s Mesh::createControlData(): error, packet pool empty", getLogDateTime());
-    return NULL;
-  }
-  packet->header = (PAYLOAD_TYPE_CONTROL << PH_TYPE_SHIFT);  // ROUTE_TYPE_* set later
-
-  memcpy(packet->payload, data, len);
-  packet->payload_len = len;
-
-  return packet;
-}
-
 void Mesh::sendFlood(Packet* packet, uint32_t delay_millis) {
   if (packet->getPayloadType() == PAYLOAD_TYPE_TRACE) {
     MESH_DEBUG_PRINTLN("%s Mesh::sendFlood(): TRACE type not suspported", getLogDateTime());
@@ -647,31 +610,6 @@ void Mesh::sendFlood(Packet* packet, uint32_t delay_millis) {
   sendPacket(packet, pri, delay_millis);
 }
 
-void Mesh::sendFlood(Packet* packet, uint16_t* transport_codes, uint32_t delay_millis) {
-  if (packet->getPayloadType() == PAYLOAD_TYPE_TRACE) {
-    MESH_DEBUG_PRINTLN("%s Mesh::sendFlood(): TRACE type not suspported", getLogDateTime());
-    return;
-  }
-
-  packet->header &= ~PH_ROUTE_MASK;
-  packet->header |= ROUTE_TYPE_TRANSPORT_FLOOD;
-  packet->transport_codes[0] = transport_codes[0];
-  packet->transport_codes[1] = transport_codes[1];
-  packet->path_len = 0;
-
-  _tables->hasSeen(packet); // mark this packet as already sent in case it is rebroadcast back to us
-
-  uint8_t pri;
-  if (packet->getPayloadType() == PAYLOAD_TYPE_PATH) {
-    pri = 2;
-  } else if (packet->getPayloadType() == PAYLOAD_TYPE_ADVERT) {
-    pri = 3;   // de-prioritie these
-  } else {
-    pri = 1;
-  }
-  sendPacket(packet, pri, delay_millis);
-}
-
 void Mesh::sendDirect(Packet* packet, const uint8_t* path, uint8_t path_len, uint32_t delay_millis) {
   packet->header &= ~PH_ROUTE_MASK;
   packet->header |= ROUTE_TYPE_DIRECT;
@@ -707,17 +645,4 @@ void Mesh::sendZeroHop(Packet* packet, uint32_t delay_millis) {
   sendPacket(packet, 0, delay_millis);
 }
 
-void Mesh::sendZeroHop(Packet* packet, uint16_t* transport_codes, uint32_t delay_millis) {
-  packet->header &= ~PH_ROUTE_MASK;
-  packet->header |= ROUTE_TYPE_TRANSPORT_DIRECT;
-  packet->transport_codes[0] = transport_codes[0];
-  packet->transport_codes[1] = transport_codes[1];
-
-  packet->path_len = 0;  // path_len of zero means Zero Hop
-
-  _tables->hasSeen(packet); // mark this packet as already sent in case it is rebroadcast back to us
-
-  sendPacket(packet, 0, delay_millis);
-}
-
 }

src/Mesh.h

@@ -43,12 +43,6 @@ protected:
    */
   DispatcherAction routeRecvPacket(Packet* packet);
 
-  /**
-   * \brief    Called _before_ the packet is dispatched to the on..Recv() methods.
-   * \returns  true, if given packet should be NOT be processed.
-   */
-  virtual bool filterRecvFloodPacket(Packet* packet) { return false; }
-
   /**
    * \brief  Check whether this packet should be forwarded (re-transmitted) or not.
    *     Is sub-classes responsibility to make sure given packet is only transmitted ONCE (by this node)
@@ -134,11 +128,6 @@ protected:
   */
   virtual void onPathRecv(Packet* packet, Identity& sender, uint8_t* path, uint8_t path_len, uint8_t extra_type, uint8_t* extra, uint8_t extra_len) { }
 
-  /**
-   * \brief  A control packet has been received.
-  */
-  virtual void onControlDataRecv(Packet* packet) { }
-
   /**
    * \brief  A packet with PAYLOAD_TYPE_RAW_CUSTOM has been received.
   */
@@ -191,19 +180,12 @@ public:
   Packet* createPathReturn(const Identity& dest, const uint8_t* secret, const uint8_t* path, uint8_t path_len, uint8_t extra_type, const uint8_t*extra, size_t extra_len);
   Packet* createRawData(const uint8_t* data, size_t len);
   Packet* createTrace(uint32_t tag, uint32_t auth_code, uint8_t flags = 0);
-  Packet* createControlData(const uint8_t* data, size_t len);
 
   /**
    * \brief  send a locally-generated Packet with flood routing
   */
   void sendFlood(Packet* packet, uint32_t delay_millis=0);
 
-  /**
-   * \brief  send a locally-generated Packet with flood routing
-   * \param transport_codes   array of 2 codes to attach to packet
-  */
-  void sendFlood(Packet* packet, uint16_t* transport_codes, uint32_t delay_millis=0);
-
   /**
    * \brief  send a locally-generated Packet with Direct routing
   */
@@ -214,12 +196,6 @@ public:
   */
   void sendZeroHop(Packet* packet, uint32_t delay_millis=0);
 
-  /**
-   * \brief  send a locally-generated Packet to just neigbor nodes (zero hops), with specific transort codes
-   * \param transport_codes   array of 2 codes to attach to packet
-  */
-  void sendZeroHop(Packet* packet, uint16_t* transport_codes, uint32_t delay_millis=0);
-
 };
 
 }

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,27 +42,15 @@ 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;
   virtual void onBeforeTransmit() { }
   virtual void onAfterTransmit() { }
   virtual void reboot() = 0;
   virtual void powerOff() { /* no op */ }
-  virtual void sleep(uint32_t secs)  { /* no op */ }
   virtual uint32_t getGpio() { return 0; }
   virtual void setGpio(uint32_t values) {}
   virtual uint8_t getStartupReason() const = 0;
   virtual bool startOTAUpdate(const char* id, char reply[]) { return false; }   // not supported
-
-  // Power management interface (boards with power management override these)
-  virtual bool isExternalPowered() { return false; }
-  virtual uint16_t getBootVoltage() { return 0; }
-  virtual uint32_t getResetReason() const { return 0; }
-  virtual const char* getResetReasonString(uint32_t reason) { return "Not available"; }
-  virtual uint8_t getShutdownReason() const { return 0; }
-  virtual const char* getShutdownReasonString(uint8_t reason) { return "Not available"; }
 };
 
 /**
@@ -85,11 +72,6 @@ public:
   */
   virtual void setCurrentTime(uint32_t time) = 0;
 
-  /**
-   * override in classes that need to periodically update internal state
-   */
-  virtual void tick() { /* no op */}
-
   uint32_t getCurrentTimeUnique() {
     uint32_t t = getCurrentTime();
     if (t <= last_unique) {

src/Packet.h

@@ -27,7 +27,6 @@ namespace mesh {
 #define PAYLOAD_TYPE_PATH        0x08    // returned path (prefixed with dest/src hashes, MAC) (enc data: path, extra)
 #define PAYLOAD_TYPE_TRACE       0x09    // trace a path, collecting SNI for each hop
 #define PAYLOAD_TYPE_MULTIPART   0x0A    // packet is one of a set of packets
-#define PAYLOAD_TYPE_CONTROL     0x0B    // a control/discovery packet
 //...
 #define PAYLOAD_TYPE_RAW_CUSTOM   0x0F    // custom packet as raw bytes, for applications with custom encryption, payloads, etc
 

src/helpers/ArduinoHelpers.h

@@ -4,19 +4,11 @@
 #include <Arduino.h>
 
 class VolatileRTCClock : public mesh::RTCClock {
-  uint32_t base_time;
-  uint64_t accumulator;
-  unsigned long prev_millis;
+  long millis_offset;
 public:
-  VolatileRTCClock() { base_time = 1715770351; accumulator = 0; prev_millis = millis(); }   // 15 May 2024, 8:50pm
-  uint32_t getCurrentTime() override { return base_time + accumulator/1000; }
-  void setCurrentTime(uint32_t time) override { base_time = time; accumulator = 0; prev_millis = millis(); }
-
-  void tick() override {
-    unsigned long now = millis();
-    accumulator += (now - prev_millis);
-    prev_millis = now;
-  }
+  VolatileRTCClock() { millis_offset = 1715770351; } // 15 May 2024, 8:50pm
+  uint32_t getCurrentTime() override { return (millis()/1000 + millis_offset); }
+  void setCurrentTime(uint32_t time) override { millis_offset = time - millis()/1000; }
 };
 
 class ArduinoMillis : public mesh::MillisecondClock {

src/helpers/AutoDiscoverRTCClock.h

@@ -14,8 +14,4 @@ public:
   void begin(TwoWire& wire);
   uint32_t getCurrentTime() override;
   void setCurrentTime(uint32_t time) override;
-
-  void tick() override {
-    _fallback->tick();   // is typically VolatileRTCClock, which now needs tick()
-  }
 };

src/helpers/BaseChatMesh.cpp

@@ -9,13 +9,6 @@
   #define TXT_ACK_DELAY     200
 #endif
 
-void BaseChatMesh::sendFloodScoped(const ContactInfo& recipient, mesh::Packet* pkt, uint32_t delay_millis) {
-  sendFlood(pkt, delay_millis);
-}
-void BaseChatMesh::sendFloodScoped(const mesh::GroupChannel& channel, mesh::Packet* pkt, uint32_t delay_millis) {
-  sendFlood(pkt, delay_millis);
-}
-
 mesh::Packet* BaseChatMesh::createSelfAdvert(const char* name) {
   uint8_t app_data[MAX_ADVERT_DATA_SIZE];
   uint8_t app_data_len;
@@ -41,7 +34,7 @@ mesh::Packet* BaseChatMesh::createSelfAdvert(const char* name, double lat, doubl
 void BaseChatMesh::sendAckTo(const ContactInfo& dest, uint32_t ack_hash) {
   if (dest.out_path_len < 0) {
     mesh::Packet* ack = createAck(ack_hash);
-    if (ack) sendFloodScoped(dest, ack, TXT_ACK_DELAY);
+    if (ack) sendFlood(ack, TXT_ACK_DELAY);
   } else {
     uint32_t d = TXT_ACK_DELAY;
     if (getExtraAckTransmitCount() > 0) {
@@ -55,54 +48,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())) {
@@ -123,48 +68,54 @@ void BaseChatMesh::onAdvertRecv(mesh::Packet* packet, const mesh::Identity& id,
   }
 
   // save a copy of raw advert packet (to support "Share..." function)
-  int plen;
-  {
-    uint8_t save = packet->header;
-    packet->header &= ~PH_ROUTE_MASK;
-    packet->header |= ROUTE_TYPE_FLOOD;   // make sure transport codes are NOT saved
-    plen = packet->writeTo(temp_buf);
-    packet->header = save;
-  }
+  int plen = packet->writeTo(temp_buf);
   putBlobByKey(id.pub_key, PUB_KEY_SIZE, temp_buf, plen);
-
-  bool is_new = false; // true = not in contacts[], false = exists in contacts[]
+  
+  bool is_new = false;
   if (from == NULL) {
-    if (!shouldAutoAddContactType(parser.getType())) {
+    if (!isAutoAddEnabled()) {
       ContactInfo ci;
-      populateContactFromAdvert(ci, id, parser, timestamp);
+      memset(&ci, 0, sizeof(ci));
+      ci.id = id;
+      ci.out_path_len = -1;  // initially out_path is unknown
+      StrHelper::strncpy(ci.name, parser.getName(), sizeof(ci.name));
+      ci.type = parser.getType();
+      if (parser.hasLatLon()) {
+        ci.gps_lat = parser.getIntLat();
+        ci.gps_lon = parser.getIntLon();
+      }
+      ci.last_advert_timestamp = timestamp;
+      ci.lastmod = getRTCClock()->getCurrentTime();
       onDiscoveredContact(ci, true, packet->path_len, packet->path);       // let UI know
       return;
     }
 
-    from = allocateContactSlot();
-    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");
+    is_new = true;
+    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
 }
@@ -182,7 +133,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);
   }
@@ -200,7 +152,7 @@ void BaseChatMesh::onPeerDataRecv(mesh::Packet* packet, uint8_t type, int sender
   if (type == PAYLOAD_TYPE_TXT_MSG && len > 5) {
     uint32_t timestamp;
     memcpy(&timestamp, data, 4);  // timestamp (by sender's RTC clock - which could be wrong)
-    uint8_t flags = data[4] >> 2;   // message attempt number, and other flags
+    uint flags = data[4] >> 2;   // message attempt number, and other flags
 
     // len can be > original length, but 'text' will be padded with zeroes
     data[len] = 0; // need to make a C string again, with null terminator
@@ -216,7 +168,7 @@ void BaseChatMesh::onPeerDataRecv(mesh::Packet* packet, uint8_t type, int sender
         // let this sender know path TO here, so they can use sendDirect(), and ALSO encode the ACK
         mesh::Packet* path = createPathReturn(from.id, secret, packet->path, packet->path_len,
                                                 PAYLOAD_TYPE_ACK, (uint8_t *) &ack_hash, 4);
-        if (path) sendFloodScoped(from, path, TXT_ACK_DELAY);
+        if (path) sendFlood(path, TXT_ACK_DELAY);
       } else {
         sendAckTo(from, ack_hash);
       }
@@ -227,7 +179,7 @@ void BaseChatMesh::onPeerDataRecv(mesh::Packet* packet, uint8_t type, int sender
       if (packet->isRouteFlood()) {
         // let this sender know path TO here, so they can use sendDirect() (NOTE: no ACK as extra)
         mesh::Packet* path = createPathReturn(from.id, secret, packet->path, packet->path_len, 0, NULL, 0);
-        if (path) sendFloodScoped(from, path);
+        if (path) sendFlood(path);
       }
     } else if (flags == TXT_TYPE_SIGNED_PLAIN) {
       if (timestamp > from.sync_since) {  // make sure 'sync_since' is up-to-date
@@ -243,7 +195,7 @@ void BaseChatMesh::onPeerDataRecv(mesh::Packet* packet, uint8_t type, int sender
         // let this sender know path TO here, so they can use sendDirect(), and ALSO encode the ACK
         mesh::Packet* path = createPathReturn(from.id, secret, packet->path, packet->path_len,
                                                 PAYLOAD_TYPE_ACK, (uint8_t *) &ack_hash, 4);
-        if (path) sendFloodScoped(from, path, TXT_ACK_DELAY);
+        if (path) sendFlood(path, TXT_ACK_DELAY);
       } else {
         sendAckTo(from, ack_hash);
       }
@@ -259,14 +211,14 @@ void BaseChatMesh::onPeerDataRecv(mesh::Packet* packet, uint8_t type, int sender
         // let this sender know path TO here, so they can use sendDirect(), and ALSO encode the response
         mesh::Packet* path = createPathReturn(from.id, secret, packet->path, packet->path_len,
                                               PAYLOAD_TYPE_RESPONSE, temp_buf, reply_len);
-        if (path) sendFloodScoped(from, path, SERVER_RESPONSE_DELAY);
+        if (path) sendFlood(path, SERVER_RESPONSE_DELAY);
       } else {
         mesh::Packet* reply = createDatagram(PAYLOAD_TYPE_RESPONSE, from.id, secret, temp_buf, reply_len);
         if (reply) {
           if (from.out_path_len >= 0) {  // we have an out_path, so send DIRECT
             sendDirect(reply, from.out_path, from.out_path_len, SERVER_RESPONSE_DELAY);
           } else {
-            sendFloodScoped(from, reply, SERVER_RESPONSE_DELAY);
+            sendFlood(reply, SERVER_RESPONSE_DELAY);
           }
         }
       }
@@ -327,7 +279,7 @@ void BaseChatMesh::onAckRecv(mesh::Packet* packet, uint32_t ack_crc) {
 void BaseChatMesh::handleReturnPathRetry(const ContactInfo& contact, const uint8_t* path, uint8_t path_len) {
   // NOTE: simplest impl is just to re-send a reciprocal return path to sender (DIRECTLY)
   //        override this method in various firmwares, if there's a better strategy
-  mesh::Packet* rpath = createPathReturn(contact.id, contact.getSharedSecret(self_id), path, path_len, 0, NULL, 0);
+  mesh::Packet* rpath = createPathReturn(contact.id, contact.shared_secret, path, path_len, 0, NULL, 0);
   if (rpath) sendDirect(rpath, contact.out_path, contact.out_path_len, 3000);   // 3 second delay
 }
 
@@ -376,7 +328,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) {
@@ -387,7 +339,7 @@ int  BaseChatMesh::sendMessage(const ContactInfo& recipient, uint32_t timestamp,
 
   int rc;
   if (recipient.out_path_len < 0) {
-    sendFloodScoped(recipient, pkt);
+    sendFlood(pkt);
     txt_send_timeout = futureMillis(est_timeout = calcFloodTimeoutMillisFor(t));
     rc = MSG_SEND_SENT_FLOOD;
   } else {
@@ -407,13 +359,13 @@ 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());
   int rc;
   if (recipient.out_path_len < 0) {
-    sendFloodScoped(recipient, pkt);
+    sendFlood(pkt);
     txt_send_timeout = futureMillis(est_timeout = calcFloodTimeoutMillisFor(t));
     rc = MSG_SEND_SENT_FLOOD;
   } else {
@@ -439,7 +391,7 @@ bool BaseChatMesh::sendGroupMessage(uint32_t timestamp, mesh::GroupChannel& chan
 
   auto pkt = createGroupDatagram(PAYLOAD_TYPE_GRP_TXT, channel, temp, 5 + prefix_len + text_len);
   if (pkt) {
-    sendFloodScoped(channel, pkt);
+    sendFlood(pkt);
     return true;
   }
   return false;
@@ -453,9 +405,7 @@ bool BaseChatMesh::shareContactZeroHop(const ContactInfo& contact) {
   if (packet == NULL) return false;  // no Packets available
 
   packet->readFrom(temp_buf, plen);  // restore Packet from 'blob'
-  uint16_t codes[2];
-  codes[0] = codes[1] = 0;   // { 0, 0 } means 'send this nowhere'
-  sendZeroHop(packet, codes);
+  sendZeroHop(packet);
   return true;  // success
 }
 
@@ -496,37 +446,12 @@ int BaseChatMesh::sendLogin(const ContactInfo& recipient, const char* password,
       tlen = 4 + len;
     }
 
-    pkt = createAnonDatagram(PAYLOAD_TYPE_ANON_REQ, self_id, recipient.id, recipient.getSharedSecret(self_id), temp, tlen);
+    pkt = createAnonDatagram(PAYLOAD_TYPE_ANON_REQ, self_id, recipient.id, recipient.shared_secret, temp, tlen);
   }
   if (pkt) {
     uint32_t t = _radio->getEstAirtimeFor(pkt->getRawLength());
     if (recipient.out_path_len < 0) {
-      sendFloodScoped(recipient, pkt);
-      est_timeout = calcFloodTimeoutMillisFor(t);
-      return MSG_SEND_SENT_FLOOD;
-    } else {
-      sendDirect(pkt, recipient.out_path, recipient.out_path_len);
-      est_timeout = calcDirectTimeoutMillisFor(t, recipient.out_path_len);
-      return MSG_SEND_SENT_DIRECT;
-    }
-  }
-  return MSG_SEND_FAILED;
-}
-
-int BaseChatMesh::sendAnonReq(const ContactInfo& recipient, const uint8_t* data, uint8_t len, uint32_t& tag, uint32_t& est_timeout) {
-  mesh::Packet* pkt;
-  {
-    uint8_t temp[MAX_PACKET_PAYLOAD];
-    tag = getRTCClock()->getCurrentTimeUnique();
-    memcpy(temp, &tag, 4);   // tag to match later (also extra blob to help make packet_hash unique)
-    memcpy(&temp[4], data, len);
-
-    pkt = createAnonDatagram(PAYLOAD_TYPE_ANON_REQ, self_id, recipient.id, recipient.getSharedSecret(self_id), temp, 4 + len);
-  }
-  if (pkt) {
-    uint32_t t = _radio->getEstAirtimeFor(pkt->getRawLength());
-    if (recipient.out_path_len < 0) {
-      sendFloodScoped(recipient, pkt);
+      sendFlood(pkt);
       est_timeout = calcFloodTimeoutMillisFor(t);
       return MSG_SEND_SENT_FLOOD;
     } else {
@@ -548,12 +473,12 @@ 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());
     if (recipient.out_path_len < 0) {
-      sendFloodScoped(recipient, pkt);
+      sendFlood(pkt);
       est_timeout = calcFloodTimeoutMillisFor(t);
       return MSG_SEND_SENT_FLOOD;
     } else {
@@ -575,12 +500,12 @@ 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());
     if (recipient.out_path_len < 0) {
-      sendFloodScoped(recipient, pkt);
+      sendFlood(pkt);
       est_timeout = calcFloodTimeoutMillisFor(t);
       return MSG_SEND_SENT_FLOOD;
     } else {
@@ -698,7 +623,7 @@ void BaseChatMesh::checkConnections() {
       // calc expected ACK reply
       mesh::Utils::sha256((uint8_t *)&connections[i].expected_ack, 4, data, 9, self_id.pub_key, PUB_KEY_SIZE);
 
-      auto pkt = createDatagram(PAYLOAD_TYPE_REQ, contact->id, contact->getSharedSecret(self_id), data, 9);
+      auto pkt = createDatagram(PAYLOAD_TYPE_REQ, contact->id, contact->shared_secret, data, 9);
       if (pkt) {
         sendDirect(pkt, contact->out_path, contact->out_path_len);
       }
@@ -758,10 +683,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;

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;
@@ -114,9 +107,6 @@ protected:
   virtual void onContactResponse(const ContactInfo& contact, const uint8_t* data, uint8_t len) = 0;
   virtual void handleReturnPathRetry(const ContactInfo& contact, const uint8_t* path, uint8_t path_len);
 
-  virtual void sendFloodScoped(const ContactInfo& recipient, mesh::Packet* pkt, uint32_t delay_millis=0);
-  virtual void sendFloodScoped(const mesh::GroupChannel& channel, mesh::Packet* pkt, uint32_t delay_millis=0);
-
   // storage concepts, for sub-classes to override/implement
   virtual int  getBlobByKey(const uint8_t key[], int key_len, uint8_t dest_buf[]) { return 0; }  // not implemented
   virtual bool putBlobByKey(const uint8_t key[], int key_len, const uint8_t src_buf[], int len) { return false; }
@@ -148,7 +138,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);

src/helpers/ClientACL.cpp

@@ -11,8 +11,7 @@ static File openWrite(FILESYSTEM* _fs, const char* filename) {
   #endif
 }
 
-void ClientACL::load(FILESYSTEM* fs, const mesh::LocalIdentity& self_id) {
-  _fs = fs;
+void ClientACL::load(FILESYSTEM* _fs) {
   num_clients = 0;
   if (_fs->exists("/s_contacts")) {
   #if defined(RP2040_PLATFORM)
@@ -35,12 +34,11 @@ void ClientACL::load(FILESYSTEM* fs, const mesh::LocalIdentity& self_id) {
         success = success && (file.read(unused, 2) == 2);
         success = success && (file.read((uint8_t *)&c.out_path_len, 1) == 1);
         success = success && (file.read(c.out_path, 64) == 64);
-        success = success && (file.read(c.shared_secret, PUB_KEY_SIZE) == PUB_KEY_SIZE); // will be recalculated below
+        success = success && (file.read(c.shared_secret, PUB_KEY_SIZE) == PUB_KEY_SIZE);
 
         if (!success) break; // EOF
 
         c.id = mesh::Identity(pub_key);
-        self_id.calcSharedSecret(c.shared_secret, pub_key);  // recalculate shared secrets in case our private key changed
         if (num_clients < MAX_CLIENTS) {
           clients[num_clients++] = c;
         } else {
@@ -52,8 +50,7 @@ void ClientACL::load(FILESYSTEM* fs, const mesh::LocalIdentity& self_id) {
   }
 }
 
-void ClientACL::save(FILESYSTEM* fs, bool (*filter)(ClientInfo*)) {
-  _fs = fs;
+void ClientACL::save(FILESYSTEM* _fs, bool (*filter)(ClientInfo*)) {
   File file = openWrite(_fs, "/s_contacts");
   if (file) {
     uint8_t unused[2];
@@ -77,16 +74,6 @@ void ClientACL::save(FILESYSTEM* fs, bool (*filter)(ClientInfo*)) {
   }
 }
 
-bool ClientACL::clear() {
-  if (!_fs) return false; // no filesystem, nothing to clear
-  if (_fs->exists("/s_contacts")) {
-    _fs->remove("/s_contacts");
-  }
-  memset(clients, 0, sizeof(clients));
-  num_clients = 0;
-  return true;
-}
-
 ClientInfo* ClientACL::getClient(const uint8_t* pubkey, int key_len) {
   for (int i = 0; i < num_clients; i++) {
     if (memcmp(pubkey, clients[i].id.pub_key, key_len) == 0) return &clients[i];  // already known

src/helpers/ClientACL.h

@@ -36,7 +36,6 @@ struct ClientInfo {
 #endif
 
 class ClientACL {
-  FILESYSTEM* _fs;
   ClientInfo clients[MAX_CLIENTS];
   int num_clients;
 
@@ -45,9 +44,8 @@ public:
     memset(clients, 0, sizeof(clients));
     num_clients = 0;
   }
-  void load(FILESYSTEM* _fs, const mesh::LocalIdentity& self_id);
+  void load(FILESYSTEM* _fs);
   void save(FILESYSTEM* _fs, bool (*filter)(ClientInfo*)=NULL);
-  bool clear();
 
   ClientInfo* getClient(const uint8_t* pubkey, int key_len);
   ClientInfo* putClient(const mesh::Identity& id, uint8_t init_perms);

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,11 @@ 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
+    // 162
 
     // sanitise bad pref values
     _prefs->rx_delay_base = constrain(_prefs->rx_delay_base, 0, 20.0f);
@@ -91,12 +77,11 @@ void CommonCLI::loadPrefsInt(FILESYSTEM* fs, const char* filename) {
     _prefs->direct_tx_delay_factor = constrain(_prefs->direct_tx_delay_factor, 0, 2.0f);
     _prefs->airtime_factor = constrain(_prefs->airtime_factor, 0, 9.0f);
     _prefs->freq = constrain(_prefs->freq, 400.0f, 2500.0f);
-    _prefs->bw = constrain(_prefs->bw, 7.8f, 500.0f);
-    _prefs->sf = constrain(_prefs->sf, 5, 12);
+    _prefs->bw = constrain(_prefs->bw, 62.5f, 500.0f);
+    _prefs->sf = constrain(_prefs->sf, 7, 12);
     _prefs->cr = constrain(_prefs->cr, 5, 8);
     _prefs->tx_power_dbm = constrain(_prefs->tx_power_dbm, 1, 30);
     _prefs->multi_acks = constrain(_prefs->multi_acks, 0, 1);
-    _prefs->adc_multiplier = constrain(_prefs->adc_multiplier, 0.0f, 10.0f);
 
     // sanitise bad bridge pref values
     _prefs->bridge_enabled = constrain(_prefs->bridge_enabled, 0, 1);
@@ -105,13 +90,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,17 +142,11 @@ 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
+    // 162
 
     file.close();
   }
@@ -202,13 +177,8 @@ uint8_t CommonCLI::buildAdvertData(uint8_t node_type, uint8_t* app_data) {
 void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, char* reply) {
     if (memcmp(command, "reboot", 6) == 0) {
       _board->reboot();  // doesn't return
-    } else if (memcmp(command, "clkreboot", 9) == 0) {
-      // Reset clock
-      getRTCClock()->setCurrentTime(1715770351);  // 15 May 2024, 8:50pm
-      _board->reboot();  // doesn't return
     } else if (memcmp(command, "advert", 6) == 0) {
-      // send flood advert
-      _callbacks->sendSelfAdvertisement(1500, true);  // longer delay, give CLI response time to be sent first
+      _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) {
       uint32_t curr = getRTCClock()->getCurrentTime();
@@ -256,12 +226,12 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
       strcpy(tmp, &command[10]);
       const char *parts[5];
       int num = mesh::Utils::parseTextParts(tmp, parts, 5);
-      float freq  = num > 0 ? strtof(parts[0], nullptr) : 0.0f;
-      float bw    = num > 1 ? strtof(parts[1], nullptr) : 0.0f;
+      float freq  = num > 0 ? atof(parts[0]) : 0.0f;
+      float bw    = num > 1 ? atof(parts[1]) : 0.0f;
       uint8_t sf  = num > 2 ? atoi(parts[2]) : 0;
       uint8_t cr  = num > 3 ? atoi(parts[3]) : 0;
       int temp_timeout_mins  = num > 4 ? atoi(parts[4]) : 0;
-      if (freq >= 300.0f && freq <= 2500.0f && sf >= 5 && sf <= 12 && cr >= 5 && cr <= 8 && bw >= 7.0f && bw <= 500.0f && temp_timeout_mins > 0) {
+      if (freq >= 300.0f && freq <= 2500.0f && sf >= 7 && sf <= 12 && cr >= 5 && cr <= 8 && bw >= 7.0f && bw <= 500.0f && temp_timeout_mins > 0) {
         _callbacks->applyTempRadioParams(freq, bw, sf, cr, temp_timeout_mins);
         sprintf(reply, "OK - temp params for %d mins", temp_timeout_mins);
       } else {
@@ -275,6 +245,29 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
     } else if (memcmp(command, "clear stats", 11) == 0) {
       _callbacks->clearStats();
       strcpy(reply, "(OK - stats reset)");
+    } else if (memcmp(command, "regeneratekeys ", 15) == 0) {
+      // Parse first hex digit
+      int value = 0;
+      if (command[15] >= '0' && command[15] <= '9')
+          value = (command[15] - '0') << 4;
+      else if (command[15] >= 'a' && command[15] <= 'f')
+          value = (command[15] - 'a' + 10) << 4;
+      else if (command[15] >= 'A' && command[15] <= 'F')
+          value = (command[15] - 'A' + 10) << 4;
+      // Parse second hex digit
+      if (command[16] >= '0' && command[16] <= '9')
+          value |= (command[16] - '0');
+      else if (command[16] >= 'a' && command[16] <= 'f')
+          value |= (command[16] - 'a' + 10);
+      else if (command[16] >= 'A' && command[16] <= 'F')
+          value |= (command[16] - 'A' + 10);
+      // regenerate key pair
+      MESH_DEBUG_PRINTLN("Generating new keypair");
+      if ((value > 0) && (value < 0xff)){
+        _callbacks->regenerateKeys(value);
+        _board->reboot();  // doesn't return
+      }
+      sprintf(reply, "> ERROR");
     /*
      * GET commands
      */
@@ -312,7 +305,7 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
       } else if (memcmp(config, "radio", 5) == 0) {
         char freq[16], bw[16];
         strcpy(freq, StrHelper::ftoa(_prefs->freq));
-        strcpy(bw, StrHelper::ftoa3(_prefs->bw));
+        strcpy(bw, StrHelper::ftoa(_prefs->bw));
         sprintf(reply, "> %s,%s,%d,%d", freq, bw, (uint32_t)_prefs->sf, (uint32_t)_prefs->cr);
       } else if (memcmp(config, "rxdelay", 7) == 0) {
         sprintf(reply, "> %s", StrHelper::ftoa(_prefs->rx_delay_base));
@@ -322,15 +315,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) {
@@ -367,42 +351,6 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
         sprintf(reply, "> %d", (uint32_t)_prefs->bridge_channel);
       } else if (memcmp(config, "bridge.secret", 13) == 0) {
         sprintf(reply, "> %s", _prefs->bridge_secret);
-#endif
-      } else if (memcmp(config, "adc.multiplier", 14) == 0) {
-        float adc_mult = _board->getAdcMultiplier();
-        if (adc_mult == 0.0f) {
-          strcpy(reply, "Error: unsupported by this board");
-        } else {
-          sprintf(reply, "> %.3f", adc_mult);
-        }
-      } else if (memcmp(config, "flood.advert.base", 17) == 0) {
-          sprintf(reply, "> %s", StrHelper::ftoa(_prefs->flood_advert_base));
-      // Power management commands
-      } else if (memcmp(config, "pwrmgt.support", 14) == 0) {
-#ifdef NRF52_POWER_MANAGEMENT
-        strcpy(reply, "> supported");
-#else
-        strcpy(reply, "> unsupported");
-#endif
-      } else if (memcmp(config, "pwrmgt.source", 13) == 0) {
-#ifdef NRF52_POWER_MANAGEMENT
-        strcpy(reply, _board->isExternalPowered() ? "> external" : "> battery");
-#else
-        strcpy(reply, "ERROR: Power management not supported");
-#endif
-      } else if (memcmp(config, "pwrmgt.bootreason", 17) == 0) {
-#ifdef NRF52_POWER_MANAGEMENT
-        sprintf(reply, "> Reset: %s; Shutdown: %s",
-          _board->getResetReasonString(_board->getResetReason()),
-          _board->getShutdownReasonString(_board->getShutdownReason()));
-#else
-        strcpy(reply, "ERROR: Power management not supported");
-#endif
-      } else if (memcmp(config, "pwrmgt.bootmv", 13) == 0) {
-#ifdef NRF52_POWER_MANAGEMENT
-        sprintf(reply, "> %u mV", _board->getBootVoltage());
-#else
-        strcpy(reply, "ERROR: Power management not supported");
 #endif
       } else {
         sprintf(reply, "??: %s", config);
@@ -434,8 +382,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 < 3) || (hours > 168)) {
-          strcpy(reply, "Error: interval range is 3-168 hours");
+        if ((hours > 0 && hours < 3) || (hours > 48)) {
+          strcpy(reply, "Error: interval range is 3-48 hours");
         } else {
           _prefs->flood_advert_interval = (uint8_t)(hours);
           _callbacks->updateFloodAdvertTimer();
@@ -456,27 +404,22 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
         StrHelper::strncpy(_prefs->guest_password, &config[15], sizeof(_prefs->guest_password));
         savePrefs();
         strcpy(reply, "OK");
-      } else if (memcmp(config, "prv.key ", 8) == 0) {
+      } else if (sender_timestamp == 0 &&
+                 memcmp(config, "prv.key ", 8) == 0) { // from serial command line only
         uint8_t prv_key[PRV_KEY_SIZE];
         bool success = mesh::Utils::fromHex(prv_key, PRV_KEY_SIZE, &config[8]);
-        // only allow rekey if key is valid
-        if (success && mesh::LocalIdentity::validatePrivateKey(prv_key)) {
+        if (success) {
           mesh::LocalIdentity new_id;
           new_id.readFrom(prv_key, PRV_KEY_SIZE);
           _callbacks->saveIdentity(new_id);
-          strcpy(reply, "OK, reboot to apply! New pubkey: ");
-          mesh::Utils::toHex(&reply[33], new_id.pub_key, PUB_KEY_SIZE);
-        } else {
-          strcpy(reply, "Error, bad 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");
+          strcpy(reply, "Error, invalid key");
         }
+      } else if (memcmp(config, "name ", 5) == 0) {
+        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();
@@ -485,11 +428,11 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
         strcpy(tmp, &config[6]);
         const char *parts[4];
         int num = mesh::Utils::parseTextParts(tmp, parts, 4);
-        float freq  = num > 0 ? strtof(parts[0], nullptr) : 0.0f;
-        float bw    = num > 1 ? strtof(parts[1], nullptr) : 0.0f;
+        float freq  = num > 0 ? atof(parts[0]) : 0.0f;
+        float bw    = num > 1 ? atof(parts[1]) : 0.0f;
         uint8_t sf  = num > 2 ? atoi(parts[2]) : 0;
         uint8_t cr  = num > 3 ? atoi(parts[3]) : 0;
-        if (freq >= 300.0f && freq <= 2500.0f && sf >= 5 && sf <= 12 && cr >= 5 && cr <= 8 && bw >= 7.0f && bw <= 500.0f) {
+        if (freq >= 300.0f && freq <= 2500.0f && sf >= 7 && sf <= 12 && cr >= 5 && cr <= 8 && bw >= 7.0f && bw <= 500.0f) {
           _prefs->sf = sf;
           _prefs->cr = cr;
           _prefs->freq = freq;
@@ -543,16 +486,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();
@@ -611,28 +544,6 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
         savePrefs();
         strcpy(reply, "OK");
 #endif
-      } else if (memcmp(config, "adc.multiplier ", 15) == 0) {
-        _prefs->adc_multiplier = atof(&config[15]);
-        if (_board->setAdcMultiplier(_prefs->adc_multiplier)) {
-          savePrefs();
-          if (_prefs->adc_multiplier == 0.0f) {
-            strcpy(reply, "OK - using default board multiplier");
-          } else {
-            sprintf(reply, "OK - multiplier set to %.3f", _prefs->adc_multiplier);
-          }
-        } else {
-          _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);
       }
@@ -657,7 +568,7 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
       int num = mesh::Utils::parseTextParts(tmp, parts, 2, ' ');
       const char *key = (num > 0) ? parts[0] : "";
       const char *value = (num > 1) ? parts[1] : "null";
-      if (_sensors->setSettingValue(key, value)) {
+      if (_sensors->setSettingByKey(key, value)) {
         strcpy(reply, "ok");
       } else {
         strcpy(reply, "can't find custom var");
@@ -689,7 +600,7 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
       }
 #if ENV_INCLUDE_GPS == 1
     } else if (memcmp(command, "gps on", 6) == 0) {
-      if (_sensors->setSettingValue("gps", "1")) {
+      if (_sensors->setSettingByKey("gps", "1")) {
         _prefs->gps_enabled = 1;
         savePrefs();
         strcpy(reply, "ok");
@@ -697,7 +608,7 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
         strcpy(reply, "gps toggle not found");
       }
     } else if (memcmp(command, "gps off", 7) == 0) {
-      if (_sensors->setSettingValue("gps", "0")) {
+      if (_sensors->setSettingByKey("gps", "0")) {
         _prefs->gps_enabled = 0;
         savePrefs();
         strcpy(reply, "ok");
@@ -763,20 +674,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");
@@ -789,12 +686,6 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
     } else if (sender_timestamp == 0 && memcmp(command, "log", 3) == 0) {
       _callbacks->dumpLogFile();
       strcpy(reply, "   EOF");
-    } else if (sender_timestamp == 0 && memcmp(command, "stats-packets", 13) == 0 && (command[13] == 0 || command[13] == ' ')) {
-      _callbacks->formatPacketStatsReply(reply);
-    } else if (sender_timestamp == 0 && memcmp(command, "stats-radio", 11) == 0 && (command[11] == 0 || command[11] == ' ')) {
-      _callbacks->formatRadioStatsReply(reply);
-    } else if (sender_timestamp == 0 && memcmp(command, "stats-core", 10) == 0 && (command[10] == 0 || command[10] == ' ')) {
-      _callbacks->formatStatsReply(reply);
     } else {
       strcpy(reply, "Unknown command");
     }

src/helpers/CommonCLI.h

@@ -3,7 +3,6 @@
 #include "Mesh.h"
 #include <helpers/IdentityStore.h>
 #include <helpers/SensorManager.h>
-#include <helpers/ClientACL.h>
 
 #if defined(WITH_RS232_BRIDGE) || defined(WITH_ESPNOW_BRIDGE)
 #define WITH_BRIDGE
@@ -36,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)
@@ -44,15 +42,10 @@ 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 {
@@ -62,7 +55,7 @@ public:
   virtual const char* getBuildDate() = 0;
   virtual const char* getRole() = 0;
   virtual bool formatFileSystem() = 0;
-  virtual void sendSelfAdvertisement(int delay_millis, bool flood) = 0;
+  virtual void sendSelfAdvertisement(int delay_millis) = 0;
   virtual void updateAdvertTimer() = 0;
   virtual void updateFloodAdvertTimer() = 0;
   virtual void setLoggingOn(bool enable) = 0;
@@ -73,12 +66,10 @@ public:
   virtual void removeNeighbor(const uint8_t* pubkey, int key_len) {
     // no op by default
   };
-  virtual void formatStatsReply(char *reply) = 0;
-  virtual void formatRadioStatsReply(char *reply) = 0;
-  virtual void formatPacketStatsReply(char *reply) = 0;
   virtual mesh::LocalIdentity& getSelfId() = 0;
   virtual void saveIdentity(const mesh::LocalIdentity& new_id) = 0;
   virtual void clearStats() = 0;
+  virtual void regenerateKeys(uint8_t byte) = 0; 
   virtual void applyTempRadioParams(float freq, float bw, uint8_t sf, uint8_t cr, int timeout_mins) = 0;
 
   virtual void setBridgeState(bool enable) {
@@ -96,7 +87,6 @@ class CommonCLI {
   CommonCLICallbacks* _callbacks;
   mesh::MainBoard* _board;
   SensorManager* _sensors;
-  ClientACL* _acl;
   char tmp[PRV_KEY_SIZE*2 + 4];
 
   mesh::RTCClock* getRTCClock() { return _rtc; }
@@ -104,8 +94,8 @@ class CommonCLI {
   void loadPrefsInt(FILESYSTEM* _fs, const char* filename);
 
 public:
-  CommonCLI(mesh::MainBoard& board, mesh::RTCClock& rtc, SensorManager& sensors, ClientACL& acl, NodePrefs* prefs, CommonCLICallbacks* callbacks)
-      : _board(&board), _rtc(&rtc), _sensors(&sensors), _acl(&acl), _prefs(prefs), _callbacks(callbacks) { }
+  CommonCLI(mesh::MainBoard& board, mesh::RTCClock& rtc, SensorManager& sensors, NodePrefs* prefs, CommonCLICallbacks* callbacks)
+      : _board(&board), _rtc(&rtc), _sensors(&sensors), _prefs(prefs), _callbacks(callbacks) { }
 
   void loadPrefs(FILESYSTEM* _fs);
   void savePrefs(FILESYSTEM* _fs);

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

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)

src/helpers/NRF52Board.cpp

@@ -1,321 +0,0 @@
-#if defined(NRF52_PLATFORM)
-#include "NRF52Board.h"
-
-#include <bluefruit.h>
-#include <nrf_soc.h>
-
-static BLEDfu bledfu;
-
-static void connect_callback(uint16_t conn_handle) {
-  (void)conn_handle;
-  MESH_DEBUG_PRINTLN("BLE client connected");
-}
-
-static void disconnect_callback(uint16_t conn_handle, uint8_t reason) {
-  (void)conn_handle;
-  (void)reason;
-
-  MESH_DEBUG_PRINTLN("BLE client disconnected");
-}
-
-void NRF52Board::begin() {
-  startup_reason = BD_STARTUP_NORMAL;
-}
-
-#ifdef NRF52_POWER_MANAGEMENT
-#include "nrf.h"
-
-// Power Management global variables
-uint32_t g_nrf52_reset_reason = 0;     // Reset/Startup reason
-uint8_t g_nrf52_shutdown_reason = 0;   // Shutdown reason
-
-// Early constructor - runs before SystemInit() clears the registers
-// Priority 101 ensures this runs before SystemInit (102) and before
-// any C++ static constructors (default 65535)
-static void __attribute__((constructor(101))) nrf52_early_reset_capture() {
-  g_nrf52_reset_reason = NRF_POWER->RESETREAS;
-  g_nrf52_shutdown_reason = NRF_POWER->GPREGRET2;
-}
-
-void NRF52Board::initPowerMgr() {
-  // Copy early-captured register values
-  reset_reason = g_nrf52_reset_reason;
-  shutdown_reason = g_nrf52_shutdown_reason;
-  boot_voltage_mv = 0;  // Will be set by checkBootVoltage()
-
-  // Clear registers for next boot
-  // Note: At this point SoftDevice may or may not be enabled
-  uint8_t sd_enabled = 0;
-  sd_softdevice_is_enabled(&sd_enabled);
-  if (sd_enabled) {
-    sd_power_reset_reason_clr(0xFFFFFFFF);
-    sd_power_gpregret_clr(1, 0xFF);
-  } else {
-    NRF_POWER->RESETREAS = 0xFFFFFFFF;  // Write 1s to clear
-    NRF_POWER->GPREGRET2 = 0;
-  }
-
-  // Log reset/shutdown info
-  if (shutdown_reason != SHUTDOWN_REASON_NONE) {
-    MESH_DEBUG_PRINTLN("PWRMGT: Reset = %s (0x%lX); Shutdown = %s (0x%02X)",
-      getResetReasonString(reset_reason), (unsigned long)reset_reason,
-      getShutdownReasonString(shutdown_reason), shutdown_reason);
-  } else {
-    MESH_DEBUG_PRINTLN("PWRMGT: Reset = %s (0x%lX)",
-      getResetReasonString(reset_reason), (unsigned long)reset_reason);
-  }
-}
-
-bool NRF52Board::isExternalPowered() {
-  // Check if SoftDevice is enabled before using its API
-  uint8_t sd_enabled = 0;
-  sd_softdevice_is_enabled(&sd_enabled);
-
-  if (sd_enabled) {
-    uint32_t usb_status;
-    sd_power_usbregstatus_get(&usb_status);
-    return (usb_status & POWER_USBREGSTATUS_VBUSDETECT_Msk) != 0;
-  } else {
-    return (NRF_POWER->USBREGSTATUS & POWER_USBREGSTATUS_VBUSDETECT_Msk) != 0;
-  }
-}
-
-const char* NRF52Board::getResetReasonString(uint32_t reason) {
-  if (reason & POWER_RESETREAS_RESETPIN_Msk) return "Reset Pin";
-  if (reason & POWER_RESETREAS_DOG_Msk) return "Watchdog";
-  if (reason & POWER_RESETREAS_SREQ_Msk) return "Soft Reset";
-  if (reason & POWER_RESETREAS_LOCKUP_Msk) return "CPU Lockup";
-  #ifdef POWER_RESETREAS_LPCOMP_Msk
-    if (reason & POWER_RESETREAS_LPCOMP_Msk) return "Wake from LPCOMP";
-  #endif
-  #ifdef POWER_RESETREAS_VBUS_Msk
-    if (reason & POWER_RESETREAS_VBUS_Msk) return "Wake from VBUS";
-  #endif
-  #ifdef POWER_RESETREAS_OFF_Msk
-    if (reason & POWER_RESETREAS_OFF_Msk) return "Wake from GPIO";
-  #endif
-  #ifdef POWER_RESETREAS_DIF_Msk
-    if (reason & POWER_RESETREAS_DIF_Msk) return "Debug Interface";
-  #endif
-  return "Cold Boot";
-}
-
-const char* NRF52Board::getShutdownReasonString(uint8_t reason) {
-  switch (reason) {
-    case SHUTDOWN_REASON_LOW_VOLTAGE:  return "Low Voltage";
-    case SHUTDOWN_REASON_USER:         return "User Request";
-    case SHUTDOWN_REASON_BOOT_PROTECT: return "Boot Protection";
-  }
-  return "Unknown";
-}
-
-bool NRF52Board::checkBootVoltage(const PowerMgtConfig* config) {
-  initPowerMgr();
-
-  // Read boot voltage
-  boot_voltage_mv = getBattMilliVolts();
-  
-  if (config->voltage_bootlock == 0) return true;  // Protection disabled
-
-  // Skip check if externally powered
-  if (isExternalPowered()) {
-    MESH_DEBUG_PRINTLN("PWRMGT: Boot check skipped (external power)");
-    boot_voltage_mv = getBattMilliVolts();
-    return true;
-  }
-
-  MESH_DEBUG_PRINTLN("PWRMGT: Boot voltage = %u mV (threshold = %u mV)",
-      boot_voltage_mv, config->voltage_bootlock);
-
-  // Only trigger shutdown if reading is valid (>1000mV) AND below threshold
-  // This prevents spurious shutdowns on ADC glitches or uninitialized reads
-  if (boot_voltage_mv > 1000 && boot_voltage_mv < config->voltage_bootlock) {
-    MESH_DEBUG_PRINTLN("PWRMGT: Boot voltage too low - entering protective shutdown");
-
-    initiateShutdown(SHUTDOWN_REASON_BOOT_PROTECT);
-    return false;  // Should never reach this
-  }
-
-  return true;
-}
-
-void NRF52Board::initiateShutdown(uint8_t reason) {
-  enterSystemOff(reason);
-}
-
-void NRF52Board::enterSystemOff(uint8_t reason) {
-  MESH_DEBUG_PRINTLN("PWRMGT: Entering SYSTEMOFF (%s)", getShutdownReasonString(reason));
-
-  // Record shutdown reason in GPREGRET2
-  uint8_t sd_enabled = 0;
-  sd_softdevice_is_enabled(&sd_enabled);
-  if (sd_enabled) {
-    sd_power_gpregret_clr(1, 0xFF);
-    sd_power_gpregret_set(1, reason);
-  } else {
-    NRF_POWER->GPREGRET2 = reason;
-  }
-
-  // Flush serial buffers
-  Serial.flush();
-  delay(100);
-
-  // Enter SYSTEMOFF
-  if (sd_enabled) {
-    uint32_t err = sd_power_system_off();
-    if (err == NRF_ERROR_SOFTDEVICE_NOT_ENABLED) {  //SoftDevice not enabled
-      sd_enabled = 0;
-    }
-  }
-
-  if (!sd_enabled) {
-    // SoftDevice not available; write directly to POWER->SYSTEMOFF
-    NRF_POWER->SYSTEMOFF = POWER_SYSTEMOFF_SYSTEMOFF_Enter;
-  }
-
-  // If we get here, something went wrong. Reset to recover.
-  NVIC_SystemReset();
-}
-
-void NRF52Board::configureVoltageWake(uint8_t ain_channel, uint8_t refsel) {
-  // LPCOMP is not managed by SoftDevice - direct register access required
-  // Halt and disable before reconfiguration
-  NRF_LPCOMP->TASKS_STOP = 1;
-  NRF_LPCOMP->ENABLE = LPCOMP_ENABLE_ENABLE_Disabled;
-
-  // Select analog input (AIN0-7 maps to PSEL 0-7)
-  NRF_LPCOMP->PSEL = ((uint32_t)ain_channel << LPCOMP_PSEL_PSEL_Pos) & LPCOMP_PSEL_PSEL_Msk;
-
-  // Reference: REFSEL (0-6=1/8..7/8, 7=ARef, 8-15=1/16..15/16)
-  NRF_LPCOMP->REFSEL = ((uint32_t)refsel << LPCOMP_REFSEL_REFSEL_Pos) & LPCOMP_REFSEL_REFSEL_Msk;
-
-  // Detect UP events (voltage rises above threshold for battery recovery)
-  NRF_LPCOMP->ANADETECT = LPCOMP_ANADETECT_ANADETECT_Up;
-
-  // Enable 50mV hysteresis for noise immunity
-  NRF_LPCOMP->HYST = LPCOMP_HYST_HYST_Hyst50mV;
-
-  // Clear stale events/interrupts before enabling wake
-  NRF_LPCOMP->EVENTS_READY = 0;
-  NRF_LPCOMP->EVENTS_DOWN = 0;
-  NRF_LPCOMP->EVENTS_UP = 0;
-  NRF_LPCOMP->EVENTS_CROSS = 0;
-
-  NRF_LPCOMP->INTENCLR = 0xFFFFFFFF;
-  NRF_LPCOMP->INTENSET = LPCOMP_INTENSET_UP_Msk;
-
-  // Enable LPCOMP
-  NRF_LPCOMP->ENABLE = LPCOMP_ENABLE_ENABLE_Enabled;
-  NRF_LPCOMP->TASKS_START = 1;
-
-  // Wait for comparator to settle before entering SYSTEMOFF
-  for (uint8_t i = 0; i < 20 && !NRF_LPCOMP->EVENTS_READY; i++) {
-    delayMicroseconds(50);
-  }
-
-  if (refsel == 7) {
-    MESH_DEBUG_PRINTLN("PWRMGT: LPCOMP wake configured (AIN%d, ref=ARef)", ain_channel);
-  } else if (refsel <= 6) {
-    MESH_DEBUG_PRINTLN("PWRMGT: LPCOMP wake configured (AIN%d, ref=%d/8 VDD)",
-      ain_channel, refsel + 1);
-  } else {
-    uint8_t ref_num = (uint8_t)((refsel - 8) * 2 + 1);
-    MESH_DEBUG_PRINTLN("PWRMGT: LPCOMP wake configured (AIN%d, ref=%d/16 VDD)",
-      ain_channel, ref_num);
-  }
-
-  // Configure VBUS (USB power) wake alongside LPCOMP
-  uint8_t sd_enabled = 0;
-  sd_softdevice_is_enabled(&sd_enabled);
-  if (sd_enabled) {
-    sd_power_usbdetected_enable(1);
-  } else {
-    NRF_POWER->EVENTS_USBDETECTED = 0;
-    NRF_POWER->INTENSET = POWER_INTENSET_USBDETECTED_Msk;
-  }
-
-  MESH_DEBUG_PRINTLN("PWRMGT: VBUS wake configured");
-}
-#endif
-
-void NRF52BoardDCDC::begin() {
-  NRF52Board::begin();
-
-  // Enable DC/DC converter for improved power efficiency
-  uint8_t sd_enabled = 0;
-  sd_softdevice_is_enabled(&sd_enabled);
-  if (sd_enabled) {
-    sd_power_dcdc_mode_set(NRF_POWER_DCDC_ENABLE);
-  } else {
-    NRF_POWER->DCDCEN = 1;
-  }
-}
-
-// Temperature from NRF52 MCU
-float NRF52Board::getMCUTemperature() {
-  NRF_TEMP->TASKS_START = 1; // Start temperature measurement
-
-  long startTime = millis();  
-  while (NRF_TEMP->EVENTS_DATARDY == 0) { // Wait for completion. Should complete in 50us
-    if(millis() - startTime > 5) {  // To wait 5ms just in case
-      NRF_TEMP->TASKS_STOP = 1;
-      return NAN;
-    }
-  }
-  
-  NRF_TEMP->EVENTS_DATARDY = 0; // Clear event flag
-
-  int32_t temp = NRF_TEMP->TEMP; // In 0.25 *C units
-  NRF_TEMP->TASKS_STOP = 1;
-
-  return temp * 0.25f; // Convert to *C
-}
-
-bool NRF52Board::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

src/helpers/NRF52Board.h

@@ -1,77 +0,0 @@
-#pragma once
-
-#include <Arduino.h>
-#include <MeshCore.h>
-
-#if defined(NRF52_PLATFORM)
-
-#ifdef NRF52_POWER_MANAGEMENT
-// Shutdown Reason Codes (stored in GPREGRET before SYSTEMOFF)
-#define SHUTDOWN_REASON_NONE          0x00
-#define SHUTDOWN_REASON_LOW_VOLTAGE   0x4C  // 'L' - Runtime low voltage threshold
-#define SHUTDOWN_REASON_USER          0x55  // 'U' - User requested powerOff()
-#define SHUTDOWN_REASON_BOOT_PROTECT  0x42  // 'B' - Boot voltage protection
-
-// Boards provide this struct with their hardware-specific settings and callbacks.
-struct PowerMgtConfig {
-  // LPCOMP wake configuration (for voltage recovery from SYSTEMOFF)
-  uint8_t lpcomp_ain_channel;       // AIN0-7 for voltage sensing pin
-  uint8_t lpcomp_refsel;            // REFSEL value: 0-6=1/8..7/8, 7=ARef, 8-15=1/16..15/16
-
-  // Boot protection voltage threshold (millivolts)
-  // Set to 0 to disable boot protection
-  uint16_t voltage_bootlock;
-};
-#endif
-
-class NRF52Board : public mesh::MainBoard {
-#ifdef NRF52_POWER_MANAGEMENT
-  void initPowerMgr();
-#endif
-
-protected:
-  uint8_t startup_reason;
-  char *ota_name;
-
-#ifdef NRF52_POWER_MANAGEMENT
-  uint32_t reset_reason;              // RESETREAS register value
-  uint8_t shutdown_reason;            // GPREGRET value (why we entered last SYSTEMOFF)
-  uint16_t boot_voltage_mv;           // Battery voltage at boot (millivolts)
-
-  bool checkBootVoltage(const PowerMgtConfig* config);
-  void enterSystemOff(uint8_t reason);
-  void configureVoltageWake(uint8_t ain_channel, uint8_t refsel);
-  virtual void initiateShutdown(uint8_t reason);
-#endif
-
-public:
-  NRF52Board(char *otaname) : ota_name(otaname) {}
-  virtual void begin();
-  virtual uint8_t getStartupReason() const override { return startup_reason; }
-  virtual float getMCUTemperature() override;
-  virtual void reboot() override { NVIC_SystemReset(); }
-  virtual bool startOTAUpdate(const char *id, char reply[]) override;
-
-#ifdef NRF52_POWER_MANAGEMENT
-  bool isExternalPowered() override;
-  uint16_t getBootVoltage() override { return boot_voltage_mv; }
-  virtual uint32_t getResetReason() const override { return reset_reason; }
-  uint8_t getShutdownReason() const override { return shutdown_reason; }
-  const char* getResetReasonString(uint32_t reason) override;
-  const char* getShutdownReasonString(uint8_t reason) override;
-#endif
-};
-
-/*
- * The NRF52 has an internal DC/DC regulator that allows increased efficiency
- * compared to the LDO regulator. For being able to use it, the module/board
- * needs to have the required inductors and and capacitors populated. If the
- * hardware requirements are met, this subclass can be used to enable the DC/DC
- * regulator.
- */
-class NRF52BoardDCDC : virtual public NRF52Board {
-public:
-  NRF52BoardDCDC() {}
-  virtual void begin() override;
-};
-#endif

src/helpers/RegionMap.cpp

@@ -1,329 +0,0 @@
-#include "RegionMap.h"
-#include <helpers/TxtDataHelpers.h>
-#include <SHA256.h>
-
-// helper class for region map exporter, we emulate Stream with a safe buffer writer.
-
-class BufStream : public Stream {
-public:
-  BufStream(char *buf, size_t max_len)
-    : _buf(buf), _max_len(max_len), _pos(0) {
-    if (_max_len > 0) _buf[0] = 0;
-  }
-
-  size_t write(uint8_t c) override {
-    if (_pos + 1 >= _max_len) return 0;
-    _buf[_pos++] = c;
-    _buf[_pos] = 0;
-    return 1;
-  }
-
-  size_t write(const uint8_t *buffer, size_t size) override {
-    size_t written = 0;
-    while (written < size) {
-      if (!write(buffer[written])) break;
-      written++;
-    }
-    return written;
-  }
-
-  int available() override { return 0; }
-  int read() override { return -1; }
-  int peek() override { return -1; }
-  void flush() override {}
-
-  size_t length() const { return _pos; }
-
-private:
-  char *_buf;
-  size_t _max_len;
-  size_t _pos;
-};
-
-
-RegionMap::RegionMap(TransportKeyStore& store) : _store(&store) {
-  next_id = 1; num_regions = 0; home_id = 0;
-  wildcard.id = wildcard.parent = 0;
-  wildcard.flags = 0;  // default behaviour, allow flood and direct
-  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 == '#' || (c >= '0' && c <= '9') || c >= 'A';
-}
-
-static const char* skip_hash(const char* name) {
-  return *name == '#' ? name + 1 : name;
-}
-
-static File openWrite(FILESYSTEM* _fs, const char* filename) {
-  #if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
-    _fs->remove(filename);
-    return _fs->open(filename, FILE_O_WRITE);
-  #elif defined(RP2040_PLATFORM)
-    return _fs->open(filename, "w");
-  #else
-    return _fs->open(filename, "w", true);
-  #endif
-}
-
-bool RegionMap::load(FILESYSTEM* _fs, const char* path) {
-  if (_fs->exists(path ? path : "/regions2")) {
-  #if defined(RP2040_PLATFORM)
-    File file = _fs->open(path ? path : "/regions2", "r");
-  #else
-    File file = _fs->open(path ? path : "/regions2");
-  #endif
-
-    if (file) {
-      uint8_t pad[128];
-
-      num_regions = 0; next_id = 1; home_id = 0;
-
-      bool success = file.read(pad, 5) == 5;  // reserved header
-      success = success && file.read((uint8_t *) &home_id, sizeof(home_id)) == sizeof(home_id);
-      success = success && file.read((uint8_t *) &wildcard.flags, sizeof(wildcard.flags)) == sizeof(wildcard.flags);
-      success = success && file.read((uint8_t *) &next_id, sizeof(next_id)) == sizeof(next_id);
-
-      if (success) {
-        while (num_regions < MAX_REGION_ENTRIES) {
-          auto r = &regions[num_regions];
-
-          success = file.read((uint8_t *) &r->id, sizeof(r->id)) == sizeof(r->id);
-          success = success && file.read((uint8_t *) &r->parent, sizeof(r->parent)) == sizeof(r->parent);
-          success = success && file.read((uint8_t *) r->name, sizeof(r->name)) == sizeof(r->name);
-          success = success && file.read((uint8_t *) &r->flags, sizeof(r->flags)) == sizeof(r->flags);
-          success = success && file.read(pad, sizeof(pad)) == sizeof(pad);
-
-          if (!success) break; // EOF
-
-          if (r->id >= next_id) {    // make sure next_id is valid
-            next_id = r->id + 1;
-          }
-          num_regions++;
-        }
-      }
-      file.close();
-      return true;
-    }
-  }
-  return false;  // failed
-}
-
-bool RegionMap::save(FILESYSTEM* _fs, const char* path) {
-  File file = openWrite(_fs, path ? path : "/regions2");
-  if (file) {
-    uint8_t pad[128];
-    memset(pad, 0, sizeof(pad));
-
-    bool success = file.write(pad, 5) == 5;  // reserved header
-    success = success && file.write((uint8_t *) &home_id, sizeof(home_id)) == sizeof(home_id);
-    success = success && file.write((uint8_t *) &wildcard.flags, sizeof(wildcard.flags)) == sizeof(wildcard.flags);
-    success = success && file.write((uint8_t *) &next_id, sizeof(next_id)) == sizeof(next_id);
-
-    if (success) {
-      for (int i = 0; i < num_regions; i++) {
-        auto r = &regions[i];
-
-        success = file.write((uint8_t *) &r->id, sizeof(r->id)) == sizeof(r->id);
-        success = success && file.write((uint8_t *) &r->parent, sizeof(r->parent)) == sizeof(r->parent);
-        success = success && file.write((uint8_t *) r->name, sizeof(r->name)) == sizeof(r->name);
-        success = success && file.write((uint8_t *) &r->flags, sizeof(r->flags)) == sizeof(r->flags);
-        success = success && file.write(pad, sizeof(pad)) == sizeof(pad);
-        if (!success) break; // write failed
-      }
-    }
-    file.close();
-    return true;
-  }
-  return false;  // failed
-}
-
-RegionEntry* RegionMap::putRegion(const char* name, uint16_t parent_id, uint16_t id) {
-  const char* sp = name;  // check for illegal name chars
-  while (*sp) {
-    if (!is_name_char(*sp)) return NULL;   // error
-    sp++;
-  }
-
-  auto region = findByName(name);
-  if (region) {
-    if (region->id == parent_id) return NULL;   // ERROR: invalid parent!
-
-    region->parent = parent_id;   // re-parent / move this region in the hierarchy
-  } else {
-    if (id == 0 && num_regions >= MAX_REGION_ENTRIES) return NULL;  // full!
-
-    region = &regions[num_regions++];   // alloc new RegionEntry
-    region->flags = REGION_DENY_FLOOD;     // DENY by default
-    region->id = id == 0 ? next_id++ : id;
-    StrHelper::strncpy(region->name, name, sizeof(region->name));
-    region->parent = parent_id;
-  }
-  return region;
-}
-
-RegionEntry* RegionMap::findMatch(mesh::Packet* packet, uint8_t mask) {
-  for (int i = 0; i < num_regions; i++) {
-    auto region = &regions[i];
-    if ((region->flags & mask) == 0) {   // does region allow this? (per 'mask' param)
-      TransportKey keys[4];
-      int num;
-      if (region->name[0] == '$') {   // private region
-        num = _store->loadKeysFor(region->id, keys, 4);
-      } else if (region->name[0] == '#') {   // auto hashtag region
-        _store->getAutoKeyFor(region->id, region->name, keys[0]);
-        num = 1;
-      } else {   // new: implicit auto hashtag region
-        char tmp[sizeof(region->name)];
-        tmp[0] = '#';
-        strcpy(&tmp[1], region->name);
-        _store->getAutoKeyFor(region->id, tmp, keys[0]);
-        num = 1;
-      }
-      for (int j = 0; j < num; j++) {
-        uint16_t code = keys[j].calcTransportCode(packet);
-        if (packet->transport_codes[0] == code) {   // a match!!
-          return region;
-        }
-      }
-    }
-  }
-  return NULL;  // no matches
-}
-
-RegionEntry* RegionMap::findByName(const char* name) {
-  if (strcmp(name, "*") == 0) return &wildcard;
-
-  if (*name == '#') { name++; }  // ignore the '#' when matching by name
-  for (int i = 0; i < num_regions; i++) {
-    auto region = &regions[i];
-    if (strcmp(name, skip_hash(region->name)) == 0) return region;
-  }
-  return NULL;  // not found
-}
-
-RegionEntry* RegionMap::findByNamePrefix(const char* prefix) {
-  if (strcmp(prefix, "*") == 0) return &wildcard;
-
-  if (*prefix == '#') { prefix++; }  // ignore the '#' when matching by name
-  RegionEntry* partial = NULL;
-  for (int i = 0; i < num_regions; i++) {
-    auto region = &regions[i];
-    if (strcmp(prefix, skip_hash(region->name)) == 0) return region;  // is a complete match, preference this one
-    if (memcmp(prefix, skip_hash(region->name), strlen(prefix)) == 0) {
-      partial = region;
-    }
-  }
-  return partial;
-}
-
-RegionEntry* RegionMap::findById(uint16_t id) {
-  if (id == 0) return &wildcard;   // special root Region
-
-  for (int i = 0; i < num_regions; i++) {
-    auto region = &regions[i];
-    if (region->id == id) return region;
-  }
-  return NULL;  // not found
-}
-
-RegionEntry* RegionMap::getHomeRegion() {
-  return findById(home_id);
-}
-
-void RegionMap::setHomeRegion(const RegionEntry* home) {
-  home_id = home ? home->id : 0;
-}
-
-bool RegionMap::removeRegion(const RegionEntry& region) {
-  if (region.id == 0) return false;  // failed (cannot remove the wildcard Region)
-
-  int i;     // first check region has no child regions
-  for (i = 0; i < num_regions; i++) {
-    if (regions[i].parent == region.id) return false;   // failed (must remove child Regions first)
-  }
-
-  i = 0;
-  while (i < num_regions) {
-    if (region.id == regions[i].id) break;
-    i++;
-  }
-  if (i >= num_regions) return false;  // failed (not found)
-
-  num_regions--;    // remove from regions array
-  while (i < num_regions) {
-    regions[i] = regions[i + 1];
-    i++;
-  }
-  return true;  // success
-}
-
-bool RegionMap::clear() {
-  num_regions = 0;
-  return true;  // success
-}
-
-void RegionMap::printChildRegions(int indent, const RegionEntry* parent, Stream& out) const {
-  for (int i = 0; i < indent; i++) {
-    out.print(' ');
-  }
-
-  if (parent->flags & REGION_DENY_FLOOD) {
-    out.printf("%s%s\n", skip_hash(parent->name), parent->id == home_id ? "^" : "");
-  } else {
-    out.printf("%s%s F\n", skip_hash(parent->name), parent->id == home_id ? "^" : "");
-  }
-
-  for (int i = 0; i < num_regions; i++) {
-    auto r = &regions[i];
-    if (r->parent == parent->id) {
-      printChildRegions(indent + 1, r, out);
-    }
-  }
-}
-
-void RegionMap::exportTo(Stream& out) const {
-  printChildRegions(0, &wildcard, out);   // recursive
-}
-
-size_t RegionMap::exportTo(char *dest, size_t max_len) const {
-  if (!dest || max_len == 0) return 0;
-
-  BufStream bs(dest, max_len);
-  exportTo(bs);              // ← reuse existing logic
-  return bs.length();
-}
-
-int RegionMap::exportNamesTo(char *dest, int max_len, uint8_t mask, bool invert) {
-  char *dp = dest;
-  
-  // Check wildcard region
-  bool wildcard_matches = invert ? (wildcard.flags & mask) : !(wildcard.flags & mask);
-  if (wildcard_matches) {
-    *dp++ = '*';
-    *dp++ = ',';
-  }
-
-    for (int i = 0; i < num_regions; i++) {
-    auto region = &regions[i];
-    
-    // Check if region matches the filter criteria
-    bool region_matches = invert ? (region->flags & mask) : !(region->flags & mask);
-    
-    if (region_matches) {
-      int len = strlen(skip_hash(region->name));
-      if ((dp - dest) + len + 2 < max_len) {   // only append if name will fit
-        memcpy(dp, skip_hash(region->name), len);
-        dp += len;
-        *dp++ = ',';
-      }
-    }
-  }
-
-  if (dp > dest) { dp--; }   // don't include trailing comma
-
-  *dp = 0;  // set null terminator
-  return dp - dest;   // return length
-}

src/helpers/RegionMap.h

@@ -1,57 +0,0 @@
-#pragma once
-
-#include <Arduino.h>   // needed for PlatformIO
-#include <Packet.h>
-#include "TransportKeyStore.h"
-
-#ifndef MAX_REGION_ENTRIES
-  #define MAX_REGION_ENTRIES  32
-#endif
-
-#define REGION_DENY_FLOOD   0x01
-#define REGION_DENY_DIRECT  0x02   // reserved for future
-
-struct RegionEntry {
-  uint16_t id;
-  uint16_t parent;
-  uint8_t flags;
-  char name[31];
-};
-
-class RegionMap {
-  TransportKeyStore* _store;
-  uint16_t next_id, home_id;
-  uint16_t num_regions;
-  RegionEntry regions[MAX_REGION_ENTRIES];
-  RegionEntry wildcard;
-
-  void printChildRegions(int indent, const RegionEntry* parent, Stream& out) const;
-
-public:
-  RegionMap(TransportKeyStore& store);
-
-  static bool is_name_char(uint8_t c);
-
-  bool load(FILESYSTEM* _fs, const char* path=NULL);
-  bool save(FILESYSTEM* _fs, const char* path=NULL);
-
-  RegionEntry* putRegion(const char* name, uint16_t parent_id, uint16_t id = 0);
-  RegionEntry* findMatch(mesh::Packet* packet, uint8_t mask);
-  RegionEntry& getWildcard() { return wildcard; }
-  RegionEntry* findByName(const char* name);
-  RegionEntry* findByNamePrefix(const char* prefix);
-  RegionEntry* findById(uint16_t id);
-  RegionEntry* getHomeRegion();   // NOTE: can be NULL
-  void setHomeRegion(const RegionEntry* home);
-  bool removeRegion(const RegionEntry& region);
-  bool clear();
-  void resetFrom(const RegionMap& src) { num_regions = 0; next_id = src.next_id; }
-  int getCount() const { return num_regions; }
-  const RegionEntry* getByIdx(int i) const { return &regions[i]; }
-  const RegionEntry* getRoot() const { return &wildcard; }
-  int exportNamesTo(char *dest, int max_len, uint8_t mask, bool invert = false);
-
-  void    exportTo(Stream& out) const;
-  size_t  exportTo(char *dest, size_t max_len) const;
- 
-};

src/helpers/SensorManager.h

@@ -34,4 +34,14 @@ public:
     }
     return NULL;
   }
+
+  bool setSettingByKey(const char* key, const char* value) {
+    int num = getNumSettings();
+    for (int i = 0; i < num; i++) {
+      if (strcmp(getSettingName(i), key) == 0) {
+        return setSettingValue(key, value);
+      }
+    }
+    return false;
+  }
 };

src/helpers/StatsFormatHelper.h

@@ -1,55 +0,0 @@
-#pragma once
-
-#include "Mesh.h"
-
-class StatsFormatHelper {
-public:
-  static void formatCoreStats(char* reply, 
-                             mesh::MainBoard& board, 
-                             mesh::MillisecondClock& ms, 
-                             uint16_t err_flags,
-                             mesh::PacketManager* mgr) {
-    sprintf(reply, 
-      "{\"battery_mv\":%u,\"uptime_secs\":%u,\"errors\":%u,\"queue_len\":%u}",
-      board.getBattMilliVolts(),
-      ms.getMillis() / 1000,
-      err_flags,
-      mgr->getOutboundCount(0xFFFFFFFF)
-    );
-  }
-
-  template<typename RadioDriverType>
-  static void formatRadioStats(char* reply,
-                              mesh::Radio* radio,
-                              RadioDriverType& driver,
-                              uint32_t total_air_time_ms,
-                              uint32_t total_rx_air_time_ms) {
-    sprintf(reply, 
-      "{\"noise_floor\":%d,\"last_rssi\":%d,\"last_snr\":%.2f,\"tx_air_secs\":%u,\"rx_air_secs\":%u}",
-      (int16_t)radio->getNoiseFloor(),
-      (int16_t)driver.getLastRSSI(),
-      driver.getLastSNR(),
-      total_air_time_ms / 1000,
-      total_rx_air_time_ms / 1000
-    );
-  }
-
-  template<typename RadioDriverType>
-  static void formatPacketStats(char* reply,
-                               RadioDriverType& driver,
-                               uint32_t n_sent_flood,
-                               uint32_t n_sent_direct,
-                               uint32_t n_recv_flood,
-                               uint32_t n_recv_direct) {
-    sprintf(reply, 
-      "{\"recv\":%u,\"sent\":%u,\"flood_tx\":%u,\"direct_tx\":%u,\"flood_rx\":%u,\"direct_rx\":%u,\"recv_errors\":%u}",
-      driver.getPacketsRecv(),
-      driver.getPacketsSent(),
-      n_sent_flood,
-      n_sent_direct,
-      n_recv_flood,
-      n_recv_direct,
-      driver.getPacketsRecvErrors()
-    );
-  }
-};

src/helpers/TransportKeyStore.cpp

@@ -1,92 +0,0 @@
-#include "TransportKeyStore.h"
-#include <SHA256.h>
-
-uint16_t TransportKey::calcTransportCode(const mesh::Packet* packet) const {
-  uint16_t code;
-  SHA256 sha;
-  sha.resetHMAC(key, sizeof(key));
-  uint8_t type = packet->getPayloadType();
-  sha.update(&type, 1);
-  sha.update(packet->payload, packet->payload_len);
-  sha.finalizeHMAC(key, sizeof(key), &code, 2);
-  if (code == 0) {     // reserve codes 0000 and FFFF
-    code++;
-  } else if (code == 0xFFFF) {
-    code--;
-  }
-  return code;
-}
-
-bool TransportKey::isNull() const {
-  for (int i = 0; i < sizeof(key); i++) {
-    if (key[i]) return false;
-  }
-  return true;  // key is all zeroes
-}
-
-void TransportKeyStore::putCache(uint16_t id, const TransportKey& key) {
-  if (num_cache < MAX_TKS_ENTRIES) {
-    cache_ids[num_cache] = id;
-    cache_keys[num_cache] = key;
-    num_cache++;
-  } else {
-    // TODO: evict oldest cache entry
-  }
-}
-
-void TransportKeyStore::getAutoKeyFor(uint16_t id, const char* name, TransportKey& dest) {
-  for (int i = 0; i < num_cache; i++) {  // first, check cache
-    if (cache_ids[i] == id) {   // cache hit!
-      dest = cache_keys[i];
-      return;
-    }
-  }
-  // calc key for publicly-known hashtag region name
-  SHA256 sha;
-  sha.update(name, strlen(name));
-  sha.finalize(&dest.key, sizeof(dest.key));
-
-  putCache(id, dest);
-}
-
-int TransportKeyStore::loadKeysFor(uint16_t id, TransportKey keys[], int max_num) {
-  int n = 0;
-  for (int i = 0; i < num_cache && n < max_num; i++) {  // first, check cache
-    if (cache_ids[i] == id) {
-      keys[n++] = cache_keys[i];
-    }
-  }
-  if (n > 0) return n;   // cache hit!
-
-  // TODO:  retrieve from difficult-to-copy keystore
-
-  // store in cache (if room)
-  for (int i = 0; i < n; i++) {
-    putCache(id, keys[i]);
-  }
-  return n;
-}
-
-bool TransportKeyStore::saveKeysFor(uint16_t id, const TransportKey keys[], int num) {
-  invalidateCache();
-
-  // TODO: update hardware keystore
-
-  return false;  // failed
-}
-
-bool TransportKeyStore::removeKeys(uint16_t id) {
-  invalidateCache();
-
-  // TODO: remove from hardware keystore
-
-  return false;  // failed
-}
-
-bool TransportKeyStore::clear() {
-  invalidateCache();
-
-  // TODO: clear hardware keystore
-
-  return false;  // failed
-}

src/helpers/TransportKeyStore.h

@@ -1,31 +0,0 @@
-#pragma once
-
-#include <Arduino.h>   // needed for PlatformIO
-#include <Packet.h>
-#include <helpers/IdentityStore.h>
-
-struct TransportKey {
-  uint8_t key[16];
-
-  uint16_t calcTransportCode(const mesh::Packet* packet) const;
-  bool isNull() const;
-};
-
-#define MAX_TKS_ENTRIES   16
-
-class TransportKeyStore {
-  uint16_t     cache_ids[MAX_TKS_ENTRIES];
-  TransportKey cache_keys[MAX_TKS_ENTRIES];
-  int num_cache;
-
-  void putCache(uint16_t id, const TransportKey& key);
-  void invalidateCache() { num_cache = 0; }
-
-public:
-  TransportKeyStore() { num_cache = 0; }
-  void getAutoKeyFor(uint16_t id, const char* name, TransportKey& dest);
-  int loadKeysFor(uint16_t id, TransportKey keys[], int max_num);
-  bool saveKeysFor(uint16_t id, const TransportKey keys[], int num);
-  bool removeKeys(uint16_t id);
-  bool clear();
-};

src/helpers/TxtDataHelpers.cpp

@@ -19,13 +19,6 @@ void StrHelper::strzcpy(char* dest, const char* src, size_t buf_sz) {
   }
 }
 
-bool StrHelper::isBlank(const char* str) {
-  while (*str) {
-    if (*str++ != ' ') return false;
-  }
-  return true;
-}
-
 #include <Arduino.h>
 
 union int32_Float_t 
@@ -139,36 +132,3 @@ const char* StrHelper::ftoa(float f) {
   }
   return tmp;
 }
-
-const char* StrHelper::ftoa3(float f) {
-  static char s[16];
-  int v = (int)(f * 1000.0f + (f >= 0 ? 0.5f : -0.5f)); // rounded ×1000
-  int w = v / 1000;                                     // whole
-  int d = abs(v % 1000);                                // decimals
-  snprintf(s, sizeof(s), "%d.%03d", w, d);
-  for (int i = strlen(s) - 1; i > 0 && s[i] == '0'; i--)
-      s[i] = 0;
-  int L = strlen(s);
-  if (s[L - 1] == '.') s[L - 1] = 0;
-  return s;
-}
-
-uint32_t StrHelper::fromHex(const char* src) {
-  uint32_t n = 0;
-  while (*src) {
-    if (*src >= '0' && *src <= '9') {
-      n <<= 4;
-      n |= (*src - '0');
-    } else if (*src >= 'A' && *src <= 'F') {
-      n <<= 4;
-      n |= (*src - 'A' + 10);
-    } else if (*src >= 'a' && *src <= 'f') {
-      n <<= 4;
-      n |= (*src - 'a' + 10);
-    } else {
-      break;  // non-hex char encountered, stop parsing
-    }
-    src++;
-  }
-  return n;
-}

src/helpers/TxtDataHelpers.h

@@ -12,7 +12,4 @@ public:
   static void strncpy(char* dest, const char* src, size_t buf_sz);
   static void strzcpy(char* dest, const char* src, size_t buf_sz);   // pads with trailing nulls
   static const char* ftoa(float f);
-  static const char* ftoa3(float f); //Converts float to string with 3 decimal places
-  static bool isBlank(const char* str);
-  static uint32_t fromHex(const char* src);
 };

src/helpers/bridges/RS232Bridge.cpp

@@ -16,8 +16,7 @@ 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
-  ((Uart *)_serial)->setPins(WITH_RS232_BRIDGE_RX, WITH_RS232_BRIDGE_TX);
+  ((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 +121,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;
     }
 

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)
  */

src/helpers/esp32/SerialBLEInterface.cpp

@@ -9,21 +9,11 @@
 
 #define ADVERT_RESTART_DELAY  1000   // millis
 
-void SerialBLEInterface::begin(const char* prefix, char* name, uint32_t pin_code) {
+void SerialBLEInterface::begin(const char* device_name, uint32_t pin_code) {
   _pin_code = pin_code;
 
-  if (strcmp(name, "@@MAC") == 0) {
-    uint8_t addr[8];
-    memset(addr, 0, sizeof(addr));
-    esp_efuse_mac_get_default(addr);
-    sprintf(name, "%02X%02X%02X%02X%02X%02X",    // modify (IN-OUT param)
-          addr[5], addr[4], addr[3], addr[2], addr[1], addr[0]);
-  }
-  char dev_name[32+16];
-  sprintf(dev_name, "%s%s", prefix, name);
-
   // Create the BLE Device
-  BLEDevice::init(dev_name);
+  BLEDevice::init(device_name);
   BLEDevice::setSecurityCallbacks(this);
   BLEDevice::setMTU(MAX_FRAME_SIZE);
 

src/helpers/esp32/SerialBLEInterface.h

@@ -61,13 +61,7 @@ public:
     send_queue_len = recv_queue_len = 0;
   }
 
-  /**
-   * init the BLE interface.
-   * @param prefix   a prefix for the device name
-   * @param name  IN/OUT - a name for the device (combined with prefix). If "@@MAC", is modified and returned
-   * @param pin_code   the BLE security pin
-   */
-  void begin(const char* prefix, char* name, uint32_t pin_code);
+  void begin(const char* device_name, uint32_t pin_code);
 
   // BaseSerialInterface methods
   void enable() override;

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

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

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;

src/helpers/nrf52/SerialBLEInterface.cpp

@@ -1,397 +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");
-    }
+  BLE_DEBUG_PRINTLN("SerialBLEInterface: onSecured");
+  if(instance){
+    instance->_isDeviceConnected = true;
+    // no need to stop advertising on connect, as the ble stack does this automatically
   }
 }
 
-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::begin(const char* device_name, uint32_t pin_code) {
 
-void SerialBLEInterface::onPairingComplete(uint16_t connection_handle, uint8_t auth_status) {
-  BLE_DEBUG_PRINTLN("SerialBLEInterface: pairing complete handle=0x%04X status=%u", connection_handle, auth_status);
-  if (instance) {
-    if (instance->isValidConnection(connection_handle)) {
-      if (auth_status == BLE_GAP_SEC_STATUS_SUCCESS) {
-        BLE_DEBUG_PRINTLN("SerialBLEInterface: pairing successful");
-      } else {
-        BLE_DEBUG_PRINTLN("SerialBLEInterface: pairing failed, disconnecting");
-        instance->disconnect();
-      }
-    } else {
-      BLE_DEBUG_PRINTLN("onPairingComplete: ignoring stale callback");
-    }
-  }
-}
-
-void SerialBLEInterface::onBLEEvent(ble_evt_t* evt) {
-  if (!instance) return;
-  
-  if (evt->header.evt_id == BLE_GAP_EVT_CONN_PARAM_UPDATE_REQUEST) {
-    uint16_t conn_handle = evt->evt.gap_evt.conn_handle;
-    if (instance->isValidConnection(conn_handle)) {
-      BLE_DEBUG_PRINTLN("CONN_PARAM_UPDATE_REQUEST: handle=0x%04X, min_interval=%u, max_interval=%u, latency=%u, timeout=%u",
-                       conn_handle,
-                       evt->evt.gap_evt.params.conn_param_update_request.conn_params.min_conn_interval,
-                       evt->evt.gap_evt.params.conn_param_update_request.conn_params.max_conn_interval,
-                       evt->evt.gap_evt.params.conn_param_update_request.conn_params.slave_latency,
-                       evt->evt.gap_evt.params.conn_param_update_request.conn_params.conn_sup_timeout);
-      
-      uint32_t err_code = sd_ble_gap_conn_param_update(conn_handle, NULL);
-      if (err_code == NRF_SUCCESS) {
-        BLE_DEBUG_PRINTLN("Accepted CONN_PARAM_UPDATE_REQUEST (using PPCP)");
-      } else {
-        BLE_DEBUG_PRINTLN("ERROR: Failed to accept CONN_PARAM_UPDATE_REQUEST: 0x%08X", err_code);
-      }
-    } else {
-      BLE_DEBUG_PRINTLN("CONN_PARAM_UPDATE_REQUEST: ignoring stale callback for handle=0x%04X", conn_handle);
-    }
-  }
-}
-
-void SerialBLEInterface::begin(const char* prefix, char* name, uint32_t pin_code) {
   instance = this;
 
   char charpin[20];
-  snprintf(charpin, sizeof(charpin), "%lu", (unsigned long)pin_code);
-  
-  // If we want to control BLE LED ourselves, uncomment this:
-  // Bluefruit.autoConnLed(false);
-  Bluefruit.configPrphBandwidth(BANDWIDTH_MAX);
-  Bluefruit.begin();
- 
-  char dev_name[32+16];
-  if (strcmp(name, "@@MAC") == 0) {
-    ble_gap_addr_t addr;
-    if (sd_ble_gap_addr_get(&addr) == NRF_SUCCESS) {
-      sprintf(name, "%02X%02X%02X%02X%02X%02X",    // modify (IN-OUT param)
-          addr.addr[5], addr.addr[4], addr.addr[3], addr.addr[2], addr.addr[1], addr.addr[0]);
-    }
-  }
-  sprintf(dev_name, "%s%s", prefix, name);
+  sprintf(charpin, "%d", pin_code);
 
-  // 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.configPrphBandwidth(BANDWIDTH_MAX);
+  Bluefruit.configPrphConn(250, BLE_GAP_EVENT_LENGTH_MIN, 16, 16);  // increase MTU
   Bluefruit.setTxPower(BLE_TX_POWER);
-  Bluefruit.setName(dev_name);
+  Bluefruit.begin();
+  Bluefruit.setName(device_name);
 
   Bluefruit.Security.setMITM(true);
   Bluefruit.Security.setPIN(charpin);
-  Bluefruit.Security.setIOCaps(true, false, false);
-  Bluefruit.Security.setPairPasskeyCallback(onPairingPasskey);
-  Bluefruit.Security.setPairCompleteCallback(onPairingComplete);
 
   Bluefruit.Periph.setConnectCallback(onConnect);
   Bluefruit.Periph.setDisconnectCallback(onDisconnect);
   Bluefruit.Security.setSecuredCallback(onSecured);
 
-  Bluefruit.setEventCallback(onBLEEvent);
+  // To be consistent OTA DFU should be added first if it exists
+  //bledfu.begin();
 
+  // Configure and start the BLE Uart service
   bleuart.setPermission(SECMODE_ENC_WITH_MITM, SECMODE_ENC_WITH_MITM);
   bleuart.begin();
-  bleuart.setRxCallback(onBleUartRX);
+  
+}
 
+void SerialBLEInterface::startAdv() {
+
+  BLE_DEBUG_PRINTLN("SerialBLEInterface: starting advertising");
+  
+  // clean restart if already advertising
+  if(Bluefruit.Advertising.isRunning()){
+    BLE_DEBUG_PRINTLN("SerialBLEInterface: already advertising, stopping to allow clean restart");
+    Bluefruit.Advertising.stop();
+  }
+
+  Bluefruit.Advertising.clearData(); // clear advertising data
+  Bluefruit.ScanResponse.clearData(); // clear scan response data
+  
+  // Advertising packet
   Bluefruit.Advertising.addFlags(BLE_GAP_ADV_FLAGS_LE_ONLY_GENERAL_DISC_MODE);
   Bluefruit.Advertising.addTxPower();
+  
+  // Include the BLE UART (AKA 'NUS') 128-bit UUID
   Bluefruit.Advertising.addService(bleuart);
 
+  // Secondary Scan Response packet (optional)
+  // Since there is no room for 'Name' in Advertising packet
   Bluefruit.ScanResponse.addName();
 
-  Bluefruit.Advertising.setInterval(BLE_ADV_INTERVAL_MIN, BLE_ADV_INTERVAL_MAX);
-  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;
 }

src/helpers/nrf52/SerialBLEInterface.h

@@ -11,60 +11,41 @@ class SerialBLEInterface : public BaseSerialInterface {
   BLEUart bleuart;
   bool _isEnabled;
   bool _isDeviceConnected;
-  uint16_t _conn_handle;
-  unsigned long _last_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;
   }
 
-  /**
-   * init the BLE interface.
-   * @param prefix   a prefix for the device name
-   * @param name  IN/OUT - a name for the device (combined with prefix). If "@@MAC", is modified and returned
-   * @param pin_code   the BLE security pin
-   */
-  void begin(const char* prefix, char* name, uint32_t pin_code);
+  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;

src/helpers/radiolib/CustomLR1110.h

@@ -3,26 +3,137 @@
 #include <RadioLib.h>
 #include "MeshCore.h"
 
+#define LR1110_IRQ_HAS_PREAMBLE                     0b0000000100  //  4     4     valid LoRa header received
+#define LR1110_IRQ_HEADER_VALID                     0b0000010000  //  4     4     valid LoRa header received
+
 class CustomLR1110 : public LR1110 {
   public:
     CustomLR1110(Module *mod) : LR1110(mod) { }
 
+    uint8_t shiftCount = 0;
+
+    int16_t standby() override {
+      // tx resets the shift, standby is called on tx completion
+      // this might not actually be what resets it, but it seems to work
+      // more investigation needed
+      this->shiftCount = 0;
+      return LR1110::standby();
+    }
+
     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
-        // 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
-        MESH_DEBUG_PRINTLN("LR1110: got header err, calling standby()");
-        standby();
+      if (len == 0) {
+        uint32_t irq = getIrqStatus();
+        if (irq & RADIOLIB_LR11X0_IRQ_HEADER_ERR) {
+          MESH_DEBUG_PRINTLN("LR1110: got header err, assuming shift");
+          this->shiftCount += 4; // uint8 will loop around to 0 at 256, perfect as rx buffer is 256 bytes
+        } else {
+          MESH_DEBUG_PRINTLN("LR1110: got zero-length packet without header err irq");
+        }
       }
       return len;
     }
-    
+
+    int16_t readData(uint8_t *data, size_t len) override {
+      // check active modem
+      uint8_t modem = RADIOLIB_LR11X0_PACKET_TYPE_NONE;
+      int16_t state = getPacketType(&modem);
+      RADIOLIB_ASSERT(state);
+      if((modem != RADIOLIB_LR11X0_PACKET_TYPE_LORA) && 
+        (modem != RADIOLIB_LR11X0_PACKET_TYPE_GFSK)) {
+        return(RADIOLIB_ERR_WRONG_MODEM);
+      }
+
+      // check integrity CRC
+      uint32_t irq = getIrqStatus();
+      int16_t crcState = RADIOLIB_ERR_NONE;
+      // Report CRC mismatch when there's a payload CRC error, or a header error and no valid header (to avoid false alarm from previous packet)
+      if((irq & RADIOLIB_LR11X0_IRQ_CRC_ERR) || ((irq & RADIOLIB_LR11X0_IRQ_HEADER_ERR) && !(irq & RADIOLIB_LR11X0_IRQ_SYNC_WORD_HEADER_VALID))) {
+        crcState = RADIOLIB_ERR_CRC_MISMATCH;
+      }
+
+      // get packet length
+      // the offset is needed since LR11x0 seems to move the buffer base by 4 bytes on every packet
+      uint8_t offset = 0;
+      size_t length = LR1110::getPacketLength(true, &offset);
+      if((len != 0) && (len < length)) {
+        // user requested less data than we got, only return what was requested
+        length = len;
+      }
+
+      // read packet data
+      state = readBuffer8(data, length, (uint8_t)(offset + this->shiftCount));  // add shiftCount to offset - only change from radiolib
+      RADIOLIB_ASSERT(state);
+
+      // clear the Rx buffer
+      state = clearRxBuffer();
+      RADIOLIB_ASSERT(state);
+
+      // clear interrupt flags
+      state = clearIrqState(RADIOLIB_LR11X0_IRQ_ALL);
+
+      // check if CRC failed - this is done after reading data to give user the option to keep them
+      RADIOLIB_ASSERT(crcState);
+
+      return(state);
+    }
+
+    RadioLibTime_t getTimeOnAir(size_t len) override {
+  // calculate number of symbols
+  float N_symbol = 0;
+  if(this->codingRate <= RADIOLIB_LR11X0_LORA_CR_4_8_SHORT) {
+    // legacy coding rate - nice and simple
+    // get SF coefficients
+    float coeff1 = 0;
+    int16_t coeff2 = 0;
+    int16_t coeff3 = 0;
+    if(this->spreadingFactor < 7) {
+      // SF5, SF6
+      coeff1 = 6.25;
+      coeff2 = 4*this->spreadingFactor;
+      coeff3 = 4*this->spreadingFactor;
+    } else if(this->spreadingFactor < 11) {
+      // SF7. SF8, SF9, SF10
+      coeff1 = 4.25;
+      coeff2 = 4*this->spreadingFactor + 8;
+      coeff3 = 4*this->spreadingFactor;
+    } else {
+      // SF11, SF12
+      coeff1 = 4.25;
+      coeff2 = 4*this->spreadingFactor + 8;
+      coeff3 = 4*(this->spreadingFactor - 2);
+    }
+
+    // get CRC length
+    int16_t N_bitCRC = 16;
+    if(this->crcTypeLoRa == RADIOLIB_LR11X0_LORA_CRC_DISABLED) {
+      N_bitCRC = 0;
+    }
+
+    // get header length
+    int16_t N_symbolHeader = 20;
+    if(this->headerType == RADIOLIB_LR11X0_LORA_HEADER_IMPLICIT) {
+      N_symbolHeader = 0;
+    }
+
+    // calculate number of LoRa preamble symbols - NO! Lora preamble is already in symbols
+    // uint32_t N_symbolPreamble = (this->preambleLengthLoRa & 0x0F) * (uint32_t(1) << ((this->preambleLengthLoRa & 0xF0) >> 4));
+
+    // calculate the number of symbols - nope
+    // N_symbol = (float)N_symbolPreamble + coeff1 + 8.0f + ceilf((float)RADIOLIB_MAX((int16_t)(8 * len + N_bitCRC - coeff2 + N_symbolHeader), (int16_t)0) / (float)coeff3) * (float)(this->codingRate + 4);
+    // calculate the number of symbols - using only preamblelora because it's already in symbols
+    N_symbol = (float)preambleLengthLoRa + coeff1 + 8.0f + ceilf((float)RADIOLIB_MAX((int16_t)(8 * len + N_bitCRC - coeff2 + N_symbolHeader), (int16_t)0) / (float)coeff3) * (float)(this->codingRate + 4);
+  } else {
+    // long interleaving - not needed for this modem
+  }
+
+  // get time-on-air in us
+  return(((uint32_t(1) << this->spreadingFactor) / this->bandwidthKhz) * N_symbol * 1000.0f);
+}
+
     bool isReceiving() {
       uint16_t irq = getIrqStatus();
-      bool detected = ((irq & RADIOLIB_LR11X0_IRQ_SYNC_WORD_HEADER_VALID) || (irq & RADIOLIB_LR11X0_IRQ_PREAMBLE_DETECTED));
+      bool detected = ((irq & LR1110_IRQ_HEADER_VALID) || (irq & LR1110_IRQ_HAS_PREAMBLE));
       return detected;
     }
 };

src/helpers/radiolib/CustomSX1262Wrapper.h

@@ -19,7 +19,4 @@ public:
     int sf = ((CustomSX1262 *)_radio)->spreadingFactor;
     return packetScoreInt(snr, sf, packet_len);
   }
-  virtual void powerOff() override {
-    ((CustomSX1262 *)_radio)->sleep(false);
-  }
 };

src/helpers/radiolib/RadioLibWrappers.cpp

@@ -105,7 +105,6 @@ int RadioLibWrapper::recvRaw(uint8_t* bytes, int sz) {
       if (err != RADIOLIB_ERR_NONE) {
         MESH_DEBUG_PRINTLN("RadioLibWrapper: error: readData(%d)", err);
         len = 0;
-        n_recv_errors++;
       } else {
       //  Serial.print("  readData() -> "); Serial.println(len);
         n_recv++;
@@ -138,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;
 }
 

src/helpers/radiolib/RadioLibWrappers.h

@@ -7,7 +7,7 @@ class RadioLibWrapper : public mesh::Radio {
 protected:
   PhysicalLayer* _radio;
   mesh::MainBoard* _board;
-  uint32_t n_recv, n_sent, n_recv_errors;
+  uint32_t n_recv, n_sent;
   int16_t _noise_floor, _threshold;
   uint16_t _num_floor_samples;
   int32_t _floor_sample_sum;
@@ -21,7 +21,6 @@ public:
   RadioLibWrapper(PhysicalLayer& radio, mesh::MainBoard& board) : _radio(&radio), _board(&board) { n_recv = n_sent = 0; }
 
   void begin() override;
-  virtual void powerOff() { _radio->sleep(); }
   int recvRaw(uint8_t* bytes, int sz) override;
   uint32_t getEstAirtimeFor(int len_bytes) override;
   bool startSendRaw(const uint8_t* bytes, int len) override;
@@ -45,9 +44,8 @@ public:
   void loop() override;
 
   uint32_t getPacketsRecv() const { return n_recv; }
-  uint32_t getPacketsRecvErrors() const { return n_recv_errors; }
   uint32_t getPacketsSent() const { return n_sent; }
-  void resetStats() { n_recv = n_sent = n_recv_errors = 0; }
+  void resetStats() { n_recv = n_sent = 0; }
 
   virtual float getLastRSSI() const override;
   virtual float getLastSNR() const override;

src/helpers/sensors/EnvironmentSensorManager.cpp

@@ -15,12 +15,6 @@
 static Adafruit_BME680 BME680;
 #endif
 
-#ifdef ENV_INCLUDE_BMP085
-#define TELEM_BMP085_SEALEVELPRESSURE_HPA (1013.25)
-#include <Adafruit_BMP085.h>
-static Adafruit_BMP085 BMP085;
-#endif
-
 #if ENV_INCLUDE_AHTX0
 #define TELEM_AHTX_ADDRESS      0x38      // AHT10, AHT20 temperature and humidity sensor I2C address
 #include <Adafruit_AHTX0.h>
@@ -42,7 +36,7 @@ static Adafruit_BME280 BME280;
 #endif
 #define TELEM_BMP280_SEALEVELPRESSURE_HPA (1013.25)    // Athmospheric pressure at sea level
 #include <Adafruit_BMP280.h>
-static Adafruit_BMP280 BMP280(TELEM_WIRE);
+static Adafruit_BMP280 BMP280;
 #endif
 
 #if ENV_INCLUDE_SHTC3
@@ -58,7 +52,6 @@ static SensirionI2cSht4x SHT4X;
 
 #if ENV_INCLUDE_LPS22HB
 #include <Arduino_LPS22HB.h>
-LPS22HBClass LPS22HB(*TELEM_WIRE);
 #endif
 
 #if ENV_INCLUDE_INA3221
@@ -179,27 +172,10 @@ bool EnvironmentSensorManager::begin() {
   }
   #endif
 
-  #if ENV_INCLUDE_BME680
-  if (BME680.begin(TELEM_BME680_ADDRESS, TELEM_WIRE)) {
-    MESH_DEBUG_PRINTLN("Found BME680 at address: %02X", TELEM_BME680_ADDRESS);
-    BME680_initialized = true;
-  } else {
-    BME680_initialized = false;
-    MESH_DEBUG_PRINTLN("BME680 was not found at I2C address %02X", TELEM_BME680_ADDRESS);
-  }
-  #endif
-
   #if ENV_INCLUDE_BME280
   if (BME280.begin(TELEM_BME280_ADDRESS, TELEM_WIRE)) {
     MESH_DEBUG_PRINTLN("Found BME280 at address: %02X", TELEM_BME280_ADDRESS);
     MESH_DEBUG_PRINTLN("BME sensor ID: %02X", BME280.sensorID());
-    // Reduce self-heating: single-shot conversions, light oversampling, long standby.
-    BME280.setSampling(Adafruit_BME280::MODE_FORCED,
-                       Adafruit_BME280::SAMPLING_X1,   // temperature
-                       Adafruit_BME280::SAMPLING_X1,   // pressure
-                       Adafruit_BME280::SAMPLING_X1,   // humidity
-                       Adafruit_BME280::FILTER_OFF,
-                       Adafruit_BME280::STANDBY_MS_1000);
     BME280_initialized = true;
   } else {
     BME280_initialized = false;
@@ -219,7 +195,7 @@ bool EnvironmentSensorManager::begin() {
   #endif
 
   #if ENV_INCLUDE_SHTC3
-  if (SHTC3.begin(TELEM_WIRE)) {
+  if (SHTC3.begin()) {
     MESH_DEBUG_PRINTLN("Found sensor: SHTC3");
     SHTC3_initialized = true;
   } else {
@@ -244,7 +220,7 @@ bool EnvironmentSensorManager::begin() {
   #endif
 
   #if ENV_INCLUDE_LPS22HB
-  if (LPS22HB.begin()) {
+  if (BARO.begin()) {
     MESH_DEBUG_PRINTLN("Found sensor: LPS22HB");
     LPS22HB_initialized = true;
   } else {
@@ -319,15 +295,13 @@ bool EnvironmentSensorManager::begin() {
   }
   #endif
 
-  #if ENV_INCLUDE_BMP085
-  // First argument is  MODE (aka oversampling)
-  // choose ULTRALOWPOWER
-  if (BMP085.begin(0, TELEM_WIRE)) {
-    MESH_DEBUG_PRINTLN("Found sensor BMP085");
-    BMP085_initialized = true;
+  #if ENV_INCLUDE_BME680
+  if (BME680.begin(TELEM_BME680_ADDRESS, TELEM_WIRE)) {
+    MESH_DEBUG_PRINTLN("Found BME680 at address: %02X", TELEM_BME680_ADDRESS);
+    BME680_initialized = true;
   } else {
-    BMP085_initialized = false;
-    MESH_DEBUG_PRINTLN("BMP085 was not found at I2C address %02X", 0x77);
+    BME680_initialized = false;
+    MESH_DEBUG_PRINTLN("BME680 was not found at I2C address %02X", TELEM_BME680_ADDRESS);
   }
   #endif
 
@@ -352,27 +326,12 @@ bool EnvironmentSensorManager::querySensors(uint8_t requester_permissions, Cayen
     }
     #endif
 
-    #if ENV_INCLUDE_BME680
-    if (BME680_initialized) {
-      if (BME680.performReading()) {
-        telemetry.addTemperature(TELEM_CHANNEL_SELF, BME680.temperature);
-        telemetry.addRelativeHumidity(TELEM_CHANNEL_SELF, BME680.humidity);
-        telemetry.addBarometricPressure(TELEM_CHANNEL_SELF, BME680.pressure / 100);
-        telemetry.addAltitude(TELEM_CHANNEL_SELF, 44330.0 * (1.0 - pow((BME680.pressure / 100) / TELEM_BME680_SEALEVELPRESSURE_HPA, 0.1903)));
-        telemetry.addAnalogInput(next_available_channel, BME680.gas_resistance);
-        next_available_channel++;
-      }
-    }
-    #endif
-
     #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,8 +367,8 @@ bool EnvironmentSensorManager::querySensors(uint8_t requester_permissions, Cayen
 
     #if ENV_INCLUDE_LPS22HB
     if (LPS22HB_initialized) {
-      telemetry.addTemperature(TELEM_CHANNEL_SELF, LPS22HB.readTemperature());
-      telemetry.addBarometricPressure(TELEM_CHANNEL_SELF, LPS22HB.readPressure() * 10); // convert kPa to hPa
+      telemetry.addTemperature(TELEM_CHANNEL_SELF, BARO.readTemperature());
+      telemetry.addBarometricPressure(TELEM_CHANNEL_SELF, BARO.readPressure());
     }
     #endif
 
@@ -475,11 +434,16 @@ bool EnvironmentSensorManager::querySensors(uint8_t requester_permissions, Cayen
     }
     #endif
 
-    #if ENV_INCLUDE_BMP085
-    if (BMP085_initialized) {
-        telemetry.addTemperature(TELEM_CHANNEL_SELF, BMP085.readTemperature());
-        telemetry.addBarometricPressure(TELEM_CHANNEL_SELF, BMP085.readPressure() / 100);
-        telemetry.addAltitude(TELEM_CHANNEL_SELF, BMP085.readAltitude(TELEM_BMP085_SEALEVELPRESSURE_HPA * 100));
+    #if ENV_INCLUDE_BME680
+    if (BME680_initialized) {
+      if (BME680.performReading()) {
+        telemetry.addTemperature(TELEM_CHANNEL_SELF, BME680.temperature);
+        telemetry.addRelativeHumidity(TELEM_CHANNEL_SELF, BME680.humidity);
+        telemetry.addBarometricPressure(TELEM_CHANNEL_SELF, BME680.pressure / 100);
+        telemetry.addAltitude(TELEM_CHANNEL_SELF, 44330.0 * (1.0 - pow((BME680.pressure / 100) / TELEM_BME680_SEALEVELPRESSURE_HPA, 0.1903)));
+        telemetry.addAnalogInput(next_available_channel, BME680.gas_resistance);
+        next_available_channel++;
+      }
     }
     #endif
 
@@ -531,15 +495,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
 }
@@ -567,11 +522,7 @@ void EnvironmentSensorManager::initBasicGPS() {
   delay(1000);
 
   // We'll consider GPS detected if we see any data on Serial1
-#ifdef ENV_SKIP_GPS_DETECT
-  gps_detected = true;
-#else
   gps_detected = (Serial1.available() > 0);
-#endif
 
   if (gps_detected) {
     MESH_DEBUG_PRINTLN("GPS detected");
@@ -586,7 +537,7 @@ void EnvironmentSensorManager::initBasicGPS() {
   gps_active = false; //Set GPS visibility off until setting is changed
 }
 
-// gps code for rak might be moved to MicroNMEALoactionProvider
+// gps code for rak might be moved to MicroNMEALoactionProvider 
 // or make a new location provider ...
 #ifdef RAK_WISBLOCK_GPS
 void EnvironmentSensorManager::rakGPSInit(){
@@ -616,7 +567,6 @@ void EnvironmentSensorManager::rakGPSInit(){
     MESH_DEBUG_PRINTLN("No GPS found");
     gps_active = false;
     gps_detected = false;
-    Serial1.end();
     return;
   }
 
@@ -655,7 +605,8 @@ bool EnvironmentSensorManager::gpsIsAwake(uint8_t ioPin){
 
     _location = &RAK12500_provider;
     return true;
-  } else if (Serial1.available()) {
+  }
+  else if(Serial1){
     MESH_DEBUG_PRINTLN("Serial GPS init correctly and is turned on");
     if(PIN_GPS_EN){
       gpsResetPin = PIN_GPS_EN;
@@ -665,8 +616,6 @@ bool EnvironmentSensorManager::gpsIsAwake(uint8_t ioPin){
     gps_detected = true;
     return true;
   }
-
-  pinMode(ioPin, INPUT);
   MESH_DEBUG_PRINTLN("GPS did not init with this IO pin... try the next");
   return false;
 }
@@ -708,8 +657,8 @@ void EnvironmentSensorManager::loop() {
 
   #if ENV_INCLUDE_GPS
   _location->loop();
-  if (millis() > next_gps_update) {
 
+  if (millis() > next_gps_update) {
     if(gps_active){
     #ifdef RAK_WISBLOCK_GPS
     if ((i2cGPSFlag || serialGPSFlag) && _location->isValid()) {
@@ -729,7 +678,7 @@ void EnvironmentSensorManager::loop() {
     }
     #endif
     }
-    next_gps_update = millis() + (gps_update_interval_sec * 1000);
+    next_gps_update = millis() + 1000;
   }
   #endif
 }

src/helpers/sensors/EnvironmentSensorManager.h

@@ -21,11 +21,9 @@ protected:
   bool VL53L0X_initialized = false;
   bool SHT4X_initialized = false;
   bool BME680_initialized = false;
-  bool BMP085_initialized = false;
 
   bool gps_detected = false;
   bool gps_active = false;
-  uint32_t gps_update_interval_sec = 1;  // Default 1 second
 
   #if ENV_INCLUDE_GPS
   LocationProvider* _location;

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) {

src/helpers/ui/GxEPDDisplay.cpp

@@ -1,26 +1,13 @@
 
 #include "GxEPDDisplay.h"
 
-#ifdef EXP_PIN_BACKLIGHT
-  #include <PCA9557.h>
-  extern PCA9557 expander;
-#endif
-
 #ifndef DISPLAY_ROTATION
   #define DISPLAY_ROTATION 3
 #endif
 
-#ifdef ESP32
-  SPIClass SPI1 = SPIClass(FSPI);
-#endif
-
 bool GxEPDDisplay::begin() {
   display.epd2.selectSPI(SPI1, SPISettings(4000000, MSBFIRST, SPI_MODE0));
-#ifdef ESP32
-  SPI1.begin(PIN_DISPLAY_SCLK, PIN_DISPLAY_MISO, PIN_DISPLAY_MOSI, PIN_DISPLAY_CS);
-#else
   SPI1.begin();
-#endif
   display.init(115200, true, 2, false);
   display.setRotation(DISPLAY_ROTATION);
   setTextSize(1);  // Default to size 1
@@ -40,8 +27,6 @@ void GxEPDDisplay::turnOn() {
   if (!_init) begin();
 #if defined(DISP_BACKLIGHT) && !defined(BACKLIGHT_BTN)
   digitalWrite(DISP_BACKLIGHT, HIGH);
-#elif defined(EXP_PIN_BACKLIGHT) && !defined(BACKLIGHT_BTN)
-  expander.digitalWrite(EXP_PIN_BACKLIGHT, HIGH);
 #endif
   _isOn = true;
 }
@@ -49,8 +34,6 @@ void GxEPDDisplay::turnOn() {
 void GxEPDDisplay::turnOff() {
 #if defined(DISP_BACKLIGHT) && !defined(BACKLIGHT_BTN)
   digitalWrite(DISP_BACKLIGHT, LOW);
-#elif defined(EXP_PIN_BACKLIGHT) && !defined(BACKLIGHT_BTN)
-  expander.digitalWrite(EXP_PIN_BACKLIGHT, LOW);
 #endif
   _isOn = false;
 }

src/helpers/ui/LGFXDisplay.cpp

@@ -1,125 +0,0 @@
-#include "LGFXDisplay.h"
-
-bool LGFXDisplay::begin() {
-  turnOn();
-  display->init();
-  display->setRotation(1);
-  display->setBrightness(64);
-  display->setColorDepth(8);
-  display->setTextColor(TFT_WHITE);
-
-  buffer.setColorDepth(8);
-  buffer.setPsram(true);
-  buffer.createSprite(width(), height());
-
-  return true;
-}
-
-void LGFXDisplay::turnOn() {
-//  display->wakeup();
-  if (!_isOn) {
-    display->wakeup();
-  }
-  _isOn = true;
-}
-
-void LGFXDisplay::turnOff() {
-  if (_isOn) {
-    display->sleep();
-  }
-  _isOn = false;
-}
-
-void LGFXDisplay::clear() {
-//  display->clearDisplay();
-  buffer.clearDisplay();
-}
-
-void LGFXDisplay::startFrame(Color bkg) {
-//  display->startWrite();
-//  display->getScanLine();
-  buffer.clearDisplay();
-  buffer.setTextColor(TFT_WHITE);
-}
-
-void LGFXDisplay::setTextSize(int sz) {
-  buffer.setTextSize(sz);
-}
-
-void LGFXDisplay::setColor(Color c) {
-  // _color = (c != 0) ? ILI9342_WHITE : ILI9342_BLACK;
-  switch (c) {
-    case DARK:
-      _color = TFT_BLACK;
-      break;
-    case LIGHT:
-      _color = TFT_WHITE;
-      break;
-    case RED:
-      _color = TFT_RED;
-      break;
-    case GREEN:
-      _color = TFT_GREEN;
-      break;
-    case BLUE:
-      _color = TFT_BLUE;
-      break;
-    case YELLOW:
-      _color = TFT_YELLOW;
-      break;
-    case ORANGE:
-      _color = TFT_ORANGE;
-      break;
-    default:
-      _color = TFT_WHITE;
-  }
-  buffer.setTextColor(_color);
-}
-
-void LGFXDisplay::setCursor(int x, int y) {
-  buffer.setCursor(x, y);
-}
-
-void LGFXDisplay::print(const char* str) {
-  buffer.println(str);
-//  Serial.println(str);
-}
-
-void LGFXDisplay::fillRect(int x, int y, int w, int h) {
-  buffer.fillRect(x, y, w, h, _color);
-}
-
-void LGFXDisplay::drawRect(int x, int y, int w, int h) {
-  buffer.drawRect(x, y, w, h, _color);
-}
-
-void LGFXDisplay::drawXbm(int x, int y, const uint8_t* bits, int w, int h) {
-  buffer.drawBitmap(x, y, bits, w, h, _color);
-}
-
-uint16_t LGFXDisplay::getTextWidth(const char* str) {
-  return buffer.textWidth(str);
-}
-
-void LGFXDisplay::endFrame() {
-  display->startWrite();
-  if (UI_ZOOM != 1) {
-    buffer.pushRotateZoom(display, display->width()/2, display->height()/2 , 0, UI_ZOOM, UI_ZOOM);
-  } else {
-    buffer.pushSprite(display, 0, 0);
-  }
-  display->endWrite();
-}
-
-bool LGFXDisplay::getTouch(int *x, int *y) {
-  lgfx::v1::touch_point_t point;
-  display->getTouch(&point);
-  if (UI_ZOOM != 1) {
-    *x = point.x / UI_ZOOM;
-    *y = point.y / UI_ZOOM;
-  } else {
-    *x = point.x;
-    *y = point.y;
-  }
-  return (*x >= 0) && (*y >= 0);
-}

src/helpers/ui/LGFXDisplay.h

@@ -1,39 +0,0 @@
-#pragma once
-
-#include <helpers/ui/DisplayDriver.h>
-
-#define LGFX_USE_V1
-#include <LovyanGFX.hpp>
-
-#ifndef UI_ZOOM
-  #define UI_ZOOM 1
-#endif
-
-class LGFXDisplay : public DisplayDriver {
-protected:
-  LGFX_Device* display;
-  LGFX_Sprite buffer;
-
-  bool _isOn = false;
-  int _color = TFT_WHITE;
-
-public:
-  LGFXDisplay(int w, int h, LGFX_Device &disp)
-    : DisplayDriver(w/UI_ZOOM, h/UI_ZOOM), display(&disp) {}
-  bool begin();
-  bool isOn() override { return _isOn; }
-  void turnOn() override;
-  void turnOff() override;
-  void clear() override;
-  void startFrame(Color bkg = DARK) override;
-  void setTextSize(int sz) override;
-  void setColor(Color c) override;
-  void setCursor(int x, int y) override;
-  void print(const char* str) override;
-  void fillRect(int x, int y, int w, int h) override;
-  void drawRect(int x, int y, int w, int h) override;
-  void drawXbm(int x, int y, const uint8_t* bits, int w, int h) override;
-  uint16_t getTextWidth(const char* str) override;
-  void endFrame() override;
-  virtual bool getTouch(int *x, int *y);
-};

src/helpers/ui/SSD1306Display.cpp

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

src/helpers/ui/SSD1306Display.h

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

src/helpers/ui/ST7789LCDDisplay.cpp

@@ -23,19 +23,12 @@ 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) {
-      pinMode(PIN_TFT_RST, OUTPUT);
-      digitalWrite(PIN_TFT_RST, LOW); 
-      delay(10);
-      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.
-    #if defined(LILYGO_TDECK) || defined(HELTEC_LORA_V4_TFT)
+    #ifdef LILYGO_TDECK
       displaySPI.begin(PIN_TFT_SCL, -1, PIN_TFT_SDA, PIN_TFT_CS);
     #endif
 
@@ -61,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();

src/helpers/ui/ST7789LCDDisplay.h

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

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`.

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."

tools/maint/patch_and_build_hansemesh_fw.sh

@@ -1,64 +0,0 @@
-#!/bin/bash  # Note: switched to bash for process substitution support
-
-export PATH="$HOME/.platformio/penv/bin:$PATH"
-
-LOGFILE="$PWD/meshcore-evo-fw.log"
-FIRMWARE_VERSION="v1.11.0-evo_0.1.5"
-FIRMWARE_BUILD_DATE=$(date '+%d-%b-%Y')
-
-collect_bin_files(){
-    DEST_DIR="./firmwares"
-    mkdir -p "$DEST_DIR"
-    BUILD_DIR=".pio/build"
-
-    if [ ! -d "$BUILD_DIR" ]; then
-        echo "Error: $BUILD_DIR not found. Did you run the build process?"
-        exit 1
-    fi
-
-    echo "Copying firmware files to $DEST_DIR..."
-
-    for target_path in "$BUILD_DIR"/*/; do
-        echo $target_path
-        target_name=$(basename "$target_path")
-    #    if ls "$target_path"*.bin >/dev/null 2>&1; then
-            for bin_file in "$target_path"*firmware*.{uf2,bin,zip}; do
-                filename=$(basename "$bin_file")
-                new_filename="${target_name}_${FIRMWARE_VERSION}_${FIRMWARE_BUILD_DATE}_${filename}"
-                cp "$bin_file" "$DEST_DIR/$new_filename"
-                echo "Done: $new_filename"
-            done
-    #    fi
-    done
-}
-
-# Everything after this line goes to BOTH console and logfile
-exec > >(tee -a "$LOGFILE") 2>&1
-
-echo "-------------------- Build start ----------------"
-date
-echo "-------------------------------------------------"
-
-# apply patches
-# ./tools/maint/apply_patches.sh 1199 1338 1297
-
-# build all repeater firmwares, the will be in .out
-FIRMWARE_VERSION=$FIRMWARE_VERSION ./build.sh build-repeater-firmwares
-
-# build single firmwares
-#FIRMWARE_VERSION=$FIRMWARE_VERSION FIRMWARE_BUILD_DATE=$FIRMWARE_BUILD_DATE ./build.sh build-firmware ProMicro_repeater
-#FIRMWARE_VERSION=$FIRMWARE_VERSION FIRMWARE_BUILD_DATE=$FIRMWARE_BUILD_DATE ./build.sh build-firmware RAK_4631_repeater
-#FIRMWARE_VERSION=$FIRMWARE_VERSION FIRMWARE_BUILD_DATE=$FIRMWARE_BUILD_DATE ./build.sh build-firmware heltec_v4_repeater
-#FIRMWARE_VERSION=$FIRMWARE_VERSION FIRMWARE_BUILD_DATE=$FIRMWARE_BUILD_DATE ./build.sh build-firmware Heltec_v3_repeater
-#FIRMWARE_VERSION=$FIRMWARE_VERSION FIRMWARE_BUILD_DATE=$FIRMWARE_BUILD_DATE ./build.sh build-firmware Xiao_nrf52_repeater
-#FIRMWARE_VERSION=$FIRMWARE_VERSION FIRMWARE_BUILD_DATE=$FIRMWARE_BUILD_DATE ./build.sh build-firmware LilyGo_T3S3_sx1262_repeater
-#FIRMWARE_VERSION=$FIRMWARE_VERSION FIRMWARE_BUILD_DATE=$FIRMWARE_BUILD_DATE ./build.sh build-firmware Heltec_t114_without_display_repeater
-#FIRMWARE_VERSION=$FIRMWARE_VERSION FIRMWARE_BUILD_DATE=$FIRMWARE_BUILD_DATE ./build.sh build-firmware Heltec_t114_repeater
-#collect_bin_files
-
-
-echo "-------------------- Build end ------------------"
-date
-echo "-------------------------------------------------"
-
-#grep -E " SUCCESS | FAILED " hansemesh_fw.log

variants/ebyte_eora_s3/platformio.ini

@@ -64,7 +64,7 @@ lib_deps =
 extends = Ebyte_EoRa-S3
 build_flags =
   ${Ebyte_EoRa-S3.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=300
   -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -99,8 +99,8 @@ build_flags =
   ${Ebyte_EoRa-S3.build_flags}
   -I examples/companion_radio/ui-new
   -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -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 = ${Ebyte_EoRa-S3.build_src_filter}
@@ -118,8 +118,8 @@ build_flags =
   ${Ebyte_EoRa-S3.build_flags}
   -I examples/companion_radio/ui-new
   -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
   -D BLE_PIN_CODE=123456
   -D BLE_DEBUG_LOGGING=1
   -D OFFLINE_QUEUE_SIZE=256

variants/generic_espnow/platformio.ini

@@ -26,7 +26,7 @@ build_src_filter = ${esp32_base.build_src_filter}
 extends = Generic_ESPNOW
 build_flags =
   ${Generic_ESPNOW.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=300
   -D MAX_GROUP_CHANNELS=1
 build_src_filter = ${Generic_ESPNOW.build_src_filter}
   +<../examples/simple_secure_chat/main.cpp>
@@ -54,7 +54,7 @@ lib_deps =
 extends = Generic_ESPNOW
 build_flags =
   ${Generic_ESPNOW.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=300
   -D MAX_GROUP_CHANNELS=8
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1

variants/heltec_ct62/platformio.ini

@@ -97,8 +97,8 @@ build_flags =
   ${Heltec_ct62.build_flags}
 ;  -D ARDUINO_USB_MODE=1
 ;  -D ARDUINO_USB_CDC_ON_BOOT=1
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
   -D OFFLINE_QUEUE_SIZE=256
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -115,8 +115,8 @@ build_flags =
   ${Heltec_ct62.build_flags}
 ;  -D ARDUINO_USB_MODE=1
 ;  -D ARDUINO_USB_CDC_ON_BOOT=1
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
   -D OFFLINE_QUEUE_SIZE=256
   -D BLE_PIN_CODE=123456
 ;  -D MESH_PACKET_LOGGING=1

variants/heltec_e213/platformio.ini

@@ -40,13 +40,13 @@ lib_deps =
   ${esp32_base.lib_deps}
   https://github.com/Quency-D/heltec-eink-modules/archive/563dd41fd850a1bc3039b8723da4f3a20fe1c800.zip
 
-[env:Heltec_E213_companion_radio_ble_]
+[env:Heltec_E213_companion_radio_ble]
 extends = Heltec_E213_base
 build_flags =
   ${Heltec_E213_base.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
   -D DISPLAY_CLASS=E213Display
   -D BLE_PIN_CODE=123456   ; dynamic, random PIN
   -D BLE_DEBUG_LOGGING=1
@@ -60,13 +60,13 @@ lib_deps =
   ${Heltec_E213_base.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-[env:Heltec_E213_companion_radio_usb_]
+[env:Heltec_E213_companion_radio_usb]
 extends = Heltec_E213_base
 build_flags =
   ${Heltec_E213_base.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
   -D DISPLAY_CLASS=E213Display
   -D OFFLINE_QUEUE_SIZE=256
 build_src_filter = ${Heltec_E213_base.build_src_filter}
@@ -78,7 +78,7 @@ lib_deps =
   ${Heltec_E213_base.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-[env:Heltec_E213_repeater_]
+[env:Heltec_E213_repeater]
 extends = Heltec_E213_base
 build_flags =
   ${Heltec_E213_base.build_flags}
@@ -95,7 +95,7 @@ lib_deps =
   ${Heltec_E213_base.lib_deps}
   ${esp32_ota.lib_deps}
 
-; [env:Heltec_E213_repeater_bridge_rs232_]
+; [env:Heltec_E213_repeater_bridge_rs232]
 ; extends = Heltec_E213_base
 ; build_flags =
 ;   ${Heltec_E213_base.build_flags}
@@ -119,7 +119,7 @@ lib_deps =
 ;   ${Heltec_E213_base.lib_deps}
 ;   ${esp32_ota.lib_deps}
 
-[env:Heltec_E213_repeater_bridge_espnow_]
+[env:Heltec_E213_repeater_bridge_espnow]
 extends = Heltec_E213_base
 build_flags =
   ${Heltec_E213_base.build_flags}
@@ -141,7 +141,7 @@ lib_deps =
   ${Heltec_E213_base.lib_deps}
   ${esp32_ota.lib_deps}
 
-[env:Heltec_E213_room_server_]
+[env:Heltec_E213_room_server]
 extends = Heltec_E213_base
 build_flags =
   ${Heltec_E213_base.build_flags}