Merge branch 'adafruit:main' into espressif_esp32s3_lcd_ev_v1.5

Author: sanhu88

.git-blame-ignore-revs

@@ -1,3 +1,12 @@
+# all: Prune trailing whitespace.
+dda9b9c6da5d3c31fa8769e581a753e95a270803
+
+# all: Remove the "STATIC" macro and just use "static" instead.
+decf8e6a8bb940d5829ca3296790631fcece7b21
+
+# renesas-ra: Fix spelling mistakes found by codespell.
+b3f2f18f927fa2fad10daf63d8c391331f5edf58
+
 # all: Update Python formatting to ruff-format.
 bbd8760bd9a2302e5abee29db279102bb11d7732
 

.github/workflows/run-tests.yml

@@ -53,15 +53,16 @@ jobs:
       run: ./run-tests.py -j4 --print-failures
       if: failure()
       working-directory: tests
-    - name: Build native modules
-      if: matrix.test == 'all'
-      run: |
-        make -C examples/natmod/features1
-        make -C examples/natmod/features2
-        make -C examples/natmod/heapq
-        make -C examples/natmod/random
-        make -C examples/natmod/re
-    - name: Test native modules
-      if: matrix.test == 'all'
-      run: ./run-natmodtests.py extmod/{heapq*,re*,zlib*}.py
-      working-directory: tests
+    # Not working after MicroPython v1.23 merge.
+    # - name: Build native modules
+    #   if: matrix.test == 'all'
+    #   run: |
+    #     make -C examples/natmod/features1
+    #     make -C examples/natmod/features2
+    #     make -C examples/natmod/heapq
+    #     make -C examples/natmod/random
+    #     make -C examples/natmod/re
+    # - name: Test native modules
+    #   if: matrix.test == 'all'
+    #   run: ./run-natmodtests.py extmod/{heapq*,random*,re*}.py
+    #   working-directory: tests

.gitmodules

@@ -10,7 +10,7 @@
 	url = https://github.com/atgreen/libffi
 [submodule "lib/berkeley-db-1.xx"]
 	path = lib/berkeley-db-1.xx
-	url = https://github.com/pfalcon/berkeley-db-1.xx
+	url = https://github.com/micropython/berkeley-db-1.xx
 [submodule "tools/uf2"]
 	path = tools/uf2
 	url = https://github.com/Microsoft/uf2.git
@@ -143,7 +143,7 @@
 [submodule "ports/espressif/esp-idf"]
 	path = ports/espressif/esp-idf
 	url = https://github.com/adafruit/esp-idf.git
-	branch = circuitpython-v5.3
+	branch = circuitpython-v5.3.1
 [submodule "ports/espressif/esp-protocols"]
 	path = ports/espressif/esp-protocols
 	url = https://github.com/espressif/esp-protocols.git

LICENSE

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 --------------------------------------------------------------------------------
 
-#CIRCUITPY-CHANGE:
+# CIRCUITPY-CHANGE:
 
 Unless specified otherwise (see below), the above license and copyright applies
 to all files derived from MicroPython in this repository.

LICENSE_MicroPython

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2022 Damien P. George
+Copyright (c) 2013-2024 Damien P. George
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -35,9 +35,7 @@ used during the build process and is not part of the compiled source code.
 
 / (MIT)
     /drivers
-        /cc3000 (BSD-3-clause)
         /cc3100 (BSD-3-clause)
-        /wiznet5k (BSD-3-clause)
     /lib
         /asf4 (Apache-2.0)
         /axtls (BSD-3-clause)
@@ -50,24 +48,31 @@ used during the build process and is not part of the compiled source code.
         /cmsis (BSD-3-clause)
         /crypto-algorithms (NONE)
         /libhydrogen (ISC)
+        /libmetal (BSD-3-clause)
         /littlefs (BSD-3-clause)
         /lwip (BSD-3-clause)
         /mynewt-nimble (Apache-2.0)
         /nrfx (BSD-3-clause)
         /nxp_driver (BSD-3-Clause)
         /oofatfs (BSD-1-clause)
+        /open-amp (BSD-3-clause)
         /pico-sdk (BSD-3-clause)
         /re15 (BSD-3-clause)
         /stm32lib (BSD-3-clause)
         /tinytest (BSD-3-clause)
         /tinyusb (MIT)
         /uzlib (Zlib)
+        /wiznet5k (MIT)
     /logo (uses OFL-1.1)
     /ports
         /cc3200
             /hal (BSD-3-clause)
             /simplelink (BSD-3-clause)
             /FreeRTOS (GPL-2.0 with FreeRTOS exception)
+        /esp32
+            /ppp_set_auth.* (Apache-2.0)
+        /rp2
+            /mutex_extra.c (BSD-3-clause)
         /stm32
             /usbd*.c (MCD-ST Liberty SW License Agreement V2)
             /stm32_it.* (MIT + BSD-3-clause)
@@ -77,8 +82,6 @@ used during the build process and is not part of the compiled source code.
                 /*/stm32*.h (BSD-3-clause)
             /usbdev (MCD-ST Liberty SW License Agreement V2)
             /usbhost (MCD-ST Liberty SW License Agreement V2)
-        /teensy
-            /core (PJRC.COM)
         /zephyr
             /src (Apache-2.0)
     /tools

README.rst

@@ -225,7 +225,7 @@ Ports include the code unique to a microcontroller line.
 
 The following ports are available: ``atmel-samd``, ``cxd56``, ``espressif``, ``litex``, ``mimxrt10xx``, ``nordic``, ``raspberrypi``, ``renode``, ``silabs`` (``efr32``), ``stm``, ``unix``.
 
-However, not all ports are fully functional. Some have limited limited functionality and known serious bugs.
+However, not all ports are fully functional. Some have limited functionality and known serious bugs.
 For details, refer to the **Port status** section in the `latest release <https://github.com/adafruit/circuitpython/releases/latest>`__ notes.
 
 Boards

devices/ble_hci/common-hal/_bleio/Characteristic.c

@@ -50,6 +50,17 @@ void common_hal_bleio_characteristic_construct(bleio_characteristic_obj_t *self,
     }
 }
 
+bool common_hal_bleio_characteristic_deinited(bleio_characteristic_obj_t *self) {
+    return self->handle == BLE_GATT_HANDLE_INVALID;
+}
+
+void common_hal_bleio_characteristic_deinit(bleio_characteristic_obj_t *self) {
+    if (common_hal_bleio_characteristic_deinited(self)) {
+        return;
+    }
+    self->handle = BLE_GATT_HANDLE_INVALID;
+}
+
 mp_obj_tuple_t *common_hal_bleio_characteristic_get_descriptors(bleio_characteristic_obj_t *self) {
     return mp_obj_new_tuple(self->descriptor_list->len, self->descriptor_list->items);
 }

docs/README.md

@@ -1,4 +1,4 @@
-Adafruit's CircuitPython Documentation
+Adafruit CircuitPython Documentation
 =========================
 
 The latest documentation can be found at:

docs/library/collections.rst

@@ -31,35 +31,37 @@ Classes
 
         - *flag* is optional and can be set to 1 to check for overflow when
           adding items.  If the deque is full and overflow checking is enabled,
-          an IndexError will be raised when adding items.
+          an ``IndexError`` will be raised when adding items.
 
     Deque objects have the following methods:
 
     .. method:: deque.append(x)
 
         Add *x* to the right side of the deque.
-        Raises IndexError if overflow checking is enabled and there is no more room left.
+        Raises ``IndexError`` if overflow checking is enabled and there is
+        no more room in the queue.
 
     .. method:: deque.appendleft(x)
 
         Add *x* to the left side of the deque.
-        Raises IndexError if overflow checking is enabled and there is no more room left.
+        Raises ``IndexError`` if overflow checking is enabled and there is
+        no more room in the queue.
 
     .. method:: deque.pop()
 
         Remove and return an item from the right side of the deque.
-        Raises IndexError if no items are present.
+        Raises ``IndexError`` if no items are present.
 
     .. method:: deque.popleft()
 
         Remove and return an item from the left side of the deque.
-        Raises IndexError if no items are present.
+        Raises ``IndexError`` if no items are present.
 
     .. method:: deque.extend(iterable)
 
-        Extend the right side of the deque by appending items from the *iterable* argument.
+        Extend the right side of the deque by appending items from the ``iterable`` argument.
         Raises IndexError if overflow checking is enabled and there is no more room left
-        for all of the items in *iterable*.
+        for all of the items in ``iterable``.
 
     In addition to the above, deques support iteration, ``bool``, ``len(d)``, ``reversed(d)``,
     membership testing with the ``in`` operator, and subscript references like ``d[0]``.