From cdd4c8c117bf4dc1f185588b2559a326e3c62f97 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Thu, 9 Oct 2025 05:57:45 -1000 Subject: [PATCH] conflicts --- tests/components/cst226/common.yaml | 1 + tests/components/cst816/common.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/components/cst226/common.yaml b/tests/components/cst226/common.yaml index 0e38692249..1f209cf6b5 100644 --- a/tests/components/cst226/common.yaml +++ b/tests/components/cst226/common.yaml @@ -10,6 +10,7 @@ display: touchscreen: - id: ts_cst226 platform: cst226 + display: cst226_display interrupt_pin: ${interrupt_pin} reset_pin: ${reset_pin} diff --git a/tests/components/cst816/common.yaml b/tests/components/cst816/common.yaml index 7a70fbc44a..8146f7047a 100644 --- a/tests/components/cst816/common.yaml +++ b/tests/components/cst816/common.yaml @@ -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