[SD] Finish refactoring to allow config.json to sit on WIPPER drive, add dynamic SD CS pin

Author: brentru

src/Wippersnapper_V2.cpp

@@ -104,13 +104,14 @@ void Wippersnapper_V2::provisionV2() {
   _littleFSV2 = new WipperSnapper_LittleFS();
 #endif
 
-  // Determines if app is in SDLogger mode
+  // Determine if app is in SDLogger mode
+  uint8_t pin_cs;
   #ifdef USE_TINYUSB
-  _fileSystemV2->GetSDCSPin(); 
+  pin_cs = _fileSystemV2->GetSDCSPin(); 
   #else
-  _littleFSV2->GetSDCSPin();
+  pin_cs = _littleFSV2->GetSDCSPin();
   #endif
-  if (WsV2._sdCardV2->InitSDCard())
+  if (WsV2._sdCardV2->InitSDCard(pin_cs))
     return;
 
 #ifdef USE_DISPLAY

src/Wippersnapper_V2.h

@@ -257,7 +257,7 @@ class Wippersnapper_V2 {
       _sharedConfigBuffers; ///< Shared JSON config buffers for offline mode
 
 
-  uint8_t pin_sd_cs; ///< SD card chip select pin  
+  JsonDocument _config_doc;
 private:
   void _initV2();
 

src/provisioning/littlefs/WipperSnapper_LittleFS_V2.cpp

@@ -161,27 +161,24 @@ void WipperSnapper_LittleFS_V2::fsHalt(String msg) {
               config.json file.
 */
 /**************************************************************************/
-void WipperSnapper_LittleFS_V2::GetSDCSPin() {
+uint8_t WipperSnapper_LittleFS_V2::GetSDCSPin() {
   File32 file_cfg;
-  JsonDocument doc;
   DeserializationError error;
   // Attempt to open and deserialize the config.json file
   file_cfg = LittleFS.open("/config.json");
-  if (!file_cfg) {
-    WsV2.pin_sd_cs = 255;
-    return;
-  }
-  error = deserializeJson(doc, file_cfg);
+  if (!file_cfg)
+    return 255;
+  error = deserializeJson(WsV2._config_doc, file_cfg);
   if (error) {
     file_cfg.close();
-    WsV2.pin_sd_cs = 255;
-    return;
+    return 255;
   }
 
   // Parse config.json and save the SD CS pin
-  JsonObject exportedFromDevice = doc["exportedFromDevice"];
-  WsV2.pin_sd_cs = exportedFromDevice["sd_cs_pin"] | 255;
+  JsonObject exportedFromDevice = WsV2._config_doc["exportedFromDevice"];
+  uint8_t pin_cs = exportedFromDevice["sd_cs_pin"] | 255;
   file_cfg.close();
+  return pin_cs;
 }
 
 #endif

src/provisioning/littlefs/WipperSnapper_LittleFS_V2.h

@@ -34,7 +34,7 @@ class WipperSnapper_LittleFS_V2 {
   ~WipperSnapper_LittleFS_V2();
   void parseSecrets();
   void fsHalt(String msg);
-  void GetSDCSPin();
+  uint8_t GetSDCSPin();
 };
 extern Wippersnapper_V2 WsV2;
 #endif // WIPPERSNAPPER_LITTLEFS_H

src/provisioning/sdcard/ws_sdcard.cpp

@@ -20,6 +20,7 @@
 */
 /**************************************************************************/
 ws_sdcard::ws_sdcard() {
+  is_mode_offline = false;
   _use_test_data = false;
   _sz_log_file = 0;
 }
@@ -43,14 +44,16 @@ ws_sdcard::~ws_sdcard() {
               otherwise.
 */
 /**************************************************************************/
-bool ws_sdcard::InitSDCard() {
-  // Check if GetSDCSPin() threw error
-  if (WsV2.pin_sd_cs == 255)
+bool ws_sdcard::InitSDCard(uint8_t pin_cs) {
+/*   if (pin_cs == 255)
+    return false; */
+  if (_sd.begin(pin_cs)) {
+    is_mode_offline = true;
+    return is_mode_offline;
+  }
     return false;
 
-  if (!_sd.begin(WsV2.pin_sd_cs))
-    return false;
-  return true;
+
 }
 
 /**************************************************************************/
@@ -475,14 +478,8 @@ bool ws_sdcard::parseConfigFile() {
   DeserializationError error;
   JsonDocument doc;
 #ifndef OFFLINE_MODE_DEBUG
-  WS_DEBUG_PRINTLN("[SD] Parsing config.json from SD card...");
-  if (!_sd.exists("config.json")) {
-    WS_DEBUG_PRINTLN(
-        "[SD] FATAL Error - config.json file not found on SD Card!");
-    return false;
-  }
-  file_config = _sd.open("config.json", O_RDONLY);
-  error = deserializeJson(doc, file_config);
+  WS_DEBUG_PRINTLN("[SD] Parsing config.json...");
+  doc = WsV2._config_doc;
 #else
   // Test Mode - do not use the SD card, use test data instead!
   if (!_use_test_data) {

src/provisioning/sdcard/ws_sdcard.h

@@ -36,7 +36,7 @@ class ws_sdcard {
 public:
   ws_sdcard();
   ~ws_sdcard();
-  bool InitSDCard();
+  bool InitSDCard(uint8_t pin_cs);
   bool parseConfigFile();
 #ifdef OFFLINE_MODE_DEBUG
   bool waitForSerialConfig();

src/provisioning/tinyusb/Wippersnapper_FS_V2.cpp

@@ -168,27 +168,24 @@ Wippersnapper_FS_V2::~Wippersnapper_FS_V2() {
               config.json file.
 */
 /**************************************************************************/
-void Wippersnapper_FS_V2::GetSDCSPin() { 
+uint8_t Wippersnapper_FS_V2::GetSDCSPin() { 
   File32 file_cfg;
-  JsonDocument doc;
   DeserializationError error;
   // Attempt to open and deserialize the config.json file
   file_cfg = wipperFatFs_v2.open("/config.json");
-  if (!file_cfg) {
-    WsV2.pin_sd_cs = 255;
-    return;
-  }
-  deserializeJson(doc, file_cfg);
+  if (!file_cfg)
+    return 255;
+  error = deserializeJson(WsV2._config_doc, file_cfg);
   if (error) {
     file_cfg.close();
-    WsV2.pin_sd_cs = 255;
-    return;
+    return 255;
   }
 
   // Parse config.json and save the SD CS pin
-  JsonObject exportedFromDevice = doc["exportedFromDevice"];
-  WsV2.pin_sd_cs = exportedFromDevice["sd_cs_pin"] | 255;
+  JsonObject exportedFromDevice = WsV2._config_doc["exportedFromDevice"];
+  uint8_t pin_cs = exportedFromDevice["sd_cs_pin"] | 255;
   file_cfg.close();
+  return pin_cs;
 }
 
 /**************************************************************************/

src/provisioning/tinyusb/Wippersnapper_FS_V2.h

@@ -59,7 +59,7 @@ class Wippersnapper_FS_V2 {
   bool getSecretsFile();
   void parseSecrets();
 
-  void GetSDCSPin();
+  uint8_t GetSDCSPin();
 
 #ifdef ARDUINO_FUNHOUSE_ESP32S2
   void parseDisplayConfig(displayConfig &displayFile);