Skip to content

Commit accd1e0

Browse files
oltacooltaco
committed
nrf52 targets: increase limits for contacts and channels
1 parent 2b24c57 commit accd1e0

File tree

17 files changed

+64
-61
lines changed

17 files changed

+64
-61
lines changed

‎examples/companion_radio/DataStore.cpp‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,16 @@ void DataStore::begin() {
6363
#include <SPIFFS.h>
6464
#elif defined(RP2040_PLATFORM)
6565
#include <LittleFS.h>
66-
#elif defined(NRF52_PLATFORM)
67-
#include <CustomLFS.h>
66+
#elif defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
6867
#if defined(QSPIFLASH)
6968
#include <CustomLFS_QSPIFlash.h>
69+
#else
70+
#if defined(EXTRAFS)
71+
#include <CustomLFS.h>
72+
#else
73+
#include <InternalFileSystem.h>
7074
#endif
71-
#elif defined(STM32_PLATFORM)
72-
#include <InternalFileSystem.h>
75+
#endif
7376
#endif
7477

7578
#if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
@@ -471,9 +474,9 @@ void DataStore::migrateToSecondaryFS() {
471474
}
472475
}
473476
if (!_fsExtra->exists("/channels2")) {
474-
if (_fs->exists("/contacts2")) {
475-
File oldFile = openRead(_fs, "/contacts2");
476-
File newFile = openWrite(_fsExtra, "/contacts2");
477+
if (_fs->exists("/channels2")) {
478+
File oldFile = openRead(_fs, "/channels2");
479+
File newFile = openWrite(_fsExtra, "/channels2");
477480

478481
if (oldFile && newFile) {
479482
uint8_t buf[64];
@@ -484,7 +487,7 @@ void DataStore::migrateToSecondaryFS() {
484487
}
485488
if (oldFile) oldFile.close();
486489
if (newFile) newFile.close();
487-
_fs->remove("/contacts2");
490+
_fs->remove("/channels2");
488491
}
489492
}
490493
// 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() {
527530
if (_fs->exists("/contacts3")) {
528531
_fs->remove("/contacts3");
529532
}
533+
if (_fs->exists("/channels2")) {
534+
_fs->remove("/channels2");
535+
}
530536
if (_fsExtra->exists("/_main.id")) {
531537
_fsExtra->remove("/_main.id");
532538
}

‎examples/companion_radio/main.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ static uint32_t _atoi(const char* sp) {
3434
DataStore store(SPIFFS, rtc_clock);
3535
#endif
3636

37-
3837
#ifdef ESP32
3938
#ifdef WIFI_SSID
4039
#include <helpers/esp32/SerialWifiInterface.h>

‎platformio.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ build_flags = ${arduino_base.build_flags}
8181
-D EXTRAFS=1
8282
lib_deps =
8383
${arduino_base.lib_deps}
84-
https://github.com/oltaco/CustomLFS
84+
https://github.com/oltaco/CustomLFS @ 0.2
8585

8686
; ----------------- RP2040 ---------------------
8787

‎src/helpers/IdentityStore.h‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
#include <FS.h>
55
#define FILESYSTEM fs::FS
66
#elif defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
7-
#include <Adafruit_LittleFS.h>
8-
#define FILESYSTEM Adafruit_LittleFS
7+
#include <Adafruit_LittleFS.h>
8+
#define FILESYSTEM Adafruit_LittleFS
99

10-
using namespace Adafruit_LittleFS_Namespace;
10+
using namespace Adafruit_LittleFS_Namespace;
1111
#endif
1212
#include <Identity.h>
1313

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

2020
void begin() {
21-
if (_dir && _dir[0] == '/') { _fs->mkdir(_dir); }
22-
23-
24-
}
21+
if (_dir && _dir[0] == '/') { _fs->mkdir(_dir); } }
2522
bool load(const char *name, mesh::LocalIdentity& id);
2623
bool load(const char *name, mesh::LocalIdentity& id, char display_name[], int max_name_sz);
2724
bool save(const char *name, const mesh::LocalIdentity& id);

‎variants/heltec_mesh_solar/platformio.ini‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ build_flags =
5959
extends = Heltec_mesh_solar
6060
build_flags =
6161
${Heltec_mesh_solar.build_flags}
62-
-D MAX_CONTACTS=100
63-
-D MAX_GROUP_CHANNELS=8
62+
-D MAX_CONTACTS=350
63+
-D MAX_GROUP_CHANNELS=40
6464
-D BLE_PIN_CODE=123456
6565
; -D BLE_DEBUG_LOGGING=1
6666
-D OFFLINE_QUEUE_SIZE=256
@@ -77,8 +77,8 @@ lib_deps =
7777
extends = Heltec_mesh_solar
7878
build_flags =
7979
${Heltec_mesh_solar.build_flags}
80-
-D MAX_CONTACTS=100
81-
-D MAX_GROUP_CHANNELS=8
80+
-D MAX_CONTACTS=350
81+
-D MAX_GROUP_CHANNELS=40
8282
; -D BLE_PIN_CODE=123456
8383
; -D BLE_DEBUG_LOGGING=1
8484
; -D MESH_PACKET_LOGGING=1

‎variants/heltec_t114/platformio.ini‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ extends = Heltec_t114
7474
build_flags =
7575
${Heltec_t114.build_flags}
7676
-I examples/companion_radio/ui-new
77-
-D MAX_CONTACTS=100
78-
-D MAX_GROUP_CHANNELS=8
77+
-D MAX_CONTACTS=350
78+
-D MAX_GROUP_CHANNELS=40
7979
-D BLE_PIN_CODE=123456
8080
; -D BLE_DEBUG_LOGGING=1
8181
-D OFFLINE_QUEUE_SIZE=256
@@ -94,8 +94,8 @@ extends = Heltec_t114
9494
build_flags =
9595
${Heltec_t114.build_flags}
9696
-I examples/companion_radio/ui-new
97-
-D MAX_CONTACTS=100
98-
-D MAX_GROUP_CHANNELS=8
97+
-D MAX_CONTACTS=350
98+
-D MAX_GROUP_CHANNELS=40
9999
; -D BLE_PIN_CODE=123456
100100
; -D BLE_DEBUG_LOGGING=1
101101
; -D MESH_PACKET_LOGGING=1

‎variants/ikoka_stick_nrf/platformio.ini‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ build_src_filter = ${nrf52840_xiao.build_src_filter}
103103
extends = ikoka_stick_nrf_baseboard
104104
build_flags =
105105
${ikoka_stick_nrf_baseboard.build_flags}
106-
-D MAX_CONTACTS=100
107-
-D MAX_GROUP_CHANNELS=8
106+
-D MAX_CONTACTS=350
107+
-D MAX_GROUP_CHANNELS=40
108108
-D BLE_PIN_CODE=123456
109109
-D OFFLINE_QUEUE_SIZE=256
110110
-I examples/companion_radio/ui-new
@@ -123,8 +123,8 @@ lib_deps =
123123
extends = ikoka_stick_nrf_baseboard
124124
build_flags =
125125
${ikoka_stick_nrf_baseboard.build_flags}
126-
-D MAX_CONTACTS=100
127-
-D MAX_GROUP_CHANNELS=8
126+
-D MAX_CONTACTS=350
127+
-D MAX_GROUP_CHANNELS=40
128128
-I examples/companion_radio/ui-new
129129
; -D MESH_PACKET_LOGGING=1
130130
; -D MESH_DEBUG=1

‎variants/lilygo_techo/platformio.ini‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,9 @@ build_flags =
8282
${LilyGo_T-Echo.build_flags}
8383
-I src/helpers/ui
8484
-I examples/companion_radio/ui-new
85-
-D MAX_CONTACTS=100
86-
-D MAX_GROUP_CHANNELS=8
85+
-D MAX_CONTACTS=350
86+
-D MAX_GROUP_CHANNELS=40
87+
-D QSPIFLASH=1
8788
-D BLE_PIN_CODE=123456
8889
; -D BLE_DEBUG_LOGGING=1
8990
-D OFFLINE_QUEUE_SIZE=256

‎variants/minewsemi_me25ls01/platformio.ini‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ lib_deps = ${nrf52840_me25ls01.lib_deps}
5252
extends = me25ls01
5353
build_flags = ${me25ls01.build_flags}
5454
-I examples/companion_radio/ui-orig
55-
-D MAX_CONTACTS=100
56-
-D MAX_GROUP_CHANNELS=8
55+
-D MAX_CONTACTS=350
56+
-D MAX_GROUP_CHANNELS=40
5757
-D BLE_PIN_CODE=123456
5858
; -D BLE_DEBUG_LOGGING=1
5959
-D MESH_PACKET_LOGGING=1
@@ -149,8 +149,8 @@ lib_deps = ${me25ls01.lib_deps}
149149
extends = me25ls01
150150
build_flags = ${me25ls01.build_flags}
151151
-I examples/companion_radio/ui-orig
152-
-D MAX_CONTACTS=100
153-
-D MAX_GROUP_CHANNELS=8
152+
-D MAX_CONTACTS=350
153+
-D MAX_GROUP_CHANNELS=40
154154
;-D BLE_PIN_CODE=123456
155155
; -D BLE_DEBUG_LOGGING=1
156156
-D MESH_PACKET_LOGGING=1

‎variants/nano_g2_ultra/platformio.ini‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ build_flags =
3535
${Nano_G2_Ultra.build_flags}
3636
-I src/helpers/ui
3737
-I examples/companion_radio/ui-new
38-
-D MAX_CONTACTS=100
39-
-D MAX_GROUP_CHANNELS=8
38+
-D MAX_CONTACTS=350
39+
-D MAX_GROUP_CHANNELS=40
4040
-D BLE_PIN_CODE=123456
4141
; -D BLE_DEBUG_LOGGING=0
4242
-D OFFLINE_QUEUE_SIZE=256
@@ -66,8 +66,8 @@ build_flags =
6666
${Nano_G2_Ultra.build_flags}
6767
-I src/helpers/ui
6868
-I examples/companion_radio/ui-new
69-
-D MAX_CONTACTS=100
70-
-D MAX_GROUP_CHANNELS=8
69+
-D MAX_CONTACTS=350
70+
-D MAX_GROUP_CHANNELS=40
7171
-D OFFLINE_QUEUE_SIZE=256
7272
-D DISPLAY_CLASS=SH1106Display
7373
-D PIN_BUZZER=4

0 commit comments

Comments
 (0)