1
0
mirror of https://github.com/esphome/esphome.git synced 2025-10-12 14:53:49 +01:00

conflicts

This commit is contained in:
J. Nick Koston
2025-10-09 05:57:45 -10:00
parent 0ea61389d0
commit cdd4c8c117
2 changed files with 2 additions and 0 deletions

View File

@@ -10,6 +10,7 @@ display:
touchscreen:
- id: ts_cst226
platform: cst226
display: cst226_display
interrupt_pin: ${interrupt_pin}
reset_pin: ${reset_pin}

View File

@@ -16,6 +16,7 @@ display:
touchscreen:
- id: ts_cst816
platform: cst816
display: cst816_display
interrupt_pin: ${interrupt_pin}
reset_pin: ${reset_pin}
skip_probe: false