Properly turn FunctionalInterrupt into integral library

Author: dok-net

CMakeLists.txt

@@ -47,6 +47,7 @@ set(LIBRARY_SRCS
   libraries/FFat/src/FFat.cpp
   libraries/FS/src/FS.cpp
   libraries/FS/src/vfs_api.cpp
+  libraries/FunctionalInterrupt/src/FunctionalInterrupt.cpp
   libraries/HTTPClient/src/HTTPClient.cpp
   libraries/HTTPUpdate/src/HTTPUpdate.cpp
   libraries/NetBIOS/src/NetBIOS.cpp
@@ -187,6 +188,7 @@ set(COMPONENT_ADD_INCLUDEDIRS
   libraries/ESPmDNS/src
   libraries/FFat/src
   libraries/FS/src
+  libraries/FunctionalInterrupt/src
   libraries/HTTPClient/src
   libraries/HTTPUpdate/src
   libraries/NetBIOS/src

libraries/ESP32/examples/GPIO/Functional/Functional.ino renamed to libraries/FunctionalInterrupt/examples/Functional/Functional.ino

@@ -1,6 +1,5 @@
 #include <Arduino.h>
-#include "Schedule.h"
-#include "FunctionalInterrupt.h"
+#include <FunctionalInterrupt.h>
 
 #if defined(ESP32)
 #define BUTTON1 16
@@ -18,12 +17,12 @@ class Button {
     Button(uint8_t reqPin) : PIN(reqPin) {
       pinMode(PIN, INPUT_PULLUP);
       // Arduino C API:
-      attachInterruptArg(PIN, [](void* self) {
-        static_cast<Button*>(self)->isr();
-      }, this, FALLING); // works on ESP32; fails on ESP8266: "ISR not in IRAM"
+      //attachInterruptArg(PIN, [](void* self) {
+      //  static_cast<Button*>(self)->isr();
+      //}, 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
+      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
     };
     ~Button() {
@@ -68,9 +67,6 @@ Button* button2;
 
 void setup() {
   Serial.begin(115200);
-  schedule_function([]() {
-    Serial.println("Scheduled function");
-  });
   Serial.println("FunctionalInterrupt test/example");
 
   button1 = new Button(BUTTON1);

libraries/FunctionalInterrupt/keywords.txt

@@ -0,0 +1,14 @@
+#######################################
+# Datatypes (KEYWORD1)
+#######################################
+
+FunctionalInterrupt	KEYWORD1
+InterruptInfo	KEYWORD1
+
+#######################################
+# Methods and Functions (KEYWORD2)
+#######################################
+
+attachInterrupt	KEYWORD2
+attachScheduledInterrupt	KEYWORD2
+detachFunctionalInterrupt	KEYWORD2

libraries/FunctionalInterrupt/library.properties

@@ -0,0 +1,9 @@
+name=FunctionalInterrupt
+version=1.0
+author=
+maintainer=
+sentence=
+paragraph=
+category=
+url=
+architectures=esp32