Merge branch 'adafruit:main' into pendrive-s3

Author: squix78

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

@@ -1,4 +1,4 @@
-name: Custom board build
+name: Build board (custom)
 
 on:
   workflow_dispatch:
@@ -21,6 +21,11 @@ on:
         description: 'Flags: Build flags (e.g. CIRCUITPY_WIFI=1)'
         required: false
         type: string
+      branch:
+        description: 'Branch (only if Version="latest")'
+        required: false
+        default: 'main'
+        type: string
       debug:
         description: 'Make a debug build'
         required: false
@@ -36,7 +41,22 @@ jobs:
     - name: Set up repository
       run: |
         git clone --filter=tree:0 https://github.com/adafruit/circuitpython.git $GITHUB_WORKSPACE
+    - name: Checkout head / tag
+      run: |
         git checkout ${{ inputs.version == 'latest' && 'HEAD' || inputs.version }}
+    - name: fork compatibility
+      if: github.repository_owner != 'adafruit'
+      run: |
+        git remote add fork https://github.com/${{github.repository}}.git
+        git fetch fork --filter=tree:0
+    - name: branch compatibility
+      if: inputs.branch != 'main' && inputs.version == 'latest' && github.repository_owner == 'adafruit'
+      run: |
+        git checkout ${{inputs.branch}}
+    - name: branch compatibility (fork)
+      if: inputs.branch != '' && inputs.version == 'latest' && github.repository_owner != 'adafruit'
+      run: |
+        git checkout -b fork-branch fork/${{inputs.branch}}
     - name: Set up identifier
       if: inputs.debug || inputs.flags != ''
       run: |

.github/workflows/pre-commit.yml

@@ -33,7 +33,7 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install -y gettext uncrustify
+        sudo apt-get install -y gettext
     - name: Run pre-commit
       uses: pre-commit/[email protected]
     - name: Make patch

locale/circuitpython.pot

@@ -1173,6 +1173,7 @@ msgstr ""
 msgid "Interrupted by output function"
 msgstr ""
 
+#: ports/espressif/common-hal/espulp/ULP.c
 #: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
 #: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
 #: ports/raspberrypi/bindings/picodvi/Framebuffer.c

ports/atmel-samd/boards/hallowing_m0_express/board.c

@@ -12,7 +12,6 @@
 #include "shared-module/displayio/mipi_constants.h"
 #include "shared-bindings/busio/SPI.h"
 
-fourwire_fourwire_obj_t board_display_obj;
 
 #define DELAY 0x80
 

ports/atmel-samd/boards/hallowing_m4_express/board.c

@@ -13,7 +13,6 @@
 #include "shared-module/displayio/__init__.h"
 #include "shared-module/displayio/mipi_constants.h"
 
-fourwire_fourwire_obj_t board_display_obj;
 
 #define DELAY 0x80
 

ports/atmel-samd/boards/monster_m4sk/board.c

@@ -12,7 +12,6 @@
 #include "shared-module/displayio/__init__.h"
 #include "shared-module/displayio/mipi_constants.h"
 
-fourwire_fourwire_obj_t board_display_obj;
 
 #define DELAY 0x80
 

ports/atmel-samd/boards/openbook_m4/board.c

@@ -13,7 +13,6 @@
 #include "shared-module/displayio/__init__.h"
 #include "shared-module/displayio/mipi_constants.h"
 
-fourwire_fourwire_obj_t board_display_obj;
 
 #define DELAY 0x80
 #define HEIGHT 400

ports/atmel-samd/boards/pewpew_lcd/board.c

@@ -12,7 +12,6 @@
 #include "shared-module/displayio/__init__.h"
 #include "shared-module/displayio/mipi_constants.h"
 
-fourwire_fourwire_obj_t board_display_obj;
 
 #define DELAY 0x80
 

ports/atmel-samd/boards/pewpew_m4/board.c

@@ -12,7 +12,6 @@
 #include "shared-module/displayio/__init__.h"
 #include "shared-module/displayio/mipi_constants.h"
 
-fourwire_fourwire_obj_t board_display_obj;
 
 typedef struct {
     const uint32_t *config_data;

ports/atmel-samd/boards/pygamer/board.c

@@ -13,7 +13,6 @@
 #include "shared-module/displayio/mipi_constants.h"
 #include "supervisor/shared/board.h"
 
-fourwire_fourwire_obj_t board_display_obj;
 
 #define DELAY 0x80