Disable click handling if we fast tap mode btn and turn encoder

lo1ol · Jul 11, 2024 · 416b9c0 · 416b9c0
1 parent 232d01b
commit 416b9c0
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 10 deletions.
diff --git a/src/SettingsSetter.cpp b/src/SettingsSetter.cpp
@@ -131,7 +131,8 @@ void SettingsSetter::process() {
         if (gModeSwitchBtn.click())
             shift = 1;
         else if (gModeSwitchBtn.pressing()) {
-            shift = getEncoderDir();
+            if ((shift = getEncoderDir()))
+                gModeSwitchBtn.ignoreTillPressing();
         }
 
         if (shift) {

diff --git a/src/SmartButton.h b/src/SmartButton.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include "SafeEncButton.h"
+
+// Needed to resolve this
+// https://github.com/GyverLibs/EncButton/issues/58
+template<uint8_t Pin>
+class SmartButton : public ButtonT<Pin> {
+public:
+    void tick() {
+        ButtonT<Pin>::tick();
+        if (m_ignoreTillPressing && ButtonT<Pin>::press()) {
+            m_ignoreTillPressing = false;
+            m_timeout = millis();
+            ButtonT<Pin>::clear();
+        }
+
+        // we need some some before wrapped button return click() == true, after press() == false
+        if (!m_ignoreTillPressing && m_ignore && static_cast<uint16_t>(millis()) - m_timeout > EB_DEB_TIME) {
+            m_ignore = false;
+            ButtonT<Pin>::clear();
+        }
+    }
+
+    void ignoreTillPressing() {
+        m_ignoreTillPressing = true;
+        m_ignore = true;
+    }
+
+    bool click() { return !m_ignore && ButtonT<Pin>::click(); }
+    bool hold() { return !m_ignore && ButtonT<Pin>::hold(); }
+
+private:
+    bool m_ignoreTillPressing = false;
+    bool m_ignore = false;
+    uint16_t m_timeout;
+};
diff --git a/src/Tools.cpp b/src/Tools.cpp
@@ -1,10 +1,10 @@
 #include "Tools.h"
 
 EncButton gEncoder(ENCODER_DT, ENCODER_CLK);
-ButtonT<MODE_SWITCH_BTN> gModeSwitchBtn;
-ButtonT<START_BTN> gStartBtn;
-ButtonT<EXTRA_BTN> gExtraBtn;
-ButtonT<VIEW_BTN> gViewBtn;
+SmartButton<MODE_SWITCH_BTN> gModeSwitchBtn;
+SmartButton<START_BTN> gStartBtn;
+SmartButton<EXTRA_BTN> gExtraBtn;
+SmartButton<VIEW_BTN> gViewBtn;
 Timer gTimer;
 Settings gSettings;
 Display gDisplay(LiquidCrystal(LCD_RS, LCD_EN, LCD_D4, LCD_D5, LCD_D6, LCD_D7));

diff --git a/src/Tools.h b/src/Tools.h
@@ -3,11 +3,12 @@
 #include "SafeEncButton.h"
 
 #include "Beeper.h"
+#include "Config.h"
 #include "Display.h"
 #include "Settings.h"
+#include "SmartButton.h"
 #include "Time.h"
 #include "Timer.h"
-#include "Config.h"
 
 #define ADD_TO_ENUM(enumName, current, num) \
     (enumName)(((uint8_t)(current) + (uint8_t)enumName::last_ + num) % (uint8_t)enumName::last_)
@@ -19,10 +20,10 @@ bool getTime(Time& time, bool smooth = false);
 void setupEncoder();
 
 extern EncButton gEncoder;
-extern ButtonT<MODE_SWITCH_BTN> gModeSwitchBtn;
-extern ButtonT<START_BTN> gStartBtn;
-extern ButtonT<EXTRA_BTN> gExtraBtn;
-extern ButtonT<VIEW_BTN> gViewBtn;
+extern SmartButton<MODE_SWITCH_BTN> gModeSwitchBtn;
+extern SmartButton<START_BTN> gStartBtn;
+extern SmartButton<EXTRA_BTN> gExtraBtn;
+extern SmartButton<VIEW_BTN> gViewBtn;
 extern Timer gTimer;
 extern Settings gSettings;
 extern Display gDisplay;

diff --git a/src/main.cpp b/src/main.cpp
@@ -65,6 +65,8 @@ void processModeSwitch() {
 
     int8_t dir = getEncoderDir();
     if (dir) {
+        gModeSwitchBtn.ignoreTillPressing();
+
         gBlocked = gBlockedByPreview = true;
 
         setMode(ADD_TO_ENUM(ModeId, gModeId, dir));