From 37dc715a8e5fbec0f0e2cb9537ad418922c9a8b5 Mon Sep 17 00:00:00 2001
From: Florent <florent@frizoncorrea.fr>
Date: Sat, 18 Oct 2025 23:37:58 +0200
Subject: [PATCH 1/8] SensorManager: remove setSettingByKey

---
 examples/simple_repeater/MyMesh.h    |  2 +-
 examples/simple_room_server/MyMesh.h |  2 +-
 examples/simple_sensor/SensorMesh.h  |  2 +-
 src/helpers/CommonCLI.cpp            |  6 +++---
 src/helpers/SensorManager.h          | 10 ----------
 5 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/examples/simple_repeater/MyMesh.h b/examples/simple_repeater/MyMesh.h
index c45c141d..729c5b7d 100644
--- a/examples/simple_repeater/MyMesh.h
+++ b/examples/simple_repeater/MyMesh.h
@@ -137,7 +137,7 @@ protected:
 
 #if ENV_INCLUDE_GPS == 1
   void applyGpsPrefs() {
-    sensors.setSettingByKey("gps", _prefs.gps_enabled?"1":"0");
+    sensors.setSettingValue("gps", _prefs.gps_enabled?"1":"0");
   }
 #endif
 
diff --git a/examples/simple_room_server/MyMesh.h b/examples/simple_room_server/MyMesh.h
index 60ef1e73..f6ce31e5 100644
--- a/examples/simple_room_server/MyMesh.h
+++ b/examples/simple_room_server/MyMesh.h
@@ -151,7 +151,7 @@ protected:
 
 #if ENV_INCLUDE_GPS == 1
   void applyGpsPrefs() {
-    sensors.setSettingByKey("gps", _prefs.gps_enabled?"1":"0");
+    sensors.setSettingValue("gps", _prefs.gps_enabled?"1":"0");
   }
 #endif
 
diff --git a/examples/simple_sensor/SensorMesh.h b/examples/simple_sensor/SensorMesh.h
index cdc3940c..ff0698dc 100644
--- a/examples/simple_sensor/SensorMesh.h
+++ b/examples/simple_sensor/SensorMesh.h
@@ -151,7 +151,7 @@ private:
 
   #if ENV_INCLUDE_GPS == 1
   void applyGpsPrefs() {
-    sensors.setSettingByKey("gps", _prefs.gps_enabled?"1":"0");
+    sensors.setSettingValue("gps", _prefs.gps_enabled?"1":"0");
   }
 #endif
 };
diff --git a/src/helpers/CommonCLI.cpp b/src/helpers/CommonCLI.cpp
index 87f20f5a..77f0b085 100644
--- a/src/helpers/CommonCLI.cpp
+++ b/src/helpers/CommonCLI.cpp
@@ -545,7 +545,7 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
       int num = mesh::Utils::parseTextParts(tmp, parts, 2, ' ');
       const char *key = (num > 0) ? parts[0] : "";
       const char *value = (num > 1) ? parts[1] : "null";
-      if (sensors.setSettingByKey(key, value)) {
+      if (sensors.setSettingValue(key, value)) {
         strcpy(reply, "ok");
       } else {
         strcpy(reply, "can't find custom var");
@@ -577,7 +577,7 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
       }
 #if ENV_INCLUDE_GPS == 1
     } else if (memcmp(command, "gps on", 6) == 0) {
-      if (sensors.setSettingByKey("gps", "1")) {
+      if (sensors.setSettingValue("gps", "1")) {
         _prefs->gps_enabled = 1;
         savePrefs();
         strcpy(reply, "ok");
@@ -585,7 +585,7 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
         strcpy(reply, "gps toggle not found");
       }
     } else if (memcmp(command, "gps off", 7) == 0) {
-      if (sensors.setSettingByKey("gps", "0")) {
+      if (sensors.setSettingValue("gps", "0")) {
         _prefs->gps_enabled = 0;
         savePrefs();
         strcpy(reply, "ok");
diff --git a/src/helpers/SensorManager.h b/src/helpers/SensorManager.h
index 38c1d806..89a174c2 100644
--- a/src/helpers/SensorManager.h
+++ b/src/helpers/SensorManager.h
@@ -34,14 +34,4 @@ public:
     }
     return NULL;
   }
-
-  bool setSettingByKey(const char* key, const char* value) {
-    int num = getNumSettings();
-    for (int i = 0; i < num; i++) {
-      if (strcmp(getSettingName(i), key) == 0) {
-        return setSettingValue(key, value);
-      }
-    }
-    return false;
-  }
 };

From 04c0c40b391e5e9d78ce83dba5e539b30e4c1443 Mon Sep 17 00:00:00 2001
From: recrof <recrof@gmail.com>
Date: Tue, 4 Nov 2025 23:58:32 +0100
Subject: [PATCH 2/8] set max contacts to 350 and channels to 40 for esp32c3,
 s3 and c6

---
 variants/ebyte_eora_s3/platformio.ini         | 10 ++++----
 variants/generic_espnow/platformio.ini        |  4 ++--
 variants/heltec_ct62/platformio.ini           |  8 +++----
 variants/heltec_e213/platformio.ini           |  8 +++----
 variants/heltec_e290/platformio.ini           |  8 +++----
 variants/heltec_t190/platformio.ini           |  8 +++----
 variants/heltec_tracker/platformio.ini        |  4 ++--
 variants/heltec_tracker_v2/platformio.ini     | 14 +++++------
 variants/heltec_v3/platformio.ini             | 24 +++++++++----------
 variants/heltec_v4/platformio.ini             | 14 +++++------
 variants/heltec_wireless_paper/platformio.ini |  4 ++--
 variants/lilygo_t3s3/platformio.ini           | 10 ++++----
 variants/lilygo_t3s3_sx1276/platformio.ini    | 10 ++++----
 .../platformio.ini                            |  4 ++--
 variants/lilygo_tlora_c6/platformio.ini       |  4 ++--
 variants/meshadventurer/platformio.ini        |  8 +++----
 .../sensecap_indicator-espnow/platformio.ini  |  4 ++--
 variants/station_g2/platformio.ini            | 12 +++++-----
 variants/thinknode_m2/platformio.ini          | 12 +++++-----
 variants/xiao_c3/platformio.ini               | 12 +++++-----
 variants/xiao_c6/platformio.ini               | 12 +++++-----
 variants/xiao_s3_wio/platformio.ini           | 16 ++++++-------
 22 files changed, 105 insertions(+), 105 deletions(-)

diff --git a/variants/ebyte_eora_s3/platformio.ini b/variants/ebyte_eora_s3/platformio.ini
index df622a34..bdf6bba3 100644
--- a/variants/ebyte_eora_s3/platformio.ini
+++ b/variants/ebyte_eora_s3/platformio.ini
@@ -64,7 +64,7 @@ lib_deps =
 extends = Ebyte_EoRa-S3
 build_flags =
   ${Ebyte_EoRa-S3.build_flags}
-  -D MAX_CONTACTS=300
+  -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -99,8 +99,8 @@ build_flags =
   ${Ebyte_EoRa-S3.build_flags}
   -I examples/companion_radio/ui-new
   -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
 build_src_filter = ${Ebyte_EoRa-S3.build_src_filter}
@@ -118,8 +118,8 @@ build_flags =
   ${Ebyte_EoRa-S3.build_flags}
   -I examples/companion_radio/ui-new
   -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D BLE_DEBUG_LOGGING=1
   -D OFFLINE_QUEUE_SIZE=256
diff --git a/variants/generic_espnow/platformio.ini b/variants/generic_espnow/platformio.ini
index c40833dc..cdeed076 100644
--- a/variants/generic_espnow/platformio.ini
+++ b/variants/generic_espnow/platformio.ini
@@ -26,7 +26,7 @@ build_src_filter = ${esp32_base.build_src_filter}
 extends = Generic_ESPNOW
 build_flags =
   ${Generic_ESPNOW.build_flags}
-  -D MAX_CONTACTS=300
+  -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=1
 build_src_filter = ${Generic_ESPNOW.build_src_filter}
   +<../examples/simple_secure_chat/main.cpp>
@@ -54,7 +54,7 @@ lib_deps =
 extends = Generic_ESPNOW
 build_flags =
   ${Generic_ESPNOW.build_flags}
-  -D MAX_CONTACTS=300
+  -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=8
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
diff --git a/variants/heltec_ct62/platformio.ini b/variants/heltec_ct62/platformio.ini
index 1b6121e4..1f2e330a 100644
--- a/variants/heltec_ct62/platformio.ini
+++ b/variants/heltec_ct62/platformio.ini
@@ -97,8 +97,8 @@ build_flags =
   ${Heltec_ct62.build_flags}
 ;  -D ARDUINO_USB_MODE=1
 ;  -D ARDUINO_USB_CDC_ON_BOOT=1
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -115,8 +115,8 @@ build_flags =
   ${Heltec_ct62.build_flags}
 ;  -D ARDUINO_USB_MODE=1
 ;  -D ARDUINO_USB_CDC_ON_BOOT=1
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256
   -D BLE_PIN_CODE=123456
 ;  -D MESH_PACKET_LOGGING=1
diff --git a/variants/heltec_e213/platformio.ini b/variants/heltec_e213/platformio.ini
index 93bdc000..caba3a30 100644
--- a/variants/heltec_e213/platformio.ini
+++ b/variants/heltec_e213/platformio.ini
@@ -45,8 +45,8 @@ extends = Heltec_E213_base
 build_flags =
   ${Heltec_E213_base.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=E213Display
   -D BLE_PIN_CODE=123456   ; dynamic, random PIN
   -D BLE_DEBUG_LOGGING=1
@@ -65,8 +65,8 @@ extends = Heltec_E213_base
 build_flags =
   ${Heltec_E213_base.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=E213Display
   -D OFFLINE_QUEUE_SIZE=256
 build_src_filter = ${Heltec_E213_base.build_src_filter}
diff --git a/variants/heltec_e290/platformio.ini b/variants/heltec_e290/platformio.ini
index 201b3631..0c07c592 100644
--- a/variants/heltec_e290/platformio.ini
+++ b/variants/heltec_e290/platformio.ini
@@ -39,8 +39,8 @@ extends = Heltec_E290_base
 build_flags =
   ${Heltec_E290_base.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=E290Display
   -D BLE_PIN_CODE=123456   ; dynamic, random PIN
   -D BLE_DEBUG_LOGGING=1
@@ -59,8 +59,8 @@ extends = Heltec_E290_base
 build_flags =
   ${Heltec_E290_base.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=E290Display
   -D BLE_PIN_CODE=123456   ; dynamic, random PIN
   -D BLE_DEBUG_LOGGING=1
diff --git a/variants/heltec_t190/platformio.ini b/variants/heltec_t190/platformio.ini
index 01e9dfc9..8d21c523 100644
--- a/variants/heltec_t190/platformio.ini
+++ b/variants/heltec_t190/platformio.ini
@@ -52,8 +52,8 @@ extends = Heltec_T190_base
 build_flags =
   ${Heltec_T190_base.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456   ; dynamic, random PIN
   -D BLE_DEBUG_LOGGING=1
   -D OFFLINE_QUEUE_SIZE=256
@@ -70,8 +70,8 @@ extends = Heltec_T190_base
 build_flags =
   ${Heltec_T190_base.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256
 build_src_filter = ${Heltec_T190_base.build_src_filter}
   +<helpers/esp32/*.cpp>
diff --git a/variants/heltec_tracker/platformio.ini b/variants/heltec_tracker/platformio.ini
index 19ab49a8..4f48ac21 100644
--- a/variants/heltec_tracker/platformio.ini
+++ b/variants/heltec_tracker/platformio.ini
@@ -43,8 +43,8 @@ build_flags =
   -I examples/companion_radio/ui-new
   -D DISPLAY_ROTATION=1
   -D DISPLAY_CLASS=ST7735Display
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456 ; HWT will use display for pin
   -D OFFLINE_QUEUE_SIZE=256
 ;  -D BLE_DEBUG_LOGGING=1
diff --git a/variants/heltec_tracker_v2/platformio.ini b/variants/heltec_tracker_v2/platformio.ini
index c4a79d9e..61ccd4f4 100644
--- a/variants/heltec_tracker_v2/platformio.ini
+++ b/variants/heltec_tracker_v2/platformio.ini
@@ -120,7 +120,7 @@ lib_deps =
 extends = Heltec_tracker_v2
 build_flags =
   ${Heltec_tracker_v2.build_flags}
-  -D MAX_CONTACTS=300
+  -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -135,8 +135,8 @@ extends = Heltec_tracker_v2
 build_flags =
   ${Heltec_tracker_v2.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=ST7735Display
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
@@ -154,8 +154,8 @@ extends = Heltec_tracker_v2
 build_flags =
   ${Heltec_tracker_v2.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=ST7735Display
   -D BLE_PIN_CODE=123456   ; dynamic, random PIN
   -D AUTO_SHUTDOWN_MILLIVOLTS=3400
@@ -179,8 +179,8 @@ extends = Heltec_tracker_v2
 build_flags =
   ${Heltec_tracker_v2.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=ST7735Display
   -D WIFI_DEBUG_LOGGING=1
   -D WIFI_SSID='"myssid"'
diff --git a/variants/heltec_v3/platformio.ini b/variants/heltec_v3/platformio.ini
index dcf566b3..36c6386f 100644
--- a/variants/heltec_v3/platformio.ini
+++ b/variants/heltec_v3/platformio.ini
@@ -125,7 +125,7 @@ lib_deps =
 extends = Heltec_lora32_v3
 build_flags =
   ${Heltec_lora32_v3.build_flags}
-  -D MAX_CONTACTS=300
+  -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -140,8 +140,8 @@ extends = Heltec_lora32_v3
 build_flags =
   ${Heltec_lora32_v3.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -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
@@ -159,8 +159,8 @@ extends = Heltec_lora32_v3
 build_flags =
   ${Heltec_lora32_v3.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=SSD1306Display
   -D BLE_PIN_CODE=123456   ; dynamic, random PIN
   -D AUTO_SHUTDOWN_MILLIVOLTS=3400
@@ -183,8 +183,8 @@ extends = Heltec_lora32_v3
 build_flags =
   ${Heltec_lora32_v3.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=SSD1306Display
   -D WIFI_DEBUG_LOGGING=1
   -D WIFI_SSID='"myssid"'
@@ -304,8 +304,8 @@ lib_deps =
 extends = Heltec_lora32_v3
 build_flags =
   ${Heltec_lora32_v3.build_flags}
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D BLE_DEBUG_LOGGING=1
   -D OFFLINE_QUEUE_SIZE=256
@@ -323,7 +323,7 @@ extends = Heltec_lora32_v3
 build_flags =
   ${Heltec_lora32_v3.build_flags}
   -D MAX_CONTACTS=140
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_GROUP_CHANNELS=40
 ; 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}
@@ -336,8 +336,8 @@ lib_deps =
 extends = Heltec_lora32_v3
 build_flags =
   ${Heltec_lora32_v3.build_flags}
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D WIFI_DEBUG_LOGGING=1
   -D WIFI_SSID='"myssid"'
   -D WIFI_PWD='"mypwd"'
diff --git a/variants/heltec_v4/platformio.ini b/variants/heltec_v4/platformio.ini
index 2c06b978..c26a5bc6 100644
--- a/variants/heltec_v4/platformio.ini
+++ b/variants/heltec_v4/platformio.ini
@@ -112,7 +112,7 @@ lib_deps =
 extends = Heltec_lora32_v4
 build_flags =
   ${Heltec_lora32_v4.build_flags}
-  -D MAX_CONTACTS=300
+  -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -127,8 +127,8 @@ extends = Heltec_lora32_v4
 build_flags =
   ${Heltec_lora32_v4.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -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
@@ -146,8 +146,8 @@ extends = Heltec_lora32_v4
 build_flags =
   ${Heltec_lora32_v4.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=SSD1306Display
   -D BLE_PIN_CODE=123456   ; dynamic, random PIN
   -D AUTO_SHUTDOWN_MILLIVOLTS=3400
@@ -170,8 +170,8 @@ extends = Heltec_lora32_v4
 build_flags =
   ${Heltec_lora32_v4.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=SSD1306Display
   -D WIFI_DEBUG_LOGGING=1
   -D WIFI_SSID='"myssid"'
diff --git a/variants/heltec_wireless_paper/platformio.ini b/variants/heltec_wireless_paper/platformio.ini
index 20bf4c64..c9ad758b 100644
--- a/variants/heltec_wireless_paper/platformio.ini
+++ b/variants/heltec_wireless_paper/platformio.ini
@@ -38,8 +38,8 @@ extends = Heltec_Wireless_Paper_base
 build_flags =
   ${Heltec_Wireless_Paper_base.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=E213Display
   -D BLE_PIN_CODE=123456   ; dynamic, random PIN
   -D BLE_DEBUG_LOGGING=1
diff --git a/variants/lilygo_t3s3/platformio.ini b/variants/lilygo_t3s3/platformio.ini
index a97a692a..0f01c9b7 100644
--- a/variants/lilygo_t3s3/platformio.ini
+++ b/variants/lilygo_t3s3/platformio.ini
@@ -102,7 +102,7 @@ lib_deps =
 extends = LilyGo_T3S3_sx1262
 build_flags =
   ${LilyGo_T3S3_sx1262.build_flags}
-  -D MAX_CONTACTS=300
+  -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -137,8 +137,8 @@ build_flags =
   ${LilyGo_T3S3_sx1262.build_flags}
   -I examples/companion_radio/ui-new
   -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
 build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter}
@@ -156,8 +156,8 @@ build_flags =
   ${LilyGo_T3S3_sx1262.build_flags}
   -I examples/companion_radio/ui-new
   -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D BLE_DEBUG_LOGGING=1
   -D OFFLINE_QUEUE_SIZE=256
diff --git a/variants/lilygo_t3s3_sx1276/platformio.ini b/variants/lilygo_t3s3_sx1276/platformio.ini
index eee8bdbd..f544be11 100644
--- a/variants/lilygo_t3s3_sx1276/platformio.ini
+++ b/variants/lilygo_t3s3_sx1276/platformio.ini
@@ -100,7 +100,7 @@ lib_deps =
 extends = LilyGo_T3S3_sx1276
 build_flags =
   ${LilyGo_T3S3_sx1276.build_flags}
-  -D MAX_CONTACTS=300
+  -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -136,8 +136,8 @@ build_flags =
   ${LilyGo_T3S3_sx1276.build_flags}
   -I examples/companion_radio/ui-new
   -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D MESH_PACKET_LOGGING=1
   -D MESH_DEBUG=1
 build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter}
@@ -155,8 +155,8 @@ build_flags =
   ${LilyGo_T3S3_sx1276.build_flags}
   -I examples/companion_radio/ui-new
   -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D BLE_DEBUG_LOGGING=1
   -D OFFLINE_QUEUE_SIZE=256
diff --git a/variants/lilygo_tbeam_supreme_SX1262/platformio.ini b/variants/lilygo_tbeam_supreme_SX1262/platformio.ini
index ef31e6e1..2d2a095a 100644
--- a/variants/lilygo_tbeam_supreme_SX1262/platformio.ini
+++ b/variants/lilygo_tbeam_supreme_SX1262/platformio.ini
@@ -116,8 +116,8 @@ extends = T_Beam_S3_Supreme_SX1262
 build_flags =
   ${T_Beam_S3_Supreme_SX1262.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D OFFLINE_QUEUE_SIZE=256
 ;  -D BLE_DEBUG_LOGGING=1
diff --git a/variants/lilygo_tlora_c6/platformio.ini b/variants/lilygo_tlora_c6/platformio.ini
index 88a811b5..b29cd036 100644
--- a/variants/lilygo_tlora_c6/platformio.ini
+++ b/variants/lilygo_tlora_c6/platformio.ini
@@ -67,8 +67,8 @@ lib_deps =
 [env:LilyGo_Tlora_C6_companion_radio_ble_]
 extends = tlora_c6
 build_flags = ${tlora_c6.build_flags}
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D BLE_DEBUG_LOGGING=1
   -D OFFLINE_QUEUE_SIZE=256
diff --git a/variants/meshadventurer/platformio.ini b/variants/meshadventurer/platformio.ini
index c52f4b7b..18b64ac3 100644
--- a/variants/meshadventurer/platformio.ini
+++ b/variants/meshadventurer/platformio.ini
@@ -190,7 +190,7 @@ build_flags =
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
   -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_GROUP_CHANNELS=40
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 lib_deps =
@@ -212,7 +212,7 @@ build_flags =
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
   -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D BLE_DEBUG_LOGGING=1
   -D OFFLINE_QUEUE_SIZE=256
@@ -275,7 +275,7 @@ build_flags =
   -D WRAPPER_CLASS=CustomSX1268Wrapper
   -D LORA_TX_POWER=22
   -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_GROUP_CHANNELS=40
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 lib_deps =
@@ -297,7 +297,7 @@ build_flags =
   -D WRAPPER_CLASS=CustomSX1268Wrapper
   -D LORA_TX_POWER=22
   -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D BLE_DEBUG_LOGGING=1
   -D OFFLINE_QUEUE_SIZE=256
diff --git a/variants/sensecap_indicator-espnow/platformio.ini b/variants/sensecap_indicator-espnow/platformio.ini
index 064f3ae8..e643d033 100644
--- a/variants/sensecap_indicator-espnow/platformio.ini
+++ b/variants/sensecap_indicator-espnow/platformio.ini
@@ -37,8 +37,8 @@ extends =SenseCapIndicator-ESPNow
 build_flags =
   ${SenseCapIndicator-ESPNow.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
 ; NOTE: DO NOT ENABLE -->  -D ESPNOW_DEBUG_LOGGING=1
diff --git a/variants/station_g2/platformio.ini b/variants/station_g2/platformio.ini
index bda8b7ae..9ee8f829 100644
--- a/variants/station_g2/platformio.ini
+++ b/variants/station_g2/platformio.ini
@@ -184,8 +184,8 @@ extends = Station_G2
 build_flags =
   ${Station_G2.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
 build_src_filter = ${Station_G2.build_src_filter}
@@ -201,8 +201,8 @@ extends = Station_G2
 build_flags =
   ${Station_G2.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D BLE_DEBUG_LOGGING=1
   -D OFFLINE_QUEUE_SIZE=256
@@ -221,8 +221,8 @@ extends = Station_G2
 build_flags =
   ${Station_G2.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D WIFI_DEBUG_LOGGING=1
   -D WIFI_SSID='"myssid"'
   -D WIFI_PWD='"mypwd"'
diff --git a/variants/thinknode_m2/platformio.ini b/variants/thinknode_m2/platformio.ini
index 0238947f..fb691d92 100644
--- a/variants/thinknode_m2/platformio.ini
+++ b/variants/thinknode_m2/platformio.ini
@@ -118,8 +118,8 @@ lib_deps =
 extends = ThinkNode_M2
 build_flags =
   ${ThinkNode_M2.build_flags}
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${ThinkNode_M2.build_src_filter}
@@ -133,8 +133,8 @@ extends = ThinkNode_M2
 build_flags =
   ${ThinkNode_M2.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D OFFLINE_QUEUE_SIZE=256
 ;  -D BLE_DEBUG_LOGGING=1
@@ -155,8 +155,8 @@ extends = ThinkNode_M2
 build_flags =
   ${ThinkNode_M2.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D SERIAL_TX=D6
   -D SERIAL_RX=D7
 ;  -D MESH_PACKET_LOGGING=1
diff --git a/variants/xiao_c3/platformio.ini b/variants/xiao_c3/platformio.ini
index 683199d9..76b72174 100644
--- a/variants/xiao_c3/platformio.ini
+++ b/variants/xiao_c3/platformio.ini
@@ -73,8 +73,8 @@ build_src_filter = ${Xiao_esp32_C3.build_src_filter}
   +<helpers/esp32/*.cpp>
 build_flags =
   ${Xiao_esp32_C3.build_flags}
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D OFFLINE_QUEUE_SIZE=256
   ; -D BLE_DEBUG_LOGGING=1
@@ -92,8 +92,8 @@ build_src_filter = ${Xiao_esp32_C3.build_src_filter}
   +<helpers/esp32/*.cpp>
 build_flags =
   ${Xiao_esp32_C3.build_flags}
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256
   ; -D BLE_DEBUG_LOGGING=1
   ; -D MESH_PACKET_LOGGING=1
@@ -110,8 +110,8 @@ build_src_filter = ${Xiao_esp32_C3.build_src_filter}
   +<helpers/esp32/*.cpp>
 build_flags =
   ${Xiao_esp32_C3.build_flags}
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256
   -D WIFI_DEBUG_LOGGING=1
   -D WIFI_SSID='"myssid"'
diff --git a/variants/xiao_c6/platformio.ini b/variants/xiao_c6/platformio.ini
index 9c971083..8f02dc87 100644
--- a/variants/xiao_c6/platformio.ini
+++ b/variants/xiao_c6/platformio.ini
@@ -50,8 +50,8 @@ lib_deps =
 [env:Xiao_C6_companion_radio_ble_]
 extends = Xiao_C6
 build_flags = ${Xiao_C6.build_flags}
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D BLE_DEBUG_LOGGING=1
   -D OFFLINE_QUEUE_SIZE=256
@@ -107,8 +107,8 @@ lib_deps =
 [env:Meshimi_companion_radio_ble_]
 extends = Meshimi
 build_flags = ${Meshimi.build_flags}
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D BLE_DEBUG_LOGGING=1
   -D OFFLINE_QUEUE_SIZE=256
@@ -167,8 +167,8 @@ lib_deps =
 [env:WHY2025_badge_companion_radio_ble_]
 extends = WHY2025_badge
 build_flags = ${WHY2025_badge.build_flags}
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D BLE_DEBUG_LOGGING=1
   -D OFFLINE_QUEUE_SIZE=256
diff --git a/variants/xiao_s3_wio/platformio.ini b/variants/xiao_s3_wio/platformio.ini
index e5cc4c8c..95a54012 100644
--- a/variants/xiao_s3_wio/platformio.ini
+++ b/variants/xiao_s3_wio/platformio.ini
@@ -107,8 +107,8 @@ lib_deps =
 extends = Xiao_S3_WIO
 build_flags =
   ${Xiao_S3_WIO.build_flags}
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Xiao_S3_WIO.build_src_filter}
@@ -122,8 +122,8 @@ extends = Xiao_S3_WIO
 build_flags =
   ${Xiao_S3_WIO.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=SSD1306Display
   -D OFFLINE_QUEUE_SIZE=256
 ;  -D MESH_PACKET_LOGGING=1
@@ -144,8 +144,8 @@ extends = Xiao_S3_WIO
 build_flags =
   ${Xiao_S3_WIO.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D DISPLAY_CLASS=SSD1306Display
   -D OFFLINE_QUEUE_SIZE=256
@@ -168,8 +168,8 @@ extends = Xiao_S3_WIO
 build_flags =
   ${Xiao_S3_WIO.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=SSD1306Display
   -D SERIAL_TX=D6
   -D SERIAL_RX=D7

From 06825030e5d48098857a63a26165cb88d0221218 Mon Sep 17 00:00:00 2001
From: Florent <florent@frizoncorrea.fr>
Date: Thu, 6 Nov 2025 22:36:37 +0100
Subject: [PATCH 3/8] sensor: copy control data code from repeater

---
 examples/simple_sensor/SensorMesh.cpp | 32 +++++++++++++++++++++++++++
 examples/simple_sensor/SensorMesh.h   |  1 +
 2 files changed, 33 insertions(+)

diff --git a/examples/simple_sensor/SensorMesh.cpp b/examples/simple_sensor/SensorMesh.cpp
index 58bce766..2ab2081f 100644
--- a/examples/simple_sensor/SensorMesh.cpp
+++ b/examples/simple_sensor/SensorMesh.cpp
@@ -617,6 +617,38 @@ bool SensorMesh::handleIncomingMsg(ClientInfo& from, uint32_t timestamp, uint8_t
   return false;
 }
 
+#define CTL_TYPE_NODE_DISCOVER_REQ   0x80
+#define CTL_TYPE_NODE_DISCOVER_RESP  0x90
+
+void SensorMesh::onControlDataRecv(mesh::Packet* packet) {
+  uint8_t type = packet->payload[0] & 0xF0;    // just test upper 4 bits
+  if (type == CTL_TYPE_NODE_DISCOVER_REQ && packet->payload_len >= 6) {
+    // TODO: apply rate limiting to these!
+    int i = 1;
+    uint8_t  filter = packet->payload[i++];
+    uint32_t tag;
+    memcpy(&tag, &packet->payload[i], 4); i += 4;
+    uint32_t since;
+    if (packet->payload_len >= i+4) {   // optional since field
+      memcpy(&since, &packet->payload[i], 4); i += 4;
+    } else {
+      since = 0;
+    }
+
+    if ((filter & (1 << ADV_TYPE_SENSOR)) != 0 && _prefs.discovery_mod_timestamp >= since) {
+      uint8_t data[6 + PUB_KEY_SIZE];
+      data[0] = CTL_TYPE_NODE_DISCOVER_RESP | ADV_TYPE_SENSOR;   // low 4-bits for node type
+      data[1] = packet->_snr;   // let sender know the inbound SNR ( x 4)
+      memcpy(&data[2], &tag, 4);     // include tag from request, for client to match to
+      memcpy(&data[6], self_id.pub_key, PUB_KEY_SIZE);
+      auto resp = createControlData(data, sizeof(data));
+      if (resp) {
+        sendZeroHop(resp, getRetransmitDelay(resp));  // apply random delay, as multiple nodes can respond to this
+      }
+    }
+  }
+}
+
 bool SensorMesh::onPeerPathRecv(mesh::Packet* packet, int sender_idx, const uint8_t* secret, uint8_t* path, uint8_t path_len, uint8_t extra_type, uint8_t* extra, uint8_t extra_len) {
   int i = matching_peer_indexes[sender_idx];
   if (i < 0 || i >= acl.getNumClients()) {
diff --git a/examples/simple_sensor/SensorMesh.h b/examples/simple_sensor/SensorMesh.h
index ba55bc70..0fb00dc1 100644
--- a/examples/simple_sensor/SensorMesh.h
+++ b/examples/simple_sensor/SensorMesh.h
@@ -125,6 +125,7 @@ protected:
   void getPeerSharedSecret(uint8_t* dest_secret, int peer_idx) override;
   void onPeerDataRecv(mesh::Packet* packet, uint8_t type, int sender_idx, const uint8_t* secret, uint8_t* data, size_t len) override;
   bool onPeerPathRecv(mesh::Packet* packet, int sender_idx, const uint8_t* secret, uint8_t* path, uint8_t path_len, uint8_t extra_type, uint8_t* extra, uint8_t extra_len) override;
+  void onControlDataRecv(mesh::Packet* packet) override;
   void onAckRecv(mesh::Packet* packet, uint32_t ack_crc) override;
   virtual bool handleIncomingMsg(ClientInfo& from, uint32_t timestamp, uint8_t* data, uint flags, size_t len);
   void sendAckTo(const ClientInfo& dest, uint32_t ack_hash);

From b31d3e7b5f90c7b6f562079df02e4a88cf93c97c Mon Sep 17 00:00:00 2001
From: Scott Powell <sqij@protonmail.com>
Date: Sun, 9 Nov 2025 16:17:49 +1100
Subject: [PATCH 4/8] * added StrHelper::fromHex()

---
 src/helpers/TxtDataHelpers.cpp | 20 ++++++++++++++++++++
 src/helpers/TxtDataHelpers.h   |  1 +
 2 files changed, 21 insertions(+)

diff --git a/src/helpers/TxtDataHelpers.cpp b/src/helpers/TxtDataHelpers.cpp
index 224eb873..09e86c67 100644
--- a/src/helpers/TxtDataHelpers.cpp
+++ b/src/helpers/TxtDataHelpers.cpp
@@ -139,3 +139,23 @@ const char* StrHelper::ftoa(float f) {
   }
   return tmp;
 }
+
+uint32_t StrHelper::fromHex(const char* src) {
+  uint32_t n = 0;
+  while (*src) {
+    if (*src >= '0' && *src <= '9') {
+      n <<= 4;
+      n |= (*src - '0');
+    } else if (*src >= 'A' && *src <= 'F') {
+      n <<= 4;
+      n |= (*src - 'A' + 10);
+    } else if (*src >= 'a' && *src <= 'f') {
+      n <<= 4;
+      n |= (*src - 'a' + 10);
+    } else {
+      break;  // non-hex char encountered, stop parsing
+    }
+    src++;
+  }
+  return n;
+}
diff --git a/src/helpers/TxtDataHelpers.h b/src/helpers/TxtDataHelpers.h
index 89789990..387e09b9 100644
--- a/src/helpers/TxtDataHelpers.h
+++ b/src/helpers/TxtDataHelpers.h
@@ -13,4 +13,5 @@ public:
   static void strzcpy(char* dest, const char* src, size_t buf_sz);   // pads with trailing nulls
   static const char* ftoa(float f);
   static bool isBlank(const char* str);
+  static uint32_t fromHex(const char* src);
 };

From ab0721d6dfaa66aa1271196ee7b7abe64c880686 Mon Sep 17 00:00:00 2001
From: Scott Powell <sqij@protonmail.com>
Date: Sun, 9 Nov 2025 16:36:23 +1100
Subject: [PATCH 5/8] * fix: repeater and room server telemetry requests now
 return all telemetry for _READ & _WRITE ACL permissions.

---
 examples/simple_repeater/MyMesh.cpp    | 5 ++++-
 examples/simple_room_server/MyMesh.cpp | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/examples/simple_repeater/MyMesh.cpp b/examples/simple_repeater/MyMesh.cpp
index 622b73a6..4136818c 100644
--- a/examples/simple_repeater/MyMesh.cpp
+++ b/examples/simple_repeater/MyMesh.cpp
@@ -170,7 +170,10 @@ int MyMesh::handleRequest(ClientInfo *sender, uint32_t sender_timestamp, uint8_t
     telemetry.reset();
     telemetry.addVoltage(TELEM_CHANNEL_SELF, (float)board.getBattMilliVolts() / 1000.0f);
     // query other sensors -- target specific
-    sensors.querySensors((sender->isAdmin() ? 0xFF : 0x00) & perm_mask, telemetry);
+    if ((sender->permissions & PERM_ACL_ROLE_MASK) == PERM_ACL_GUEST) {
+      perm_mask = 0x00;  // just base telemetry allowed
+    }
+    sensors.querySensors(perm_mask, telemetry);
 
     uint8_t tlen = telemetry.getSize();
     memcpy(&reply_data[4], telemetry.getBuffer(), tlen);
diff --git a/examples/simple_room_server/MyMesh.cpp b/examples/simple_room_server/MyMesh.cpp
index 4d953c9c..de06b4c6 100644
--- a/examples/simple_room_server/MyMesh.cpp
+++ b/examples/simple_room_server/MyMesh.cpp
@@ -165,7 +165,10 @@ int MyMesh::handleRequest(ClientInfo *sender, uint32_t sender_timestamp, uint8_t
     telemetry.reset();
     telemetry.addVoltage(TELEM_CHANNEL_SELF, (float)board.getBattMilliVolts() / 1000.0f);
     // query other sensors -- target specific
-    sensors.querySensors((sender->isAdmin() ? 0xFF : 0x00) & perm_mask, telemetry);
+    if ((sender->permissions & PERM_ACL_ROLE_MASK) == PERM_ACL_GUEST) {
+      perm_mask = 0x00;  // just base telemetry allowed
+    }
+    sensors.querySensors(perm_mask, telemetry);
 
     uint8_t tlen = telemetry.getSize();
     memcpy(&reply_data[4], telemetry.getBuffer(), tlen);

From b59d1999e6f6d79aa673e136cc52319229444bc0 Mon Sep 17 00:00:00 2001
From: Scott Powell <sqij@protonmail.com>
Date: Tue, 11 Nov 2025 20:08:05 +1100
Subject: [PATCH 6/8] * Sensor: DISCOVER_REQ, prefix_only support

---
 examples/simple_sensor/SensorMesh.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/examples/simple_sensor/SensorMesh.cpp b/examples/simple_sensor/SensorMesh.cpp
index 2ab2081f..20d9921b 100644
--- a/examples/simple_sensor/SensorMesh.cpp
+++ b/examples/simple_sensor/SensorMesh.cpp
@@ -636,14 +636,15 @@ void SensorMesh::onControlDataRecv(mesh::Packet* packet) {
     }
 
     if ((filter & (1 << ADV_TYPE_SENSOR)) != 0 && _prefs.discovery_mod_timestamp >= since) {
+      bool prefix_only = packet->payload[0] & 1;
       uint8_t data[6 + PUB_KEY_SIZE];
       data[0] = CTL_TYPE_NODE_DISCOVER_RESP | ADV_TYPE_SENSOR;   // low 4-bits for node type
       data[1] = packet->_snr;   // let sender know the inbound SNR ( x 4)
       memcpy(&data[2], &tag, 4);     // include tag from request, for client to match to
       memcpy(&data[6], self_id.pub_key, PUB_KEY_SIZE);
-      auto resp = createControlData(data, sizeof(data));
+      auto resp = createControlData(data,  prefix_only ? 6 + 8 : 6 + PUB_KEY_SIZE);
       if (resp) {
-        sendZeroHop(resp, getRetransmitDelay(resp));  // apply random delay, as multiple nodes can respond to this
+        sendZeroHop(resp, getRetransmitDelay(resp)*4);  // apply random delay (widened x4), as multiple nodes can respond to this
       }
     }
   }

From 750e955f193780b8eb1065b21691eb7e704b4377 Mon Sep 17 00:00:00 2001
From: fdlamotte <florent@frizoncorrea.fr>
Date: Thu, 13 Nov 2025 10:39:20 +0100
Subject: [PATCH 7/8] Update library.json to latest libs and version

---
 library.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

From 91e9fcea4b76307d0e109730e848ddb819df9360 Mon Sep 17 00:00:00 2001
From: Scott Powell <sqij@protonmail.com>
Date: Thu, 13 Nov 2025 20:45:38 +1100
Subject: [PATCH 8/8] * ver 1.10.0

---
 examples/companion_radio/MyMesh.h    | 4 ++--
 examples/simple_repeater/MyMesh.h    | 4 ++--
 examples/simple_room_server/MyMesh.h | 4 ++--
 examples/simple_sensor/SensorMesh.h  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/examples/companion_radio/MyMesh.h b/examples/companion_radio/MyMesh.h
index f2b56e5e..927ec65e 100644
--- a/examples/companion_radio/MyMesh.h
+++ b/examples/companion_radio/MyMesh.h
@@ -8,11 +8,11 @@
 #define FIRMWARE_VER_CODE 8
 
 #ifndef FIRMWARE_BUILD_DATE
-#define FIRMWARE_BUILD_DATE "2 Oct 2025"
+#define FIRMWARE_BUILD_DATE "13 Nov 2025"
 #endif
 
 #ifndef FIRMWARE_VERSION
-#define FIRMWARE_VERSION "v1.9.1"
+#define FIRMWARE_VERSION "v1.10.0"
 #endif
 
 #if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
diff --git a/examples/simple_repeater/MyMesh.h b/examples/simple_repeater/MyMesh.h
index 00720bf7..d8a20486 100644
--- a/examples/simple_repeater/MyMesh.h
+++ b/examples/simple_repeater/MyMesh.h
@@ -68,11 +68,11 @@ struct NeighbourInfo {
 };
 
 #ifndef FIRMWARE_BUILD_DATE
-  #define FIRMWARE_BUILD_DATE   "2 Oct 2025"
+  #define FIRMWARE_BUILD_DATE   "13 Nov 2025"
 #endif
 
 #ifndef FIRMWARE_VERSION
-  #define FIRMWARE_VERSION   "v1.9.1"
+  #define FIRMWARE_VERSION   "v1.10.0"
 #endif
 
 #define FIRMWARE_ROLE "repeater"
diff --git a/examples/simple_room_server/MyMesh.h b/examples/simple_room_server/MyMesh.h
index f0dec42b..8641caaf 100644
--- a/examples/simple_room_server/MyMesh.h
+++ b/examples/simple_room_server/MyMesh.h
@@ -26,11 +26,11 @@
 /* ------------------------------ Config -------------------------------- */
 
 #ifndef FIRMWARE_BUILD_DATE
-  #define FIRMWARE_BUILD_DATE   "2 Oct 2025"
+  #define FIRMWARE_BUILD_DATE   "13 Nov 2025"
 #endif
 
 #ifndef FIRMWARE_VERSION
-  #define FIRMWARE_VERSION   "v1.9.1"
+  #define FIRMWARE_VERSION   "v1.10.0"
 #endif
 
 #ifndef LORA_FREQ
diff --git a/examples/simple_sensor/SensorMesh.h b/examples/simple_sensor/SensorMesh.h
index cc14f596..00d9c698 100644
--- a/examples/simple_sensor/SensorMesh.h
+++ b/examples/simple_sensor/SensorMesh.h
@@ -33,11 +33,11 @@
 #define PERM_RECV_ALERTS_HI    (1 << 7)   // high priority alerts
 
 #ifndef FIRMWARE_BUILD_DATE
-  #define FIRMWARE_BUILD_DATE   "2 Oct 2025"
+  #define FIRMWARE_BUILD_DATE   "13 Nov 2025"
 #endif
 
 #ifndef FIRMWARE_VERSION
-  #define FIRMWARE_VERSION   "v1.9.1"
+  #define FIRMWARE_VERSION   "v1.10.0"
 #endif
 
 #define FIRMWARE_ROLE "sensor"