src/FSCommon.cpp

@@ -328,14 +328,14 @@ void listDir(const char *dirname, uint8_t levels, bool del)
 void rmDir(const char *dirname)
 {
 #ifdef FSCom
-
+    spiLock->lock();
 #if (defined(ARCH_ESP32) || defined(ARCH_RP2040) || defined(ARCH_PORTDUINO))
     listDir(dirname, 10, true);
 #elif defined(ARCH_NRF52)
     // nRF52 implementation of LittleFS has a recursive delete function
     FSCom.rmdir_r(dirname);
 #endif
-
+    spiLock->unlock();
 #endif
 }
 

src/main.cpp

@@ -361,8 +361,6 @@ void setup()
 #endif
 #endif
 
-    initSPI();
-
     OSThread::setup();
 
     ledPeriodic = new Periodic("Blink", ledBlinker);
@@ -647,6 +645,8 @@ void setup()
     rp2040Setup();
 #endif
 
+    initSPI(); // needed here before reading from littleFS
+
     // We do this as early as possible because this loads preferences from flash
     // but we need to do this after main cpu init (esp32setup), because we need the random seed set
     nodeDB = new NodeDB;

src/mesh/NodeDB.cpp

@@ -352,9 +352,8 @@ bool NodeDB::factoryReset(bool eraseBleBonds)
 {
     LOG_INFO("Perform factory reset!");
     // first, remove the "/prefs" (this removes most prefs)
-    spiLock->lock();
     rmDir("/prefs"); // this uses spilock internally...
-
+    spiLock->lock();
 #ifdef FSCom
     if (FSCom.exists("/static/rangetest.csv") && !FSCom.remove("/static/rangetest.csv")) {
         LOG_ERROR("Could not remove rangetest.csv file");