Merge branch 'micropython:master' into patch-1

Author: dotdashnotdotsoftware

.github/workflows/build_packages.yml

@@ -23,7 +23,7 @@ jobs:
       if: vars.MICROPY_PUBLISH_MIP_INDEX && github.event_name == 'push' && ! github.event.deleted
       run: source tools/ci.sh && ci_push_package_index
     - name: Upload packages as artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: packages-${{ github.sha }}
         path: ${{ env.PACKAGE_INDEX_PATH }}

.github/workflows/ruff.yml

@@ -6,6 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - run: pip install --user ruff==0.1.2
+    # Version should be kept in sync with .pre-commit_config.yaml & also micropython
+    - run: pip install --user ruff==0.11.6
     - run: ruff check --output-format=github .
     - run: ruff format --diff .

.pre-commit-config.yaml

@@ -8,7 +8,8 @@ repos:
         verbose: true
         stages: [commit-msg]
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.1.2
+    # Version should be kept in sync with .github/workflows/ruff.yml & also micropython
+    rev: v0.11.6
     hooks:
       - id: ruff
         id: ruff-format

micropython/aioespnow/README.md

@@ -55,7 +55,7 @@ A small async server example::
     import asyncio
 
     # A WLAN interface must be active to send()/recv()
-    network.WLAN(network.STA_IF).active(True)
+    network.WLAN(network.WLAN.IF_STA).active(True)
 
     e = aioespnow.AIOESPNow()  # Returns AIOESPNow enhanced with async support
     e.active(True)

micropython/aiorepl/aiorepl.py

@@ -132,7 +132,7 @@ async def task(g=None, prompt="--> "):
                             continue
                         if curs:
                             # move cursor to end of the line
-                            sys.stdout.write("\x1B[{}C".format(curs))
+                            sys.stdout.write("\x1b[{}C".format(curs))
                             curs = 0
                         sys.stdout.write("\n")
                         if cmd:
@@ -153,10 +153,10 @@ async def task(g=None, prompt="--> "):
                             if curs:
                                 cmd = "".join((cmd[: -curs - 1], cmd[-curs:]))
                                 sys.stdout.write(
-                                    "\x08\x1B[K"
+                                    "\x08\x1b[K"
                                 )  # move cursor back, erase to end of line
                                 sys.stdout.write(cmd[-curs:])  # redraw line
-                                sys.stdout.write("\x1B[{}D".format(curs))  # reset cursor location
+                                sys.stdout.write("\x1b[{}D".format(curs))  # reset cursor location
                             else:
                                 cmd = cmd[:-1]
                                 sys.stdout.write("\x08 \x08")
@@ -207,21 +207,21 @@ async def task(g=None, prompt="--> "):
                         elif key == "[D":  # left
                             if curs < len(cmd) - 1:
                                 curs += 1
-                                sys.stdout.write("\x1B")
+                                sys.stdout.write("\x1b")
                                 sys.stdout.write(key)
                         elif key == "[C":  # right
                             if curs:
                                 curs -= 1
-                                sys.stdout.write("\x1B")
+                                sys.stdout.write("\x1b")
                                 sys.stdout.write(key)
                         elif key == "[H":  # home
                             pcurs = curs
                             curs = len(cmd)
-                            sys.stdout.write("\x1B[{}D".format(curs - pcurs))  # move cursor left
+                            sys.stdout.write("\x1b[{}D".format(curs - pcurs))  # move cursor left
                         elif key == "[F":  # end
                             pcurs = curs
                             curs = 0
-                            sys.stdout.write("\x1B[{}C".format(pcurs))  # move cursor right
+                            sys.stdout.write("\x1b[{}C".format(pcurs))  # move cursor right
                     else:
                         # sys.stdout.write("\\x")
                         # sys.stdout.write(hex(c))
@@ -231,7 +231,7 @@ async def task(g=None, prompt="--> "):
                         # inserting into middle of line
                         cmd = "".join((cmd[:-curs], b, cmd[-curs:]))
                         sys.stdout.write(cmd[-curs - 1 :])  # redraw line to end
-                        sys.stdout.write("\x1B[{}D".format(curs))  # reset cursor location
+                        sys.stdout.write("\x1b[{}D".format(curs))  # reset cursor location
                     else:
                         sys.stdout.write(b)
                         cmd += b

micropython/bluetooth/aioble-central/manifest.py

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

micropython/bluetooth/aioble-core/manifest.py

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

micropython/bluetooth/aioble/aioble/central.py

@@ -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()

micropython/bluetooth/aioble/aioble/device.py

@@ -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()

micropython/bluetooth/aioble/examples/l2cap_file_client.py

@@ -88,7 +88,7 @@ async def download(self, path, dest):
 
         await self._command(_COMMAND_SEND, path.encode())
 
-        with open(dest, "wb") as f:  # noqa: ASYNC101
+        with open(dest, "wb") as f:  # noqa: ASYNC230
             total = 0
             buf = bytearray(self._channel.our_mtu)
             mv = memoryview(buf)