PR feedback, relocate retry out of parseDisplayConfig

Author: tyeth

src/Wippersnapper.cpp

@@ -108,7 +108,9 @@ void Wippersnapper::provision() {
 #ifdef USE_DISPLAY
   // Initialize the display
   displayConfig config;
-  WS._fileSystem->parseDisplayConfig(config);
+  if (!WS._fileSystem->parseDisplayConfig(config)) {
+    WS._fileSystem->parseDisplayConfig(config, true);
+  }
   WS._display = new ws_display_driver(config);
   // Begin display
   if (!WS._display->begin()) {

src/provisioning/tinyusb/Wippersnapper_FS.cpp

@@ -543,8 +543,8 @@ void Wippersnapper_FS::createDisplayConfig() {
   delay(2500); // give FS some time to write the file
 }
 
-bool Wippersnapper_FS::parseDisplayConfig(displayConfig &dispCfg, bool forceRecreate) {
-  if (forceRecreate) {
+bool Wippersnapper_FS::parseDisplayConfig(displayConfig &dispCfg, bool force_recreate) {
+  if (force_recreate) {
     if (wipperFatFs.exists("/display_config.json")) {
       wipperFatFs.remove("/display_config.json");
     }
@@ -565,8 +565,8 @@ bool Wippersnapper_FS::parseDisplayConfig(displayConfig &dispCfg, bool forceRecr
   // Attempt to open file for JSON parsing
   File32 file = wipperFatFs.open("/display_config.json", FILE_READ);
   if (!file) {
-    if (!forceRecreate && parseDisplayConfig(dispCfg, true)) {
-      return true;
+    if (!force_recreate) {
+      return false;
     }
     fsHalt("FATAL ERROR: Unable to open display_config.json for parsing");
   }
@@ -575,8 +575,8 @@ bool Wippersnapper_FS::parseDisplayConfig(displayConfig &dispCfg, bool forceRecr
   JsonDocument doc;
   DeserializationError error = deserializeJson(doc, file);
   if (error) {
-    if (!forceRecreate && parseDisplayConfig(dispCfg, true)) {
-      return true;
+    if (!force_recreate) {
+      return false;
     }
     fsHalt(String("FATAL ERROR: Unable to parse display_config.json - "
                   "deserializeJson() failed with code") +

src/provisioning/tinyusb/Wippersnapper_FS.h

@@ -59,7 +59,7 @@ class Wippersnapper_FS {
   void parseSecrets();
 
 #ifdef ARDUINO_FUNHOUSE_ESP32S2
-  bool parseDisplayConfig(displayConfig &displayFile, bool forceRecreate = false);
+  bool parseDisplayConfig(displayConfig &displayFile, bool force_recreate = false);
   void createDisplayConfig();
 #endif
 private: