#203 two button support

Author: davetcc

src/extras/TwoButtonSwitchEncoder.cpp

@@ -0,0 +1,31 @@
+
+#include "TwoButtonSwitchEncoder.h"
+
+TwoButtonSwitchEncoder::TwoButtonSwitchEncoder(pinid_t up, pinid_t down, EncoderCallbackFn callbackFn)
+            : RotaryEncoder(callbackFn), upPin(up), downPin(down) {
+    switches.addSwitchListener(up, this, NO_REPEAT);
+    switches.addSwitchListener(down, this, NO_REPEAT);
+}
+
+void TwoButtonSwitchEncoder::onReleased(pinid_t pin, bool held) {
+    auto invert = intent == SCROLL_THROUGH_ITEMS;
+    if(pin == upPin) {
+        if(held) {
+            menuMgr.performDirectionMove(true);
+        } else {
+            int8_t dir = invert ? -stepSize : stepSize;
+            increment(dir);
+        }
+    } else if(pin == downPin) {
+        if(held) {
+            menuMgr.onMenuSelect(false);
+        } else {
+            int8_t dir = invert ? stepSize : -stepSize;
+            increment(dir);
+        }
+    }
+}
+
+void TwoButtonSwitchEncoder::onPressed(pinid_t pin, bool held) {
+    // ignored for two button case
+}

src/extras/TwoButtonSwitchEncoder.h

@@ -31,34 +31,12 @@ class TwoButtonSwitchEncoder : public RotaryEncoder, public SwitchListener {
      * @param down the down button (doubles as OK when held)
      * @param callbackFn the encoder change callback.
      */
-    TwoButtonSwitchEncoder(pinid_t up, pinid_t down, EncoderCallbackFn callbackFn)
-                : RotaryEncoder(callbackFn), upPin(up), downPin(down) {
-        //switches.addSwitchListener(up, this, NO_REPEAT);
-        //switches.addSwitchListener(down, this, NO_REPEAT);
-    }
+    TwoButtonSwitchEncoder(pinid_t up, pinid_t down, EncoderCallbackFn callbackFn);
 
-    void onPressed(pinid_t pin, bool held) override {
-        // ignored as we need to only handle once the button is released.
-    }
+    void onPressed(pinid_t pin, bool held) override;
+
+    void onReleased(pinid_t pin, bool held) override;
 
-    void onReleased(pinid_t pin, bool held) override {
-        auto invert = intent == SCROLL_THROUGH_ITEMS;
-        if(pin == upPin) {
-            if(held) {
-                menuMgr.performDirectionMove(true);
-            } else {
-                int8_t dir = invert ? -stepSize : stepSize;
-                increment(dir);
-            }
-        } else if(pin == downPin) {
-            if(held) {
-                menuMgr.onMenuSelect(false);
-            } else {
-                int8_t dir = invert ? stepSize : -stepSize;
-                increment(dir);
-            }
-        }
-    }
 };
 
 #endif //TCMENU_TWOBUTTONSWITCHCONTROL_H

src/tcMenu.cpp

@@ -64,6 +64,7 @@ void MenuManager::initForTwoButton(MenuRenderer *r, MenuItem *root, pinid_t upPi
     this->renderer = r;
     navigator.setRootItem(root);
     switches.setEncoder(new TwoButtonSwitchEncoder(upPin, downPin, [](int v) { menuMgr.valueChanged(v); }));
+    renderer->initialise();
 }
 
 void MenuManager::initForUpDownOk(MenuRenderer* renderer, MenuItem* root, pinid_t pinDown, pinid_t pinUp, pinid_t pinOk, int speed) {