Merge remote-tracking branch 'origin/master' into moat

Author: smurfix

.github/workflows/package_tests.yml

@@ -0,0 +1,16 @@
+name: Package tests
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v4
+    - name: Setup environment
+      run: source tools/ci.sh && ci_package_tests_setup_micropython
+    - name: Setup libraries
+      run: source tools/ci.sh && ci_package_tests_setup_lib
+    - name: Run tests
+      run: source tools/ci.sh && ci_package_tests_run

CONTRIBUTING.md

@@ -102,15 +102,20 @@ Pages](https://docs.github.com/en/pages):
    "truthy" value).
 5. The settings for GitHub Actions and GitHub Pages features should not need to
    be changed from the repository defaults, unless you've explicitly disabled
-   them.
+   Actions or Pages in your fork.
 
 The next time you push commits to a branch in your fork, GitHub Actions will run
 an additional step in the "Build All Packages" workflow named "Publish Packages
-for branch".
+for branch". This step runs in *your fork*, but if you open a pull request then
+this workflow is not shown in the Pull Request's "Checks". These run in the
+upstream repository. Navigate to your fork's Actions tab in order to see
+the additional "Publish Packages for branch" step.
 
 Anyone can then install these packages as described under [Installing packages
-from forks](README.md#installing-packages-from-forks). The exact commands are also
-quoted in the GitHub Actions log for the "Publish Packages for branch" step.
+from forks](README.md#installing-packages-from-forks).
+
+The exact command is also quoted in the GitHub Actions log in your fork's
+Actions for the "Publish Packages for branch" step of "Build All Packages".
 
 #### Opting Back Out
 

micropython/aioespnow/README.md

@@ -4,7 +4,7 @@ A supplementary module which extends the micropython `espnow` module to provide
 `asyncio` support.
 
 - Asyncio support is available on all ESP32 targets as well as those ESP8266
-boards which include the `uasyncio` module (ie. ESP8266 devices with at least
+boards which include the `asyncio` module (ie. ESP8266 devices with at least
 2MB flash storage).
 
 ## API reference
@@ -52,7 +52,7 @@ A small async server example::
 ```python
     import network
     import aioespnow
-    import uasyncio as asyncio
+    import asyncio
 
     # A WLAN interface must be active to send()/recv()
     network.WLAN(network.STA_IF).active(True)

micropython/aioespnow/aioespnow.py

@@ -1,12 +1,12 @@
 # aioespnow module for MicroPython on ESP32 and ESP8266
 # MIT license; Copyright (c) 2022 Glenn Moloney @glenn20
 
-import uasyncio as asyncio
+import asyncio
 import espnow
 
 
-# Modelled on the uasyncio.Stream class (extmod/stream/stream.py)
-# NOTE: Relies on internal implementation of uasyncio.core (_io_queue)
+# Modelled on the asyncio.Stream class (extmod/asyncio/stream.py)
+# NOTE: Relies on internal implementation of asyncio.core (_io_queue)
 class AIOESPNow(espnow.ESPNow):
     # Read one ESPNow message
     async def arecv(self):

micropython/aiorepl/aiorepl.py

@@ -41,7 +41,7 @@ async def execute(code, g, s):
                 code = "return {}".format(code)
 
             code = """
-import uasyncio as asyncio
+import asyncio
 async def __code():
     {}
 

micropython/bluetooth/aioble-central/manifest.py

@@ -1,4 +1,4 @@
-metadata(version="0.2.1")
+metadata(version="0.3.0")
 
 require("aioble-core")
 

micropython/bluetooth/aioble-core/manifest.py

@@ -1,4 +1,4 @@
-metadata(version="0.2.0")
+metadata(version="0.4.0")
 
 package(
     "aioble",

micropython/bluetooth/aioble-peripheral/manifest.py

@@ -1,4 +1,4 @@
-metadata(version="0.2.0")
+metadata(version="0.2.1")
 
 require("aioble-core")
 

micropython/bluetooth/aioble/aioble/central.py

@@ -6,7 +6,7 @@
 import bluetooth
 import struct
 
-import uasyncio as asyncio
+import asyncio
 
 from .core import (
     ensure_active,
@@ -104,7 +104,9 @@ async def _cancel_pending():
 
 # Start connecting to a peripheral.
 # Call device.connect() rather than using method directly.
-async def _connect(connection, timeout_ms):
+async def _connect(
+    connection, timeout_ms, scan_duration_ms, min_conn_interval_us, max_conn_interval_us
+):
     device = connection.device
     if device in _connecting:
         return
@@ -122,7 +124,13 @@ async def _connect(connection, timeout_ms):
 
     try:
         with DeviceTimeout(None, timeout_ms):
-            ble.gap_connect(device.addr_type, device.addr)
+            ble.gap_connect(
+                device.addr_type,
+                device.addr,
+                scan_duration_ms,
+                min_conn_interval_us,
+                max_conn_interval_us,
+            )
 
             # Wait for the connected IRQ.
             await connection._event.wait()
@@ -195,12 +203,14 @@ def name(self):
 
     # Generator that enumerates the service UUIDs that are advertised.
     def services(self):
-        for u in self._decode_field(_ADV_TYPE_UUID16_INCOMPLETE, _ADV_TYPE_UUID16_COMPLETE):
-            yield bluetooth.UUID(struct.unpack("<H", u)[0])
-        for u in self._decode_field(_ADV_TYPE_UUID32_INCOMPLETE, _ADV_TYPE_UUID32_COMPLETE):
-            yield bluetooth.UUID(struct.unpack("<I", u)[0])
-        for u in self._decode_field(_ADV_TYPE_UUID128_INCOMPLETE, _ADV_TYPE_UUID128_COMPLETE):
-            yield bluetooth.UUID(u)
+        for uuid_len, codes in (
+            (2, (_ADV_TYPE_UUID16_INCOMPLETE, _ADV_TYPE_UUID16_COMPLETE)),
+            (4, (_ADV_TYPE_UUID32_INCOMPLETE, _ADV_TYPE_UUID32_COMPLETE)),
+            (16, (_ADV_TYPE_UUID128_INCOMPLETE, _ADV_TYPE_UUID128_COMPLETE)),
+        ):
+            for u in self._decode_field(*codes):
+                for i in range(0, len(u), uuid_len):
+                    yield bluetooth.UUID(u[i : i + uuid_len])
 
     # Generator that returns (manufacturer_id, data) tuples.
     def manufacturer(self, filter=None):

micropython/bluetooth/aioble/aioble/client.py

@@ -3,7 +3,7 @@
 
 from micropython import const
 from collections import deque
-import uasyncio as asyncio
+import asyncio
 import struct
 
 import bluetooth

micropython/bluetooth/aioble/aioble/device.py

@@ -3,7 +3,7 @@
 
 from micropython import const
 
-import uasyncio as asyncio
+import asyncio
 import binascii
 
 from .core import ble, register_irq_handler, log_error
@@ -132,14 +132,26 @@ def __str__(self):
     def addr_hex(self):
         return binascii.hexlify(self.addr, ":").decode()
 
-    async def connect(self, timeout_ms=10000):
+    async def connect(
+        self,
+        timeout_ms=10000,
+        scan_duration_ms=None,
+        min_conn_interval_us=None,
+        max_conn_interval_us=None,
+    ):
         if self._connection:
             return self._connection
 
         # Forward to implementation in central.py.
         from .central import _connect
 
-        await _connect(DeviceConnection(self), timeout_ms)
+        await _connect(
+            DeviceConnection(self),
+            timeout_ms,
+            scan_duration_ms,
+            min_conn_interval_us,
+            max_conn_interval_us,
+        )
 
         # Start the device task that will clean up after disconnection.
         self._connection._run_task()
@@ -164,7 +176,7 @@ def __init__(self, device):
 
         # This event is fired by the IRQ both for connection and disconnection
         # and controls the device_task.
-        self._event = None
+        self._event = asyncio.ThreadSafeFlag()
 
         # If we're waiting for a pending MTU exchange.
         self._mtu_event = None
@@ -207,15 +219,12 @@ async def device_task(self):
             t._task.cancel()
 
     def _run_task(self):
-        # Event will be already created this if we initiated connection.
-        self._event = self._event or asyncio.ThreadSafeFlag()
-
         self._task = asyncio.create_task(self.device_task())
 
     async def disconnect(self, timeout_ms=2000):
         await self.disconnected(timeout_ms, disconnect=True)
 
-    async def disconnected(self, timeout_ms=60000, disconnect=False):
+    async def disconnected(self, timeout_ms=None, disconnect=False):
         if not self.is_connected():
             return
 

micropython/bluetooth/aioble/aioble/l2cap.py

@@ -3,7 +3,7 @@
 
 from micropython import const
 
-import uasyncio as asyncio
+import asyncio
 
 from .core import ble, log_error, register_irq_handler
 from .device import DeviceConnection

micropython/bluetooth/aioble/aioble/peripheral.py

@@ -6,7 +6,7 @@
 import bluetooth
 import struct
 
-import uasyncio as asyncio
+import asyncio
 
 from .core import (
     ensure_active,
@@ -129,14 +129,13 @@ async def advertise(
         # Services are prioritised to go in the advertising data because iOS supports
         # filtering scan results by service only, so services must come first.
         if services:
-            for uuid in services:
-                b = bytes(uuid)
-                if len(b) == 2:
-                    resp_data = _append(adv_data, resp_data, _ADV_TYPE_UUID16_COMPLETE, b)
-                elif len(b) == 4:
-                    resp_data = _append(adv_data, resp_data, _ADV_TYPE_UUID32_COMPLETE, b)
-                elif len(b) == 16:
-                    resp_data = _append(adv_data, resp_data, _ADV_TYPE_UUID128_COMPLETE, b)
+            for uuid_len, code in (
+                (2, _ADV_TYPE_UUID16_COMPLETE),
+                (4, _ADV_TYPE_UUID32_COMPLETE),
+                (16, _ADV_TYPE_UUID128_COMPLETE),
+            ):
+                if uuids := [bytes(uuid) for uuid in services if len(bytes(uuid)) == uuid_len]:
+                    resp_data = _append(adv_data, resp_data, code, b"".join(uuids))
 
         if name:
             resp_data = _append(adv_data, resp_data, _ADV_TYPE_NAME, name)

micropython/bluetooth/aioble/aioble/security.py

@@ -2,7 +2,7 @@
 # MIT license; Copyright (c) 2021 Jim Mussared
 
 from micropython import const, schedule
-import uasyncio as asyncio
+import asyncio
 import binascii
 import json
 

micropython/bluetooth/aioble/aioble/server.py

@@ -4,7 +4,7 @@
 from micropython import const
 from collections import deque
 import bluetooth
-import uasyncio as asyncio
+import asyncio
 
 from .core import (
     ensure_active,

micropython/bluetooth/aioble/examples/l2cap_file_client.py

@@ -5,11 +5,12 @@
 
 import sys
 
+# ruff: noqa: E402
 sys.path.append("")
 
 from micropython import const
 
-import uasyncio as asyncio
+import asyncio
 import aioble
 import bluetooth
 
@@ -85,7 +86,7 @@ async def size(self, path):
     async def download(self, path, dest):
         size = await self.size(path)
 
-        send_seq = await self._command(_COMMAND_SEND, path.encode())
+        await self._command(_COMMAND_SEND, path.encode())
 
         with open(dest, "wb") as f:  # noqa: ASYNC101
             total = 0
@@ -97,7 +98,7 @@ async def download(self, path, dest):
                 total += n
 
     async def list(self, path):
-        send_seq = await self._command(_COMMAND_LIST, path.encode())
+        await self._command(_COMMAND_LIST, path.encode())
         results = bytearray()
         buf = bytearray(self._channel.our_mtu)
         mv = memoryview(buf)

micropython/bluetooth/aioble/examples/l2cap_file_server.py

@@ -16,11 +16,12 @@
 
 import sys
 
+# ruff: noqa: E402
 sys.path.append("")
 
 from micropython import const
 
-import uasyncio as asyncio
+import asyncio
 import aioble
 import bluetooth
 
@@ -132,23 +133,20 @@ async def control_task(connection):
                 file = msg[2:].decode()
 
                 if command == _COMMAND_SEND:
-                    op_seq = seq
                     send_file = file
                     l2cap_event.set()
                 elif command == _COMMAND_RECV:
-                    op_seq = seq
                     recv_file = file
                     l2cap_event.set()
                 elif command == _COMMAND_LIST:
-                    op_seq = seq
                     list_path = file
                     l2cap_event.set()
                 elif command == _COMMAND_SIZE:
                     try:
                         stat = os.stat(file)
                         size = stat[6]
                         status = 0
-                    except OSError as e:
+                    except OSError:
                         size = 0
                         status = _STATUS_NOT_FOUND
                     control_characteristic.notify(

micropython/bluetooth/aioble/examples/temp_client.py

@@ -1,10 +1,11 @@
 import sys
 
+# ruff: noqa: E402
 sys.path.append("")
 
 from micropython import const
 
-import uasyncio as asyncio
+import asyncio
 import aioble
 import bluetooth
 
@@ -54,7 +55,7 @@ async def main():
             print("Timeout discovering services/characteristics")
             return
 
-        while True:
+        while connection.is_connected():
             temp_deg_c = _decode_temperature(await temp_characteristic.read())
             print("Temperature: {:.2f}".format(temp_deg_c))
             await asyncio.sleep_ms(1000)