From 43f3ec1367c933242b0fbbd74fe8b7c6ac4483ff Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Thu, 9 Oct 2025 14:53:47 -1000 Subject: [PATCH] mege --- tests/components/mapping/test.esp32-c3-idf.yaml | 12 ++++-------- tests/components/mapping/test.esp32-idf.yaml | 12 ++++-------- tests/components/mapping/test.esp8266-ard.yaml | 12 ++++-------- tests/components/mapping/test.rp2040-ard.yaml | 12 ++++-------- tests/components/mipi_rgb/test.esp32-s3-idf.yaml | 12 ++++-------- .../components/mipi_spi/test-lvgl.esp32-s3-idf.yaml | 13 +++---------- tests/components/mipi_spi/test.esp32-c3-idf.yaml | 3 ++- tests/components/mipi_spi/test.esp32-idf.yaml | 3 ++- tests/components/mipi_spi/test.rp2040-ard.yaml | 3 ++- 9 files changed, 29 insertions(+), 53 deletions(-) diff --git a/tests/components/mapping/test.esp32-c3-idf.yaml b/tests/components/mapping/test.esp32-c3-idf.yaml index f95dd4f30d..7911eb7edc 100644 --- a/tests/components/mapping/test.esp32-c3-idf.yaml +++ b/tests/components/mapping/test.esp32-c3-idf.yaml @@ -1,10 +1,9 @@ -spi: - - id: spi_main_lcd - clk_pin: 6 - mosi_pin: 7 - miso_pin: 5 +packages: + spi: !include ../../test_build_components/common/spi/esp32-c3-idf.yaml + map: !include common.yaml display: + spi_id: spi_bus platform: ili9xxx id: main_lcd model: ili9342 @@ -12,6 +11,3 @@ display: dc_pin: 9 reset_pin: 10 invert_colors: false - -packages: - map: !include common.yaml diff --git a/tests/components/mapping/test.esp32-idf.yaml b/tests/components/mapping/test.esp32-idf.yaml index 231fdae797..a35b6940c7 100644 --- a/tests/components/mapping/test.esp32-idf.yaml +++ b/tests/components/mapping/test.esp32-idf.yaml @@ -1,10 +1,9 @@ -spi: - - id: spi_main_lcd - clk_pin: 16 - mosi_pin: 17 - miso_pin: 15 +packages: + spi: !include ../../test_build_components/common/spi/esp32-idf.yaml + map: !include common.yaml display: + spi_id: spi_bus platform: ili9xxx id: main_lcd model: ili9342 @@ -12,6 +11,3 @@ display: dc_pin: 13 reset_pin: 21 invert_colors: false - -packages: - map: !include common.yaml diff --git a/tests/components/mapping/test.esp8266-ard.yaml b/tests/components/mapping/test.esp8266-ard.yaml index a5b45d391a..c59821a211 100644 --- a/tests/components/mapping/test.esp8266-ard.yaml +++ b/tests/components/mapping/test.esp8266-ard.yaml @@ -1,10 +1,9 @@ -spi: - - id: spi_main_lcd - clk_pin: 14 - mosi_pin: 13 - miso_pin: 12 +packages: + spi: !include ../../test_build_components/common/spi/esp8266-ard.yaml + map: !include common.yaml display: + spi_id: spi_bus platform: ili9xxx id: main_lcd model: ili9342 @@ -12,6 +11,3 @@ display: dc_pin: 15 reset_pin: 16 invert_colors: false - -packages: - map: !include common.yaml diff --git a/tests/components/mapping/test.rp2040-ard.yaml b/tests/components/mapping/test.rp2040-ard.yaml index f092686553..acc305a701 100644 --- a/tests/components/mapping/test.rp2040-ard.yaml +++ b/tests/components/mapping/test.rp2040-ard.yaml @@ -1,10 +1,9 @@ -spi: - - id: spi_main_lcd - clk_pin: 2 - mosi_pin: 3 - miso_pin: 4 +packages: + spi: !include ../../test_build_components/common/spi/rp2040-ard.yaml + map: !include common.yaml display: + spi_id: spi_bus platform: ili9xxx id: main_lcd model: ili9342 @@ -12,6 +11,3 @@ display: dc_pin: 21 reset_pin: 22 invert_colors: false - -packages: - map: !include common.yaml diff --git a/tests/components/mipi_rgb/test.esp32-s3-idf.yaml b/tests/components/mipi_rgb/test.esp32-s3-idf.yaml index 8d0e20d6f5..29f833c235 100644 --- a/tests/components/mipi_rgb/test.esp32-s3-idf.yaml +++ b/tests/components/mipi_rgb/test.esp32-s3-idf.yaml @@ -1,16 +1,12 @@ +packages: + spi: !include ../../test_build_components/common/spi/esp32-s3-idf.yaml + psram: mode: octal -spi: - - clk_pin: - number: 47 - allow_other_uses: true - mosi_pin: - number: 41 - allow_other_uses: true - display: - platform: mipi_rgb + spi_id: spi_bus model: ZX2D10GE01R-V4848 update_interval: 1s color_order: BGR diff --git a/tests/components/mipi_spi/test-lvgl.esp32-s3-idf.yaml b/tests/components/mipi_spi/test-lvgl.esp32-s3-idf.yaml index e0f65a3a6a..48f34f3449 100644 --- a/tests/components/mipi_spi/test-lvgl.esp32-s3-idf.yaml +++ b/tests/components/mipi_spi/test-lvgl.esp32-s3-idf.yaml @@ -1,16 +1,9 @@ -substitutions: - clk_pin: GPIO16 - mosi_pin: GPIO17 - -spi: - - id: spi_single - clk_pin: - number: ${clk_pin} - mosi_pin: - number: ${mosi_pin} +packages: + spi: !include ../../test_build_components/common/spi/esp32-s3-idf.yaml display: - platform: mipi_spi + spi_id: spi_bus model: t-display-s3-pro lvgl: diff --git a/tests/components/mipi_spi/test.esp32-c3-idf.yaml b/tests/components/mipi_spi/test.esp32-c3-idf.yaml index d00615b824..55e25d8318 100644 --- a/tests/components/mipi_spi/test.esp32-c3-idf.yaml +++ b/tests/components/mipi_spi/test.esp32-c3-idf.yaml @@ -6,4 +6,5 @@ substitutions: packages: spi: !include ../../test_build_components/common/spi/esp32-c3-idf.yaml - display: !include common.yaml + +<<: !include common.yaml diff --git a/tests/components/mipi_spi/test.esp32-idf.yaml b/tests/components/mipi_spi/test.esp32-idf.yaml index ba4765ce09..b173b8de87 100644 --- a/tests/components/mipi_spi/test.esp32-idf.yaml +++ b/tests/components/mipi_spi/test.esp32-idf.yaml @@ -6,4 +6,5 @@ substitutions: packages: spi: !include ../../test_build_components/common/spi/esp32-idf.yaml - display: !include common.yaml + +<<: !include common.yaml diff --git a/tests/components/mipi_spi/test.rp2040-ard.yaml b/tests/components/mipi_spi/test.rp2040-ard.yaml index 85b0304cc0..380cebcde3 100644 --- a/tests/components/mipi_spi/test.rp2040-ard.yaml +++ b/tests/components/mipi_spi/test.rp2040-ard.yaml @@ -6,4 +6,5 @@ substitutions: packages: spi: !include ../../test_build_components/common/spi/rp2040-ard.yaml - display: !include common.yaml + +<<: !include common.yaml