Update FunctionalInterrupt for all-functional IRQ implementation

dok-net · dok-net · commit f6ad6e240650 · 2020-10-22T19:12:15.000+02:00
diff --git a/libraries/FunctionalInterrupt/examples/Functional/Functional.ino b/libraries/FunctionalInterrupt/examples/Functional/Functional.ino
@@ -1,4 +1,4 @@
-//#include "FunctionalInterrupt.h"
+#include <FunctionalInterrupt.h>
 
 #if defined(ESP32)
 #define BUTTON1 16
@@ -15,14 +15,12 @@ class Button {
   public:
     Button(uint8_t reqPin) : PIN(reqPin) {
       pinMode(PIN, INPUT_PULLUP);
-      // Arduino C API:
+      // Arduino API:
       //attachInterruptArg(PIN, [](void* self) {
       //  static_cast<Button*>(self)->buttonIsr();
       //}, this, FALLING); // fails on ESP8266: "buttonIsr not in IRAM"
       //attachInterruptArg(PIN, reinterpret_cast<void(*)(void*)>(&buttonIsr_static), this, FALLING); // works on ESP8266
-      attachInterrupt(PIN, [this]() {
-        buttonIsr();
-      }, FALLING); // works on ESP8266
+      attachInterrupt(PIN, std::bind(&Button::buttonIsr, this), FALLING); // works on ESP8266
       // FunctionalInterrupt.h API:
       //attachScheduledInterrupt(PIN, [this](const InterruptInfo & ii) {
       //  Serial.print("Pin ");
diff --git a/libraries/FunctionalInterrupt/keywords.txt b/libraries/FunctionalInterrupt/keywords.txt
@@ -0,0 +1,11 @@
+#######################################
+# Datatypes (KEYWORD1)
+#######################################
+
+InterruptInfo	KEYWORD1
+
+#######################################
+# Methods and Functions (KEYWORD2)
+#######################################
+
+attachScheduledInterrupt	KEYWORD2
diff --git a/libraries/FunctionalInterrupt/library.properties b/libraries/FunctionalInterrupt/library.properties
@@ -0,0 +1,10 @@
+name=FunctionalInterrupt
+version=1.0
+author=hreintke <hreintke@tauri.nl>
+maintainer=hreintke <hreintke@tauri.nl>
+sentence=C++ functional and scheduled interrupt handling
+paragraph=
+category=Other
+url=https://github.com/esp8266/Arduino
+architectures=esp8266
+dot_a_linkage=true
diff --git a/libraries/FunctionalInterrupt/src/FunctionalInterrupt.cpp b/libraries/FunctionalInterrupt/src/FunctionalInterrupt.cpp
@@ -0,0 +1,23 @@
+#include "FunctionalInterrupt.h"
+#include <Schedule.h>
+#include <Arduino.h>
+
+namespace {
+
+    void ICACHE_RAM_ATTR interruptScheduleFunctional(uint8_t pin, std::function<void(InterruptInfo)> scheduledIntRoutine)
+    {
+        InterruptInfo interruptInfo(pin);
+        interruptInfo.value = digitalRead(pin);
+        interruptInfo.micro = micros();
+        schedule_function(std::bind(std::move(scheduledIntRoutine), std::move(interruptInfo)));
+    }
+
+}
+
+void attachScheduledInterrupt(uint8_t pin, std::function<void(InterruptInfo)> scheduledIntRoutine, int mode)
+{
+    if (scheduledIntRoutine)
+    {
+        attachInterrupt(pin, std::bind(interruptScheduleFunctional, pin, std::move(scheduledIntRoutine)), mode);
+    }
+}
diff --git a/libraries/FunctionalInterrupt/src/FunctionalInterrupt.h b/libraries/FunctionalInterrupt/src/FunctionalInterrupt.h
@@ -0,0 +1,18 @@
+#ifndef FUNCTIONALINTERRUPT_H
+#define FUNCTIONALINTERRUPT_H
+
+#include <functional>
+
+// Structures for communication
+
+struct InterruptInfo
+{
+    InterruptInfo(uint8_t _pin) : pin(_pin) {}
+    const uint8_t pin;
+    uint8_t value = 0;
+    uint32_t micro = 0;
+};
+
+void attachScheduledInterrupt(uint8_t pin, std::function<void(InterruptInfo)> scheduledIntRoutine, int mode);
+
+#endif //FUNCTIONALINTERRUPT_H
diff --git a/libraries/esp8266/examples/GPIO/Functional/FunctionalInterrupt.cpp b/libraries/esp8266/examples/GPIO/Functional/FunctionalInterrupt.cpp
diff --git a/libraries/esp8266/examples/GPIO/Functional/FunctionalInterrupt.h b/libraries/esp8266/examples/GPIO/Functional/FunctionalInterrupt.h
