mirror of
https://github.com/esphome/esphome.git
synced 2025-10-12 06:43:48 +01:00
fix conflicts
This commit is contained in:
@@ -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:
|
||||
|
@@ -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:
|
||||
|
@@ -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:
|
||||
|
Reference in New Issue
Block a user