Fix bug where no long press func provided.

peterhinch · peterhinch · commit a685b5adb5f4 · 2018-11-29T13:39:00.000Z
diff --git a/astests.py b/astests.py
@@ -73,8 +73,10 @@ def test_btn(suppress=False, lf=True, df=True):
     pb.press_func(pulse, (red, 1000))
     pb.release_func(pulse, (green, 1000))
     if df:
+        print('Doubleclick enabled')
         pb.double_func(pulse, (yellow, 1000))
     if lf:
+        print('Long press enabled')
         pb.long_func(pulse, (blue, 1000))
     loop = asyncio.get_event_loop()
     loop.run_until_complete(killer())
diff --git a/aswitch.py b/aswitch.py
@@ -132,7 +132,7 @@ def __init__(self, pin, suppress=False):
         self._ld = False  # Delay_ms instance for long press
         self._dd = False  # Ditto for doubleclick
         self.sense = pin.value()  # Convert from electrical to logical value
-        self.buttonstate = self.rawstate()  # Initial state
+        self.state = self.rawstate()  # Initial state
         loop = asyncio.get_event_loop()
         loop.create_task(self.buttoncheck())  # Thread runs forever
 
@@ -158,36 +158,31 @@ def rawstate(self):
 
     # Current debounced state of button (True == pressed)
     def __call__(self):
-        return self.buttonstate
+        return self.state
 
     def _ddto(self):  # Doubleclick timeout: no doubleclick occurred
         self._dblpend = False
-        if self._supp:
+        if self._supp and not self.state:
             if not self._ld or (self._ld and not self._ld()):
                 launch(self._ff, self._fa)
 
-    def _ldip(self):  # True if a long delay exists and is running
-        d = self._ld
-        return d and d()
-
     async def buttoncheck(self):
-        loop = asyncio.get_event_loop()
-        if self._lf:
+        if self._lf:  # Instantiate timers if funcs exist
             self._ld = Delay_ms(self._lf, self._la)
         if self._df:
             self._dd = Delay_ms(self._ddto)
         while True:
             state = self.rawstate()
             # State has changed: act on it now.
-            if state != self.buttonstate:
-                self.buttonstate = state
-                if state:
-                    # Button is pressed
-                    if self._lf:
-                        # Start long press delay
+            if state != self.state:
+                self.state = state
+                if state:  # Button pressed: launch pressed func
+                    if self._tf:
+                        launch(self._tf, self._ta)
+                    if self._lf:  # There's a long func: start long press delay
                         self._ld.trigger(Pushbutton.long_press_ms)
                     if self._df:
-                        if self._dd():
+                        if self._dd():  # Second click: timer running
                             self._dd.stop()
                             self._dblpend = False
                             self._dblran = True  # Prevent suppressed launch on release
@@ -196,19 +191,18 @@ async def buttoncheck(self):
                             # First click: start doubleclick timer
                             self._dd.trigger(Pushbutton.double_click_ms)
                             self._dblpend = True  # Prevent suppressed launch on release
-                    if self._tf:
-                        launch(self._tf, self._ta)
-                else:
-                    # Button release
+                else:  # Button release. Is there a release func?
                     if self._ff:
                         if self._supp:
-                            if self._ldip() and not self._dblpend and not self._dblran:
-                                launch(self._ff, self._fa)
+                            d = self._ld 
+                            # If long delay exists, is running and doubleclick status is OK
+                            if not self._dblpend and not self._dblran:
+                                if (d and d()) or not d:
+                                    launch(self._ff, self._fa)
                         else:
                             launch(self._ff, self._fa)
-                    if self._ldip():
-                        # Avoid interpreting a second click as a long push
-                        self._ld.stop()
+                    if self._ld:
+                        self._ld.stop()  # Avoid interpreting a second click as a long push
                     self._dblran = False
             # Ignore state changes until switch has settled
             await asyncio.sleep_ms(Pushbutton.debounce_ms)
