revert to std::function from Delegate to make easier to accept PR

Author: dok-net

cores/esp8266/core_esp8266_main.cpp

@@ -24,7 +24,6 @@
 //#define CONT_STACKSIZE 4096
 #include <Arduino.h>
 #include "Schedule.h"
-#include "Delegate.h"
 extern "C" {
 #include "ets_sys.h"
 #include "os_type.h"
@@ -72,6 +71,7 @@ static uint32_t s_cycles_at_yield_start;
 static uint16_t ets_intr_lock_stack[ETS_INTR_LOCK_NEST_MAX];
 static byte     ets_intr_lock_stack_ptr=0;
 
+
 extern "C" {
 extern const uint32_t __attribute__((section(".ver_number"))) core_version = ARDUINO_ESP8266_GIT_VER;
 const char* core_release =
@@ -153,7 +153,7 @@ extern "C" void __esp_delay(unsigned long ms) {
 
 extern "C" void esp_delay(unsigned long ms) __attribute__((weak, alias("__esp_delay")));
 
-using IsBlockedCB = Delegate<bool(), void*>;
+using IsBlockedCB = std::function<bool()>;
 
 void esp_delay(const uint32_t timeout_ms, const IsBlockedCB& blocked, const uint32_t intvl_ms) {
     const auto start = millis();
@@ -174,7 +174,7 @@ extern "C" void __yield() {
     }
 }
 
-extern "C" void yield() __attribute__ ((weak, alias("__yield")));
+extern "C" void yield(void) __attribute__ ((weak, alias("__yield")));
 
 extern "C" void optimistic_yield(uint32_t interval_us) {
     const uint32_t intvl_cycles = interval_us *
@@ -205,6 +205,7 @@ extern "C" void IRAM_ATTR ets_intr_unlock() {
      xt_rsil(0);
 }
 
+
 // Save / Restore the PS state across the rom ets_post call as the rom code
 // does not implement this correctly.
 extern "C" bool ets_post_rom(uint8 prio, ETSSignal sig, ETSParam par);

cores/esp8266/coredecls.h

@@ -28,16 +28,16 @@ uint32_t crc32 (const void* data, size_t length, uint32_t crc = 0xffffffff);
 #ifdef __cplusplus
 }
 
-#include <Delegate.h>
+#include <functional>
 
-using BoolCB = Delegate<void(bool), void*>;
-using TrivialCB = Delegate<void(), void*>;
+using BoolCB = std::function<void(bool)>;
+using TrivialCB = std::function<void()>;
 
 void settimeofday_cb (BoolCB&& cb);
 void settimeofday_cb (const BoolCB& cb);
 void settimeofday_cb (const TrivialCB& cb);
 
-using IsBlockedCB = Delegate<bool(), void*>;
+using IsBlockedCB = std::function<bool()>;
 
 inline void esp_suspend() {
     esp_yield();

libraries/ESP8266WiFi/src/ESP8266WiFiGeneric.cpp

@@ -434,7 +434,7 @@ bool ESP8266WiFiGenericClass::mode(WiFiMode_t m) {
     //tasks to wait correctly.
     constexpr unsigned int timeoutValue = 1000; //1 second
     if(can_yield()) {
-        esp_delay(timeoutValue, { [](void* m) { return wifi_get_opmode() != *static_cast<WiFiMode_t*>(m); }, (void*)&m }, 5);
+        esp_delay(timeoutValue, [m]() { return wifi_get_opmode() != m; }, 5);
 
         //if at this point mode still hasn't been reached, give up
         if(wifi_get_opmode() != (uint8) m) {

libraries/ESP8266WiFi/src/include/ClientContext.h

@@ -145,7 +145,7 @@ class ClientContext
         _op_start_time = millis();
         // will resume on timeout or when _connected or _notify_error fires
         // give scheduled functions a chance to run (e.g. Ethernet uses recurrent)
-        esp_delay(_timeout_ms, { [](void* self) { return static_cast<ClientContext*>(self)->_connect_pending; }, this }, 1);
+        esp_delay(_timeout_ms, [this]() { return this->_connect_pending; }, 1);
         _connect_pending = false;
         if (!_pcb) {
             DEBUGV(":cabrt\r\n");
@@ -486,7 +486,7 @@ class ClientContext
             _send_waiting = true;
             // will resume on timeout or when _write_some_from_cb or _notify_error fires
             // give scheduled functions a chance to run (e.g. Ethernet uses recurrent)
-            esp_delay(_timeout_ms, { [](void* self) { return static_cast<ClientContext*>(self)->_send_waiting; }, this }, 1);
+            esp_delay(_timeout_ms, [this]() { return this->_send_waiting; }, 1);
             _send_waiting = false;
         } while(true);
 

libraries/esp8266/examples/NTP-TZ-DST/NTP-TZ-DST.ino

@@ -242,7 +242,7 @@ void setup() {
   // install callback - called when settimeofday is called (by SNTP or user)
   // once enabled (by DHCP), SNTP is updated every hour by default
   // ** optional boolean in callback function is true when triggered by SNTP **
-  settimeofday_cb(static_cast<BoolCB>(time_is_set));
+  settimeofday_cb(time_is_set);
 
   // setup RTC time
   // it will be used until NTP server will send us real current time

tests/host/common/Arduino.cpp

@@ -15,7 +15,7 @@
 
 #include <sys/time.h>
 #include "Arduino.h"
-#include <Delegate.h>
+#include <functional>
 
 #include <unistd.h>
 
@@ -63,7 +63,7 @@ extern "C" void esp_delay (unsigned long ms)
     usleep(ms * 1000);
 }
 
-using IsBlockedCB = Delegate<bool(), void*>;
+using IsBlockedCB = std::function<bool()>;
 
 inline void esp_suspend() {
     esp_yield();