sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-05 11:23:47 +01:00
Code Issues Releases Wiki Activity

comment

Browse Source
This commit is contained in:
J. Nick Koston
2025-06-12 18:33:27 -05:00
parent b32fc3bfdd
commit d1e6b8dd10
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
esphome/components/esp32_touch/esp32_touch_v1.cpp
View File

@@ -179,7 +179,7 @@ void ESP32TouchComponent::loop() {
void ESP32TouchComponent::on_shutdown() { void ESP32TouchComponent::on_shutdown() {
touch_pad_intr_disable(); touch_pad_intr_disable();
touch_pad_isr_deregister(touch_isr_handler, this); touch_pad_isr_deregister(touch_isr_handler, this);
this->cleanup_touch_queue(); this->cleanup_touch_queue_();
if (this->iir_filter_enabled_()) { if (this->iir_filter_enabled_()) {
touch_pad_filter_stop(); touch_pad_filter_stop();

4
esphome/components/esp32_touch/esp32_touch_v2.cpp
View File

@@ -76,7 +76,7 @@ void ESP32TouchComponent::setup() {
touch_pad_isr_register(touch_isr_handler, this, static_cast<touch_pad_intr_mask_t>(TOUCH_PAD_INTR_MASK_ALL)); touch_pad_isr_register(touch_isr_handler, this, static_cast<touch_pad_intr_mask_t>(TOUCH_PAD_INTR_MASK_ALL));
if (err != ESP_OK) { if (err != ESP_OK) {
ESP_LOGE(TAG, "Failed to register touch ISR: %s", esp_err_to_name(err)); ESP_LOGE(TAG, "Failed to register touch ISR: %s", esp_err_to_name(err));
this->cleanup_touch_queue(); this->cleanup_touch_queue_();
this->mark_failed(); this->mark_failed();
return; return;
} }
@@ -299,7 +299,7 @@ void ESP32TouchComponent::on_shutdown() {
touch_pad_intr_disable(static_cast<touch_pad_intr_mask_t>(TOUCH_PAD_INTR_MASK_ACTIVE | TOUCH_PAD_INTR_MASK_INACTIVE | touch_pad_intr_disable(static_cast<touch_pad_intr_mask_t>(TOUCH_PAD_INTR_MASK_ACTIVE | TOUCH_PAD_INTR_MASK_INACTIVE |
TOUCH_PAD_INTR_MASK_TIMEOUT)); TOUCH_PAD_INTR_MASK_TIMEOUT));
touch_pad_isr_deregister(touch_isr_handler, this); touch_pad_isr_deregister(touch_isr_handler, this);
this->cleanup_touch_queue(); this->cleanup_touch_queue_();
// Configure wakeup pads if any are set // Configure wakeup pads if any are set
this->configure_wakeup_pads(); this->configure_wakeup_pads();