Merge pull request #8912 from tannewt/merge_in_8.2.x

tannewt · web-flow · commit 574900a6854c · 2024-02-13T14:09:39.000-08:00
Merge in 8.2.x
diff --git a/ports/espressif/bindings/espnow/ESPNow.c b/ports/espressif/bindings/espnow/ESPNow.c
@@ -340,6 +340,7 @@ STATIC const mp_stream_p_t espnow_stream_p = {
 //|         This is an easy way to check if the buffer is empty.
 //|         """
 //|         ...
+//|
 //|     def __len__(self) -> int:
 //|         """Return the number of `bytes` available to read. Used to implement ``len()``."""
 //|         ...
diff --git a/ports/espressif/tools/update_sdkconfig.py b/ports/espressif/tools/update_sdkconfig.py
@@ -198,9 +198,9 @@ def update(debug, board, update_all):
             ble_enabled = not (value == "0")
 
     os.environ["IDF_TARGET"] = target
-    os.environ[
-        "COMPONENT_KCONFIGS_PROJBUILD_SOURCE_FILE"
-    ] = f"build-{board}/esp-idf/kconfigs_projbuild.in"
+    os.environ["COMPONENT_KCONFIGS_PROJBUILD_SOURCE_FILE"] = (
+        f"build-{board}/esp-idf/kconfigs_projbuild.in"
+    )
     os.environ["COMPONENT_KCONFIGS_SOURCE_FILE"] = f"build-{board}/esp-idf/kconfigs.in"
 
     kconfig_path = pathlib.Path(f"build-{board}/esp-idf/kconfigs.in")
diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv_base/pins.c b/ports/raspberrypi/boards/pimoroni_pico_dv_base/pins.c
@@ -53,7 +53,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO25) },
     { MP_ROM_QSTR(MP_QSTR_GP25), MP_ROM_PTR(&pin_GPIO25) },
 
-    { MP_ROM_QSTR(MP_QSTR_I2S_WORD_SELECT), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_I2S_DATA), MP_ROM_PTR(&pin_GPIO26) },
     { MP_ROM_QSTR(MP_QSTR_GP26_A0), MP_ROM_PTR(&pin_GPIO26) },
     { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) },
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) },
@@ -63,7 +63,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) },
     { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) },
 
-    { MP_ROM_QSTR(MP_QSTR_I2S_DATA), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_I2S_WORD_SELECT), MP_ROM_PTR(&pin_GPIO28) },
     { MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28) },
     { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) },
     { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) },
diff --git a/shared-bindings/_bleio/CharacteristicBuffer.c b/shared-bindings/_bleio/CharacteristicBuffer.c
@@ -99,12 +99,14 @@ STATIC void check_for_deinit(bleio_characteristic_buffer_obj_t *self) {
 //|         :return: Data read
 //|         :rtype: bytes or None"""
 //|         ...
+//|
 //|     def readinto(self, buf: WriteableBuffer) -> Optional[int]:
 //|         """Read bytes into the ``buf``. Read at most ``len(buf)`` bytes.
 //|
 //|         :return: number of bytes read and stored into ``buf``
 //|         :rtype: int or None (on a non-blocking error)"""
 //|         ...
+//|
 //|     def readline(self) -> bytes:
 //|         """Read a line, ending in a newline character.
 //|
diff --git a/shared-bindings/_bleio/Connection.c b/shared-bindings/_bleio/Connection.c
@@ -72,6 +72,7 @@ void bleio_connection_ensure_connected(bleio_connection_obj_t *self) {
 //|         Connections may also be made when another device initiates a connection. To use a Connection
 //|         created by a peer, read the `Adapter.connections` property."""
 //|         ...
+//|
 //|     def disconnect(self) -> None:
 //|         """Disconnects from the remote peripheral. Does nothing if already disconnected."""
 //|         ...
diff --git a/shared-bindings/_bleio/Descriptor.c b/shared-bindings/_bleio/Descriptor.c
@@ -44,6 +44,7 @@
 //|         and attached to a Characteristic by calling `add_to_characteristic()`.
 //|         Remote Descriptor objects are created by `Connection.discover_remote_services()`
 //|         as part of remote Characteristics in the remote Services that are discovered."""
+//|
 //|     @classmethod
 //|     def add_to_characteristic(
 //|         cls,
diff --git a/shared-bindings/_bleio/ScanEntry.c b/shared-bindings/_bleio/ScanEntry.c
@@ -44,6 +44,7 @@
 //|     def __init__(self) -> None:
 //|         """Cannot be instantiated directly. Use `_bleio.Adapter.start_scan`."""
 //|         ...
+//|
 //|     def matches(self, prefixes: ScanEntry, *, match_all: bool = True) -> bool:
 //|         """Returns True if the ScanEntry matches all prefixes when ``match_all`` is True. This is stricter
 //|         than the scan filtering which accepts any advertisements that match any of the prefixes
diff --git a/shared-bindings/_bleio/ScanResults.c b/shared-bindings/_bleio/ScanResults.c
@@ -49,9 +49,11 @@ STATIC mp_obj_t scanresults_iternext(mp_obj_t self_in) {
 //|     def __init__(self) -> None:
 //|         """Cannot be instantiated directly. Use `_bleio.Adapter.start_scan`."""
 //|         ...
+//|
 //|     def __iter__(self) -> Iterator[ScanEntry]:
 //|         """Returns itself since it is the iterator."""
 //|         ...
+//|
 //|     def __next__(self) -> ScanEntry:
 //|         """Returns the next `_bleio.ScanEntry`. Blocks if none have been received and scanning is still
 //|         active. Raises `StopIteration` if scanning is finished and no other results are available.
diff --git a/shared-bindings/_pixelmap/PixelMap.c b/shared-bindings/_pixelmap/PixelMap.c
@@ -160,10 +160,12 @@ MP_DEFINE_CONST_FUN_OBJ_2(pixelmap_pixelmap_indices_obj, pixelmap_pixelmap_indic
 //|     def __getitem__(self, index: slice) -> PixelReturnSequence:
 //|         """Retrieve the value of the underlying pixels."""
 //|         ...
+//|
 //|     @overload
 //|     def __getitem__(self, index: int) -> PixelReturnType:
 //|         """Retrieve the value of one of the underlying pixels at 'index'."""
 //|         ...
+//|
 //|     @overload
 //|     def __setitem__(self, index: slice, value: PixelSequence) -> None: ...
 //|     @overload
diff --git a/shared-bindings/adafruit_pixelbuf/PixelBuf.c b/shared-bindings/adafruit_pixelbuf/PixelBuf.c
@@ -268,12 +268,14 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(pixelbuf_pixelbuf_fill_obj, pixelbuf_pixelbuf_f
 //|         between 0 and 255.  When in PWM (DotStar) mode, the 4th tuple value is a float of the pixel
 //|         intensity from 0-1.0."""
 //|         ...
+//|
 //|     @overload
 //|     def __getitem__(self, index: int) -> PixelReturnType:
 //|         """Returns the pixel value at the given index as a tuple of (Red, Green, Blue[, White]) values
 //|         between 0 and 255.  When in PWM (DotStar) mode, the 4th tuple value is a float of the pixel
 //|         intensity from 0-1.0."""
 //|         ...
+//|
 //|     @overload
 //|     def __setitem__(self, index: slice, value: PixelSequence) -> None: ...
 //|     @overload
diff --git a/shared-bindings/alarm/SleepMemory.c b/shared-bindings/alarm/SleepMemory.c
@@ -53,11 +53,13 @@
 //|     def __init__(self) -> None:
 //|         """Not used. Access the sole instance through `alarm.sleep_memory`."""
 //|         ...
+//|
 //|     def __bool__(self) -> bool:
 //|         """``sleep_memory`` is ``True`` if its length is greater than zero.
 //|         This is an easy way to check for its existence.
 //|         """
 //|         ...
+//|
 //|     def __len__(self) -> int:
 //|         """Return the length. This is used by (`len`)"""
 //|         ...
@@ -85,6 +87,7 @@ STATIC MP_DEFINE_CONST_DICT(alarm_sleep_memory_locals_dict, alarm_sleep_memory_l
 //|     def __getitem__(self, index: int) -> int:
 //|         """Returns the value at the given index."""
 //|         ...
+//|
 //|     @overload
 //|     def __setitem__(self, index: slice, value: ReadableBuffer) -> None: ...
 //|     @overload
diff --git a/shared-bindings/canio/Listener.c b/shared-bindings/canio/Listener.c
@@ -80,6 +80,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(canio_listener_in_waiting_obj, canio_listener_i
 //|         This method exists so that `Listener` can be used as an
 //|         iterable"""
 //|         ...
+//|
 //|     def __next__(self) -> Union[RemoteTransmissionRequest, Message]:
 //|         """Reads a message, after waiting up to self.timeout seconds
 //|
diff --git a/shared-bindings/displayio/Bitmap.c b/shared-bindings/displayio/Bitmap.c
@@ -139,6 +139,7 @@ MP_PROPERTY_GETTER(displayio_bitmap_bits_per_value_obj,
 //|
 //|           print(bitmap[0,1])"""
 //|         ...
+//|
 //|     def __setitem__(self, index: Union[Tuple[int, int], int], value: int) -> None:
 //|         """Sets the value at the given index. The index can either be an x,y tuple or an int equal
 //|         to ``y * width + x``.
diff --git a/shared-bindings/displayio/Group.c b/shared-bindings/displayio/Group.c
@@ -281,6 +281,7 @@ STATIC mp_obj_t group_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
 //|
 //|           print(group[0])"""
 //|         ...
+//|
 //|     def __setitem__(
 //|         self,
 //|         index: int,
@@ -292,6 +293,7 @@ STATIC mp_obj_t group_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
 //|
 //|           group[0] = sprite"""
 //|         ...
+//|
 //|     def __delitem__(self, index: int) -> None:
 //|         """Deletes the value at the given index.
 //|
diff --git a/shared-bindings/displayio/Palette.c b/shared-bindings/displayio/Palette.c
@@ -104,6 +104,7 @@ STATIC mp_obj_t group_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
 //|     def __getitem__(self, index: int) -> Optional[int]:
 //|         r"""Return the pixel color at the given index as an integer."""
 //|         ...
+//|
 //|     def __setitem__(
 //|         self, index: int, value: Union[int, ReadableBuffer, Tuple[int, int, int]]
 //|     ) -> None:
diff --git a/shared-bindings/displayio/TileGrid.c b/shared-bindings/displayio/TileGrid.c
@@ -409,6 +409,7 @@ MP_PROPERTY_GETSET(displayio_tilegrid_bitmap_obj,
 //|
 //|           print(grid[0])"""
 //|         ...
+//|
 //|     def __setitem__(self, index: Union[Tuple[int, int], int], value: int) -> None:
 //|         """Sets the tile index at the given index. The index can either be an x,y tuple or an int equal
 //|         to ``y * width + x``.
diff --git a/shared-bindings/fontio/BuiltinFont.c b/shared-bindings/fontio/BuiltinFont.c
@@ -47,6 +47,7 @@
 //|         The two element version is ``(width, height)``, in which
 //|         ``x_offset`` and ``y_offset`` are assumed to be zero."""
 //|         pass
+//|
 //|     def get_glyph(self, codepoint: int) -> Optional[Glyph]:
 //|         """Retrieve the Glyph for a given code point
 //|
diff --git a/shared-bindings/keypad/EventQueue.c b/shared-bindings/keypad/EventQueue.c
@@ -100,6 +100,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(keypad_eventqueue_clear_obj, keypad_eventqueue_clear);
 //|         This is an easy way to check if the queue is empty.
 //|         """
 //|         ...
+//|
 //|     def __len__(self) -> int:
 //|         """Return the number of events currently in the queue. Used to implement ``len()``."""
 //|         ...
diff --git a/shared-bindings/memorymap/AddressRange.c b/shared-bindings/memorymap/AddressRange.c
@@ -72,6 +72,7 @@
 //|        # print GPIO16 pad drive strength
 //|        print(rp2040_get_pad_drive(16))
 //|     """
+//|
 
 //|     def __init__(self, *, start, length) -> None:
 //|         """Constructs an address range starting at ``start`` and ending at
@@ -144,6 +145,7 @@ STATIC MP_DEFINE_CONST_DICT(memorymap_addressrange_locals_dict, memorymap_addres
 //|         when possible.
 //|         All others may use multiple transactions."""
 //|         ...
+//|
 //|     @overload
 //|     def __setitem__(self, index: slice, value: ReadableBuffer) -> None: ...
 //|     @overload
diff --git a/shared-bindings/nvm/ByteArray.c b/shared-bindings/nvm/ByteArray.c
@@ -41,6 +41,7 @@
 //|        import microcontroller
 //|        microcontroller.nvm[0:3] = b"\xcc\x10\x00"
 //|     """
+//|
 
 //|     def __init__(self) -> None:
 //|         """Not currently dynamically supported. Access the sole instance through `microcontroller.nvm`."""
@@ -74,6 +75,7 @@ STATIC MP_DEFINE_CONST_DICT(nvm_bytearray_locals_dict, nvm_bytearray_locals_dict
 //|     def __getitem__(self, index: int) -> int:
 //|         """Returns the value at the given index."""
 //|         ...
+//|
 //|     @overload
 //|     def __setitem__(self, index: slice, value: ReadableBuffer) -> None: ...
 //|     @overload
diff --git a/shared-bindings/storage/__init__.c b/shared-bindings/storage/__init__.c
@@ -275,30 +275,38 @@ STATIC const mp_rom_map_elem_t storage_module_globals_table[] = {
 //|         larger filesystems, but you will need to format the filesystem on another device.
 //|         """
 //|         ...
+//|
 //|     def open(self, path: str, mode: str) -> None:
 //|         """Like builtin ``open()``"""
 //|         ...
+//|
 //|     def ilistdir(
 //|         self, path: str
 //|     ) -> Iterator[Union[Tuple[AnyStr, int, int, int], Tuple[AnyStr, int, int]]]:
 //|         """Return an iterator whose values describe files and folders within
 //|         ``path``"""
 //|         ...
+//|
 //|     def mkdir(self, path: str) -> None:
 //|         """Like `os.mkdir`"""
 //|         ...
+//|
 //|     def rmdir(self, path: str) -> None:
 //|         """Like `os.rmdir`"""
 //|         ...
+//|
 //|     def stat(self, path: str) -> Tuple[int, int, int, int, int, int, int, int, int, int]:
 //|         """Like `os.stat`"""
 //|         ...
+//|
 //|     def statvfs(self, path: int) -> Tuple[int, int, int, int, int, int, int, int, int, int]:
 //|         """Like `os.statvfs`"""
 //|         ...
+//|
 //|     def mount(self, readonly: bool, mkfs: VfsFat) -> None:
 //|         """Don't call this directly, call `storage.mount`."""
 //|         ...
+//|
 //|     def umount(self) -> None:
 //|         """Don't call this directly, call `storage.umount`."""
 //|         ...
diff --git a/shared-bindings/usb_cdc/Serial.c b/shared-bindings/usb_cdc/Serial.c
@@ -41,6 +41,7 @@
 //|         """You cannot create an instance of `usb_cdc.Serial`.
 //|         The available instances are in the ``usb_cdc.serials`` tuple."""
 //|         ...
+//|
 //|     def read(self, size: int = 1) -> bytes:
 //|         """Read at most ``size`` bytes. If ``size`` exceeds the internal buffer size
 //|         only the bytes in the buffer will be read. If `timeout` is > 0 or ``None``,
@@ -50,6 +51,7 @@
 //|         :return: Data read
 //|         :rtype: bytes"""
 //|         ...
+//|
 //|     def readinto(self, buf: WriteableBuffer) -> int:
 //|         """Read bytes into the ``buf``. Read at most ``len(buf)`` bytes. If `timeout`
 //|         is > 0 or ``None``, keep waiting until the timeout expires or ``len(buf)``
@@ -58,6 +60,7 @@
 //|         :return: number of bytes read and stored into ``buf``
 //|         :rtype: int"""
 //|         ...
+//|
 //|     def readline(self, size: int = -1) -> Optional[bytes]:
 //|         r"""Read a line ending in a newline character ("\\n"), including the newline.
 //|         Return everything readable if no newline is found and ``timeout`` is 0.
@@ -70,6 +73,7 @@
 //|         :return: the line read
 //|         :rtype: bytes or None"""
 //|         ...
+//|
 //|     def readlines(self) -> List[Optional[bytes]]:
 //|         """Read multiple lines as a list, using `readline()`.
 //|
@@ -79,12 +83,14 @@
 //|         :return: a list of the line read
 //|         :rtype: list"""
 //|         ...
+//|
 //|     def write(self, buf: ReadableBuffer) -> int:
 //|         """Write as many bytes as possible from the buffer of bytes.
 //|
 //|         :return: the number of bytes written
 //|         :rtype: int"""
 //|         ...
+//|
 //|     def flush(self) -> None:
 //|         """Force out any unwritten bytes, waiting until they are written."""
 //|         ...
diff --git a/shared-bindings/usb_midi/PortIn.c b/shared-bindings/usb_midi/PortIn.c
@@ -55,6 +55,7 @@
 //|         :return: Data read
 //|         :rtype: bytes or None"""
 //|         ...
+//|
 //|     def readinto(self, buf: WriteableBuffer, nbytes: Optional[int] = None) -> Optional[bytes]:
 //|         """Read bytes into the ``buf``.  If ``nbytes`` is specified then read at most
 //|         that many bytes.  Otherwise, read at most ``len(buf)`` bytes.
diff --git a/shared-bindings/wifi/ScannedNetworks.c b/shared-bindings/wifi/ScannedNetworks.c
@@ -50,9 +50,11 @@ STATIC mp_obj_t scannednetworks_iternext(mp_obj_t self_in) {
 //|     def __init__(self) -> None:
 //|         """Cannot be instantiated directly. Use `wifi.Radio.start_scanning_networks`."""
 //|         ...
+//|
 //|     def __iter__(self) -> Iterator[Network]:
 //|         """Returns itself since it is the iterator."""
 //|         ...
+//|
 //|     def __next__(self) -> Network:
 //|         """Returns the next `wifi.Network`.
 //|         Raises `StopIteration` if scanning is finished and no other results are available."""
diff --git a/tools/analyze_heap_dump.py b/tools/analyze_heap_dump.py
diff --git a/tools/ci_changes_per_commit.py b/tools/ci_changes_per_commit.py
diff --git a/tools/ci_fetch_deps.py b/tools/ci_fetch_deps.py
diff --git a/tools/codeformat.py b/tools/codeformat.py
