From 4f57a2e2485778d92a98bc2e719a6314cc45539d Mon Sep 17 00:00:00 2001
From: Austin <vidplace7@gmail.com>
Date: Fri, 25 Jul 2025 16:25:50 -0400
Subject: [PATCH] Build RP2350 (Pi Pico 2) (#7441)

---
 .github/workflows/main_matrix.yml        | 51 +++++++++++++++++++++---
 bin/build-firmware.sh                    |  2 +-
 variants/rp2040/rpipicow/platformio.ini  |  1 +
 variants/rp2350/rpipico2w/platformio.ini |  1 +
 4 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main_matrix.yml b/.github/workflows/main_matrix.yml
index c62d80888..a98bdc011 100644
--- a/.github/workflows/main_matrix.yml
+++ b/.github/workflows/main_matrix.yml
@@ -30,7 +30,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch: [esp32, esp32s3, esp32c3, esp32c6, nrf52840, rp2040, stm32, check]
+        arch:
+          - esp32
+          - esp32s3
+          - esp32c3
+          - esp32c6
+          - nrf52840
+          - rp2040
+          - rp2350
+          - stm32
+          - check
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
@@ -56,6 +65,7 @@ jobs:
       esp32c6: ${{ steps.jsonStep.outputs.esp32c6 }}
       nrf52840: ${{ steps.jsonStep.outputs.nrf52840 }}
       rp2040: ${{ steps.jsonStep.outputs.rp2040 }}
+      rp2350: ${{ steps.jsonStep.outputs.rp2350 }}
       stm32: ${{ steps.jsonStep.outputs.stm32 }}
       check: ${{ steps.jsonStep.outputs.check }}
 
@@ -145,7 +155,7 @@ jobs:
       pio_env: ${{ matrix.board }}
       platform: nrf52840
 
-  build-rpi2040:
+  build-rp2040:
     needs: [setup, version]
     strategy:
       fail-fast: false
@@ -156,6 +166,17 @@ jobs:
       pio_env: ${{ matrix.board }}
       platform: rp2040
 
+  build-rp2350:
+    needs: [setup, version]
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJson(needs.setup.outputs.rp2350) }}
+    uses: ./.github/workflows/build_firmware.yml
+    with:
+      version: ${{ needs.version.outputs.long }}
+      pio_env: ${{ matrix.board }}
+      platform: rp2350
+
   build-stm32:
     needs: [setup, version]
     strategy:
@@ -243,7 +264,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch: [esp32, esp32s3, esp32c3, esp32c6, nrf52840, rp2040, stm32]
+        arch:
+          - esp32
+          - esp32s3
+          - esp32c3
+          - esp32c6
+          - nrf52840
+          - rp2040
+          - rp2350
+          - stm32
     runs-on: ubuntu-latest
     needs:
       [
@@ -253,7 +282,8 @@ jobs:
         build-esp32c3,
         build-esp32c6,
         build-nrf52840,
-        build-rpi2040,
+        build-rp2040,
+        build-rp2350,
         build-stm32,
       ]
     steps:
@@ -392,7 +422,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch: [esp32, esp32s3, esp32c3, esp32c6, nrf52840, rp2040, stm32]
+        arch:
+          - esp32
+          - esp32s3
+          - esp32c3
+          - esp32c6
+          - nrf52840
+          - rp2040
+          - rp2350
+          - stm32
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'workflow_dispatch' }}
     needs: [release-artifacts, version]
@@ -449,7 +487,8 @@ jobs:
     if: ${{ github.event_name == 'workflow_dispatch' }}
     needs: [release-firmware, version]
     env:
-      targets: esp32,esp32s3,esp32c3,esp32c6,nrf52840,rp2040,stm32
+      targets: |-
+        esp32,esp32s3,esp32c3,esp32c6,nrf52840,rp2040,rp2350,stm32
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/bin/build-firmware.sh b/bin/build-firmware.sh
index c53f1b660..fdd7caa11 100644
--- a/bin/build-firmware.sh
+++ b/bin/build-firmware.sh
@@ -11,7 +11,7 @@ elif (echo $2 | grep -q "nrf52"); then
 elif (echo $2 | grep -q "stm32"); then
   bin/build-stm32.sh $1
 elif (echo $2 | grep -q "rpi2040"); then
-  bin/build-rpi2040.sh $1
+  bin/build-rp2xx0.sh $1
 else
   echo "Unknown target $2"
   exit 1
diff --git a/variants/rp2040/rpipicow/platformio.ini b/variants/rp2040/rpipicow/platformio.ini
index 658d113d7..60845ba39 100644
--- a/variants/rp2040/rpipicow/platformio.ini
+++ b/variants/rp2040/rpipicow/platformio.ini
@@ -2,6 +2,7 @@
 extends = rp2040_base
 board = rpipicow
 board_level = pr
+board_check = true
 upload_protocol = picotool
 # add our variants files to the include and src paths
 build_flags = 
diff --git a/variants/rp2350/rpipico2w/platformio.ini b/variants/rp2350/rpipico2w/platformio.ini
index 59b1354b4..5dbce533b 100644
--- a/variants/rp2350/rpipico2w/platformio.ini
+++ b/variants/rp2350/rpipico2w/platformio.ini
@@ -2,6 +2,7 @@
 extends = rp2350_base
 board = rpipico2w
 board_level = pr
+board_check = true
 upload_protocol = jlink
 # debug settings for external openocd with RP2040 support (custom build)
 debug_tool = custom