Skip to content

Commit

Permalink
Minor tweaks for ESP8266
Browse files Browse the repository at this point in the history
- update was restarting device on some occasions
- a bit of throttling in UI
  • Loading branch information
blazoncek committed Jun 14, 2024
1 parent f4475b9 commit ed0e738
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions wled00/data/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -282,12 +282,12 @@ function onLoad()
// fill effect extra data array
loadFXData(()=>{
// load and populate effects
loadFX(()=>{
setTimeout(()=>{loadFX(()=>{
loadPalettesData(()=>{
requestJson();// will load presets and create WS
if (cfg.comp.css) setTimeout(()=>{loadSkinCSS('skinCss')},50);
});
});
})},50);
});
});
resetUtil();
Expand Down
2 changes: 1 addition & 1 deletion wled00/json.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@ void serializeInfo(JsonObject root)
root[F("ver")] = versionString;
root[F("vid")] = VERSION;
root[F("cn")] = F(WLED_CODENAME);
root[F("release")] = FPSTR(releaseString);
root[F("release")] = releaseString;

JsonObject leds = root.createNestedObject(F("leds"));
leds[F("count")] = strip.getLengthTotal();
Expand Down
2 changes: 1 addition & 1 deletion wled00/util.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ bool requestJSONBufferLock(uint8_t module)
}
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) {
DEBUG_PRINT(F("ERROR: Locking JSON buffer failed! (still locked by "));
Expand Down
4 changes: 2 additions & 2 deletions wled00/wled.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/

// 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
//#define WLED_USE_MY_CONFIG
Expand Down Expand Up @@ -268,7 +268,7 @@ using PSRAMDynamicJsonDocument = BasicJsonDocument<PSRAM_Allocator>;

// Global Variable definitions
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"

// AP and OTA default passwords (for maximum security change them!)
Expand Down
2 changes: 1 addition & 1 deletion wled00/xml.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,7 @@ void getSettingsJS(byte subPage, char* dest)
olen -= 2; //delete ";
oappend(versionString);
oappend(SET_F("<br>"));
oappend((char*)FPSTR(releaseString));
oappend(releaseString);
oappend(SET_F("<br>("));
#if defined(ARDUINO_ARCH_ESP32)
oappend(ESP.getChipModel());
Expand Down

0 comments on commit ed0e738

Please sign in to comment.