Discard long-hold swipes

Author: tadeubas

CHANGELOG.md

@@ -15,7 +15,7 @@ Added new context arrows, customizable colors, and a page index indicator for me
 ### Other Bug Fixes and Improvements
 - Settings: Reduced default _Buttons Debounce_ value (with an even lower default on _M5StickV_)
 - Settings: Expanded value ranges for _Touch Threshold_ and _Buttons Debounce_
-- Swipe handling: Diagonal swipes are now discarded, and the swipe detection threshold has been slightly reduced
+- Swipe handling: Diagonal and long-hold swipes are now discarded, and the swipe detection threshold has been slightly reduced
 - Keypad: Added backtick **`**
 - Bugfix: Screensaver not activating in menu pages without statusbar
 - Embit: Improved BIP39 mnemonic validation

src/krux/touch.py

@@ -30,6 +30,7 @@
 PRESSED = 1
 RELEASED = 2
 
+SWIPE_DURATION_MS = 750
 SWIPE_THRESHOLD = 35
 SWIPE_RIGHT = 1
 SWIPE_LEFT = 2
@@ -48,6 +49,7 @@ def __init__(self, width, height, irq_pin=None, res_pin=None):
         For Krux width = max_y, height = max_x
         """
         self.sample_time = 0
+        self.pressed_time = 0
         self.y_regions = []
         self.x_regions = []
         self.index = 0
@@ -223,26 +225,35 @@ def current_state(self):
         data = self.touch_driver.current_point()
         if isinstance(data, tuple):
             self._store_points(data)
-        elif data is None:  # gets release then return to idle.
+            return self.state
+
+        if data is None:  # gets release then return to idle.
             if self.state == RELEASED:  # On touch release
                 self.state = IDLE
-            elif self.state == PRESSED:
+                return self.state
+
+            if self.state == PRESSED:
                 self.state = RELEASED
+
                 if self.release_point is not None:
                     dx = self.release_point[0] - self.press_point[0][0]
                     dy = self.release_point[1] - self.press_point[0][1]
 
                     if abs(dx) > SWIPE_THRESHOLD or abs(dy) > SWIPE_THRESHOLD:
-                        # discards swipes with angle > 27 degrees
-                        if abs(dx) > abs(dy) * 2:
-                            self.gesture = SWIPE_LEFT if dx < 0 else SWIPE_RIGHT
-                        elif abs(dy) > abs(dx) * 2:
-                            self.gesture = SWIPE_UP if dy < 0 else SWIPE_DOWN
+                        # discard swipes that took more than ~1s
+                        if self.sample_time - self.pressed_time < SWIPE_DURATION_MS:
+                            # discards swipes with angle > 27 degrees
+                            if abs(dx) > abs(dy) * 2:
+                                self.gesture = SWIPE_LEFT if dx < 0 else SWIPE_RIGHT
+                            elif abs(dy) > abs(dx) * 2:
+                                self.gesture = SWIPE_UP if dy < 0 else SWIPE_DOWN
+                            else:
+                                self.gesture = SWIPE_NONE # undetermined diagonal swipe
                         else:
-                            # undetermined diagonal swipe
-                            self.gesture = SWIPE_NONE
-        else:
-            print("Touch error")
+                            self.gesture = SWIPE_NONE # hold finger on screen for too long
+            return self.state
+
+        print("Touch error")
         return self.state
 
     def event(self, validate_position=True):
@@ -257,6 +268,7 @@ def event(self, validate_position=True):
                 if isinstance(self.touch_driver.irq_point, tuple):
                     if self.valid_position(self.touch_driver.irq_point):
                         self._store_points(self.touch_driver.irq_point)
+                        self.pressed_time = time.ticks_ms()
                         return True
         return False
 

tests/test_input.py

@@ -691,6 +691,7 @@ def mock_points(point1, point2):
             "current_point",
             side_effect=[None, point1, point2, None, None],
         )
+        input.touch.pressed_time = time.ticks_ms()
 
     # Swipe Right
     input.touch.clear_regions()

tests/test_touch.py

@@ -308,6 +308,7 @@ def test_gesture_detection(
     touch.state = PRESSED
     touch.press_point = [press_point]
     touch.release_point = release_point
+    touch.pressed_time = time.ticks_ms()
 
     touch.current_state()