[SD] Link tinyusb, refactor init

Author: brentru

src/Wippersnapper_V2.cpp

@@ -104,10 +104,11 @@ void Wippersnapper_V2::provisionV2() {
   _littleFSV2 = new WipperSnapper_LittleFS();
 #endif
 
-  // Are we using sd-card/offline mode?
+  // Determines if app is in SDLogger mode
   #ifdef USE_TINYUSB
   _fileSystemV2->GetSDCSPin(); 
-  // TODO: Implement this for LittleFS TOO and do an elseif for USE_LITTLEFS
+  #else
+  _littleFSV2->GetSDCSPin();
   #endif
   if (WsV2._sdCardV2->InitSDCard())
     return;

src/provisioning/littlefs/WipperSnapper_LittleFS_V2.cpp

@@ -155,22 +155,30 @@ void WipperSnapper_LittleFS_V2::fsHalt(String msg) {
   }
 }
 
+/**************************************************************************/
+/*!
+    @brief    Attempts to obtain the hardware's CS pin from the
+              config.json file.
+*/
+/**************************************************************************/
 void WipperSnapper_LittleFS_V2::GetSDCSPin() {
-
-BRENT YOU WERE HERE YOU WERE HERE !!!
-
-  File file_cfg = LittleFS.open("/config.json");
+  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;
   }
-  DeserializationError error = deserializeJson(doc, file_cfg);
-  // failed to deserialize the config file, bail out
+  error = deserializeJson(doc, file_cfg);
   if (error) {
     file_cfg.close();
     WsV2.pin_sd_cs = 255;
     return;
   }
+
+  // Parse config.json and save the SD CS pin
   JsonObject exportedFromDevice = doc["exportedFromDevice"];
   WsV2.pin_sd_cs = exportedFromDevice["sd_cs_pin"] | 255;
   file_cfg.close();

src/provisioning/sdcard/ws_sdcard.cpp

@@ -36,15 +36,21 @@ ws_sdcard::~ws_sdcard() {
   }
 }
 
+/**************************************************************************/
+/*!
+    @brief    Attempts to initialize the SD card and filesystem.
+    @returns  True if the SD card was successfully initialized, False
+              otherwise.
+*/
+/**************************************************************************/
 bool ws_sdcard::InitSDCard() {
-  is_mode_offline = false;
-  if (WsV2.pin_sd_cs == 255) { // No SD card CS pin defined
-    return is_mode_offline;
-  } else { // SD card CS pin defined
-    if (_sd.begin(WsV2.pin_sd_cs))
-      is_mode_offline = true;
-  }
-  return is_mode_offline;
+  // Check if GetSDCSPin() threw error
+  if (WsV2.pin_sd_cs == 255)
+    return false;
+
+  if (!_sd.begin(WsV2.pin_sd_cs))
+    return false;
+  return true;
 }
 
 /**************************************************************************/

src/provisioning/tinyusb/Wippersnapper_FS.cpp

@@ -279,15 +279,15 @@ bool Wippersnapper_FS::createBootFile() {
     bootFile.print("MAC Address: ");
     bootFile.println(sMAC);
 
-    // Print ESP-specific info to boot file
-    #ifdef ARDUINO_ARCH_ESP32
+// Print ESP-specific info to boot file
+#ifdef ARDUINO_ARCH_ESP32
     // Get version of ESP-IDF
     bootFile.print("ESP-IDF Version: ");
     bootFile.println(ESP.getSdkVersion());
     // Get version of this core
     bootFile.print("ESP32 Core Version: ");
     bootFile.println(ESP.getCoreVersion());
-    #endif
+#endif
 
     bootFile.flush();
     bootFile.close();
@@ -617,26 +617,26 @@ DSTATUS fdisk_initialize(BYTE pdrv) {
 }
 
 DRESULT fdisk_read(BYTE pdrv,  /* Physical drive nmuber to identify the drive */
-                  BYTE *buff, /* Data buffer to store read data */
-                  DWORD sector, /* Start sector in LBA */
-                  UINT count    /* Number of sectors to read */
+                   BYTE *buff, /* Data buffer to store read data */
+                   DWORD sector, /* Start sector in LBA */
+                   UINT count    /* Number of sectors to read */
 ) {
   (void)pdrv;
   return flash.readBlocks(sector, buff, count) ? RES_OK : RES_ERROR;
 }
 
 DRESULT fdisk_write(BYTE pdrv, /* Physical drive nmuber to identify the drive */
-                   const BYTE *buff, /* Data to be written */
-                   DWORD sector,     /* Start sector in LBA */
-                   UINT count        /* Number of sectors to write */
+                    const BYTE *buff, /* Data to be written */
+                    DWORD sector,     /* Start sector in LBA */
+                    UINT count        /* Number of sectors to write */
 ) {
   (void)pdrv;
   return flash.writeBlocks(sector, buff, count) ? RES_OK : RES_ERROR;
 }
 
 DRESULT fdisk_ioctl(BYTE pdrv, /* Physical drive nmuber (0..) */
-                   BYTE cmd,  /* Control code */
-                   void *buff /* Buffer to send/receive control data */
+                    BYTE cmd,  /* Control code */
+                    void *buff /* Buffer to send/receive control data */
 ) {
   (void)pdrv;
 

src/provisioning/tinyusb/Wippersnapper_FS_V2.cpp

@@ -162,19 +162,30 @@ Wippersnapper_FS_V2::~Wippersnapper_FS_V2() {
   wipperFatFs_v2.end();
 }
 
+/**************************************************************************/
+/*!
+    @brief    Attempts to obtain the hardware's CS pin from the
+              config.json file.
+*/
+/**************************************************************************/
 void Wippersnapper_FS_V2::GetSDCSPin() { 
-  File32 file_cfg = wipperFatFs_v2.open("/config.json");
+  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;
   }
-  DeserializationError error = deserializeJson(doc, file_cfg);
-  // failed to deserialize the config file, bail out
+  deserializeJson(doc, file_cfg);
   if (error) {
     file_cfg.close();
     WsV2.pin_sd_cs = 255;
     return;
   }
+
+  // Parse config.json and save the SD CS pin
   JsonObject exportedFromDevice = doc["exportedFromDevice"];
   WsV2.pin_sd_cs = exportedFromDevice["sd_cs_pin"] | 255;
   file_cfg.close();