mege

tests/components/mapping/test.esp32-c3-idf.yaml

@@ -1,10 +1,9 @@
-spi:
+packages:
-  - id: spi_main_lcd
+  spi: !include ../../test_build_components/common/spi/esp32-c3-idf.yaml
-    clk_pin: 6
+  map: !include common.yaml
-    mosi_pin: 7
-    miso_pin: 5
 
 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

tests/components/mapping/test.esp32-idf.yaml

@@ -1,10 +1,9 @@
-spi:
+packages:
-  - id: spi_main_lcd
+  spi: !include ../../test_build_components/common/spi/esp32-idf.yaml
-    clk_pin: 16
+  map: !include common.yaml
-    mosi_pin: 17
-    miso_pin: 15
 
 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

tests/components/mapping/test.esp8266-ard.yaml

@@ -1,10 +1,9 @@
-spi:
+packages:
-  - id: spi_main_lcd
+  spi: !include ../../test_build_components/common/spi/esp8266-ard.yaml
-    clk_pin: 14
+  map: !include common.yaml
-    mosi_pin: 13
-    miso_pin: 12
 
 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

tests/components/mapping/test.rp2040-ard.yaml

@@ -1,10 +1,9 @@
-spi:
+packages:
-  - id: spi_main_lcd
+  spi: !include ../../test_build_components/common/spi/rp2040-ard.yaml
-    clk_pin: 2
+  map: !include common.yaml
-    mosi_pin: 3
-    miso_pin: 4
 
 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

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

tests/components/mipi_spi/test-lvgl.esp32-s3-idf.yaml

@@ -1,16 +1,9 @@
-substitutions:
+packages:
-  clk_pin: GPIO16
+  spi: !include ../../test_build_components/common/spi/esp32-s3-idf.yaml
-  mosi_pin: GPIO17
-
-spi:
-  - id: spi_single
-    clk_pin:
-      number: ${clk_pin}
-    mosi_pin:
-      number: ${mosi_pin}
 
 display:
   - platform: mipi_spi
+    spi_id: spi_bus
     model: t-display-s3-pro
 
 lvgl:

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

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

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