SPI: Make some validation failures give more useful messages. (#6413)

esphome/components/spi/__init__.py

@@ -268,6 +268,9 @@ SPI_SCHEMA = cv.All(
                 *sum(get_hw_interface_list(), ["software", "hardware", "any"]),
                 lower=True,
             ),
+            cv.Optional(CONF_DATA_PINS): cv.invalid(
+                "'data_pins' should be used with 'type: quad' only"
+            ),
         }
     ),
     cv.has_at_least_one_key(CONF_MISO_PIN, CONF_MOSI_PIN),
@@ -287,6 +290,12 @@ SPI_QUAD_SCHEMA = cv.All(
                 *sum(get_hw_interface_list(), ["hardware"]),
                 lower=True,
             ),
+            cv.Optional(CONF_MISO_PIN): cv.invalid(
+                "'miso_pin' should not be used with quad SPI"
+            ),
+            cv.Optional(CONF_MOSI_PIN): cv.invalid(
+                "'mosi_pin' should not be used with quad SPI"
+            ),
         }
     ),
     cv.only_on([PLATFORM_ESP32]),

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

@@ -23,10 +23,11 @@ touchscreen:
     display: xpt_display
     update_interval: 50ms
     threshold: 400
-    calibration_x_min: 3860
+    calibration:
-    calibration_x_max: 280
+      x_min: 3860
-    calibration_y_min: 340
+      x_max: 280
-    calibration_y_max: 3860
+      y_min: 340
+      y_max: 3860
     on_touch:
       - logger.log:
           format: Touch at (%d, %d)

tests/components/xpt2046/test.esp32-c3.yaml

@@ -23,10 +23,11 @@ touchscreen:
     display: xpt_display
     update_interval: 50ms
     threshold: 400
-    calibration_x_min: 3860
+    calibration:
-    calibration_x_max: 280
+      x_min: 3860
-    calibration_y_min: 340
+      x_max: 280
-    calibration_y_max: 3860
+      y_min: 340
+      y_max: 3860
     on_touch:
       - logger.log:
           format: Touch at (%d, %d)

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

@@ -23,10 +23,11 @@ touchscreen:
     display: xpt_display
     update_interval: 50ms
     threshold: 400
-    calibration_x_min: 3860
+    calibration:
-    calibration_x_max: 280
+      x_min: 3860
-    calibration_y_min: 340
+      x_max: 280
-    calibration_y_max: 3860
+      y_min: 340
+      y_max: 3860
     on_touch:
       - logger.log:
           format: Touch at (%d, %d)

tests/components/xpt2046/test.esp32.yaml

@@ -23,10 +23,11 @@ touchscreen:
     display: xpt_display
     update_interval: 50ms
     threshold: 400
-    calibration_x_min: 3860
+    calibration:
-    calibration_x_max: 280
+      x_min: 3860
-    calibration_y_min: 340
+      x_max: 280
-    calibration_y_max: 3860
+      y_min: 340
+      y_max: 3860
     on_touch:
       - logger.log:
           format: Touch at (%d, %d)

tests/components/xpt2046/test.esp8266.yaml

@@ -23,10 +23,11 @@ touchscreen:
     display: xpt_display
     update_interval: 50ms
     threshold: 400
-    calibration_x_min: 3860
+    calibration:
-    calibration_x_max: 280
+      x_min: 3860
-    calibration_y_min: 340
+      x_max: 280
-    calibration_y_max: 3860
+      y_min: 340
+      y_max: 3860
     on_touch:
       - logger.log:
           format: Touch at (%d, %d)

tests/components/xpt2046/test.rp2040.yaml

@@ -23,10 +23,11 @@ touchscreen:
     display: xpt_display
     update_interval: 50ms
     threshold: 400
-    calibration_x_min: 3860
+    calibration:
-    calibration_x_max: 280
+      x_min: 3860
-    calibration_y_min: 340
+      x_max: 280
-    calibration_y_max: 3860
+      y_min: 340
+      y_max: 3860
     on_touch:
       - logger.log:
           format: Touch at (%d, %d)