Skip to content

Commit 4dce617

Browse files
committed
pcTaskGetName
1 parent d33f143 commit 4dce617

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

wled00/FX_fcn.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
// This workaround is just needed for the segment class, that does't know about "strip"
5858
void strip_wait_until_idle(String whoCalledMe) {
5959
#if defined(ARDUINO_ARCH_ESP32) && defined(WLEDMM_PROTECT_SERVICE) // WLEDMM experimental
60-
if (strip.isServicing() && (strncmp(pcTaskGetTaskName(NULL), "loopTask", 8) != 0)) { // if we are in looptask (arduino loop), its safe to proceed without waiting
60+
if (strip.isServicing() && (strncmp(pcTaskGetName(NULL), "loopTask", 8) != 0)) { // if we are in looptask (arduino loop), its safe to proceed without waiting
6161
USER_PRINTLN(whoCalledMe + String(": strip is still drawing effects."));
6262
strip.waitUntilIdle();
6363
}
@@ -1864,7 +1864,7 @@ void WS2812FX::waitUntilIdle(void) {
18641864
delay(2); // Suspending for 1 tick (or more) gives other tasks a chance to run.
18651865
//yield(); // seems to be a no-op on esp32
18661866
} while (isServicing() && (millis() - waitStarted < MAX_IDLE_WAIT_MS));
1867-
USER_PRINTF("strip.waitUntilIdle(): strip %sidle after %d ms. (task %s with prio=%d)\n", isServicing()?"not ":"", int(millis() - waitStarted), pcTaskGetTaskName(NULL), uxTaskPriorityGet(NULL));
1867+
USER_PRINTF("strip.waitUntilIdle(): strip %sidle after %d ms. (task %s with prio=%d)\n", isServicing()?"not ":"", int(millis() - waitStarted), pcTaskGetName(NULL), uxTaskPriorityGet(NULL));
18681868
}
18691869
return;
18701870
#else

wled00/cfg.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
9393
// WLEDMM: before changing strip, make sure our strip is _not_ servicing effects in parallel
9494
suspendStripService = true; // temporarily lock out strip updates
9595
#ifdef ARDUINO_ARCH_ESP32
96-
if (strip.isServicing() && (strncmp(pcTaskGetTaskName(NULL), "loopTask", 8) != 0)) { // if we are in looptask (arduino loop), its safe to proceed without waiting
96+
if (strip.isServicing() && (strncmp(pcTaskGetName(NULL), "loopTask", 8) != 0)) { // if we are in looptask (arduino loop), its safe to proceed without waiting
9797
if (fromFS) {
9898
USER_PRINTLN(F("deserializeConfig(fromFS): strip is still drawing effects."));
9999
} else {

0 commit comments

Comments
 (0)