events.Ebutton: Simplify code. Improve test script.

Author: peterhinch

v3/primitives/events.py

@@ -123,13 +123,12 @@ async def _poll(self, dt):  # Poll the button
     def _pf(self):  # Button press
         if not self._supp:
             self.press.set()  # User event
-        if not (self._ltim() or self._dtim()):  # Don't retrigger long timer if already running
-            self._ltim.trigger()
         if self._dtim():  # Press occurred while _dtim is running
             self.double.set()  # User event
             self._dtim.stop()  # _dtim's Event is only used if suppress
-        else:
+        else:  # Single press or 1st of a double pair.
             self._dtim.trigger()
+            self._ltim.trigger()  # Trigger long timer on 1st press of a double pair
 
     def _rf(self):  # Button release
         self._ltim.stop()
@@ -142,11 +141,12 @@ async def _ltf(self):  # Long timeout
             self._ltim.clear()  # Clear the event
             self.long.set()  # User event
 
-    async def _dtf(self):  # Double timeout (runs if suppress is set)
+    # Runs if suppress set. Delay response to single press until sure it is a single short pulse.
+    async def _dtf(self):
         while True:
-            await self._dtim.wait()
+            await self._dtim.wait()  # Double click has timed out
             self._dtim.clear()  # Clear the event
-            if not self._ltim():  # Button was released
+            if not self._ltim():  # Button was released: not a long press.
                 self.press.set()  # User events
                 self.release.set()
 

v3/primitives/tests/event_test.py

@@ -116,14 +116,15 @@ async def btest(btn, verbose, supp):
     val = 0
     events = btn.press, btn.release, btn.double, btn.long
     tasks = []
-    for n, evt in enumerate(events):
+    for n, evt in enumerate(events):  # Each event has a 3-bit event counter
         tasks.append(asyncio.create_task(monitor(evt, 1 << 3 * n, verbose)))
     await asyncio.sleep(1)
     print("Start short press test")
     await pulse()
     await asyncio.sleep(1)
     verbose and print("Test of short press", hex(val))
     expect(val, 0x09)
+
     val = 0
     await asyncio.sleep(1)
     print("Start long press test")
@@ -132,6 +133,7 @@ async def btest(btn, verbose, supp):
     verbose and print("Long press", hex(val))
     exp = 0x208 if supp else 0x209
     expect(val, exp)
+
     val = 0
     await asyncio.sleep(1)
     print("Start double press test")
@@ -142,6 +144,7 @@ async def btest(btn, verbose, supp):
     verbose and print("Double press", hex(val))
     exp = 0x48 if supp else 0x52
     expect(val, exp)
+
     val = 0
     await asyncio.sleep(1)
     print("Start double press, 2nd press long, test")
@@ -163,9 +166,11 @@ async def stest(sw, verbose):
     for n, evt in enumerate(events):
         tasks.append(asyncio.create_task(monitor(evt, 1 << 3 * n, verbose)))
     asyncio.create_task(pulse(2000))
+    print("Switch closure")
     await asyncio.sleep(1)
     expect(val, 0x08)
     await asyncio.sleep(4)  # Wait for any spurious events
+    print("Switch open")
     verbose and print("Switch close and open", hex(val))
     expect(val, 0x09)
     for task in tasks:
@@ -177,12 +182,15 @@ async def switch_test(pol, verbose):
     pin = Pin('Y1', Pin.IN)
     pout = Pin('Y2', Pin.OUT, value=pol)
     print("Testing EButton.")
-    print("suppress == False")
+    print("Testing with suppress == False")
     btn = EButton(pin)
     await btest(btn, verbose, False)
-    print("suppress == True")
+    print()
+    print("Testing with suppress == True")
+    btn.deinit()
     btn = EButton(pin, suppress=True)
     await btest(btn, verbose, True)
+    print()
     print("Testing ESwitch")
     sw = ESwitch(pin, pol)
     await stest(sw, verbose)