From bf509243c22228e414c23d6eb0295499f422513f Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Thu, 9 Oct 2025 10:30:04 -1000 Subject: [PATCH] fix conflicts --- tests/components/ade7953_i2c/common.yaml | 3 --- tests/components/ft5x06/common.yaml | 3 ++- tests/components/ft63x6/common.yaml | 3 ++- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/components/ade7953_i2c/common.yaml b/tests/components/ade7953_i2c/common.yaml index f4b3852ef2..8b2a9588fe 100644 --- a/tests/components/ade7953_i2c/common.yaml +++ b/tests/components/ade7953_i2c/common.yaml @@ -4,13 +4,10 @@ sensor: irq_pin: ${irq_pin} voltage: name: ADE7953 Voltage - id: ade7953_voltage current_a: name: ADE7953 Current A - id: ade7953_current_a current_b: name: ADE7953 Current B - id: ade7953_current_b power_factor_a: name: ADE7953 Power Factor A power_factor_b: diff --git a/tests/components/ft5x06/common.yaml b/tests/components/ft5x06/common.yaml index ad8d9cf442..a56635e08b 100644 --- a/tests/components/ft5x06/common.yaml +++ b/tests/components/ft5x06/common.yaml @@ -1,7 +1,7 @@ display: - platform: ssd1306_i2c i2c_id: i2c_bus - id: ssd1306_display + id: ft5x06_display model: SSD1306_128X64 reset_pin: ${reset_pin} pages: @@ -11,6 +11,7 @@ display: touchscreen: - platform: ft5x06 + display: ft5x06_display id: ft5x06_touchscreen on_touch: - logger.log: diff --git a/tests/components/ft63x6/common.yaml b/tests/components/ft63x6/common.yaml index 1ba8bc5620..1a1c964b26 100644 --- a/tests/components/ft63x6/common.yaml +++ b/tests/components/ft63x6/common.yaml @@ -1,7 +1,7 @@ display: - platform: ssd1306_i2c i2c_id: i2c_bus - id: ssd1306_display + id: ft63x6_display model: SSD1306_128X64 reset_pin: ${reset_pin} pages: @@ -11,6 +11,7 @@ display: touchscreen: - platform: ft63x6 + display: ft63x6_display id: ft63x6_touchscreen interrupt_pin: ${interrupt_pin} transform: