sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-12 06:43:48 +01:00
Code Issues Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
J. Nick Koston
2025-10-09 10:30:04 -10:00
parent 9353c6aac9
commit bf509243c2
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/components/ade7953_i2c/common.yaml
View File

@@ -4,13 +4,10 @@ sensor:
irq_pin: ${irq_pin} irq_pin: ${irq_pin}
voltage: voltage:
name: ADE7953 Voltage name: ADE7953 Voltage
id: ade7953_voltage
current_a: current_a:
name: ADE7953 Current A name: ADE7953 Current A
id: ade7953_current_a
current_b: current_b:
name: ADE7953 Current B name: ADE7953 Current B
id: ade7953_current_b
power_factor_a: power_factor_a:
name: ADE7953 Power Factor A name: ADE7953 Power Factor A
power_factor_b: power_factor_b:

3
tests/components/ft5x06/common.yaml
View File

@@ -1,7 +1,7 @@
display: display:
- platform: ssd1306_i2c - platform: ssd1306_i2c
i2c_id: i2c_bus i2c_id: i2c_bus
id: ssd1306_display id: ft5x06_display
model: SSD1306_128X64 model: SSD1306_128X64
reset_pin: ${reset_pin} reset_pin: ${reset_pin}
pages: pages:
@@ -11,6 +11,7 @@ display:
touchscreen: touchscreen:
- platform: ft5x06 - platform: ft5x06
display: ft5x06_display
id: ft5x06_touchscreen id: ft5x06_touchscreen
on_touch: on_touch:
- logger.log: - logger.log:

3
tests/components/ft63x6/common.yaml
View File

@@ -1,7 +1,7 @@
display: display:
- platform: ssd1306_i2c - platform: ssd1306_i2c
i2c_id: i2c_bus i2c_id: i2c_bus
id: ssd1306_display id: ft63x6_display
model: SSD1306_128X64 model: SSD1306_128X64
reset_pin: ${reset_pin} reset_pin: ${reset_pin}
pages: pages:
@@ -11,6 +11,7 @@ display:
touchscreen: touchscreen:
- platform: ft63x6 - platform: ft63x6
display: ft63x6_display
id: ft63x6_touchscreen id: ft63x6_touchscreen
interrupt_pin: ${interrupt_pin} interrupt_pin: ${interrupt_pin}
transform: transform: