Updated examples

Author: dok-net

libraries/FunctionalInterrupt/examples/Functional/Functional.ino

@@ -1,5 +1,8 @@
 #include <FunctionalInterrupt.h>
-#include <Arduino.h>
+
+#ifndef IRAM_ATTR
+#define IRAM_ATTR ICACHE_RAM_ATTR
+#endif
 
 #if defined(ESP32)
 #define BUTTON1 16
@@ -16,46 +19,27 @@ class Button {
   public:
     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, reinterpret_cast<void(*)(void*)>(&isr_static), this, FALLING); // works on ESP32; works on ESP8266
-      // FunctionalInterrupts API:
-      attachScheduledInterrupt(PIN, [this](InterruptInfo ii) {
-        Serial.print("Pin ");
-        Serial.println(ii.pin);
-        isr();
-      }, FALLING); // works on ESP32; works on ESP8266
+      attachInterrupt(PIN, std::bind(&Button::buttonIsr, this), FALLING);
     };
     ~Button() {
       detachInterrupt(PIN);
     }
 
-#if defined(ESP8266)
-    void ICACHE_RAM_ATTR isr()
-#elif defined(ESP32)
-    void IRAM_ATTR isr()
-#endif
-    {
+    void IRAM_ATTR buttonIsr() {
       numberKeyPresses += 1;
       pressed = true;
     }
 
-#if defined(ESP8266)
-    static void ICACHE_RAM_ATTR isr_static(Button* const self)
-#elif defined(ESP32)
-    static void IRAM_ATTR isr_static(Button* const self)
-#endif
-    {
-      self->isr();
+    static void IRAM_ATTR buttonIsr_static(Button* const self) {
+      self->buttonIsr();
     }
 
-    void checkPressed() {
+    uint32_t checkPressed() {
       if (pressed) {
         Serial.printf("Button on pin %u has been pressed %u times\n", PIN, numberKeyPresses);
         pressed = false;
       }
+      return numberKeyPresses;
     }
 
   private:
@@ -80,5 +64,8 @@ void setup() {
 
 void loop() {
   button1->checkPressed();
-  button2->checkPressed();
+  if (nullptr != button2 && 10 < button2->checkPressed()) {
+    delete button2;
+    button2 = nullptr;
+  }
 }

libraries/FunctionalInterrupt/examples/ScheduledFunctional/ScheduledFunctional.ino

@@ -0,0 +1,75 @@
+#include <FunctionalInterrupt.h>
+
+#ifndef IRAM_ATTR
+#define IRAM_ATTR ICACHE_RAM_ATTR
+#endif
+
+#if defined(ESP32)
+#define BUTTON1 16
+#define BUTTON2 17
+#elif defined(ARDUINO_ESP8266_WEMOS_D1MINI)
+#define BUTTON1 D4
+#define BUTTON2 D3
+#else
+#define BUTTON1 2
+#define BUTTON2 0
+#endif
+
+class Button {
+  public:
+    Button(uint8_t reqPin) : PIN(reqPin) {
+      pinMode(PIN, INPUT_PULLUP);
+      attachScheduledInterrupt(PIN, [this](const InterruptInfo & ii) {
+        Serial.print("Pin ");
+        Serial.println(ii.pin);
+        buttonIsr();
+      }, FALLING); // works on ESP8266
+    };
+    ~Button() {
+      detachInterrupt(PIN);
+    }
+
+    void IRAM_ATTR buttonIsr() {
+      numberKeyPresses += 1;
+      pressed = true;
+    }
+
+    static void IRAM_ATTR buttonIsr_static(Button* const self) {
+      self->buttonIsr();
+    }
+
+    uint32_t checkPressed() {
+      if (pressed) {
+        Serial.printf("Button on pin %u has been pressed %u times\n", PIN, numberKeyPresses);
+        pressed = false;
+      }
+      return numberKeyPresses;
+    }
+
+  private:
+    const uint8_t PIN;
+    volatile uint32_t numberKeyPresses = 0;
+    volatile bool pressed = false;
+};
+
+Button* button1;
+Button* button2;
+
+
+void setup() {
+  Serial.begin(115200);
+  Serial.println("FunctionalInterrupt test/example");
+
+  button1 = new Button(BUTTON1);
+  button2 = new Button(BUTTON2);
+
+  Serial.println("setup() complete");
+}
+
+void loop() {
+  button1->checkPressed();
+  if (nullptr != button2 && 10 < button2->checkPressed()) {
+    delete button2;
+    button2 = nullptr;
+  }
+}