events.EButton: fix iss 101. Queues: allow int list size arg.

Author: peterhinch

v3/docs/EVENTS.md

@@ -493,8 +493,10 @@ Attributes of `RingbufQueue`:
  4. It has an "overwrite oldest data" synchronous write mode.
 
 Constructor mandatory arg:
- * `buf` Buffer for the queue, e.g. list `[0 for _ in range(20)]` or array. A
- buffer of size `N` can hold a maximum of `N-1` items.
+ * `buf` Buffer for the queue, e.g. list, bytearray or array. If an integer is
+ passed, a list of this size is created. A  buffer of size `N` can hold a
+ maximum of `N-1` items. Note that, where items on the queue are suitably
+ limited, bytearrays or arrays are more efficient than lists.
 
 Synchronous methods (immediate return):  
  * `qsize` No arg. Returns the number of items in the queue.

v3/docs/THREADING.md

@@ -317,8 +317,10 @@ Attributes of `ThreadSafeQueue`:
  raises an `IndexError`.
 
 Constructor mandatory arg:
- * `buf` Buffer for the queue, e.g. list `[0 for _ in range(20)]` or array. A
- buffer of size `N` can hold a maximum of `N-1` items.
+ * `buf` Buffer for the queue, e.g. list, bytearray or array. If an integer is
+ passed, a list of this size is created. A  buffer of size `N` can hold a
+ maximum of `N-1` items. Note that, where items on the queue are suitably
+ limited, bytearrays or arrays are more efficient than lists.
 
 Synchronous methods.  
  * `qsize` No arg. Returns the number of items in the queue.

v3/primitives/events.py

@@ -123,7 +123,7 @@ 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():  # Don't retrigger long timer if already running
+        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

v3/primitives/ringbuf_queue.py

@@ -1,6 +1,6 @@
 # ringbuf_queue.py Provides RingbufQueue class
 
-# Copyright (c) 2022 Peter Hinch
+# Copyright (c) 2022-2023 Peter Hinch
 # Released under the MIT License (MIT) - see LICENSE file
 
 # API differs from CPython
@@ -13,7 +13,7 @@
 
 class RingbufQueue:  # MicroPython optimised
     def __init__(self, buf):
-        self._q = buf
+        self._q = [0 for _ in range(buf)] if isinstance(buf, int) else buf
         self._size = len(buf)
         self._wi = 0
         self._ri = 0

v3/primitives/tests/event_test.py

@@ -108,7 +108,7 @@ def expect(v, e):
     if v == e:
         print("Pass")
     else:
-        print(f"Fail: expected {e} got {v}")
+        print(f"Fail: expected 0x{e:04x} got 0x{v:04x}")
         fail = True
 
 async def btest(btn, verbose, supp):
@@ -142,6 +142,16 @@ 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")
+    await pulse()
+    await asyncio.sleep_ms(100)
+    await pulse(2000)
+    await asyncio.sleep(4)
+    verbose and print("Double press", hex(val))
+    exp = 0x48 if supp else 0x52
+    expect(val, exp)
     for task in tasks:
         task.cancel()
 

v3/threadsafe/threadsafe_queue.py

@@ -11,7 +11,7 @@
 
 class ThreadSafeQueue:  # MicroPython optimised
     def __init__(self, buf):
-        self._q = buf
+        self._q = [0 for _ in range(buf)] if isinstance(buf, int) else buf
         self._size = len(buf)
         self._wi = 0
         self._ri = 0