Update to latest ESP8266/ESP32 compatible version

Author: dok-net

libraries/FunctionalInterrupt/examples/Functional/Functional.ino

@@ -1,5 +1,5 @@
-#include <Arduino.h>
 #include <FunctionalInterrupt.h>
+#include <Arduino.h>
 
 #if defined(ESP32)
 #define BUTTON1 16
@@ -22,8 +22,7 @@ class Button {
       //}, this, FALLING); // works on ESP32; fails on ESP8266: "ISR not in IRAM"
       //attachInterruptArg(PIN, reinterpret_cast<void(*)(void*)>(&isr_static), this, FALLING); // works on ESP32; works on ESP8266
       // FunctionalInterrupts API:
-      attachInterrupt(PIN, [this]() { isr(); }, FALLING); // works on ESP32; works on ESP8266
-      //attachScheduledInterrupt(PIN, [this](InterruptInfo ii) { Serial.print("Pin "); Serial.println(ii.pin); isr(); }, FALLING); // works on ESP32; works on ESP8266
+      attachScheduledInterrupt(PIN, [this](InterruptInfo ii) { Serial.print("Pin "); Serial.println(ii.pin); isr(); }, FALLING); // works on ESP32; works on ESP8266
     };
     ~Button() {
       detachInterrupt(PIN);
@@ -78,6 +77,4 @@ void setup() {
 void loop() {
   button1->checkPressed();
   button2->checkPressed();
-
-  run_scheduled_functions();
 }

libraries/FunctionalInterrupt/src/FunctionalInterrupt.cpp

@@ -1,5 +1,5 @@
 #include "FunctionalInterrupt.h"
-#include "Schedule.h"
+#include <Schedule.h>
 #include <Arduino.h>
 
 void ICACHE_RAM_ATTR interruptFunctional(void* arg)
@@ -10,19 +10,15 @@ void ICACHE_RAM_ATTR interruptFunctional(void* arg)
         localArg->interruptInfo->value = digitalRead(localArg->interruptInfo->pin);
         localArg->interruptInfo->micro = micros();
     }
-    if (localArg->functionInfo->reqScheduledFunction)
+    if (localArg->scheduledFunction)
     {
         schedule_function(
-            [reqScheduledFunction = localArg->functionInfo->reqScheduledFunction,
-                                  interruptInfo = *localArg->interruptInfo]()
+            [scheduledFunction = localArg->scheduledFunction,
+                               interruptInfo = *localArg->interruptInfo]()
         {
-            reqScheduledFunction(interruptInfo);
+            scheduledFunction(interruptInfo);
         });
     }
-    else if (localArg->functionInfo->reqFunction)
-    {
-        localArg->functionInfo->reqFunction();
-    }
 }
 
 void cleanupFunctional(void* arg)
@@ -31,25 +27,6 @@ void cleanupFunctional(void* arg)
     delete localArg;
 }
 
-void attachInterrupt(uint8_t pin, std::function<void(void)> intRoutine, int mode)
-{
-    // use the local interrupt routine which takes the ArgStructure as argument
-
-    void* localArg = detachInterruptArg(pin);
-    if (localArg)
-    {
-        cleanupFunctional(localArg);
-    }
-
-    FunctionInfo* fi = new FunctionInfo;
-    fi->reqFunction = intRoutine;
-
-    ArgStructure* as = new ArgStructure;
-    as->functionInfo = fi;
-
-    attachInterruptArg(pin, interruptFunctional, as, mode);
-}
-
 void attachScheduledInterrupt(uint8_t pin, std::function<void(InterruptInfo)> scheduledIntRoutine, int mode)
 {
     void* localArg = detachInterruptArg(pin);
@@ -58,14 +35,9 @@ void attachScheduledInterrupt(uint8_t pin, std::function<void(InterruptInfo)> sc
         cleanupFunctional(localArg);
     }
 
-    InterruptInfo* ii = new InterruptInfo(pin);
-
-    FunctionInfo* fi = new FunctionInfo;
-    fi->reqScheduledFunction = scheduledIntRoutine;
-
     ArgStructure* as = new ArgStructure;
-    as->interruptInfo = ii;
-    as->functionInfo = fi;
+    as->interruptInfo = new InterruptInfo(pin);
+    as->scheduledFunction = scheduledIntRoutine;
 
     attachInterruptArg(pin, interruptFunctional, as, mode);
 }

libraries/FunctionalInterrupt/src/FunctionalInterrupt.h

@@ -13,24 +13,16 @@ struct InterruptInfo
     uint32_t micro = 0;
 };
 
-struct FunctionInfo
-{
-    std::function<void(void)> reqFunction = nullptr;
-    std::function<void(InterruptInfo)> reqScheduledFunction = nullptr;
-};
-
 struct ArgStructure
 {
     ~ArgStructure()
     {
-        delete functionInfo;
         delete interruptInfo;
     }
     InterruptInfo* interruptInfo = nullptr;
-    FunctionInfo* functionInfo = nullptr;
+    std::function<void(InterruptInfo)> scheduledFunction = nullptr;
 };
 
-void attachInterrupt(uint8_t pin, std::function<void(void)> intRoutine, int mode);
 void attachScheduledInterrupt(uint8_t pin, std::function<void(InterruptInfo)> scheduledIntRoutine, int mode);
 void detachFunctionalInterrupt(uint8_t pin);