Fix esp32dev platform

Author: brentru

src/provisioning/littlefs/WipperSnapper_LittleFS.cpp

@@ -28,8 +28,8 @@
 WipperSnapper_LittleFS::WipperSnapper_LittleFS() {
   // Attempt to initialize filesystem
   if (!LittleFS.begin()) {
-    HaltFilesystem("ERROR: Failure initializing LittleFS!",
-                   WS_LED_STATUS_WAITING_FOR_REG_MSG);
+    fsHalt("ERROR: Failure initializing LittleFS!",
+           WS_LED_STATUS_WAITING_FOR_REG_MSG);
   }
 }
 
@@ -42,26 +42,25 @@ WipperSnapper_LittleFS::~WipperSnapper_LittleFS() { LittleFS.end(); }
     @brief    Locates, opens and parses the WipperSnapper secrets file
               on the LittleFS filesystem.
 */
-void WipperSnapper_LittleFS::parseSecrets() {
+void WipperSnapper_LittleFS::ParseFileSecrets() {
   // Check if `secrets.json` file exists on FS
   if (!LittleFS.exists("/secrets.json")) {
-    HaltFilesystem(
-        "ERROR: No secrets.json found on filesystem - did you upload "
-        "credentials?");
+    fsHalt("ERROR: No secrets.json found on filesystem - did you upload "
+           "credentials?");
   }
 
   // Attempt to open secrets.json file for reading
   File secretsFile = LittleFS.open("/secrets.json", "r");
   if (!secretsFile) {
-    HaltFilesystem("ERROR: Could not open secrets.json file for reading!");
+    fsHalt("ERROR: Could not open secrets.json file for reading!");
   }
 
   // Attempt to deserialize the file's JSON document
   JsonDocument doc;
   DeserializationError error = deserializeJson(doc, secretsFile);
   if (error) {
-    HaltFilesystem(String("ERROR: deserializeJson() failed with code ") +
-                   error.c_str());
+    fsHalt(String("ERROR: deserializeJson() failed with code ") +
+           error.c_str());
   }
   if (doc.containsKey("network_type_wifi")) {
     // set default network config
@@ -81,9 +80,8 @@ void WipperSnapper_LittleFS::parseSecrets() {
       WS_DEBUG_PRINT("Network count: ");
       WS_DEBUG_PRINTLN(altNetworkCount);
       if (altNetworkCount == 0) {
-        HaltFilesystem(
-            "ERROR: No alternative network entries found under "
-            "network_type_wifi.alternative_networks in secrets.json!");
+        fsHalt("ERROR: No alternative network entries found under "
+               "network_type_wifi.alternative_networks in secrets.json!");
       }
       // check if over 3, warn user and take first three
       for (int i = 0; i < altNetworkCount; i++) {
@@ -101,11 +99,11 @@ void WipperSnapper_LittleFS::parseSecrets() {
       }
       WsV2._isWiFiMultiV2 = true;
     } else {
-      HaltFilesystem("ERROR: Unrecognised value type for "
-                     "network_type_wifi.alternative_networks in secrets.json!");
+      fsHalt("ERROR: Unrecognised value type for "
+             "network_type_wifi.alternative_networks in secrets.json!");
     }
   } else {
-    HaltFilesystem("ERROR: Could not find network_type_wifi in secrets.json!");
+    fsHalt("ERROR: Could not find network_type_wifi in secrets.json!");
   }
 
   // Extract a config struct from the JSON document
@@ -114,17 +112,16 @@ void WipperSnapper_LittleFS::parseSecrets() {
   // Validate the config struct is not filled with default values
   if (strcmp(WsV2._configV2.aio_user, "YOUR_IO_USERNAME_HERE") == 0 ||
       strcmp(WsV2._configV2.aio_key, "YOUR_IO_KEY_HERE") == 0) {
-    HaltFilesystem(
+    fsHalt(
         "ERROR: Invalid IO credentials in secrets.json! TO FIX: Please change "
         "io_username and io_key to match your Adafruit IO credentials!\n");
   }
 
   if (strcmp(WsV2._configV2.network.ssid, "YOUR_WIFI_SSID_HERE") == 0 ||
       strcmp(WsV2._configV2.network.pass, "YOUR_WIFI_PASS_HERE") == 0) {
-    HaltFilesystem(
-        "ERROR: Invalid network credentials in secrets.json! TO FIX: Please "
-        "change network_ssid and network_password to match your Adafruit IO "
-        "credentials!\n");
+    fsHalt("ERROR: Invalid network credentials in secrets.json! TO FIX: Please "
+           "change network_ssid and network_password to match your Adafruit IO "
+           "credentials!\n");
   }
 
   // Close the file
@@ -153,7 +150,7 @@ void WipperSnapper_LittleFS::fsHalt(String msg, ws_led_status_t status_state) {
     @brief    Attempts to obtain the hardware's CS pin from the
               config.json file.
 */
-void WipperSnapper_LittleFS::GetSDCSPin() {
+void WipperSnapper_LittleFS::GetPinSDCS() {
   // Attempt to open and deserialize the config.json file
 #if defined(ARDUINO_ESP8266_ADAFRUIT_HUZZAH)
   File file_cfg = LittleFS.open("/config.json", "r");

src/provisioning/littlefs/WipperSnapper_LittleFS.h

@@ -29,9 +29,8 @@ class WipperSnapper_LittleFS {
   WipperSnapper_LittleFS();
   ~WipperSnapper_LittleFS();
   void ParseFileSecrets();
-  void
-  HaltFilesystem(String msg,
-                 ws_led_status_t status_state = WS_LED_STATUS_ERROR_RUNTIME);
+  void fsHalt(String msg,
+              ws_led_status_t status_state = WS_LED_STATUS_ERROR_RUNTIME);
   void GetPinSDCS();
 };
 extern Wippersnapper_V2 WsV2;