reduced flash required

removed string requirement
used paged arrays for events
increased to VER-2.0.0

Author: IPdotSetAF

include/EZButton.h

@@ -3,6 +3,7 @@
 
 #include <Arduino.h>
 
+#define EVENT_COUNT 4
 enum EventTypes
 {
     PRESSED,
@@ -14,34 +15,32 @@ enum EventTypes
 class EZButton
 {
 public:
-    unsigned long HoldTreshHold;
-    unsigned long HoldInterval;
+    unsigned int HoldTreshHold;
+    unsigned int HoldInterval;
 
-    EZButton(const String buttonNames[],
-             void (*readButtons)(String *, bool *, int),
-             unsigned long holdTreshold = 500,
-             unsigned long holdInterval = 500);
+    EZButton(int buttonCount,
+             void (*readButtons)(bool *, int),
+             unsigned int holdTreshold = 500,
+             unsigned int holdInterval = 500);
 
     ~EZButton();
 
     void Reset();
     void CheckButtons();
-    void Subscribe(String buttonName, void (*event)(), EventTypes type);
+    void Subscribe(int index, void (*event)(), EventTypes type);
 
 private:
     int _numButtons;
-    String *_buttons;
 
     unsigned long *_buttonDownMillis;
     unsigned int *_lastHoldInterval;
     bool *_buttonLastState;
 
     typedef void (*Event)(); // Type alias for function pointer
-    Event *_onPressedEvents;
-    Event *_onReleaseEvents;
-    Event *_onHoldReleaseEvents;
-    Event *_onHoldEvents;
-    void (*_readButtons)(String *, bool *, int);
+    Event *_events;
+    void (*_readButtons)(bool *, int);
+
+    void CallEvent(int index, EventTypes type);
 };
 
 #endif // EZButton_H

library.json

@@ -1,6 +1,6 @@
 {
     "name": "EZButton",
-    "version": "1.0.1",
+    "version": "2.0.0",
     "description": "A Library for managing different button events. Events include: OnPressed, OnReleased, OnHold, OnHoldReleased.",
     "keywords": "button, key, event, hold, press, release",
     "repository":

src/EZButton.cpp

@@ -1,46 +1,31 @@
 #include "EZButton.h"
 
-EZButton::EZButton(const String buttonNames[],
-                   void (*readButtons)(String *, bool *, int),
-                   unsigned long holdTreshold,
-                   unsigned long holdInterval)
+EZButton::EZButton(int buttonCount,
+                   void (*readButtons)(bool *, int),
+                   unsigned int holdTreshold,
+                   unsigned int holdInterval)
 {
-    _numButtons = buttonNames->length() - 1;
+    _numButtons = buttonCount;
     HoldTreshHold = holdTreshold;
     HoldInterval = holdInterval;
     _readButtons = readButtons;
-    _buttons = new String[_numButtons];
-    _onPressedEvents = new Event[_numButtons];
-    _onReleaseEvents = new Event[_numButtons];
-    _onHoldReleaseEvents = new Event[_numButtons];
-    _onHoldEvents = new Event[_numButtons];
+    _events = new Event[_numButtons * EVENT_COUNT];
     _buttonDownMillis = new unsigned long[_numButtons];
     _buttonLastState = new bool[_numButtons];
     _lastHoldInterval = new unsigned int[_numButtons];
 
-    for (int i = 0; i < _numButtons; i++)
-    {
-        _buttons[i] = buttonNames[i];
-        _onPressedEvents[i] = nullptr;
-        _onReleaseEvents[i] = nullptr;
-        _onHoldReleaseEvents[i] = nullptr;
-        _onHoldEvents[i] = nullptr;
-        _buttonDownMillis[i] = 0;
-        _buttonLastState[i] = false;
-        _lastHoldInterval[i] = 0;
-    }
+    for (int i = 0; i < _numButtons * EVENT_COUNT; i++)
+        _events[i] = nullptr;
+
+    Reset();
 }
 
 EZButton::~EZButton()
 {
-    delete[] _buttons;
     delete[] _buttonDownMillis;
     delete[] _buttonLastState;
     delete[] _lastHoldInterval;
-    delete[] _onPressedEvents;
-    delete[] _onReleaseEvents;
-    delete[] _onHoldEvents;
-    delete[] _onHoldReleaseEvents;
+    delete[] _events;
 }
 
 void EZButton::Reset()
@@ -56,7 +41,7 @@ void EZButton::Reset()
 void EZButton::CheckButtons()
 {
     bool *buttonStates = new bool[_numButtons];
-    _readButtons(_buttons, buttonStates, _numButtons);
+    _readButtons(buttonStates, _numButtons);
 
     for (int i = 0; i < _numButtons; i++)
     {
@@ -66,17 +51,15 @@ void EZButton::CheckButtons()
             {
                 _buttonDownMillis[i] = millis();
                 _buttonLastState[i] = 1;
-                if (_onPressedEvents[i] != nullptr)
-                    _onPressedEvents[i]();
+                CallEvent(i, EventTypes::PRESSED);
             }
             else if (millis() - _buttonDownMillis[i] > HoldTreshHold)
             {
                 unsigned long interval = (millis() - _buttonDownMillis[i]) / HoldInterval;
                 if (interval > _lastHoldInterval[i])
                 {
                     _lastHoldInterval[i] = interval;
-                    if (_onHoldEvents[i] != nullptr)
-                        _onHoldEvents[i]();
+                    CallEvent(i, EventTypes::HOLD);
                 }
             }
         }
@@ -87,42 +70,24 @@ void EZButton::CheckButtons()
                 _buttonLastState[i] = 0;
                 _lastHoldInterval[i] = 0;
                 if (millis() - _buttonDownMillis[i] > HoldTreshHold)
-                {
-                    if (_onHoldReleaseEvents[i] != nullptr)
-                        _onHoldReleaseEvents[i]();
-                }
+                    CallEvent(i, EventTypes::HOLD_RELEASE);
                 else
-                {
-                    if (_onReleaseEvents[i] != nullptr)
-                        _onReleaseEvents[i]();
-                }
+                    CallEvent(i, EventTypes::RELEASE);
             }
         }
     }
 
     delete[] buttonStates;
 }
 
-void EZButton::Subscribe(String buttonName, void (*event)(), EventTypes type)
+void EZButton::Subscribe(int index, void (*event)(), EventTypes type)
 {
-    int i = 0;
-    for (; i < _numButtons; i++)
-        if (_buttons[i].equals(buttonName))
-            break;
+    _events[index + type * EVENT_COUNT] = event;
+}
 
-    switch (type)
-    {
-    case EventTypes::PRESSED:
-        _onPressedEvents[i] = event;
-        break;
-    case EventTypes::HOLD_RELEASE:
-        _onHoldReleaseEvents[i] = event;
-        break;
-    case EventTypes::RELEASE:
-        _onReleaseEvents[i] = event;
-        break;
-    case EventTypes::HOLD:
-        _onHoldEvents[i] = event;
-        break;
-    }
+void EZButton::CallEvent(int index, EventTypes type)
+{
+    int i = index + type * EVENT_COUNT;
+    if (_events[i] != nullptr)
+        _events[i]();
 }