Florian/esphome
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'esp32_touch_isr' into esp32_touch_isr_loop_runtime_stats_always_select

Browse Source
This commit is contained in:
J. Nick Koston
2025-06-12 18:34:24 -05:00
parent 6bab7c80cb d1edb1e32a
commit 05d2ec6e73
2 changed files with 5 additions and 5 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() {
touch_pad_intr_disable();
touch_pad_isr_deregister(touch_isr_handler, this);
this->cleanup_touch_queue();
this->cleanup_touch_queue_();
if (this->iir_filter_enabled_()) {
touch_pad_filter_stop();

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

@@ -12,7 +12,7 @@ static const char *const TAG = "esp32_touch";
void ESP32TouchComponent::setup() {
// Create queue for touch events first
if (!this->create_touch_queue()) {
if (!this->create_touch_queue_()) {
return;
}
@@ -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));
if (err != ESP_OK) {
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();
return;
}
@@ -299,10 +299,10 @@ 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_MASK_TIMEOUT));
touch_pad_isr_deregister(touch_isr_handler, this);
this->cleanup_touch_queue();
this->cleanup_touch_queue_();
// Configure wakeup pads if any are set
this->configure_wakeup_pads();
this->configure_wakeup_pads_();
}
void IRAM_ATTR ESP32TouchComponent::touch_isr_handler(void *arg) {