[SD] Support for LittleFS based provisioning

Author: brentru

src/Wippersnapper_V2.cpp

@@ -101,7 +101,7 @@ void Wippersnapper_V2::provisionV2() {
 #ifdef USE_TINYUSB
   _fileSystemV2 = new Wippersnapper_FS_V2();
 #elif defined(USE_LITTLEFS)
-  _littleFSV2 = new WipperSnapper_LittleFS();
+  _littleFSV2 = new WipperSnapper_LittleFS_V2();
 #endif
 
   // Determine if app is in SDLogger mode

src/Wippersnapper_V2.h

@@ -80,7 +80,7 @@
 #include "provisioning/tinyusb/Wippersnapper_FS_V2.h"
 #endif
 #if defined(USE_LITTLEFS)
-#include "provisioning/littlefs/WipperSnapper_LittleFS.h"
+#include "provisioning/littlefs/WipperSnapper_LittleFS_V2.h"
 #endif
 
 #define WS_VERSION                                                             \
@@ -95,7 +95,7 @@
 // Forward declarations (API v1)
 class Wippersnapper_AnalogIO;
 class Wippersnapper_FS_V2;
-class WipperSnapper_LittleFS;
+class WipperSnapper_LittleFS_V2;
 class ws_sdcard;
 #ifdef USE_DISPLAY
 class ws_display_driver;
@@ -207,7 +207,7 @@ class Wippersnapper_V2 {
   // to free up space on the heap
   Wippersnapper_AnalogIO *_analogIOV2; ///< Instance of analog io class
   Wippersnapper_FS_V2 *_fileSystemV2;  ///< Instance of Filesystem (native USB)
-  WipperSnapper_LittleFS
+  WipperSnapper_LittleFS_V2
       *_littleFSV2;     ///< Instance of LittleFS Filesystem (non-native USB)
   ws_sdcard *_sdCardV2; ///< Instance of SD card class
 #ifdef USE_DISPLAY

src/provisioning/littlefs/WipperSnapper_LittleFS_V2.cpp

@@ -162,10 +162,9 @@ void WipperSnapper_LittleFS_V2::fsHalt(String msg) {
 */
 /**************************************************************************/
 void WipperSnapper_LittleFS_V2::GetSDCSPin() {
-  File32 file_cfg;
   DeserializationError error;
   // Attempt to open and deserialize the config.json file
-  file_cfg = LittleFS.open("/config.json");
+  File file_cfg = LittleFS.open("/config.json");
   if (!file_cfg)
     WsV2.pin_sd_cs = 255;
   error = deserializeJson(WsV2._config_doc, file_cfg);

src/provisioning/littlefs/WipperSnapper_LittleFS_V2.h

@@ -16,7 +16,6 @@
 #define WIPPERSNAPPER_LITTLEFS_V2_H
 
 #include "Wippersnapper_V2.h"
-
 #include <FS.h>
 #include <LittleFS.h>
 

src/provisioning/sdcard/ws_sdcard.cpp

@@ -466,7 +466,7 @@ bool ws_sdcard::CreateNewLogFile() {
   _log_filename = log_filename_buffer;
 
   // Attempt to create the new log file
-  if (!file.open(_log_filename, FILE_WRITE))
+  if (!file.open(_log_filename, O_RDWR | O_CREAT | O_AT_END))
     return false;
   WS_DEBUG_PRINT("[SD] Created new log file on SD card: ");
   WS_DEBUG_PRINTLN(_log_filename);
@@ -802,7 +802,7 @@ bool ws_sdcard::LogJSONDoc(JsonDocument &doc) {
   // Serialize the JSON document
 #ifndef OFFLINE_MODE_DEBUG
   File32 file;
-  file = _sd.open(_log_filename, FILE_WRITE);
+  file = _sd.open(_log_filename, O_RDWR | O_CREAT | O_AT_END);
   if (!file) {
     WS_DEBUG_PRINTLN(
         "[SD] FATAL Error - Unable to open the log file for writing!");

src/ws_manager.cpp

@@ -69,10 +69,10 @@ void Wippersnapper_Manager::checkAPIVersion(int pinNum) {
   // NOTE: For debugging right now, we are forcing the API version
   readButton = true;
   if (readButton) { // API version 2 if D12 is high
-    ws_instance_v2 = new ws_adapter_offline_v2();
+    ws_instance_v2 = new ws_adapter_wifi_v2();
     _api_version = 2;
   } else { // API version 1 if D12 is low
-    ws_instance = new ws_adapter_offline();
+    ws_instance = new ws_adapter_wifi();
     _api_version = 1;
   }
 }

src/ws_manager.h

@@ -1,10 +1,10 @@
 #ifndef WIPPERSNAPPER_MANAGER_H
 #define WIPPERSNAPPER_MANAGER_H
 
-#include "adapters/offline/ws_offline_pico.h"
-typedef ws_offline_pico ws_adapter_offline;
-#include "adapters/offline/ws_offline_pico_v2.h"
-typedef ws_offline_pico_v2 ws_adapter_offline_v2;
+#include "adapters/wifi/ws_wifi_esp32.h"
+typedef ws_wifi_esp32 ws_adapter_wifi;
+#include "adapters/wifi/ws_wifi_esp32_v2.h"
+typedef ws_wifi_esp32_v2 ws_adapter_wifi_v2;
 
 /****************************************************************************/
 /*!
@@ -27,8 +27,8 @@ class Wippersnapper_Manager {
   void run();
 
 protected:
-  ws_adapter_offline *ws_instance;      ///< Instance of Wippersnapper API v1
-  ws_adapter_offline_v2 *ws_instance_v2; ///< Instance of Wippersnapper API v2
+  ws_adapter_wifi *ws_instance;      ///< Instance of Wippersnapper API v1
+  ws_adapter_wifi_v2 *ws_instance_v2; ///< Instance of Wippersnapper API v2
 private:
   int _api_version;
 };