Merge branch 'main' into blues-cygnet-add

Author: Bucknalla

.github/pull_request_template.md

@@ -0,0 +1,10 @@
+Thanks for submitting a pull request to CircuitPython! Remove these instructions before submitting.
+
+ See https://learn.adafruit.com/contribute-to-circuitpython-with-git-and-github for detailed instructions.
+
+- Consider whether to submit this PR against `main` or against (if it exists) the branch for the current stable release or an upcoming minor release. The branch will be named `i.j.x`, for example, `9.2.x`. Bug fixes and minor enhancements can be submitted against the stable release branch, and will be merged to `main` regularly.
+- Create your own fork of `circuitpython` and create a branch for your changes.
+- Use `pre-commit` to check your commits before submitting. See https://learn.adafruit.com/contribute-to-circuitpython-with-git-and-github/check-your-code.
+- Test your changes and tell us how you tested.
+
+---

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

.pre-commit-config.yaml

@@ -10,9 +10,9 @@ repos:
     hooks:
     -   id: check-yaml
     -   id: end-of-file-fixer
-        exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/raspberrypi/sdk|lib/tinyusb)'
+        exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/mimxrt10xx/sdk|ports/raspberrypi/sdk|lib/tinyusb)'
     -   id: trailing-whitespace
-        exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|lib/mbedtls_errors/generate_errors.diff|ports/raspberrypi/sdk|lib/tinyusb)'
+        exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|lib/mbedtls_errors/generate_errors.diff|ports/raspberrypi/sdk|ports/mimxrt10xx/sdk|lib/tinyusb)'
 -   repo: https://github.com/codespell-project/codespell
     rev: v2.2.4
     hooks:
@@ -59,3 +59,4 @@ repos:
   rev: "v2.5.0"
   hooks:
     - id: pyproject-fmt
+      exclude: '^(ports/mimxrt10xx/sdk)'

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/library/errno.rst

@@ -7,7 +7,7 @@
 |see_cpython_module| :mod:`python:errno`.
 
 This module provides access to symbolic error codes for `OSError` exception.
-The codes available may vary per CircuitPython build.
+Some codes are not available on the smallest CircuitPython builds, such as SAMD21, for space reasons.
 
 Constants
 ---------

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