Skip to content

Commit 1647514

Browse files
committed
minor updates per PRs
1 parent f763e6a commit 1647514

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

examples/Scheduler_example00_Blink/Scheduler_example00_Blink.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
// #define _TASK_LTS_POINTER // Compile with support for local task storage pointer
2222
// #define _TASK_PRIORITY // Support for layered scheduling priority
2323
// #define _TASK_MICRO_RES // Support for microsecond resolution
24-
// #define _TASK_STD_FUNCTION // Support for std::function (ESP8266 ONLY)
24+
// #define _TASK_STD_FUNCTION // Support for std::function
2525
// #define _TASK_DEBUG // Make all methods and variables public for debug purposes
2626
// #define _TASK_INLINE // Make all methods "inline" - needed to support some multi-tab, multi-file implementations
2727
// #define _TASK_TIMEOUT // Support for overall task timeout

examples/Scheduler_example00_Blink_Namespace/Scheduler_example00_Blink_Namespace.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
// #define _TASK_LTS_POINTER // Compile with support for local task storage pointer
2020
// #define _TASK_PRIORITY // Support for layered scheduling priority
2121
// #define _TASK_MICRO_RES // Support for microsecond resolution
22-
// #define _TASK_STD_FUNCTION // Support for std::function (ESP8266 ONLY)
22+
// #define _TASK_STD_FUNCTION // Support for std::function
2323
// #define _TASK_DEBUG // Make all methods and variables public for debug purposes
2424
// #define _TASK_INLINE // Make all methods "inline" - needed to support some multi-tab, multi-file implementations
2525
// #define _TASK_TIMEOUT // Support for overall task timeout

examples/Scheduler_example16_Multitab/ts.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// #define _TASK_LTS_POINTER // Compile with support for local task storage pointer
1515
// #define _TASK_PRIORITY // Support for layered scheduling priority
1616
// #define _TASK_MICRO_RES // Support for microsecond resolution
17-
// #define _TASK_STD_FUNCTION // Support for std::function (ESP8266 ONLY)
17+
// #define _TASK_STD_FUNCTION // Support for std::function
1818
// #define _TASK_DEBUG // Make all methods and variables public for debug purposes
1919

2020
#include <TaskScheduler.h>

examples/Scheduler_example17_Timeout/Scheduler_example17_Timeout.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// #define _TASK_LTS_POINTER // Compile with support for local task storage pointer
1414
// #define _TASK_PRIORITY // Support for layered scheduling priority
1515
// #define _TASK_MICRO_RES // Support for microsecond resolution
16-
// #define _TASK_STD_FUNCTION // Support for std::function (ESP8266 ONLY)
16+
// #define _TASK_STD_FUNCTION // Support for std::function
1717
// #define _TASK_DEBUG // Make all methods and variables public for debug purposes
1818
// #define _TASK_INLINE // Make all methods "inline" - needed to support some multi-tab, multi-file implementations
1919
#define _TASK_TIMEOUT

examples/Scheduler_template/Scheduler_template.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
// #define _TASK_LTS_POINTER // Compile with support for local task storage pointer
5151
// #define _TASK_PRIORITY // Support for layered scheduling priority
5252
// #define _TASK_MICRO_RES // Support for microsecond resolution
53-
// #define _TASK_STD_FUNCTION // Support for std::function (ESP8266 ONLY)
53+
// #define _TASK_STD_FUNCTION // Support for std::function
5454
// #define _TASK_DEBUG // Make all methods and variables public for debug purposes
5555
// #define _TASK_INLINE // Make all methods "inline" - needed to support some multi-tab, multi-file implementations
5656
// #define _TASK_TIMEOUT // Support for overall task timeout

keywords.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ adjust KEYWORD2
2626
allowSleep KEYWORD2
2727
Callback KEYWORD2
2828
cancel KEYWORD2
29-
canceled KEYWORD2
30-
completed KEYWORD2
29+
isCanceled KEYWORD2
30+
isCompleted KEYWORD2
3131
cpuLoadReset KEYWORD2
3232
currentLts KEYWORD2
3333
delay KEYWORD2
@@ -77,7 +77,7 @@ isOverrun KEYWORD2
7777
OnDisable KEYWORD2
7878
OnEnable KEYWORD2
7979
pause KEYWORD2
80-
pending KEYWORD2
80+
isPending KEYWORD2
8181
requestAction KEYWORD2
8282
resetTimeout KEYWORD2
8383
restart KEYWORD2
@@ -101,7 +101,7 @@ setWaiting KEYWORD2
101101
signal KEYWORD2
102102
signalComplete KEYWORD2
103103
startNow KEYWORD2
104-
timedOut KEYWORD2
104+
isTimedOut KEYWORD2
105105
timeUntilNextIteration KEYWORD2
106106
untilTimeout KEYWORD2
107107
waitFor KEYWORD2

src/TaskScheduler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ v4.0.0:
308308
// #define _TASK_LTS_POINTER // Compile with support for local task storage pointer
309309
// #define _TASK_PRIORITY // Support for layered scheduling priority
310310
// #define _TASK_MICRO_RES // Support for microsecond resolution
311-
// #define _TASK_STD_FUNCTION // Support for std::function (ESP8266 ONLY)
311+
// #define _TASK_STD_FUNCTION // Support for std::function
312312
// #define _TASK_DEBUG // Make all methods and variables public for debug purposes
313313
// #define _TASK_INLINE // Make all methods "inline" - needed to support some multi-tab, multi-file implementations
314314
// #define _TASK_TIMEOUT // Support for overall task timeout

src/TaskSchedulerDeclarations.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* - Support for task IDs and Control Points for error handling and watchdog timer
1717
* - Support for Local Task Storage pointer (allowing the use of same callback code for multiple tasks)
1818
* - Support for layered task prioritization
19-
* - Support for std::functions (ESP8266 only)
19+
* - Support for std::functions
2020
* - Overall task timeout
2121
* - Static and dynamic callback method binding
2222
*

0 commit comments

Comments
 (0)