Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

prevent strip flickering

Browse Source 
* it seems that NPB is very sensitive when being interrupted during LEDs driving.  This change tries to avoid flash (file) writes when the strip is active.
* minor optimization: yield is completely unnecessary on ESP32 (we have a real OS).
This commit is contained in:
Frank
2023-06-12 23:27:09 +02:00
parent d4a37ecaea
commit a9cdd21da9
3 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wled00/fcn_declare.h
View File

@@ -199,6 +199,8 @@ void handlePlaylist();
void serializePlaylist(JsonObject obj);
//presets.cpp
bool presetsSavePending(void); // WLEDMM true if presetToSave, playlistSave or saveLedmap
bool presetsActionPending(void); // WLEDMM true if presetToApply, presetToSave, playlistSave or saveLedmap
void initPresetsFile();
void handlePresets();
bool applyPreset(byte index, byte callMode = CALL_MODE_DIRECT_CHANGE);

14
wled00/presets.cpp
View File

@@ -20,6 +20,20 @@ static const char *getFileName(bool persist = true) {
return persist ? "/presets.json" : "/tmp.json";
}
bool presetsSavePending(void) { // WLEDMM true if presetToSave, playlistSave or saveLedmap
if (presetToSave > 0) return(true);
if (playlistSave == true) return(true);
if (saveLedmap >= 0) return(true);
return(false);
}
bool presetsActionPending(void) { // WLEDMM true if presetToApply, presetToSave, playlistSave or saveLedmap
if (presetToApply > 0) return(true);
if (presetToSave > 0) return(true);
if (playlistSave == true) return(true);
if (saveLedmap >= 0) return(true);
return(false);
}
static void doSaveState() {
bool persist = (presetToSave < 251);
const char *filename = getFileName(persist);

20
wled00/wled.cpp
View File

@@ -87,6 +87,10 @@ void WLED::reset()
ESP.restart();
}
#if defined(ARDUINO_ARCH_ESP32) && defined(WLEDMM_FASTPATH)
#define yield() {} // WLEDMM yield() is completely unnecessary on esp32. See https://github.com/espressif/arduino-esp32/issues/1385
#endif
void WLED::loop()
{
#ifdef WLED_DEBUG
@@ -141,6 +145,18 @@ void WLED::loop()
yield();
// https://github.com/Makuna/NeoPixelBus/wiki/ESP32-and-RTOS-Tasks
// On ESP32, when the CPU is loaded, asynchronous WiFi libraries (like ESPAsyncWebServer or async-mqtt-client) may interfere with interrupts used to control the LEDs (I2S mode is less affected by this),
// which causes flickering of LEDs.
#if defined(ARDUINO_ARCH_ESP32) && (defined(WLEDMM_FASTPATH) || defined(WLEDMM_PROTECT_SERVICE)) // WLEDMM experimental: avoid strip flickering
#define FILEWRITE_MAX_WAIT_MS 30 // max time for waiting - aligned with 33 fps
//if (doReboot || doSerializeConfig || doCloseFile || loadLedmap || presetsActionPending()) { // WLEDMM trx this to also wait before reading from files
if (doReboot || doSerializeConfig || doCloseFile || presetsSavePending()) { // WLEDMM wait until strip gets idle before writing to files
unsigned long waitStripStart = millis();
while (strip.isUpdating() && (millis() - waitStripStart < FILEWRITE_MAX_WAIT_MS)) {delay(3);}
}
#endif
if (doSerializeConfig) serializeConfig();
if (doReboot && !doInitBusses) // if busses have to be inited & saved, wait until next iteration
@@ -340,6 +356,10 @@ void WLED::loop()
#endif
}
#if defined(ARDUINO_ARCH_ESP32) && defined(WLEDMM_FASTPATH)
#undef yield // WLEDMM restore yield()
#endif
void WLED::enableWatchdog() {
#if WLED_WATCHDOG_TIMEOUT > 0
#ifdef ARDUINO_ARCH_ESP32