From 9448737a92ccdc2e3d72aa47c11fa1a50ce004f1 Mon Sep 17 00:00:00 2001 From: Keith Burzinski Date: Tue, 25 Feb 2025 14:14:39 -0600 Subject: [PATCH] [esp32_touch] Fix variants, add tests for variants (#8320) --- esphome/components/esp32_touch/esp32_touch.cpp | 2 +- tests/components/esp32_touch/common-variants.yaml | 15 +++++++++++++++ tests/components/esp32_touch/common.yaml | 2 +- tests/components/esp32_touch/test.esp32-ard.yaml | 3 +++ tests/components/esp32_touch/test.esp32-idf.yaml | 3 +++ .../components/esp32_touch/test.esp32-s2-ard.yaml | 4 ++++ .../components/esp32_touch/test.esp32-s2-idf.yaml | 4 ++++ .../components/esp32_touch/test.esp32-s3-ard.yaml | 4 ++++ .../components/esp32_touch/test.esp32-s3-idf.yaml | 4 ++++ 9 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 tests/components/esp32_touch/common-variants.yaml create mode 100644 tests/components/esp32_touch/test.esp32-s2-ard.yaml create mode 100644 tests/components/esp32_touch/test.esp32-s2-idf.yaml create mode 100644 tests/components/esp32_touch/test.esp32-s3-ard.yaml create mode 100644 tests/components/esp32_touch/test.esp32-s3-idf.yaml diff --git a/esphome/components/esp32_touch/esp32_touch.cpp b/esphome/components/esp32_touch/esp32_touch.cpp index 0ae414fa12..69e4e37cec 100644 --- a/esphome/components/esp32_touch/esp32_touch.cpp +++ b/esphome/components/esp32_touch/esp32_touch.cpp @@ -52,7 +52,7 @@ void ESP32TouchComponent::setup() { } #endif -#if ESP_IDF_VERSION_MAJOR >= 5 +#if ESP_IDF_VERSION_MAJOR >= 5 && defined(USE_ESP32_VARIANT_ESP32) touch_pad_set_measurement_clock_cycles(this->meas_cycle_); touch_pad_set_measurement_interval(this->sleep_cycle_); #else diff --git a/tests/components/esp32_touch/common-variants.yaml b/tests/components/esp32_touch/common-variants.yaml new file mode 100644 index 0000000000..69a3dbd969 --- /dev/null +++ b/tests/components/esp32_touch/common-variants.yaml @@ -0,0 +1,15 @@ +esp32_touch: + setup_mode: false + sleep_duration: 27ms + measurement_duration: 8ms + low_voltage_reference: 0.5V + high_voltage_reference: 2.7V + voltage_attenuation: 1.5V + +binary_sensor: + - platform: esp32_touch + name: ESP32 Touch Pad + pin: ${pin} + threshold: 1000 + on_press: + - logger.log: "I'm touched!" diff --git a/tests/components/esp32_touch/common.yaml b/tests/components/esp32_touch/common.yaml index 691cce8d86..e41bf7d201 100644 --- a/tests/components/esp32_touch/common.yaml +++ b/tests/components/esp32_touch/common.yaml @@ -10,7 +10,7 @@ esp32_touch: binary_sensor: - platform: esp32_touch name: ESP32 Touch Pad - pin: 27 + pin: ${pin} threshold: 1000 on_press: - logger.log: "I'm touched!" diff --git a/tests/components/esp32_touch/test.esp32-ard.yaml b/tests/components/esp32_touch/test.esp32-ard.yaml index dade44d145..25316b8646 100644 --- a/tests/components/esp32_touch/test.esp32-ard.yaml +++ b/tests/components/esp32_touch/test.esp32-ard.yaml @@ -1 +1,4 @@ +substitutions: + pin: GPIO27 + <<: !include common.yaml diff --git a/tests/components/esp32_touch/test.esp32-idf.yaml b/tests/components/esp32_touch/test.esp32-idf.yaml index dade44d145..25316b8646 100644 --- a/tests/components/esp32_touch/test.esp32-idf.yaml +++ b/tests/components/esp32_touch/test.esp32-idf.yaml @@ -1 +1,4 @@ +substitutions: + pin: GPIO27 + <<: !include common.yaml diff --git a/tests/components/esp32_touch/test.esp32-s2-ard.yaml b/tests/components/esp32_touch/test.esp32-s2-ard.yaml new file mode 100644 index 0000000000..575d758fae --- /dev/null +++ b/tests/components/esp32_touch/test.esp32-s2-ard.yaml @@ -0,0 +1,4 @@ +substitutions: + pin: GPIO12 + +<<: !include common-variants.yaml diff --git a/tests/components/esp32_touch/test.esp32-s2-idf.yaml b/tests/components/esp32_touch/test.esp32-s2-idf.yaml new file mode 100644 index 0000000000..575d758fae --- /dev/null +++ b/tests/components/esp32_touch/test.esp32-s2-idf.yaml @@ -0,0 +1,4 @@ +substitutions: + pin: GPIO12 + +<<: !include common-variants.yaml diff --git a/tests/components/esp32_touch/test.esp32-s3-ard.yaml b/tests/components/esp32_touch/test.esp32-s3-ard.yaml new file mode 100644 index 0000000000..575d758fae --- /dev/null +++ b/tests/components/esp32_touch/test.esp32-s3-ard.yaml @@ -0,0 +1,4 @@ +substitutions: + pin: GPIO12 + +<<: !include common-variants.yaml diff --git a/tests/components/esp32_touch/test.esp32-s3-idf.yaml b/tests/components/esp32_touch/test.esp32-s3-idf.yaml new file mode 100644 index 0000000000..575d758fae --- /dev/null +++ b/tests/components/esp32_touch/test.esp32-s3-idf.yaml @@ -0,0 +1,4 @@ +substitutions: + pin: GPIO12 + +<<: !include common-variants.yaml