mirror of
https://github.com/esphome/esphome.git
synced 2025-09-16 18:22:22 +01:00
cleanup
This commit is contained in:
@@ -296,7 +296,8 @@ void ESP32TouchComponent::loop() {
|
|||||||
|
|
||||||
// Find the child for the pad that triggered the interrupt
|
// Find the child for the pad that triggered the interrupt
|
||||||
for (auto *child : this->children_) {
|
for (auto *child : this->children_) {
|
||||||
if (child->get_touch_pad() == event.pad an && d child->last_state_ != is_touch_event) {
|
if (child->get_touch_pad() == event.pad)
|
||||||
|
if (child->last_state_ != is_touch_event) {
|
||||||
// Read current value
|
// Read current value
|
||||||
uint32_t value = 0;
|
uint32_t value = 0;
|
||||||
if (this->filter_configured_()) {
|
if (this->filter_configured_()) {
|
||||||
@@ -309,14 +310,15 @@ void ESP32TouchComponent::loop() {
|
|||||||
child->publish_state(is_touch_event);
|
child->publish_state(is_touch_event);
|
||||||
ESP_LOGD(TAG, "Touch Pad '%s' %s (value: %d, threshold: %d)", child->get_name().c_str(),
|
ESP_LOGD(TAG, "Touch Pad '%s' %s (value: %d, threshold: %d)", child->get_name().c_str(),
|
||||||
is_touch_event ? "touched" : "released", value, child->get_threshold());
|
is_touch_event ? "touched" : "released", value, child->get_threshold());
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// In setup mode, periodically log all pad values
|
// In setup mode, periodically log all pad values
|
||||||
if (this->setup_mode_ && now - this->setup_mode_last_log_print_ > SETUP_MODE_LOG_INTERVAL_MS) {
|
if (this->setup_mode_ && now - this->setup_mode_last_log_print_ > SETUP_MODE_LOG_INTERVAL_MS) {
|
||||||
for (auto *child : this->children_) {
|
for (auto *child : this->children_) {
|
||||||
uint32_t raw = 0;
|
uint32_t raw = 0;
|
||||||
uint32_t benchmark = 0;
|
uint32_t benchmark = 0;
|
||||||
@@ -327,15 +329,15 @@ void ESP32TouchComponent::loop() {
|
|||||||
|
|
||||||
if (this->filter_configured_()) {
|
if (this->filter_configured_()) {
|
||||||
touch_pad_filter_read_smooth(child->get_touch_pad(), &smooth);
|
touch_pad_filter_read_smooth(child->get_touch_pad(), &smooth);
|
||||||
ESP_LOGD(TAG, " Pad T%d: raw=%d, benchmark=%d, smooth=%d, threshold=%d", child->get_touch_pad(), raw,
|
ESP_LOGD(TAG, " Pad T%d: raw=%d, benchmark=%d, smooth=%d, threshold=%d", child->get_touch_pad(), raw, benchmark,
|
||||||
benchmark, smooth, child->get_threshold());
|
smooth, child->get_threshold());
|
||||||
} else {
|
} else {
|
||||||
ESP_LOGD(TAG, " Pad T%d: raw=%d, benchmark=%d, threshold=%d", child->get_touch_pad(), raw, benchmark,
|
ESP_LOGD(TAG, " Pad T%d: raw=%d, benchmark=%d, threshold=%d", child->get_touch_pad(), raw, benchmark,
|
||||||
child->get_threshold());
|
child->get_threshold());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
this->setup_mode_last_log_print_ = now;
|
this->setup_mode_last_log_print_ = now;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ESP32TouchComponent::on_shutdown() {
|
void ESP32TouchComponent::on_shutdown() {
|
||||||
|
Reference in New Issue
Block a user