From df4dab8509081a08010229af207ac2eae288bab8 Mon Sep 17 00:00:00 2001
From: agessaman <adam@gessaman.com>
Date: Fri, 7 Nov 2025 22:16:48 -0800
Subject: [PATCH 01/13] Add statistics commands and response handling in MyMesh

- Introduced new commands for retrieving statistics: CMD_GET_STATS_CORE, CMD_GET_STATS_RADIO, and CMD_GET_STATS_PACKETS.
- Implemented corresponding response handling methods to format and send statistics data.
- Updated MyMesh constructor to initialize new member variables for managing statistics.
- Included StatsFormatHelper for formatting statistics replies.
---
 examples/companion_radio/MyMesh.cpp | 62 ++++++++++++++++++++++++++++-
 examples/companion_radio/MyMesh.h   |  8 ++++
 2 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/examples/companion_radio/MyMesh.cpp b/examples/companion_radio/MyMesh.cpp
index 598d535f..fa9edc8c 100644
--- a/examples/companion_radio/MyMesh.cpp
+++ b/examples/companion_radio/MyMesh.cpp
@@ -52,6 +52,9 @@
 #define CMD_SEND_PATH_DISCOVERY_REQ   52
 #define CMD_SET_FLOOD_SCOPE           54   // v8+
 #define CMD_SEND_CONTROL_DATA         55   // v8+
+#define CMD_GET_STATS_CORE            56
+#define CMD_GET_STATS_RADIO           57
+#define CMD_GET_STATS_PACKETS         58
 
 #define RESP_CODE_OK                  0
 #define RESP_CODE_ERR                 1
@@ -77,6 +80,9 @@
 #define RESP_CODE_CUSTOM_VARS         21
 #define RESP_CODE_ADVERT_PATH         22
 #define RESP_CODE_TUNING_PARAMS       23
+#define RESP_CODE_STATS_CORE          24
+#define RESP_CODE_STATS_RADIO         25
+#define RESP_CODE_STATS_PACKETS       26
 
 #define SEND_TIMEOUT_BASE_MILLIS        500
 #define FLOOD_SEND_TIMEOUT_FACTOR       16.0f
@@ -704,7 +710,7 @@ uint32_t MyMesh::calcDirectTimeoutMillisFor(uint32_t pkt_airtime_millis, uint8_t
 void MyMesh::onSendTimeout() {}
 
 MyMesh::MyMesh(mesh::Radio &radio, mesh::RNG &rng, mesh::RTCClock &rtc, SimpleMeshTables &tables, DataStore& store, AbstractUITask* ui)
-    : BaseChatMesh(radio, *new ArduinoMillis(), rng, rtc, *new StaticPoolPacketManager(16), tables),
+    : BaseChatMesh(radio, *(_ms_clock = new ArduinoMillis()), rng, rtc, *(_pkt_mgr = new StaticPoolPacketManager(16)), tables),
       _serial(NULL), telemetry(MAX_PACKET_PAYLOAD - 4), _store(&store), _ui(ui) {
   _iter_started = false;
   _cli_rescue = false;
@@ -1529,6 +1535,45 @@ void MyMesh::handleCmdFrame(size_t len) {
     } else {
       writeErrFrame(ERR_CODE_NOT_FOUND);
     }
+  } else if (cmd_frame[0] == CMD_GET_STATS_CORE) {
+    char json_reply[160];
+    formatStatsReply(json_reply);
+    int i = 0;
+    out_frame[i++] = RESP_CODE_STATS_CORE;
+    int json_len = strlen(json_reply);
+    if (i + json_len <= MAX_FRAME_SIZE) {
+      memcpy(&out_frame[i], json_reply, json_len);
+      i += json_len;
+      _serial->writeFrame(out_frame, i);
+    } else {
+      writeErrFrame(ERR_CODE_TABLE_FULL);
+    }
+  } else if (cmd_frame[0] == CMD_GET_STATS_RADIO) {
+    char json_reply[160];
+    formatRadioStatsReply(json_reply);
+    int i = 0;
+    out_frame[i++] = RESP_CODE_STATS_RADIO;
+    int json_len = strlen(json_reply);
+    if (i + json_len <= MAX_FRAME_SIZE) {
+      memcpy(&out_frame[i], json_reply, json_len);
+      i += json_len;
+      _serial->writeFrame(out_frame, i);
+    } else {
+      writeErrFrame(ERR_CODE_TABLE_FULL);
+    }
+  } else if (cmd_frame[0] == CMD_GET_STATS_PACKETS) {
+    char json_reply[160];
+    formatPacketStatsReply(json_reply);
+    int i = 0;
+    out_frame[i++] = RESP_CODE_STATS_PACKETS;
+    int json_len = strlen(json_reply);
+    if (i + json_len <= MAX_FRAME_SIZE) {
+      memcpy(&out_frame[i], json_reply, json_len);
+      i += json_len;
+      _serial->writeFrame(out_frame, i);
+    } else {
+      writeErrFrame(ERR_CODE_TABLE_FULL);
+    }
   } else if (cmd_frame[0] == CMD_FACTORY_RESET && memcmp(&cmd_frame[1], "reset", 5) == 0) {
     bool success = _store->formatFileSystem();
     if (success) {
@@ -1565,6 +1610,21 @@ void MyMesh::enterCLIRescue() {
   Serial.println("========= CLI Rescue =========");
 }
 
+void MyMesh::formatStatsReply(char *reply) {
+  // Use StatsFormatHelper
+  // Note: err_flags is private in Dispatcher, so we use 0
+  StatsFormatHelper::formatCoreStats(reply, board, *_ms_clock, 0, _pkt_mgr);
+}
+
+void MyMesh::formatRadioStatsReply(char *reply) {
+  StatsFormatHelper::formatRadioStats(reply, _radio, radio_driver, getTotalAirTime(), getReceiveAirTime());
+}
+
+void MyMesh::formatPacketStatsReply(char *reply) {
+  StatsFormatHelper::formatPacketStats(reply, radio_driver, getNumSentFlood(), getNumSentDirect(), 
+                                       getNumRecvFlood(), getNumRecvDirect());
+}
+
 void MyMesh::checkCLIRescueCmd() {
   int len = strlen(cli_command);
   while (Serial.available() && len < sizeof(cli_command)-1) {
diff --git a/examples/companion_radio/MyMesh.h b/examples/companion_radio/MyMesh.h
index f2b56e5e..ef451d5d 100644
--- a/examples/companion_radio/MyMesh.h
+++ b/examples/companion_radio/MyMesh.h
@@ -69,6 +69,7 @@
 
 #include <helpers/BaseChatMesh.h>
 #include <helpers/TransportKeyStore.h>
+#include <helpers/StatsFormatHelper.h>
 
 /* -------------------------------------------------------------------------------------- */
 
@@ -170,6 +171,11 @@ private:
   void checkCLIRescueCmd();
   void checkSerialInterface();
 
+  // Stats methods
+  void formatStatsReply(char *reply);
+  void formatRadioStatsReply(char *reply);
+  void formatPacketStatsReply(char *reply);
+
   // helpers, short-cuts
   void savePrefs() { _store->savePrefs(_prefs, sensors.node_lat, sensors.node_lon); }
   void saveChannels() { _store->saveChannels(this); }
@@ -178,6 +184,8 @@ private:
 private:
   DataStore* _store;
   NodePrefs _prefs;
+  mesh::PacketManager* _pkt_mgr;  // stored for stats access
+  mesh::MillisecondClock* _ms_clock;  // stored for stats access
   uint32_t pending_login;
   uint32_t pending_status;
   uint32_t pending_telemetry, pending_discovery;   // pending _TELEMETRY_REQ

From c9aa536ca632db7f28029ba1a4a66bc4bdccda92 Mon Sep 17 00:00:00 2001
From: agessaman <adam@gessaman.com>
Date: Sat, 8 Nov 2025 20:44:42 -0800
Subject: [PATCH 02/13] Reverted MyMesh constructor for simplicity. Updated
 formatStatsReply method to use new member variables for statistics handling.
 Removed excess variable creation

---
 examples/companion_radio/MyMesh.cpp | 5 ++---
 examples/companion_radio/MyMesh.h   | 2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/examples/companion_radio/MyMesh.cpp b/examples/companion_radio/MyMesh.cpp
index fa9edc8c..6fe165c5 100644
--- a/examples/companion_radio/MyMesh.cpp
+++ b/examples/companion_radio/MyMesh.cpp
@@ -710,7 +710,7 @@ uint32_t MyMesh::calcDirectTimeoutMillisFor(uint32_t pkt_airtime_millis, uint8_t
 void MyMesh::onSendTimeout() {}
 
 MyMesh::MyMesh(mesh::Radio &radio, mesh::RNG &rng, mesh::RTCClock &rtc, SimpleMeshTables &tables, DataStore& store, AbstractUITask* ui)
-    : BaseChatMesh(radio, *(_ms_clock = new ArduinoMillis()), rng, rtc, *(_pkt_mgr = new StaticPoolPacketManager(16)), tables),
+    : BaseChatMesh(radio, *new ArduinoMillis(), rng, rtc, *new StaticPoolPacketManager(16), tables),
       _serial(NULL), telemetry(MAX_PACKET_PAYLOAD - 4), _store(&store), _ui(ui) {
   _iter_started = false;
   _cli_rescue = false;
@@ -1612,8 +1612,7 @@ void MyMesh::enterCLIRescue() {
 
 void MyMesh::formatStatsReply(char *reply) {
   // Use StatsFormatHelper
-  // Note: err_flags is private in Dispatcher, so we use 0
-  StatsFormatHelper::formatCoreStats(reply, board, *_ms_clock, 0, _pkt_mgr);
+  StatsFormatHelper::formatCoreStats(reply, board, *_ms, _err_flags, _mgr);
 }
 
 void MyMesh::formatRadioStatsReply(char *reply) {
diff --git a/examples/companion_radio/MyMesh.h b/examples/companion_radio/MyMesh.h
index ef451d5d..61a25e14 100644
--- a/examples/companion_radio/MyMesh.h
+++ b/examples/companion_radio/MyMesh.h
@@ -184,8 +184,6 @@ private:
 private:
   DataStore* _store;
   NodePrefs _prefs;
-  mesh::PacketManager* _pkt_mgr;  // stored for stats access
-  mesh::MillisecondClock* _ms_clock;  // stored for stats access
   uint32_t pending_login;
   uint32_t pending_status;
   uint32_t pending_telemetry, pending_discovery;   // pending _TELEMETRY_REQ

From 80d6dd4367c2882a5b576ed1394bb4c2151b290e Mon Sep 17 00:00:00 2001
From: agessaman <adam@gessaman.com>
Date: Sun, 9 Nov 2025 11:28:11 -0800
Subject: [PATCH 03/13] Update statistics handling to use binary frames instead
 of JSON formatting for consistency with other companion commands. Added
 documentation of frame structure with code examples.

---
 docs/stats_binary_frames.md         | 225 ++++++++++++++++++++++++++++
 examples/companion_radio/MyMesh.cpp |  62 ++++----
 2 files changed, 257 insertions(+), 30 deletions(-)
 create mode 100644 docs/stats_binary_frames.md

diff --git a/docs/stats_binary_frames.md b/docs/stats_binary_frames.md
new file mode 100644
index 00000000..d4327ea6
--- /dev/null
+++ b/docs/stats_binary_frames.md
@@ -0,0 +1,225 @@
+# Stats Binary Frame Structures
+
+Binary frame structures for companion radio stats commands. All multi-byte integers use little-endian byte order.
+
+## Command Codes
+
+| Command | Code | Description |
+|---------|------|-------------|
+| `CMD_GET_STATS_CORE` | 56 | Get core device statistics |
+| `CMD_GET_STATS_RADIO` | 57 | Get radio statistics |
+| `CMD_GET_STATS_PACKETS` | 58 | Get packet statistics |
+
+## Response Codes
+
+| Response | Code | Description |
+|----------|------|-------------|
+| `RESP_CODE_STATS_CORE` | 24 | Core stats response |
+| `RESP_CODE_STATS_RADIO` | 25 | Radio stats response |
+| `RESP_CODE_STATS_PACKETS` | 26 | Packet stats response |
+
+---
+
+## RESP_CODE_STATS_CORE (24)
+
+**Total Frame Size:** 10 bytes
+
+| Offset | Size | Type | Field Name | Description | Range/Notes |
+|--------|------|------|------------|-------------|-------------|
+| 0 | 1 | uint8_t | response_code | Always `0x18` (24) | - |
+| 1 | 2 | uint16_t | battery_mv | Battery voltage in millivolts | 0 - 65,535 |
+| 3 | 4 | uint32_t | uptime_secs | Device uptime in seconds | 0 - 4,294,967,295 |
+| 7 | 2 | uint16_t | errors | Error flags bitmask | - |
+| 9 | 1 | uint8_t | queue_len | Outbound packet queue length | 0 - 255 |
+
+### Example Structure (C/C++)
+
+```c
+struct StatsCore {
+    uint8_t  response_code;  // 0x18
+    uint16_t battery_mv;
+    uint32_t uptime_secs;
+    uint16_t errors;
+    uint8_t  queue_len;
+} __attribute__((packed));
+```
+
+---
+
+## RESP_CODE_STATS_RADIO (25)
+
+**Total Frame Size:** 13 bytes
+
+| Offset | Size | Type | Field Name | Description | Range/Notes |
+|--------|------|------|------------|-------------|-------------|
+| 0 | 1 | uint8_t | response_code | Always `0x19` (25) | - |
+| 1 | 2 | int16_t | noise_floor | Radio noise floor in dBm | -140 to +10 |
+| 3 | 1 | int8_t | last_rssi | Last received signal strength in dBm | -128 to +127 |
+| 4 | 1 | int8_t | last_snr | SNR scaled by 4 | Divide by 4.0 for dB |
+| 5 | 4 | uint32_t | tx_air_secs | Cumulative transmit airtime in seconds | 0 - 4,294,967,295 |
+| 9 | 4 | uint32_t | rx_air_secs | Cumulative receive airtime in seconds | 0 - 4,294,967,295 |
+
+### Example Structure (C/C++)
+
+```c
+struct StatsRadio {
+    uint8_t  response_code;  // 0x19
+    int16_t  noise_floor;
+    int8_t   last_rssi;
+    int8_t   last_snr;       // Divide by 4.0 to get actual SNR in dB
+    uint32_t tx_air_secs;
+    uint32_t rx_air_secs;
+} __attribute__((packed));
+```
+
+---
+
+## RESP_CODE_STATS_PACKETS (26)
+
+**Total Frame Size:** 25 bytes
+
+| Offset | Size | Type | Field Name | Description | Range/Notes |
+|--------|------|------|------------|-------------|-------------|
+| 0 | 1 | uint8_t | response_code | Always `0x1A` (26) | - |
+| 1 | 4 | uint32_t | recv | Total packets received | 0 - 4,294,967,295 |
+| 5 | 4 | uint32_t | sent | Total packets sent | 0 - 4,294,967,295 |
+| 9 | 4 | uint32_t | flood_tx | Packets sent via flood routing | 0 - 4,294,967,295 |
+| 13 | 4 | uint32_t | direct_tx | Packets sent via direct routing | 0 - 4,294,967,295 |
+| 17 | 4 | uint32_t | flood_rx | Packets received via flood routing | 0 - 4,294,967,295 |
+| 21 | 4 | uint32_t | direct_rx | Packets received via direct routing | 0 - 4,294,967,295 |
+
+### Notes
+
+- Counters are cumulative from boot and may wrap.
+- `recv = flood_rx + direct_rx`
+- `sent = flood_tx + direct_tx`
+
+### Example Structure (C/C++)
+
+```c
+struct StatsPackets {
+    uint8_t  response_code;  // 0x1A
+    uint32_t recv;
+    uint32_t sent;
+    uint32_t flood_tx;
+    uint32_t direct_tx;
+    uint32_t flood_rx;
+    uint32_t direct_rx;
+} __attribute__((packed));
+```
+
+---
+
+## Usage Example (Python)
+
+```python
+import struct
+
+def parse_stats_core(frame):
+    """Parse RESP_CODE_STATS_CORE frame (10 bytes)"""
+    response_code, battery_mv, uptime_secs, errors, queue_len = \
+        struct.unpack('<B H I H B', frame)
+    return {
+        'battery_mv': battery_mv,
+        'uptime_secs': uptime_secs,
+        'errors': errors,
+        'queue_len': queue_len
+    }
+
+def parse_stats_radio(frame):
+    """Parse RESP_CODE_STATS_RADIO frame (13 bytes)"""
+    response_code, noise_floor, last_rssi, last_snr, tx_air_secs, rx_air_secs = \
+        struct.unpack('<B h b b I I', frame)
+    return {
+        'noise_floor': noise_floor,
+        'last_rssi': last_rssi,
+        'last_snr': last_snr / 4.0,  # Unscale SNR
+        'tx_air_secs': tx_air_secs,
+        'rx_air_secs': rx_air_secs
+    }
+
+def parse_stats_packets(frame):
+    """Parse RESP_CODE_STATS_PACKETS frame (25 bytes)"""
+    response_code, recv, sent, flood_tx, direct_tx, flood_rx, direct_rx = \
+        struct.unpack('<B I I I I I I', frame)
+    return {
+        'recv': recv,
+        'sent': sent,
+        'flood_tx': flood_tx,
+        'direct_tx': direct_tx,
+        'flood_rx': flood_rx,
+        'direct_rx': direct_rx
+    }
+```
+
+---
+
+## Usage Example (JavaScript/TypeScript)
+
+```typescript
+interface StatsCore {
+    battery_mv: number;
+    uptime_secs: number;
+    errors: number;
+    queue_len: number;
+}
+
+interface StatsRadio {
+    noise_floor: number;
+    last_rssi: number;
+    last_snr: number;
+    tx_air_secs: number;
+    rx_air_secs: number;
+}
+
+interface StatsPackets {
+    recv: number;
+    sent: number;
+    flood_tx: number;
+    direct_tx: number;
+    flood_rx: number;
+    direct_rx: number;
+}
+
+function parseStatsCore(buffer: ArrayBuffer): StatsCore {
+    const view = new DataView(buffer);
+    return {
+        battery_mv: view.getUint16(1, true),
+        uptime_secs: view.getUint32(3, true),
+        errors: view.getUint16(7, true),
+        queue_len: view.getUint8(9)
+    };
+}
+
+function parseStatsRadio(buffer: ArrayBuffer): StatsRadio {
+    const view = new DataView(buffer);
+    return {
+        noise_floor: view.getInt16(1, true),
+        last_rssi: view.getInt8(3),
+        last_snr: view.getInt8(4) / 4.0,  // Unscale SNR
+        tx_air_secs: view.getUint32(5, true),
+        rx_air_secs: view.getUint32(9, true)
+    };
+}
+
+function parseStatsPackets(buffer: ArrayBuffer): StatsPackets {
+    const view = new DataView(buffer);
+    return {
+        recv: view.getUint32(1, true),
+        sent: view.getUint32(5, true),
+        flood_tx: view.getUint32(9, true),
+        direct_tx: view.getUint32(13, true),
+        flood_rx: view.getUint32(17, true),
+        direct_rx: view.getUint32(21, true)
+    };
+}
+```
+
+---
+
+## Field Size Considerations
+
+- Packet counters (uint32_t): May wrap after extended high-traffic operation.
+- Time fields (uint32_t): Max ~136 years.
+- SNR (int8_t, scaled by 4): Range -32 to +31.75 dB, 0.25 dB precision.
+
diff --git a/examples/companion_radio/MyMesh.cpp b/examples/companion_radio/MyMesh.cpp
index 6fe165c5..6fc9a433 100644
--- a/examples/companion_radio/MyMesh.cpp
+++ b/examples/companion_radio/MyMesh.cpp
@@ -1536,44 +1536,46 @@ void MyMesh::handleCmdFrame(size_t len) {
       writeErrFrame(ERR_CODE_NOT_FOUND);
     }
   } else if (cmd_frame[0] == CMD_GET_STATS_CORE) {
-    char json_reply[160];
-    formatStatsReply(json_reply);
     int i = 0;
     out_frame[i++] = RESP_CODE_STATS_CORE;
-    int json_len = strlen(json_reply);
-    if (i + json_len <= MAX_FRAME_SIZE) {
-      memcpy(&out_frame[i], json_reply, json_len);
-      i += json_len;
-      _serial->writeFrame(out_frame, i);
-    } else {
-      writeErrFrame(ERR_CODE_TABLE_FULL);
-    }
+    uint16_t battery_mv = board.getBattMilliVolts();
+    uint32_t uptime_secs = _ms->getMillis() / 1000;
+    uint8_t queue_len = (uint8_t)_mgr->getOutboundCount(0xFFFFFFFF);
+    memcpy(&out_frame[i], &battery_mv, 2); i += 2;
+    memcpy(&out_frame[i], &uptime_secs, 4); i += 4;
+    memcpy(&out_frame[i], &_err_flags, 2); i += 2;
+    out_frame[i++] = queue_len;
+    _serial->writeFrame(out_frame, i);
   } else if (cmd_frame[0] == CMD_GET_STATS_RADIO) {
-    char json_reply[160];
-    formatRadioStatsReply(json_reply);
     int i = 0;
     out_frame[i++] = RESP_CODE_STATS_RADIO;
-    int json_len = strlen(json_reply);
-    if (i + json_len <= MAX_FRAME_SIZE) {
-      memcpy(&out_frame[i], json_reply, json_len);
-      i += json_len;
-      _serial->writeFrame(out_frame, i);
-    } else {
-      writeErrFrame(ERR_CODE_TABLE_FULL);
-    }
+    int16_t noise_floor = (int16_t)_radio->getNoiseFloor();
+    int8_t last_rssi = (int8_t)radio_driver.getLastRSSI();
+    int8_t last_snr = (int8_t)(radio_driver.getLastSNR() * 4); // scaled by 4 for 0.25 dB precision
+    uint32_t tx_air_secs = getTotalAirTime() / 1000;
+    uint32_t rx_air_secs = getReceiveAirTime() / 1000;
+    memcpy(&out_frame[i], &noise_floor, 2); i += 2;
+    out_frame[i++] = last_rssi;
+    out_frame[i++] = last_snr;
+    memcpy(&out_frame[i], &tx_air_secs, 4); i += 4;
+    memcpy(&out_frame[i], &rx_air_secs, 4); i += 4;
+    _serial->writeFrame(out_frame, i);
   } else if (cmd_frame[0] == CMD_GET_STATS_PACKETS) {
-    char json_reply[160];
-    formatPacketStatsReply(json_reply);
     int i = 0;
     out_frame[i++] = RESP_CODE_STATS_PACKETS;
-    int json_len = strlen(json_reply);
-    if (i + json_len <= MAX_FRAME_SIZE) {
-      memcpy(&out_frame[i], json_reply, json_len);
-      i += json_len;
-      _serial->writeFrame(out_frame, i);
-    } else {
-      writeErrFrame(ERR_CODE_TABLE_FULL);
-    }
+    uint32_t recv = radio_driver.getPacketsRecv();
+    uint32_t sent = radio_driver.getPacketsSent();
+    uint32_t n_sent_flood = getNumSentFlood();
+    uint32_t n_sent_direct = getNumSentDirect();
+    uint32_t n_recv_flood = getNumRecvFlood();
+    uint32_t n_recv_direct = getNumRecvDirect();
+    memcpy(&out_frame[i], &recv, 4); i += 4;
+    memcpy(&out_frame[i], &sent, 4); i += 4;
+    memcpy(&out_frame[i], &n_sent_flood, 4); i += 4;
+    memcpy(&out_frame[i], &n_sent_direct, 4); i += 4;
+    memcpy(&out_frame[i], &n_recv_flood, 4); i += 4;
+    memcpy(&out_frame[i], &n_recv_direct, 4); i += 4;
+    _serial->writeFrame(out_frame, i);
   } else if (cmd_frame[0] == CMD_FACTORY_RESET && memcmp(&cmd_frame[1], "reset", 5) == 0) {
     bool success = _store->formatFileSystem();
     if (success) {

From 39f83efbfe9c34129996f35eec6de916b890762c Mon Sep 17 00:00:00 2001
From: agessaman <adam@gessaman.com>
Date: Sun, 9 Nov 2025 11:39:47 -0800
Subject: [PATCH 04/13] Remove unused statistics formatting methods and
 associated header includes from MyMesh class. Whoops.

---
 examples/companion_radio/MyMesh.cpp | 14 --------------
 examples/companion_radio/MyMesh.h   |  6 ------
 2 files changed, 20 deletions(-)

diff --git a/examples/companion_radio/MyMesh.cpp b/examples/companion_radio/MyMesh.cpp
index 6fc9a433..140f58c6 100644
--- a/examples/companion_radio/MyMesh.cpp
+++ b/examples/companion_radio/MyMesh.cpp
@@ -1612,20 +1612,6 @@ void MyMesh::enterCLIRescue() {
   Serial.println("========= CLI Rescue =========");
 }
 
-void MyMesh::formatStatsReply(char *reply) {
-  // Use StatsFormatHelper
-  StatsFormatHelper::formatCoreStats(reply, board, *_ms, _err_flags, _mgr);
-}
-
-void MyMesh::formatRadioStatsReply(char *reply) {
-  StatsFormatHelper::formatRadioStats(reply, _radio, radio_driver, getTotalAirTime(), getReceiveAirTime());
-}
-
-void MyMesh::formatPacketStatsReply(char *reply) {
-  StatsFormatHelper::formatPacketStats(reply, radio_driver, getNumSentFlood(), getNumSentDirect(), 
-                                       getNumRecvFlood(), getNumRecvDirect());
-}
-
 void MyMesh::checkCLIRescueCmd() {
   int len = strlen(cli_command);
   while (Serial.available() && len < sizeof(cli_command)-1) {
diff --git a/examples/companion_radio/MyMesh.h b/examples/companion_radio/MyMesh.h
index 61a25e14..f2b56e5e 100644
--- a/examples/companion_radio/MyMesh.h
+++ b/examples/companion_radio/MyMesh.h
@@ -69,7 +69,6 @@
 
 #include <helpers/BaseChatMesh.h>
 #include <helpers/TransportKeyStore.h>
-#include <helpers/StatsFormatHelper.h>
 
 /* -------------------------------------------------------------------------------------- */
 
@@ -171,11 +170,6 @@ private:
   void checkCLIRescueCmd();
   void checkSerialInterface();
 
-  // Stats methods
-  void formatStatsReply(char *reply);
-  void formatRadioStatsReply(char *reply);
-  void formatPacketStatsReply(char *reply);
-
   // helpers, short-cuts
   void savePrefs() { _store->savePrefs(_prefs, sensors.node_lat, sensors.node_lon); }
   void saveChannels() { _store->saveChannels(this); }

From a3c9a07377d1895f78c776049ebd2bd99b90f4ae Mon Sep 17 00:00:00 2001
From: agessaman <adam@gessaman.com>
Date: Mon, 17 Nov 2025 09:57:36 -0800
Subject: [PATCH 05/13] Modify CMD_GET_STATS with sub-types for core, radio,
 and packet statistics. Consolidated to a single RESP_CODE_STATS with a second
 byte to identify response structure. Updated documentation and examples to
 reflect the new command structure and response parsing.

---
 docs/stats_binary_frames.md         | 201 ++++++++++++++++++++--------
 examples/companion_radio/MyMesh.cpp | 103 +++++++-------
 2 files changed, 200 insertions(+), 104 deletions(-)

diff --git a/docs/stats_binary_frames.md b/docs/stats_binary_frames.md
index d4327ea6..1b409912 100644
--- a/docs/stats_binary_frames.md
+++ b/docs/stats_binary_frames.md
@@ -6,37 +6,53 @@ Binary frame structures for companion radio stats commands. All multi-byte integ
 
 | Command | Code | Description |
 |---------|------|-------------|
-| `CMD_GET_STATS_CORE` | 56 | Get core device statistics |
-| `CMD_GET_STATS_RADIO` | 57 | Get radio statistics |
-| `CMD_GET_STATS_PACKETS` | 58 | Get packet statistics |
+| `CMD_GET_STATS` | 56 | Get statistics (2-byte command: code + sub-type) |
+
+### Stats Sub-Types
+
+The `CMD_GET_STATS` command uses a 2-byte frame structure:
+- **Byte 0:** `CMD_GET_STATS` (56)
+- **Byte 1:** Stats sub-type:
+  - `STATS_TYPE_CORE` (0) - Get core device statistics
+  - `STATS_TYPE_RADIO` (1) - Get radio statistics
+  - `STATS_TYPE_PACKETS` (2) - Get packet statistics
 
 ## Response Codes
 
 | Response | Code | Description |
 |----------|------|-------------|
-| `RESP_CODE_STATS_CORE` | 24 | Core stats response |
-| `RESP_CODE_STATS_RADIO` | 25 | Radio stats response |
-| `RESP_CODE_STATS_PACKETS` | 26 | Packet stats response |
+| `RESP_CODE_STATS` | 24 | Statistics response (2-byte response: code + sub-type) |
+
+### Stats Response Sub-Types
+
+The `RESP_CODE_STATS` response uses a 2-byte header structure:
+- **Byte 0:** `RESP_CODE_STATS` (24)
+- **Byte 1:** Stats sub-type (matches command sub-type):
+  - `STATS_TYPE_CORE` (0) - Core device statistics response
+  - `STATS_TYPE_RADIO` (1) - Radio statistics response
+  - `STATS_TYPE_PACKETS` (2) - Packet statistics response
 
 ---
 
-## RESP_CODE_STATS_CORE (24)
+## RESP_CODE_STATS + STATS_TYPE_CORE (24, 0)
 
-**Total Frame Size:** 10 bytes
+**Total Frame Size:** 11 bytes
 
 | Offset | Size | Type | Field Name | Description | Range/Notes |
 |--------|------|------|------------|-------------|-------------|
 | 0 | 1 | uint8_t | response_code | Always `0x18` (24) | - |
-| 1 | 2 | uint16_t | battery_mv | Battery voltage in millivolts | 0 - 65,535 |
-| 3 | 4 | uint32_t | uptime_secs | Device uptime in seconds | 0 - 4,294,967,295 |
-| 7 | 2 | uint16_t | errors | Error flags bitmask | - |
-| 9 | 1 | uint8_t | queue_len | Outbound packet queue length | 0 - 255 |
+| 1 | 1 | uint8_t | stats_type | Always `0x00` (STATS_TYPE_CORE) | - |
+| 2 | 2 | uint16_t | battery_mv | Battery voltage in millivolts | 0 - 65,535 |
+| 4 | 4 | uint32_t | uptime_secs | Device uptime in seconds | 0 - 4,294,967,295 |
+| 8 | 2 | uint16_t | errors | Error flags bitmask | - |
+| 10 | 1 | uint8_t | queue_len | Outbound packet queue length | 0 - 255 |
 
 ### Example Structure (C/C++)
 
 ```c
 struct StatsCore {
     uint8_t  response_code;  // 0x18
+    uint8_t  stats_type;     // 0x00 (STATS_TYPE_CORE)
     uint16_t battery_mv;
     uint32_t uptime_secs;
     uint16_t errors;
@@ -46,24 +62,26 @@ struct StatsCore {
 
 ---
 
-## RESP_CODE_STATS_RADIO (25)
+## RESP_CODE_STATS + STATS_TYPE_RADIO (24, 1)
 
-**Total Frame Size:** 13 bytes
+**Total Frame Size:** 14 bytes
 
 | Offset | Size | Type | Field Name | Description | Range/Notes |
 |--------|------|------|------------|-------------|-------------|
-| 0 | 1 | uint8_t | response_code | Always `0x19` (25) | - |
-| 1 | 2 | int16_t | noise_floor | Radio noise floor in dBm | -140 to +10 |
-| 3 | 1 | int8_t | last_rssi | Last received signal strength in dBm | -128 to +127 |
-| 4 | 1 | int8_t | last_snr | SNR scaled by 4 | Divide by 4.0 for dB |
-| 5 | 4 | uint32_t | tx_air_secs | Cumulative transmit airtime in seconds | 0 - 4,294,967,295 |
-| 9 | 4 | uint32_t | rx_air_secs | Cumulative receive airtime in seconds | 0 - 4,294,967,295 |
+| 0 | 1 | uint8_t | response_code | Always `0x18` (24) | - |
+| 1 | 1 | uint8_t | stats_type | Always `0x01` (STATS_TYPE_RADIO) | - |
+| 2 | 2 | int16_t | noise_floor | Radio noise floor in dBm | -140 to +10 |
+| 4 | 1 | int8_t | last_rssi | Last received signal strength in dBm | -128 to +127 |
+| 5 | 1 | int8_t | last_snr | SNR scaled by 4 | Divide by 4.0 for dB |
+| 6 | 4 | uint32_t | tx_air_secs | Cumulative transmit airtime in seconds | 0 - 4,294,967,295 |
+| 10 | 4 | uint32_t | rx_air_secs | Cumulative receive airtime in seconds | 0 - 4,294,967,295 |
 
 ### Example Structure (C/C++)
 
 ```c
 struct StatsRadio {
-    uint8_t  response_code;  // 0x19
+    uint8_t  response_code;  // 0x18
+    uint8_t  stats_type;     // 0x01 (STATS_TYPE_RADIO)
     int16_t  noise_floor;
     int8_t   last_rssi;
     int8_t   last_snr;       // Divide by 4.0 to get actual SNR in dB
@@ -74,19 +92,20 @@ struct StatsRadio {
 
 ---
 
-## RESP_CODE_STATS_PACKETS (26)
+## RESP_CODE_STATS + STATS_TYPE_PACKETS (24, 2)
 
-**Total Frame Size:** 25 bytes
+**Total Frame Size:** 26 bytes
 
 | Offset | Size | Type | Field Name | Description | Range/Notes |
 |--------|------|------|------------|-------------|-------------|
-| 0 | 1 | uint8_t | response_code | Always `0x1A` (26) | - |
-| 1 | 4 | uint32_t | recv | Total packets received | 0 - 4,294,967,295 |
-| 5 | 4 | uint32_t | sent | Total packets sent | 0 - 4,294,967,295 |
-| 9 | 4 | uint32_t | flood_tx | Packets sent via flood routing | 0 - 4,294,967,295 |
-| 13 | 4 | uint32_t | direct_tx | Packets sent via direct routing | 0 - 4,294,967,295 |
-| 17 | 4 | uint32_t | flood_rx | Packets received via flood routing | 0 - 4,294,967,295 |
-| 21 | 4 | uint32_t | direct_rx | Packets received via direct routing | 0 - 4,294,967,295 |
+| 0 | 1 | uint8_t | response_code | Always `0x18` (24) | - |
+| 1 | 1 | uint8_t | stats_type | Always `0x02` (STATS_TYPE_PACKETS) | - |
+| 2 | 4 | uint32_t | recv | Total packets received | 0 - 4,294,967,295 |
+| 6 | 4 | uint32_t | sent | Total packets sent | 0 - 4,294,967,295 |
+| 10 | 4 | uint32_t | flood_tx | Packets sent via flood routing | 0 - 4,294,967,295 |
+| 14 | 4 | uint32_t | direct_tx | Packets sent via direct routing | 0 - 4,294,967,295 |
+| 18 | 4 | uint32_t | flood_rx | Packets received via flood routing | 0 - 4,294,967,295 |
+| 22 | 4 | uint32_t | direct_rx | Packets received via direct routing | 0 - 4,294,967,295 |
 
 ### Notes
 
@@ -98,7 +117,8 @@ struct StatsRadio {
 
 ```c
 struct StatsPackets {
-    uint8_t  response_code;  // 0x1A
+    uint8_t  response_code;  // 0x18
+    uint8_t  stats_type;     // 0x02 (STATS_TYPE_PACKETS)
     uint32_t recv;
     uint32_t sent;
     uint32_t flood_tx;
@@ -110,15 +130,38 @@ struct StatsPackets {
 
 ---
 
-## Usage Example (Python)
+## Command Usage Example (Python)
+
+```python
+# Send CMD_GET_STATS command
+def send_get_stats_core(serial_interface):
+    """Send command to get core stats"""
+    cmd = bytes([56, 0])  # CMD_GET_STATS (56) + STATS_TYPE_CORE (0)
+    serial_interface.write(cmd)
+
+def send_get_stats_radio(serial_interface):
+    """Send command to get radio stats"""
+    cmd = bytes([56, 1])  # CMD_GET_STATS (56) + STATS_TYPE_RADIO (1)
+    serial_interface.write(cmd)
+
+def send_get_stats_packets(serial_interface):
+    """Send command to get packet stats"""
+    cmd = bytes([56, 2])  # CMD_GET_STATS (56) + STATS_TYPE_PACKETS (2)
+    serial_interface.write(cmd)
+```
+
+---
+
+## Response Parsing Example (Python)
 
 ```python
 import struct
 
 def parse_stats_core(frame):
-    """Parse RESP_CODE_STATS_CORE frame (10 bytes)"""
-    response_code, battery_mv, uptime_secs, errors, queue_len = \
-        struct.unpack('<B H I H B', frame)
+    """Parse RESP_CODE_STATS + STATS_TYPE_CORE frame (11 bytes)"""
+    response_code, stats_type, battery_mv, uptime_secs, errors, queue_len = \
+        struct.unpack('<B B H I H B', frame)
+    assert response_code == 24 and stats_type == 0, "Invalid response type"
     return {
         'battery_mv': battery_mv,
         'uptime_secs': uptime_secs,
@@ -127,9 +170,10 @@ def parse_stats_core(frame):
     }
 
 def parse_stats_radio(frame):
-    """Parse RESP_CODE_STATS_RADIO frame (13 bytes)"""
-    response_code, noise_floor, last_rssi, last_snr, tx_air_secs, rx_air_secs = \
-        struct.unpack('<B h b b I I', frame)
+    """Parse RESP_CODE_STATS + STATS_TYPE_RADIO frame (14 bytes)"""
+    response_code, stats_type, noise_floor, last_rssi, last_snr, tx_air_secs, rx_air_secs = \
+        struct.unpack('<B B h b b I I', frame)
+    assert response_code == 24 and stats_type == 1, "Invalid response type"
     return {
         'noise_floor': noise_floor,
         'last_rssi': last_rssi,
@@ -139,9 +183,10 @@ def parse_stats_radio(frame):
     }
 
 def parse_stats_packets(frame):
-    """Parse RESP_CODE_STATS_PACKETS frame (25 bytes)"""
-    response_code, recv, sent, flood_tx, direct_tx, flood_rx, direct_rx = \
-        struct.unpack('<B I I I I I I', frame)
+    """Parse RESP_CODE_STATS + STATS_TYPE_PACKETS frame (26 bytes)"""
+    response_code, stats_type, recv, sent, flood_tx, direct_tx, flood_rx, direct_rx = \
+        struct.unpack('<B B I I I I I I', frame)
+    assert response_code == 24 and stats_type == 2, "Invalid response type"
     return {
         'recv': recv,
         'sent': sent,
@@ -154,7 +199,34 @@ def parse_stats_packets(frame):
 
 ---
 
-## Usage Example (JavaScript/TypeScript)
+## Command Usage Example (JavaScript/TypeScript)
+
+```typescript
+// Send CMD_GET_STATS command
+const CMD_GET_STATS = 56;
+const STATS_TYPE_CORE = 0;
+const STATS_TYPE_RADIO = 1;
+const STATS_TYPE_PACKETS = 2;
+
+function sendGetStatsCore(serialInterface: SerialPort): void {
+    const cmd = new Uint8Array([CMD_GET_STATS, STATS_TYPE_CORE]);
+    serialInterface.write(cmd);
+}
+
+function sendGetStatsRadio(serialInterface: SerialPort): void {
+    const cmd = new Uint8Array([CMD_GET_STATS, STATS_TYPE_RADIO]);
+    serialInterface.write(cmd);
+}
+
+function sendGetStatsPackets(serialInterface: SerialPort): void {
+    const cmd = new Uint8Array([CMD_GET_STATS, STATS_TYPE_PACKETS]);
+    serialInterface.write(cmd);
+}
+```
+
+---
+
+## Response Parsing Example (JavaScript/TypeScript)
 
 ```typescript
 interface StatsCore {
@@ -183,34 +255,49 @@ interface StatsPackets {
 
 function parseStatsCore(buffer: ArrayBuffer): StatsCore {
     const view = new DataView(buffer);
+    const response_code = view.getUint8(0);
+    const stats_type = view.getUint8(1);
+    if (response_code !== 24 || stats_type !== 0) {
+        throw new Error('Invalid response type');
+    }
     return {
-        battery_mv: view.getUint16(1, true),
-        uptime_secs: view.getUint32(3, true),
-        errors: view.getUint16(7, true),
-        queue_len: view.getUint8(9)
+        battery_mv: view.getUint16(2, true),
+        uptime_secs: view.getUint32(4, true),
+        errors: view.getUint16(8, true),
+        queue_len: view.getUint8(10)
     };
 }
 
 function parseStatsRadio(buffer: ArrayBuffer): StatsRadio {
     const view = new DataView(buffer);
+    const response_code = view.getUint8(0);
+    const stats_type = view.getUint8(1);
+    if (response_code !== 24 || stats_type !== 1) {
+        throw new Error('Invalid response type');
+    }
     return {
-        noise_floor: view.getInt16(1, true),
-        last_rssi: view.getInt8(3),
-        last_snr: view.getInt8(4) / 4.0,  // Unscale SNR
-        tx_air_secs: view.getUint32(5, true),
-        rx_air_secs: view.getUint32(9, true)
+        noise_floor: view.getInt16(2, true),
+        last_rssi: view.getInt8(4),
+        last_snr: view.getInt8(5) / 4.0,  // Unscale SNR
+        tx_air_secs: view.getUint32(6, true),
+        rx_air_secs: view.getUint32(10, true)
     };
 }
 
 function parseStatsPackets(buffer: ArrayBuffer): StatsPackets {
     const view = new DataView(buffer);
+    const response_code = view.getUint8(0);
+    const stats_type = view.getUint8(1);
+    if (response_code !== 24 || stats_type !== 2) {
+        throw new Error('Invalid response type');
+    }
     return {
-        recv: view.getUint32(1, true),
-        sent: view.getUint32(5, true),
-        flood_tx: view.getUint32(9, true),
-        direct_tx: view.getUint32(13, true),
-        flood_rx: view.getUint32(17, true),
-        direct_rx: view.getUint32(21, true)
+        recv: view.getUint32(2, true),
+        sent: view.getUint32(6, true),
+        flood_tx: view.getUint32(10, true),
+        direct_tx: view.getUint32(14, true),
+        flood_rx: view.getUint32(18, true),
+        direct_rx: view.getUint32(22, true)
     };
 }
 ```
diff --git a/examples/companion_radio/MyMesh.cpp b/examples/companion_radio/MyMesh.cpp
index 140f58c6..bcc56817 100644
--- a/examples/companion_radio/MyMesh.cpp
+++ b/examples/companion_radio/MyMesh.cpp
@@ -52,9 +52,12 @@
 #define CMD_SEND_PATH_DISCOVERY_REQ   52
 #define CMD_SET_FLOOD_SCOPE           54   // v8+
 #define CMD_SEND_CONTROL_DATA         55   // v8+
-#define CMD_GET_STATS_CORE            56
-#define CMD_GET_STATS_RADIO           57
-#define CMD_GET_STATS_PACKETS         58
+#define CMD_GET_STATS                 56   // v8+, second byte is stats type
+
+// Stats sub-types for CMD_GET_STATS
+#define STATS_TYPE_CORE               0
+#define STATS_TYPE_RADIO              1
+#define STATS_TYPE_PACKETS             2
 
 #define RESP_CODE_OK                  0
 #define RESP_CODE_ERR                 1
@@ -80,9 +83,7 @@
 #define RESP_CODE_CUSTOM_VARS         21
 #define RESP_CODE_ADVERT_PATH         22
 #define RESP_CODE_TUNING_PARAMS       23
-#define RESP_CODE_STATS_CORE          24
-#define RESP_CODE_STATS_RADIO         25
-#define RESP_CODE_STATS_PACKETS       26
+#define RESP_CODE_STATS               24   // v8+, second byte is stats type
 
 #define SEND_TIMEOUT_BASE_MILLIS        500
 #define FLOOD_SEND_TIMEOUT_FACTOR       16.0f
@@ -1535,47 +1536,55 @@ void MyMesh::handleCmdFrame(size_t len) {
     } else {
       writeErrFrame(ERR_CODE_NOT_FOUND);
     }
-  } else if (cmd_frame[0] == CMD_GET_STATS_CORE) {
-    int i = 0;
-    out_frame[i++] = RESP_CODE_STATS_CORE;
-    uint16_t battery_mv = board.getBattMilliVolts();
-    uint32_t uptime_secs = _ms->getMillis() / 1000;
-    uint8_t queue_len = (uint8_t)_mgr->getOutboundCount(0xFFFFFFFF);
-    memcpy(&out_frame[i], &battery_mv, 2); i += 2;
-    memcpy(&out_frame[i], &uptime_secs, 4); i += 4;
-    memcpy(&out_frame[i], &_err_flags, 2); i += 2;
-    out_frame[i++] = queue_len;
-    _serial->writeFrame(out_frame, i);
-  } else if (cmd_frame[0] == CMD_GET_STATS_RADIO) {
-    int i = 0;
-    out_frame[i++] = RESP_CODE_STATS_RADIO;
-    int16_t noise_floor = (int16_t)_radio->getNoiseFloor();
-    int8_t last_rssi = (int8_t)radio_driver.getLastRSSI();
-    int8_t last_snr = (int8_t)(radio_driver.getLastSNR() * 4); // scaled by 4 for 0.25 dB precision
-    uint32_t tx_air_secs = getTotalAirTime() / 1000;
-    uint32_t rx_air_secs = getReceiveAirTime() / 1000;
-    memcpy(&out_frame[i], &noise_floor, 2); i += 2;
-    out_frame[i++] = last_rssi;
-    out_frame[i++] = last_snr;
-    memcpy(&out_frame[i], &tx_air_secs, 4); i += 4;
-    memcpy(&out_frame[i], &rx_air_secs, 4); i += 4;
-    _serial->writeFrame(out_frame, i);
-  } else if (cmd_frame[0] == CMD_GET_STATS_PACKETS) {
-    int i = 0;
-    out_frame[i++] = RESP_CODE_STATS_PACKETS;
-    uint32_t recv = radio_driver.getPacketsRecv();
-    uint32_t sent = radio_driver.getPacketsSent();
-    uint32_t n_sent_flood = getNumSentFlood();
-    uint32_t n_sent_direct = getNumSentDirect();
-    uint32_t n_recv_flood = getNumRecvFlood();
-    uint32_t n_recv_direct = getNumRecvDirect();
-    memcpy(&out_frame[i], &recv, 4); i += 4;
-    memcpy(&out_frame[i], &sent, 4); i += 4;
-    memcpy(&out_frame[i], &n_sent_flood, 4); i += 4;
-    memcpy(&out_frame[i], &n_sent_direct, 4); i += 4;
-    memcpy(&out_frame[i], &n_recv_flood, 4); i += 4;
-    memcpy(&out_frame[i], &n_recv_direct, 4); i += 4;
-    _serial->writeFrame(out_frame, i);
+  } else if (cmd_frame[0] == CMD_GET_STATS && len >= 2) {
+    uint8_t stats_type = cmd_frame[1];
+    if (stats_type == STATS_TYPE_CORE) {
+      int i = 0;
+      out_frame[i++] = RESP_CODE_STATS;
+      out_frame[i++] = STATS_TYPE_CORE;
+      uint16_t battery_mv = board.getBattMilliVolts();
+      uint32_t uptime_secs = _ms->getMillis() / 1000;
+      uint8_t queue_len = (uint8_t)_mgr->getOutboundCount(0xFFFFFFFF);
+      memcpy(&out_frame[i], &battery_mv, 2); i += 2;
+      memcpy(&out_frame[i], &uptime_secs, 4); i += 4;
+      memcpy(&out_frame[i], &_err_flags, 2); i += 2;
+      out_frame[i++] = queue_len;
+      _serial->writeFrame(out_frame, i);
+    } else if (stats_type == STATS_TYPE_RADIO) {
+      int i = 0;
+      out_frame[i++] = RESP_CODE_STATS;
+      out_frame[i++] = STATS_TYPE_RADIO;
+      int16_t noise_floor = (int16_t)_radio->getNoiseFloor();
+      int8_t last_rssi = (int8_t)radio_driver.getLastRSSI();
+      int8_t last_snr = (int8_t)(radio_driver.getLastSNR() * 4); // scaled by 4 for 0.25 dB precision
+      uint32_t tx_air_secs = getTotalAirTime() / 1000;
+      uint32_t rx_air_secs = getReceiveAirTime() / 1000;
+      memcpy(&out_frame[i], &noise_floor, 2); i += 2;
+      out_frame[i++] = last_rssi;
+      out_frame[i++] = last_snr;
+      memcpy(&out_frame[i], &tx_air_secs, 4); i += 4;
+      memcpy(&out_frame[i], &rx_air_secs, 4); i += 4;
+      _serial->writeFrame(out_frame, i);
+    } else if (stats_type == STATS_TYPE_PACKETS) {
+      int i = 0;
+      out_frame[i++] = RESP_CODE_STATS;
+      out_frame[i++] = STATS_TYPE_PACKETS;
+      uint32_t recv = radio_driver.getPacketsRecv();
+      uint32_t sent = radio_driver.getPacketsSent();
+      uint32_t n_sent_flood = getNumSentFlood();
+      uint32_t n_sent_direct = getNumSentDirect();
+      uint32_t n_recv_flood = getNumRecvFlood();
+      uint32_t n_recv_direct = getNumRecvDirect();
+      memcpy(&out_frame[i], &recv, 4); i += 4;
+      memcpy(&out_frame[i], &sent, 4); i += 4;
+      memcpy(&out_frame[i], &n_sent_flood, 4); i += 4;
+      memcpy(&out_frame[i], &n_sent_direct, 4); i += 4;
+      memcpy(&out_frame[i], &n_recv_flood, 4); i += 4;
+      memcpy(&out_frame[i], &n_recv_direct, 4); i += 4;
+      _serial->writeFrame(out_frame, i);
+    } else {
+      writeErrFrame(ERR_CODE_ILLEGAL_ARG); // invalid stats sub-type
+    }
   } else if (cmd_frame[0] == CMD_FACTORY_RESET && memcmp(&cmd_frame[1], "reset", 5) == 0) {
     bool success = _store->formatFileSystem();
     if (success) {

From ed9655e14e40d9e4f5361631c1ddc0d3a70de999 Mon Sep 17 00:00:00 2001
From: taco <taco@sly.nu>
Date: Fri, 21 Nov 2025 12:48:33 +1100
Subject: [PATCH 06/13] rename faketec to promicro

---
 variants/promicro/platformio.ini | 64 ++++++++++++++++----------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/variants/promicro/platformio.ini b/variants/promicro/platformio.ini
index b1c0c4ea..90962d27 100644
--- a/variants/promicro/platformio.ini
+++ b/variants/promicro/platformio.ini
@@ -1,9 +1,9 @@
-[Faketec]
+[Promicro]
 extends = nrf52_base
 board = promicro_nrf52840
 build_flags = ${nrf52_base.build_flags}
   -I variants/promicro
-  -D FAKETEC
+  -D PROMICRO
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
@@ -34,14 +34,14 @@ lib_deps= ${nrf52_base.lib_deps}
   adafruit/Adafruit BMP280 Library@^2.6.8
   stevemarple/MicroNMEA @ ^2.0.6
 
-[env:Faketec_repeater]
-extends = Faketec
-build_src_filter = ${Faketec.build_src_filter}
+[env:ProMicro_repeater]
+extends = Promicro
+build_src_filter = ${Promicro.build_src_filter}
   +<../examples/simple_repeater>
   +<helpers/ui/SSD1306Display.cpp>
   +<helpers/ui/MomentaryButton.cpp>
 build_flags =
-  ${Faketec.build_flags}
+  ${Promicro.build_flags}
   -D ADVERT_NAME='"Faketec Repeater"'
   -D ADVERT_LAT=0.0
   -D ADVERT_LON=0.0
@@ -50,16 +50,16 @@ build_flags =
   -D DISPLAY_CLASS=SSD1306Display
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-lib_deps = ${Faketec.lib_deps}
+lib_deps = ${Promicro.lib_deps}
   adafruit/RTClib @ ^2.1.3
 
-[env:Faketec_room_server]
-extends = Faketec
-build_src_filter = ${Faketec.build_src_filter}
+[env:ProMicro_room_server]
+extends = Promicro
+build_src_filter = ${Promicro.build_src_filter}
   +<../examples/simple_room_server>
   +<helpers/ui/SSD1306Display.cpp>
   +<helpers/ui/MomentaryButton.cpp>
-build_flags = ${Faketec.build_flags}
+build_flags = ${Promicro.build_flags}
   -D ADVERT_NAME='"Faketec Room"'
   -D ADVERT_LAT=0.0
   -D ADVERT_LON=0.0
@@ -68,47 +68,47 @@ build_flags = ${Faketec.build_flags}
   -D DISPLAY_CLASS=SSD1306Display
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-lib_deps = ${Faketec.lib_deps}
+lib_deps = ${Promicro.lib_deps}
   adafruit/RTClib @ ^2.1.3
 
-[env:Faketec_terminal_chat]
-extends = Faketec
-build_flags = ${Faketec.build_flags}
+[env:ProMicro_terminal_chat]
+extends = Promicro
+build_flags = ${Promicro.build_flags}
   -D MAX_CONTACTS=100
   -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${Faketec.build_src_filter}
+build_src_filter = ${Promicro.build_src_filter}
   +<../examples/simple_secure_chat/main.cpp>
-lib_deps = ${Faketec.lib_deps}
+lib_deps = ${Promicro.lib_deps}
   densaugeo/base64 @ ~1.4.0
   adafruit/RTClib @ ^2.1.3
 
-[env:Faketec_companion_radio_usb]
-extends = Faketec
+[env:ProMicro_companion_radio_usb]
+extends = Promicro
 board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld
 board_upload.maximum_size = 712704
-build_flags = ${Faketec.build_flags}
+build_flags = ${Promicro.build_flags}
   -I examples/companion_radio/ui-new
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=SSD1306Display
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
-build_src_filter = ${Faketec.build_src_filter}
+build_src_filter = ${Promicro.build_src_filter}
   +<helpers/ui/SSD1306Display.cpp>
   +<helpers/ui/MomentaryButton.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-new/*.cpp>
-lib_deps = ${Faketec.lib_deps}
+lib_deps = ${Promicro.lib_deps}
   adafruit/RTClib @ ^2.1.3
   densaugeo/base64 @ ~1.4.0
 
-[env:Faketec_companion_radio_ble]
-extends = Faketec
+[env:ProMicro_companion_radio_ble]
+extends = Promicro
 board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld
 board_upload.maximum_size = 712704
-build_flags = ${Faketec.build_flags}
+build_flags = ${Promicro.build_flags}
   -I examples/companion_radio/ui-new
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
@@ -118,20 +118,20 @@ build_flags = ${Faketec.build_flags}
   -D DISPLAY_CLASS=SSD1306Display
 ;  -D MESH_PACKET_LOGGING=1
   -D MESH_DEBUG=1
-build_src_filter = ${Faketec.build_src_filter}
+build_src_filter = ${Promicro.build_src_filter}
   +<helpers/nrf52/SerialBLEInterface.cpp>
   +<helpers/ui/SSD1306Display.cpp>
   +<helpers/ui/MomentaryButton.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-new/*.cpp>
-lib_deps = ${Faketec.lib_deps}
+lib_deps = ${Promicro.lib_deps}
   adafruit/RTClib @ ^2.1.3
   densaugeo/base64 @ ~1.4.0
 
-[env:Faketec_sensor]
-extends = Faketec
+[env:ProMicro_sensor]
+extends = Promicro
 build_flags =
-  ${Faketec.build_flags}
+  ${Promicro.build_flags}
   -D ADVERT_NAME='"Faketec Sensor"'
   -D ADVERT_LAT=0.0
   -D ADVERT_LON=0.0
@@ -139,9 +139,9 @@ build_flags =
   -D DISPLAY_CLASS=SSD1306Display
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${Faketec.build_src_filter}
+build_src_filter = ${Promicro.build_src_filter}
   +<helpers/ui/SSD1306Display.cpp>
   +<helpers/ui/MomentaryButton.cpp>
   +<../examples/simple_sensor>
 lib_deps =
-  ${Faketec.lib_deps}
+  ${Promicro.lib_deps}

From 454f6b2583496cc4937b111ab4c7d6eb3b79e9e7 Mon Sep 17 00:00:00 2001
From: taco <taco@sly.nu>
Date: Fri, 21 Nov 2025 17:57:49 +1100
Subject: [PATCH 07/13] rename adverts

---
 variants/promicro/platformio.ini | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/variants/promicro/platformio.ini b/variants/promicro/platformio.ini
index 90962d27..78ea5fa1 100644
--- a/variants/promicro/platformio.ini
+++ b/variants/promicro/platformio.ini
@@ -42,7 +42,7 @@ build_src_filter = ${Promicro.build_src_filter}
   +<helpers/ui/MomentaryButton.cpp>
 build_flags =
   ${Promicro.build_flags}
-  -D ADVERT_NAME='"Faketec Repeater"'
+  -D ADVERT_NAME='"ProMicro Repeater"'
   -D ADVERT_LAT=0.0
   -D ADVERT_LON=0.0
   -D ADMIN_PASSWORD='"password"'
@@ -60,7 +60,7 @@ build_src_filter = ${Promicro.build_src_filter}
   +<helpers/ui/SSD1306Display.cpp>
   +<helpers/ui/MomentaryButton.cpp>
 build_flags = ${Promicro.build_flags}
-  -D ADVERT_NAME='"Faketec Room"'
+  -D ADVERT_NAME='"ProMicro Room"'
   -D ADVERT_LAT=0.0
   -D ADVERT_LON=0.0
   -D ADMIN_PASSWORD='"password"'
@@ -132,7 +132,7 @@ lib_deps = ${Promicro.lib_deps}
 extends = Promicro
 build_flags =
   ${Promicro.build_flags}
-  -D ADVERT_NAME='"Faketec Sensor"'
+  -D ADVERT_NAME='"ProMicro Sensor"'
   -D ADVERT_LAT=0.0
   -D ADVERT_LON=0.0
   -D ADMIN_PASSWORD='"password"'

From 5a3ea64a97dc0cc419ee553d0da5c4c7656b7858 Mon Sep 17 00:00:00 2001
From: taco <taco@sly.nu>
Date: Fri, 21 Nov 2025 18:15:30 +1100
Subject: [PATCH 08/13] Repeater: add adc.multiplier setting

---
 examples/simple_repeater/MyMesh.cpp |  4 ++++
 src/MeshCore.h                      |  2 ++
 src/helpers/CommonCLI.cpp           | 14 ++++++++++++--
 src/helpers/CommonCLI.h             |  1 +
 variants/promicro/PromicroBoard.h   | 14 +++++++++++++-
 5 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/examples/simple_repeater/MyMesh.cpp b/examples/simple_repeater/MyMesh.cpp
index 4136818c..091d7901 100644
--- a/examples/simple_repeater/MyMesh.cpp
+++ b/examples/simple_repeater/MyMesh.cpp
@@ -710,6 +710,8 @@ MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondCloc
   _prefs.gps_enabled = 0;
   _prefs.gps_interval = 0;
   _prefs.advert_loc_policy = ADVERT_LOC_PREFS;
+
+  _prefs.adc_multiplier = 0.0f; // 0.0f means use default board multiplier
 }
 
 void MyMesh::begin(FILESYSTEM *fs) {
@@ -733,6 +735,8 @@ void MyMesh::begin(FILESYSTEM *fs) {
   updateAdvertTimer();
   updateFloodAdvertTimer();
 
+  board.setAdcMultiplier(_prefs.adc_multiplier);
+
 #if ENV_INCLUDE_GPS == 1
   applyGpsPrefs();
 #endif
diff --git a/src/MeshCore.h b/src/MeshCore.h
index 94bf351d..d65c2b93 100644
--- a/src/MeshCore.h
+++ b/src/MeshCore.h
@@ -42,6 +42,8 @@ namespace mesh {
 class MainBoard {
 public:
   virtual uint16_t getBattMilliVolts() = 0;
+  virtual void setAdcMultiplier(float multiplier) {};
+  virtual float getAdcMultiplier() const { return 1.0f; }
   virtual const char* getManufacturerName() const = 0;
   virtual void onBeforeTransmit() { }
   virtual void onAfterTransmit() { }
diff --git a/src/helpers/CommonCLI.cpp b/src/helpers/CommonCLI.cpp
index 93773cce..b33d71aa 100644
--- a/src/helpers/CommonCLI.cpp
+++ b/src/helpers/CommonCLI.cpp
@@ -70,7 +70,8 @@ void CommonCLI::loadPrefsInt(FILESYSTEM* fs, const char* filename) {
     file.read((uint8_t *)&_prefs->gps_interval, sizeof(_prefs->gps_interval));                     // 157
     file.read((uint8_t *)&_prefs->advert_loc_policy, sizeof (_prefs->advert_loc_policy));          // 161
     file.read((uint8_t *)&_prefs->discovery_mod_timestamp, sizeof(_prefs->discovery_mod_timestamp)); // 162
-    // 166
+    file.read((uint8_t *)&_prefs->adc_multiplier, sizeof(_prefs->adc_multiplier)); // 166
+    // 170
 
     // sanitise bad pref values
     _prefs->rx_delay_base = constrain(_prefs->rx_delay_base, 0, 20.0f);
@@ -83,6 +84,7 @@ void CommonCLI::loadPrefsInt(FILESYSTEM* fs, const char* filename) {
     _prefs->cr = constrain(_prefs->cr, 5, 8);
     _prefs->tx_power_dbm = constrain(_prefs->tx_power_dbm, 1, 30);
     _prefs->multi_acks = constrain(_prefs->multi_acks, 0, 1);
+    _prefs->adc_multiplier = constrain(_prefs->adc_multiplier, 0.0f, 10.0f);
 
     // sanitise bad bridge pref values
     _prefs->bridge_enabled = constrain(_prefs->bridge_enabled, 0, 1);
@@ -148,7 +150,8 @@ void CommonCLI::savePrefs(FILESYSTEM* fs) {
     file.write((uint8_t *)&_prefs->gps_interval, sizeof(_prefs->gps_interval));                     // 157
     file.write((uint8_t *)&_prefs->advert_loc_policy, sizeof(_prefs->advert_loc_policy));           // 161
     file.write((uint8_t *)&_prefs->discovery_mod_timestamp, sizeof(_prefs->discovery_mod_timestamp)); // 162
-    // 166
+    file.write((uint8_t *)&_prefs->adc_multiplier, sizeof(_prefs->adc_multiplier));                 // 166
+    // 170
 
     file.close();
   }
@@ -331,6 +334,8 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
       } else if (memcmp(config, "bridge.secret", 13) == 0) {
         sprintf(reply, "> %s", _prefs->bridge_secret);
 #endif
+      } else if (memcmp(config, "adc.multiplier", 14) == 0) {
+        sprintf(reply, "> %s", StrHelper::ftoa(_prefs->adc_multiplier));
       } else {
         sprintf(reply, "??: %s", config);
       }
@@ -523,6 +528,11 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
         savePrefs();
         strcpy(reply, "OK");
 #endif
+      } else if (memcmp(config, "adc.multiplier ", 15) == 0) {
+        _prefs->adc_multiplier = atof(&config[15]);
+        _board->setAdcMultiplier(_prefs->adc_multiplier);
+        savePrefs();
+        strcpy(reply, "OK");
       } else {
         sprintf(reply, "unknown config: %s", config);
       }
diff --git a/src/helpers/CommonCLI.h b/src/helpers/CommonCLI.h
index a665e014..068783ab 100644
--- a/src/helpers/CommonCLI.h
+++ b/src/helpers/CommonCLI.h
@@ -47,6 +47,7 @@ struct NodePrefs { // persisted to file
   uint32_t gps_interval; // in seconds
   uint8_t advert_loc_policy;
   uint32_t discovery_mod_timestamp;
+  float adc_multiplier;
 };
 
 class CommonCLICallbacks {
diff --git a/variants/promicro/PromicroBoard.h b/variants/promicro/PromicroBoard.h
index e4b67415..9dfb7b2f 100644
--- a/variants/promicro/PromicroBoard.h
+++ b/variants/promicro/PromicroBoard.h
@@ -23,6 +23,7 @@ class PromicroBoard : public mesh::MainBoard {
 protected:
   uint8_t startup_reason;
   uint8_t btn_prev_state;
+  float adc_mult = ADC_MULTIPLIER;
 
 public:
   void begin();
@@ -39,7 +40,18 @@ public:
       raw += analogRead(PIN_VBAT_READ);
     }
     raw = raw / BATTERY_SAMPLES;
-    return (ADC_MULTIPLIER * raw);
+    return (adc_mult * raw);
+  }
+
+  void setAdcMultiplier(float multiplier) override {
+    if (multiplier == 0.0f) {
+      adc_mult = ADC_MULTIPLIER;}
+    else {
+      adc_mult = multiplier;
+    }
+  }
+  float getAdcMultiplier() const override {
+    return adc_mult;
   }
 
   const char* getManufacturerName() const override {

From e13c064487f11a99eaad173b556e0a4dc92a1350 Mon Sep 17 00:00:00 2001
From: taco <taco@sly.nu>
Date: Fri, 21 Nov 2025 21:46:55 +1100
Subject: [PATCH 09/13] add board.setAdcMultiplier to room server and sensor

---
 examples/simple_room_server/MyMesh.cpp | 2 ++
 examples/simple_sensor/SensorMesh.cpp  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/examples/simple_room_server/MyMesh.cpp b/examples/simple_room_server/MyMesh.cpp
index de06b4c6..7b575e6f 100644
--- a/examples/simple_room_server/MyMesh.cpp
+++ b/examples/simple_room_server/MyMesh.cpp
@@ -641,6 +641,8 @@ void MyMesh::begin(FILESYSTEM *fs) {
   updateAdvertTimer();
   updateFloodAdvertTimer();
 
+  board.setAdcMultiplier(_prefs.adc_multiplier);
+
 #if ENV_INCLUDE_GPS == 1
   applyGpsPrefs();
 #endif
diff --git a/examples/simple_sensor/SensorMesh.cpp b/examples/simple_sensor/SensorMesh.cpp
index 20d9921b..96a3791d 100644
--- a/examples/simple_sensor/SensorMesh.cpp
+++ b/examples/simple_sensor/SensorMesh.cpp
@@ -740,6 +740,8 @@ void SensorMesh::begin(FILESYSTEM* fs) {
   updateAdvertTimer();
   updateFloodAdvertTimer();
 
+   board.setAdcMultiplier(_prefs.adc_multiplier);
+
 #if ENV_INCLUDE_GPS == 1
   applyGpsPrefs();
 #endif

From fc93d84fb8eac695fe79f602ad0e70d59dd07823 Mon Sep 17 00:00:00 2001
From: taco <taco@sly.nu>
Date: Fri, 21 Nov 2025 23:44:17 +1100
Subject: [PATCH 10/13] tweaks get/set adcMultiplier logic

---
 src/MeshCore.h                    |  4 ++--
 src/helpers/CommonCLI.cpp         | 21 +++++++++++++++++----
 variants/promicro/PromicroBoard.h |  9 +++++++--
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/MeshCore.h b/src/MeshCore.h
index d65c2b93..11a6a5b4 100644
--- a/src/MeshCore.h
+++ b/src/MeshCore.h
@@ -42,8 +42,8 @@ namespace mesh {
 class MainBoard {
 public:
   virtual uint16_t getBattMilliVolts() = 0;
-  virtual void setAdcMultiplier(float multiplier) {};
-  virtual float getAdcMultiplier() const { return 1.0f; }
+  virtual bool setAdcMultiplier(float multiplier) { return false; };
+  virtual float getAdcMultiplier() const { return 0.0f; }
   virtual const char* getManufacturerName() const = 0;
   virtual void onBeforeTransmit() { }
   virtual void onAfterTransmit() { }
diff --git a/src/helpers/CommonCLI.cpp b/src/helpers/CommonCLI.cpp
index b33d71aa..17b2b753 100644
--- a/src/helpers/CommonCLI.cpp
+++ b/src/helpers/CommonCLI.cpp
@@ -335,7 +335,12 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
         sprintf(reply, "> %s", _prefs->bridge_secret);
 #endif
       } else if (memcmp(config, "adc.multiplier", 14) == 0) {
-        sprintf(reply, "> %s", StrHelper::ftoa(_prefs->adc_multiplier));
+        float adc_mult = _board->getAdcMultiplier();
+        if (adc_mult == 0.0f) {
+          strcpy(reply, "Error: unsupported by this board");
+        } else {
+          sprintf(reply, "> %.3f", adc_mult);
+        }
       } else {
         sprintf(reply, "??: %s", config);
       }
@@ -530,9 +535,17 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
 #endif
       } else if (memcmp(config, "adc.multiplier ", 15) == 0) {
         _prefs->adc_multiplier = atof(&config[15]);
-        _board->setAdcMultiplier(_prefs->adc_multiplier);
-        savePrefs();
-        strcpy(reply, "OK");
+        if (_board->setAdcMultiplier(_prefs->adc_multiplier)) {
+          savePrefs();
+          if (_prefs->adc_multiplier == 0.0f) {
+            strcpy(reply, "OK - using default board multiplier");
+          } else {
+            sprintf(reply, "OK - multiplier set to %.3f", _prefs->adc_multiplier);
+          }
+        } else {
+          _prefs->adc_multiplier = 0.0f;
+          strcpy(reply, "Error: unsupported by this board");
+        };
       } else {
         sprintf(reply, "unknown config: %s", config);
       }
diff --git a/variants/promicro/PromicroBoard.h b/variants/promicro/PromicroBoard.h
index 9dfb7b2f..dc20e550 100644
--- a/variants/promicro/PromicroBoard.h
+++ b/variants/promicro/PromicroBoard.h
@@ -43,15 +43,20 @@ public:
     return (adc_mult * raw);
   }
 
-  void setAdcMultiplier(float multiplier) override {
+  bool setAdcMultiplier(float multiplier) override {
     if (multiplier == 0.0f) {
       adc_mult = ADC_MULTIPLIER;}
     else {
       adc_mult = multiplier;
     }
+    return true;
   }
   float getAdcMultiplier() const override {
-    return adc_mult;
+    if (adc_mult == 0.0f) {
+      return ADC_MULTIPLIER;
+    } else {
+      return adc_mult;
+    }
   }
 
   const char* getManufacturerName() const override {

From dc58f0ea83ad12653075fef31b9afe4175d1671d Mon Sep 17 00:00:00 2001
From: Scott Powell <sqij@protonmail.com>
Date: Mon, 24 Nov 2025 22:56:55 +1100
Subject: [PATCH 11/13] * BUG FIX: repeater remote admin, flood login should
 invalidate the client->out_path

---
 examples/simple_repeater/MyMesh.cpp | 8 ++++++--
 examples/simple_repeater/MyMesh.h   | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/examples/simple_repeater/MyMesh.cpp b/examples/simple_repeater/MyMesh.cpp
index 091d7901..a9be6c40 100644
--- a/examples/simple_repeater/MyMesh.cpp
+++ b/examples/simple_repeater/MyMesh.cpp
@@ -82,7 +82,7 @@ void MyMesh::putNeighbour(const mesh::Identity &id, uint32_t timestamp, float sn
 #endif
 }
 
-uint8_t MyMesh::handleLoginReq(const mesh::Identity& sender, const uint8_t* secret, uint32_t sender_timestamp, const uint8_t* data) {
+uint8_t MyMesh::handleLoginReq(const mesh::Identity& sender, const uint8_t* secret, uint32_t sender_timestamp, const uint8_t* data, bool is_flood) {
   ClientInfo* client = NULL;
   if (data[0] == 0) {   // blank password, just check if sender is in ACL
     client = acl.getClient(sender.pub_key, PUB_KEY_SIZE);
@@ -123,6 +123,10 @@ uint8_t MyMesh::handleLoginReq(const mesh::Identity& sender, const uint8_t* secr
     }
   }
 
+  if (is_flood) {
+    client->out_path_len = -1;  // need to rediscover out_path
+  }
+
   uint32_t now = getRTCClock()->getCurrentTimeUnique();
   memcpy(reply_data, &now, 4);   // response packets always prefixed with timestamp
   reply_data[4] = RESP_SERVER_LOGIN_OK;
@@ -438,7 +442,7 @@ void MyMesh::onAnonDataRecv(mesh::Packet *packet, const uint8_t *secret, const m
     data[len] = 0;  // ensure null terminator
     uint8_t reply_len;
     if (data[4] == 0 || data[4] >= ' ') {   // is password, ie. a login request
-      reply_len = handleLoginReq(sender, secret, timestamp, &data[4]);
+      reply_len = handleLoginReq(sender, secret, timestamp, &data[4], packet->isRouteFlood());
     //} else if (data[4] == ANON_REQ_TYPE_*) {   // future type codes
       // TODO
     } else {
diff --git a/examples/simple_repeater/MyMesh.h b/examples/simple_repeater/MyMesh.h
index d8a20486..98bce787 100644
--- a/examples/simple_repeater/MyMesh.h
+++ b/examples/simple_repeater/MyMesh.h
@@ -113,7 +113,7 @@ class MyMesh : public mesh::Mesh, public CommonCLICallbacks {
 #endif
 
   void putNeighbour(const mesh::Identity& id, uint32_t timestamp, float snr);
-  uint8_t handleLoginReq(const mesh::Identity& sender, const uint8_t* secret, uint32_t sender_timestamp, const uint8_t* data);
+  uint8_t handleLoginReq(const mesh::Identity& sender, const uint8_t* secret, uint32_t sender_timestamp, const uint8_t* data, bool is_flood);
   int handleRequest(ClientInfo* sender, uint32_t sender_timestamp, uint8_t* payload, size_t payload_len);
   mesh::Packet* createSelfAdvert();
 

From 0e903de72cf6740ab5be070b3fd97dd0e0b3884f Mon Sep 17 00:00:00 2001
From: Scott Powell <sqij@protonmail.com>
Date: Tue, 25 Nov 2025 15:09:51 +1100
Subject: [PATCH 12/13] * BUG FIX: same remote login fix as repeater

---
 examples/simple_sensor/SensorMesh.cpp | 8 ++++++--
 examples/simple_sensor/SensorMesh.h   | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/examples/simple_sensor/SensorMesh.cpp b/examples/simple_sensor/SensorMesh.cpp
index 96a3791d..6116c4de 100644
--- a/examples/simple_sensor/SensorMesh.cpp
+++ b/examples/simple_sensor/SensorMesh.cpp
@@ -326,7 +326,7 @@ int SensorMesh::getAGCResetInterval() const {
   return ((int)_prefs.agc_reset_interval) * 4000;   // milliseconds
 }
 
-uint8_t SensorMesh::handleLoginReq(const mesh::Identity& sender, const uint8_t* secret, uint32_t sender_timestamp, const uint8_t* data) {
+uint8_t SensorMesh::handleLoginReq(const mesh::Identity& sender, const uint8_t* secret, uint32_t sender_timestamp, const uint8_t* data, bool is_flood) {
   ClientInfo* client;
   if (data[0] == 0) {   // blank password, just check if sender is in ACL
     client = acl.getClient(sender.pub_key, PUB_KEY_SIZE);
@@ -359,6 +359,10 @@ uint8_t SensorMesh::handleLoginReq(const mesh::Identity& sender, const uint8_t*
     dirty_contacts_expiry = futureMillis(LAZY_CONTACTS_WRITE_DELAY);
   }
 
+  if (is_flood) {
+    client->out_path_len = -1;  // need to rediscover out_path
+  }
+
   uint32_t now = getRTCClock()->getCurrentTimeUnique();
   memcpy(reply_data, &now, 4);   // response packets always prefixed with timestamp
   reply_data[4] = RESP_SERVER_LOGIN_OK;
@@ -451,7 +455,7 @@ void SensorMesh::onAnonDataRecv(mesh::Packet* packet, const uint8_t* secret, con
     data[len] = 0;  // ensure null terminator
     uint8_t reply_len;
     if (data[4] == 0 || data[4] >= ' ') {   // is password, ie. a login request
-      reply_len = handleLoginReq(sender, secret, timestamp, &data[4]);
+      reply_len = handleLoginReq(sender, secret, timestamp, &data[4], packet->isRouteFlood());
     //} else if (data[4] == ANON_REQ_TYPE_*) {   // future type codes
       // TODO
     } else {
diff --git a/examples/simple_sensor/SensorMesh.h b/examples/simple_sensor/SensorMesh.h
index 00d9c698..627ef549 100644
--- a/examples/simple_sensor/SensorMesh.h
+++ b/examples/simple_sensor/SensorMesh.h
@@ -148,7 +148,7 @@ private:
   uint8_t pending_sf;
   uint8_t pending_cr;
 
-  uint8_t handleLoginReq(const mesh::Identity& sender, const uint8_t* secret, uint32_t sender_timestamp, const uint8_t* data);
+  uint8_t handleLoginReq(const mesh::Identity& sender, const uint8_t* secret, uint32_t sender_timestamp, const uint8_t* data, bool is_flood);
   uint8_t handleRequest(uint8_t perms, uint32_t sender_timestamp, uint8_t req_type, uint8_t* payload, size_t payload_len);
   mesh::Packet* createSelfAdvert();
 

From 30ccc1fa0148c7af036cd05a8eecd444f644b83b Mon Sep 17 00:00:00 2001
From: Scott Powell <sqij@protonmail.com>
Date: Tue, 25 Nov 2025 15:12:48 +1100
Subject: [PATCH 13/13] * BUG FIX: remote login fix same as repeater

---
 examples/simple_room_server/MyMesh.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/examples/simple_room_server/MyMesh.cpp b/examples/simple_room_server/MyMesh.cpp
index 7b575e6f..89505a3b 100644
--- a/examples/simple_room_server/MyMesh.cpp
+++ b/examples/simple_room_server/MyMesh.cpp
@@ -332,6 +332,10 @@ void MyMesh::onAnonDataRecv(mesh::Packet *packet, const uint8_t *secret, const m
       dirty_contacts_expiry = futureMillis(LAZY_CONTACTS_WRITE_DELAY);
     }
 
+    if (packet->isRouteFlood()) {
+      client->out_path_len = -1;  // need to rediscover out_path
+    }
+
     uint32_t now = getRTCClock()->getCurrentTimeUnique();
     memcpy(reply_data, &now, 4); // response packets always prefixed with timestamp
     // TODO: maybe reply with count of messages waiting to be synced for THIS client?