Merge branch 'adafruit:main' into m5stack_stamps3

Author: StellasFun

.gitmodules

@@ -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.1
+	branch = circuitpython-v5.3.2
 [submodule "ports/espressif/esp-protocols"]
 	path = ports/espressif/esp-protocols
 	url = https://github.com/adafruit/esp-protocols.git
@@ -345,7 +345,7 @@
 	url = https://github.com/adafruit/Adafruit_CircuitPython_Wave.git
 [submodule "ports/raspberrypi/lib/Pico-PIO-USB"]
 	path = ports/raspberrypi/lib/Pico-PIO-USB
-	url = https://github.com/sekigon-gonnoc/Pico-PIO-USB.git
+	url = https://github.com/adafruit/Pico-PIO-USB.git
 [submodule "lib/micropython-lib"]
 	path = lib/micropython-lib
 	url = https://github.com/micropython/micropython-lib.git

README.rst

@@ -136,6 +136,9 @@ Behavior
 -  Adds a safe mode that does not run user code after a hard crash or brown out. This makes it
    possible to fix code that causes nasty crashes by making it available through mass storage after
    the crash. A reset (the button) is needed after it's fixed to get back into normal mode.
+-  A 1 second delay is added to the boot process during which time the status LED will flash, and
+   resetting the device or pressing the boot button will force the device into safe mode. This delay
+   can be removed by a compile time option (``CIRCUITPY_SKIP_SAFE_MODE_WAIT``).
 -  Safe mode may be handled programmatically by providing a ``safemode.py``.
    ``safemode.py`` is run if the board has reset due to entering safe mode, unless the safe mode
    initiated by the user by pressing button(s).

conf.py

@@ -174,74 +174,22 @@ def autoapi_prepare_jinja_env(jinja_env):
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ["**/build*",
-                    ".git",
-                    ".github",
-                    ".env",
-                    ".venv",
-                    ".direnv",
-                    ".devcontainer/Readme.md",
-                    "circuitpython-stubs",
-                    "data",
-                    "docs/autoapi",
-                    "docs/README.md",
-                    "drivers",
-                    "examples",
-                    "extmod",
-                    "frozen",
-                    "lib",
-                    "main.c",
-                    "mpy-cross",
-                    "ports/*/*.c",
-                    "ports/*/*.h",
-                    "ports/*/boards",
-                    "ports/*/common-hal",
-                    "ports/*/supervisor",
-                    "ports/atmel-samd/asf4",
-                    "ports/atmel-samd/asf4_conf",
-                    "ports/atmel-samd/external_flash",
-                    "ports/atmel-samd/freetouch",
-                    "ports/atmel-samd/peripherals",
-                    "ports/atmel-samd/QTouch",
-                    "ports/atmel-samd/tools",
-                    "ports/broadcom/firmware",
-                    "ports/broadcom/peripherals",
-                    "ports/cxd56/mkspk",
-                    "ports/cxd56/spresense-exported-sdk",
-                    "ports/espressif/certificates",
-                    "ports/espressif/esp-idf",
-                    "ports/espressif/esp-camera",
-                    "ports/espressif/esp-protocols",
-                    "ports/espressif/.idf_tools",
-                    "ports/espressif/peripherals",
-                    "ports/litex/hw",
-                    "ports/minimal",
-                    "ports/mimxrt10xx/peripherals",
-                    "ports/mimxrt10xx/sdk",
-                    "ports/nordic/device",
-                    "ports/nordic/bluetooth",
-                    "ports/nordic/modules",
-                    "ports/nordic/nrfx",
-                    "ports/nordic/peripherals",
-                    "ports/nordic/usb",
-                    "ports/raspberrypi/sdk",
-                    "ports/raspberrypi/pioasm",
-                    "ports/raspberrypi/lib",
-                    "ports/silabs/gecko_sdk",
-                    "ports/silabs/tools",
-                    "ports/stm/st_driver",
-                    "ports/stm/packages",
-                    "ports/stm/peripherals",
-                    "ports/stm/ref",
-                    "py",
-                    "shared/*",
-                    "shared-bindings/util.*",
-                    "shared-module",
-                    "supervisor",
-                    "tests",
-                    "test-stubs",
-                    "tools",
-                    "circuitpython-stubs/README.rst"]
+include_patterns = [
+    # Top directory documentation
+    "*.rst",
+    "*.md",
+
+    # Docs inherited from microypython (but not templates or README.md, see below)
+    "docs/**",
+
+    # Module documentation
+    "shared-bindings/**",
+    "ports/*/bindings/**",
+
+    # Port READMEs in various formats
+    "ports/*/README*",
+]
+exclude_patterns = ["docs/autoapi/templates/**", "docs/README.md"]
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.

docs/environment.rst

@@ -111,6 +111,7 @@ during power up at 1024x600 otherwise the display will be initialized at a resol
 of 800x480.
 
 `Sunton ESP32-2432S028 <https://circuitpython.org/board/sunton_esp32_2432S028/>`_
+`Sunton ESP32-2432S024C <https://circuitpython.org/board/sunton_esp32_2432S024C/>`_
 
 CIRCUITPY_DISPLAY_ROTATION
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -119,3 +120,13 @@ If the CIRCUITPY_DISPLAY_ROTATION parameter is set the display will be initializ
 during power up with the selected rotation, otherwise the display will be initialized with
 a rotation of 0. Attempting to initialize the screen with a rotation other than 0,
 90, 180 or 270 is not supported and will result in an unexpected screen rotation.
+
+`Sunton ESP32-8048S050 <https://circuitpython.org/board/sunton_esp32_8048S050/>`_
+
+CIRCUITPY_DISPLAY_FREQUENCY
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Allows the entry of a display frequency used during the "dotclock" framebuffer construction.
+If a valid frequency is not defined the board will initialize the framebuffer with a
+frequency of 12500000hz (12.5Mhz). The value should be entered as an integer in hertz
+i.e. CIRCUITPY_DISPLAY_FREQUENCY=16000000 will override the default value with a 16Mhz
+display frequency.

locale/ID.po

@@ -230,7 +230,7 @@ msgstr "%q harus kelipatan 8."
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/bitmapfilter/__init__.c shared-bindings/canio/CAN.c
 #: shared-bindings/digitalio/Pull.c shared-bindings/supervisor/__init__.c
-#: shared-module/synthio/Synthesizer.c
+#: shared-module/synthio/Biquad.c shared-module/synthio/Synthesizer.c
 msgid "%q must be of type %q or %q, not %q"
 msgstr "%q harus bertipe %q atau %q, bukan %q"
 
@@ -817,6 +817,10 @@ msgstr "Tidak dapat menentukan RTS atau CTS dalam mode RS485"
 msgid "Cannot subclass slice"
 msgstr "Tidak dapat membuat subkelas dari irisan"
 
+#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
+msgid "Cannot use GPIO0..15 together with GPIO32..47"
+msgstr ""
+
 #: ports/nordic/common-hal/alarm/pin/PinAlarm.c
 msgid "Cannot wake on pin edge, only level"
 msgstr "Tidak dapat bangun di tepi pin, hanya level"
@@ -3434,10 +3438,6 @@ msgstr ""
 msgid "label redefined"
 msgstr "label didefinis ulang"
 
-#: shared-bindings/audiomixer/MixerVoice.c
-msgid "level must be between 0 and 1"
-msgstr ""
-
 #: py/objarray.c
 msgid "lhs and rhs should be compatible"
 msgstr ""

locale/circuitpython.pot

@@ -218,7 +218,7 @@ msgstr ""
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/bitmapfilter/__init__.c shared-bindings/canio/CAN.c
 #: shared-bindings/digitalio/Pull.c shared-bindings/supervisor/__init__.c
-#: shared-module/synthio/Synthesizer.c
+#: shared-module/synthio/Biquad.c shared-module/synthio/Synthesizer.c
 msgid "%q must be of type %q or %q, not %q"
 msgstr ""
 
@@ -795,6 +795,10 @@ msgstr ""
 msgid "Cannot subclass slice"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
+msgid "Cannot use GPIO0..15 together with GPIO32..47"
+msgstr ""
+
 #: ports/nordic/common-hal/alarm/pin/PinAlarm.c
 msgid "Cannot wake on pin edge, only level"
 msgstr ""
@@ -3383,10 +3387,6 @@ msgstr ""
 msgid "label redefined"
 msgstr ""
 
-#: shared-bindings/audiomixer/MixerVoice.c
-msgid "level must be between 0 and 1"
-msgstr ""
-
 #: py/objarray.c
 msgid "lhs and rhs should be compatible"
 msgstr ""

locale/cs.po

@@ -229,7 +229,7 @@ msgstr ""
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/bitmapfilter/__init__.c shared-bindings/canio/CAN.c
 #: shared-bindings/digitalio/Pull.c shared-bindings/supervisor/__init__.c
-#: shared-module/synthio/Synthesizer.c
+#: shared-module/synthio/Biquad.c shared-module/synthio/Synthesizer.c
 msgid "%q must be of type %q or %q, not %q"
 msgstr "%q musí být typu %q nebo %q, ne %q"
 
@@ -811,6 +811,10 @@ msgstr "Nelze určit RTS nebo CTS v režimu RS485"
 msgid "Cannot subclass slice"
 msgstr "Nelze použít řez podtřídy"
 
+#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
+msgid "Cannot use GPIO0..15 together with GPIO32..47"
+msgstr ""
+
 #: ports/nordic/common-hal/alarm/pin/PinAlarm.c
 msgid "Cannot wake on pin edge, only level"
 msgstr "Nelze probudit hranou na pinu, pouze úrovní"
@@ -3414,10 +3418,6 @@ msgstr ""
 msgid "label redefined"
 msgstr ""
 
-#: shared-bindings/audiomixer/MixerVoice.c
-msgid "level must be between 0 and 1"
-msgstr ""
-
 #: py/objarray.c
 msgid "lhs and rhs should be compatible"
 msgstr ""

locale/de_DE.po

@@ -232,7 +232,7 @@ msgstr "%q muss ein Vielfaches von 8 sein."
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/bitmapfilter/__init__.c shared-bindings/canio/CAN.c
 #: shared-bindings/digitalio/Pull.c shared-bindings/supervisor/__init__.c
-#: shared-module/synthio/Synthesizer.c
+#: shared-module/synthio/Biquad.c shared-module/synthio/Synthesizer.c
 msgid "%q must be of type %q or %q, not %q"
 msgstr "%q muss von Typ %q oder %q sein, nicht %q"
 
@@ -815,6 +815,10 @@ msgstr "RTS oder CTS können im RS485-Modus nicht angegeben werden"
 msgid "Cannot subclass slice"
 msgstr "Slice kann keine sub-klasse sein"
 
+#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
+msgid "Cannot use GPIO0..15 together with GPIO32..47"
+msgstr ""
+
 #: ports/nordic/common-hal/alarm/pin/PinAlarm.c
 msgid "Cannot wake on pin edge, only level"
 msgstr "Kann nicht durch Flanke an Pin geweckt werden, sondern nur durch Pegel"
@@ -3464,10 +3468,6 @@ msgstr "Label '%q' nicht definiert"
 msgid "label redefined"
 msgstr "Label neu definiert"
 
-#: shared-bindings/audiomixer/MixerVoice.c
-msgid "level must be between 0 and 1"
-msgstr "Der Pegel muss zwischen 0 und 1 liegen"
-
 #: py/objarray.c
 msgid "lhs and rhs should be compatible"
 msgstr "lhs und rhs sollten kompatibel sein"
@@ -4459,6 +4459,9 @@ msgstr "zi muss eine Gleitkommazahl sein"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi muss die Form (n_section, 2) haben"
 
+#~ msgid "level must be between 0 and 1"
+#~ msgstr "Der Pegel muss zwischen 0 und 1 liegen"
+
 #~ msgid "init I2C"
 #~ msgstr "initialisiere I2C"
 

locale/el.po

@@ -233,7 +233,7 @@ msgstr ""
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/bitmapfilter/__init__.c shared-bindings/canio/CAN.c
 #: shared-bindings/digitalio/Pull.c shared-bindings/supervisor/__init__.c
-#: shared-module/synthio/Synthesizer.c
+#: shared-module/synthio/Biquad.c shared-module/synthio/Synthesizer.c
 msgid "%q must be of type %q or %q, not %q"
 msgstr "%q πρέπει να είναι τύπου %q ή %q, όχι %q"
 
@@ -816,6 +816,10 @@ msgstr "Δεν μπορεί να οριστεί RTS ή CTS σε RS485 mode"
 msgid "Cannot subclass slice"
 msgstr "Δεν γίνεται υποκατηγορία ενός slice"
 
+#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
+msgid "Cannot use GPIO0..15 together with GPIO32..47"
+msgstr ""
+
 #: ports/nordic/common-hal/alarm/pin/PinAlarm.c
 msgid "Cannot wake on pin edge, only level"
 msgstr "Δεν γίνεται αφύπνηση σε pin edge, αλλά μόνο σε level"
@@ -3411,10 +3415,6 @@ msgstr ""
 msgid "label redefined"
 msgstr ""
 
-#: shared-bindings/audiomixer/MixerVoice.c
-msgid "level must be between 0 and 1"
-msgstr ""
-
 #: py/objarray.c
 msgid "lhs and rhs should be compatible"
 msgstr ""

locale/en_GB.po

@@ -231,7 +231,7 @@ msgstr "%q must be multiple of 8."
 #: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
 #: shared-bindings/bitmapfilter/__init__.c shared-bindings/canio/CAN.c
 #: shared-bindings/digitalio/Pull.c shared-bindings/supervisor/__init__.c
-#: shared-module/synthio/Synthesizer.c
+#: shared-module/synthio/Biquad.c shared-module/synthio/Synthesizer.c
 msgid "%q must be of type %q or %q, not %q"
 msgstr "%q must be of type %q or %q, not %q"
 
@@ -810,6 +810,10 @@ msgstr "Cannot specify RTS or CTS in RS485 mode"
 msgid "Cannot subclass slice"
 msgstr "Cannot subclass slice"
 
+#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
+msgid "Cannot use GPIO0..15 together with GPIO32..47"
+msgstr ""
+
 #: ports/nordic/common-hal/alarm/pin/PinAlarm.c
 msgid "Cannot wake on pin edge, only level"
 msgstr "Cannot wake on pin edge, only level"
@@ -3421,10 +3425,6 @@ msgstr "label '%q' not defined"
 msgid "label redefined"
 msgstr "label redefined"
 
-#: shared-bindings/audiomixer/MixerVoice.c
-msgid "level must be between 0 and 1"
-msgstr "level must be between 0 and 1"
-
 #: py/objarray.c
 msgid "lhs and rhs should be compatible"
 msgstr "lhs and rhs should be compatible"
@@ -4406,6 +4406,9 @@ msgstr "zi must be of float type"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi must be of shape (n_section, 2)"
 
+#~ msgid "level must be between 0 and 1"
+#~ msgstr "level must be between 0 and 1"
+
 #~ msgid "init I2C"
 #~ msgstr "init I2C"