Flip the canonical rp2040 platform key to rp2

Author: bdraco

esphome_device_builder/controllers/boards.py

@@ -101,7 +101,7 @@ async def get_boards(
         Get boards with optional filtering, search, and pagination.
 
         ``query`` matches the board id, name, manufacturer, description
-        and tags. ``mcu`` narrows the rp2040 platform to one chip series
+        and tags. ``mcu`` narrows the rp2 platform to one chip series
         ("rp2040" / "rp2350"). Sort order: featured first; generics next;
         WiFi-capable boards ahead of non-WiFi within each group; then
         alphabetically. Returns slim :class:`BoardCatalogIndex` entries —
@@ -194,7 +194,7 @@ def find_by_pio_board(
         :meth:`get_board` for pins / featured_components.
 
         ``platform`` scopes the match to one ESPHome platform — nRF52 and
-        rp2040 both ship an ``adafruit_itsybitsy``, so an unscoped lookup
+        rp2 both ship an ``adafruit_itsybitsy``, so an unscoped lookup
         would serve wrong-platform pins. A scoped miss returns ``None``.
 
         Several entries can share a PlatformIO board id (products built on one

esphome_device_builder/controllers/components/controller.py

@@ -549,7 +549,7 @@ def _underlying_id(self, component_id: str) -> str | None:
         Map a wire id to the catalog body it resolves to.
 
         Regular ids return unchanged, except esphome 2026.7's ``rp2``
-        spelling, which resolves to the canonical ``rp2040`` body.
+        spelling, which resolves to the canonical ``rp2`` body.
         ``featured.<board>.<local>`` ids return the underlying
         ``<domain>.<stem>`` id from the featured registry. Returns
         ``None`` when the featured id is unknown so callers can skip

esphome_device_builder/controllers/firmware/download.py

@@ -162,7 +162,7 @@ def _download_types_for(
 ) -> list[dict]:
     """Return ``get_download_types`` entries for *storage*'s platform.
 
-    Static platforms (esp32 / esp8266 / rp2040) come straight from the
+    Static platforms (esp32 / esp8266 / rp2) come straight from the
     precomputed catalog index. Build-dir-dependent platforms (libretiny / nrf52)
     are answered by the device-builder-helper subprocess, so the long-lived
     process never imports ``esphome.components.*``. A missing *storage_path* or a

esphome_device_builder/controllers/remote_build/artifact_platforms/__init__.py

@@ -13,9 +13,9 @@
 
 from ....definitions import load_platform_capabilities_index
 from ....models.boards import normalize_platform
-from . import bk72xx, esp32, esp8266, ln882x, nrf52, rp2040, rtl87xx
+from . import bk72xx, esp32, esp8266, ln882x, nrf52, rp2, rtl87xx
 
-_PLATFORMS = (bk72xx, esp8266, esp32, ln882x, nrf52, rp2040, rtl87xx)
+_PLATFORMS = (bk72xx, esp8266, esp32, ln882x, nrf52, rp2, rtl87xx)
 
 
 @cache

…emote_build/artifact_platforms/rp2040.py …s/remote_build/artifact_platforms/rp2.pyesphome_device_builder/controllers/remote_build/artifact_platforms/rp2040.py renamed to esphome_device_builder/controllers/remote_build/artifact_platforms/rp2.py esphome_device_builder/controllers/remote_build/artifact_platforms/rp2040.py renamed to esphome_device_builder/controllers/remote_build/artifact_platforms/rp2.py

@@ -647,7 +647,7 @@ class PlatformCapabilities(NamedTuple):
     libretiny_families: list[str]
     rp2040_no_wifi_boards: list[str]
     # ``{component: [{title, description, file}]}`` for the platforms whose
-    # download types are static (esp32 / esp8266 / rp2040). Build-dir-dependent
+    # download types are static (esp32 / esp8266 / rp2). Build-dir-dependent
     # platforms (libretiny / nrf52) are absent and resolved via subprocess.
     download_types: dict[str, list[dict[str, str]]]
     # Every shipped component directory name — including the schema-less

esphome_device_builder/definitions/__init__.py

@@ -1 +1 @@
-{"description":"","docs_url":"https://esphome.io/components/rp2040.html","esphome":{"board":"0xcb_helios","mcu":"rp2040","platform":"rp2040"},"id":"0xcb_helios","manufacturer":"","name":"0xCB Helios","pins":[{"features":["pwm","uart_tx"],"gpio":0,"label":"GPIO0","notes":"Default UART0 TX"},{"features":["pwm","uart_rx"],"gpio":1,"label":"GPIO1","notes":"Default UART0 RX"},{"features":["i2c_sda","pwm"],"gpio":2,"label":"GPIO2","notes":"Default I2C1 SDA"},{"features":["i2c_scl","pwm"],"gpio":3,"label":"GPIO3","notes":"Default I2C1 SCL"},{"features":["pwm"],"gpio":4,"label":"GPIO4"},{"features":["pwm"],"gpio":5,"label":"GPIO5"},{"features":["pwm"],"gpio":6,"label":"GPIO6"},{"features":["pwm"],"gpio":7,"label":"GPIO7"},{"features":["pwm"],"gpio":8,"label":"GPIO8"},{"features":["pwm"],"gpio":9,"label":"GPIO9"},{"features":["pwm"],"gpio":10,"label":"GPIO10"},{"features":["pwm"],"gpio":11,"label":"GPIO11"},{"features":["pwm"],"gpio":12,"label":"GPIO12"},{"features":["pwm"],"gpio":13,"label":"GPIO13"},{"features":["pwm"],"gpio":14,"label":"GPIO14"},{"features":["pwm"],"gpio":15,"label":"GPIO15"},{"features":["pwm"],"gpio":16,"label":"GPIO16"},{"features":["pwm"],"gpio":17,"label":"GPIO17","occupied_by":"Built-in LED"},{"features":["pwm"],"gpio":18,"label":"GPIO18"},{"features":["pwm"],"gpio":19,"label":"GPIO19"},{"features":["pwm","spi_miso"],"gpio":20,"label":"GPIO20","notes":"Default SPI0 MISO (RX)"},{"features":["pwm","spi_cs"],"gpio":21,"label":"GPIO21","notes":"Default SPI0 CS"},{"features":["pwm","spi_clk"],"gpio":22,"label":"GPIO22","notes":"Default SPI0 CLK"},{"features":["pwm","spi_mosi"],"gpio":23,"label":"GPIO23","notes":"Default SPI0 MOSI (TX)"},{"features":["pwm"],"gpio":24,"label":"GPIO24"},{"features":["pwm"],"gpio":25,"label":"GPIO25"},{"features":["adc","pwm"],"gpio":26,"label":"GPIO26","notes":"ADC0"},{"features":["adc","pwm"],"gpio":27,"label":"GPIO27","notes":"ADC1"},{"features":["adc","pwm"],"gpio":28,"label":"GPIO28","notes":"ADC2"},{"features":["adc","pwm"],"gpio":29,"label":"GPIO29","notes":"ADC3"}]}
+{"description":"","docs_url":"https://esphome.io/components/rp2.html","esphome":{"board":"0xcb_helios","mcu":"rp2040","platform":"rp2"},"id":"0xcb_helios","manufacturer":"","name":"0xCB Helios","pins":[{"features":["pwm","uart_tx"],"gpio":0,"label":"GPIO0","notes":"Default UART0 TX"},{"features":["pwm","uart_rx"],"gpio":1,"label":"GPIO1","notes":"Default UART0 RX"},{"features":["i2c_sda","pwm"],"gpio":2,"label":"GPIO2","notes":"Default I2C1 SDA"},{"features":["i2c_scl","pwm"],"gpio":3,"label":"GPIO3","notes":"Default I2C1 SCL"},{"features":["pwm"],"gpio":4,"label":"GPIO4"},{"features":["pwm"],"gpio":5,"label":"GPIO5"},{"features":["pwm"],"gpio":6,"label":"GPIO6"},{"features":["pwm"],"gpio":7,"label":"GPIO7"},{"features":["pwm"],"gpio":8,"label":"GPIO8"},{"features":["pwm"],"gpio":9,"label":"GPIO9"},{"features":["pwm"],"gpio":10,"label":"GPIO10"},{"features":["pwm"],"gpio":11,"label":"GPIO11"},{"features":["pwm"],"gpio":12,"label":"GPIO12"},{"features":["pwm"],"gpio":13,"label":"GPIO13"},{"features":["pwm"],"gpio":14,"label":"GPIO14"},{"features":["pwm"],"gpio":15,"label":"GPIO15"},{"features":["pwm"],"gpio":16,"label":"GPIO16"},{"features":["pwm"],"gpio":17,"label":"GPIO17","occupied_by":"Built-in LED"},{"features":["pwm"],"gpio":18,"label":"GPIO18"},{"features":["pwm"],"gpio":19,"label":"GPIO19"},{"features":["pwm","spi_miso"],"gpio":20,"label":"GPIO20","notes":"Default SPI0 MISO (RX)"},{"features":["pwm","spi_cs"],"gpio":21,"label":"GPIO21","notes":"Default SPI0 CS"},{"features":["pwm","spi_clk"],"gpio":22,"label":"GPIO22","notes":"Default SPI0 CLK"},{"features":["pwm","spi_mosi"],"gpio":23,"label":"GPIO23","notes":"Default SPI0 MOSI (TX)"},{"features":["pwm"],"gpio":24,"label":"GPIO24"},{"features":["pwm"],"gpio":25,"label":"GPIO25"},{"features":["adc","pwm"],"gpio":26,"label":"GPIO26","notes":"ADC0"},{"features":["adc","pwm"],"gpio":27,"label":"GPIO27","notes":"ADC1"},{"features":["adc","pwm"],"gpio":28,"label":"GPIO28","notes":"ADC2"},{"features":["adc","pwm"],"gpio":29,"label":"GPIO29","notes":"ADC3"}]}

esphome_device_builder/definitions/board_bodies/0xcb_helios.json

@@ -1 +1 @@
-{"description":"","docs_url":"https://esphome.io/components/rp2040.html","esphome":{"board":"DudesCab","mcu":"rp2040","platform":"rp2040"},"id":"DudesCab","manufacturer":"","name":"L'atelier d'Arnoz DudesCab","pins":[{"features":["pwm","uart_tx"],"gpio":0,"label":"GPIO0","notes":"Default UART0 TX"},{"features":["pwm","uart_rx"],"gpio":1,"label":"GPIO1","notes":"Default UART0 RX"},{"features":["pwm","spi_clk"],"gpio":2,"label":"GPIO2","notes":"Default SPI0 CLK"},{"features":["pwm","spi_mosi"],"gpio":3,"label":"GPIO3","notes":"Default SPI0 MOSI (TX)"},{"features":["pwm","spi_miso"],"gpio":4,"label":"GPIO4","notes":"Default SPI0 MISO (RX)"},{"features":["pwm","spi_cs"],"gpio":5,"label":"GPIO5","notes":"Default SPI0 CS"},{"features":["pwm"],"gpio":6,"label":"GPIO6"},{"features":["pwm"],"gpio":7,"label":"GPIO7"},{"features":["pwm"],"gpio":8,"label":"GPIO8"},{"features":["pwm"],"gpio":9,"label":"GPIO9"},{"features":["i2c_sda","pwm"],"gpio":10,"label":"GPIO10","notes":"Default I2C1 SDA"},{"features":["i2c_scl","pwm"],"gpio":11,"label":"GPIO11","notes":"Default I2C1 SCL"},{"features":["pwm"],"gpio":12,"label":"GPIO12"},{"features":["pwm"],"gpio":13,"label":"GPIO13"},{"features":["pwm"],"gpio":14,"label":"GPIO14"},{"features":["pwm"],"gpio":15,"label":"GPIO15"},{"features":["pwm"],"gpio":16,"label":"GPIO16"},{"features":["pwm"],"gpio":17,"label":"GPIO17"},{"features":["i2c_sda","pwm"],"gpio":18,"label":"GPIO18","notes":"Default I2C0 SDA"},{"features":["i2c_scl","pwm"],"gpio":19,"label":"GPIO19","notes":"Default I2C0 SCL"},{"features":["pwm"],"gpio":20,"label":"GPIO20"},{"features":["pwm"],"gpio":21,"label":"GPIO21"},{"features":["pwm"],"gpio":22,"label":"GPIO22"},{"features":["pwm"],"gpio":23,"label":"GPIO23"},{"features":["pwm"],"gpio":24,"label":"GPIO24"},{"features":["pwm"],"gpio":25,"label":"GPIO25","occupied_by":"Built-in LED"},{"features":["adc","pwm"],"gpio":26,"label":"GPIO26","notes":"ADC0"},{"features":["adc","pwm"],"gpio":27,"label":"GPIO27","notes":"ADC1"},{"features":["adc","pwm"],"gpio":28,"label":"GPIO28","notes":"ADC2"},{"features":["adc","pwm"],"gpio":29,"label":"GPIO29","notes":"ADC3"}]}
+{"description":"","docs_url":"https://esphome.io/components/rp2.html","esphome":{"board":"DudesCab","mcu":"rp2040","platform":"rp2"},"id":"DudesCab","manufacturer":"","name":"L'atelier d'Arnoz DudesCab","pins":[{"features":["pwm","uart_tx"],"gpio":0,"label":"GPIO0","notes":"Default UART0 TX"},{"features":["pwm","uart_rx"],"gpio":1,"label":"GPIO1","notes":"Default UART0 RX"},{"features":["pwm","spi_clk"],"gpio":2,"label":"GPIO2","notes":"Default SPI0 CLK"},{"features":["pwm","spi_mosi"],"gpio":3,"label":"GPIO3","notes":"Default SPI0 MOSI (TX)"},{"features":["pwm","spi_miso"],"gpio":4,"label":"GPIO4","notes":"Default SPI0 MISO (RX)"},{"features":["pwm","spi_cs"],"gpio":5,"label":"GPIO5","notes":"Default SPI0 CS"},{"features":["pwm"],"gpio":6,"label":"GPIO6"},{"features":["pwm"],"gpio":7,"label":"GPIO7"},{"features":["pwm"],"gpio":8,"label":"GPIO8"},{"features":["pwm"],"gpio":9,"label":"GPIO9"},{"features":["i2c_sda","pwm"],"gpio":10,"label":"GPIO10","notes":"Default I2C1 SDA"},{"features":["i2c_scl","pwm"],"gpio":11,"label":"GPIO11","notes":"Default I2C1 SCL"},{"features":["pwm"],"gpio":12,"label":"GPIO12"},{"features":["pwm"],"gpio":13,"label":"GPIO13"},{"features":["pwm"],"gpio":14,"label":"GPIO14"},{"features":["pwm"],"gpio":15,"label":"GPIO15"},{"features":["pwm"],"gpio":16,"label":"GPIO16"},{"features":["pwm"],"gpio":17,"label":"GPIO17"},{"features":["i2c_sda","pwm"],"gpio":18,"label":"GPIO18","notes":"Default I2C0 SDA"},{"features":["i2c_scl","pwm"],"gpio":19,"label":"GPIO19","notes":"Default I2C0 SCL"},{"features":["pwm"],"gpio":20,"label":"GPIO20"},{"features":["pwm"],"gpio":21,"label":"GPIO21"},{"features":["pwm"],"gpio":22,"label":"GPIO22"},{"features":["pwm"],"gpio":23,"label":"GPIO23"},{"features":["pwm"],"gpio":24,"label":"GPIO24"},{"features":["pwm"],"gpio":25,"label":"GPIO25","occupied_by":"Built-in LED"},{"features":["adc","pwm"],"gpio":26,"label":"GPIO26","notes":"ADC0"},{"features":["adc","pwm"],"gpio":27,"label":"GPIO27","notes":"ADC1"},{"features":["adc","pwm"],"gpio":28,"label":"GPIO28","notes":"ADC2"},{"features":["adc","pwm"],"gpio":29,"label":"GPIO29","notes":"ADC3"}]}

esphome_device_builder/definitions/board_bodies/DudesCab.json

@@ -1 +1 @@
-{"description":"","docs_url":"https://esphome.io/components/rp2040.html","esphome":{"board":"MyRP_2350B","mcu":"rp2350","platform":"rp2040"},"id":"MyRP_2350B","manufacturer":"","name":"MyMakers RP2350B","pins":[{"features":["pwm","uart_tx"],"gpio":0,"label":"GPIO0","notes":"Default UART0 TX"},{"features":["pwm","uart_rx"],"gpio":1,"label":"GPIO1","notes":"Default UART0 RX"},{"features":["pwm"],"gpio":2,"label":"GPIO2"},{"features":["pwm"],"gpio":3,"label":"GPIO3"},{"features":["i2c_sda","pwm"],"gpio":4,"label":"GPIO4","notes":"Default I2C0 SDA"},{"features":["i2c_scl","pwm"],"gpio":5,"label":"GPIO5","notes":"Default I2C0 SCL"},{"features":["pwm"],"gpio":6,"label":"GPIO6"},{"features":["pwm"],"gpio":7,"label":"GPIO7"},{"features":["pwm"],"gpio":8,"label":"GPIO8"},{"features":["pwm"],"gpio":9,"label":"GPIO9"},{"features":["pwm"],"gpio":10,"label":"GPIO10"},{"features":["pwm"],"gpio":11,"label":"GPIO11"},{"features":["pwm"],"gpio":12,"label":"GPIO12"},{"features":["pwm"],"gpio":13,"label":"GPIO13"},{"features":["pwm"],"gpio":14,"label":"GPIO14"},{"features":["pwm"],"gpio":15,"label":"GPIO15"},{"features":["pwm","spi_miso"],"gpio":16,"label":"GPIO16","notes":"Default SPI0 MISO (RX)"},{"features":["pwm","spi_cs"],"gpio":17,"label":"GPIO17","notes":"Default SPI0 CS"},{"features":["pwm","spi_clk"],"gpio":18,"label":"GPIO18","notes":"Default SPI0 CLK"},{"features":["pwm","spi_mosi"],"gpio":19,"label":"GPIO19","notes":"Default SPI0 MOSI (TX)"},{"features":["pwm"],"gpio":20,"label":"GPIO20"},{"features":["pwm"],"gpio":21,"label":"GPIO21"},{"features":["pwm"],"gpio":22,"label":"GPIO22"},{"features":["pwm"],"gpio":23,"label":"GPIO23"},{"features":["pwm"],"gpio":24,"label":"GPIO24"},{"features":["pwm"],"gpio":25,"label":"GPIO25","occupied_by":"Built-in LED"},{"features":["i2c_sda","pwm"],"gpio":26,"label":"GPIO26","notes":"Default I2C1 SDA"},{"features":["i2c_scl","pwm"],"gpio":27,"label":"GPIO27","notes":"Default I2C1 SCL"},{"features":["pwm"],"gpio":28,"label":"GPIO28"},{"features":["pwm"],"gpio":29,"label":"GPIO29"},{"features":["pwm"],"gpio":30,"label":"GPIO30"},{"features":["pwm"],"gpio":31,"label":"GPIO31"},{"features":["pwm"],"gpio":32,"label":"GPIO32"},{"features":["pwm"],"gpio":33,"label":"GPIO33"},{"features":["pwm"],"gpio":34,"label":"GPIO34"},{"features":["pwm"],"gpio":35,"label":"GPIO35"},{"features":["pwm"],"gpio":36,"label":"GPIO36"},{"features":["pwm"],"gpio":37,"label":"GPIO37"},{"features":["pwm"],"gpio":38,"label":"GPIO38"},{"features":["pwm"],"gpio":39,"label":"GPIO39"},{"features":["adc","pwm"],"gpio":40,"label":"GPIO40","notes":"ADC0"},{"features":["adc","pwm"],"gpio":41,"label":"GPIO41","notes":"ADC1"},{"features":["adc","pwm"],"gpio":42,"label":"GPIO42","notes":"ADC2"},{"features":["adc","pwm"],"gpio":43,"label":"GPIO43","notes":"ADC3"},{"features":["adc","pwm"],"gpio":44,"label":"GPIO44","notes":"ADC4"},{"features":["adc","pwm"],"gpio":45,"label":"GPIO45","notes":"ADC5"},{"features":["adc","pwm"],"gpio":46,"label":"GPIO46","notes":"ADC6"},{"features":["adc","pwm"],"gpio":47,"label":"GPIO47","notes":"ADC7"}]}
+{"description":"","docs_url":"https://esphome.io/components/rp2.html","esphome":{"board":"MyRP_2350B","mcu":"rp2350","platform":"rp2"},"id":"MyRP_2350B","manufacturer":"","name":"MyMakers RP2350B","pins":[{"features":["pwm","uart_tx"],"gpio":0,"label":"GPIO0","notes":"Default UART0 TX"},{"features":["pwm","uart_rx"],"gpio":1,"label":"GPIO1","notes":"Default UART0 RX"},{"features":["pwm"],"gpio":2,"label":"GPIO2"},{"features":["pwm"],"gpio":3,"label":"GPIO3"},{"features":["i2c_sda","pwm"],"gpio":4,"label":"GPIO4","notes":"Default I2C0 SDA"},{"features":["i2c_scl","pwm"],"gpio":5,"label":"GPIO5","notes":"Default I2C0 SCL"},{"features":["pwm"],"gpio":6,"label":"GPIO6"},{"features":["pwm"],"gpio":7,"label":"GPIO7"},{"features":["pwm"],"gpio":8,"label":"GPIO8"},{"features":["pwm"],"gpio":9,"label":"GPIO9"},{"features":["pwm"],"gpio":10,"label":"GPIO10"},{"features":["pwm"],"gpio":11,"label":"GPIO11"},{"features":["pwm"],"gpio":12,"label":"GPIO12"},{"features":["pwm"],"gpio":13,"label":"GPIO13"},{"features":["pwm"],"gpio":14,"label":"GPIO14"},{"features":["pwm"],"gpio":15,"label":"GPIO15"},{"features":["pwm","spi_miso"],"gpio":16,"label":"GPIO16","notes":"Default SPI0 MISO (RX)"},{"features":["pwm","spi_cs"],"gpio":17,"label":"GPIO17","notes":"Default SPI0 CS"},{"features":["pwm","spi_clk"],"gpio":18,"label":"GPIO18","notes":"Default SPI0 CLK"},{"features":["pwm","spi_mosi"],"gpio":19,"label":"GPIO19","notes":"Default SPI0 MOSI (TX)"},{"features":["pwm"],"gpio":20,"label":"GPIO20"},{"features":["pwm"],"gpio":21,"label":"GPIO21"},{"features":["pwm"],"gpio":22,"label":"GPIO22"},{"features":["pwm"],"gpio":23,"label":"GPIO23"},{"features":["pwm"],"gpio":24,"label":"GPIO24"},{"features":["pwm"],"gpio":25,"label":"GPIO25","occupied_by":"Built-in LED"},{"features":["i2c_sda","pwm"],"gpio":26,"label":"GPIO26","notes":"Default I2C1 SDA"},{"features":["i2c_scl","pwm"],"gpio":27,"label":"GPIO27","notes":"Default I2C1 SCL"},{"features":["pwm"],"gpio":28,"label":"GPIO28"},{"features":["pwm"],"gpio":29,"label":"GPIO29"},{"features":["pwm"],"gpio":30,"label":"GPIO30"},{"features":["pwm"],"gpio":31,"label":"GPIO31"},{"features":["pwm"],"gpio":32,"label":"GPIO32"},{"features":["pwm"],"gpio":33,"label":"GPIO33"},{"features":["pwm"],"gpio":34,"label":"GPIO34"},{"features":["pwm"],"gpio":35,"label":"GPIO35"},{"features":["pwm"],"gpio":36,"label":"GPIO36"},{"features":["pwm"],"gpio":37,"label":"GPIO37"},{"features":["pwm"],"gpio":38,"label":"GPIO38"},{"features":["pwm"],"gpio":39,"label":"GPIO39"},{"features":["adc","pwm"],"gpio":40,"label":"GPIO40","notes":"ADC0"},{"features":["adc","pwm"],"gpio":41,"label":"GPIO41","notes":"ADC1"},{"features":["adc","pwm"],"gpio":42,"label":"GPIO42","notes":"ADC2"},{"features":["adc","pwm"],"gpio":43,"label":"GPIO43","notes":"ADC3"},{"features":["adc","pwm"],"gpio":44,"label":"GPIO44","notes":"ADC4"},{"features":["adc","pwm"],"gpio":45,"label":"GPIO45","notes":"ADC5"},{"features":["adc","pwm"],"gpio":46,"label":"GPIO46","notes":"ADC6"},{"features":["adc","pwm"],"gpio":47,"label":"GPIO47","notes":"ADC7"}]}