From 75d38da03b67c93ab60ec8ec47c4a515e0ae6313 Mon Sep 17 00:00:00 2001
From: Shelby Merrick <sporadic@forkineye.com>
Date: Fri, 1 Dec 2023 11:04:54 -0500
Subject: [PATCH 1/4] Check for wificonfig.json before opening

---
 ESPixelStick/src/network/WiFiDriver.cpp | 31 ++++++++++++++-----------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/ESPixelStick/src/network/WiFiDriver.cpp b/ESPixelStick/src/network/WiFiDriver.cpp
index fa9317b9d..2ca0a4d94 100644
--- a/ESPixelStick/src/network/WiFiDriver.cpp
+++ b/ESPixelStick/src/network/WiFiDriver.cpp
@@ -130,24 +130,27 @@ void c_WiFiDriver::Begin ()
 
     if (FileMgr.SdCardIsInstalled())
     {
-        DynamicJsonDocument jsonConfigDoc(1024);
-        // DEBUG_V ("read the sdcard config");
-        if (FileMgr.ReadSdFile (F("wificonfig.json"), jsonConfigDoc))
+        if (ESP_SDFS.exists (F("wificonfig.json")))
         {
-            // DEBUG_V ("Process the sdcard config");
-            JsonObject jsonConfig = jsonConfigDoc.as<JsonObject> ();
+            DynamicJsonDocument jsonConfigDoc(1024);
+            // DEBUG_V ("read the sdcard config");
+            if (FileMgr.ReadSdFile (F("wificonfig.json"), jsonConfigDoc))
+            {
+                // DEBUG_V ("Process the sdcard config");
+                JsonObject jsonConfig = jsonConfigDoc.as<JsonObject> ();
 
-            // copy the fields of interest into the local structure
-            setFromJSON (ssid,       jsonConfig, CN_ssid);
-            setFromJSON (passphrase, jsonConfig, CN_passphrase);
+                // copy the fields of interest into the local structure
+                setFromJSON (ssid,       jsonConfig, CN_ssid);
+                setFromJSON (passphrase, jsonConfig, CN_passphrase);
 
-            ConfigSaveNeeded = true;
+                ConfigSaveNeeded = true;
 
-            FileMgr.DeleteSdFile (F ("wificonfig.json"));
-        }
-        else
-        {
-            // DEBUG_V ("ERROR: Could not read SD card config");
+                FileMgr.DeleteSdFile (F ("wificonfig.json"));
+            }
+            else
+            {
+                // DEBUG_V ("ERROR: Could not read SD card config");
+            }
         }
     }
 

From 5809d782db079fad417c70eceffc12827d8e7e79 Mon Sep 17 00:00:00 2001
From: Shelby Merrick <sporadic@forkineye.com>
Date: Fri, 1 Dec 2023 11:05:53 -0500
Subject: [PATCH 2/4] Fixed "AP Reboot" text

---
 html/index.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/html/index.html b/html/index.html
index 24d7fe3af..f70a30155 100644
--- a/html/index.html
+++ b/html/index.html
@@ -453,14 +453,14 @@
                             <div class="col-sm-offset-2 col-sm-8">
                                 <div class="checkbox"><label><input type="checkbox" id="ap_reboot"
                                             title="Enabling this will cause your device to Reboot when all connections fail.">
-                                        AP ReBoot</label></div>
+                                        Reboot on Fail</label></div>
                             </div>
                         </div>
                         <div class="form-group">
                             <div class="col-sm-offset-2 col-sm-8">
                                 <div class="checkbox"><label><input type="checkbox" id="StayInApMode"
                                             title="Enabling this will cause your device to Stay in AP mode when all connections fail.">
-                                        Stay In AP Mode</label></div>
+                                        Stay in AP Mode</label></div>
                             </div>
                         </div>
                     </fieldset>
@@ -642,15 +642,15 @@
                     <div class="hidden" id="ecb">
                         <legend class="esps-legend" for="ecb_title">Advance Effect/File via Button</legend>
                         <div class="form-group col-sm-offset-2" id="ecb_title">
-            
+
                             <label class="control-label col-sm-2" for="ecb_enable">Enable</label>
                             <div class="col-sm-4">
                                 <input type="checkbox" id="ecb_enable" title="Send FPP Sync.">
                             </div>
-            
+
                             <label class="control-label AdvancedMode" for="ecb_gpioid">GPIO</label>
                             <input type="number" class="is-valid AdvancedMode" id="ecb_gpioid" step="1" min="0" max="40" value="0" title="GPIO to monitor for effects trigger">
-            
+
                             <label class="control-label AdvancedMode" for="ecb_polarity">Polarity</label>
                             <select class="AdvancedMode" id="ecb_polarity">
                                 <option value="ActiveLow">ActiveLow</option>

From b9ea484592c9a0b20d2024b26b71aa546b74cc69 Mon Sep 17 00:00:00 2001
From: Shelby Merrick <sporadic@forkineye.com>
Date: Fri, 1 Dec 2023 11:07:21 -0500
Subject: [PATCH 3/4] Updated .gitignore

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index b919df0aa..e41e563e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,9 @@
 __pycache__
 platformio_user.ini
 secrets.h
+firmware.map
+MyEnv.txt
+Changelog.pdf
 *.ino.generic.bin
 *.gz
 *.pyc
\ No newline at end of file

From 7b4418a33ea8a048b7764ee626f3fdae8e01c7c8 Mon Sep 17 00:00:00 2001
From: Shelby Merrick <sporadic@forkineye.com>
Date: Fri, 1 Dec 2023 12:08:42 -0500
Subject: [PATCH 4/4] Updated for 4.0-beta5

---
 Changelog.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 5e7747649..62a664245 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,10 @@
 
 # Changelog
 
+### 4.0-beta5
+
+Numerous fixes have occurred since beta4, most notably web frontend stability (websockets removed) and FPP / xLights compatibility and synchronization.  You will need to be on a current release of xLights in order for input/output uploading to work.  MacOS libraries for the flash tool have been updated as well, but you will still have to execute the flash tool from the command line and jump through Apple's security hoops to allow mklittlefs to run.  Numerous 3rd party ESP32 platforms have been added for those that like to roll their own controllers.
+
 ### 4.0-beta4
 
 - Moved FPP Remote to secondary input [Issue #388](https://github.com/forkineye/ESPixelStick/issues/388)