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

Author: dok-net

cores/esp8266/Arduino.h

@@ -229,7 +229,6 @@ void optimistic_yield(uint32_t interval_us);
 #include <algorithm>
 #include <cstdlib>
 #include <cmath>
-#include "Delegate.h"
 
 
 #include "mmu_iram.h"
@@ -276,7 +275,7 @@ void setTZ(const char* tz);
 void configTime(const char* tz, const char* server1,
     const char* server2 = nullptr, const char* server3 = nullptr);
 
-void attachInterrupt(uint8_t pin, Delegate<void(), void*> userFunc, int mode);
+void attachInterrupt(uint8_t pin, std::function<void()> userFunc, int mode);
 
 // configures with approximated TZ value. part of the old api, prefer configTime with TZ variable
 void configTime(int timezone, int daylightOffset_sec, const char* server1,

cores/esp8266/core_esp8266_wiring_digital.cpp

@@ -129,7 +129,7 @@ extern "C" {
             {
             }
             uint8_t mode;
-            Delegate<void(), void*> userFunc;
+            std::function<void()> userFunc;
         };
 
         static interrupt_handler_t interrupt_handlers[16];
@@ -147,7 +147,7 @@ extern "C" {
             }
         }
 
-        void set_interrupt_handlers(uint8_t pin, Delegate<void(), void*>&& userFunc, uint8_t mode)
+        void set_interrupt_handlers(uint8_t pin, std::function<void()>&& userFunc, uint8_t mode)
         {
             interrupt_handler_t& handler = interrupt_handlers[pin];
             handler.userFunc = std::move(userFunc);
@@ -171,7 +171,7 @@ extern "C" {
     extern void __attachInterruptArg(uint8_t pin, voidFuncPtrArg const userFunc, void* const arg, int mode)
     {
         isr_iram_assertion(userFunc);
-        attachInterrupt(pin, { userFunc, arg }, mode);
+        attachInterrupt(pin, std::bind(userFunc, arg), mode);
     }
 
     extern void __attachInterrupt(uint8_t pin, voidFuncPtr userFunc, int mode)
@@ -224,9 +224,9 @@ extern "C" {
 
 };
 
-extern void attachInterrupt(uint8_t pin, Delegate<void(), void*> userFunc, int mode)
+extern void attachInterrupt(uint8_t pin, std::function<void()> userFunc, int mode)
 {
-    // isr_iram_assertion cannot inspect std::function objects; Delegate hides if its a std::function or C-style ptr
+    // isr_iram_assertion cannot inspect std::function objects
     if (pin < 16)
     {
         ETS_GPIO_INTR_DISABLE();

libraries/FunctionalInterrupt/examples/Functional/Functional.ino

@@ -18,7 +18,7 @@ class Button {
   public:
     Button(uint8_t reqPin) : PIN(reqPin) {
       pinMode(PIN, INPUT_PULLUP);
-      attachInterrupt(PIN, { buttonIsr_static, this }, FALLING);
+      attachInterrupt(PIN, std::bind(buttonIsr_static, this), FALLING);
     };
     ~Button() {
       detachInterrupt(PIN);

libraries/FunctionalInterrupt/src/FunctionalInterrupt.cpp

@@ -8,11 +8,11 @@ namespace
     struct InterruptScheduleFunctionalArg
     {
         uint8_t pin;
-        Delegate<void(const InterruptInfo&), void*> scheduledIntRoutine;
+        std::function<void(const InterruptInfo&)> scheduledIntRoutine;
     };
     struct ScheduleLambdaArg
     {
-        Delegate<void(const InterruptInfo&), void*> scheduledIntRoutine;
+        std::function<void(const InterruptInfo&)> scheduledIntRoutine;
         InterruptInfo interruptInfo;
     };
 
@@ -26,7 +26,7 @@ namespace
 
 }
 
-void attachScheduledInterrupt(uint8_t pin, const Delegate<void(const InterruptInfo&), void*>& scheduledIntRoutine, int mode)
+void attachScheduledInterrupt(uint8_t pin, const std::function<void(const InterruptInfo&)>& scheduledIntRoutine, int mode)
 {
     if (scheduledIntRoutine)
     {

libraries/FunctionalInterrupt/src/FunctionalInterrupt.h

@@ -1,7 +1,7 @@
 #ifndef FUNCTIONALINTERRUPT_H
 #define FUNCTIONALINTERRUPT_H
 
-#include <Delegate.h>
+#include <functional>
 
 // Structures for communication
 
@@ -13,6 +13,6 @@ struct InterruptInfo
     uint32_t micro = 0;
 };
 
-void attachScheduledInterrupt(uint8_t pin, const Delegate<void(const InterruptInfo&), void*>& scheduledIntRoutine, int mode);
+void attachScheduledInterrupt(uint8_t pin, const std::function<void(const InterruptInfo&)>& scheduledIntRoutine, int mode);
 
 #endif //FUNCTIONALINTERRUPT_H