fix for TFT_eSPI_Button compatibility mode #139

fix for TFT_eSPI_Button compatibility mode
m5stack · Jul 3, 2024 · 8493f21 · 8493f21
1 parent 588e69b
commit 8493f21
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/src/M5Core2.h b/src/M5Core2.h
@@ -26,7 +26,7 @@ class M5Core2 {
 
     void begin(bool LCDEnable = true, bool SDEnable = true,
                bool SerialEnable = true, bool I2CEnable = false,
-               mbus_mode_t mode = kMBusModeOutput, bool SpeakerEnable = true);
+               mbus_mode_t mode = kMBusModeOutput, bool SpeakerEnable = false);
     void update();
 
     void shutdown();

diff --git a/src/utility/M5Button.cpp b/src/utility/M5Button.cpp
@@ -749,21 +749,27 @@ void TFT_eSPI_Button::drawButton(bool inverted /* = false */,
     if (long_name != "") strncpy(_label, oldLabel, 50);
 }
 
-bool TFT_eSPI_Button::contains(int16_t x, int16_t y) {
-    return Button::contains(x, y);
+bool TFT_eSPI_Button::isPressed() {
+    return currstate;
+}
+
+bool TFT_eSPI_Button::contains(int16_t _x, int16_t _y) {
+    return ((_x >= x) && (_x < (x + w)) && (_y >= y) && (_y < (y + h)));
 }
 
 void TFT_eSPI_Button::press(bool p) {
     if (p)
         fingerDown();
     else
         fingerUp();
+    laststate = currstate;
+    currstate = p;
 }
 
 bool TFT_eSPI_Button::justPressed() {
-    return wasPressed();
+    return (currstate && !laststate);
 }
 
 bool TFT_eSPI_Button::justReleased() {
-    return wasReleased();
-}
+    return (!currstate && laststate);
+}
diff --git a/src/utility/M5Button.h b/src/utility/M5Button.h
@@ -981,6 +981,9 @@ class TFT_eSPI_Button : public Button {
     bool isPressed();
     bool justPressed();
     bool justReleased();
+
+   private:
+    bool currstate, laststate;
 };
 
 #endif /* _M5BUTTON_H_ */