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 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) 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 (); + 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 (); - // 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 index 24d7fe3af..f70a30155 100644 --- a/html/index.html +++ b/html/index.html @@ -453,14 +453,14 @@
+ Reboot on Fail
+ Stay in AP Mode
@@ -642,15 +642,15 @@