Skip to content

Suggestion for flash storage auto config #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
nilu96 wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Suggestion for flash storage auto config #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f85279d
suggestion for fixing and streamlining automatic FS configuration
nilu96 May 10, 2026
ee16f73
remove override of user configurations
nilu96 May 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions RNode_Firmware.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ RNS::Interface lora_interface(RNS::Type::NONE);
#if defined(RNS_USE_FS)
// CBA microStore
#if MCU_VARIANT == MCU_ESP32
#if defined(USTORE_USE_SD)
#if defined(HAS_SDCARD)
#include <microStore/Adapters/SDFileSystem.h>
microStore::FileSystem filesystem{microStore::Adapters::SDFileSystem(SDCARD_SCLK, SDCARD_MISO, SDCARD_MOSI, SDCARD_CS)};
#else
Expand All @@ -253,6 +253,7 @@ RNS::Interface lora_interface(RNS::Type::NONE);
microStore::FileSystem filesystem{microStore::Adapters::PosixFileSystem()};
#endif
#else // RNS_USE_FS
#include <microStore/Adapters/NoopFileSystem.h>
microStore::FileSystem filesystem{microStore::Adapters::NoopFileSystem()};
#endif // RNS_USE_FS
#endif // HAS_RNS
Expand Down Expand Up @@ -597,17 +598,13 @@ void setup() {
try {
// CBA Init filesystem
HEAD("Initializing filesystem...", RNS::LOG_TRACE);
#if MCU_VARIANT == MCU_NRF52
#if MCU_VARIANT == MCU_NRF52 && RNS_USE_FS
// First attempt to initialize RAK15001 flash
TRACE("Looking for RAK15001 flash...");
static const SPIFlash_Device_t device_rak15001 = RAK15001;
filesystem = microStore::Adapters::FlashFSFileSystem(&device_rak15001);
if (filesystem.init()) {
TRACE("Initialized RAK15001 flash");
// Raise path store limits to account for larger external flash size
RNS::Transport::path_table_maxsize(500);
RNS::Transport::path_store_segment_size(24576);
RNS::Transport::path_store_segment_count(8);
}
else {
// Finaly attempt to initialize internl flash
Expand Down
42 changes: 3 additions & 39 deletions platformio.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ board_build.filesystem = littlefs
build_flags =
${env.build_flags}
-DBOARD_MODEL=BOARD_RNODE_NG_20
-DUSTORE_USE_POSIXFS=1
-DURTN_PATH_TABLE_MAX_RECS=500
-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
-DRNS_PATH_TABLE_SEGMENT_COUNT=8
Expand All @@ -86,7 +85,6 @@ board_build.filesystem = littlefs
build_flags =
${env.build_flags}
-DBOARD_MODEL=BOARD_RNODE_NG_21
-DUSTORE_USE_POSIXFS=1
-DURTN_PATH_TABLE_MAX_RECS=500
-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
-DRNS_PATH_TABLE_SEGMENT_COUNT=8
Expand All @@ -112,7 +110,6 @@ board_build.filesystem = littlefs
build_flags =
${env.build_flags}
-DBOARD_MODEL=BOARD_TBEAM
-DUSTORE_USE_POSIXFS=1
-DURTN_PATH_TABLE_MAX_RECS=500
-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
-DRNS_PATH_TABLE_SEGMENT_COUNT=8
Expand All @@ -138,7 +135,6 @@ build_flags =
${env.build_flags}
-DBOARD_MODEL=BOARD_TBEAM
-DMODEM=SX1262
-DUSTORE_USE_POSIXFS=1
-DURTN_PATH_TABLE_MAX_RECS=500
-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
-DRNS_PATH_TABLE_SEGMENT_COUNT=8
Expand Down Expand Up @@ -166,7 +162,6 @@ build_flags =
-DMODEM=SX1262
-DBOARD_HAS_PSRAM=1
-DRNS_CONTAINER_ALLOCATOR=RNS_PSRAM_ALLOCATOR
-DUSTORE_USE_POSIXFS=1
-DURTN_PATH_TABLE_MAX_RECS=2000
-DRNS_PATH_TABLE_SEGMENT_SIZE=98304 ; 96 KB
-DRNS_PATH_TABLE_SEGMENT_COUNT=8
Expand Down Expand Up @@ -196,7 +191,6 @@ build_flags =
-DMODEM=SX1262
-DBOARD_HAS_PSRAM=1
-DRNS_CONTAINER_ALLOCATOR=RNS_PSRAM_ALLOCATOR
-DUSTORE_USE_POSIXFS=1
-DURTN_PATH_TABLE_MAX_RECS=2000
-DRNS_PATH_TABLE_SEGMENT_SIZE=98304 ; 96 KB
-DRNS_PATH_TABLE_SEGMENT_COUNT=8
Expand Down Expand Up @@ -224,7 +218,6 @@ build_flags =
-DMODEM=SX1276
-DBOARD_HAS_PSRAM=1
-DRNS_CONTAINER_ALLOCATOR=RNS_PSRAM_ALLOCATOR
-DUSTORE_USE_POSIXFS=1
-DURTN_PATH_TABLE_MAX_RECS=2000
-DRNS_PATH_TABLE_SEGMENT_SIZE=98304 ; 96 KB
-DRNS_PATH_TABLE_SEGMENT_COUNT=8
Expand Down Expand Up @@ -252,7 +245,6 @@ build_flags =
-DMODEM=SX1280
-DBOARD_HAS_PSRAM=1
-DRNS_CONTAINER_ALLOCATOR=RNS_PSRAM_ALLOCATOR
-DUSTORE_USE_POSIXFS=1
-DURTN_PATH_TABLE_MAX_RECS=2000
-DRNS_PATH_TABLE_SEGMENT_SIZE=98304 ; 96 KB
-DRNS_PATH_TABLE_SEGMENT_COUNT=8
Expand Down Expand Up @@ -293,7 +285,6 @@ build_flags =
; -UARDUINO_USB_CDC_ON_BOOT
-DBOARD_HAS_PSRAM=1
-DRNS_CONTAINER_ALLOCATOR=RNS_PSRAM_ALLOCATOR
-DUSTORE_USE_POSIXFS=1
-DURTN_PATH_TABLE_MAX_RECS=2000
-DRNS_PATH_TABLE_SEGMENT_SIZE=98304 ; 96 KB
-DRNS_PATH_TABLE_SEGMENT_COUNT=8
Expand All @@ -318,7 +309,6 @@ board_build.filesystem = littlefs
build_flags =
${env.build_flags}
-DBOARD_MODEL=BOARD_LORA32_V1_0
-DUSTORE_USE_POSIXFS=1
-DURTN_PATH_TABLE_MAX_RECS=500
-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
-DRNS_PATH_TABLE_SEGMENT_COUNT=8
Expand All @@ -343,7 +333,6 @@ board_build.filesystem = littlefs
build_flags =
${env.build_flags}
-DBOARD_MODEL=BOARD_LORA32_V2_0
-DUSTORE_USE_POSIXFS=1
-DURTN_PATH_TABLE_MAX_RECS=500
-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
-DRNS_PATH_TABLE_SEGMENT_COUNT=8
Expand All @@ -369,7 +358,6 @@ build_flags =
${env.build_flags}
-DBOARD_MODEL=BOARD_LORA32_V1_0
-DEXTERNAL_LEDS=true
-DUSTORE_USE_POSIXFS=1
-DURTN_PATH_TABLE_MAX_RECS=500
-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
-DRNS_PATH_TABLE_SEGMENT_COUNT=8
Expand Down Expand Up @@ -399,7 +387,6 @@ build_flags =
-DSDCARD_MISO=2
-DSDCARD_MOSI=15
-DSDCARD_CS=13
-DUSTORE_USE_POSIXFS=1
-DURTN_PATH_TABLE_MAX_RECS=500
-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
-DRNS_PATH_TABLE_SEGMENT_COUNT=8
Expand All @@ -425,7 +412,6 @@ build_flags =
${env.build_flags}
-DBOARD_MODEL=BOARD_LORA32_V2_1
-DEXTERNAL_LEDS=true
-DUSTORE_USE_POSIXFS=1
-DURTN_PATH_TABLE_MAX_RECS=500
-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
-DRNS_PATH_TABLE_SEGMENT_COUNT=8
Expand All @@ -451,7 +437,6 @@ build_flags =
${env.build_flags}
-DBOARD_MODEL=BOARD_LORA32_V2_1
-DENABLE_TCXO=true
-DUSTORE_USE_POSIXFS=1
-DURTN_PATH_TABLE_MAX_RECS=500
-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
-DRNS_PATH_TABLE_SEGMENT_COUNT=8
Expand All @@ -476,7 +461,6 @@ board_build.filesystem = littlefs
build_flags =
${env.build_flags}
-DBOARD_MODEL=BOARD_LORA32_V2_1
-DUSTORE_USE_POSIXFS=1
-DURTN_PATH_TABLE_MAX_RECS=500
-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
-DRNS_PATH_TABLE_SEGMENT_COUNT=8
Expand All @@ -502,7 +486,6 @@ build_flags =
${env.build_flags}
-DBOARD_MODEL=BOARD_LORA32_V2_1
-DEXTERNAL_LEDS=true
-DUSTORE_USE_POSIXFS=1
-DURTN_PATH_TABLE_MAX_RECS=500
-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
-DRNS_PATH_TABLE_SEGMENT_COUNT=8
Expand All @@ -529,7 +512,6 @@ build_flags =
-DBOARD_MODEL=BOARD_HELTEC32_V3
; CBA BOARD_HAS_PSRAM=1 causes malloc to automatically use PSRAM
;-DBOARD_HAS_PSRAM=1
-DUSTORE_USE_POSIXFS=1
-DURTN_PATH_TABLE_MAX_RECS=500
-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
-DRNS_PATH_TABLE_SEGMENT_COUNT=8
Expand Down Expand Up @@ -561,7 +543,6 @@ build_flags =
-DARDUINO_USB_CDC_ON_BOOT=1
-DBOARD_HAS_PSRAM=1
-DRNS_CONTAINER_ALLOCATOR=RNS_PSRAM_ALLOCATOR
-DUSTORE_USE_POSIXFS=1
-DURTN_PATH_TABLE_MAX_RECS=2000
-DRNS_PATH_TABLE_SEGMENT_SIZE=98304 ; 96 KB
-DRNS_PATH_TABLE_SEGMENT_COUNT=8
Expand All @@ -585,7 +566,6 @@ board_build.filesystem = littlefs
build_flags =
${env.build_flags}
-DBOARD_MODEL=BOARD_HUZZAH32
-DUSTORE_USE_POSIXFS=1
-DURTN_PATH_TABLE_MAX_RECS=500
-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
-DRNS_PATH_TABLE_SEGMENT_COUNT=8
Expand All @@ -610,7 +590,6 @@ board_build.filesystem = littlefs
build_flags =
${env.build_flags}
-DBOARD_MODEL=BOARD_XIAO_S3
-DUSTORE_USE_POSIXFS=1
-DURTN_PATH_TABLE_MAX_RECS=500
-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
-DRNS_PATH_TABLE_SEGMENT_COUNT=8
Expand All @@ -635,8 +614,6 @@ board_build.filesystem = littlefs
build_flags =
${env.build_flags}
-DBOARD_MODEL=BOARD_GENERIC_ESP32
-DUSTORE_USE_POSIXFS=1
-DUSTORE_USE_POSIXFS=1
-DURTN_PATH_TABLE_MAX_RECS=500
-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
-DRNS_PATH_TABLE_SEGMENT_COUNT=8
Expand Down Expand Up @@ -673,8 +650,6 @@ build_flags =
-DBOARD_MODEL=BOARD_RAK4631
-DRNS_CONTAINER_ALLOCATOR=RNS_HEAP_POOL_ALLOCATOR
-DRNS_HEAP_POOL_BUFFER_SIZE=131072
-DUSTORE_USE_INTERNALFS
-DUSTORE_USE_FLASHFS
-DURTN_PATH_TABLE_MAX_RECS=25
-DRNS_PATH_TABLE_SEGMENT_SIZE=2048 ; 2 KB
-DRNS_PATH_TABLE_SEGMENT_COUNT=6
Expand All @@ -683,7 +658,7 @@ lib_deps =
https://github.com/attermann/microStore.git
https://github.com/attermann/microReticulum.git
adafruit/SdFat - Adafruit Fork
https://github.com/attermann/Adafruit_SPIFlash#littlefs
adafruit/Adafruit SPIFlash



Expand All @@ -698,7 +673,6 @@ build_flags =
${env.build_flags}
-DBOARD_MODEL=BOARD_TBEAM
; CBA TEST
-DUSTORE_USE_POSIXFS=1
-DURTN_PATH_TABLE_MAX_RECS=500
-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
-DRNS_PATH_TABLE_SEGMENT_COUNT=8
Expand All @@ -722,7 +696,6 @@ build_flags =
; CBA TEST
;-UHAS_RNS
;-DRNS_MEM_LOG
-DUSTORE_USE_POSIXFS=1
-DURTN_PATH_TABLE_MAX_RECS=500
-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
-DRNS_PATH_TABLE_SEGMENT_COUNT=8
Expand All @@ -746,7 +719,6 @@ build_flags =
; CBA TEST
;-UHAS_RNS
;-DRNS_MEM_LOG
-DUSTORE_USE_SD=1
-DSDCARD_SCLK=14
-DSDCARD_MISO=2
-DSDCARD_MOSI=15
Expand Down Expand Up @@ -777,8 +749,6 @@ build_flags =
; CBA TEST
;-UHAS_RNS
;-DRNS_MEM_LOG
-DUSTORE_USE_POSIXFS=1
;-DUSTORE_USE_LITTLEFS
-DURTN_PATH_TABLE_MAX_RECS=500
-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
-DRNS_PATH_TABLE_SEGMENT_COUNT=8
Expand Down Expand Up @@ -806,7 +776,6 @@ build_flags =
; CBA Define following to enable UDP transport via WiFi
-DUDP_TRANSPORT
;-DRNS_MEM_LOG
-DUSTORE_USE_POSIXFS=1
-DURTN_PATH_TABLE_MAX_RECS=500
-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
-DRNS_PATH_TABLE_SEGMENT_COUNT=8
Expand Down Expand Up @@ -847,7 +816,6 @@ build_flags =
;-DRNS_PSRAM_POOL_BUFFER_SIZE=2000000
;-DRNS_PSRAM_POOL_BUFFER_SIZE=1000000
;-DRNS_MEM_LOG
-DUSTORE_USE_POSIXFS=1
-DURTN_PATH_TABLE_MAX_RECS=2000
-DRNS_PATH_TABLE_SEGMENT_SIZE=98304 ; 96 KB
-DRNS_PATH_TABLE_SEGMENT_COUNT=8
Expand Down Expand Up @@ -895,7 +863,6 @@ build_flags =
;-DRNS_PSRAM_POOL_BUFFER_SIZE=2000000
;-DRNS_PSRAM_POOL_BUFFER_SIZE=1000000
;-DRNS_MEM_LOG
-DUSTORE_USE_POSIXFS=1
-DURTN_PATH_TABLE_MAX_RECS=2000
-DRNS_PATH_TABLE_SEGMENT_SIZE=98304 ; 96 KB
-DRNS_PATH_TABLE_SEGMENT_COUNT=8
Expand Down Expand Up @@ -941,8 +908,6 @@ build_flags =
-DRNS_HEAP_POOL_BUFFER_SIZE=131072
;-DRNS_HEAP_POOL_BUFFER_SIZE=65536
;-UHAS_RNS
-DUSTORE_USE_INTERNALFS
-DUSTORE_USE_FLASHFS
-DURTN_PATH_TABLE_MAX_RECS=25
-DRNS_PATH_TABLE_SEGMENT_SIZE=2048 ; 2 KB
-DRNS_PATH_TABLE_SEGMENT_COUNT=6
Expand All @@ -951,8 +916,7 @@ lib_deps =
microStore=symlink://../microStore
microReticulum=symlink://../microReticulum
adafruit/SdFat - Adafruit Fork
;https://github.com/attermann/Adafruit_SPIFlash#littlefs
Adafruit_SPIFlash=symlink://../Adafruit_SPIFlash
adafruit/Adafruit SPIFlash

; MCU: Nordic nRF52840 (32-bit ARM Cortex-M4, 64 MHz)
; SRAM: 256 KB
Expand Down Expand Up @@ -981,7 +945,6 @@ build_flags =
; CBA TEST
-DRNS_DEFAULT_ALLOCATOR=RNS_HEAP_POOL_ALLOCATOR
-DRNS_HEAP_POOL_BUFFER_SIZE=204800
-DUSTORE_USE_INTERNALFS
-DURTN_PATH_TABLE_MAX_RECS=25
-DRNS_PATH_TABLE_SEGMENT_SIZE=2048 ; 2 KB
-DRNS_PATH_TABLE_SEGMENT_COUNT=6
Expand All @@ -991,3 +954,4 @@ lib_deps =
adafruit/Adafruit NeoPixel@^1.12.0
microStore=symlink://../microStore
microReticulum=symlink://../microReticulum
adafruit/Adafruit SPIFlash