Merge branch 'forkineye:main' into main

forkineye · Dec 8, 2023 · 5860330 · 5860330
2 parents 00eff1c + 7b4418a
commit 5860330
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 19 deletions.
diff --git 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
diff --git 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)

diff --git 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");
+            }
         }
     }
 

diff --git 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>