mirror of
https://github.com/wled/WLED.git
synced 2025-07-23 10:46:33 +00:00
Minor tweaks for ESP8266
- update was restarting device on some occasions - a bit of throttling in UI
This commit is contained in:
parent
f4475b9d2a
commit
ed0e73803f
@ -282,12 +282,12 @@ function onLoad()
|
|||||||
// fill effect extra data array
|
// fill effect extra data array
|
||||||
loadFXData(()=>{
|
loadFXData(()=>{
|
||||||
// load and populate effects
|
// load and populate effects
|
||||||
loadFX(()=>{
|
setTimeout(()=>{loadFX(()=>{
|
||||||
loadPalettesData(()=>{
|
loadPalettesData(()=>{
|
||||||
requestJson();// will load presets and create WS
|
requestJson();// will load presets and create WS
|
||||||
if (cfg.comp.css) setTimeout(()=>{loadSkinCSS('skinCss')},50);
|
if (cfg.comp.css) setTimeout(()=>{loadSkinCSS('skinCss')},50);
|
||||||
});
|
});
|
||||||
});
|
})},50);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
resetUtil();
|
resetUtil();
|
||||||
|
@ -638,7 +638,7 @@ void serializeInfo(JsonObject root)
|
|||||||
root[F("ver")] = versionString;
|
root[F("ver")] = versionString;
|
||||||
root[F("vid")] = VERSION;
|
root[F("vid")] = VERSION;
|
||||||
root[F("cn")] = F(WLED_CODENAME);
|
root[F("cn")] = F(WLED_CODENAME);
|
||||||
root[F("release")] = FPSTR(releaseString);
|
root[F("release")] = releaseString;
|
||||||
|
|
||||||
JsonObject leds = root.createNestedObject(F("leds"));
|
JsonObject leds = root.createNestedObject(F("leds"));
|
||||||
leds[F("count")] = strip.getLengthTotal();
|
leds[F("count")] = strip.getLengthTotal();
|
||||||
|
@ -215,7 +215,7 @@ bool requestJSONBufferLock(uint8_t module)
|
|||||||
}
|
}
|
||||||
unsigned long now = millis();
|
unsigned long now = millis();
|
||||||
|
|
||||||
while (jsonBufferLock && millis()-now < 100) delay(1); // wait for fraction for buffer lock
|
while (jsonBufferLock && millis()-now < 250) delay(1); // wait for fraction for buffer lock
|
||||||
|
|
||||||
if (jsonBufferLock) {
|
if (jsonBufferLock) {
|
||||||
DEBUG_PRINT(F("ERROR: Locking JSON buffer failed! (still locked by "));
|
DEBUG_PRINT(F("ERROR: Locking JSON buffer failed! (still locked by "));
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
// version code in format yymmddb (b = daily build)
|
// version code in format yymmddb (b = daily build)
|
||||||
#define VERSION 2406120
|
#define VERSION 2406121
|
||||||
|
|
||||||
//uncomment this if you have a "my_config.h" file you'd like to use
|
//uncomment this if you have a "my_config.h" file you'd like to use
|
||||||
//#define WLED_USE_MY_CONFIG
|
//#define WLED_USE_MY_CONFIG
|
||||||
@ -268,7 +268,7 @@ using PSRAMDynamicJsonDocument = BasicJsonDocument<PSRAM_Allocator>;
|
|||||||
|
|
||||||
// Global Variable definitions
|
// Global Variable definitions
|
||||||
WLED_GLOBAL char versionString[] _INIT(TOSTRING(WLED_VERSION));
|
WLED_GLOBAL char versionString[] _INIT(TOSTRING(WLED_VERSION));
|
||||||
WLED_GLOBAL char releaseString[] _INIT_PROGMEM(TOSTRING(WLED_RELEASE_NAME)); // somehow this will not work if using "const char releaseString[]
|
WLED_GLOBAL char releaseString[] _INIT(TOSTRING(WLED_RELEASE_NAME)); // somehow this will not work if using "const char releaseString[]
|
||||||
#define WLED_CODENAME "Kōsen"
|
#define WLED_CODENAME "Kōsen"
|
||||||
|
|
||||||
// AP and OTA default passwords (for maximum security change them!)
|
// AP and OTA default passwords (for maximum security change them!)
|
||||||
|
@ -726,7 +726,7 @@ void getSettingsJS(byte subPage, char* dest)
|
|||||||
olen -= 2; //delete ";
|
olen -= 2; //delete ";
|
||||||
oappend(versionString);
|
oappend(versionString);
|
||||||
oappend(SET_F("<br>"));
|
oappend(SET_F("<br>"));
|
||||||
oappend((char*)FPSTR(releaseString));
|
oappend(releaseString);
|
||||||
oappend(SET_F("<br>("));
|
oappend(SET_F("<br>("));
|
||||||
#if defined(ARDUINO_ARCH_ESP32)
|
#if defined(ARDUINO_ARCH_ESP32)
|
||||||
oappend(ESP.getChipModel());
|
oappend(ESP.getChipModel());
|
||||||
|
Loading…
x
Reference in New Issue
Block a user