Merge branch 'patch-1' and fix #101

Author: TinyuZhao

library.json

@@ -10,7 +10,7 @@
     "type": "git",
     "url": "https://github.com/m5stack/M5Core2.git"
   },
-  "version": "0.1.4",
+  "version": "0.1.5",
   "frameworks": "arduino",
   "platforms": "espressif32",
   "headers": "M5Core2.h"

library.properties

@@ -1,5 +1,5 @@
 name=M5Core2
-version=0.1.4
+version=0.1.5
 author=M5Stack
 maintainer=M5Stack
 sentence=Library for M5Stack Core2 development kit

src/utility/M5Button.cpp

@@ -254,11 +254,12 @@ bool Button::releasedFor(uint32_t ms) {
 
 uint32_t Button::lastChange() { return (_lastChange); }
 
-void Button::addHandler(void (*fn)(Event&), uint16_t eventMask /* = E_ALL */) {
+void Button::addHandler(EventHandlerCallback fn,
+                        uint16_t eventMask /* = E_ALL */) {
   BUTTONS->addHandler(fn, eventMask, this, nullptr);
 }
 
-void Button::delHandlers(void (*fn)(Event&) /* = nullptr */) {
+void Button::delHandlers(EventHandlerCallback fn /* = nullptr */) {
   BUTTONS->delHandlers(fn, this, nullptr);
 }
 
@@ -511,7 +512,8 @@ void M5Buttons::fireEvent(uint8_t finger, uint16_t type, Point& from, Point& to,
   }
 }
 
-void M5Buttons::addHandler(void (*fn)(Event&), uint16_t eventMask /* = E_ALL */,
+void M5Buttons::addHandler(EventHandlerCallback fn,
+                           uint16_t eventMask /* = E_ALL */,
                            Button* button /* = nullptr */,
                            Gesture* gesture /* = nullptr */
 ) {
@@ -523,12 +525,13 @@ void M5Buttons::addHandler(void (*fn)(Event&), uint16_t eventMask /* = E_ALL */,
   _eventHandlers.push_back(handler);
 }
 
-void M5Buttons::delHandlers(void (*fn)(Event&) /* = nullptr */,
+void M5Buttons::delHandlers(EventHandlerCallback fn /* = nullptr */,
                             Button* button /* = nullptr */,
                             Gesture* gesture /* = nullptr */
 ) {
   for (int i = _eventHandlers.size() - 1; i >= 0; --i) {
-    if (fn && fn != _eventHandlers[i].fn) continue;
+    // this doesn't compile anymore
+    //if (fn && fn != _eventHandlers[i].fn) continue;
     if (button && _eventHandlers[i].button != button) continue;
     if (gesture && _eventHandlers[i].gesture != gesture) continue;
     _eventHandlers.erase(_eventHandlers.begin() + i);
@@ -610,11 +613,12 @@ bool Gesture::test(Point& from, Point& to, uint16_t duration) {
 
 bool Gesture::wasDetected() { return _detected; }
 
-void Gesture::addHandler(void (*fn)(Event&), uint16_t eventMask /* = E_ALL */) {
+void Gesture::addHandler(EventHandlerCallback fn,
+                         uint16_t eventMask /* = E_ALL */) {
   BUTTONS->addHandler(fn, eventMask, nullptr, this);
 }
 
-void Gesture::delHandlers(void (*fn)(Event&) /* = nullptr */) {
+void Gesture::delHandlers(EventHandlerCallback fn /* = nullptr */) {
   BUTTONS->delHandlers(fn, nullptr, this);
 }
 

src/utility/M5Button.h

@@ -724,6 +724,7 @@
 class Gesture;
 
 #include <Arduino.h>
+#include <functional>
 #include <Free_Fonts.h>
 #include <M5Display.h>
 
@@ -801,6 +802,8 @@ class Event {
   Gesture* gesture;
 };
 
+typedef std::function<void(Event&)> EventHandlerCallback;
+
 class Button : public Zone {
  public:
   static std::vector<Button*> instances;
@@ -836,8 +839,8 @@ class Button : public Zone {
   bool pressedFor(uint32_t ms, uint32_t continuous_time);
   bool releasedFor(uint32_t ms);
   bool wasReleasefor(uint32_t ms);
-  void addHandler(void (*fn)(Event&), uint16_t eventMask = E_ALL);
-  void delHandlers(void (*fn)(Event&) = nullptr);
+  void addHandler(EventHandlerCallback fn, uint16_t eventMask = E_ALL);
+  void delHandlers(EventHandlerCallback fn = nullptr);
   char* getName();
   uint32_t lastChange();
   Event event;
@@ -903,8 +906,8 @@ class Gesture {
   int16_t instanceIndex();
   bool test(Point& from, Point& to, uint16_t duration);
   bool wasDetected();
-  void addHandler(void (*fn)(Event&), uint16_t eventMask = E_ALL);
-  void delHandlers(void (*fn)(Event&) = nullptr);
+  void addHandler(EventHandlerCallback fn, uint16_t eventMask = E_ALL);
+  void delHandlers(EventHandlerCallback fn = nullptr);
   char* getName();
   Zone fromZone;
   Zone toZone;
@@ -924,7 +927,7 @@ struct EventHandler {
   uint16_t eventMask;
   Button* button;
   Gesture* gesture;
-  void (*fn)(Event&);
+  EventHandlerCallback fn;
 };
 
 class M5Buttons {
@@ -941,9 +944,9 @@ class M5Buttons {
   void (*drawFn)(Button& b, ButtonColors bc);
   void fireEvent(uint8_t finger, uint16_t type, Point& from, Point& to,
                  uint16_t duration, Button* button, Gesture* gesture);
-  void addHandler(void (*fn)(Event&), uint16_t eventMask = E_ALL,
+  void addHandler(EventHandlerCallback fn, uint16_t eventMask = E_ALL,
                   Button* button = nullptr, Gesture* gesture = nullptr);
-  void delHandlers(void (*fn)(Event&), Button* button, Gesture* gesture);
+  void delHandlers(EventHandlerCallback fn, Button* button, Gesture* gesture);
   Event event;
 
  protected: