Merge branch 'dev'

# Conflicts:
#	docs/payloads.md

boards/meshnology_w12.json

@@ -0,0 +1,43 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s3_out.ld",
+      "partitions": "default_16MB.csv",
+      "memory_type": "qio_opi"
+      },
+    "core": "esp32",
+    "extra_flags": [
+      "-DBOARD_HAS_PSRAM",
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DARDUINO_USB_MODE=1",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=1"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "psram_type": "opi",
+    "hwids": [["0x303A", "0x0002"], ["0x303A", "0x1001"]],
+    "mcu": "esp32s3",
+    "variant": "meshnology_w12"
+  },
+  "connectivity": ["wifi", "bluetooth", "lora"],
+  "debug": {
+    "default_tool": "esp-builtin",
+    "onboard_tools": ["esp-builtin"],
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": ["arduino", "espidf"],
+  "name": "heltec_wifi_lora_32 v5 (16 MB FLASH, 8 MB PSRAM)",
+  "upload": {
+    "flash_size": "16MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 16777216,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true,
+    "require_upload_port": true,
+    "speed": 921600
+  },
+  "url": "https://heltec.org/",
+  "vendor": "heltec"
+}

boards/seeed-mesh-tracker-x1.json

@@ -0,0 +1,60 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "nrf52840_s140_v7.ld"
+    },
+    "core": "nRF5",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DARDUINO_WIO_WM1110 -DNRF52840_XXAA",
+    "f_cpu": "64000000L",
+    "hwids": [
+      ["0x239A", "0x8029"],
+      ["0x239A", "0x0029"],
+      ["0x239A", "0x002A"],
+      ["0x239A", "0x802A"],
+      ["0x2886", "0x0057"]
+    ],
+    "usb_product": "X1-BOOT",
+    "mcu": "nrf52840",
+    "variant": "Seeed_Mesh-Tracker-X1",
+    "bsp": {
+      "name": "adafruit"
+    },
+    "softdevice": {
+      "sd_flags": "-DS140",
+      "sd_name": "s140",
+      "sd_version": "7.3.0",
+      "sd_fwid": "0x0123"
+    },
+    "bootloader": {
+      "settings_addr": "0xFF000"
+    }
+  },
+  "connectivity": ["bluetooth"],
+  "debug": {
+    "jlink_device": "nRF52840_xxAA",
+    "svd_path": "nrf52840.svd",
+    "openocd_target": "nrf52.cfg"
+  },
+  "frameworks": ["arduino"],
+  "name": "Seeed SenseCAP MeshTracker X1",
+  "upload": {
+    "maximum_ram_size": 248832,
+    "maximum_size": 815104,
+    "speed": 115200,
+    "protocol": "nrfutil",
+    "protocols": [
+      "jlink",
+      "nrfjprog",
+      "nrfutil",
+      "stlink",
+      "cmsis-dap",
+      "blackmagic"
+    ],
+    "use_1200bps_touch": true,
+    "require_upload_port": true,
+    "wait_for_upload_port": true
+  },
+  "url": "https://www.seeedstudio.com/SenseCAP-MeshTracker-X1-for-Meshtastic-p-6793.html",
+  "vendor": "Seeed Studio"
+}

docs/cli_commands.md

@@ -305,7 +305,7 @@ This document provides an overview of CLI commands that can be sent to MeshCore
 
 **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.
+**Note:** Advertised names can use up to 23 bytes when location is included and 31 bytes otherwise. Emoji and Unicode characters may take more than one byte. Names that exceed the available advert space are truncated at a valid UTF-8 code point boundary.
 
 ---
 

docs/companion_protocol.md

@@ -440,6 +440,8 @@ Byte 0: 0x14
     - Uses a secret key derived from the channel name
     - It is the first 16 bytes of `sha256("#test")`
     - For example hashtag channel `#test` has the key: `9cd8fcf22a47333b591d96a2b848b73f`
+    - Traffic is encrypted on air, but anyone who knows or guesses the channel
+      name can derive the key. Hashtag channels should not be treated as private.
     - Used as a topic based public group chat, separate from the default public channel
 3. **Private Channels**
     - Uses a randomly generated 16-byte secret key

docs/payloads.md

@@ -23,7 +23,7 @@ NOTE: all 16 and 32-bit integer fields are Little Endian.
 
 * Node hash: the first byte of the node's public key
 
-# Node advertisement
+## Node advertisement
 This kind of payload notifies receivers that a node exists, and gives information about the node
 
 | Field         | Size (bytes)    | Description                                              |
@@ -57,7 +57,7 @@ Appdata Flags
 | `0x40` | has feature 2  | Reserved for future use.              |
 | `0x80` | has name       | appdata contains a node name          |
 
-# Acknowledgement
+## 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 acknowledgement packet. CLI commands do not cause acknowledgement responses, neither discrete nor extra.
 
@@ -66,7 +66,7 @@ An acknowledgement that a message was received. Note that for returned path mess
 | checksum | 4            | CRC checksum of message timestamp, text, and sender pubkey |
 
 
-# Returned path, request, response, and plain text message
+## Returned path, request, response, and plain text message
 
 Returned path, request, response, and plain text messages are all formatted in the same way. See the subsection for more details about the ciphertext's associated plaintext representation.
 
@@ -77,7 +77,7 @@ Returned path, request, response, and plain text messages are all formatted in t
 | cipher MAC       | 2               | MAC for encrypted data in next field                 |
 | ciphertext       | rest of payload | encrypted message, see subsections below for details |
 
-## Returned path
+### Returned path
 
 Returned path messages provide a description of the route a packet took from the original author. Receivers will send returned path messages to the author of the original message.
 
@@ -88,7 +88,7 @@ Returned path messages provide a description of the route a packet took from the
 | extra type  | 1            | extra, bundled payload type, eg., acknowledgement or response. Same values as in [Packet Format](./packet_format.md) |
 | extra       | rest of data | extra, bundled payload content, follows same format as main content defined by this document                         |
 
-## Request
+### Request
 
 | Field        | Size (bytes)    | Description                              |
 |--------------|-----------------|------------------------------------------|
@@ -102,7 +102,7 @@ For the common chat/server helpers in `BaseChatMesh`, the current request type v
 | `0x01` | get stats | get stats of repeater or room server               |
 | `0x02` | keepalive | keep-alive request used for maintained connections |
 
-### Get stats
+#### Get stats
 
 Gets information about the node, possibly including the following:
 
@@ -125,32 +125,32 @@ Gets information about the node, possibly including the following:
 * Number posted (?)
 * Number of post pushes (?)
 
-### Get telemetry data
+#### Get telemetry data
 
 Not defined in `BaseChatMesh`. Sensor- and application-specific request payloads may be implemented by higher-level firmware.
 
-### Get Telemetry
+#### Get Telemetry
 
 Not defined in `BaseChatMesh`.
 
-### Get Min/Max/Ave  (Sensor nodes)
+#### Get Min/Max/Ave  (Sensor nodes)
 
 Not defined in `BaseChatMesh`.
 
-### Get Access List
+#### Get Access List
 
 Not defined in `BaseChatMesh`.
 
-### Get Neighbors
+#### Get Neighbors
 
 Not defined in `BaseChatMesh`.
 
-### Get Owner Info
+#### Get Owner Info
 
 Not defined in `BaseChatMesh`.
 
 
-## Response
+### Response
 
 | Field   | Size (bytes)    | Description                       |
 |---------|-----------------|-----------------------------------|
@@ -158,7 +158,7 @@ Not defined in `BaseChatMesh`.
 
 Response contents are opaque application data. There is no single generic response envelope beyond the encrypted payload wrapper shown above.
 
-## Plain text message
+### Plain text message
 
 | Field              | Size (bytes)    | Description                                                                       |
 |--------------------|-----------------|-----------------------------------------------------------------------------------|
@@ -174,7 +174,7 @@ txt_type
 | `0x01` | CLI command               | the command text of the message                                          |
 | `0x02` | signed plain text message | first four bytes is sender pubkey prefix, followed by plain text message |
 
-# Anonymous request
+## Anonymous request
 
 | Field            | Size (bytes)    | Description                               |
 |------------------|-----------------|-------------------------------------------|
@@ -183,7 +183,7 @@ 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
+### Room server login
 
 | Field          | Size (bytes)    | Description                                                                   |
 |----------------|-----------------|-------------------------------------------------------------------------------|
@@ -191,14 +191,14 @@ txt_type
 | sync timestamp | 4               | sender's "sync messages SINCE x" timestamp                                    |
 | password       | rest of message | password for room                                                             |
 
-## Repeater/Sensor login
+### Repeater/Sensor login
 
 | Field          | Size (bytes)    | Description                                                                   |
 |----------------|-----------------|-------------------------------------------------------------------------------|
 | timestamp      | 4               | sender time (unix timestamp)                                                  |
 | password       | rest of message | password for repeater/sensor                                                  |
 
-## Repeater - Regions request
+### Repeater - Regions request
 
 | Field          | Size (bytes) | Description                  |
 |----------------|--------------|------------------------------|
@@ -207,7 +207,7 @@ txt_type
 | reply path len | 1            | path len for reply           |
 | reply path     | (variable)   | reply path                   |
 
-## Repeater - Owner info request
+### Repeater - Owner info request
 
 | Field          | Size (bytes) | Description                  |
 |----------------|--------------|------------------------------|
@@ -216,7 +216,7 @@ txt_type
 | reply path len | 1            | path len for reply           |
 | reply path     | (variable)   | reply path                   |
 
-## Repeater - Clock and status request
+### Repeater - Clock and status request
 
 | Field          | Size (bytes) | Description                  |
 |----------------|--------------|------------------------------|
@@ -226,7 +226,7 @@ txt_type
 | reply path     | (variable)   | reply path                   |
 
 
-# Group text message
+## Group text message
 
 | Field        | Size (bytes)    | Description                                  |
 |--------------|-----------------|----------------------------------------------|
@@ -236,7 +236,10 @@ 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`).
 
-# Group datagram
+The sender name is unverified message text. Group messages contain no sender
+signature, so any channel-key holder can choose any sender name.
+
+## Group datagram
 
 | Field        | Size (bytes)    | Description                                  |
 |--------------|-----------------|----------------------------------------------|
@@ -253,14 +256,14 @@ The data contained in the ciphertext uses the format below:
 | data      | rest of payload | (depends on data type)                                   |
 
 
-# Control data
+## 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)
+### DISCOVER_REQ (sub_type)
 
 | Field        | Size (bytes)    | Description                                  |
 |--------------|-----------------|----------------------------------------------|
@@ -269,7 +272,7 @@ The data contained in the ciphertext uses the format below:
 | tag          | 4               | randomly generate by sender                  |
 | since        | 4               | (optional) epoch timestamp (0 by default)    |
 
-## DISCOVER_RESP (sub_type)
+### DISCOVER_RESP (sub_type)
 
 | Field        | Size (bytes)    | Description                                |
 |--------------|-----------------|--------------------------------------------|
@@ -279,6 +282,6 @@ The data contained in the ciphertext uses the format below:
 | pubkey       | 8 or 32         | node's ID (or prefix)                      |
 
 
-# Custom packet
+## Custom packet
 
 Custom packets have no defined format.

examples/companion_radio/AbstractUITask.h

@@ -4,7 +4,7 @@
 #include <helpers/ui/DisplayDriver.h>
 #include <helpers/ui/UIScreen.h>
 #include <helpers/SensorManager.h>
-#include <helpers/BaseSerialInterface.h>
+#include <helpers/MultiSerialInterface.h>
 #include <Arduino.h>
 
 #ifdef PIN_BUZZER
@@ -25,10 +25,10 @@ enum class UIEventType {
 class AbstractUITask {
 protected:
   mesh::MainBoard* _board;
-  BaseSerialInterface* _serial;
+  MultiSerialInterface* _interfaceManager;
   bool _connected;
 
-  AbstractUITask(mesh::MainBoard* board, BaseSerialInterface* serial) : _board(board), _serial(serial) {
+  AbstractUITask(mesh::MainBoard* board, MultiSerialInterface* interfaceManager) : _board(board), _interfaceManager(interfaceManager) {
     _connected = false;
   }
 
@@ -36,9 +36,9 @@ public:
   void setHasConnection(bool connected) { _connected = connected; }
   bool hasConnection() const { return _connected; }
   uint16_t getBattMilliVolts() const { return _board->getBattMilliVolts(); }
-  bool isSerialEnabled() const { return _serial->isEnabled(); }
-  void enableSerial() { _serial->enable(); }
-  void disableSerial() { _serial->disable(); }
+  bool isBluetoothEnabled() const { return _interfaceManager->isBluetoothEnabled(); }
+  void enableBluetooth() { _interfaceManager->enableBluetooth(); }
+  void disableBluetooth() { _interfaceManager->disableBluetooth(); }
   virtual void msgRead(int msgcount) = 0;
   virtual void newMsg(uint8_t path_len, const char* from_name, const char* text, int msgcount) = 0;
   virtual void notify(UIEventType t = UIEventType::none) = 0;

examples/companion_radio/MyMesh.cpp

@@ -262,7 +262,7 @@ int MyMesh::getInterferenceThreshold() const {
   return 0; // disabled for now, until currentRSSI() problem is resolved
 }
 bool MyMesh::getCADEnabled() const {
-  return true; // hardware CAD before TX (no CLI toggle on companion; enabled by default)
+  return false; // hardware CAD before TX (disabled by default, until configurable)
 }
 
 int MyMesh::calcRxDelay(float score, uint32_t air_time) const {

examples/companion_radio/MyMesh.h

@@ -8,11 +8,11 @@
 #define FIRMWARE_VER_CODE 13
 
 #ifndef FIRMWARE_BUILD_DATE
-#define FIRMWARE_BUILD_DATE "6 Jun 2026"
+#define FIRMWARE_BUILD_DATE "9 Aug 2026"
 #endif
 
 #ifndef FIRMWARE_VERSION
-#define FIRMWARE_VERSION "v1.16.0"
+#define FIRMWARE_VERSION "v1.17.0"
 #endif
 
 #if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)

examples/companion_radio/NodePrefs.h

@@ -28,6 +28,7 @@ public:
   uint32_t ble_pin = 0;
   uint8_t  advert_loc_policy = 0;
   uint8_t  buzzer_quiet = 0;
+  uint8_t  vibe_quiet = 0;
   uint8_t  gps_enabled = 0;      // GPS enabled flag (0=disabled, 1=enabled)
   uint32_t gps_interval = 0;     // GPS read interval in seconds
   uint8_t autoadd_config = 0;    // bitmask for auto-add contacts config
@@ -101,6 +102,7 @@ private:
       def("defs_key", (void *) _parent->default_scope_key, sizeof(_parent->default_scope_key));
       def("pin", _parent->ble_pin);
       def("buzz_q", _parent->buzzer_quiet);
+      def("vibe_q", _parent->vibe_quiet);
       def("auto_add", _parent->autoadd_config);    // bitmask for auto-add contacts config
       def("man_add", _parent->manual_add_contacts);
       def("tel_base", _parent->telemetry_mode_base);

examples/companion_radio/main.cpp

@@ -12,6 +12,59 @@ static uint32_t _atoi(const char* sp) {
   return n;
 }
 
+// interface manager
+#include <helpers/MultiSerialInterface.h>
+MultiSerialInterface interface_manager;
+
+// include bluetooth interface
+#if defined(BLE_PIN_CODE)
+  #ifdef ESP32
+    // include esp32 bluetooth interface
+    #include <helpers/esp32/SerialBLEInterface.h>
+    SerialBLEInterface bluetooth_interface;
+  #elif defined(NRF52_PLATFORM)
+    // include nrf52 bluetooth interface
+    #include <helpers/nrf52/SerialBLEInterface.h>
+    SerialBLEInterface bluetooth_interface;
+  #else
+    #error "SerialBLEInterface is not defined for this platform"
+  #endif
+#endif
+
+// include wifi interface
+#ifdef WIFI_SSID
+  #ifndef TCP_PORT
+    #define TCP_PORT 5000
+  #endif
+  #ifdef ESP32
+    // include esp32 wifi interface
+    #include <helpers/esp32/SerialWifiInterface.h>
+    SerialWifiInterface wifi_interface;
+  #else
+    #error "SerialWifiInterface is not defined for this platform"
+  #endif
+#endif
+
+// include usb interface
+#if defined(ENABLE_USB_INTERFACE)
+  #include <helpers/ArduinoSerialInterface.h>
+  ArduinoSerialInterface usb_serial_interface;
+#endif
+
+// include ethernet interface
+#if defined(ETHERNET_ENABLED)
+  #include <helpers/ethernet/EthernetInterface.h>
+  ETHERNET_CLASS ethernet_interface;
+#endif
+
+// include hardware serial interface
+#if defined(SERIAL_RX)
+  #include <helpers/ArduinoSerialInterface.h>
+  ArduinoSerialInterface hardware_serial_interface;
+  HardwareSerial companion_serial(1);
+#endif
+
+// platform file system
 #if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
   #include <InternalFileSystem.h>
   #if defined(QSPIFLASH)
@@ -34,64 +87,10 @@ static uint32_t _atoi(const char* sp) {
   DataStore store(SPIFFS, rtc_clock);
 #endif
 
-#ifdef ESP32
-  #ifdef WIFI_SSID
-    #include <helpers/esp32/SerialWifiInterface.h>
-    SerialWifiInterface serial_interface;
-    #ifndef TCP_PORT
-      #define TCP_PORT 5000
-    #endif
-  #elif defined(BLE_PIN_CODE)
-    #include <helpers/esp32/SerialBLEInterface.h>
-    SerialBLEInterface serial_interface;
-  #elif defined(SERIAL_RX)
-    #include <helpers/ArduinoSerialInterface.h>
-    ArduinoSerialInterface serial_interface;
-    HardwareSerial companion_serial(1);
-  #else
-    #include <helpers/ArduinoSerialInterface.h>
-    ArduinoSerialInterface serial_interface;
-  #endif
-#elif defined(RP2040_PLATFORM)
-  //#ifdef WIFI_SSID
-  //  #include <helpers/rp2040/SerialWifiInterface.h>
-  //  SerialWifiInterface serial_interface;
-  //  #ifndef TCP_PORT
-  //    #define TCP_PORT 5000
-  //  #endif
-  // #elif defined(BLE_PIN_CODE)
-  //   #include <helpers/rp2040/SerialBLEInterface.h>
-  //   SerialBLEInterface serial_interface;
-  #if defined(SERIAL_RX)
-    #include <helpers/ArduinoSerialInterface.h>
-    ArduinoSerialInterface serial_interface;
-    HardwareSerial companion_serial(1);
-  #else
-    #include <helpers/ArduinoSerialInterface.h>
-    ArduinoSerialInterface serial_interface;
-  #endif
-#elif defined(NRF52_PLATFORM)
-  #ifdef BLE_PIN_CODE
-    #include <helpers/nrf52/SerialBLEInterface.h>
-    SerialBLEInterface serial_interface;
-  #elif defined(ETHERNET_ENABLED)
-    #include <helpers/nrf52/SerialEthernetInterface.h>
-    SerialEthernetInterface serial_interface;
-  #else
-    #include <helpers/ArduinoSerialInterface.h>
-    ArduinoSerialInterface serial_interface;
-  #endif
-#elif defined(STM32_PLATFORM)
-  #include <helpers/ArduinoSerialInterface.h>
-  ArduinoSerialInterface serial_interface;
-#else
-  #error "need to define a serial interface"
-#endif
-
 /* GLOBAL OBJECTS */
 #ifdef DISPLAY_CLASS
   #include "UITask.h"
-  UITask ui_task(&board, &serial_interface);
+  UITask ui_task(&board, &interface_manager);
 #endif
 
 StdRNG fast_rng;
@@ -161,26 +160,6 @@ void setup() {
         false
     #endif
   );
-
-#ifdef BLE_PIN_CODE
-  serial_interface.begin(BLE_NAME_PREFIX, the_mesh.getNodePrefs()->node_name, the_mesh.getBLEPin());
-  the_mesh.startInterface(serial_interface);
-#elif defined(ETHERNET_ENABLED)
-  Serial.print("Waiting for serial to connect...\n");
-  unsigned long timeout = millis();
-  while (!Serial) {
-    if ((millis() - timeout) < 5000) { delay(100); } else { break; }
-  }
-  Serial.println("Initializing Ethernet adapter...");
-  if (serial_interface.begin()) {
-    the_mesh.startInterface(serial_interface);
-  } else {
-    Serial.println("ETH: Init failed, continuing without Ethernet (mesh only)");
-  }
-#else
-  serial_interface.begin(Serial);
-  the_mesh.startInterface(serial_interface);
-#endif
 #elif defined(RP2040_PLATFORM)
   LittleFS.begin();
   store.begin();
@@ -191,22 +170,6 @@ void setup() {
         false
     #endif
   );
-
-  //#ifdef WIFI_SSID
-  //  WiFi.begin(WIFI_SSID, WIFI_PWD);
-  //  serial_interface.begin(TCP_PORT);
-  // #elif defined(BLE_PIN_CODE)
-  //   char dev_name[32+16];
-  //   sprintf(dev_name, "%s%s", BLE_NAME_PREFIX, the_mesh.getNodeName());
-  //   serial_interface.begin(dev_name, the_mesh.getBLEPin());
-  #if defined(SERIAL_RX)
-    companion_serial.setPins(SERIAL_RX, SERIAL_TX);
-    companion_serial.begin(115200);
-    serial_interface.begin(companion_serial);
-  #else
-    serial_interface.begin(Serial);
-  #endif
-    the_mesh.startInterface(serial_interface);
 #elif defined(ESP32)
   SPIFFS.begin(true);
   store.begin();
@@ -217,7 +180,17 @@ void setup() {
         false
     #endif
   );
+#else
+  #error "need to define filesystem"
+#endif
 
+// add bluetooth interface
+#if defined(BLE_PIN_CODE)
+  bluetooth_interface.begin(BLE_NAME_PREFIX, the_mesh.getNodePrefs()->node_name, the_mesh.getBLEPin());
+  interface_manager.addInterface(InterfaceType::Bluetooth, &bluetooth_interface);
+#endif
+
+// add wifi interface
 #ifdef WIFI_SSID
   board.setInhibitSleep(true);   // prevent sleep when WiFi is active
   WiFi.setAutoReconnect(true);
@@ -233,21 +206,31 @@ 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());
-#elif defined(SERIAL_RX)
-  companion_serial.setPins(SERIAL_RX, SERIAL_TX);
-  companion_serial.begin(115200);
-  serial_interface.begin(companion_serial);
-#else
-  serial_interface.begin(Serial);
-#endif
-  the_mesh.startInterface(serial_interface);
-#else
-  #error "need to define filesystem"
+  wifi_interface.begin(TCP_PORT);
+  interface_manager.addInterface(InterfaceType::WiFi, &wifi_interface);
 #endif
 
+// add usb interface
+#if defined(ENABLE_USB_INTERFACE)
+  usb_serial_interface.begin(Serial);
+  interface_manager.addInterface(InterfaceType::USB, &usb_serial_interface);
+#endif
+
+// add ethernet interface
+#if defined(ETHERNET_ENABLED)
+  ethernet_interface.begin();
+  interface_manager.addInterface(InterfaceType::Ethernet, &ethernet_interface);
+#endif
+
+// add hardware serial interface
+#if defined(SERIAL_RX)
+  companion_serial.setPins(SERIAL_RX, SERIAL_TX);
+  companion_serial.begin(115200);
+  hardware_serial_interface.begin(companion_serial);
+  interface_manager.addInterface(InterfaceType::HardwareSerial, &hardware_serial_interface);
+#endif
+
+  the_mesh.startInterface(interface_manager);
   sensors.begin();
 
 #if ENV_INCLUDE_GPS == 1
@@ -263,6 +246,7 @@ void setup() {
 
 void loop() {
   the_mesh.loop();
+  interface_manager.loop();
   sensors.loop();
 #ifdef DISPLAY_CLASS
   ui_task.loop();
@@ -272,10 +256,6 @@ void loop() {
   external_watchdog.loop();
 #endif
 
-#ifdef ETHERNET_ENABLED
-  serial_interface.loop();
-#endif
-
   if (!the_mesh.hasPendingWork()) {
 #if defined(NRF52_PLATFORM)
     board.sleep(0); // nrf ignores seconds param, sleeps whenever possible

examples/companion_radio/ui-new/UITask.cpp

@@ -53,23 +53,24 @@ public:
 
   int render(DisplayDriver& display) override {
     // meshcore logo
-    display.setColor(DisplayDriver::BLUE);
+    display.setColor(UIColor::corp_blue);
     int logoWidth = 128;
     display.drawXbm((display.width() - logoWidth) / 2, 3, meshcore_logo, logoWidth, 13);
 
     // meshcore website
     const char* website = "https://meshcore.io";
-    display.setColor(DisplayDriver::LIGHT);
+    display.setColor(UIColor::primary_txt);
     display.setTextSize(1);
     uint16_t websiteWidth = display.getTextWidth(website);
     display.setCursor((display.width() - websiteWidth) / 2, 22);
     display.print(website);
 
     // version info
-    display.setColor(DisplayDriver::LIGHT);
+    display.setColor(UIColor::primary_txt);
     display.setTextSize(1);
     display.drawTextCentered(display.width()/2, 35, _version_info);
 
+    display.setColor(UIColor::secondary_txt);
     display.setTextSize(1);
     display.drawTextCentered(display.width()/2, 48, FIRMWARE_BUILD_DATE);
 
@@ -128,7 +129,7 @@ class HomeScreen : public UIScreen {
     int iconHeight = 10;
     int iconX = display.width() - iconWidth - 5; // Position the icon near the top-right corner
     int iconY = 0;
-    display.setColor(DisplayDriver::GREEN);
+    display.setColor(UIColor::title_txt);
 
     // battery outline
     display.drawRect(iconX, iconY, iconWidth, iconHeight);
@@ -143,7 +144,7 @@ class HomeScreen : public UIScreen {
     // show muted icon if buzzer is muted
 #ifdef PIN_BUZZER
     if (_task->isBuzzerQuiet()) {
-      display.setColor(DisplayDriver::RED);
+      display.setColor(UIColor::warning_txt);
       display.drawXbm(iconX - 9, iconY + 1, muted_icon, 8, 8);
     }
 #endif
@@ -188,34 +189,41 @@ public:
   }
 
   int render(DisplayDriver& display) override {
+    display.setColor(UIColor::title_bkg);
+    display.fillRect(0, 0, display.width(), 12);
     char tmp[80];
     // node name
     display.setTextSize(1);
-    display.setColor(DisplayDriver::GREEN);
+    display.setColor(UIColor::title_txt);
     char filtered_name[sizeof(_node_prefs->node_name)];
     display.translateUTF8ToBlocks(filtered_name, _node_prefs->node_name, sizeof(filtered_name));
-    display.setCursor(0, 0);
+    display.setCursor(0, 2);
     display.print(filtered_name);
 
     // battery voltage
     renderBatteryIndicator(display, _task->getBattMilliVolts());
 
     // curr page indicator
+    if (UIColor::title_bkg == UIColor::window_bkg) {
+      display.setColor(UIColor::title_txt);
+    } else {
+      display.setColor(UIColor::title_bkg);
+    }
     int y = 14;
     int x = display.width() / 2 - 5 * (HomePage::Count-1);
     for (uint8_t i = 0; i < HomePage::Count; i++, x += 10) {
       if (i == _page) {
-        display.fillRect(x-1, y-1, 3, 3);
+        display.fillRect(x-1, y-1, 4, 4);
       } else {
-        display.fillRect(x, y, 1, 1);
+        display.fillRect(x, y, 2, 2);
       }
     }
 
     if (_page == HomePage::FIRST) {
-      display.setColor(DisplayDriver::YELLOW);
+      display.setColor(UIColor::primary_txt);
       display.setTextSize(2);
       sprintf(tmp, "MSG: %d", _task->getMsgCount());
-      display.drawTextCentered(display.width() / 2, 20, tmp);
+      display.drawTextCentered(display.width() / 2, 22, tmp);
 
       #ifdef WIFI_SSID
         IPAddress ip = WiFi.localIP();
@@ -224,19 +232,19 @@ public:
         display.drawTextCentered(display.width() / 2, 54, tmp);
       #endif
       if (_task->hasConnection()) {
-        display.setColor(DisplayDriver::GREEN);
+        display.setColor(UIColor::warning_txt);
         display.setTextSize(1);
         display.drawTextCentered(display.width() / 2, 43, "< Connected >");
 
       } else if (the_mesh.getBLEPin() != 0) { // BT pin
-        display.setColor(DisplayDriver::RED);
+        display.setColor(UIColor::warning_txt);
         display.setTextSize(2);
         sprintf(tmp, "Pin:%d", the_mesh.getBLEPin());
         display.drawTextCentered(display.width() / 2, 43, tmp);
       }
     } else if (_page == HomePage::RECENT) {
       the_mesh.getRecentlyHeard(recent, UI_RECENT_LIST_SIZE);
-      display.setColor(DisplayDriver::GREEN);
+      display.setColor(UIColor::primary_txt);
       int y = 20;
       for (int i = 0; i < UI_RECENT_LIST_SIZE; i++, y += 11) {
         auto a = &recent[i];
@@ -260,7 +268,7 @@ public:
         display.print(tmp);
       }
     } else if (_page == HomePage::RADIO) {
-      display.setColor(DisplayDriver::YELLOW);
+      display.setColor(UIColor::primary_txt);
       display.setTextSize(1);
       // freq / sf
       display.setCursor(0, 20);
@@ -279,15 +287,17 @@ public:
       sprintf(tmp, "Noise floor: %d", radio_driver.getNoiseFloor());
       display.print(tmp);
     } else if (_page == HomePage::BLUETOOTH) {
-      display.setColor(DisplayDriver::GREEN);
+      display.setColor(UIColor::corp_blue);
       display.drawXbm((display.width() - 32) / 2, 18,
-          _task->isSerialEnabled() ? bluetooth_on : bluetooth_off,
+          _task->isBluetoothEnabled() ? bluetooth_on : bluetooth_off,
           32, 32);
+      display.setColor(UIColor::secondary_txt);
       display.setTextSize(1);
       display.drawTextCentered(display.width() / 2, 64 - 11, "toggle: " PRESS_LABEL);
     } else if (_page == HomePage::ADVERT) {
-      display.setColor(DisplayDriver::GREEN);
+      display.setColor(UIColor::corp_blue);
       display.drawXbm((display.width() - 32) / 2, 18, advert_icon, 32, 32);
+      display.setColor(UIColor::secondary_txt);
       display.drawTextCentered(display.width() / 2, 64 - 11, "advert: " PRESS_LABEL);
 #if ENV_INCLUDE_GPS == 1
     } else if (_page == HomePage::GPS) {
@@ -305,24 +315,33 @@ public:
 #else
       strcpy(buf, gps_state ? "gps on" : "gps off");
 #endif
+      display.setColor(UIColor::primary_txt);
       display.drawTextLeftAlign(0, y, buf);
       if (nmea == NULL) {
         y = y + 12;
+        display.setColor(UIColor::secondary_txt);
         display.drawTextLeftAlign(0, y, "Can't access GPS");
       } else {
+        display.setColor(UIColor::primary_txt);
         strcpy(buf, nmea->isValid()?"fix":"no fix");
         display.drawTextRightAlign(display.width()-1, y, buf);
         y = y + 12;
+        display.setColor(UIColor::secondary_txt);
         display.drawTextLeftAlign(0, y, "sat");
+        display.setColor(UIColor::primary_txt);
         sprintf(buf, "%d", nmea->satellitesCount());
         display.drawTextRightAlign(display.width()-1, y, buf);
         y = y + 12;
+        display.setColor(UIColor::secondary_txt);
         display.drawTextLeftAlign(0, y, "pos");
+        display.setColor(UIColor::primary_txt);
         sprintf(buf, "%.4f %.4f",
           nmea->getLatitude()/1000000., nmea->getLongitude()/1000000.);
         display.drawTextRightAlign(display.width()-1, y, buf);
         y = y + 12;
+        display.setColor(UIColor::secondary_txt);
         display.drawTextLeftAlign(0, y, "alt");
+        display.setColor(UIColor::primary_txt);
         sprintf(buf, "%.2f", nmea->getAltitude()/1000.);
         display.drawTextRightAlign(display.width()-1, y, buf);
         y = y + 12;
@@ -390,7 +409,9 @@ public:
             strcpy(name, "unk"); sprintf(buf, "");
         }
         display.setCursor(0, y);
+        display.setColor(UIColor::secondary_txt);
         display.print(name);
+        display.setColor(UIColor::primary_txt);
         display.setCursor(
           display.width()-display.getTextWidth(buf)-1, y
         );
@@ -401,11 +422,13 @@ public:
       else sensors_scroll_offset = 0;
 #endif
     } else if (_page == HomePage::SHUTDOWN) {
-      display.setColor(DisplayDriver::GREEN);
+      display.setColor(UIColor::corp_blue);
       display.setTextSize(1);
       if (_shutdown_init) {
+        display.setColor(UIColor::warning_txt);
         display.drawTextCentered(display.width() / 2, 34, "hibernating...");
       } else {
+        display.setColor(UIColor::secondary_txt);
         display.drawXbm((display.width() - 32) / 2, 18, power_icon, 32, 32);
         display.drawTextCentered(display.width() / 2, 64 - 11, "hibernate:" PRESS_LABEL);
       }
@@ -426,10 +449,10 @@ public:
       return true;
     }
     if (c == KEY_ENTER && _page == HomePage::BLUETOOTH) {
-      if (_task->isSerialEnabled()) {  // toggle Bluetooth on/off
-        _task->disableSerial();
+      if (_task->isBluetoothEnabled()) {  // toggle Bluetooth on/off
+        _task->disableBluetooth();
       } else {
-        _task->enableSerial();
+        _task->enableBluetooth();
       }
       return true;
     }
@@ -498,7 +521,7 @@ public:
     char tmp[16];
     display.setCursor(0, 0);
     display.setTextSize(1);
-    display.setColor(DisplayDriver::GREEN);
+    display.setColor(UIColor::corp_blue);
     sprintf(tmp, "Unread: %d", num_unread);
     display.print(tmp);
 
@@ -518,13 +541,13 @@ public:
     display.drawRect(0, 11, display.width(), 1);  // horiz line
 
     display.setCursor(0, 14);
-    display.setColor(DisplayDriver::YELLOW);
+    display.setColor(UIColor::secondary_txt);
     char filtered_origin[sizeof(p->origin)];
     display.translateUTF8ToBlocks(filtered_origin, p->origin, sizeof(filtered_origin));
     display.print(filtered_origin);
 
     display.setCursor(0, 25);
-    display.setColor(DisplayDriver::LIGHT);
+    display.setColor(UIColor::primary_txt);
     char filtered_msg[sizeof(p->msg)];
     display.translateUTF8ToBlocks(filtered_msg, p->msg, sizeof(filtered_msg));
     display.printWordWrap(filtered_msg, display.width());
@@ -806,9 +829,9 @@ void UITask::loop() {
         _display->setTextSize(1);
         int y = _display->height() / 3;
         int p = _display->height() / 32;
-        _display->setColor(DisplayDriver::DARK);
+        _display->setColor(UIColor::popup_bkg);
         _display->fillRect(p, y, _display->width() - p*2, y);
-        _display->setColor(DisplayDriver::LIGHT);  // draw box border
+        _display->setColor(UIColor::popup_txt);  // draw box border
         _display->drawRect(p, y, _display->width() - p*2, y);
         _display->drawTextCentered(_display->width() / 2, y + p*3, _alert);
         _next_refresh = _alert_expiry;   // will need refresh when alert is dismissed
@@ -845,7 +868,7 @@ void UITask::loop() {
         if (_display != NULL) {
           _display->startFrame();
           _display->setTextSize(2);
-          _display->setColor(DisplayDriver::RED);
+          _display->setColor(UIColor::warning_txt);
           _display->drawTextCentered(_display->width() / 2, 20, "Low Battery.");
           _display->drawTextCentered(_display->width() / 2, 40, "Shutting Down!");
           _display->endFrame();

examples/companion_radio/ui-new/UITask.h

@@ -4,7 +4,7 @@
 #include <helpers/ui/DisplayDriver.h>
 #include <helpers/ui/UIScreen.h>
 #include <helpers/SensorManager.h>
-#include <helpers/BaseSerialInterface.h>
+#include <helpers/MultiSerialInterface.h>
 #include <Arduino.h>
 #include <helpers/sensors/LPPDataHelpers.h>
 
@@ -65,7 +65,7 @@ class UITask : public AbstractUITask {
 
 public:
 
-  UITask(mesh::MainBoard* board, BaseSerialInterface* serial) : AbstractUITask(board, serial), _display(NULL), _sensors(NULL) {
+  UITask(mesh::MainBoard* board, MultiSerialInterface* serial) : AbstractUITask(board, serial), _display(NULL), _sensors(NULL) {
     next_batt_chck = _next_refresh = 0;
     ui_started_at = 0;
     curr = NULL;

examples/companion_radio/ui-orig/UITask.cpp

@@ -6,12 +6,19 @@
 #define AUTO_OFF_MILLIS     15000   // 15 seconds
 #define BOOT_SCREEN_MILLIS   3000   // 3 seconds
 
-#ifdef PIN_STATUS_LED
+#if defined(PIN_STATUS_LED) || defined(PIN_STATUS_LED_R)
 #define LED_ON_MILLIS     20
 #define LED_ON_MSG_MILLIS 200
 #define LED_CYCLE_MILLIS  4000
 #endif
 
+#if defined(PIN_STATUS_LED_R) && defined(PIN_STATUS_LED_G) && defined(PIN_STATUS_LED_B)
+#define STATUS_LED_RGB 1
+#ifndef LOW_BATT_MILLIVOLTS
+#define LOW_BATT_MILLIVOLTS 3500
+#endif
+#endif
+
 #ifndef USER_BTN_PRESSED
 #define USER_BTN_PRESSED LOW
 #endif
@@ -60,6 +67,11 @@ void UITask::begin(DisplayDriver* display, SensorManager* sensors, NodePrefs* no
   buzzer.startup();
 #endif
 
+#ifdef HAS_DRV2605
+  vibration.begin();
+  vibration.quiet(_node_prefs->vibe_quiet);
+#endif
+
   // Initialize digital button if available
 #ifdef PIN_USER_BTN
   _userButton = new Button(PIN_USER_BTN, USER_BTN_PRESSED);
@@ -130,6 +142,10 @@ void UITask::clearMsgPreview() {
 void UITask::newMsg(uint8_t path_len, const char* from_name, const char* text, int msgcount) {
   _msgcount = msgcount;
 
+#ifdef HAS_DRV2605
+  vibration.trigger();   // vibrate even while the app is connected (honors quiet + cooldown)
+#endif
+
   if (path_len == 0xFF) {
     sprintf(_origin, "(F) %s", from_name);
   } else {
@@ -167,7 +183,7 @@ void UITask::renderBatteryIndicator(uint16_t batteryMilliVolts) {
   int iconHeight = 12;
   int iconX = _display->width() - iconWidth - 5; // Position the icon near the top-right corner
   int iconY = 0;
-  _display->setColor(DisplayDriver::GREEN);
+  _display->setColor(UIColor::primary_txt);
 
   // battery outline
   _display->drawRect(iconX, iconY, iconWidth, iconHeight);
@@ -188,7 +204,7 @@ void UITask::renderCurrScreen() {
     _display->setTextSize(1.4);
     uint16_t textWidth = _display->getTextWidth(_alert);
     _display->setCursor((_display->width() - textWidth) / 2, 22);
-    _display->setColor(DisplayDriver::GREEN);
+    _display->setColor(UIColor::warning_txt);
     _display->print(_alert);
     _alert[0] = 0;
     _need_refresh = true;
@@ -197,30 +213,29 @@ void UITask::renderCurrScreen() {
     // render message preview
     _display->setCursor(0, 0);
     _display->setTextSize(1);
-    _display->setColor(DisplayDriver::GREEN);
+    _display->setColor(UIColor::primary_txt);
     _display->print(_node_prefs->node_name);
 
     _display->setCursor(0, 12);
-    _display->setColor(DisplayDriver::YELLOW);
+    _display->setColor(UIColor::secondary_txt);
     _display->print(_origin);
     _display->setCursor(0, 24);
-    _display->setColor(DisplayDriver::LIGHT);
     _display->print(_msg);
 
     _display->setCursor(_display->width() - 28, 9);
     _display->setTextSize(2);
-    _display->setColor(DisplayDriver::ORANGE);
+    _display->setColor(UIColor::primary_txt);
     sprintf(tmp, "%d", _msgcount);
     _display->print(tmp);
-    _display->setColor(DisplayDriver::YELLOW); // last color will be kept on T114
+    _display->setColor(UIColor::secondary_txt); // last color will be kept on T114
   } else if ((millis() - ui_started_at) < BOOT_SCREEN_MILLIS) { // boot screen
     // meshcore logo
-    _display->setColor(DisplayDriver::BLUE);
+    _display->setColor(UIColor::corp_blue);
     int logoWidth = 128;
     _display->drawXbm((_display->width() - logoWidth) / 2, 3, meshcore_logo, logoWidth, 13);
 
     // version info
-    _display->setColor(DisplayDriver::LIGHT);
+    _display->setColor(UIColor::primary_txt);
     _display->setTextSize(1);
     uint16_t textWidth = _display->getTextWidth(_version_info);
     _display->setCursor((_display->width() - textWidth) / 2, 22);
@@ -229,7 +244,7 @@ void UITask::renderCurrScreen() {
     // node name
     _display->setCursor(0, 0);
     _display->setTextSize(1);
-    _display->setColor(DisplayDriver::GREEN);
+    _display->setColor(UIColor::primary_txt);
     _display->print(_node_prefs->node_name);
 
     // battery voltage
@@ -237,7 +252,7 @@ void UITask::renderCurrScreen() {
 
     // freq / sf
     _display->setCursor(0, 20);
-    _display->setColor(DisplayDriver::YELLOW);
+    _display->setColor(UIColor::secondary_txt);
     sprintf(tmp, "FREQ: %06.3f SF%d", _node_prefs->freq, _node_prefs->sf);
     _display->print(tmp);
 
@@ -248,21 +263,127 @@ void UITask::renderCurrScreen() {
 
     // BT pin
     if (!_connected && the_mesh.getBLEPin() != 0) {
-      _display->setColor(DisplayDriver::RED);
+      _display->setColor(UIColor::warning_txt);
       _display->setTextSize(2);
       _display->setCursor(0, 43);
       sprintf(tmp, "Pin:%d", the_mesh.getBLEPin());
       _display->print(tmp);
-      _display->setColor(DisplayDriver::GREEN);
+      _display->setColor(UIColor::primary_txt);
     } else {
-      _display->setColor(DisplayDriver::LIGHT); 
+      _display->setColor(UIColor::primary_txt); 
     }
   }
   _need_refresh = false;
 }
 
+#ifdef STATUS_LED_RGB
+static void statusLedWrite(uint8_t r, uint8_t g, uint8_t b) {
+  analogWrite(PIN_STATUS_LED_R, r);
+  analogWrite(PIN_STATUS_LED_G, g);
+  analogWrite(PIN_STATUS_LED_B, b);
+}
+
+static void statusLedWheel(uint8_t pos) {   // smooth hue sweep, 0..255
+  if (pos < 85) {
+    statusLedWrite(255 - pos * 3, pos * 3, 0);
+  } else if (pos < 170) {
+    pos -= 85;
+    statusLedWrite(0, 255 - pos * 3, pos * 3);
+  } else {
+    pos -= 170;
+    statusLedWrite(pos * 3, 0, 255 - pos * 3);
+  }
+}
+#endif
+
 void UITask::userLedHandler() {
-#ifdef PIN_STATUS_LED
+#ifdef STATUS_LED_RGB
+  static bool booted = false;
+  static bool flourish_active = false;
+  static unsigned long flourish_until = 0;
+  static int prev_msgcount = 0;
+  static int state = 0;
+  static unsigned long next_change = 0;
+  static int last_increment = 0;
+  static unsigned long next_batt_check = 0;
+  static bool low_batt = false;
+
+  unsigned long cur_time = millis();
+
+  if (!booted) {   // color sweep on boot
+    booted = true;
+    flourish_until = cur_time + 1200;
+    flourish_active = true;
+  }
+  if (_msgcount > prev_msgcount) {   // color sweep when a new message arrives
+    flourish_until = cur_time + 800;
+    flourish_active = true;
+  }
+  prev_msgcount = _msgcount;
+
+  if (flourish_active) {
+    if (cur_time < flourish_until) {
+      statusLedWheel((cur_time % 1200) * 255 / 1200);
+      return;
+    }
+    statusLedWrite(0, 0, 0);
+    flourish_active = false;
+    state = 0;
+    next_change = cur_time;
+  }
+
+  if (cur_time > next_batt_check) {   // battery reads are not free, keep them rare
+    low_batt = _board->getBattMilliVolts() < LOW_BATT_MILLIVOLTS;
+    next_batt_check = cur_time + 60000;
+  }
+
+#ifdef EXT_CHRG_DETECT
+  // charge status display while docked (skipped when messages are waiting,
+  // so the unread indication is never masked)
+  static unsigned long next_pwr_check = 0;
+  static bool ext_powered = false, ext_charging = false;
+  if (cur_time > next_pwr_check) {
+    ext_powered = _board->isExternalPowered();
+    ext_charging = ext_powered && digitalRead(EXT_CHRG_DETECT) == LOW;
+    next_pwr_check = cur_time + 1000;
+  }
+  if (ext_powered && _msgcount == 0) {
+    if (ext_charging) {
+      // amber breathing while charging
+      int ph = cur_time % 2000;
+      int v = ph < 1000 ? ph : 2000 - ph;
+      uint8_t lvl = (uint8_t)(v * 255 / 1000);
+      statusLedWrite(lvl, (uint8_t)(lvl * 35 / 100), 0);
+    } else {
+      statusLedWrite(0, 40, 0);   // dim solid green: charge complete
+    }
+    state = 0;
+    next_change = cur_time;
+    return;
+  }
+#endif
+
+  if (cur_time > next_change) {
+    if (state == 0) {
+      state = 1;
+      last_increment = (_msgcount > 0) ? LED_ON_MSG_MILLIS : LED_ON_MILLIS;
+      next_change = cur_time + last_increment;
+      if (low_batt) {
+        statusLedWrite(255, 0, 0);      // red: battery low
+      } else if (_msgcount > 0) {
+        statusLedWrite(255, 90, 0);     // amber: unread messages
+      } else if (_connected) {
+        statusLedWrite(0, 0, 255);      // blue: app connected
+      } else {
+        statusLedWrite(0, 255, 0);      // green: heartbeat
+      }
+    } else {
+      state = 0;
+      next_change = cur_time + LED_CYCLE_MILLIS - last_increment;
+      statusLedWrite(0, 0, 0);
+    }
+  }
+#elif defined(PIN_STATUS_LED)
   static int state = 0;
   static int next_change = 0;
   static int last_increment = 0;
@@ -407,8 +528,26 @@ void UITask::handleButtonDoublePress() {
 
 void UITask::handleButtonTriplePress() {
   MESH_DEBUG_PRINTLN("UITask: triple press triggered");
-  // Toggle buzzer quiet mode
-  #ifdef PIN_BUZZER
+#if defined(PIN_BUZZER) && defined(HAS_DRV2605)
+  // cycle alert modes: Buzz+Vibe -> Buzz only -> Vibe only -> Silent
+  int mode = (_node_prefs->buzzer_quiet ? 2 : 0) | (_node_prefs->vibe_quiet ? 1 : 0);
+  mode = (mode + 1) & 3;
+  _node_prefs->buzzer_quiet = (mode & 2) ? 1 : 0;
+  _node_prefs->vibe_quiet = (mode & 1) ? 1 : 0;
+  buzzer.quiet(_node_prefs->buzzer_quiet);
+  vibration.quiet(_node_prefs->vibe_quiet);
+  // audible/tactile confirmation of the new mode (no screen on some boards)
+  if (!_node_prefs->buzzer_quiet) notify(UIEventType::ack);
+  if (!_node_prefs->vibe_quiet) vibration.trigger(true);
+  switch (mode) {
+    case 0: sprintf(_alert, "Alerts: Buzz+Vibe"); break;
+    case 1: sprintf(_alert, "Alerts: Buzz only"); break;
+    case 2: sprintf(_alert, "Alerts: Vibe only"); break;
+    default: sprintf(_alert, "Alerts: Silent"); break;
+  }
+  the_mesh.savePrefs();
+  _need_refresh = true;
+#elif defined(PIN_BUZZER)
     if (buzzer.isQuiet()) {
       buzzer.quiet(false);
       notify(UIEventType::ack);
@@ -420,7 +559,7 @@ void UITask::handleButtonTriplePress() {
     _node_prefs->buzzer_quiet = buzzer.isQuiet();
     the_mesh.savePrefs();
     _need_refresh = true;
-  #endif
+#endif
 }
 
 void UITask::handleButtonQuadruplePress() {

examples/companion_radio/ui-orig/UITask.h

@@ -14,11 +14,18 @@
 
 #include "Button.h"
 
+#ifdef HAS_DRV2605
+  #include <helpers/ui/DRV2605Vibration.h>
+#endif
+
 class UITask : public AbstractUITask {
   DisplayDriver* _display;
   SensorManager* _sensors;
 #ifdef PIN_BUZZER
   genericBuzzer buzzer;
+#endif
+#ifdef HAS_DRV2605
+  DRV2605Vibration vibration;
 #endif
   unsigned long _next_refresh, _auto_off;
   NodePrefs* _node_prefs;
@@ -54,7 +61,7 @@ class UITask : public AbstractUITask {
  
 public:
 
-  UITask(mesh::MainBoard* board, BaseSerialInterface* serial) : AbstractUITask(board, serial), _display(NULL), _sensors(NULL) {
+  UITask(mesh::MainBoard* board, MultiSerialInterface* serial) : AbstractUITask(board, serial), _display(NULL), _sensors(NULL) {
       _next_refresh = 0;
       ui_started_at = 0;
   }

examples/companion_radio/ui-tiny/ScrollingStatusBar.h

@@ -104,7 +104,7 @@ public:
     if (_status[0] == 0) return;
 
     display.setTextSize(1);
-    display.setColor(DisplayDriver::GREEN);
+    display.setColor(UIColor::primary_txt);
 
     // if (_needs_redraw) {
     //   _text_width = display.getTextWidth(_status);

examples/companion_radio/ui-tiny/UITask.cpp

@@ -56,24 +56,24 @@ public:
   int render(DisplayDriver& display) override {
     if (millis() < version_after) {
     // meshcore logo
-    display.setColor(DisplayDriver::BLUE);
+    display.setColor(UIColor::corp_blue);
     int logoWidth = 72;
     display.drawXbm(0, 0, meshcore_logo, 72, 36);
     } else {
 
     // meshcore website
     const char* website = "meshcore.io";
-    display.setColor(DisplayDriver::LIGHT);
+    display.setColor(UIColor::primary_txt);
     display.setTextSize(1);
     uint16_t websiteWidth = display.getTextWidth(website);
     display.setCursor((display.width() - websiteWidth) / 2, 9);
     display.print(website);
 
     // version info
-    display.setColor(DisplayDriver::LIGHT);
     display.setTextSize(1);
     display.drawTextCentered(display.width()/2, 18, _version_info);
 
+    display.setColor(UIColor::secondary_txt);
     display.setTextSize(1);
     display.drawTextCentered(display.width()/2, 27, FIRMWARE_BUILD_DATE);
     }
@@ -163,7 +163,7 @@ public:
       // display.print(filtered_name);
 
 
-      display.setColor(DisplayDriver::YELLOW);
+      display.setColor(UIColor::primary_txt);
       display.setTextSize(2);
       sprintf(tmp, "MSG: %d", _task->getMsgCount());
       display.setCursor(0, 10);
@@ -180,19 +180,19 @@ public:
         display.drawTextCentered(display.width() / 2, 54, tmp);
       #endif
       if (_task->hasConnection()) {
-        display.setColor(DisplayDriver::GREEN);
+        display.setColor(UIColor::warning_txt);
         display.setTextSize(1);
         display.drawTextCentered(display.width() / 2, display.height()-8, "< Connected >");
 
       } else if (the_mesh.getBLEPin() != 0) { // BT pin
-        display.setColor(DisplayDriver::RED);
+        display.setColor(UIColor::warning_txt);
         display.setTextSize(2);
         sprintf(tmp, "Pin:%d", the_mesh.getBLEPin());
         display.drawTextCentered(display.width() / 2, display.height()-8, tmp);
       }
     } else if (_page == HomePage::RECENT) {
       the_mesh.getRecentlyHeard(recent, UI_RECENT_LIST_SIZE);
-      display.setColor(DisplayDriver::GREEN);
+      display.setColor(UIColor::primary_txt);
       int y = 8;
       for (int i = 0; i < UI_RECENT_LIST_SIZE; i++, y += 11) {
         auto a = &recent[i];
@@ -216,7 +216,7 @@ public:
         display.print(tmp);
       }
     } else if (_page == HomePage::RADIO) {
-      display.setColor(DisplayDriver::YELLOW);
+      display.setColor(UIColor::primary_txt);
       display.setTextSize(1);
       // frequency and spreading factor
       display.setCursor(0, 8);
@@ -238,14 +238,14 @@ public:
       display.drawTextRightAlign(display.width(), 26, tmp);
 
     } else if (_page == HomePage::BLUETOOTH) {
-      display.setColor(DisplayDriver::GREEN);
+      display.setColor(UIColor::corp_blue);
       display.drawXbm((display.width() - 32) / 2, 8,
-          _task->isSerialEnabled() ? bluetooth_on : bluetooth_off,
+          _task->isBluetoothEnabled() ? bluetooth_on : bluetooth_off,
           32, 32);
       display.setTextSize(1);
       // display.drawTextCentered(display.width() / 2, 40 - 11, "toggle: " PRESS_LABEL);
     } else if (_page == HomePage::ADVERT) {
-      display.setColor(DisplayDriver::GREEN);
+      display.setColor(UIColor::corp_blue);
       display.drawXbm((display.width() - 32) / 2, 8, advert_icon, 32, 32);
       // display.drawTextCentered(display.width() / 2, 40 - 11, "advert: " PRESS_LABEL);
 #if ENV_INCLUDE_GPS == 1
@@ -264,9 +264,11 @@ public:
 #else
       strcpy(buf, gps_state ? "gps on" : "gps off");
 #endif
+      display.setColor(UIColor::primary_txt);
       display.drawTextLeftAlign(0, y, buf);
       if (nmea == NULL) {
         // y = y + 8;
+        display.setColor(UIColor::warning_txt);
         display.drawTextLeftAlign(0, y, "Can't access GPS");
       } else {
         if (!gps_state || !nmea->isValid()) {
@@ -274,6 +276,7 @@ public:
         } else {
             sprintf(buf, "%d sat", nmea->satellitesCount());
         }
+        display.setColor(UIColor::primary_txt);
         display.drawTextRightAlign(display.width()-1, y, buf);
         y = y + 8;
         sprintf(buf, "lat %.4f",
@@ -349,8 +352,10 @@ public:
             r.skipData(type);
             strcpy(name, "unk"); sprintf(buf, "");
         }
+        display.setColor(UIColor::secondary_txt);
         display.setCursor(0, y);
         display.print(name);
+        display.setColor(UIColor::primary_txt);
         display.setCursor(
           display.width()-display.getTextWidth(buf)-1, y
         );
@@ -361,7 +366,7 @@ public:
       else sensors_scroll_offset = 0;
 #endif
     } else if (_page == HomePage::SHUTDOWN) {
-      display.setColor(DisplayDriver::GREEN);
+      display.setColor(UIColor::secondary_txt);
       display.setTextSize(1);
       if (_shutdown_init) {
         display.drawTextCentered(display.width() / 2, 20, "hibernating...");
@@ -386,10 +391,10 @@ public:
       return true;
     }
     if (c == KEY_ENTER && _page == HomePage::BLUETOOTH) {
-      if (_task->isSerialEnabled()) {  // toggle Bluetooth on/off
-        _task->disableSerial();
+      if (_task->isBluetoothEnabled()) {  // toggle Bluetooth on/off
+        _task->disableBluetooth();
       } else {
-        _task->enableSerial();
+        _task->enableBluetooth();
       }
       return true;
     }
@@ -672,7 +677,7 @@ void UITask::loop() {
         _cached_batt_mv,
         isBuzzerQuiet(),
         getGPSState(),
-        isSerialEnabled());
+        isBluetoothEnabled());
 
     bool status_dirty = _statusBar.needsRedraw();
     bool content_dirty = (millis() >= _next_refresh && curr);
@@ -692,9 +697,9 @@ void UITask::loop() {
         _display->setTextSize(1);
         int y = _display->height() / 3;
         int p = _display->height() / 32;
-        _display->setColor(DisplayDriver::DARK);
+        _display->setColor(UIColor::popup_bkg);
         _display->fillRect(p, y, _display->width() - p*2, y);
-        _display->setColor(DisplayDriver::LIGHT);  // draw box border
+        _display->setColor(UIColor::popup_txt);  // draw box border
         _display->drawRect(p, y, _display->width() - p*2, y);
         _display->drawTextCentered(_display->width() / 2, y + p*3, _alert);
         _next_refresh = _alert_expiry;   // will need refresh when alert is dismissed

examples/companion_radio/ui-tiny/UITask.h

@@ -4,7 +4,7 @@
 #include <helpers/ui/DisplayDriver.h>
 #include <helpers/ui/UIScreen.h>
 #include <helpers/SensorManager.h>
-#include <helpers/BaseSerialInterface.h>
+#include <helpers/MultiSerialInterface.h>
 #include <Arduino.h>
 #include <helpers/sensors/LPPDataHelpers.h>
 
@@ -71,7 +71,7 @@ class UITask : public AbstractUITask {
 
 public:
 
-  UITask(mesh::MainBoard* board, BaseSerialInterface* serial) : AbstractUITask(board, serial), _display(NULL), _sensors(NULL) {
+  UITask(mesh::MainBoard* board, MultiSerialInterface* serial) : AbstractUITask(board, serial), _display(NULL), _sensors(NULL) {
     next_batt_chck = _next_refresh = 0;
     _cached_batt_mv = 0;
     ui_started_at = 0;

examples/simple_repeater/MyMesh.cpp

@@ -147,11 +147,10 @@ uint8_t MyMesh::handleLoginReq(const mesh::Identity& sender, const uint8_t* secr
 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 & 63;
-    reply_path_hash_size = (*data >> 6) + 1;
-    data++;
+    reply_path_len = *data++;
+    if (!mesh::Packet::isValidPathLen(reply_path_len)) return 0;  // reject - bad encoding
 
-    memcpy(reply_path, data, ((uint8_t)reply_path_len) * reply_path_hash_size);
+    mesh::Packet::writePath(reply_path, data, reply_path_len);
     // data += (uint8_t)reply_path_len * reply_path_hash_size;
 
     memcpy(reply_data, &sender_timestamp, 4);   // prefix with sender_timestamp, like a tag
@@ -166,11 +165,10 @@ uint8_t MyMesh::handleAnonRegionsReq(const mesh::Identity& sender, uint32_t send
 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 & 63;
-    reply_path_hash_size = (*data >> 6) + 1;
-    data++;
+    reply_path_len = *data++;
+    if (!mesh::Packet::isValidPathLen(reply_path_len)) return 0;  // reject - bad encoding
 
-    memcpy(reply_path, data, ((uint8_t)reply_path_len) * reply_path_hash_size);
+    mesh::Packet::writePath(reply_path, data, reply_path_len);
     // data += (uint8_t)reply_path_len * reply_path_hash_size;
 
     memcpy(reply_data, &sender_timestamp, 4);   // prefix with sender_timestamp, like a tag
@@ -186,11 +184,10 @@ uint8_t MyMesh::handleAnonOwnerReq(const mesh::Identity& sender, uint32_t sender
 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 & 63;
-    reply_path_hash_size = (*data >> 6) + 1;
-    data++;
+    reply_path_len = *data++;
+    if (!mesh::Packet::isValidPathLen(reply_path_len)) return 0;  // reject - bad encoding
 
-    memcpy(reply_path, data, ((uint8_t)reply_path_len) * reply_path_hash_size);
+    mesh::Packet::writePath(reply_path, data, reply_path_len);
     // data += (uint8_t)reply_path_len * reply_path_hash_size;
 
     memcpy(reply_data, &sender_timestamp, 4);   // prefix with sender_timestamp, like a tag
@@ -574,7 +571,7 @@ void MyMesh::onAnonDataRecv(mesh::Packet *packet, const uint8_t *secret, const m
     data[len] = 0;  // ensure null terminator
     uint8_t reply_len;
 
-    reply_path_len = -1;
+    reply_path_len = 0xFF;
     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()) {
@@ -594,13 +591,12 @@ 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) sendFloodReply(path, SERVER_RESPONSE_DELAY, packet->getPathHashSize());
-    } else if (reply_path_len < 0) {
+    } else if (reply_path_len == 0xFF) {
       mesh::Packet* reply = createDatagram(PAYLOAD_TYPE_RESPONSE, sender, secret, reply_data, reply_len);
       if (reply) sendFloodReply(reply, SERVER_RESPONSE_DELAY, packet->getPathHashSize());
     } else {
       mesh::Packet* reply = createDatagram(PAYLOAD_TYPE_RESPONSE, sender, secret, reply_data, reply_len);
-      uint8_t path_len = ((reply_path_hash_size - 1) << 6) | (reply_path_len & 63);
-      if (reply) sendDirect(reply, reply_path,  path_len, SERVER_RESPONSE_DELAY);
+      if (reply) sendDirect(reply, reply_path, reply_path_len, SERVER_RESPONSE_DELAY);
     }
   }
 }
@@ -1064,6 +1060,12 @@ bool MyMesh::setRxBoostedGain(bool enable) {
   return radio_driver.setRxBoostedGainMode(enable);
 }
 
+#if defined(USE_LR2021)
+bool MyMesh::configSideDetectors(const uint8_t sideDetSFs[], uint8_t num, float bw) {
+  return radio_driver.configSideDetectors(sideDetSFs, num, bw);
+}
+#endif
+
 void MyMesh::formatNeighborsReply(char *reply) {
   char *dp = reply;
 

examples/simple_repeater/MyMesh.h

@@ -11,6 +11,7 @@
   #include <LittleFS.h>
 #elif defined(ESP32)
   #include <SPIFFS.h>
+  using File = fs::File;
 #endif
 
 #ifdef WITH_RS232_BRIDGE
@@ -69,11 +70,11 @@ struct NeighbourInfo {
 };
 
 #ifndef FIRMWARE_BUILD_DATE
-  #define FIRMWARE_BUILD_DATE   "6 Jun 2026"
+  #define FIRMWARE_BUILD_DATE   "9 Aug 2026"
 #endif
 
 #ifndef FIRMWARE_VERSION
-  #define FIRMWARE_VERSION   "v1.16.0"
+  #define FIRMWARE_VERSION   "v1.17.0"
 #endif
 
 #define FIRMWARE_ROLE "repeater"
@@ -91,8 +92,7 @@ class MyMesh : public mesh::Mesh, public CommonCLICallbacks {
   CommonCLI _cli;
   uint8_t reply_data[MAX_PACKET_PAYLOAD];
   uint8_t reply_path[MAX_PATH_SIZE];
-  int8_t  reply_path_len;
-  uint8_t reply_path_hash_size;
+  uint8_t reply_path_len;
   TransportKeyStore key_store;
   RegionMap region_map, temp_map;
   RegionEntry* load_stack[8];
@@ -254,4 +254,8 @@ public:
 
   bool setRxBoostedGain(bool enable) override;
 
+  #if defined(USE_LR2021)
+  virtual bool configSideDetectors(const uint8_t sideDetSFs[], uint8_t num, float bw) override;
+  #endif
+
 };

examples/simple_repeater/UITask.cpp

@@ -57,18 +57,17 @@ void UITask::renderCurrScreen() {
   char tmp[80];
   if (millis() < _started_at + BOOT_SCREEN_MILLIS) { // boot screen
     // meshcore logo
-    _display->setColor(DisplayDriver::BLUE);
+    _display->setColor(UIColor::corp_blue);
     int logoWidth = 128;
     _display->drawXbm((_display->width() - logoWidth) / 2, 3, meshcore_logo, logoWidth, 13);
 
     // meshcore website
     const char* website = "https://meshcore.io";
-    _display->setColor(DisplayDriver::LIGHT);
+    _display->setColor(UIColor::primary_txt);
     _display->setTextSize(1);
     _display->drawTextCentered(_display->width() / 2, 22, website);
 
     // version info
-    _display->setColor(DisplayDriver::LIGHT);
     _display->setTextSize(1);
     _display->drawTextCentered(_display->width() / 2, 35, _version_info);
 
@@ -77,13 +76,13 @@ void UITask::renderCurrScreen() {
     _display->drawTextCentered(_display->width() / 2, 48, node_type);
   } else if (_powering_off_at > 0) {
     // meshcore logo
-    _display->setColor(DisplayDriver::BLUE);
+    _display->setColor(UIColor::corp_blue);
     int logoWidth = 128;
     _display->drawXbm((_display->width() - logoWidth) / 2, 3, meshcore_logo, logoWidth, 13);
 
     // meshcore website
     const char* website = "https://meshcore.io";
-    _display->setColor(DisplayDriver::LIGHT);
+    _display->setColor(UIColor::primary_txt);
     _display->setTextSize(1);
     _display->drawTextCentered(_display->width()/ 2, 22, website);
 
@@ -95,12 +94,11 @@ void UITask::renderCurrScreen() {
   } else {
     _display->setCursor(0, 0);
     _display->setTextSize(1);
-    _display->setColor(DisplayDriver::GREEN);
+    _display->setColor(UIColor::primary_txt);
     _display->print(_node_prefs->node_name);
 
     // freq / sf
     _display->setCursor(0, 20);
-    _display->setColor(DisplayDriver::YELLOW);
     sprintf(tmp, "FREQ: %06.3f SF%d", _node_prefs->freq, _node_prefs->sf);
     _display->print(tmp);
 

examples/simple_room_server/MyMesh.cpp

@@ -39,18 +39,35 @@ struct ServerStats {
 };
 
 void MyMesh::addPost(ClientInfo *client, const char *postData) {
-  // TODO: suggested postData format: <title>/<descrption>
-  posts[next_post_idx].author = client->id; // add to cyclic queue
-  StrHelper::strncpy(posts[next_post_idx].text, postData, MAX_POST_TEXT_LEN);
+  storePost(client->id, postData);
+}
 
-  posts[next_post_idx].post_timestamp = getRTCClock()->getCurrentTimeUnique();
+void MyMesh::addSystemPost(const char *postData) {
+  if (!postData || postData[0] == 0) return;
+
+  MESH_DEBUG_PRINTLN("room.post: addSystemPost: %s", postData);
+
+  storePost(self_id, postData);
+}
+
+void MyMesh::storePost(const mesh::Identity &author, const char *postData) {
+  int idx = next_post_idx;
+  // TODO: suggested postData format: <title>/<descrption>
+  posts[idx].author = author; // add to cyclic queue
+  StrHelper::strncpy(posts[idx].text, postData, MAX_POST_TEXT_LEN);
+
+  posts[idx].post_timestamp = getRTCClock()->getCurrentTimeUnique();
+  MESH_DEBUG_PRINTLN("room.post: storePost idx=%d text=%s", idx, posts[idx].text);
+  MESH_DEBUG_PRINTLN("room.post: timestamp=%u", posts[idx].post_timestamp);
   next_post_idx = (next_post_idx + 1) % MAX_UNSYNCED_POSTS;
 
   next_push = futureMillis(PUSH_NOTIFY_DELAY_MILLIS);
   _num_posted++; // stats
+  MESH_DEBUG_PRINTLN("room.post: next_post_idx=%d num_posted=%d push scheduled", next_post_idx, _num_posted);
 }
 
 void MyMesh::pushPostToClient(ClientInfo *client, PostInfo &post) {
+  MESH_DEBUG_PRINTLN("room.post: pushPostToClient text=%s", post.text);
   int len = 0;
   memcpy(&reply_data[len], &post.post_timestamp, 4);
   len += 4; // this is a PAST timestamp... but should be accepted by client
@@ -948,6 +965,15 @@ void MyMesh::handleCommand(uint32_t sender_timestamp, char *command, char *reply
       Serial.printf("\n");
     }
     reply[0] = 0;
+  } else if (strncmp(command, "room.post", 9) == 0) {
+    char* msg = command + 9;
+    while (*msg == ' ') msg++;
+    if (*msg == 0) {
+      snprintf(reply, MAX_POST_TEXT_LEN, "ERR empty message");
+    } else {
+      addSystemPost(msg);
+      snprintf(reply, MAX_POST_TEXT_LEN, "OK");
+    }
   } else{
     _cli.handleCommand(sender_timestamp, command, reply);  // common CLI commands
   }

examples/simple_room_server/MyMesh.h

@@ -27,11 +27,11 @@
 /* ------------------------------ Config -------------------------------- */
 
 #ifndef FIRMWARE_BUILD_DATE
-  #define FIRMWARE_BUILD_DATE   "6 Jun 2026"
+  #define FIRMWARE_BUILD_DATE   "9 Aug 2026"
 #endif
 
 #ifndef FIRMWARE_VERSION
-  #define FIRMWARE_VERSION   "v1.16.0"
+  #define FIRMWARE_VERSION   "v1.17.0"
 #endif
 
 #ifndef LORA_FREQ
@@ -119,6 +119,7 @@ class MyMesh : public mesh::Mesh, public CommonCLICallbacks {
   int  matching_peer_indexes[MAX_CLIENTS];
 
   void addPost(ClientInfo* client, const char* postData);
+  void storePost(const mesh::Identity& author, const char* postData);
   void pushPostToClient(ClientInfo* client, PostInfo& post);
   uint8_t getUnsyncedCount(ClientInfo* client);
   bool processAck(const uint8_t *data);
@@ -176,6 +177,7 @@ public:
   MyMesh(mesh::MainBoard& board, mesh::Radio& radio, mesh::MillisecondClock& ms, mesh::RNG& rng, mesh::RTCClock& rtc, mesh::MeshTables& tables);
 
   void begin(FILESYSTEM* fs);
+  void addSystemPost(const char* postData);
 
   const char* getFirmwareVer() override { return FIRMWARE_VERSION; }
   const char* getBuildDate() override { return FIRMWARE_BUILD_DATE; }

examples/simple_room_server/UITask.cpp

@@ -49,20 +49,19 @@ void UITask::renderCurrScreen() {
   char tmp[80];
   if (millis() < BOOT_SCREEN_MILLIS) { // boot screen
     // meshcore logo
-    _display->setColor(DisplayDriver::BLUE);
+    _display->setColor(UIColor::corp_blue);
     int logoWidth = 128;
     _display->drawXbm((_display->width() - logoWidth) / 2, 3, meshcore_logo, logoWidth, 13);
 
     // meshcore website
     const char* website = "https://meshcore.io";
-    _display->setColor(DisplayDriver::LIGHT);
+    _display->setColor(UIColor::primary_txt);
     _display->setTextSize(1);
     uint16_t websiteWidth = _display->getTextWidth(website);
     _display->setCursor((_display->width() - websiteWidth) / 2, 22);
     _display->print(website);
 
     // version info
-    _display->setColor(DisplayDriver::LIGHT);
     _display->setTextSize(1);
     uint16_t versionWidth = _display->getTextWidth(_version_info);
     _display->setCursor((_display->width() - versionWidth) / 2, 35);
@@ -77,12 +76,11 @@ void UITask::renderCurrScreen() {
     // node name
     _display->setCursor(0, 0);
     _display->setTextSize(1);
-    _display->setColor(DisplayDriver::GREEN);
+    _display->setColor(UIColor::primary_txt);
     _display->print(_node_prefs->node_name);
 
     // freq / sf
     _display->setCursor(0, 20);
-    _display->setColor(DisplayDriver::YELLOW);
     sprintf(tmp, "FREQ: %06.3f SF%d", _node_prefs->freq, _node_prefs->sf);
     _display->print(tmp);
 

examples/simple_sensor/SensorMesh.h

@@ -34,11 +34,11 @@
 #define PERM_RECV_ALERTS_HI    (1 << 7)   // high priority alerts
 
 #ifndef FIRMWARE_BUILD_DATE
-  #define FIRMWARE_BUILD_DATE   "6 Jun 2026"
+  #define FIRMWARE_BUILD_DATE   "9 Aug 2026"
 #endif
 
 #ifndef FIRMWARE_VERSION
-  #define FIRMWARE_VERSION   "v1.16.0"
+  #define FIRMWARE_VERSION   "v1.17.0"
 #endif
 
 #define FIRMWARE_ROLE "sensor"

examples/simple_sensor/UITask.cpp

@@ -49,20 +49,19 @@ void UITask::renderCurrScreen() {
   char tmp[80];
   if (millis() < BOOT_SCREEN_MILLIS) { // boot screen
     // meshcore logo
-    _display->setColor(DisplayDriver::BLUE);
+    _display->setColor(UIColor::corp_blue);
     int logoWidth = 128;
     _display->drawXbm((_display->width() - logoWidth) / 2, 3, meshcore_logo, logoWidth, 13);
 
     // meshcore website
     const char* website = "https://meshcore.io";
-    _display->setColor(DisplayDriver::LIGHT);
+    _display->setColor(UIColor::primary_txt);
     _display->setTextSize(1);
     uint16_t websiteWidth = _display->getTextWidth(website);
     _display->setCursor((_display->width() - websiteWidth) / 2, 22);
     _display->print(website);
 
     // version info
-    _display->setColor(DisplayDriver::LIGHT);
     _display->setTextSize(1);
     uint16_t versionWidth = _display->getTextWidth(_version_info);
     _display->setCursor((_display->width() - versionWidth) / 2, 35);
@@ -77,12 +76,11 @@ void UITask::renderCurrScreen() {
     // node name
     _display->setCursor(0, 0);
     _display->setTextSize(1);
-    _display->setColor(DisplayDriver::GREEN);
+    _display->setColor(UIColor::primary_txt);
     _display->print(_node_prefs->node_name);
 
     // freq / sf
     _display->setCursor(0, 20);
-    _display->setColor(DisplayDriver::YELLOW);
     sprintf(tmp, "FREQ: %06.3f SF%d", _node_prefs->freq, _node_prefs->sf);
     _display->print(tmp);
 

platformio.ini

@@ -91,9 +91,10 @@ build_flags = ${arduino_base.build_flags}
   -D NRF52_PLATFORM
   -D LFS_NO_ASSERT=1
   -D EXTRAFS=1
+  -D USE_CC310_HW_CRYPTO=1
 lib_deps =
   ${arduino_base.lib_deps}
-  https://github.com/oltaco/CustomLFS#0.2.2
+  https://github.com/oltaco/CustomLFS#0.2.3
 ; ----------------- RP2040 ---------------------
 
 [rp2040_base]

src/Identity.cpp

@@ -4,6 +4,11 @@
 #include <ed_25519.h>
 #include <Ed25519.h>
 
+#ifdef USE_CC310_HW_CRYPTO
+#include <Adafruit_nRFCrypto.h>
+#include "nrf_cc310/include/crys_ec_edw_api.h"
+#endif
+
 namespace mesh {
 
 Identity::Identity() {
@@ -15,7 +20,20 @@ Identity::Identity(const char* pub_hex) {
 }
 
 bool Identity::verify(const uint8_t* sig, const uint8_t* message, int msg_len) const {
-#if 0
+#ifdef USE_CC310_HW_CRYPTO
+  // nRF52840 CryptoCell CC310 hardware Ed25519 verification. The software
+  // implementations need ~3KB of stack (which can overflow the Adafruit core's
+  // 4KB loop task stack from the advert receive path); the hardware path
+  // needs much less, around 600-700bytes. The CC310 workspace is static, faster,
+  // should save power at scale as well.
+  static CRYS_ECEDW_TempBuff_t cc310_tmp;
+  nRFCrypto.begin();
+  CRYSError_t rc = CRYS_ECEDW_Verify((uint8_t*)sig, CRYS_ECEDW_SIGNATURE_BYTES,
+                                     (uint8_t*)pub_key, CRYS_ECEDW_MOD_SIZE_IN_BYTES,
+                                     (uint8_t*)message, (size_t)msg_len, &cc310_tmp);
+  nRFCrypto.end();
+  return rc == CRYS_OK;
+#elif 0
   // NOTE:  memory corruption bug was found in this function!!
   return ed25519_verify(sig, message, msg_len, pub_key);
 #else

src/Utils.cpp

@@ -2,6 +2,13 @@
 #include <AES.h>
 #include <SHA256.h>
 
+#ifdef USE_CC310_HW_CRYPTO
+#include <Adafruit_nRFCrypto.h>
+#include "nrf_cc310/include/crys_hash.h"
+#include "nrf_cc310/include/crys_hmac.h"
+#include "nrf_cc310/include/ssi_aes.h"
+#endif
+
 #ifdef ARDUINO
   #include <Arduino.h>
 #endif
@@ -15,19 +22,58 @@ uint32_t RNG::nextInt(uint32_t _min, uint32_t _max) {
 }
 
 void Utils::sha256(uint8_t *hash, size_t hash_len, const uint8_t* msg, int msg_len) {
+#ifdef USE_CC310_HW_CRYPTO
+  static CRYS_HASH_Result_t result;
+  nRFCrypto.begin();
+  CRYS_HASH(CRYS_HASH_SHA256_mode, (uint8_t*)msg, (size_t)msg_len, result);
+  nRFCrypto.end();
+  memcpy(hash, result, hash_len);
+#else
   SHA256 sha;
   sha.update(msg, msg_len);
   sha.finalize(hash, hash_len);
+#endif
 }
 
 void Utils::sha256(uint8_t *hash, size_t hash_len, const uint8_t* frag1, int frag1_len, const uint8_t* frag2, int frag2_len) {
+#ifdef USE_CC310_HW_CRYPTO
+  static CRYS_HASHUserContext_t ctx;
+  static CRYS_HASH_Result_t result;
+  nRFCrypto.begin();
+  CRYS_HASH_Init(&ctx, CRYS_HASH_SHA256_mode);
+  CRYS_HASH_Update(&ctx, (uint8_t*)frag1, (size_t)frag1_len);
+  CRYS_HASH_Update(&ctx, (uint8_t*)frag2, (size_t)frag2_len);
+  CRYS_HASH_Finish(&ctx, result);
+  nRFCrypto.end();
+  memcpy(hash, result, hash_len);
+#else
   SHA256 sha;
   sha.update(frag1, frag1_len);
   sha.update(frag2, frag2_len);
   sha.finalize(hash, hash_len);
+#endif
 }
 
 int Utils::decrypt(const uint8_t* shared_secret, uint8_t* dest, const uint8_t* src, int src_len) {
+#ifdef USE_CC310_HW_CRYPTO
+  static SaSiAesUserContext_t ctx;
+  SaSiAesUserKeyData_t keyData = { (uint8_t*)shared_secret, CIPHER_KEY_SIZE };
+  uint8_t* dp = dest;
+  const uint8_t* sp = src;
+  size_t dummy_out = 0;
+
+  nRFCrypto.begin();
+  SaSi_AesInit(&ctx, SASI_AES_DECRYPT, SASI_AES_MODE_ECB, SASI_AES_PADDING_NONE);
+  SaSi_AesSetKey(&ctx, SASI_AES_USER_KEY, &keyData, sizeof(keyData));
+  while (sp - src < src_len) {
+    SaSi_AesBlock(&ctx, (uint8_t*)sp, 16, dp);
+    dp += 16; sp += 16;
+  }
+  SaSi_AesFinish(&ctx, 0, NULL, 0, NULL, &dummy_out);
+  SaSi_AesFree(&ctx);
+  nRFCrypto.end();
+  return sp - src;
+#else
   AES128 aes;
   uint8_t* dp = dest;
   const uint8_t* sp = src;
@@ -39,9 +85,34 @@ int Utils::decrypt(const uint8_t* shared_secret, uint8_t* dest, const uint8_t* s
   }
 
   return sp - src;  // will always be multiple of 16
+#endif
 }
 
 int Utils::encrypt(const uint8_t* shared_secret, uint8_t* dest, const uint8_t* src, int src_len) {
+#ifdef USE_CC310_HW_CRYPTO
+  static SaSiAesUserContext_t ctx;
+  SaSiAesUserKeyData_t keyData = { (uint8_t*)shared_secret, CIPHER_KEY_SIZE };
+  uint8_t* dp = dest;
+  size_t dummy_out = 0;
+
+  nRFCrypto.begin();
+  SaSi_AesInit(&ctx, SASI_AES_ENCRYPT, SASI_AES_MODE_ECB, SASI_AES_PADDING_NONE);
+  SaSi_AesSetKey(&ctx, SASI_AES_USER_KEY, &keyData, sizeof(keyData));
+  while (src_len >= 16) {
+    SaSi_AesBlock(&ctx, (uint8_t*)src, 16, dp);
+    dp += 16; src += 16; src_len -= 16;
+  }
+  if (src_len > 0) {  // remaining partial block — zero-pad to 16 bytes
+    uint8_t tmp[16] = {};
+    memcpy(tmp, src, src_len);
+    SaSi_AesBlock(&ctx, tmp, 16, dp);
+    dp += 16;
+  }
+  SaSi_AesFinish(&ctx, 0, NULL, 0, NULL, &dummy_out);
+  SaSi_AesFree(&ctx);
+  nRFCrypto.end();
+  return dp - dest;
+#else
   AES128 aes;
   uint8_t* dp = dest;
 
@@ -58,15 +129,27 @@ int Utils::encrypt(const uint8_t* shared_secret, uint8_t* dest, const uint8_t* s
     dp += 16;
   }
   return dp - dest;  // will always be multiple of 16
+#endif
 }
 
 int Utils::encryptThenMAC(const uint8_t* shared_secret, uint8_t* dest, const uint8_t* src, int src_len) {
   int enc_len = encrypt(shared_secret, dest + CIPHER_MAC_SIZE, src, src_len);
 
+#ifdef USE_CC310_HW_CRYPTO
+  static CRYS_HMACUserContext_t hmac_ctx;
+  static CRYS_HASH_Result_t hmac_result;
+  nRFCrypto.begin();
+  CRYS_HMAC_Init(&hmac_ctx, CRYS_HASH_SHA256_mode, (uint8_t*)shared_secret, PUB_KEY_SIZE);
+  CRYS_HMAC_Update(&hmac_ctx, dest + CIPHER_MAC_SIZE, enc_len);
+  CRYS_HMAC_Finish(&hmac_ctx, hmac_result);
+  nRFCrypto.end();
+  memcpy(dest, hmac_result, CIPHER_MAC_SIZE);
+#else
   SHA256 sha;
   sha.resetHMAC(shared_secret, PUB_KEY_SIZE);
   sha.update(dest + CIPHER_MAC_SIZE, enc_len);
   sha.finalizeHMAC(shared_secret, PUB_KEY_SIZE, dest, CIPHER_MAC_SIZE);
+#endif
 
   return CIPHER_MAC_SIZE + enc_len;
 }
@@ -75,12 +158,25 @@ int Utils::MACThenDecrypt(const uint8_t* shared_secret, uint8_t* dest, const uin
   if (src_len <= CIPHER_MAC_SIZE) return 0;  // invalid src bytes
 
   uint8_t hmac[CIPHER_MAC_SIZE];
+#ifdef USE_CC310_HW_CRYPTO
+  {
+    static CRYS_HMACUserContext_t hmac_ctx;
+    static CRYS_HASH_Result_t hmac_result;
+    nRFCrypto.begin();
+    CRYS_HMAC_Init(&hmac_ctx, CRYS_HASH_SHA256_mode, (uint8_t*)shared_secret, PUB_KEY_SIZE);
+    CRYS_HMAC_Update(&hmac_ctx, (uint8_t*)(src + CIPHER_MAC_SIZE), src_len - CIPHER_MAC_SIZE);
+    CRYS_HMAC_Finish(&hmac_ctx, hmac_result);
+    nRFCrypto.end();
+    memcpy(hmac, hmac_result, CIPHER_MAC_SIZE);
+  }
+#else
   {
     SHA256 sha;
     sha.resetHMAC(shared_secret, PUB_KEY_SIZE);
     sha.update(src + CIPHER_MAC_SIZE, src_len - CIPHER_MAC_SIZE);
     sha.finalizeHMAC(shared_secret, PUB_KEY_SIZE, hmac, CIPHER_MAC_SIZE);
   }
+#endif
   if (memcmp(hmac, src, CIPHER_MAC_SIZE) == 0) {
     return decrypt(shared_secret, dest, src + CIPHER_MAC_SIZE, src_len - CIPHER_MAC_SIZE);
   }
@@ -150,4 +246,4 @@ int Utils::parseTextParts(char* text, const char* parts[], int max_num, char sep
   return num;
 }
 
-}
+}

src/helpers/AdvertDataHelpers.cpp

@@ -1,4 +1,5 @@
 #include <helpers/AdvertDataHelpers.h>
+#include <helpers/UTF8Helpers.h>
 
   uint8_t AdvertDataBuilder::encodeTo(uint8_t app_data[]) {
     app_data[0] = _type;
@@ -16,11 +17,12 @@
       app_data[0] |= ADV_FEAT2_MASK;
       memcpy(&app_data[i], &_extra2, 2); i += 2;
     }
-    if (_name && *_name != 0) { 
-      app_data[0] |= ADV_NAME_MASK;
-      const char* sp = _name;
-      while (*sp && i < MAX_ADVERT_DATA_SIZE) {
-        app_data[i++] = *sp++;
+    if (_name && *_name != 0) {
+      size_t name_len = mesh::validUtf8PrefixLength(_name, MAX_ADVERT_DATA_SIZE - i);
+      if (name_len > 0) {
+        app_data[0] |= ADV_NAME_MASK;
+        memcpy(&app_data[i], _name, name_len);
+        i += name_len;
       }
     }
     return i;
@@ -84,4 +86,4 @@ void AdvertTimeHelper::formatRelativeTimeDiff(char dest[], int32_t seconds_from_
       }
     }
   }
-}
+}

src/helpers/BaseSerialInterface.h

@@ -14,6 +14,7 @@ public:
   virtual bool isEnabled() const = 0;
 
   virtual bool isConnected() const = 0;
+  virtual void loop() {};
 
   virtual bool isWriteBusy() const = 0;
   virtual size_t writeFrame(const uint8_t src[], size_t len) = 0;

src/helpers/CommonCLI.cpp

@@ -753,6 +753,28 @@ void CommonCLI::handleSetCmd(uint32_t sender_timestamp, char* command, char* rep
       _prefs->adc_multiplier = 0.0f;
       strcpy(reply, "Error: unsupported");
     };
+  #if defined(USE_LR2021)
+  } else if (memcmp(config, "extra.sf ", 9) == 0) {
+    strcpy(tmp, &config[9]);
+    const char *parts[4];
+    uint8_t sideDetSFs[4];
+    int num = mesh::Utils::parseTextParts(tmp, parts, 4);
+    if (num > 3) {
+      sprintf(reply, "Invalid extra SF config");
+    } else {
+      for (int i = 0; i < num; i++) {
+        sideDetSFs[i] = atoi(parts[i]);
+      }
+      sideDetSFs[num] = 0;
+      if (_callbacks->configSideDetectors(sideDetSFs, num, _prefs->bw)) {
+        for (int i = 0; i <= num; i++) _prefs->extra_sf[i] = sideDetSFs[i];
+        savePrefs();
+        sprintf(reply, "OK - extra SFs set");
+      } else {
+        sprintf(reply, "Invalid extra SF config");
+      }
+    }
+  #endif
   } else {
     strcpy(reply, "unknown config: ");
     StrHelper::strncpy(&reply[16], config, 160-17);
@@ -922,6 +944,14 @@ void CommonCLI::handleGetCmd(uint32_t sender_timestamp, char* command, char* rep
 #else
     strcpy(reply, "ERROR: Power management not supported");
 #endif
+  } else if (memcmp(config, "extra.sf", 8) == 0) {
+    char* tmp = reply;
+    for (int i = 0; i < 3 && _prefs->extra_sf[i] != 0; i++) {
+      tmp += sprintf(tmp, "%s%d", (i == 0) ? "" : ",", _prefs->extra_sf[i]);
+    } 
+    if (tmp == reply) {
+      sprintf(reply, "No extra SF configured");
+    }
   } else {
     sprintf(reply, "??: %s", config);
   }

src/helpers/CommonCLI.h

@@ -68,6 +68,7 @@ public:
   uint8_t path_hash_mode = 0;   // which path mode to use when sending
   uint8_t loop_detect = 0;
   uint8_t cad_enabled = 0;      // hardware Channel Activity Detection before TX (boolean)
+  uint8_t extra_sf[4];
 
 private:
   class RadioPrefs : public ConfigSerializer {
@@ -238,6 +239,12 @@ public:
   virtual bool setRxBoostedGain(bool enable) {
     return false; // CommonCLI reports unsupported if not overridden by wrapper
   };
+
+  #if defined(USE_LR2021)
+  virtual bool configSideDetectors(const uint8_t sideDetSFs[], uint8_t num, float bw) {
+    return false; // Override in wrapper
+  } 
+  #endif
 };
 
 class CommonCLI {

src/helpers/MultiSerialInterface.h

@@ -0,0 +1,200 @@
+#pragma once
+
+#include "BaseSerialInterface.h"
+
+#ifndef MAX_INTERFACES
+  // ble, usb, wifi, ethernet
+  #define MAX_INTERFACES 4
+#endif
+
+enum class InterfaceType : uint8_t {
+  NONE,
+  Bluetooth,
+  USB,
+  WiFi,
+  Ethernet,
+  HardwareSerial
+};
+
+class MultiSerialInterface : public BaseSerialInterface {
+private:
+
+  struct RegisteredInterface {
+    InterfaceType type = InterfaceType::NONE;
+    BaseSerialInterface* instance = nullptr;
+  };
+
+  bool _enabled = false;
+  RegisteredInterface _interfaces[MAX_INTERFACES] = {};
+
+public:
+  bool addInterface(InterfaceType type, BaseSerialInterface* iface) {
+    // make sure an interface was provided
+    if(iface == nullptr){
+      return false;
+    }
+
+    // put it in the first free slot
+    for(int i = 0; i < MAX_INTERFACES; i++){
+      if(_interfaces[i].instance == nullptr){
+        _interfaces[i].instance = iface;
+        _interfaces[i].type = type;
+        return true;
+      }
+    }
+
+    // no free slots available
+    return false;
+  }
+
+  bool removeInterface(BaseSerialInterface* iface) {
+    // make sure an interface was provided
+    if(iface == nullptr){
+      return false;
+    }
+
+    // find and remove interface
+    for(int i = 0; i < MAX_INTERFACES; i++){
+      if(_interfaces[i].instance == iface){
+        _interfaces[i] = {};
+        return true;
+      }
+    }
+
+    // interface not found
+    return false;
+  }
+
+  void enableBluetooth() {
+    for(auto iface : _interfaces){
+      if(iface.instance && iface.type == InterfaceType::Bluetooth){
+        iface.instance->enable();
+      }
+    }
+  }
+
+  void disableBluetooth() {
+    for(auto iface : _interfaces){
+      if(iface.instance && iface.type == InterfaceType::Bluetooth){
+        iface.instance->disable();
+      }
+    }
+  }
+
+  bool isBluetoothEnabled() {
+    for(auto iface : _interfaces){
+      if(iface.instance && iface.type == InterfaceType::Bluetooth){
+        return iface.instance->isEnabled();
+      }
+    }
+    return false; 
+  }
+
+  // enable all interfaces
+  void enable() override {
+    _enabled = true;
+    for(auto iface : _interfaces){
+      if(iface.instance){
+        iface.instance->enable();
+      }
+    }
+  }
+
+  // disable all interfaces
+  void disable() override {
+    _enabled = false;
+    for(auto iface : _interfaces){
+      if(iface.instance){
+        iface.instance->disable();
+      }
+    }
+  }
+
+  bool isEnabled() const override { 
+    return _enabled; 
+  }
+
+  bool isConnected() const override {
+    // not connected when disabled
+    if(!_enabled){
+      return false;
+    }
+    
+    // check if any interface is connected
+    for(auto iface : _interfaces){
+      if(iface.instance && iface.instance->isConnected()) {
+        return true;
+      }
+    }
+
+    // nothing connected
+    return false;
+  }
+
+  // loop all interfaces
+  void loop() override {
+    for(auto iface : _interfaces){
+      if(iface.instance){
+        iface.instance->loop();
+      }
+    }
+  }
+
+  bool isWriteBusy() const override {
+    // not busy when disabled
+    if(!_enabled){
+      return false;
+    }
+
+    // check if any interface is busy
+    for(auto iface : _interfaces){
+      if(iface.instance && iface.instance->isEnabled() && iface.instance->isWriteBusy()){
+        return true;
+      }
+    }
+
+    // nothing busy
+    return false;
+  }
+
+  size_t writeFrame(const uint8_t src[], size_t len) override {
+    // don't write when disabled or nothing provided
+    if(!_enabled || len == 0){
+      return 0;
+    }
+
+    // write frame to all enabled interfaces
+    bool allSuccessful = true;
+    for(auto iface : _interfaces){
+      if(iface.instance && iface.instance->isEnabled()){
+        if(iface.instance->writeFrame(src, len) != len){
+          allSuccessful = false;
+        }
+      }
+    }
+
+    // report success if all writes completed successfully
+    return allSuccessful ? len : 0; 
+  }
+
+  size_t checkRecvFrame(uint8_t dest[]) override {
+    // don't read when disabled
+    if(!_enabled){
+      return 0;
+    }
+
+    // try to read a frame from any enabled interface
+    for(auto iface : _interfaces){
+      if(iface.instance && iface.instance->isEnabled()){
+        size_t frameSize = iface.instance->checkRecvFrame(dest);
+        if(frameSize > 0){
+          return frameSize; 
+        }
+      }
+    }
+
+    // no frame received
+    return 0;
+  }
+
+};

src/helpers/NRF52Board.cpp

@@ -396,7 +396,8 @@ bool NRF52Board::startOTAUpdate(const char *id, char reply[]) {
   Bluefruit.configPrphBandwidth(BANDWIDTH_MAX);
   Bluefruit.configPrphConn(92, BLE_GAP_EVENT_LENGTH_MIN, 16, 16);
 
-  Bluefruit.begin(1, 0);
+  if (!Bluefruit.begin(1, 0)) return false;
+
   // Set max power. Accepted values are: -40, -30, -20, -16, -12, -8, -4, 0, 4
   Bluefruit.setTxPower(4);
   // Set the BLE device name

src/helpers/UTF8Helpers.h

@@ -0,0 +1,56 @@
+#pragma once
+
+#include <stddef.h>
+#include <stdint.h>
+
+namespace mesh {
+
+inline bool isUtf8Continuation(uint8_t byte) {
+  return (byte & 0xC0) == 0x80;
+}
+
+inline size_t validUtf8PrefixLength(const char* text, size_t max_bytes) {
+  if (text == nullptr) return 0;
+
+  size_t offset = 0;
+  while (text[offset] != '\0') {
+    const uint8_t first = static_cast<uint8_t>(text[offset]);
+    size_t sequence_length = 0;
+
+    if (first <= 0x7F) {
+      sequence_length = 1;
+    } else if (first >= 0xC2 && first <= 0xDF) {
+      sequence_length = 2;
+    } else if (first >= 0xE0 && first <= 0xEF) {
+      sequence_length = 3;
+    } else if (first >= 0xF0 && first <= 0xF4) {
+      sequence_length = 4;
+    } else {
+      break;
+    }
+
+    if (offset + sequence_length > max_bytes) break;
+
+    bool complete = true;
+    for (size_t i = 1; i < sequence_length; i++) {
+      if (text[offset + i] == '\0' || !isUtf8Continuation(static_cast<uint8_t>(text[offset + i]))) {
+        complete = false;
+        break;
+      }
+    }
+    if (!complete) break;
+
+    if (sequence_length == 3) {
+      const uint8_t second = static_cast<uint8_t>(text[offset + 1]);
+      if ((first == 0xE0 && second < 0xA0) || (first == 0xED && second > 0x9F)) break;
+    } else if (sequence_length == 4) {
+      const uint8_t second = static_cast<uint8_t>(text[offset + 1]);
+      if ((first == 0xF0 && second < 0x90) || (first == 0xF4 && second > 0x8F)) break;
+    }
+
+    offset += sequence_length;
+  }
+  return offset;
+}
+
+}  // namespace mesh

src/helpers/ethernet/EthernetInterface.h

@@ -0,0 +1,11 @@
+#pragma once
+
+#if defined(ETHERNET_ENABLED)
+  #if defined(ETHERNET_USE_CH390)
+    #include "helpers/ethernet/ch390/CH390EthernetInterface.h"
+  #elif defined(ETHERNET_USE_RAK13800)
+    #include "helpers/ethernet/RAK13800/RAK13800EthernetInterface.h"
+  #else
+    #error "ETHERNET_ENABLED is defined, but no specific driver flag (e.g. ETHERNET_USE_CH390) was provided!"
+  #endif
+#endif

src/helpers/ethernet/RAK13800/RAK13800EthernetInterface.cpp

@@ -0,0 +1,109 @@
+#include "RAK13800EthernetInterface.h"
+#include "../../nrf52/EthernetMac.h"
+#include <SPI.h>
+#include <EthernetUdp.h>
+
+#define PIN_SPI1_MISO (29) // (0 + 29)
+#define PIN_SPI1_MOSI (30) // (0 + 30)
+#define PIN_SPI1_SCK (3)   // (0 + 3)
+
+SPIClass ETHERNET_SPI_PORT(NRF_SPIM1, PIN_SPI1_MISO, PIN_SPI1_SCK, PIN_SPI1_MOSI);
+
+#define PIN_ETHERNET_POWER_EN WB_IO2    // output, high to enable
+#define PIN_ETHERNET_RESET 21
+#define PIN_ETHERNET_SS 26
+
+bool RAK13800EthernetInterface::begin() {
+
+  // WB_IO2 (power enable) is already driven HIGH by early constructor
+  // in RAK4631Board.cpp to support POE boot.
+  // Skip hardware reset — the W5100S comes out of power-on reset cleanly,
+  // and toggling reset kills the PHY link which breaks POE power.
+#ifdef PIN_ETHERNET_RESET
+        pinMode(PIN_ETHERNET_RESET, OUTPUT);
+        digitalWrite(PIN_ETHERNET_RESET, HIGH);
+#endif
+
+  // generate mac address
+  uint8_t mac[6];
+  generateEthernetMac(mac);
+  ETHERNET_DEBUG_PRINTLN(
+      "Ethernet MAC: %02X:%02X:%02X:%02X:%02X:%02X",
+      mac[0],
+      mac[1],
+      mac[2],
+      mac[3],
+      mac[4],
+      mac[5]);
+  ETHERNET_SPI_PORT.begin();
+  Ethernet.init(ETHERNET_SPI_PORT, PIN_ETHERNET_SS);
+
+  // Use static IP if build flags are defined, otherwise DHCP
+  #if defined(ETHERNET_STATIC_IP) && defined(ETHERNET_STATIC_GATEWAY) && defined(ETHERNET_STATIC_SUBNET) && defined(ETHERNET_STATIC_DNS)
+  IPAddress ip(ETHERNET_STATIC_IP);
+  IPAddress gateway(ETHERNET_STATIC_GATEWAY);
+  IPAddress subnet(ETHERNET_STATIC_SUBNET);
+  IPAddress dns(ETHERNET_STATIC_DNS);
+  Ethernet.begin(mac, ip, dns, gateway, subnet);
+  #else
+  if (Ethernet.begin(mac) == 0) {
+    ETHERNET_DEBUG_PRINTLN("Failed to initialize RAK13800 hardware.");
+    if (Ethernet.hardwareStatus() == EthernetNoHardware) {
+      ETHERNET_DEBUG_PRINTLN("Ethernet hardware not found.");
+    } else if (Ethernet.linkStatus() == LinkOFF) {
+      ETHERNET_DEBUG_PRINTLN("Ethernet cable not connected.");
+    } else {
+      ETHERNET_DEBUG_PRINTLN("DHCP failed for unknown reason.");
+    }
+    return false;
+  }
+  #endif
+
+  ETHERNET_DEBUG_PRINTLN("Ethernet begin complete");
+  ETHERNET_DEBUG_PRINT_IP("IP Address", Ethernet.localIP());
+  ETHERNET_DEBUG_PRINT_IP("Subnet Mask", Ethernet.subnetMask());
+  ETHERNET_DEBUG_PRINT_IP("Gateway", Ethernet.gatewayIP());
+  ETHERNET_DEBUG_PRINT_IP("DNS", Ethernet.dnsServerIP());
+
+  server.begin();
+  ETHERNET_DEBUG_PRINTLN("listening on TCP port: %d", ETHERNET_TCP_PORT);
+
+  return true;
+}
+
+int RAK13800EthernetInterface::available() {
+  return client.available();
+}
+
+int RAK13800EthernetInterface::read() {
+  return client.read();
+}
+
+size_t RAK13800EthernetInterface::write(const uint8_t *buf, size_t size) {
+  return client.write(buf, size);
+}
+
+bool RAK13800EthernetInterface::isConnected() const {
+  return _isConnected;
+}
+
+void RAK13800EthernetInterface::loop() {
+
+  Ethernet.maintain();
+  
+  auto newClient = server.accept();
+  if (newClient) {
+    IPAddress remoteIp = newClient.remoteIP();
+    uint16_t remotePort = newClient.remotePort();
+    ETHERNET_DEBUG_PRINTLN("New client accepted %u.%u.%u.%u:%u", remoteIp[0], remoteIp[1], remoteIp[2], remoteIp[3], remotePort);
+    if (client) {
+      ETHERNET_DEBUG_PRINTLN("Closing previous client");
+      client.stop();
+    }
+    client = newClient;
+    onClientConnected();
+  }
+
+  _isConnected = client.connected();
+
+}

src/helpers/ethernet/RAK13800/RAK13800EthernetInterface.h

@@ -0,0 +1,27 @@
+#pragma once
+
+#include "../SerialEthernetInterface.h"
+#include <SPI.h>
+#include <RAK13800_W5100S.h>
+
+class RAK13800EthernetInterface : public SerialEthernetInterface {
+  
+  bool _isConnected;
+  EthernetServer server;
+  EthernetClient client;
+
+  public:
+    RAK13800EthernetInterface() : server(EthernetServer(ETHERNET_TCP_PORT)) {
+      _isConnected = false;
+    }
+    
+    bool begin();
+    void loop() override;
+
+    // BaseSerialInterface methods
+    bool isConnected() const override;
+
+    int available() override;
+    int read() override;
+    size_t write(const uint8_t *buf, size_t size) override;
+};

src/helpers/ethernet/SerialEthernetInterface.cpp

@@ -0,0 +1,140 @@
+#include "SerialEthernetInterface.h"
+
+#define RECV_STATE_IDLE        0
+#define RECV_STATE_HDR_FOUND   1
+#define RECV_STATE_LEN1_FOUND  2
+#define RECV_STATE_LEN2_FOUND  3
+
+bool SerialEthernetInterface::begin() {
+  return true;
+}
+
+void SerialEthernetInterface::enable() {
+  if (_isEnabled) return;
+  _isEnabled = true;
+  clearBuffers();
+}
+
+void SerialEthernetInterface::disable() {
+  _isEnabled = false;
+}
+
+size_t SerialEthernetInterface::writeFrame(const uint8_t src[], size_t len) {
+  if (len > MAX_FRAME_SIZE) {
+    ETHERNET_DEBUG_PRINTLN("writeFrame(), frame too big, len=%d\n", len);
+    return 0;
+  }
+
+  if (isConnected() && len > 0) {
+    if (send_queue_len >= FRAME_QUEUE_SIZE) {
+      ETHERNET_DEBUG_PRINTLN("writeFrame(), send_queue is full!");
+      return 0;
+    }
+
+    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;
+}
+
+bool SerialEthernetInterface::isWriteBusy() const {
+  return false;
+}
+
+void SerialEthernetInterface::onClientConnected() {
+  _state = RECV_STATE_IDLE;
+  _frame_len = 0;
+  _rx_len = 0;
+}
+
+size_t SerialEthernetInterface::checkRecvFrame(uint8_t dest[]) {
+
+  if (isConnected()) {
+    if (send_queue_len > 0) {   // first, check send queue
+
+      _last_write = millis();
+      int len = send_queue[0].len;
+
+#if ETHERNET_RAW_LINE
+      ETHERNET_DEBUG_PRINTLN("TX line len=%d", len);
+      client.write(send_queue[0].buf, len);
+      client.write("\r\n", 2);
+#else
+      uint8_t pkt[3+len]; // use same header as serial interface so client can delimit frames
+      pkt[0] = '>';
+      pkt[1] = (len & 0xFF);  // LSB
+      pkt[2] = (len >> 8);    // MSB
+      memcpy(&pkt[3], send_queue[0].buf, send_queue[0].len);
+      ETHERNET_DEBUG_PRINTLN("Sending frame len=%d", len);
+      #if ETHERNET_DEBUG_LOGGING && ARDUINO
+      ETHERNET_DEBUG_PRINTLN("TX frame len=%d", len);
+      #endif
+      write(pkt, 3 + len);
+#endif
+      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 {
+      while (available()) {
+        int c = read();
+        if (c < 0) break;
+
+#if ETHERNET_RAW_LINE
+        if (c == '\r' || c == '\n') {
+          if (_rx_len == 0) {
+            continue;
+          }
+          uint16_t out_len = _rx_len;
+          if (out_len > MAX_FRAME_SIZE) out_len = MAX_FRAME_SIZE;
+          memcpy(dest, _rx_buf, out_len);
+          _rx_len = 0;
+          return out_len;
+        }
+        if (_rx_len < MAX_FRAME_SIZE) {
+          _rx_buf[_rx_len] = (uint8_t)c;
+          _rx_len++;
+        }
+#else
+        switch (_state) {
+          case RECV_STATE_IDLE:
+            if (c == '<') {
+              _state = RECV_STATE_HDR_FOUND;
+            }
+            break;
+          case RECV_STATE_HDR_FOUND:
+            _frame_len = (uint8_t)c;
+            _state = RECV_STATE_LEN1_FOUND;
+            break;
+          case RECV_STATE_LEN1_FOUND:
+            _frame_len |= ((uint16_t)c) << 8;
+            _rx_len = 0;
+            _state = _frame_len > 0 ? RECV_STATE_LEN2_FOUND : RECV_STATE_IDLE;
+            break;
+          default:
+            if (_rx_len < MAX_FRAME_SIZE) {
+              _rx_buf[_rx_len] = (uint8_t)c;
+            }
+            _rx_len++;
+            if (_rx_len >= _frame_len) {
+              if (_frame_len > MAX_FRAME_SIZE) {
+                _frame_len = MAX_FRAME_SIZE;
+              }
+              #if ETHERNET_DEBUG_LOGGING && ARDUINO
+              ETHERNET_DEBUG_PRINTLN("RX frame len=%d", _frame_len);
+              #endif
+              memcpy(dest, _rx_buf, _frame_len);
+              _state = RECV_STATE_IDLE;
+              return _frame_len;
+            }
+        }
+#endif
+      }
+    }
+  }
+
+  return 0;
+}

src/helpers/ethernet/SerialEthernetInterface.h

@@ -1,10 +1,6 @@
 #pragma once
 
-#ifdef ETHERNET_ENABLED
-
-#include "helpers/BaseSerialInterface.h"
-#include <SPI.h>
-#include <RAK13800_W5100S.h>
+#include "../BaseSerialInterface.h"
 
 #ifndef ETHERNET_TCP_PORT
   #define ETHERNET_TCP_PORT 5000
@@ -12,7 +8,6 @@
 // define ETHERNET_RAW_LINE=1 to use raw line-based CLI instead of framed packets
 
 class SerialEthernetInterface : public BaseSerialInterface {
-  bool deviceConnected;
   bool _isEnabled;
   unsigned long _last_write;
   uint8_t _state;
@@ -20,9 +15,6 @@ class SerialEthernetInterface : public BaseSerialInterface {
   uint16_t _rx_len;
   uint8_t _rx_buf[MAX_FRAME_SIZE];
 
-  EthernetServer server;
-  EthernetClient client;
-
   struct Frame {
     uint8_t len;
     uint8_t buf[MAX_FRAME_SIZE];
@@ -42,8 +34,7 @@ class SerialEthernetInterface : public BaseSerialInterface {
   protected:
 
   public:
-    SerialEthernetInterface() : server(EthernetServer(ETHERNET_TCP_PORT)) {
-        deviceConnected = false;
+    SerialEthernetInterface() {
         _isEnabled = false;
         _last_write = 0;
         send_queue_len = 0;
@@ -53,6 +44,8 @@ class SerialEthernetInterface : public BaseSerialInterface {
     }
     bool begin();
 
+    void onClientConnected();
+
     // BaseSerialInterface methods
     void enable() override;
     void disable() override;
@@ -64,7 +57,9 @@ class SerialEthernetInterface : public BaseSerialInterface {
     size_t writeFrame(const uint8_t src[], size_t len) override;
     size_t checkRecvFrame(uint8_t dest[]) override;
 
-    void loop();
+    virtual int available() = 0;
+    virtual int read() = 0;
+    virtual size_t write(const uint8_t *buf, size_t size) = 0;
 };
 
 
@@ -72,11 +67,9 @@ class SerialEthernetInterface : public BaseSerialInterface {
   #include <Arduino.h>
   #define ETHERNET_DEBUG_PRINT(F, ...) Serial.printf("ETH: " F, ##__VA_ARGS__)
   #define ETHERNET_DEBUG_PRINTLN(F, ...) Serial.printf("ETH: " F "\n", ##__VA_ARGS__)
-  #define ETHERNET_DEBUG_PRINT_IP(name, ip) Serial.printf(name ": %u.%u.%u.%u" "\n", ip[0], ip[1], ip[2], ip[3])
+  #define ETHERNET_DEBUG_PRINT_IP(name, ip) Serial.printf("ETH: " name ": %u.%u.%u.%u" "\n", ip[0], ip[1], ip[2], ip[3])
 #else
   #define ETHERNET_DEBUG_PRINT(...) {}
   #define ETHERNET_DEBUG_PRINTLN(...) {}
   #define ETHERNET_DEBUG_PRINT_IP(...) {}
 #endif
-
-#endif // ETHERNET_ENABLED

src/helpers/ethernet/ch390/CH390EthernetInterface.cpp

@@ -0,0 +1,94 @@
+#include "CH390EthernetInterface.h"
+
+void onWiFiEvent(WiFiEvent_t event) {
+  switch(event){
+    case ARDUINO_EVENT_ETH_START:
+      ETHERNET_DEBUG_PRINTLN("Ethernet Started");
+      break;
+    case ARDUINO_EVENT_ETH_CONNECTED:
+      ETHERNET_DEBUG_PRINTLN("Ethernet Connected");
+      break;
+    case ARDUINO_EVENT_ETH_DISCONNECTED:
+      ETHERNET_DEBUG_PRINTLN("Ethernet Disconnected");
+      break;
+    case ARDUINO_EVENT_ETH_GOT_IP:
+      ETHERNET_DEBUG_PRINTLN("Ethernet Got IP");
+      ETHERNET_DEBUG_PRINT_IP("IP Address", CH390.localIP());
+      ETHERNET_DEBUG_PRINT_IP("Subnet Mask", CH390.subnetMask());
+      ETHERNET_DEBUG_PRINT_IP("Gateway", CH390.gatewayIP());
+      ETHERNET_DEBUG_PRINT_IP("DNS", CH390.dnsIP());
+      ETHERNET_DEBUG_PRINTLN("MAC Address: %s", CH390.macAddress().c_str());
+      break;
+    default:
+      break;
+  }
+}
+
+bool CH390EthernetInterface::begin() {
+
+  // listen to ethernet events
+  WiFi.onEvent(onWiFiEvent);
+
+  // Init CH390
+  ch390_config_t config = CH390_DEFAULT_CONFIG();
+  config.spi_miso_gpio = ETH_MISO_PIN;
+  config.spi_mosi_gpio = ETH_MOSI_PIN;
+  config.spi_sck_gpio = ETH_SCLK_PIN;
+  config.spi_cs_gpio = ETH_CS_PIN;
+  config.int_gpio = ETH_INT_PIN;
+  if (!CH390.begin(config)) {
+    ETHERNET_DEBUG_PRINTLN("Failed to initialize CH390 hardware.");
+    return false;
+  }
+
+  // Setup Static IP if build flags are present
+  #if defined(ETHERNET_STATIC_IP) && defined(ETHERNET_STATIC_GATEWAY) && defined(ETHERNET_STATIC_SUBNET)
+    IPAddress ip(ETHERNET_STATIC_IP);
+    IPAddress gw(ETHERNET_STATIC_GATEWAY);
+    IPAddress sn(ETHERNET_STATIC_SUBNET);
+    CH390.config(ip, gw, sn);
+  #endif
+
+  // Start Server
+  server.begin(ETHERNET_TCP_PORT);
+  ETHERNET_DEBUG_PRINTLN("listening on TCP port: %d", ETHERNET_TCP_PORT);
+
+  return true;
+}
+
+int CH390EthernetInterface::available() {
+  return client.available();
+}
+
+int CH390EthernetInterface::read() {
+  return client.read();
+}
+
+size_t CH390EthernetInterface::write(const uint8_t *buf, size_t size) {
+  return client.write(buf, size);
+}
+
+bool CH390EthernetInterface::isConnected() const {
+  return _isConnected;
+}
+
+void CH390EthernetInterface::loop() {
+  
+  if (server.hasClient()) {
+    auto newClient = server.available();
+    if (newClient) {
+      IPAddress remoteIp = newClient.remoteIP();
+      uint16_t remotePort = newClient.remotePort();
+      ETHERNET_DEBUG_PRINTLN("New client accepted %u.%u.%u.%u:%u", remoteIp[0], remoteIp[1], remoteIp[2], remoteIp[3], remotePort);
+      if (client) {
+        ETHERNET_DEBUG_PRINTLN("Closing previous client");
+        client.stop();
+      }
+      client = newClient;
+      onClientConnected();
+    }
+  }
+
+  _isConnected = client.connected();
+
+}

src/helpers/ethernet/ch390/CH390EthernetInterface.h

@@ -0,0 +1,30 @@
+#pragma once
+
+#include "../SerialEthernetInterface.h"
+#include <SPI.h>
+#include <WiFi.h>
+#include <WiFiServer.h>
+#include <WiFiClient.h>
+#include <ESP32_CH390.h>
+
+class CH390EthernetInterface : public SerialEthernetInterface {
+  
+  bool _isConnected;
+  WiFiServer server;
+  WiFiClient client;
+
+  public:
+    CH390EthernetInterface(){
+      _isConnected = false;
+    }
+    
+    bool begin();
+    void loop() override;
+
+    // BaseSerialInterface methods
+    bool isConnected() const override;
+
+    int available() override;
+    int read() override;
+    size_t write(const uint8_t *buf, size_t size) override;
+};

src/helpers/nrf52/SerialEthernetInterface.cpp

@@ -1,268 +0,0 @@
-#ifdef ETHERNET_ENABLED
-
-#include "SerialEthernetInterface.h"
-#include "EthernetMac.h"
-#include <SPI.h>
-#include <EthernetUdp.h>
-
-#define PIN_SPI1_MISO (29) // (0 + 29)
-#define PIN_SPI1_MOSI (30) // (0 + 30)
-#define PIN_SPI1_SCK (3)   // (0 + 3)
-
-SPIClass ETHERNET_SPI_PORT(NRF_SPIM1, PIN_SPI1_MISO, PIN_SPI1_SCK, PIN_SPI1_MOSI);
-
-#define PIN_ETHERNET_POWER_EN WB_IO2    // output, high to enable
-#define PIN_ETHERNET_RESET 21
-#define PIN_ETHERNET_SS 26
-
-#define RECV_STATE_IDLE        0
-#define RECV_STATE_HDR_FOUND   1
-#define RECV_STATE_LEN1_FOUND  2
-#define RECV_STATE_LEN2_FOUND  3
-
-bool SerialEthernetInterface::begin() {
-
-  ETHERNET_DEBUG_PRINTLN("Ethernet initializing");
-
-  // WB_IO2 (power enable) is already driven HIGH by early constructor
-  // in RAK4631Board.cpp to support POE boot.
-  // Skip hardware reset — the W5100S comes out of power-on reset cleanly,
-  // and toggling reset kills the PHY link which breaks POE power.
-#ifdef PIN_ETHERNET_RESET
-        pinMode(PIN_ETHERNET_RESET, OUTPUT);
-        digitalWrite(PIN_ETHERNET_RESET, HIGH);
-#endif
-
-  uint8_t mac[6];
-  generateEthernetMac(mac);
-  ETHERNET_DEBUG_PRINTLN(
-      "Ethernet MAC: %02X:%02X:%02X:%02X:%02X:%02X",
-      mac[0],
-      mac[1],
-      mac[2],
-      mac[3],
-      mac[4],
-      mac[5]);
-  ETHERNET_DEBUG_PRINTLN("Init");
-  ETHERNET_SPI_PORT.begin();
-  Ethernet.init(ETHERNET_SPI_PORT, PIN_ETHERNET_SS);
-
-  // Use static IP if build flags are defined, otherwise DHCP
-  #if defined(ETHERNET_STATIC_IP) && defined(ETHERNET_STATIC_GATEWAY) && defined(ETHERNET_STATIC_SUBNET) && defined(ETHERNET_STATIC_DNS)
-  IPAddress ip(ETHERNET_STATIC_IP);
-  IPAddress gateway(ETHERNET_STATIC_GATEWAY);
-  IPAddress subnet(ETHERNET_STATIC_SUBNET);
-  IPAddress dns(ETHERNET_STATIC_DNS);
-  Ethernet.begin(mac, ip, dns, gateway, subnet);
-  #else
-  ETHERNET_DEBUG_PRINTLN("Begin");
-  if (Ethernet.begin(mac) == 0) {
-    ETHERNET_DEBUG_PRINTLN("Begin failed.");
-
-    // DHCP failed -- let's figure out why
-    if (Ethernet.hardwareStatus() == EthernetNoHardware)  // Check for Ethernet hardware present.
-    {
-      ETHERNET_DEBUG_PRINTLN("Ethernet hardware not found.");
-      return false;
-    }
-    if (Ethernet.linkStatus() == LinkOFF)     // No physical connection
-    {
-      ETHERNET_DEBUG_PRINTLN("Ethernet cable not connected.");
-      return false;
-    }
-    ETHERNET_DEBUG_PRINTLN("Ethernet: DHCP failed for unknown reason.");
-    return false;
-  }
-  #endif
-  ETHERNET_DEBUG_PRINTLN("Ethernet begin complete");
-  ETHERNET_DEBUG_PRINT_IP("IP", Ethernet.localIP());
-  ETHERNET_DEBUG_PRINT_IP("Subnet", Ethernet.subnetMask());
-  ETHERNET_DEBUG_PRINT_IP("Gateway", Ethernet.gatewayIP());
-
-  server.begin();   // start listening for clients
-  ETHERNET_DEBUG_PRINTLN("Ethernet: listening on TCP port: %d", ETHERNET_TCP_PORT);
-
-  return true;
-}
-
-void SerialEthernetInterface::enable() {
-  if (_isEnabled) return;
-
-  _isEnabled = true;
-  clearBuffers();
-}
-
-void SerialEthernetInterface::disable() {
-  _isEnabled = false;
-}
-
-size_t SerialEthernetInterface::writeFrame(const uint8_t src[], size_t len) {
-  if (len > MAX_FRAME_SIZE) {
-    ETHERNET_DEBUG_PRINTLN("writeFrame(), frame too big, len=%d\n", len);
-    return 0;
-  }
-
-  if (deviceConnected && len > 0) {
-    if (send_queue_len >= FRAME_QUEUE_SIZE) {
-      ETHERNET_DEBUG_PRINTLN("writeFrame(), send_queue is full!");
-      return 0;
-    }
-
-    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;
-}
-
-bool SerialEthernetInterface::isWriteBusy() const {
-  return false;
-}
-
-size_t SerialEthernetInterface::checkRecvFrame(uint8_t dest[]) {
-  // Use accept() (not available()) so we only see newly-accepted sockets.
-  // available() also returns existing connected sockets that have data,
-  // which would cause us to treat each inbound packet as a "new client"
-  // and stop() the underlying socket — disconnecting the companion.
-  auto newClient = server.accept();
-  if (newClient) {
-    IPAddress new_ip = newClient.remoteIP();
-    uint16_t new_port = newClient.remotePort();
-    ETHERNET_DEBUG_PRINTLN(
-        "New client accepted %u.%u.%u.%u:%u",
-        new_ip[0],
-        new_ip[1],
-        new_ip[2],
-        new_ip[3],
-        new_port);
-
-    deviceConnected = false;
-    if (client) {
-      ETHERNET_DEBUG_PRINTLN("Closing previous client");
-      client.stop();
-    }
-    _state = RECV_STATE_IDLE;
-    _frame_len = 0;
-    _rx_len = 0;
-    client = newClient;
-    ETHERNET_DEBUG_PRINTLN("Switched to new client");
-  }
-
-  if (client.connected()) {
-    if (!deviceConnected) {
-      ETHERNET_DEBUG_PRINTLN(
-          "Got connection %u.%u.%u.%u:%u",
-          client.remoteIP()[0],
-          client.remoteIP()[1],
-          client.remoteIP()[2],
-          client.remoteIP()[3],
-          client.remotePort());
-      deviceConnected = true;
-    }
-  } else {
-    if (deviceConnected) {
-      deviceConnected = false;
-      ETHERNET_DEBUG_PRINTLN("Disconnected");
-    }
-  }
-
-  if (deviceConnected) {
-    if (send_queue_len > 0) {   // first, check send queue
-
-      _last_write = millis();
-      int len = send_queue[0].len;
-
-#if ETHERNET_RAW_LINE
-      ETHERNET_DEBUG_PRINTLN("TX line len=%d", len);
-      client.write(send_queue[0].buf, len);
-      client.write("\r\n", 2);
-#else
-      uint8_t pkt[3+len]; // use same header as serial interface so client can delimit frames
-      pkt[0] = '>';
-      pkt[1] = (len & 0xFF);  // LSB
-      pkt[2] = (len >> 8);    // MSB
-      memcpy(&pkt[3], send_queue[0].buf, send_queue[0].len);
-      ETHERNET_DEBUG_PRINTLN("Sending frame len=%d", len);
-      #if ETHERNET_DEBUG_LOGGING && ARDUINO
-      ETHERNET_DEBUG_PRINTLN("TX frame len=%d", len);
-      #endif
-      client.write(pkt, 3 + len);
-#endif
-      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 {
-      while (client.available()) {
-        int c = client.read();
-        if (c < 0) break;
-
-#if ETHERNET_RAW_LINE
-        if (c == '\r' || c == '\n') {
-          if (_rx_len == 0) {
-            continue;
-          }
-          uint16_t out_len = _rx_len;
-          if (out_len > MAX_FRAME_SIZE) {
-            out_len = MAX_FRAME_SIZE;
-          }
-          memcpy(dest, _rx_buf, out_len);
-          _rx_len = 0;
-          return out_len;
-        }
-        if (_rx_len < MAX_FRAME_SIZE) {
-          _rx_buf[_rx_len] = (uint8_t)c;
-          _rx_len++;
-        }
-#else
-        switch (_state) {
-          case RECV_STATE_IDLE:
-            if (c == '<') {
-              _state = RECV_STATE_HDR_FOUND;
-            }
-            break;
-          case RECV_STATE_HDR_FOUND:
-            _frame_len = (uint8_t)c;
-            _state = RECV_STATE_LEN1_FOUND;
-            break;
-          case RECV_STATE_LEN1_FOUND:
-            _frame_len |= ((uint16_t)c) << 8;
-            _rx_len = 0;
-            _state = _frame_len > 0 ? RECV_STATE_LEN2_FOUND : RECV_STATE_IDLE;
-            break;
-          default:
-            if (_rx_len < MAX_FRAME_SIZE) {
-              _rx_buf[_rx_len] = (uint8_t)c;
-            }
-            _rx_len++;
-            if (_rx_len >= _frame_len) {
-              if (_frame_len > MAX_FRAME_SIZE) {
-                _frame_len = MAX_FRAME_SIZE;
-              }
-              #if ETHERNET_DEBUG_LOGGING && ARDUINO
-              ETHERNET_DEBUG_PRINTLN("RX frame len=%d", _frame_len);
-              #endif
-              memcpy(dest, _rx_buf, _frame_len);
-              _state = RECV_STATE_IDLE;
-              return _frame_len;
-            }
-        }
-#endif
-      }
-    }
-  }
-
-  return 0;
-}
-
-bool SerialEthernetInterface::isConnected() const {
-  return deviceConnected;
-}
-
-void SerialEthernetInterface::loop() {
-  Ethernet.maintain();
-}
-
-#endif // ETHERNET_ENABLED

src/helpers/radiolib/CustomLLCC68.h

@@ -2,10 +2,12 @@
 
 #include <RadioLib.h>
 
-#define SX126X_IRQ_HEADER_VALID                     0b0000010000  //  4     4     valid LoRa header received
-#define SX126X_IRQ_PREAMBLE_DETECTED           0x04
-
 class CustomLLCC68 : public LLCC68 {
+  uint32_t _preambleMillis = 66;
+  uint32_t _maxPayloadMillis = 3934;
+  uint32_t _activityAt = 0;
+  bool _headerSeen = false;
+
   public:
     CustomLLCC68(Module *mod) : LLCC68(mod) { }
 
@@ -78,10 +80,61 @@ class CustomLLCC68 : public LLCC68 {
     return true;  // success
   }
 
+    int16_t startReceive() override {
+      // include the PREAMBLE_DETECTED irq bit in reported flags
+      return LLCC68::startReceive(RADIOLIB_SX126X_RX_TIMEOUT_INF, RADIOLIB_IRQ_RX_DEFAULT_FLAGS | (1UL << RADIOLIB_IRQ_PREAMBLE_DETECTED), RADIOLIB_IRQ_RX_DEFAULT_MASK, 0);
+    }
+
     bool isReceiving() {
-      uint16_t irq = getIrqFlags();
-      bool detected = (irq & SX126X_IRQ_HEADER_VALID) || (irq & SX126X_IRQ_PREAMBLE_DETECTED);
-      return detected;
+      uint32_t irq = getIrqFlags();
+      bool preamble = irq & RADIOLIB_SX126X_IRQ_PREAMBLE_DETECTED; // bit 2
+      bool header   = irq & RADIOLIB_SX126X_IRQ_HEADER_VALID;      // bit 4
+      bool hdrErr   = irq & RADIOLIB_SX126X_IRQ_HEADER_ERR;        // bit 5
+      uint32_t now  = millis();
+      if (hdrErr) {
+        clearIrqFlags(RADIOLIB_SX126X_IRQ_PREAMBLE_DETECTED | RADIOLIB_SX126X_IRQ_HEADER_VALID | RADIOLIB_SX126X_IRQ_HEADER_ERR | RADIOLIB_SX126X_IRQ_SYNC_WORD_VALID);
+        _activityAt = 0;
+        _headerSeen = false;
+        return false;
+      }
+      if (!header && _headerSeen) {
+        // something cleared the header flag, reset our state.
+        _activityAt = 0; _headerSeen = false;
+        return false;
+      }
+
+      if (header) {
+        if (!_headerSeen) { _headerSeen = true; _activityAt = now; };
+        if (now - _activityAt > _maxPayloadMillis) {
+          MESH_DEBUG_PRINTLN("Clearing header IRQ after %ums", _maxPayloadMillis);
+          clearIrqFlags(RADIOLIB_SX126X_IRQ_PREAMBLE_DETECTED | RADIOLIB_SX126X_IRQ_HEADER_VALID | RADIOLIB_SX126X_IRQ_HEADER_ERR | RADIOLIB_SX126X_IRQ_SYNC_WORD_VALID);
+          _activityAt = 0; _headerSeen = false;
+          return false;
+        }
+        return true;
+      }
+      if (preamble) {
+        if (_activityAt == 0) _activityAt = now;
+        if (now - _activityAt > _preambleMillis) {
+          clearIrqFlags(RADIOLIB_SX126X_IRQ_PREAMBLE_DETECTED);
+          _activityAt = 0;
+          MESH_DEBUG_PRINTLN("Clearing preamble IRQ after %ums", _preambleMillis);
+
+          return false;
+        }
+        return true;
+      }
+      _activityAt = 0; _headerSeen = false;
+      return false;
+    }
+    
+    void setPreambleMillis(uint32_t preambleMillis) {
+      _preambleMillis = preambleMillis;
+      MESH_DEBUG_PRINTLN("Set _preambleMillis=%u", _preambleMillis);
+    }
+    void setMaxPayloadMillis(uint32_t payloadMillis) {
+      _maxPayloadMillis = payloadMillis;
+      MESH_DEBUG_PRINTLN("Set _maxPayloadMillis=%u", _maxPayloadMillis);
     }
 
     bool getRxBoostedGainMode() {

src/helpers/radiolib/CustomLLCC68Wrapper.h

@@ -14,6 +14,10 @@ public:
     ((CustomLLCC68 *)_radio)->setBandwidth(bw);
     ((CustomLLCC68 *)_radio)->setCodingRate(cr);
     updatePreamble(sf);
+    PacketMillis pm = calcMaxPacketMillis(sf, bw, cr, preambleLengthForSF(sf));
+    ((CustomLLCC68 *)_radio)->setPreambleMillis(pm.preambleMillis);
+    ((CustomLLCC68 *)_radio)->setMaxPayloadMillis(pm.payloadMillis);
+
   }
 
   bool isReceivingPacket() override { 

src/helpers/radiolib/CustomLR1110.h

@@ -35,6 +35,11 @@ class CustomLR1110 : public LR1110 {
 
     bool getRxBoostedGainMode() const { return _rx_boosted; }
 
+    int16_t startReceive() override {
+      // include the PREAMBLE_DETECTED irq bit in reported flags.
+      return LR1110::startReceive(RADIOLIB_LR11X0_RX_TIMEOUT_INF, RADIOLIB_IRQ_RX_DEFAULT_FLAGS | (1UL << RADIOLIB_IRQ_PREAMBLE_DETECTED), RADIOLIB_IRQ_RX_DEFAULT_MASK, 0);
+    }
+
     bool isReceiving() {
       uint32_t irq = getIrqStatus();
       bool preamble = irq & RADIOLIB_LR11X0_IRQ_PREAMBLE_DETECTED;      // bit 4
@@ -47,6 +52,11 @@ class CustomLR1110 : public LR1110 {
         _headerSeen = false;
         return false;
       }
+      if (!header && _headerSeen) {
+        // something cleared the header flag, reset our state.
+        _activityAt = 0; _headerSeen = false;
+        return false;
+      }
       if (header) {
         if (!_headerSeen) { _headerSeen = true; _activityAt = now; };
         if (now - _activityAt > _maxPayloadMillis) {
@@ -82,4 +92,4 @@ class CustomLR1110 : public LR1110 {
     }
 
     uint8_t getSpreadingFactor() const { return spreadingFactor; }
-};
+};

src/helpers/radiolib/CustomLR2021.h

@@ -0,0 +1,76 @@
+#pragma once
+
+#include <RadioLib.h>
+#include "MeshCore.h"
+
+class CustomLR2021 : public LR2021 {
+  bool _rx_boosted = false;
+
+  public:
+    CustomLR2021(Module *mod) : LR2021(mod) { irqDioNum = LR2021_IRQ_DIO; }
+
+    bool std_init(SPIClass* spi = NULL)
+    {
+      
+  #ifdef LR2021_TCXO_VOLTAGE
+      float tcxo = LR2021_TCXO_VOLTAGE;
+  #else
+      float tcxo = 1.6f;
+  #endif
+
+  #ifdef LORA_CR
+      uint8_t cr = LORA_CR;
+  #else
+      uint8_t cr = 5;
+  #endif
+
+  #if defined(P_LORA_SCLK)
+    #ifdef NRF52_PLATFORM
+      if (spi) { spi->setPins(P_LORA_MISO, P_LORA_SCLK, P_LORA_MOSI); spi->begin(); }
+    #elif defined(RP2040_PLATFORM)
+      if (spi) {
+        spi->setMISO(P_LORA_MISO);
+        //spi->setCS(P_LORA_NSS); // Setting CS results in freeze
+        spi->setSCK(P_LORA_SCLK);
+        spi->setMOSI(P_LORA_MOSI);
+        spi->begin();
+      }
+    #else
+      if (spi) spi->begin(P_LORA_SCLK, P_LORA_MISO, P_LORA_MOSI);
+    #endif
+  #endif
+      int status = begin(LORA_FREQ, LORA_BW, LORA_SF, cr, RADIOLIB_LR2021_LORA_SYNC_WORD_PRIVATE, LORA_TX_POWER, 16, tcxo);
+      // if radio init fails with -707/-706, try again with tcxo voltage set to 0.0f
+      if (status == RADIOLIB_ERR_SPI_CMD_FAILED || status == RADIOLIB_ERR_SPI_CMD_INVALID) {
+        tcxo = 0.0f;
+        status = begin(LORA_FREQ, LORA_BW, LORA_SF, cr, RADIOLIB_LR2021_LORA_SYNC_WORD_PRIVATE, LORA_TX_POWER, 16, tcxo);
+      }
+      if (status != RADIOLIB_ERR_NONE) {
+        Serial.print("ERROR: radio init failed: ");
+        Serial.println(status);
+        return false;  // fail
+      }
+    
+      setCRC(2);
+      explicitHeader();
+
+      
+    #ifdef LR2021_RX_BOOSTED_GAIN
+      setRxBoostedGainMode(LR2021_RX_BOOSTED_GAIN);
+    #endif
+
+      return true;  // success
+    }
+    
+    float getFreqMHz() const { return freqMHz; }
+
+    bool getRxBoostedGainMode() const { return _rx_boosted; }
+
+    bool isReceiving() {
+      uint32_t irq = getIrqStatus();
+      bool detected = ((irq & RADIOLIB_LR2021_IRQ_SYNCWORD_VALID) || (irq & RADIOLIB_LR2021_IRQ_PREAMBLE_DETECTED));
+      return detected;
+    }
+
+    uint8_t getSpreadingFactor() const { return spreadingFactor; }
+};

src/helpers/radiolib/CustomLR2021Wrapper.h

@@ -0,0 +1,107 @@
+#pragma once
+
+#include "CustomLR2021.h"
+#include "RadioLibWrappers.h"
+
+#ifndef USE_LR2021
+#define USE_LR2021
+#endif
+
+#ifndef LR2021_RX_BOOST_LEVEL
+#define LR2021_RX_BOOST_LEVEL 7
+#endif
+
+class CustomLR2021Wrapper : public RadioLibWrapper {
+public:
+  CustomLR2021Wrapper(CustomLR2021& radio, mesh::MainBoard& board) : RadioLibWrapper(radio, board) { }
+
+  void setParams(float freq, float bw, uint8_t sf, uint8_t cr) override {
+    ((CustomLR2021 *)_radio)->setFrequency(freq);
+    ((CustomLR2021 *)_radio)->setSpreadingFactor(sf);
+    ((CustomLR2021 *)_radio)->setBandwidth(bw);
+    ((CustomLR2021 *)_radio)->setCodingRate(cr);
+    updatePreamble(sf);
+    applySideDetectorConfig();
+  }
+
+  bool configSideDetectors(const uint8_t* sideDetSFs, uint8_t num, float bw) override {
+    LR2021LoRaSideDetector_t tmp[3];
+    uint8_t sf = getSpreadingFactor();
+
+    if (sf >= 10 && num > 1) { return false; }  // only 1 side detector allowed when primary SF >= 10
+    for (int i = 0; i < num; i++) {
+      if (sideDetSFs[i] > 12 || sideDetSFs[i] < 5) { return false; }  // must be valid SF
+      if (sideDetSFs[i] <= sf) { return false; }  // must be < primary SF
+      if (sideDetSFs[i] > sf + 4) { return false; }  // span must not be > 4
+
+      tmp[i].sf = sideDetSFs[i];
+      float tSym = calcTsym(tmp[i].sf, bw);
+      if (tSym >= 16.0f) {
+        tmp[i].ldro = true;
+      } else {
+        tmp[i].ldro = false; 
+      }
+      tmp[i].invertIQ = false;
+      tmp[i].syncWord = 0x12;
+    }
+    int16_t status = ((CustomLR2021 *)_radio)->setSideDetector(tmp, num);
+    RadioLibWrapper::idle(); // trigger startReceive()
+    MESH_DEBUG_PRINTLN("setSideDetector() returned %d", status);
+
+    if (status == RADIOLIB_ERR_NONE) {
+      for (int i = 0; i < num; i++) { _sideDet[i] = tmp[i]; }
+      _numSideDet = num;
+    } else {
+      return false;
+    }
+    
+    return true;
+  }
+
+  int16_t applySideDetectorConfig() {
+    int16_t status = ((CustomLR2021 *)_radio)->setSideDetector(_sideDet, _numSideDet);
+    RadioLibWrapper::idle(); // trigger startReceive()
+    return status;
+  }
+
+  float calcTsym(uint8_t sf, float bw) {
+    float tSym = (float)(uint32_t(1) << sf) / (float)bw;
+    return tSym;
+  }
+
+  bool isReceivingPacket() override {
+    return ((CustomLR2021 *)_radio)->isReceiving();
+  }
+
+  float getCurrentRSSI() override {
+    float rssi = -110;
+    ((CustomLR2021 *)_radio)->getRssiInst(&rssi);
+    return rssi;
+  }
+
+  void onSendFinished() override {
+    RadioLibWrapper::onSendFinished();
+    _radio->setPreambleLength(preambleLengthForSF(getSpreadingFactor())); // overcomes weird issues with small and big pkts
+  }
+
+  float getLastRSSI() const override { return ((CustomLR2021 *)_radio)->getRSSI(); }
+  float getLastSNR() const override { return ((CustomLR2021 *)_radio)->getSNR(); }
+
+  uint8_t getSpreadingFactor() const override { return ((CustomLR2021 *)_radio)->getSpreadingFactor(); }
+  
+  bool setRxBoostedGainMode(bool en) override {
+    ((CustomLR2021 *)_radio)->standby(); // LR2021 must be in standby to accept setRxBoostedGainMode
+    int16_t status = ((CustomLR2021 *)_radio)->setRxBoostedGainMode(en ? LR2021_RX_BOOST_LEVEL: 0);
+    RadioLibWrapper::idle(); // trigger startReceive()
+    return status == RADIOLIB_ERR_NONE;
+  }
+
+  bool getRxBoostedGainMode() const override {
+    return ((CustomLR2021 *)_radio)->getRxBoostedGainMode();
+  }
+
+  protected:
+    LR2021LoRaSideDetector_t _sideDet[3];
+    size_t _numSideDet = 0;
+
+};

src/helpers/radiolib/CustomSTM32WLx.h

@@ -2,16 +2,70 @@
 
 #include <RadioLib.h>
 
-#define SX126X_IRQ_HEADER_VALID                     0b0000010000  //  4     4     valid LoRa header received
-#define SX126X_IRQ_PREAMBLE_DETECTED           0x04
-
 class CustomSTM32WLx : public STM32WLx {
+  uint32_t _preambleMillis = 66;
+  uint32_t _maxPayloadMillis = 3934;
+  uint32_t _activityAt = 0;
+  bool _headerSeen = false;
+
   public:
     CustomSTM32WLx(STM32WLx_Module *mod) : STM32WLx(mod) { }
 
-    bool isReceiving() {
-      uint16_t irq = getIrqFlags();
-      bool detected = (irq & SX126X_IRQ_HEADER_VALID) || (irq & SX126X_IRQ_PREAMBLE_DETECTED);
-      return detected;
+    int16_t startReceive() override {
+      // include the PREAMBLE_DETECTED irq bit in reported flags
+      return STM32WLx::startReceive(RADIOLIB_SX126X_RX_TIMEOUT_INF, RADIOLIB_IRQ_RX_DEFAULT_FLAGS | (1UL << RADIOLIB_IRQ_PREAMBLE_DETECTED), RADIOLIB_IRQ_RX_DEFAULT_MASK, 0);
     }
+
+    bool isReceiving() {
+      uint32_t irq = getIrqFlags();
+      bool preamble = irq & RADIOLIB_SX126X_IRQ_PREAMBLE_DETECTED; // bit 2
+      bool header   = irq & RADIOLIB_SX126X_IRQ_HEADER_VALID;      // bit 4
+      bool hdrErr   = irq & RADIOLIB_SX126X_IRQ_HEADER_ERR;        // bit 5
+      uint32_t now  = millis();
+      if (hdrErr) {
+        clearIrqFlags(RADIOLIB_SX126X_IRQ_PREAMBLE_DETECTED | RADIOLIB_SX126X_IRQ_HEADER_VALID | RADIOLIB_SX126X_IRQ_HEADER_ERR | RADIOLIB_SX126X_IRQ_SYNC_WORD_VALID);
+        _activityAt = 0;
+        _headerSeen = false;
+        return false;
+      }
+      if (!header && _headerSeen) {
+        // something cleared the header flag, reset our state.
+        _activityAt = 0; _headerSeen = false;
+        return false;
+      }
+
+      if (header) {
+        if (!_headerSeen) { _headerSeen = true; _activityAt = now; };
+        if (now - _activityAt > _maxPayloadMillis) {
+          MESH_DEBUG_PRINTLN("Clearing header IRQ after %ums", _maxPayloadMillis);
+          clearIrqFlags(RADIOLIB_SX126X_IRQ_PREAMBLE_DETECTED | RADIOLIB_SX126X_IRQ_HEADER_VALID | RADIOLIB_SX126X_IRQ_HEADER_ERR | RADIOLIB_SX126X_IRQ_SYNC_WORD_VALID);
+          _activityAt = 0; _headerSeen = false;
+          return false;
+        }
+        return true;
+      }
+      if (preamble) {
+        if (_activityAt == 0) _activityAt = now;
+        if (now - _activityAt > _preambleMillis) {
+          clearIrqFlags(RADIOLIB_SX126X_IRQ_PREAMBLE_DETECTED);
+          _activityAt = 0;
+          MESH_DEBUG_PRINTLN("Clearing preamble IRQ after %ums", _preambleMillis);
+
+          return false;
+        }
+        return true;
+      }
+      _activityAt = 0; _headerSeen = false;
+      return false;
+    }
+
+    void setPreambleMillis(uint32_t preambleMillis) {
+      _preambleMillis = preambleMillis;
+      MESH_DEBUG_PRINTLN("Set _preambleMillis=%u", _preambleMillis);
+    }
+    void setMaxPayloadMillis(uint32_t payloadMillis) {
+      _maxPayloadMillis = payloadMillis;
+      MESH_DEBUG_PRINTLN("Set _maxPayloadMillis=%u", _maxPayloadMillis);
+    }
+
 };

src/helpers/radiolib/CustomSTM32WLxWrapper.h

@@ -15,6 +15,9 @@ public:
     ((CustomSTM32WLx *)_radio)->setBandwidth(bw);
     ((CustomSTM32WLx *)_radio)->setCodingRate(cr);
     updatePreamble(sf);
+    PacketMillis pm = calcMaxPacketMillis(sf, bw, cr, preambleLengthForSF(sf));
+    ((CustomSTM32WLx *)_radio)->setPreambleMillis(pm.preambleMillis);
+    ((CustomSTM32WLx *)_radio)->setMaxPayloadMillis(pm.payloadMillis);
   }
 
   bool isReceivingPacket() override { 

src/helpers/radiolib/CustomSX1262.h

@@ -100,6 +100,11 @@ class CustomSX1262 : public SX1262 {
       return true;  // success
     }
 
+    int16_t startReceive() override {
+      // include the PREAMBLE_DETECTED irq bit in reported flags
+      return SX1262::startReceive(RADIOLIB_SX126X_RX_TIMEOUT_INF, RADIOLIB_IRQ_RX_DEFAULT_FLAGS | (1UL << RADIOLIB_IRQ_PREAMBLE_DETECTED), RADIOLIB_IRQ_RX_DEFAULT_MASK, 0);
+    }
+
     bool isReceiving() {
       uint32_t irq = getIrqFlags();
       bool preamble = irq & RADIOLIB_SX126X_IRQ_PREAMBLE_DETECTED; // bit 2
@@ -112,6 +117,12 @@ class CustomSX1262 : public SX1262 {
         _headerSeen = false;
         return false;
       }
+      if (!header && _headerSeen) {
+        // something cleared the header flag, reset our state.
+        _activityAt = 0; _headerSeen = false;
+        return false;
+      }
+
       if (header) {
         if (!_headerSeen) { _headerSeen = true; _activityAt = now; };
         if (now - _activityAt > _maxPayloadMillis) {

src/helpers/radiolib/CustomSX1268.h

@@ -2,10 +2,12 @@
 
 #include <RadioLib.h>
 
-#define SX126X_IRQ_HEADER_VALID                0b0000010000  //  4     4     valid LoRa header received
-#define SX126X_IRQ_PREAMBLE_DETECTED           0x04
-
 class CustomSX1268 : public SX1268 {
+  uint32_t _preambleMillis = 66;
+  uint32_t _maxPayloadMillis = 3934;
+  uint32_t _activityAt = 0;
+  bool _headerSeen = false;
+
   public:
     CustomSX1268(Module *mod) : SX1268(mod) { }
 
@@ -78,12 +80,64 @@ class CustomSX1268 : public SX1268 {
       return true;  // success
     }
 
-    bool isReceiving() {
-      uint16_t irq = getIrqFlags();
-      bool detected = (irq & SX126X_IRQ_HEADER_VALID) || (irq & SX126X_IRQ_PREAMBLE_DETECTED);
-      return detected;
+    int16_t startReceive() override {
+      // include the PREAMBLE_DETECTED irq bit in reported flags
+      return SX1268::startReceive(RADIOLIB_SX126X_RX_TIMEOUT_INF, RADIOLIB_IRQ_RX_DEFAULT_FLAGS | (1UL << RADIOLIB_IRQ_PREAMBLE_DETECTED), RADIOLIB_IRQ_RX_DEFAULT_MASK, 0);
     }
 
+    bool isReceiving() {
+      uint32_t irq = getIrqFlags();
+      bool preamble = irq & RADIOLIB_SX126X_IRQ_PREAMBLE_DETECTED; // bit 2
+      bool header   = irq & RADIOLIB_SX126X_IRQ_HEADER_VALID;      // bit 4
+      bool hdrErr   = irq & RADIOLIB_SX126X_IRQ_HEADER_ERR;        // bit 5
+      uint32_t now  = millis();
+      if (hdrErr) {
+        clearIrqFlags(RADIOLIB_SX126X_IRQ_PREAMBLE_DETECTED | RADIOLIB_SX126X_IRQ_HEADER_VALID | RADIOLIB_SX126X_IRQ_HEADER_ERR | RADIOLIB_SX126X_IRQ_SYNC_WORD_VALID);
+        _activityAt = 0;
+        _headerSeen = false;
+        return false;
+      }
+      if (!header && _headerSeen) {
+        // something cleared the header flag, reset our state.
+        _activityAt = 0; _headerSeen = false;
+        return false;
+      }
+
+      if (header) {
+        if (!_headerSeen) { _headerSeen = true; _activityAt = now; };
+        if (now - _activityAt > _maxPayloadMillis) {
+          MESH_DEBUG_PRINTLN("Clearing header IRQ after %ums", _maxPayloadMillis);
+          clearIrqFlags(RADIOLIB_SX126X_IRQ_PREAMBLE_DETECTED | RADIOLIB_SX126X_IRQ_HEADER_VALID | RADIOLIB_SX126X_IRQ_HEADER_ERR | RADIOLIB_SX126X_IRQ_SYNC_WORD_VALID);
+          _activityAt = 0; _headerSeen = false;
+          return false;
+        }
+        return true;
+      }
+      if (preamble) {
+        if (_activityAt == 0) _activityAt = now;
+        if (now - _activityAt > _preambleMillis) {
+          clearIrqFlags(RADIOLIB_SX126X_IRQ_PREAMBLE_DETECTED);
+          _activityAt = 0;
+          MESH_DEBUG_PRINTLN("Clearing preamble IRQ after %ums", _preambleMillis);
+
+          return false;
+        }
+        return true;
+      }
+      _activityAt = 0; _headerSeen = false;
+      return false;
+    }
+    
+    void setPreambleMillis(uint32_t preambleMillis) {
+      _preambleMillis = preambleMillis;
+      MESH_DEBUG_PRINTLN("Set _preambleMillis=%u", _preambleMillis);
+    }
+    void setMaxPayloadMillis(uint32_t payloadMillis) {
+      _maxPayloadMillis = payloadMillis;
+      MESH_DEBUG_PRINTLN("Set _maxPayloadMillis=%u", _maxPayloadMillis);
+    }
+
+
     bool getRxBoostedGainMode() {
       uint8_t rxGain = 0;
       readRegister(RADIOLIB_SX126X_REG_RX_GAIN, &rxGain, 1);

src/helpers/radiolib/CustomSX1268Wrapper.h

@@ -18,6 +18,9 @@ public:
     ((CustomSX1268 *)_radio)->setBandwidth(bw);
     ((CustomSX1268 *)_radio)->setCodingRate(cr);
     updatePreamble(sf);
+    PacketMillis pm = calcMaxPacketMillis(sf, bw, cr, preambleLengthForSF(sf));
+    ((CustomSX1268 *)_radio)->setPreambleMillis(pm.preambleMillis);
+    ((CustomSX1268 *)_radio)->setMaxPayloadMillis(pm.payloadMillis);
   }
 
   bool isReceivingPacket() override { 

src/helpers/radiolib/RadioLibWrappers.cpp

@@ -105,6 +105,9 @@ void RadioLibWrapper::loop() {
 }
 
 void RadioLibWrapper::startRecv() {
+  #if defined(USE_LR2021)
+  _radio->standby(); // without this LR2021 can throw -706 when calling startReceive after hardware CAD when side detectors are enabled
+  #endif
   int err = _radio->startReceive();
   if (err == RADIOLIB_ERR_NONE) {
     state = STATE_RX;
@@ -133,7 +136,11 @@ int RadioLibWrapper::recvRaw(uint8_t* bytes, int sz) {
         n_recv++;
       }
     }
+    #if defined(USE_LR2021)
+    state = STATE_RX;     // LR2021 stays in Rx after readData, calling startReceive while still in Rx throws -706 errors
+    #else
     state = STATE_IDLE;   // need another startReceive()
+    #endif
   }
 
   if (state != STATE_RX) {

src/helpers/radiolib/RadioLibWrappers.h

@@ -3,6 +3,9 @@
 #include <Mesh.h>
 #include <RadioLib.h>
 
+#ifdef USE_CC310_HW_CRYPTO
+#include <Adafruit_nRFCrypto.h>
+#endif
 struct PacketMillis {
   uint32_t preambleMillis;  // preamble-detect -> header-valid deadline
   uint32_t payloadMillis;   // header-valid   -> rx-done deadline
@@ -74,6 +77,8 @@ public:
 
   virtual bool setRxBoostedGainMode(bool) { return false; }
   virtual bool getRxBoostedGainMode() const { return false; }
+  
+  virtual bool configSideDetectors(const uint8_t sideDetSFs[], uint8_t num, float bw) { return false; }
 };
 
 /**
@@ -86,8 +91,15 @@ public:
   RadioNoiseListener(PhysicalLayer& radio): _radio(&radio) { }
 
   void random(uint8_t* dest, size_t sz) override {
+#ifdef USE_CC310_HW_CRYPTO
+    // CC310 TRNG is higher quality and environment-independent vs radio RSSI noise.
+    nRFCrypto.begin();
+    nRFCrypto.Random.generate(dest, (uint16_t)sz);
+    nRFCrypto.end();
+#else
     for (int i = 0; i < sz; i++) {
       dest[i] = _radio->randomByte() ^ (::random(0, 256) & 0xFF);
     }
+#endif
   }
 };

src/helpers/ui/DRV2605Vibration.cpp

@@ -0,0 +1,47 @@
+#ifdef HAS_DRV2605
+
+#include "DRV2605Vibration.h"
+#include <Wire.h>
+
+void DRV2605Vibration::begin() {
+#ifdef PIN_DRV_EN
+  pinMode(PIN_DRV_EN, OUTPUT);
+  digitalWrite(PIN_DRV_EN, HIGH);   // power up the haptic driver
+  delay(10);
+#endif
+  if (!drv.begin(&Wire)) {
+    return;   // no haptic driver found, stay silent
+  }
+#ifdef DRV2605_USE_LRA
+  // LRA mode: 4x brake factor, medium loop gain, back-EMF gain 2
+  drv.writeRegister8(DRV2605_REG_FEEDBACK, 0xB6);
+#endif
+  drv.selectLibrary(1);
+  drv.setMode(DRV2605_MODE_INTTRIG);
+  _ready = true;
+}
+
+void DRV2605Vibration::trigger(bool force) {
+  if (!_ready || _quiet) return;
+  unsigned long now = millis();
+  if (!force && _last_trigger != 0 && now - _last_trigger < VIBRATION_TIMEOUT) return;
+  _last_trigger = now;
+  drv.setWaveform(0, DRV2605_EFFECT);
+  drv.setWaveform(1, 0);   // pause
+  drv.setWaveform(2, DRV2605_EFFECT);
+  drv.setWaveform(3, 0);   // end of sequence
+  drv.go();
+}
+
+void DRV2605Vibration::loop() {
+}
+
+bool DRV2605Vibration::isVibrating() {
+  return false;   // effects are short, treat as instantaneous
+}
+
+void DRV2605Vibration::stop() {
+  if (_ready) drv.stop();
+}
+
+#endif // ifdef HAS_DRV2605

src/helpers/ui/DRV2605Vibration.h

@@ -0,0 +1,39 @@
+#pragma once
+
+#ifdef HAS_DRV2605
+
+#include <Arduino.h>
+#include <Adafruit_DRV2605.h>
+
+/*
+ * Vibration control class for boards where the motor is behind a
+ * DRV2605 haptic driver on I2C (e.g. Seeed SenseCAP MeshTracker X1).
+ * Same interface as GenericVibration.
+ */
+
+#ifndef VIBRATION_TIMEOUT
+#define VIBRATION_TIMEOUT 5000 // cooldown between vibrations
+#endif
+
+#ifndef DRV2605_EFFECT
+#define DRV2605_EFFECT 16   // "1000 ms alert" from the DRV2605 effect library
+#endif
+
+class DRV2605Vibration {
+public:
+  void begin();       // power up and init the DRV2605
+  void trigger(bool force = false);   // trigger vibration; force skips the cooldown
+  void loop();        // no-op, the DRV2605 plays effects autonomously
+  bool isVibrating();
+  void stop();        // stop vibration immediately
+  void quiet(bool q) { _quiet = q; }
+  bool isQuiet() const { return _quiet; }
+
+private:
+  Adafruit_DRV2605 drv;
+  bool _ready = false;
+  bool _quiet = false;
+  unsigned long _last_trigger = 0;
+};
+
+#endif // ifdef HAS_DRV2605

src/helpers/ui/DisplayDriver.h

@@ -3,12 +3,20 @@
 #include <stdint.h>
 #include <string.h>
 
+using ColorVal = uint16_t;
+
+class UIColor {
+public:
+  // color definitions (by element _type_)
+  static ColorVal window_bkg, title_bkg, title_txt, primary_txt, secondary_txt, warning_txt, popup_bkg, popup_txt, corp_blue;
+};
+
 class DisplayDriver {
   int _w, _h;
 protected:
   DisplayDriver(int w, int h) { _w = w; _h = h; }
 public:
-  enum Color { DARK=0, LIGHT, RED, GREEN, BLUE, YELLOW, ORANGE }; // on b/w screen, colors will be !=0 synonym of light
+  //enum Color { DARK=0, LIGHT, RED, GREEN, BLUE, YELLOW, ORANGE }; // on b/w screen, colors will be !=0 synonym of light
 
   int width() const { return _w; }
   int height() const { return _h; }
@@ -18,9 +26,9 @@ public:
   virtual void turnOn() = 0;
   virtual void turnOff() = 0;
   virtual void clear() = 0;
-  virtual void startFrame(Color bkg = DARK) = 0;
+  virtual void startFrame(ColorVal bkg = UIColor::window_bkg) = 0;
   virtual void setTextSize(int sz) = 0;
-  virtual void setColor(Color c) = 0;
+  virtual void setColor(ColorVal c) = 0;
   virtual void setCursor(int x, int y) = 0;
   virtual void print(const char* str) = 0;
   virtual void printWordWrap(const char* str, int max_width) { print(str); }   // fallback to basic print() if no override

src/helpers/ui/E213Display.cpp

@@ -2,6 +2,17 @@
 
 #include "../../MeshCore.h"
 
+// Color scheme
+ColorVal UIColor::window_bkg = WHITE;
+ColorVal UIColor::title_bkg = WHITE;
+ColorVal UIColor::title_txt = BLACK;
+ColorVal UIColor::primary_txt = BLACK;
+ColorVal UIColor::secondary_txt = BLACK;
+ColorVal UIColor::warning_txt = BLACK;
+ColorVal UIColor::popup_bkg = WHITE;
+ColorVal UIColor::popup_txt = BLACK;
+ColorVal UIColor::corp_blue = BLACK;
+
 BaseDisplay* E213Display::detectEInk()
 {
     // Test 1: Logic of BUSY pin
@@ -108,16 +119,18 @@ void E213Display::clear() {
   display->clear();
 }
 
-void E213Display::startFrame(Color bkg) {
+void E213Display::startFrame(ColorVal bkg) {
   display_crc.reset();
 
   // Fill screen with white first to ensure clean background
   display->fillRect(0, 0, width(), height(), WHITE);
 
-  if (bkg == LIGHT) {
+  if (bkg == 0) {
     // Fill with black if light background requested (inverted for e-ink)
     display->fillRect(0, 0, width(), height(), BLACK);
   }
+  _color = UIColor::primary_txt;
+  display->setTextColor(_color);
 }
 
 void E213Display::setTextSize(int sz) {
@@ -126,9 +139,10 @@ void E213Display::setTextSize(int sz) {
     display->setTextSize(sz);
 }
 
-void E213Display::setColor(Color c) {
-  display_crc.update<Color>(c);
-  // implemented in individual display methods
+void E213Display::setColor(ColorVal c) {
+  _color = c;
+  display_crc.update<ColorVal>(c);
+  display->setTextColor(_color);
 }
 
 void E213Display::setCursor(int x, int y) {
@@ -147,7 +161,7 @@ void E213Display::fillRect(int x, int y, int w, int h) {
   display_crc.update<int>(y);
   display_crc.update<int>(w);
   display_crc.update<int>(h);
-    display->fillRect(x, y, w, h, BLACK);
+    display->fillRect(x, y, w, h, _color);
 }
 
 void E213Display::drawRect(int x, int y, int w, int h) {
@@ -155,7 +169,7 @@ void E213Display::drawRect(int x, int y, int w, int h) {
   display_crc.update<int>(y);
   display_crc.update<int>(w);
   display_crc.update<int>(h);
-    display->drawRect(x, y, w, h, BLACK);
+    display->drawRect(x, y, w, h, _color);
 }
 
 void E213Display::drawXbm(int x, int y, const uint8_t *bits, int w, int h) {
@@ -179,7 +193,7 @@ void E213Display::drawXbm(int x, int y, const uint8_t *bits, int w, int h) {
 
       // If the bit is set, draw the pixel
       if (bitSet) {
-          display->drawPixel(x + bx, y + by, BLACK);
+          display->drawPixel(x + bx, y + by, _color);
       }
     }
   }

src/helpers/ui/E213Display.h

@@ -16,6 +16,7 @@ class E213Display : public DisplayDriver {
   RefCountedDigitalPin* _periph_power;
   CRC32 display_crc;
   uint32_t last_display_crc_value = 0;
+  uint16_t _color;
 
 public:
   E213Display(RefCountedDigitalPin* periph_power = NULL) : DisplayDriver(250, 122), _periph_power(periph_power) {}
@@ -30,9 +31,9 @@ public:
   void turnOn() override;
   void turnOff() override;
   void clear() override;
-  void startFrame(Color bkg = DARK) override;
+  void startFrame(ColorVal bkg = UIColor::window_bkg) override;
   void setTextSize(int sz) override;
-  void setColor(Color c) override;
+  void setColor(ColorVal 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;

src/helpers/ui/E290Display.cpp

@@ -2,6 +2,17 @@
 
 #include "../../MeshCore.h"
 
+// Color scheme
+ColorVal UIColor::window_bkg = WHITE;
+ColorVal UIColor::title_bkg = WHITE;
+ColorVal UIColor::title_txt = BLACK;
+ColorVal UIColor::primary_txt = BLACK;
+ColorVal UIColor::secondary_txt = BLACK;
+ColorVal UIColor::warning_txt = BLACK;
+ColorVal UIColor::popup_bkg = WHITE;
+ColorVal UIColor::popup_txt = BLACK;
+ColorVal UIColor::corp_blue = BLACK;
+
 bool E290Display::begin() {
   if (_init) return true;
 
@@ -62,15 +73,17 @@ void E290Display::clear() {
   display.clear();
 }
 
-void E290Display::startFrame(Color bkg) {
+void E290Display::startFrame(ColorVal bkg) {
   display_crc.reset();
 
   // Fill screen with white first to ensure clean background
   display.fillRect(0, 0, width(), height(), WHITE);
-  if (bkg == LIGHT) {
+  if (bkg == 0) {
     // Fill with black if light background requested (inverted for e-ink)
     display.fillRect(0, 0, width(), height(), BLACK);
   }
+  _color = UIColor::primary_txt;
+  display.setTextColor(_color);
 }
 
 void E290Display::setTextSize(int sz) {
@@ -79,9 +92,10 @@ void E290Display::setTextSize(int sz) {
   display.setTextSize(sz);
 }
 
-void E290Display::setColor(Color c) {
-  display_crc.update<Color>(c);
-  // implemented in individual display methods
+void E290Display::setColor(ColorVal c) {
+  _color = c;
+  display_crc.update<ColorVal>(c);
+  display.setTextColor(_color);
 }
 
 void E290Display::setCursor(int x, int y) {
@@ -100,7 +114,7 @@ void E290Display::fillRect(int x, int y, int w, int h) {
   display_crc.update<int>(y);
   display_crc.update<int>(w);
   display_crc.update<int>(h);
-  display.fillRect(x, y, w, h, BLACK);
+  display.fillRect(x, y, w, h, _color);
 }
 
 void E290Display::drawRect(int x, int y, int w, int h) {
@@ -108,7 +122,7 @@ void E290Display::drawRect(int x, int y, int w, int h) {
   display_crc.update<int>(y);
   display_crc.update<int>(w);
   display_crc.update<int>(h);
-  display.drawRect(x, y, w, h, BLACK);
+  display.drawRect(x, y, w, h, _color);
 }
 
 void E290Display::drawXbm(int x, int y, const uint8_t *bits, int w, int h) {
@@ -132,7 +146,7 @@ void E290Display::drawXbm(int x, int y, const uint8_t *bits, int w, int h) {
 
       // If the bit is set, draw the pixel
       if (bitSet) {
-        display.drawPixel(x + bx, y + by, BLACK);
+        display.drawPixel(x + bx, y + by, _color);
       }
     }
   }

src/helpers/ui/E290Display.h

@@ -16,6 +16,7 @@ class E290Display : public DisplayDriver {
   RefCountedDigitalPin* _periph_power;
   CRC32 display_crc;
   uint32_t last_display_crc_value = 0;
+  uint16_t _color;
 
 public:
   E290Display(RefCountedDigitalPin* periph_power = NULL) : DisplayDriver(296, 128), _periph_power(periph_power) {}
@@ -26,9 +27,9 @@ public:
   void turnOn() override;
   void turnOff() override;
   void clear() override;
-  void startFrame(Color bkg = DARK) override;
+  void startFrame(ColorVal bkg = UIColor::window_bkg) override;
   void setTextSize(int sz) override;
-  void setColor(Color c) override;
+  void setColor(ColorVal 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;

src/helpers/ui/GxEPDDisplay.cpp

@@ -14,6 +14,18 @@
   SPIClass SPI1 = SPIClass(FSPI);
 #endif
 
+// Color scheme
+ColorVal UIColor::window_bkg = GxEPD_WHITE;
+ColorVal UIColor::title_bkg = GxEPD_WHITE;
+ColorVal UIColor::title_txt = GxEPD_BLACK;
+ColorVal UIColor::primary_txt = GxEPD_BLACK;
+ColorVal UIColor::secondary_txt = GxEPD_BLACK;
+ColorVal UIColor::warning_txt = GxEPD_BLACK;
+ColorVal UIColor::popup_bkg = GxEPD_WHITE;
+ColorVal UIColor::popup_txt = GxEPD_BLACK;
+ColorVal UIColor::corp_blue = GxEPD_BLACK;
+
+
 bool GxEPDDisplay::begin() {
   display.epd2.selectSPI(SPI1, SPISettings(4000000, MSBFIRST, SPI_MODE0));
 #ifdef ESP32
@@ -61,9 +73,9 @@ void GxEPDDisplay::clear() {
   display_crc.reset();
 }
 
-void GxEPDDisplay::startFrame(Color bkg) {
-  display.fillScreen(GxEPD_WHITE);
-  display.setTextColor(_curr_color = GxEPD_BLACK);
+void GxEPDDisplay::startFrame(ColorVal bkg) {
+  display.fillScreen(bkg);
+  display.setTextColor(_curr_color = UIColor::primary_txt);
   display_crc.reset();
 }
 
@@ -85,14 +97,9 @@ void GxEPDDisplay::setTextSize(int sz) {
   }
 }
 
-void GxEPDDisplay::setColor(Color c) {
-  display_crc.update<Color> (c);
-  // colours need to be inverted for epaper displays
-  if (c == DARK) {
-    display.setTextColor(_curr_color = GxEPD_WHITE);
-  } else {
-    display.setTextColor(_curr_color = GxEPD_BLACK);
-  }
+void GxEPDDisplay::setColor(ColorVal c) {
+  display_crc.update<ColorVal> (c);
+  display.setTextColor(_curr_color = c);
 }
 
 void GxEPDDisplay::setCursor(int x, int y) {

src/helpers/ui/GxEPDDisplay.h

@@ -51,9 +51,9 @@ public:
   void turnOn() override;
   void turnOff() override;
   void clear() override;
-  void startFrame(Color bkg = DARK) override;
+  void startFrame(ColorVal bkg = UIColor::window_bkg) override;
   void setTextSize(int sz) override;
-  void setColor(Color c) override;
+  void setColor(ColorVal 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;

src/helpers/ui/LGFXDisplay.cpp

@@ -1,5 +1,16 @@
 #include "LGFXDisplay.h"
 
+// Color scheme
+ColorVal UIColor::window_bkg = 0xFFFF;
+ColorVal UIColor::title_bkg = 0x001F;
+ColorVal UIColor::title_txt = 0xFFFF;
+ColorVal UIColor::primary_txt = 0x0000;
+ColorVal UIColor::secondary_txt = (18 << 11) | (36 << 5) | 18;  // mid-gray
+ColorVal UIColor::warning_txt = 0xFD20;
+ColorVal UIColor::popup_bkg =  0x07FF;  // CYAN
+ColorVal UIColor::popup_txt = 0x0000;
+ColorVal UIColor::corp_blue = 0x001A;
+
 bool LGFXDisplay::begin() {
   turnOn();
   display->init();
@@ -35,45 +46,20 @@ void LGFXDisplay::clear() {
   buffer.clearDisplay();
 }
 
-void LGFXDisplay::startFrame(Color bkg) {
+void LGFXDisplay::startFrame(ColorVal bkg) {
 //  display->startWrite();
 //  display->getScanLine();
-  buffer.clearDisplay();
-  buffer.setTextColor(TFT_WHITE);
+  _color = bkg;
+  buffer.fillScreen(_color);
+  buffer.setTextColor(_color = UIColor::primary_txt);
 }
 
 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::setColor(ColorVal c) {
+  buffer.setTextColor(_color = c);
 }
 
 void LGFXDisplay::setCursor(int x, int y) {

src/helpers/ui/LGFXDisplay.h

@@ -25,9 +25,9 @@ public:
   void turnOn() override;
   void turnOff() override;
   void clear() override;
-  void startFrame(Color bkg = DARK) override;
+  void startFrame(ColorVal bkg = UIColor::window_bkg) override;
   void setTextSize(int sz) override;
-  void setColor(Color c) override;
+  void setColor(ColorVal 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;

src/helpers/ui/NV3001BDisplay.cpp

@@ -96,18 +96,16 @@
   #define NV3001B_TEXT_SIZE2_SCALE_Y 3
 #endif
 
-static uint16_t mapColor(DisplayDriver::Color c) {
-  switch (c) {
-    case DisplayDriver::DARK: return 0x0000;
-    case DisplayDriver::LIGHT: return 0xffff;
-    case DisplayDriver::RED: return 0xf800;
-    case DisplayDriver::GREEN: return 0x07e0;
-    case DisplayDriver::BLUE: return 0x001f;
-    case DisplayDriver::YELLOW: return 0xffe0;
-    case DisplayDriver::ORANGE: return 0xfd20;
-    default: return 0xffff;
-  }
-}
+// Color scheme
+ColorVal UIColor::window_bkg = 0xFFFF;
+ColorVal UIColor::title_bkg = 0x001F;
+ColorVal UIColor::title_txt = 0xFFFF;
+ColorVal UIColor::primary_txt = 0x0000;
+ColorVal UIColor::secondary_txt = (18 << 11) | (36 << 5) | 18;  // mid-gray
+ColorVal UIColor::warning_txt = 0xFD20;
+ColorVal UIColor::popup_bkg =  0x07FF;  // CYAN
+ColorVal UIColor::popup_txt = 0x0000;
+ColorVal UIColor::corp_blue = 0x001A;
 
 static int scaleX(int x) {
   return (int)(x * DISPLAY_SCALE_X);
@@ -465,15 +463,15 @@ void NV3001BDisplay::turnOff() {
 
 void NV3001BDisplay::clear() {
   uint16_t saved = color;
-  color = 0x0000;
+  color = UIColor::window_bkg;
   fillPhysicalRect(0, 0, NV3001B_SCREEN_WIDTH, NV3001B_SCREEN_HEIGHT);
   color = saved;
 }
 
-void NV3001BDisplay::startFrame(Color bkg) {
-  color = mapColor(bkg);
+void NV3001BDisplay::startFrame(ColorVal bkg) {
+  color = bkg;
   fillPhysicalRect(0, 0, NV3001B_SCREEN_WIDTH, NV3001B_SCREEN_HEIGHT);
-  color = 0xffff;
+  color = UIColor::primary_txt;
   text_size = 1;
   cursor_x = 0;
   cursor_y = 0;
@@ -483,8 +481,8 @@ void NV3001BDisplay::setTextSize(int sz) {
   text_size = sz < 1 ? 1 : sz;
 }
 
-void NV3001BDisplay::setColor(Color c) {
-  color = mapColor(c);
+void NV3001BDisplay::setColor(ColorVal c) {
+  color = c;
 }
 
 void NV3001BDisplay::setCursor(int x, int y) {

src/helpers/ui/NV3001BDisplay.h

@@ -55,9 +55,9 @@ public:
   void turnOn() override;
   void turnOff() override;
   void clear() override;
-  void startFrame(Color bkg = DARK) override;
+  void startFrame(ColorVal bkg = UIColor::window_bkg) override;
   void setTextSize(int sz) override;
-  void setColor(Color c) override;
+  void setColor(ColorVal 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;

src/helpers/ui/NullDisplayDriver.cpp

@@ -0,0 +1,11 @@
+#include "NullDisplayDriver.h"
+
+ColorVal UIColor::window_bkg = 0;
+ColorVal UIColor::title_bkg = 0;
+ColorVal UIColor::title_txt = 0;
+ColorVal UIColor::primary_txt = 0;
+ColorVal UIColor::secondary_txt = 0;
+ColorVal UIColor::warning_txt = 0;
+ColorVal UIColor::popup_bkg = 0;
+ColorVal UIColor::popup_txt = 0;
+ColorVal UIColor::corp_blue = 0;

src/helpers/ui/NullDisplayDriver.h

@@ -11,9 +11,9 @@ public:
   void turnOn() override { }
   void turnOff() override { }
   void clear() override { }
-  void startFrame(Color bkg = DARK) override { }
+  void startFrame(ColorVal bkg = UIColor::window_bkg) override { }
   void setTextSize(int sz) override { }
-  void setColor(Color c) override { }
+  void setColor(ColorVal 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 { }

src/helpers/ui/SH1106Display.cpp

@@ -9,6 +9,17 @@ bool SH1106Display::i2c_probe(TwoWire &wire, uint8_t addr)
   return (error == 0);
 }
 
+// Color scheme
+ColorVal UIColor::window_bkg = SH110X_BLACK;
+ColorVal UIColor::title_bkg = SH110X_BLACK;
+ColorVal UIColor::title_txt = SH110X_WHITE;
+ColorVal UIColor::primary_txt = SH110X_WHITE;
+ColorVal UIColor::secondary_txt = SH110X_WHITE;
+ColorVal UIColor::warning_txt = SH110X_WHITE;
+ColorVal UIColor::popup_bkg = SH110X_BLACK;
+ColorVal UIColor::popup_txt = SH110X_WHITE;
+ColorVal UIColor::corp_blue = SH110X_WHITE;
+
 bool SH1106Display::begin()
 {
   // Wire must already be initialised by board.begin() before this is called.
@@ -35,7 +46,7 @@ void SH1106Display::clear()
   display.display();
 }
 
-void SH1106Display::startFrame(Color bkg)
+void SH1106Display::startFrame(ColorVal bkg)
 {
   display.clearDisplay(); // TODO: apply 'bkg'
   _color = SH110X_WHITE;
@@ -49,9 +60,9 @@ void SH1106Display::setTextSize(int sz)
   display.setTextSize(sz);
 }
 
-void SH1106Display::setColor(Color c)
+void SH1106Display::setColor(ColorVal c)
 {
-  _color = (c != 0) ? SH110X_WHITE : SH110X_BLACK;
+  _color = c;
   display.setTextColor(_color);
 }
 
@@ -77,7 +88,7 @@ void SH1106Display::drawRect(int x, int y, int w, int h)
 
 void SH1106Display::drawXbm(int x, int y, const uint8_t *bits, int w, int h)
 {
-  display.drawBitmap(x, y, bits, w, h, SH110X_WHITE);
+  display.drawBitmap(x, y, bits, w, h, _color);
 }
 
 uint16_t SH1106Display::getTextWidth(const char *str)

src/helpers/ui/SH1106Display.h

@@ -30,9 +30,9 @@ public:
   void turnOn() override;
   void turnOff() override;
   void clear() override;
-  void startFrame(Color bkg = DARK) override;
+  void startFrame(ColorVal bkg = UIColor::window_bkg) override;
   void setTextSize(int sz) override;
-  void setColor(Color c) override;
+  void setColor(ColorVal 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;

src/helpers/ui/SSD1306Display.cpp

@@ -6,6 +6,17 @@ bool SSD1306Display::i2c_probe(TwoWire& wire, uint8_t addr) {
   return (error == 0);
 }
 
+// Color scheme
+ColorVal UIColor::window_bkg = SSD1306_BLACK;
+ColorVal UIColor::title_bkg = SSD1306_BLACK;
+ColorVal UIColor::title_txt = SSD1306_WHITE;
+ColorVal UIColor::primary_txt = SSD1306_WHITE;
+ColorVal UIColor::secondary_txt = SSD1306_WHITE;
+ColorVal UIColor::warning_txt = SSD1306_WHITE;
+ColorVal UIColor::popup_bkg = SSD1306_BLACK;
+ColorVal UIColor::popup_txt = SSD1306_WHITE;
+ColorVal UIColor::corp_blue = SSD1306_WHITE;
+
 bool SSD1306Display::begin() {
   if (!_isOn) {
     if (_peripher_power) _peripher_power->claim();
@@ -44,7 +55,7 @@ void SSD1306Display::clear() {
   display.display();
 }
 
-void SSD1306Display::startFrame(Color bkg) {
+void SSD1306Display::startFrame(ColorVal bkg) {
   display.clearDisplay();  // TODO: apply 'bkg'
   _color = SSD1306_WHITE;
   display.setTextColor(_color);
@@ -56,8 +67,8 @@ void SSD1306Display::setTextSize(int sz) {
   display.setTextSize(sz);
 }
 
-void SSD1306Display::setColor(Color c) {
-  _color = (c != 0) ? SSD1306_WHITE : SSD1306_BLACK;
+void SSD1306Display::setColor(ColorVal c) {
+  _color = c;
   display.setTextColor(_color);
 }
 
@@ -78,7 +89,7 @@ void SSD1306Display::drawRect(int x, int y, int w, int h) {
 }
 
 void SSD1306Display::drawXbm(int x, int y, const uint8_t* bits, int w, int h) {
-  display.drawBitmap(x, y, bits, w, h, SSD1306_WHITE);
+  display.drawBitmap(x, y, bits, w, h, _color);
 }
 
 uint16_t SSD1306Display::getTextWidth(const char* str) {

src/helpers/ui/SSD1306Display.h

@@ -35,9 +35,9 @@ public:
   void turnOn() override;
   void turnOff() override;
   void clear() override;
-  void startFrame(Color bkg = DARK) override;
+  void startFrame(ColorVal bkg = UIColor::window_bkg) override;
   void setTextSize(int sz) override;
-  void setColor(Color c) override;
+  void setColor(ColorVal 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;

src/helpers/ui/ST7735Display.cpp

@@ -417,6 +417,17 @@ bool ST7735Display::i2c_probe(TwoWire& wire, uint8_t addr) {
   #define PIN_TFT_LEDA_CTL_ACTIVE  HIGH
 #endif
 
+// Color scheme
+ColorVal UIColor::window_bkg = ST77XX_WHITE;
+ColorVal UIColor::title_bkg = ST77XX_BLUE;
+ColorVal UIColor::title_txt = ST77XX_WHITE;
+ColorVal UIColor::primary_txt = ST77XX_BLACK;
+ColorVal UIColor::secondary_txt = (18 << 11) | (36 << 5) | 18;  // mid-gray
+ColorVal UIColor::warning_txt = ST77XX_ORANGE;
+ColorVal UIColor::popup_bkg = ST77XX_CYAN;
+ColorVal UIColor::popup_txt = ST77XX_BLACK;
+ColorVal UIColor::corp_blue = 0x001A;
+
 bool ST7735Display::begin() {
   if (!sprite) {
     // alloc offscreen canvas
@@ -527,9 +538,9 @@ void ST7735Display::clear() {
   sprite->fillScreen(ST77XX_BLACK);
 }
 
-void ST7735Display::startFrame(Color bkg) {
-  sprite->fillScreen(ST77XX_BLACK);
-  sprite->setTextColor(curr_color = ST77XX_WHITE);
+void ST7735Display::startFrame(ColorVal bkg) {
+  sprite->fillScreen(bkg);
+  sprite->setTextColor(curr_color = UIColor::primary_txt);
   sprite->setFreeFont();
   sprite->setTextSize(1);      // This one affects size of Please wait... message
   //sprite->cp437(true);         // Use full 256 char 'Code Page 437' font
@@ -539,33 +550,8 @@ void ST7735Display::setTextSize(int sz) {
   sprite->setTextSize(sz);
 }
 
-void ST7735Display::setColor(Color c) {
-  switch (c) {
-    case DisplayDriver::DARK :
-      curr_color = ST77XX_BLACK;
-      break;
-    case DisplayDriver::LIGHT : 
-      curr_color = ST77XX_WHITE;
-      break;
-    case DisplayDriver::RED : 
-      curr_color = ST77XX_RED;
-      break;
-    case DisplayDriver::GREEN : 
-      curr_color = ST77XX_GREEN;
-      break;
-    case DisplayDriver::BLUE : 
-      curr_color = ST77XX_BLUE;
-      break;
-    case DisplayDriver::YELLOW : 
-      curr_color = ST77XX_YELLOW;
-      break;
-    case DisplayDriver::ORANGE : 
-      curr_color = ST77XX_ORANGE;
-      break;
-    default:
-      curr_color = ST77XX_WHITE;
-      break;
-  }
+void ST7735Display::setColor(ColorVal c) {
+  curr_color = c;
   sprite->setTextColor(curr_color);
 }
 

src/helpers/ui/ST7735Display.h

@@ -33,9 +33,9 @@ public:
   void turnOn() override;
   void turnOff() override;
   void clear() override;
-  void startFrame(Color bkg = DARK) override;
+  void startFrame(ColorVal bkg = UIColor::window_bkg) override;
   void setTextSize(int sz) override;
-  void setColor(Color c) override;
+  void setColor(ColorVal 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;

src/helpers/ui/ST7789Display.cpp

@@ -26,6 +26,17 @@
   #define SCALE_Y DISPLAY_SCALE_Y
 #endif
 
+// Color scheme
+ColorVal UIColor::window_bkg = OLEDDISPLAY_COLOR::BLACK;
+ColorVal UIColor::title_bkg = OLEDDISPLAY_COLOR::BLACK;
+ColorVal UIColor::title_txt = OLEDDISPLAY_COLOR::WHITE;
+ColorVal UIColor::primary_txt = OLEDDISPLAY_COLOR::WHITE;
+ColorVal UIColor::secondary_txt = OLEDDISPLAY_COLOR::WHITE;
+ColorVal UIColor::warning_txt = OLEDDISPLAY_COLOR::WHITE;
+ColorVal UIColor::popup_bkg = OLEDDISPLAY_COLOR::BLACK;
+ColorVal UIColor::popup_txt = OLEDDISPLAY_COLOR::WHITE;
+ColorVal UIColor::corp_blue = OLEDDISPLAY_COLOR::WHITE;
+
 bool ST7789Display::begin() {
   if(!_isOn) {
     pinMode(PIN_TFT_VDD_CTL, OUTPUT);
@@ -90,10 +101,9 @@ void ST7789Display::clear() {
   display.clear();
 }
 
-void ST7789Display::startFrame(Color bkg) {
-  display.clear();
-  _color = ST77XX_WHITE;
-  display.setRGB(_color);
+void ST7789Display::startFrame(ColorVal bkg) {
+  display.clear();  // TODO: use bkg
+  setColor(UIColor::primary_txt);
   display.setFont(ArialMT_Plain_16);
 }
 
@@ -110,38 +120,10 @@ void ST7789Display::setTextSize(int sz) {
   }
 }
 
-void ST7789Display::setColor(Color c) {
-  switch (c) {
-    case DisplayDriver::DARK :
-      _color = ST77XX_BLACK;
-      display.setColor(OLEDDISPLAY_COLOR::BLACK);
-      break;
-#if 0
-    case DisplayDriver::LIGHT : 
-      _color = ST77XX_WHITE;
-      break;
-    case DisplayDriver::RED : 
-      _color = ST77XX_RED;
-      break;
-    case DisplayDriver::GREEN : 
-      _color = ST77XX_GREEN;
-      break;
-    case DisplayDriver::BLUE : 
-      _color = ST77XX_BLUE;
-      break;
-    case DisplayDriver::YELLOW : 
-      _color = ST77XX_YELLOW;
-      break;
-    case DisplayDriver::ORANGE : 
-      _color = ST77XX_ORANGE;
-      break;
-#endif
-    default:
-      _color = ST77XX_WHITE;
-      display.setColor(OLEDDISPLAY_COLOR::WHITE);
-      break;
-  }
-  display.setRGB(_color);
+void ST7789Display::setColor(ColorVal c) {
+  _color = c;
+  display.setColor((OLEDDISPLAY_COLOR)_color);
+  display.setRGB(_color == OLEDDISPLAY_COLOR::WHITE ? ST77XX_WHITE : ST77XX_BLACK);
 }
 
 void ST7789Display::setCursor(int x, int y) {

src/helpers/ui/ST7789Display.h

@@ -27,9 +27,9 @@ public:
   void turnOn() override;
   void turnOff() override;
   void clear() override;
-  void startFrame(Color bkg = DARK) override;
+  void startFrame(ColorVal bkg = UIColor::window_bkg) override;
   void setTextSize(int sz) override;
-  void setColor(Color c) override;
+  void setColor(ColorVal c) override;
   void setCursor(int x, int y) override;
   void print(const char* str) override;
   void printWordWrap(const char* str, int max_width) override;

src/helpers/ui/ST7789LCDDisplay.cpp

@@ -23,6 +23,17 @@ bool ST7789LCDDisplay::i2c_probe(TwoWire& wire, uint8_t addr) {
   return true;
 }
 
+// Color scheme
+ColorVal UIColor::window_bkg = ST77XX_WHITE;
+ColorVal UIColor::title_bkg = ST77XX_BLUE;
+ColorVal UIColor::title_txt = ST77XX_WHITE;
+ColorVal UIColor::primary_txt = ST77XX_BLACK;
+ColorVal UIColor::secondary_txt = (18 << 11) | (36 << 5) | 18;  // mid-gray
+ColorVal UIColor::warning_txt = ST77XX_ORANGE;
+ColorVal UIColor::popup_bkg = ST77XX_CYAN;
+ColorVal UIColor::popup_txt = ST77XX_BLACK;
+ColorVal UIColor::corp_blue = 0x001A;
+
 bool ST7789LCDDisplay::begin() {
   if (!_isOn) {
     if (_peripher_power) _peripher_power->claim();
@@ -78,9 +89,9 @@ void ST7789LCDDisplay::clear() {
   display.fillScreen(ST77XX_BLACK);
 }
 
-void ST7789LCDDisplay::startFrame(Color bkg) {
-  display.fillScreen(ST77XX_BLACK);
-  display.setTextColor(ST77XX_WHITE);
+void ST7789LCDDisplay::startFrame(ColorVal bkg) {
+  display.fillScreen(bkg);
+  display.setTextColor(_color = UIColor::primary_txt);
   display.setTextSize(1 * DISPLAY_SCALE_X); // This one affects size of Please wait... message
   display.cp437(true); // Use full 256 char 'Code Page 437' font
 }
@@ -89,34 +100,8 @@ void ST7789LCDDisplay::setTextSize(int sz) {
   display.setTextSize(sz * DISPLAY_SCALE_X);
 }
 
-void ST7789LCDDisplay::setColor(Color c) {
-  switch (c) {
-    case DisplayDriver::DARK :
-      _color = ST77XX_BLACK;
-      break;
-    case DisplayDriver::LIGHT : 
-      _color = ST77XX_WHITE;
-      break;
-    case DisplayDriver::RED : 
-      _color = ST77XX_RED;
-      break;
-    case DisplayDriver::GREEN : 
-      _color = ST77XX_GREEN;
-      break;
-    case DisplayDriver::BLUE : 
-      _color = ST77XX_BLUE;
-      break;
-    case DisplayDriver::YELLOW : 
-      _color = ST77XX_YELLOW;
-      break;
-    case DisplayDriver::ORANGE : 
-      _color = ST77XX_ORANGE;
-      break;
-    default:
-      _color = ST77XX_WHITE;
-      break;
-  }
-  display.setTextColor(_color);
+void ST7789LCDDisplay::setColor(ColorVal c) {
+  display.setTextColor(_color = c);
 }
 
 void ST7789LCDDisplay::setCursor(int x, int y) {

src/helpers/ui/ST7789LCDDisplay.h

@@ -47,9 +47,9 @@ public:
   void turnOn() override;
   void turnOff() override;
   void clear() override;
-  void startFrame(Color bkg = DARK) override;
+  void startFrame(ColorVal bkg = UIColor::window_bkg) override;
   void setTextSize(int sz) override;
-  void setColor(Color c) override;
+  void setColor(ColorVal 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;

src/helpers/ui/U8g2Display.cpp

@@ -0,0 +1,12 @@
+#include "U8g2Display.h"
+
+// Color scheme
+ColorVal UIColor::window_bkg = 0;
+ColorVal UIColor::title_bkg = 0;
+ColorVal UIColor::title_txt = 1;
+ColorVal UIColor::primary_txt = 1;
+ColorVal UIColor::secondary_txt = 1;
+ColorVal UIColor::warning_txt = 1;
+ColorVal UIColor::popup_bkg = 0;
+ColorVal UIColor::popup_txt = 1;
+ColorVal UIColor::corp_blue = 1;

src/helpers/ui/U8g2Display.h

@@ -72,10 +72,10 @@ public:
     _u8g2.sendBuffer();
   }
 
-  void startFrame(Color bkg = DARK) override {
-    _u8g2.clearBuffer();
-    _drawColor = 1;
-    _u8g2.setDrawColor(1);
+  void startFrame(ColorVal bkg = UIColor::window_bkg) override {
+    _u8g2.clearBuffer();  // TODO: apply 'bkg' color
+    _drawColor = UIColor::primary_txt;
+    _u8g2.setDrawColor(_drawColor);
     applyFont(1);
   }
 
@@ -83,8 +83,8 @@ public:
     applyFont(sz);
   }
 
-  void setColor(Color c) override {
-    _drawColor = (c != DARK) ? 1 : 0;
+  void setColor(ColorVal c) override {
+    _drawColor = c;
     _u8g2.setDrawColor(_drawColor);
   }
 
@@ -94,22 +94,18 @@ public:
   }
 
   void print(const char* str) override {
-    _u8g2.setDrawColor(_drawColor);
     _u8g2.drawStr(_cursorX, _cursorY, str);
   }
 
   void fillRect(int x, int y, int w, int h) override {
-    _u8g2.setDrawColor(_drawColor);
     _u8g2.drawBox(x, y, w, h);
   }
 
   void drawRect(int x, int y, int w, int h) override {
-    _u8g2.setDrawColor(_drawColor);
     _u8g2.drawFrame(x, y, w, h);
   }
 
   void drawXbm(int x, int y, const uint8_t* bits, int w, int h) override {
-    _u8g2.setDrawColor(1);
     _u8g2.drawXBM(x, y, w, h, bits);
   }
 

test/test_utf8_helpers/test_utf8_helpers.cpp

@@ -0,0 +1,38 @@
+#include <gtest/gtest.h>
+
+#include <helpers/UTF8Helpers.h>
+
+TEST(UTF8Helpers, KeepsCompleteNameWithinLimit) {
+  const char* name = "Example RPT 🔋🇵🇱";
+
+  EXPECT_EQ(24u, mesh::validUtf8PrefixLength(name, 24));
+}
+
+TEST(UTF8Helpers, StopsBeforeCodePointCrossingLimit) {
+  const char* name = "Example RPT 🔋🇵🇱";
+
+  EXPECT_EQ(20u, mesh::validUtf8PrefixLength(name, 23));
+}
+
+TEST(UTF8Helpers, RejectsMalformedAndTruncatedSequences) {
+  const char overlong[] = {'A', static_cast<char>(0xC0), static_cast<char>(0xAF), 0};
+  const char surrogate[] = {'A', static_cast<char>(0xED), static_cast<char>(0xA0), static_cast<char>(0x80), 0};
+  const char out_of_range[] = {'A', static_cast<char>(0xF4), static_cast<char>(0x90), static_cast<char>(0x80), static_cast<char>(0x80), 0};
+  const char truncated[] = {'A', static_cast<char>(0xF0), static_cast<char>(0x9F), 0};
+
+  EXPECT_EQ(1u, mesh::validUtf8PrefixLength(overlong, sizeof(overlong)));
+  EXPECT_EQ(1u, mesh::validUtf8PrefixLength(surrogate, sizeof(surrogate)));
+  EXPECT_EQ(1u, mesh::validUtf8PrefixLength(out_of_range, sizeof(out_of_range)));
+  EXPECT_EQ(1u, mesh::validUtf8PrefixLength(truncated, sizeof(truncated)));
+}
+
+TEST(UTF8Helpers, RejectsUnexpectedContinuationByte) {
+  const char invalid[] = {'A', static_cast<char>(0x80), 'B', 0};
+
+  EXPECT_EQ(1u, mesh::validUtf8PrefixLength(invalid, sizeof(invalid)));
+}
+
+int main(int argc, char **argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}

variants/ebyte_eora_s3/platformio.ini

@@ -102,6 +102,7 @@ build_flags =
   -D DISPLAY_CLASS=SSD1306Display
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
+  -D ENABLE_USB_INTERFACE
 ; 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}

variants/gat562_30s_mesh_kit/platformio.ini

@@ -75,6 +75,7 @@ build_flags =
   -D DISPLAY_CLASS=SSD1306Display
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
+  -D ENABLE_USB_INTERFACE
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
 build_src_filter = ${GAT562_30S_Mesh_Kit.build_src_filter}

variants/gat562_mesh_tracker_pro/platformio.ini

@@ -71,6 +71,7 @@ build_flags =
   -D DISPLAY_CLASS=SSD1306Display
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
+  -D ENABLE_USB_INTERFACE
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
 build_src_filter = ${GAT562_Mesh_Tracker_Pro.build_src_filter}

variants/heltec_ct62/platformio.ini

@@ -101,6 +101,7 @@ build_flags =
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256
+  -D ENABLE_USB_INTERFACE
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_ct62.build_src_filter}

variants/heltec_e213/platformio.ini

@@ -73,6 +73,7 @@ build_flags =
   -D DISPLAY_CLASS=E213Display
   -D AUTO_OFF_MILLIS=0
   -D OFFLINE_QUEUE_SIZE=256
+  -D ENABLE_USB_INTERFACE
 build_src_filter = ${Heltec_E213_base.build_src_filter}
   +<helpers/ui/E213Display.cpp>
   +<helpers/esp32/*.cpp>

variants/heltec_mesh_solar/platformio.ini

@@ -87,6 +87,7 @@ build_flags =
   ${Heltec_mesh_solar.build_flags}
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
+  -D ENABLE_USB_INTERFACE
 ;  -D BLE_PIN_CODE=123456
 ;  -D BLE_DEBUG_LOGGING=1
 ;  -D MESH_PACKET_LOGGING=1

variants/heltec_rc32/platformio.ini

@@ -131,9 +131,11 @@ build_flags =
   -D DISPLAY_CLASS=NullDisplayDriver
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
+  -D ENABLE_USB_INTERFACE
 build_src_filter = ${Heltec_RC32.build_src_filter}
   +<helpers/ui/MomentaryButton.cpp>
   +<helpers/ui/buzzer.cpp>
+  +<helpers/ui/NullDisplayDriver.cpp>
   +<helpers/esp32/*.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-new/*.cpp>
@@ -157,6 +159,7 @@ build_flags =
 build_src_filter = ${Heltec_RC32.build_src_filter}
   +<helpers/ui/MomentaryButton.cpp>
   +<helpers/ui/buzzer.cpp>
+  +<helpers/ui/NullDisplayDriver.cpp>
   +<helpers/esp32/*.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-new/*.cpp>
@@ -180,6 +183,7 @@ build_flags =
 build_src_filter = ${Heltec_RC32.build_src_filter}
   +<helpers/ui/MomentaryButton.cpp>
   +<helpers/ui/buzzer.cpp>
+  +<helpers/ui/NullDisplayDriver.cpp>
   +<helpers/esp32/*.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-new/*.cpp>
@@ -272,6 +276,7 @@ build_flags =
   -D UI_HAS_ROTARY_INPUT
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
+  -D ENABLE_USB_INTERFACE
 build_src_filter = ${Heltec_RC32_with_display.build_src_filter}
   +<helpers/ui/buzzer.cpp>
   +<helpers/esp32/*.cpp>

variants/heltec_t096/platformio.ini

@@ -152,6 +152,7 @@ build_flags =
   -I examples/companion_radio/ui-new
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
+  -D ENABLE_USB_INTERFACE
 ;  -D BLE_PIN_CODE=123456
 ;  -D BLE_DEBUG_LOGGING=1
 ;  -D MESH_PACKET_LOGGING=1

variants/heltec_t1/platformio.ini

@@ -90,6 +90,7 @@ build_flags =
   -I examples/companion_radio/ui-new
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
+  -D ENABLE_USB_INTERFACE
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_t1.build_src_filter}

variants/heltec_t114/platformio.ini

@@ -109,6 +109,7 @@ build_flags =
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_t114.build_src_filter}
+  +<helpers/ui/NullDisplayDriver.cpp>
   +<helpers/nrf52/SerialBLEInterface.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-new/*.cpp>
@@ -126,8 +127,10 @@ build_flags =
   -D DISPLAY_CLASS=NullDisplayDriver
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
+  -D ENABLE_USB_INTERFACE
 build_src_filter = ${Heltec_t114.build_src_filter}
   +<helpers/nrf52/*.cpp>
+  +<helpers/ui/NullDisplayDriver.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps =
@@ -236,6 +239,7 @@ build_flags =
   -I examples/companion_radio/ui-new
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
+  -D ENABLE_USB_INTERFACE
 ;  -D BLE_PIN_CODE=123456
 ;  -D BLE_DEBUG_LOGGING=1
 ;  -D MESH_PACKET_LOGGING=1

variants/heltec_t190/platformio.ini

@@ -74,6 +74,7 @@ build_flags =
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256
+  -D ENABLE_USB_INTERFACE
 build_src_filter = ${Heltec_T190_base.build_src_filter}
   +<helpers/esp32/*.cpp>
   +<../examples/companion_radio/*.cpp>

variants/heltec_tower_v2/platformio.ini

@@ -69,6 +69,7 @@ build_flags =
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_tower_v2.build_src_filter}
+  +<helpers/ui/NullDisplayDriver.cpp>
   +<helpers/nrf52/SerialBLEInterface.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-new/*.cpp>
@@ -86,11 +87,13 @@ build_flags =
   -D DISPLAY_CLASS=NullDisplayDriver
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
+  -D ENABLE_USB_INTERFACE
 ;  -D BLE_PIN_CODE=123456
 ;  -D BLE_DEBUG_LOGGING=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_tower_v2.build_src_filter}
+  +<helpers/ui/NullDisplayDriver.cpp>
   +<helpers/nrf52/*.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-new/*.cpp>

variants/heltec_tracker/platformio.ini

@@ -59,6 +59,7 @@ build_flags =
   -D DISPLAY_CLASS=ST7735Display
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
+  -D ENABLE_USB_INTERFACE
 ; -D BLE_PIN_CODE=123456 ; HWT will use display for pin
 ; -D OFFLINE_QUEUE_SIZE=256
 ;  -D BLE_DEBUG_LOGGING=1

variants/heltec_tracker_v2/platformio.ini

@@ -140,6 +140,7 @@ build_flags =
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=ST7735Display
+  -D ENABLE_USB_INTERFACE
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_tracker_v2.build_src_filter}

variants/heltec_v2/platformio.ini

@@ -137,6 +137,7 @@ build_flags =
   -D DISPLAY_CLASS=SSD1306Display
   -D MAX_CONTACTS=160
   -D MAX_GROUP_CHANNELS=8
+  -D ENABLE_USB_INTERFACE
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_lora32_v2.build_src_filter}

variants/heltec_v3/platformio.ini

@@ -144,6 +144,7 @@ build_flags =
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=SSD1306Display
+  -D ENABLE_USB_INTERFACE
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_lora32_v3.build_src_filter}
@@ -326,6 +327,7 @@ build_flags =
   ${Heltec_lora32_v3.build_flags}
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
+  -D ENABLE_USB_INTERFACE
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_lora32_v3.build_src_filter}

variants/heltec_v4/platformio.ini

@@ -187,6 +187,7 @@ build_flags =
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=SSD1306Display
+  -D ENABLE_USB_INTERFACE
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
 build_src_filter = ${heltec_v4_oled.build_src_filter}
@@ -351,6 +352,7 @@ build_flags =
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=ST7789LCDDisplay
+  -D ENABLE_USB_INTERFACE
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
 build_src_filter = ${heltec_v4_tft.build_src_filter}