Use Delegate instead of std::function

dok-net · dok-net · commit bfb084ab973a · 2021-06-28T12:50:01.000+02:00
diff --git a/cores/esp8266/Schedule.cpp b/cores/esp8266/Schedule.cpp
@@ -23,7 +23,7 @@
 #include "interrupts.h"
 #include "coredecls.h"
 
-typedef std::function<void(void)> mSchedFuncT;
+typedef Delegate<> mSchedFuncT;
 struct scheduled_fn_t
 {
     scheduled_fn_t* mNext = nullptr;
@@ -35,13 +35,13 @@ static scheduled_fn_t* sLast = nullptr;
 static scheduled_fn_t* sUnused = nullptr;
 static int sCount = 0;
 
-typedef std::function<bool(void)> mRecFuncT;
+typedef Delegate<bool> mRecFuncT;
 struct recurrent_fn_t
 {
     recurrent_fn_t* mNext = nullptr;
     mRecFuncT mFunc;
     esp8266::polledTimeout::periodicFastUs callNow;
-    std::function<bool(void)> alarm = nullptr;
+    Delegate<bool> alarm = nullptr;
     recurrent_fn_t(esp8266::polledTimeout::periodicFastUs interval) : callNow(interval) { }
 };
 
@@ -73,13 +73,13 @@ static scheduled_fn_t* get_fn_unsafe()
 
 static void recycle_fn_unsafe(scheduled_fn_t* fn)
 {
-    fn->mFunc = nullptr; // special overload in c++ std lib
+    fn->mFunc = nullptr; // special overload in Delegate
     fn->mNext = sUnused;
     sUnused = fn;
 }
 
 IRAM_ATTR // (not only) called from ISR
-bool schedule_function(const std::function<void(void)>& fn)
+bool schedule_function(const Delegate<>& fn)
 {
     if (!fn)
         return false;
@@ -103,8 +103,8 @@ bool schedule_function(const std::function<void(void)>& fn)
 }
 
 IRAM_ATTR // (not only) called from ISR
-bool schedule_recurrent_function_us(const std::function<bool(void)>& fn,
-    uint32_t repeat_us, const std::function<bool(void)>& alarm)
+bool schedule_recurrent_function_us(const Delegate<bool>& fn,
+    uint32_t repeat_us, const Delegate<bool>& alarm)
 {
     assert(repeat_us < decltype(recurrent_fn_t::callNow)::neverExpires); //~26800000us (26.8s)
 
diff --git a/cores/esp8266/Schedule.h b/cores/esp8266/Schedule.h
@@ -19,7 +19,7 @@
 #ifndef ESP_SCHEDULE_H
 #define ESP_SCHEDULE_H
 
-#include <functional>
+#include <Delegate.h>
 #include <stdint.h>
 
 #define SCHEDULED_FN_MAX_COUNT 32
@@ -55,7 +55,7 @@
 // * Run the lambda only once next time.
 // * A scheduled function can schedule a function.
 
-bool schedule_function (const std::function<void(void)>& fn);
+bool schedule_function (const Delegate<>& fn);
 
 // Run all scheduled functions.
 // Use this function if your are not using `loop`,
@@ -80,8 +80,8 @@ void run_scheduled_functions();
 // * If alarm is used, anytime during scheduling when it returns true,
 //   any remaining delay from repeat_us is disregarded, and fn is executed.
 
-bool schedule_recurrent_function_us(const std::function<bool(void)>& fn,
-    uint32_t repeat_us, const std::function<bool(void)>& alarm = nullptr);
+bool schedule_recurrent_function_us(const Delegate<bool>& fn,
+    uint32_t repeat_us, const Delegate<bool>& alarm = nullptr);
 
 // Test recurrence and run recurrent scheduled functions.
 // (internally called at every `yield()` and `loop()`)
