jeans/esphome
jeans/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-08-01 16:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[esp32_touch] Only read one touch sensor per loop

Browse Source
This commit is contained in:
Jesse Hills 2025-06-12 14:26:38 +12:00
parent 261b561bb2
commit a794a8f3e4
No known key found for this signature in database
GPG Key ID: BEAAE804EFD8E83A
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,8 +2,8 @@
#include "esp32_touch.h" #include "esp32_touch.h"
#include "esphome/core/application.h" #include "esphome/core/application.h"
#include "esphome/core/log.h"
#include "esphome/core/hal.h" #include "esphome/core/hal.h"
#include "esphome/core/log.h"
#include <cinttypes> #include <cinttypes>
@ -294,26 +294,28 @@ uint32_t ESP32TouchComponent::component_touch_pad_read(touch_pad_t tp) {
void ESP32TouchComponent::loop() { void ESP32TouchComponent::loop() {
const uint32_t now = App.get_loop_component_start_time(); const uint32_t now = App.get_loop_component_start_time();
bool should_print = this->setup_mode_ && now - this->setup_mode_last_log_print_ > 250; bool should_print = this->setup_mode_ && now - this->setup_mode_last_log_print_ > 250;
for (auto *child : this->children_) {
child->value_ = this->component_touch_pad_read(child->get_touch_pad());
#if !(defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3))
child->publish_state(child->value_ < child->get_threshold());
#else
child->publish_state(child->value_ > child->get_threshold());
#endif
if (should_print) {
ESP_LOGD(TAG, "Touch Pad '%s' (T%" PRIu32 "): %" PRIu32, child->get_name().c_str(),
(uint32_t) child->get_touch_pad(), child->value_);
}
App.feed_wdt();
}
if (should_print) { if (should_print) {
// Avoid spamming logs // Avoid spamming logs
this->setup_mode_last_log_print_ = now; this->setup_mode_last_log_print_ = now;
} }
if (this->children_.empty()) {
return;
}
auto *child = this->children_[this->current_child_];
child->value_ = this->component_touch_pad_read(child->get_touch_pad());
#if !(defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3))
child->publish_state(child->value_ < child->get_threshold());
#else
child->publish_state(child->value_ > child->get_threshold());
#endif
if (should_print) {
ESP_LOGD(TAG, "Touch Pad '%s' (T%" PRIu32 "): %" PRIu32, child->get_name().c_str(),
(uint32_t) child->get_touch_pad(), child->value_);
}
this->current_child_ = (this->current_child_ + 1) % this->children_.size();
} }
void ESP32TouchComponent::on_shutdown() { void ESP32TouchComponent::on_shutdown() {

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

@ -2,9 +2,9 @@
#ifdef USE_ESP32 #ifdef USE_ESP32
#include "esphome/core/component.h"
#include "esphome/components/binary_sensor/binary_sensor.h"
#include <esp_idf_version.h> #include <esp_idf_version.h>
#include "esphome/components/binary_sensor/binary_sensor.h"
#include "esphome/core/component.h"
#include <vector> #include <vector>
@ -73,6 +73,7 @@ class ESP32TouchComponent : public Component {
#endif #endif
std::vector<ESP32TouchBinarySensor *> children_; std::vector<ESP32TouchBinarySensor *> children_;
uint8_t current_child_{0};
bool setup_mode_{false}; bool setup_mode_{false};
uint32_t setup_mode_last_log_print_{0}; uint32_t setup_mode_last_log_print_{0};
// common parameters // common parameters