nrf52 targets: increase limits for contacts and channels

2026-04-20 22:13:47 +00:00 · 2025-08-25 12:41:59 +10:00 · 2025-08-25 12:41:59 +10:00 · accd1e0a97
commit accd1e0a97
parent 2b24c575c7
17 changed files with 64 additions and 61 deletions
--- a/examples/companion_radio/DataStore.cpp
+++ b/examples/companion_radio/DataStore.cpp
@ -63,13 +63,16 @@ void DataStore::begin() {
  #include <SPIFFS.h>
 #elif defined(RP2040_PLATFORM)
  #include <LittleFS.h>
-#elif defined(NRF52_PLATFORM)
-  #include <CustomLFS.h>
+#elif defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
  #if defined(QSPIFLASH)
    #include <CustomLFS_QSPIFlash.h>
+  #else
+  #if defined(EXTRAFS)
+    #include <CustomLFS.h>
+  #else 
+    #include <InternalFileSystem.h>
  #endif
-#elif defined(STM32_PLATFORM)
-  #include <InternalFileSystem.h>
+#endif
 #endif

 #if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
@ -471,9 +474,9 @@ void DataStore::migrateToSecondaryFS() {
    }
  }
  if (!_fsExtra->exists("/channels2")) {
-    if (_fs->exists("/contacts2")) {
-      File oldFile = openRead(_fs, "/contacts2");
-      File newFile = openWrite(_fsExtra, "/contacts2");
+    if (_fs->exists("/channels2")) {
+      File oldFile = openRead(_fs, "/channels2");
+      File newFile = openWrite(_fsExtra, "/channels2");

      if (oldFile && newFile) {
        uint8_t buf[64];
@ -484,7 +487,7 @@ void DataStore::migrateToSecondaryFS() {
      }
      if (oldFile) oldFile.close();
      if (newFile) newFile.close();
-      _fs->remove("/contacts2");
+      _fs->remove("/channels2");
    }
  }
  // cleanup nodes which have been testing the extra fs, copy _main.id and new_prefs back to primary
@ -527,6 +530,9 @@ void DataStore::migrateToSecondaryFS() {
  if (_fs->exists("/contacts3")) {
    _fs->remove("/contacts3");
  }
+  if (_fs->exists("/channels2")) {
+    _fs->remove("/channels2");
+  }
  if (_fsExtra->exists("/_main.id")) {
    _fsExtra->remove("/_main.id");
  }
--- a/examples/companion_radio/main.cpp
+++ b/examples/companion_radio/main.cpp
@ -34,7 +34,6 @@ static uint32_t _atoi(const char* sp) {
  DataStore store(SPIFFS, rtc_clock);
 #endif

-
 #ifdef ESP32
  #ifdef WIFI_SSID
    #include <helpers/esp32/SerialWifiInterface.h>
--- a/platformio.ini
+++ b/platformio.ini
@ -81,7 +81,7 @@ build_flags = ${arduino_base.build_flags}
  -D EXTRAFS=1
 lib_deps =
  ${arduino_base.lib_deps}
-  https://github.com/oltaco/CustomLFS
+  https://github.com/oltaco/CustomLFS @ 0.2

 ; ----------------- RP2040 ---------------------

--- a/src/helpers/IdentityStore.h
+++ b/src/helpers/IdentityStore.h
@ -4,10 +4,10 @@
  #include <FS.h>
  #define FILESYSTEM  fs::FS
 #elif defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
-    #include <Adafruit_LittleFS.h>
-    #define FILESYSTEM  Adafruit_LittleFS
+  #include <Adafruit_LittleFS.h>
+  #define FILESYSTEM  Adafruit_LittleFS

-    using namespace Adafruit_LittleFS_Namespace;
+  using namespace Adafruit_LittleFS_Namespace;
 #endif
 #include <Identity.h>

@ -18,10 +18,7 @@ public:
  IdentityStore(FILESYSTEM& fs, const char* dir): _fs(&fs), _dir(dir) { }

  void begin() {
-     if (_dir && _dir[0] == '/') { _fs->mkdir(_dir); } 
-    
-    
-    }
+     if (_dir && _dir[0] == '/') { _fs->mkdir(_dir); } }
  bool load(const char *name, mesh::LocalIdentity& id);
  bool load(const char *name, mesh::LocalIdentity& id, char display_name[], int max_name_sz);
  bool save(const char *name, const mesh::LocalIdentity& id);
--- a/variants/heltec_mesh_solar/platformio.ini
+++ b/variants/heltec_mesh_solar/platformio.ini
@ -59,8 +59,8 @@ build_flags =
 extends = Heltec_mesh_solar
 build_flags =
  ${Heltec_mesh_solar.build_flags}
-  -D MAX_CONTACTS=100
-  -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
@ -77,8 +77,8 @@ lib_deps =
 extends = Heltec_mesh_solar
 build_flags =
  ${Heltec_mesh_solar.build_flags}
-  -D MAX_CONTACTS=100
-  -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 MESH_PACKET_LOGGING=1
--- a/variants/heltec_t114/platformio.ini
+++ b/variants/heltec_t114/platformio.ini
@ -74,8 +74,8 @@ extends = Heltec_t114
 build_flags =
  ${Heltec_t114.build_flags}
  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=100
-  -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
@ -94,8 +94,8 @@ extends = Heltec_t114
 build_flags =
  ${Heltec_t114.build_flags}
  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=100
-  -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 MESH_PACKET_LOGGING=1
--- a/variants/ikoka_stick_nrf/platformio.ini
+++ b/variants/ikoka_stick_nrf/platformio.ini
@ -103,8 +103,8 @@ build_src_filter = ${nrf52840_xiao.build_src_filter}
 extends = ikoka_stick_nrf_baseboard
 build_flags =
  ${ikoka_stick_nrf_baseboard.build_flags}
-  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
  -D BLE_PIN_CODE=123456
  -D OFFLINE_QUEUE_SIZE=256
  -I examples/companion_radio/ui-new
@ -123,8 +123,8 @@ lib_deps =
 extends = ikoka_stick_nrf_baseboard
 build_flags =
  ${ikoka_stick_nrf_baseboard.build_flags}
-  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
  -I examples/companion_radio/ui-new
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
--- a/variants/lilygo_techo/platformio.ini
+++ b/variants/lilygo_techo/platformio.ini
@ -82,8 +82,9 @@ build_flags =
  ${LilyGo_T-Echo.build_flags}
  -I src/helpers/ui
  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
+  -D QSPIFLASH=1
  -D BLE_PIN_CODE=123456
 ;  -D BLE_DEBUG_LOGGING=1
  -D OFFLINE_QUEUE_SIZE=256
--- a/variants/minewsemi_me25ls01/platformio.ini
+++ b/variants/minewsemi_me25ls01/platformio.ini
@ -52,8 +52,8 @@ lib_deps = ${nrf52840_me25ls01.lib_deps}
 extends = me25ls01
 build_flags = ${me25ls01.build_flags}
  -I examples/companion_radio/ui-orig
-  -D MAX_CONTACTS=100
-  -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 MESH_PACKET_LOGGING=1
@ -149,8 +149,8 @@ lib_deps = ${me25ls01.lib_deps}
 extends = me25ls01
 build_flags = ${me25ls01.build_flags}
  -I examples/companion_radio/ui-orig
-  -D MAX_CONTACTS=100
-  -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 MESH_PACKET_LOGGING=1
--- a/variants/nano_g2_ultra/platformio.ini
+++ b/variants/nano_g2_ultra/platformio.ini
@ -35,8 +35,8 @@ build_flags =
  ${Nano_G2_Ultra.build_flags}
  -I src/helpers/ui
  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
  -D BLE_PIN_CODE=123456
 ;  -D BLE_DEBUG_LOGGING=0
  -D OFFLINE_QUEUE_SIZE=256
@ -66,8 +66,8 @@ build_flags =
  ${Nano_G2_Ultra.build_flags}
  -I src/helpers/ui
  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=8
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
  -D OFFLINE_QUEUE_SIZE=256
  -D DISPLAY_CLASS=SH1106Display
  -D PIN_BUZZER=4
--- a/variants/promicro/platformio.ini
+++ b/variants/promicro/platformio.ini
@ -88,8 +88,8 @@ lib_deps = ${Faketec.lib_deps}
 extends = Faketec
 build_flags = ${Faketec.build_flags}
  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=100
-  -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
@ -106,8 +106,8 @@ lib_deps = ${Faketec.lib_deps}
 extends = Faketec
 build_flags = ${Faketec.build_flags}
  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=100
-  -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
--- a/variants/rak4631/platformio.ini
+++ b/variants/rak4631/platformio.ini
@ -70,8 +70,8 @@ build_flags =
  -D PIN_USER_BTN=9
  -D PIN_USER_BTN_ANA=31
  -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=100
-  -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 = ${rak4631.build_src_filter}
@ -89,8 +89,8 @@ build_flags =
  -D PIN_USER_BTN=9
  -D PIN_USER_BTN_ANA=31
  -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=100
-  -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
--- a/variants/sensecap_solar/platformio.ini
+++ b/variants/sensecap_solar/platformio.ini
@ -76,8 +76,8 @@ build_src_filter = ${SenseCap_Solar.build_src_filter}
 extends = SenseCap_Solar
 build_flags =
  ${SenseCap_Solar.build_flags}
-  -D MAX_CONTACTS=100
-  -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
@ -94,8 +94,8 @@ lib_deps =
 extends = SenseCap_Solar
 build_flags =
  ${SenseCap_Solar.build_flags}
-  -D MAX_CONTACTS=100
-  -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 = ${SenseCap_Solar.build_src_filter}
--- a/variants/t1000-e/platformio.ini
+++ b/variants/t1000-e/platformio.ini
@ -91,8 +91,8 @@ lib_deps = ${t1000-e.lib_deps}
 extends = t1000-e
 build_flags = ${t1000-e.build_flags}
  -I examples/companion_radio/ui-orig
-  -D MAX_CONTACTS=100
-  -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 MESH_PACKET_LOGGING=1
--- a/variants/thinknode_m1/platformio.ini
+++ b/variants/thinknode_m1/platformio.ini
@ -71,8 +71,8 @@ build_flags =
  ${ThinkNode_M1.build_flags}
  -I src/helpers/ui
  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=100
-  -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 DISPLAY_ROTATION=4
--- a/variants/wio-tracker-l1/platformio.ini
+++ b/variants/wio-tracker-l1/platformio.ini
@ -79,8 +79,8 @@ lib_deps = ${WioTrackerL1.lib_deps}
 extends = WioTrackerL1
 build_flags = ${WioTrackerL1.build_flags}
  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=100
-  -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
--- a/variants/xiao_nrf52/platformio.ini
+++ b/variants/xiao_nrf52/platformio.ini
@ -59,8 +59,8 @@ upload_protocol = nrfutil
 extends = Xiao_nrf52
 build_flags =
  ${Xiao_nrf52.build_flags}
-  -D MAX_CONTACTS=100
-  -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
@ -78,8 +78,8 @@ lib_deps =
 extends = Xiao_nrf52
 build_flags =
  ${Xiao_nrf52.build_flags}
-  -D MAX_CONTACTS=100
-  -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_nrf52.build_src_filter}