sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-09-15 17:52:19 +01:00
Code Issues Releases Wiki Activity

track pads

Browse Source
This commit is contained in:
J. Nick Koston
2025-06-11 23:29:00 -05:00
parent a7bb7fc14d
commit eae4bd222a
2 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
esphome/components/esp32_touch/esp32_touch.cpp
View File

@@ -404,22 +404,30 @@ void IRAM_ATTR ESP32TouchComponent::touch_isr_handler(void *arg) {
uint32_t pad_status = touch_pad_get_status(); uint32_t pad_status = touch_pad_get_status();
touch_pad_clear_status(); touch_pad_clear_status();
// pad_status contains the current trigger state of all pads // Find which pads have changed state
// Send status update for all configured pads uint32_t changed_pads = pad_status ^ component->last_touch_status_;
component->last_touch_status_ = pad_status;
// Only process pads that have actually changed state
for (auto *child : component->children_) { for (auto *child : component->children_) {
touch_pad_t pad = child->get_touch_pad(); touch_pad_t pad = child->get_touch_pad();
TouchPadEvent event;
event.pad = pad;
// Check if this pad is currently triggered (1) or not (0)
event.triggered = (pad_status >> pad) & 0x01;
// Read current value using HAL function (safe for all variants)
event.value = touch_ll_read_raw_data(pad);
// Send to queue from ISR // Check if this pad has changed
BaseType_t xHigherPriorityTaskWoken = pdFALSE; if ((changed_pads >> pad) & 0x01) {
xQueueSendFromISR(component->touch_queue_, &event, &xHigherPriorityTaskWoken); bool is_touched = (pad_status >> pad) & 0x01;
if (xHigherPriorityTaskWoken) {
portYIELD_FROM_ISR(); TouchPadEvent event;
event.pad = pad;
event.triggered = is_touched;
// Read current value using HAL function (safe for all variants)
event.value = touch_ll_read_raw_data(pad);
// Send to queue from ISR
BaseType_t xHigherPriorityTaskWoken = pdFALSE;
xQueueSendFromISR(component->touch_queue_, &event, &xHigherPriorityTaskWoken);
if (xHigherPriorityTaskWoken) {
portYIELD_FROM_ISR();
}
} }
} }
} }

1
esphome/components/esp32_touch/esp32_touch.h
View File

@@ -68,6 +68,7 @@ class ESP32TouchComponent : public Component {
static void touch_isr_handler(void *arg); static void touch_isr_handler(void *arg);
QueueHandle_t touch_queue_{nullptr}; QueueHandle_t touch_queue_{nullptr};
uint32_t last_touch_status_{0}; // Track last interrupt status to detect changes
#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3) #if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
bool filter_configured_() const { bool filter_configured_() const {
return (this->filter_mode_ != TOUCH_PAD_FILTER_MAX) && (this->smooth_level_ != TOUCH_PAD_SMOOTH_MAX); return (this->filter_mode_ != TOUCH_PAD_FILTER_MAX) && (this->smooth_level_ != TOUCH_PAD_SMOOTH_MAX);