From eb9aae04d0e9775f9d6d362652de7e14b5b4f255 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Tue, 29 Sep 2026 12:51:03 +0200
Subject: [PATCH] [rp2] Bump arduino-pico framework to 6.1.1 (#19881)

---
 esphome/components/rp2/__init__.py            | 11 +++---
 esphome/components/rp2/boards.py              | 37 +++++++++++++++++++
 .../components/rp2040_ble/btstack_memory.cpp  |  2 +-
 esphome/core/defines.h                        |  2 +-
 platformio.ini                                |  2 +-
 5 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/esphome/components/rp2/__init__.py b/esphome/components/rp2/__init__.py
index a1bbf6a3d6..23346ca6f4 100644
--- a/esphome/components/rp2/__init__.py
+++ b/esphome/components/rp2/__init__.py
@@ -197,20 +197,21 @@ def _parse_platform_version(value: Any) -> str:
 
 # The default/recommended arduino framework version
 #  - https://github.com/earlephilhower/arduino-pico/releases
-RECOMMENDED_ARDUINO_FRAMEWORK_VERSION = cv.Version(6, 1, 0)
+RECOMMENDED_ARDUINO_FRAMEWORK_VERSION = cv.Version(6, 1, 1)
 
 # The raspberrypi platform version to use for arduino frameworks
 #  - https://github.com/maxgerhardt/platform-raspberrypi/tags
-# develop-branch commit carrying the arduino-pico 6.1.0 update and the board
-# JSON files it adds; replace with a release tag when one is cut
+# develop-branch commit carrying the arduino-pico 6.1.0 update; it predates
+# 6.1.1, so the boards that release adds have no board JSON on it yet; replace
+# with a release tag when one is cut
 RECOMMENDED_ARDUINO_PLATFORM_VERSION = "5d4561a05e3b212660ac6fdd3fbfb328d1988aa1"
 
 
 def _arduino_check_versions(value: ConfigType) -> ConfigType:
     value = value.copy()
     lookups = {
-        "dev": (cv.Version(6, 1, 0), "https://github.com/earlephilhower/arduino-pico"),
-        "latest": (cv.Version(6, 1, 0), None),
+        "dev": (cv.Version(6, 1, 1), "https://github.com/earlephilhower/arduino-pico"),
+        "latest": (cv.Version(6, 1, 1), None),
         "recommended": (RECOMMENDED_ARDUINO_FRAMEWORK_VERSION, None),
     }
 
diff --git a/esphome/components/rp2/boards.py b/esphome/components/rp2/boards.py
index a9ce11c33d..08536fd053 100644
--- a/esphome/components/rp2/boards.py
+++ b/esphome/components/rp2/boards.py
@@ -1442,6 +1442,19 @@ RP2_BOARD_PINS = {
         "SS": 5,
         "TX": 0,
     },
+    "waveshare_rp2350_core": {
+        "LED": 39,
+        "MISO": 16,
+        "MOSI": 19,
+        "RX": 1,
+        "SCK": 18,
+        "SCL": 9,
+        "SCL1": 11,
+        "SDA": 8,
+        "SDA1": 10,
+        "SS": 17,
+        "TX": 0,
+    },
     "waveshare_rp2350_lcd_0_96": {
         "MISO": 16,
         "MOSI": 19,
@@ -1479,6 +1492,18 @@ RP2_BOARD_PINS = {
         "SS": 17,
         "TX": 0,
     },
+    "waveshare_rp2350_poe_eth": {
+        "MISO": 16,
+        "MOSI": 19,
+        "RX": 1,
+        "SCK": 18,
+        "SCL": 5,
+        "SCL1": 27,
+        "SDA": 4,
+        "SDA1": 26,
+        "SS": 17,
+        "TX": 0,
+    },
     "waveshare_rp2350_zero": {
         "MISO": 4,
         "MOSI": 3,
@@ -2286,6 +2311,12 @@ BOARDS = {
         "mcu": "rp2040",
         "max_pin": 29,
     },
+    "waveshare_rp2350_core": {
+        "name": "Waveshare RP2350 Core",
+        "mcu": "rp2350",
+        "max_pin": 47,
+        "die": "B",
+    },
     "waveshare_rp2350_lcd_0_96": {
         "name": "Waveshare RP2350 LCD 0.96",
         "mcu": "rp2350",
@@ -2304,6 +2335,12 @@ BOARDS = {
         "max_pin": 29,
         "die": "A",
     },
+    "waveshare_rp2350_poe_eth": {
+        "name": "Waveshare RP2350-POE-ETH",
+        "mcu": "rp2350",
+        "max_pin": 29,
+        "die": "A",
+    },
     "waveshare_rp2350_zero": {
         "name": "Waveshare RP2350 Zero",
         "mcu": "rp2350",
diff --git a/esphome/components/rp2040_ble/btstack_memory.cpp b/esphome/components/rp2040_ble/btstack_memory.cpp
index 699555f623..adf45eeaf7 100644
--- a/esphome/components/rp2040_ble/btstack_memory.cpp
+++ b/esphome/components/rp2040_ble/btstack_memory.cpp
@@ -20,7 +20,7 @@
 namespace esphome::rp2040_ble {
 namespace {
 
-// Pinned against arduino-pico 6.1.0's prebuilt archives: a framework bump (or
+// Pinned against arduino-pico 6.1.1's prebuilt archives: a framework bump (or
 // a changed ENABLE_* macro) shifting the struct layout must fail the build
 // here, not overrun the pool blocks at runtime. Sizes differ per core
 // architecture (measured from each archive's own storage symbols). GCC only:
diff --git a/esphome/core/defines.h b/esphome/core/defines.h
index da03f0e3d1..115bae96c6 100644
--- a/esphome/core/defines.h
+++ b/esphome/core/defines.h
@@ -546,7 +546,7 @@
 // rp2/__init__.py codegen also defines USE_RP2040 as a back-compat alias
 // for external custom components that may still test for it.
 #ifdef USE_RP2
-#define USE_ARDUINO_VERSION_CODE VERSION_CODE(6, 1, 0)
+#define USE_ARDUINO_VERSION_CODE VERSION_CODE(6, 1, 1)
 #define USE_RP2_CRASH_HANDLER
 #define USE_HTTP_REQUEST_RESPONSE
 #define USE_I2C
diff --git a/platformio.ini b/platformio.ini
index 102c7973b9..dd2a572493 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -207,7 +207,7 @@ platform = https://github.com/maxgerhardt/platform-raspberrypi.git#5d4561a05e3b2
 platform_packages =
     ; The framework-arduinopico package is no longer published to the PlatformIO
     ; registry, so install the framework straight from the GitHub release
-    earlephilhower/framework-arduinopico@https://github.com/earlephilhower/arduino-pico/releases/download/6.1.0/rp2040-6.1.0.zip
+    earlephilhower/framework-arduinopico@https://github.com/earlephilhower/arduino-pico/releases/download/6.1.1/rp2040-6.1.1.zip
 
 framework = arduino
 lib_deps =