Restore original class and make debouncer version a subclass

Author: dastels

adafruit_cursorcontrol/cursorcontrol_cursormanager.py

@@ -51,9 +51,8 @@ class CursorManager:
     """
     def __init__(self, cursor):
         self._cursor = cursor
-        self._pressed = 0
+        self._is_clicked = False
         self._init_hardware()
-        self._debouncer = Debouncer(lambda: bool(self._pressed & self._pad_btns['btn_a']))
 
     def __enter__(self):
         return self
@@ -98,28 +97,16 @@ def is_clicked(self):
         """Returns True if the cursor button was pressed
         during previous call to update()
         """
-        return self._debouncer.rose
-    pressed = is_clicked
-
-    @property
-    def released(self):
-        """Returns True if the cursor button was released
-        during previous call to update()
-        """
-        return self._debouncer.fell
-
-    @property
-    def held(self):
-        """Returns True if the cursor button is currently being held
-        """
-        return self._debouncer.value
-
+        return self._is_clicked
 
     def update(self):
         """Updates the cursor object."""
-        self._pressed = self._pad.get_pressed()
-        self._check_cursor_movement(self._pressed)
-        self._debouncer.update()
+        pressed = self._pad.get_pressed()
+        self._check_cursor_movement(pressed)
+        if self._is_clicked:
+            self._is_clicked = False
+        elif pressed & self._pad_btns['btn_a']:
+            self._is_clicked = True
 
     def _read_joystick_x(self, samples=3):
         """Read the X analog joystick on the PyGamer.
@@ -174,3 +161,42 @@ def _check_cursor_movement(self, pressed=None):
                 self._cursor.y -= self._cursor.speed
         else:
             raise AttributeError('Board must have a D-Pad or Joystick for use with CursorManager!')
+
+
+class DebouncedCursorManager(CursorManager):
+    """Simple interaction user interface interaction for Adafruit_CursorControl.
+
+    :param adafruit_cursorcontrol cursor: The cursor object we are using.
+    """
+    def __init__(self, cursor, debounce_interval=0.01):
+        super().__init__(self, cursor)
+        self._pressed = 0
+        self._debouncer = Debouncer(lambda: bool(self._pressed & self._pad_btns['btn_a']), interval=debounce_interval)
+
+    @property
+    def is_clicked(self):
+        """Returns True if the cursor button was pressed
+        during previous call to update()
+        """
+        return self._debouncer.rose
+    pressed = is_clicked
+
+    @property
+    def released(self):
+        """Returns True if the cursor button was released
+        during previous call to update()
+        """
+        return self._debouncer.fell
+
+    @property
+    def held(self):
+        """Returns True if the cursor button is currently being held
+        """
+        return self._debouncer.value
+
+
+    def update(self):
+        """Updates the cursor object."""
+        self._pressed = self._pad.get_pressed()
+        self._check_cursor_movement(self._pressed)
+        self._debouncer.update()