Merge branch 'master' of https://github.com/peterhinch/micropython-async

peterhinch · peterhinch · commit f1962d40c5a5 · 2021-03-31T11:36:59.000+01:00
Update to pushbutton.py
diff --git a/v3/primitives/pushbutton.py b/v3/primitives/pushbutton.py
@@ -38,13 +38,19 @@ def release_func(self, func, args=()):
         self._ff = func
         self._fa = args
 
-    def double_func(self, func, args=()):
+    def double_func(self, func=False, args=()):
         self._df = func
         self._da = args
+        if self._dd:
+            self._dd.stop()
+        self._dd = Delay_ms(self._ddto) if func else False
 
-    def long_func(self, func, args=()):
+    def long_func(self, func=False, args=()):
         self._lf = func
         self._la = args
+        if self._ld:
+            self._ld.stop()
+        self._ld = Delay_ms(self._lf, self._la) if func else False
 
     # Current non-debounced logical button state: True == pressed
     def rawstate(self):
@@ -61,10 +67,6 @@ def _ddto(self):  # Doubleclick timeout: no doubleclick occurred
                 launch(self._ff, self._fa)
 
     async def buttoncheck(self):
-        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.
