Merge branch 'adafruit:main' into ports/analog/add-busio

Author: Brandon-Hurst

.github/workflows/build-board-custom.yml

@@ -73,11 +73,18 @@ jobs:
       uses: actions/setup-python@v5
       with:
         python-version: 3.x
+    - name: Board to port
+      id: board-to-port
+      run: |
+        PORT=$(python tools/board_to_port.py "${{ inputs.board }}")
+        echo "port=$PORT" >> $GITHUB_OUTPUT
+      shell: bash
     - name: Set up port
       id: set-up-port
       uses: ./.github/actions/deps/ports
       with:
         board: ${{ inputs.board }}
+        port: ${{ steps.board-to-port.outputs.port }}
     - name: Set up submodules
       id: set-up-submodules
       uses: ./.github/actions/deps/submodules
@@ -88,7 +95,7 @@ jobs:
       uses: ./.github/actions/deps/external
       with:
         action: cache
-        port: ${{ steps.set-up-port.outputs.port }}
+        port: ${{ steps.board-to-port.outputs.port }}
     - name: Set up mpy-cross
       if: steps.set-up-submodules.outputs.frozen == 'True'
       uses: ./.github/actions/mpy_cross
@@ -115,9 +122,9 @@ jobs:
         FLAGS: ${{ inputs.flags }}
         DEBUG: ${{ inputs.debug && '1' || '0' }}
       run: make -j4 $FLAGS BOARD="$BOARD" DEBUG=$DEBUG TRANSLATION="$TRANSLATION"
-      working-directory: ports/${{ steps.set-up-port.outputs.port }}
+      working-directory: ports/${{ steps.board-to-port.outputs.port }}
     - name: Upload artifact
       uses: actions/upload-artifact@v4
       with:
         name: ${{ inputs.board }}-${{ inputs.language }}-${{ inputs.version }}${{ inputs.flags != '' && '-custom' || '' }}${{ inputs.debug && '-debug' || '' }}
-        path: ports/${{ steps.set-up-port.outputs.port }}/build-${{ inputs.board }}/firmware.*
+        path: ports/${{ steps.board-to-port.outputs.port }}/build-${{ inputs.board }}/firmware.*

.gitmodules

@@ -345,7 +345,8 @@
 	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/adafruit/Pico-PIO-USB.git
+	url = https://github.com/tannewt/Pico-PIO-USB.git
+	branch = better_timeouts
 [submodule "lib/micropython-lib"]
 	path = lib/micropython-lib
 	url = https://github.com/micropython/micropython-lib.git

Makefile

@@ -40,20 +40,30 @@ ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(BASEOPTS)
 # the i18n builder cannot share the environment and doctrees with the others
 I18NSPHINXOPTS  = $(BASEOPTS)
 
-TRANSLATE_SOURCES = extmod lib main.c ports/atmel-samd ports/analog ports/cxd56 ports/espressif ports/mimxrt10xx ports/nordic ports/raspberrypi ports/renode ports/stm py shared-bindings shared-module supervisor
+TRANSLATE_SOURCES = extmod lib main.c ports/atmel-samd ports/analog ports/cxd56 ports/espressif ports/mimxrt10xx ports/nordic ports/raspberrypi ports/renode ports/stm ports/zephyr-cp py shared-bindings shared-module supervisor
 # Paths to exclude from TRANSLATE_SOURCES
 # Each must be preceded by "-path"; if any wildcards, enclose in quotes.
 # Separate by "-o" (Find's "or" operand)
 TRANSLATE_SOURCES_EXC = -path "ports/*/build-*" \
 	-o -path "ports/*/build" \
+	-o -path ports/analog/msdk \
 	-o -path ports/atmel-samd/asf4 \
 	-o -path ports/cxd56/spresense-exported-sdk \
+	-o -path ports/espressif/esp-camera \
 	-o -path ports/espressif/esp-idf \
+	-o -path ports/espressif/esp-protocols \
 	-o -path ports/mimxrt10xx/sdk \
+	-o -path ports/nordic/bluetooth \
+	-o -path ports/nordic/nrfx \
+	-o -path ports/raspberrypi/lib \
 	-o -path ports/raspberrypi/sdk \
+	-o -path ports/stm/peripherals \
 	-o -path ports/stm/st_driver \
-	-o -path lib/tinyusb \
-	-o -path lib/lwip \
+	-o -path ports/zephyr-cp/bootloader \
+	-o -path ports/zephyr-cp/modules \
+	-o -path ports/zephyr-cp/tools \
+	-o -path ports/zephyr-cp/zephyr \
+	-o -path lib \
 	-o -path extmod/ulab/circuitpython \
 	-o -path extmod/ulab/micropython \
 

docs/environment.rst

@@ -158,9 +158,13 @@ Selects the desired resolution and color depth.
 
 Supported resolutions are:
  * 640x480 with color depth 1, 2, 4 or 8 bits per pixel
- * 320x240 with color depth 8 or 16 bits per pixel
+ * 320x240 with pixel doubling and color depth 8, 16, or 32 bits per pixel
+ * 360x200 with pixel doubling and color depth 8, 16, or 32 bits per pixel
 
-The default value, if unspecified, is 320x240 with 16 bits per pixel.
+See :py:class:`picodvi.Framebuffer` for more details.
+
+The default value, if unspecified, is 360x200 16 bits per pixel if the connected
+display is 1920x1080 or a multiple of it, otherwise 320x240 with 16 bits per pixel.
 
 If height is unspecified, it is set from the width. For example, a width of 640
 implies a height of 480.

docs/shared_bindings_matrix.py

@@ -362,7 +362,7 @@ def support_matrix(arg):
         if use_branded_name:
             board_name = branded_name
         else:
-            board_name = board_directory.name
+            board_name = board_id
 
         if add_chips:
             with open(board_directory / "mpconfigboard.h") as get_name:

extmod/vfs.h

@@ -71,6 +71,10 @@ typedef struct _mp_vfs_proto_t {
 typedef struct _mp_vfs_blockdev_t {
     uint16_t flags;
     size_t block_size;
+    #if CIRCUITPY_SAVES_PARTITION_SIZE > 0
+    size_t offset;
+    int size;
+    #endif
     mp_obj_t readblocks[5];
     mp_obj_t writeblocks[5];
     // new protocol uses just ioctl, old uses sync (optional) and count

lib/tinyusb

@@ -114,7 +114,7 @@ msgstr "%q berisi pin duplikat"
 msgid "%q failure: %d"
 msgstr "%q gagal: %d"
 
-#: py/argcheck.c
+#: py/argcheck.c shared-module/audiofilters/Filter.c
 msgid "%q in %q must be of type %q, not %q"
 msgstr "%q dalam %q harus bertipe %q, bukan %q"
 
@@ -199,10 +199,6 @@ msgstr "%q harus <= %u"
 msgid "%q must be >= %d"
 msgstr "%q harus >= %d"
 
-#: shared-module/audiofilters/Filter.c
-msgid "%q must be a %q object, %q, or %q"
-msgstr "%q harus berupa objek %q, %q, atau %q"
-
 #: shared-bindings/analogbufio/BufferedIn.c
 msgid "%q must be a bytearray or array of type 'H' or 'B'"
 msgstr "%q harus berupa bytearray atau array bertipe 'H' atau 'B'"
@@ -230,6 +226,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/audiofilters/Filter.c shared-module/displayio/__init__.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"
@@ -554,7 +551,6 @@ msgstr "Semua timer untuk pin ini sedang digunakan"
 #: ports/nordic/common-hal/pulseio/PulseIn.c
 #: ports/nordic/peripherals/nrf/timers.c
 #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
-#: ports/stm/peripherals/timers.c
 msgid "All timers in use"
 msgstr "Semua timer sedang digunakan"
 
@@ -580,6 +576,7 @@ msgstr "Sudah berjalan"
 
 #: ports/espressif/common-hal/wifi/Radio.c
 #: ports/raspberrypi/common-hal/wifi/Radio.c
+#: ports/zephyr-cp/common-hal/wifi/Radio.c
 msgid "Already scanning for wifi networks"
 msgstr "Sudah memindai jaringan wifi"
 
@@ -898,10 +895,6 @@ msgstr "DAC sudah digunakan"
 msgid "Data 0 pin must be byte aligned"
 msgstr "Data 0 pin harus byte disejajarkan"
 
-#: shared-module/audiocore/WaveFile.c
-msgid "Data chunk must follow fmt chunk"
-msgstr "Potongan data harus mengikuti fmt chunk"
-
 #: shared-module/jpegio/JpegDecoder.c
 msgid "Data format error (may be broken data)"
 msgstr "Kesalahan format data (mungkin data rusak)"
@@ -1067,6 +1060,10 @@ msgstr ""
 msgid "Failed to release mutex, err 0x%04x"
 msgstr "Gagal melepaskan mutex, err 0x%04x"
 
+#: ports/zephyr-cp/common-hal/wifi/Radio.c
+msgid "Failed to set hostname"
+msgstr ""
+
 #: ports/espressif/common-hal/audioio/AudioOut.c
 msgid "Failed to start async audio"
 msgstr ""
@@ -1218,6 +1215,7 @@ msgid "Insufficient stream input buffer"
 msgstr ""
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/zephyr-cp/common-hal/wifi/Radio.c
 msgid "Interface must be started"
 msgstr ""
 
@@ -1337,6 +1335,7 @@ msgid "Invalid hex password"
 msgstr ""
 
 #: ports/espressif/common-hal/wifi/Radio.c
+#: ports/zephyr-cp/common-hal/wifi/Radio.c
 msgid "Invalid multicast MAC address"
 msgstr ""
 
@@ -1439,7 +1438,8 @@ msgstr ""
 msgid "Mount point directory missing"
 msgstr ""
 
-#: shared-bindings/busio/UART.c shared-bindings/displayio/Group.c
+#: ports/zephyr-cp/bindings/zephyr_serial/UART.c shared-bindings/busio/UART.c
+#: shared-bindings/displayio/Group.c
 msgid "Must be a %q subclass."
 msgstr "Harus berupa subclass %q."
 
@@ -1681,15 +1681,6 @@ msgstr ""
 msgid "Only int or string supported for ip"
 msgstr ""
 
-#: shared-module/displayio/OnDiskBitmap.c
-#, c-format
-msgid ""
-"Only monochrome, indexed 4bpp or 8bpp, and 16bpp or greater BMPs supported: "
-"%d bpp given"
-msgstr ""
-"Hanya monokrom, 4bpp atau 8bpp yang diindeks, dan 16bpp atau lebih yang "
-"didukung: %d bpp diberikan"
-
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
 msgid "Only one %q can be set in deep sleep."
 msgstr ""
@@ -1740,6 +1731,7 @@ msgstr "Kehabisan memori"
 
 #: ports/espressif/common-hal/socketpool/Socket.c
 #: ports/raspberrypi/common-hal/socketpool/Socket.c
+#: ports/zephyr-cp/common-hal/socketpool/Socket.c
 msgid "Out of sockets"
 msgstr "Kehabisan socket"
 
@@ -2023,6 +2015,7 @@ msgstr "Potongan tidak didukung"
 
 #: ports/espressif/common-hal/socketpool/SocketPool.c
 #: ports/raspberrypi/common-hal/socketpool/SocketPool.c
+#: ports/zephyr-cp/common-hal/socketpool/SocketPool.c
 msgid "SocketPool can only be used with wifi.radio"
 msgstr "SocketPool hanya dapat digunakan dengan wifi.radio"
 
@@ -2063,8 +2056,7 @@ msgstr ""
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr "Panjang rgb_pins harus 6, 12, 18, 24, atau 30"
 
-#: shared-module/audiodelays/Echo.c shared-module/audiofilters/Distortion.c
-#: shared-module/audiofilters/Filter.c shared-module/audiomixer/MixerVoice.c
+#: shared-module/audiocore/__init__.c
 msgid "The sample's %q does not match"
 msgstr "Sampel punya %q yang tidak cocok"
 
@@ -2336,6 +2328,7 @@ msgid "Unsupported hash algorithm"
 msgstr "Algoritma hash tidak didukung"
 
 #: ports/espressif/common-hal/socketpool/Socket.c
+#: ports/zephyr-cp/common-hal/socketpool/Socket.c
 msgid "Unsupported socket type"
 msgstr "Jenis soket tidak didukung"
 
@@ -2629,7 +2622,8 @@ msgstr ""
 msgid "bits must be 32 or less"
 msgstr ""
 
-#: shared-bindings/audiodelays/Echo.c shared-bindings/audiofilters/Distortion.c
+#: shared-bindings/audiodelays/Echo.c shared-bindings/audiodelays/PitchShift.c
+#: shared-bindings/audiofilters/Distortion.c
 #: shared-bindings/audiofilters/Filter.c shared-bindings/audiomixer/Mixer.c
 msgid "bits_per_sample must be 8 or 16"
 msgstr ""
@@ -4412,6 +4406,7 @@ msgstr ""
 
 #: ports/espressif/common-hal/wifi/Radio.c
 #: ports/raspberrypi/common-hal/wifi/Radio.c
+#: ports/zephyr-cp/common-hal/wifi/Radio.c
 msgid "wifi is not enabled"
 msgstr "wifi tidak diaktifkan"
 
@@ -4477,6 +4472,20 @@ msgstr "zi harus berjenis float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "Zi harus berbentuk (n_section, 2)"
 
+#~ msgid "%q must be a %q object, %q, or %q"
+#~ msgstr "%q harus berupa objek %q, %q, atau %q"
+
+#~ msgid "Data chunk must follow fmt chunk"
+#~ msgstr "Potongan data harus mengikuti fmt chunk"
+
+#, c-format
+#~ msgid ""
+#~ "Only monochrome, indexed 4bpp or 8bpp, and 16bpp or greater BMPs "
+#~ "supported: %d bpp given"
+#~ msgstr ""
+#~ "Hanya monokrom, 4bpp atau 8bpp yang diindeks, dan 16bpp atau lebih yang "
+#~ "didukung: %d bpp diberikan"
+
 #~ msgid "The sample's bits_per_sample does not match the mixer's"
 #~ msgstr "Sampel bits_per_sampel tidak cocok dengan mixer"