mirror of
https://github.com/esphome/esphome.git
synced 2025-09-15 09:42:19 +01:00
split it
This commit is contained in:
J. Nick Koston
@@ -1,555 +1,4 @@
|
|||||||
#ifdef USE_ESP32
|
// ESP32 touch sensor implementation
|
||||||
|
// Platform-specific implementations are in:
|
||||||
#include "esp32_touch.h"
|
// - esp32_touch_esp32.cpp for original ESP32
|
||||||
#include "esphome/core/application.h"
|
// - esp32_touch_esp32s2s3.cpp for ESP32-S2/S3
|
||||||
#include "esphome/core/log.h"
|
|
||||||
#include "esphome/core/hal.h"
|
|
||||||
|
|
||||||
#include <algorithm>
|
|
||||||
#include <cinttypes>
|
|
||||||
|
|
||||||
// Include HAL for ISR-safe touch reading on all variants
|
|
||||||
#include "hal/touch_sensor_ll.h"
|
|
||||||
// Include for RTC clock frequency
|
|
||||||
#include "soc/rtc.h"
|
|
||||||
|
|
||||||
namespace esphome {
|
|
||||||
namespace esp32_touch {
|
|
||||||
|
|
||||||
static const char *const TAG = "esp32_touch";
|
|
||||||
|
|
||||||
void ESP32TouchComponent::setup() {
|
|
||||||
ESP_LOGCONFIG(TAG, "Running setup");
|
|
||||||
|
|
||||||
touch_pad_init();
|
|
||||||
|
|
||||||
touch_pad_set_fsm_mode(TOUCH_FSM_MODE_TIMER);
|
|
||||||
|
|
||||||
#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
|
|
||||||
touch_pad_fsm_start();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Create queue for touch events - size based on number of touch pads
|
|
||||||
// Each pad can have at most a few press events queued
|
|
||||||
// Use 4x the number of pads to handle burst events
|
|
||||||
size_t queue_size = this->children_.size() * 4;
|
|
||||||
if (queue_size < 8)
|
|
||||||
queue_size = 8; // Minimum queue size
|
|
||||||
|
|
||||||
this->touch_queue_ = xQueueCreate(queue_size, sizeof(TouchPadEvent));
|
|
||||||
if (this->touch_queue_ == nullptr) {
|
|
||||||
ESP_LOGE(TAG, "Failed to create touch event queue of size %d", queue_size);
|
|
||||||
this->mark_failed();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
// set up and enable/start filtering based on ESP32 variant
|
|
||||||
#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
|
|
||||||
if (this->filter_configured_()) {
|
|
||||||
touch_filter_config_t filter_info = {
|
|
||||||
.mode = this->filter_mode_,
|
|
||||||
.debounce_cnt = this->debounce_count_,
|
|
||||||
.noise_thr = this->noise_threshold_,
|
|
||||||
.jitter_step = this->jitter_step_,
|
|
||||||
.smh_lvl = this->smooth_level_,
|
|
||||||
};
|
|
||||||
touch_pad_filter_set_config(&filter_info);
|
|
||||||
touch_pad_filter_enable();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this->denoise_configured_()) {
|
|
||||||
touch_pad_denoise_t denoise = {
|
|
||||||
.grade = this->grade_,
|
|
||||||
.cap_level = this->cap_level_,
|
|
||||||
};
|
|
||||||
touch_pad_denoise_set_config(&denoise);
|
|
||||||
touch_pad_denoise_enable();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this->waterproof_configured_()) {
|
|
||||||
touch_pad_waterproof_t waterproof = {
|
|
||||||
.guard_ring_pad = this->waterproof_guard_ring_pad_,
|
|
||||||
.shield_driver = this->waterproof_shield_driver_,
|
|
||||||
};
|
|
||||||
touch_pad_waterproof_set_config(&waterproof);
|
|
||||||
touch_pad_waterproof_enable();
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
if (this->iir_filter_enabled_()) {
|
|
||||||
touch_pad_filter_start(this->iir_filter_);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
|
|
||||||
// For ESP32-S2/S3, use the new API
|
|
||||||
touch_pad_set_charge_discharge_times(this->meas_cycle_);
|
|
||||||
touch_pad_set_measurement_interval(this->sleep_cycle_);
|
|
||||||
#elif ESP_IDF_VERSION_MAJOR >= 5 && defined(USE_ESP32_VARIANT_ESP32)
|
|
||||||
touch_pad_set_measurement_clock_cycles(this->meas_cycle_);
|
|
||||||
touch_pad_set_measurement_interval(this->sleep_cycle_);
|
|
||||||
#else
|
|
||||||
touch_pad_set_meas_time(this->sleep_cycle_, this->meas_cycle_);
|
|
||||||
#endif
|
|
||||||
touch_pad_set_voltage(this->high_voltage_reference_, this->low_voltage_reference_, this->voltage_attenuation_);
|
|
||||||
|
|
||||||
#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
|
|
||||||
// For ESP32-S2/S3, we need to set up the channel mask
|
|
||||||
uint16_t channel_mask = 0;
|
|
||||||
for (auto *child : this->children_) {
|
|
||||||
channel_mask |= BIT(child->get_touch_pad());
|
|
||||||
}
|
|
||||||
touch_pad_set_channel_mask(channel_mask);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
for (auto *child : this->children_) {
|
|
||||||
// Configure touch pad
|
|
||||||
#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
|
|
||||||
// For ESP32-S2/S3, config and threshold are separate
|
|
||||||
touch_pad_config(child->get_touch_pad());
|
|
||||||
if (child->get_threshold() != 0) {
|
|
||||||
// Only set threshold if it's non-zero
|
|
||||||
touch_pad_set_thresh(child->get_touch_pad(), child->get_threshold());
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
// For original ESP32, config includes threshold
|
|
||||||
touch_pad_config(child->get_touch_pad(), child->get_threshold());
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
// Register ISR handler
|
|
||||||
#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
|
|
||||||
// For ESP32-S2/S3, we need to specify which interrupts to enable
|
|
||||||
// We want active/inactive interrupts to detect touch state changes
|
|
||||||
esp_err_t err = touch_pad_isr_register(
|
|
||||||
touch_isr_handler, this,
|
|
||||||
static_cast<touch_pad_intr_mask_t>(TOUCH_PAD_INTR_MASK_ACTIVE | TOUCH_PAD_INTR_MASK_INACTIVE));
|
|
||||||
#else
|
|
||||||
// For original ESP32
|
|
||||||
esp_err_t err = touch_pad_isr_register(touch_isr_handler, this);
|
|
||||||
#endif
|
|
||||||
if (err != ESP_OK) {
|
|
||||||
ESP_LOGE(TAG, "Failed to register touch ISR: %s", esp_err_to_name(err));
|
|
||||||
vQueueDelete(this->touch_queue_);
|
|
||||||
this->touch_queue_ = nullptr;
|
|
||||||
this->mark_failed();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Calculate release timeout based on sleep cycle
|
|
||||||
// Sleep cycle is in RTC_SLOW_CLK cycles (typically 150kHz, but can be 32kHz)
|
|
||||||
// Get actual RTC clock frequency
|
|
||||||
uint32_t rtc_freq = rtc_clk_slow_freq_get_hz();
|
|
||||||
|
|
||||||
// Calculate based on actual sleep cycle since they use timer mode
|
|
||||||
this->release_timeout_ms_ = (this->sleep_cycle_ * 1000 * 3) / (rtc_freq * 2);
|
|
||||||
if (this->release_timeout_ms_ < 100) {
|
|
||||||
this->release_timeout_ms_ = 100; // Minimum 100ms
|
|
||||||
}
|
|
||||||
|
|
||||||
// Calculate check interval
|
|
||||||
this->release_check_interval_ms_ = std::min(this->release_timeout_ms_ / 4, (uint32_t) 50);
|
|
||||||
|
|
||||||
// Enable touch pad interrupt
|
|
||||||
#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
|
|
||||||
// For ESP32-S2/S3, enable the interrupts we registered for
|
|
||||||
touch_pad_intr_enable(static_cast<touch_pad_intr_mask_t>(TOUCH_PAD_INTR_MASK_ACTIVE | TOUCH_PAD_INTR_MASK_INACTIVE));
|
|
||||||
#else
|
|
||||||
// For original ESP32
|
|
||||||
touch_pad_intr_enable();
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
void ESP32TouchComponent::dump_config() {
|
|
||||||
const char *lv_s;
|
|
||||||
switch (this->low_voltage_reference_) {
|
|
||||||
case TOUCH_LVOLT_0V5:
|
|
||||||
lv_s = "0.5V";
|
|
||||||
break;
|
|
||||||
case TOUCH_LVOLT_0V6:
|
|
||||||
lv_s = "0.6V";
|
|
||||||
break;
|
|
||||||
case TOUCH_LVOLT_0V7:
|
|
||||||
lv_s = "0.7V";
|
|
||||||
break;
|
|
||||||
case TOUCH_LVOLT_0V8:
|
|
||||||
lv_s = "0.8V";
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
lv_s = "UNKNOWN";
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
const char *hv_s;
|
|
||||||
switch (this->high_voltage_reference_) {
|
|
||||||
case TOUCH_HVOLT_2V4:
|
|
||||||
hv_s = "2.4V";
|
|
||||||
break;
|
|
||||||
case TOUCH_HVOLT_2V5:
|
|
||||||
hv_s = "2.5V";
|
|
||||||
break;
|
|
||||||
case TOUCH_HVOLT_2V6:
|
|
||||||
hv_s = "2.6V";
|
|
||||||
break;
|
|
||||||
case TOUCH_HVOLT_2V7:
|
|
||||||
hv_s = "2.7V";
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
hv_s = "UNKNOWN";
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
const char *atten_s;
|
|
||||||
switch (this->voltage_attenuation_) {
|
|
||||||
case TOUCH_HVOLT_ATTEN_1V5:
|
|
||||||
atten_s = "1.5V";
|
|
||||||
break;
|
|
||||||
case TOUCH_HVOLT_ATTEN_1V:
|
|
||||||
atten_s = "1V";
|
|
||||||
break;
|
|
||||||
case TOUCH_HVOLT_ATTEN_0V5:
|
|
||||||
atten_s = "0.5V";
|
|
||||||
break;
|
|
||||||
case TOUCH_HVOLT_ATTEN_0V:
|
|
||||||
atten_s = "0V";
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
atten_s = "UNKNOWN";
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
ESP_LOGCONFIG(TAG,
|
|
||||||
"Config for ESP32 Touch Hub:\n"
|
|
||||||
" Meas cycle: %.2fms\n"
|
|
||||||
" Sleep cycle: %.2fms\n"
|
|
||||||
" Low Voltage Reference: %s\n"
|
|
||||||
" High Voltage Reference: %s\n"
|
|
||||||
" Voltage Attenuation: %s\n"
|
|
||||||
" ISR Configuration:\n"
|
|
||||||
" Release timeout: %" PRIu32 "ms\n"
|
|
||||||
" Release check interval: %" PRIu32 "ms",
|
|
||||||
this->meas_cycle_ / (8000000.0f / 1000.0f), this->sleep_cycle_ / (150000.0f / 1000.0f), lv_s, hv_s,
|
|
||||||
atten_s, this->release_timeout_ms_, this->release_check_interval_ms_);
|
|
||||||
|
|
||||||
#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
|
|
||||||
if (this->filter_configured_()) {
|
|
||||||
const char *filter_mode_s;
|
|
||||||
switch (this->filter_mode_) {
|
|
||||||
case TOUCH_PAD_FILTER_IIR_4:
|
|
||||||
filter_mode_s = "IIR_4";
|
|
||||||
break;
|
|
||||||
case TOUCH_PAD_FILTER_IIR_8:
|
|
||||||
filter_mode_s = "IIR_8";
|
|
||||||
break;
|
|
||||||
case TOUCH_PAD_FILTER_IIR_16:
|
|
||||||
filter_mode_s = "IIR_16";
|
|
||||||
break;
|
|
||||||
case TOUCH_PAD_FILTER_IIR_32:
|
|
||||||
filter_mode_s = "IIR_32";
|
|
||||||
break;
|
|
||||||
case TOUCH_PAD_FILTER_IIR_64:
|
|
||||||
filter_mode_s = "IIR_64";
|
|
||||||
break;
|
|
||||||
case TOUCH_PAD_FILTER_IIR_128:
|
|
||||||
filter_mode_s = "IIR_128";
|
|
||||||
break;
|
|
||||||
case TOUCH_PAD_FILTER_IIR_256:
|
|
||||||
filter_mode_s = "IIR_256";
|
|
||||||
break;
|
|
||||||
case TOUCH_PAD_FILTER_JITTER:
|
|
||||||
filter_mode_s = "JITTER";
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
filter_mode_s = "UNKNOWN";
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
ESP_LOGCONFIG(TAG,
|
|
||||||
" Filter mode: %s\n"
|
|
||||||
" Debounce count: %" PRIu32 "\n"
|
|
||||||
" Noise threshold coefficient: %" PRIu32 "\n"
|
|
||||||
" Jitter filter step size: %" PRIu32,
|
|
||||||
filter_mode_s, this->debounce_count_, this->noise_threshold_, this->jitter_step_);
|
|
||||||
const char *smooth_level_s;
|
|
||||||
switch (this->smooth_level_) {
|
|
||||||
case TOUCH_PAD_SMOOTH_OFF:
|
|
||||||
smooth_level_s = "OFF";
|
|
||||||
break;
|
|
||||||
case TOUCH_PAD_SMOOTH_IIR_2:
|
|
||||||
smooth_level_s = "IIR_2";
|
|
||||||
break;
|
|
||||||
case TOUCH_PAD_SMOOTH_IIR_4:
|
|
||||||
smooth_level_s = "IIR_4";
|
|
||||||
break;
|
|
||||||
case TOUCH_PAD_SMOOTH_IIR_8:
|
|
||||||
smooth_level_s = "IIR_8";
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
smooth_level_s = "UNKNOWN";
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
ESP_LOGCONFIG(TAG, " Smooth level: %s", smooth_level_s);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this->denoise_configured_()) {
|
|
||||||
const char *grade_s;
|
|
||||||
switch (this->grade_) {
|
|
||||||
case TOUCH_PAD_DENOISE_BIT12:
|
|
||||||
grade_s = "BIT12";
|
|
||||||
break;
|
|
||||||
case TOUCH_PAD_DENOISE_BIT10:
|
|
||||||
grade_s = "BIT10";
|
|
||||||
break;
|
|
||||||
case TOUCH_PAD_DENOISE_BIT8:
|
|
||||||
grade_s = "BIT8";
|
|
||||||
break;
|
|
||||||
case TOUCH_PAD_DENOISE_BIT4:
|
|
||||||
grade_s = "BIT4";
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
grade_s = "UNKNOWN";
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
ESP_LOGCONFIG(TAG, " Denoise grade: %s", grade_s);
|
|
||||||
|
|
||||||
const char *cap_level_s;
|
|
||||||
switch (this->cap_level_) {
|
|
||||||
case TOUCH_PAD_DENOISE_CAP_L0:
|
|
||||||
cap_level_s = "L0";
|
|
||||||
break;
|
|
||||||
case TOUCH_PAD_DENOISE_CAP_L1:
|
|
||||||
cap_level_s = "L1";
|
|
||||||
break;
|
|
||||||
case TOUCH_PAD_DENOISE_CAP_L2:
|
|
||||||
cap_level_s = "L2";
|
|
||||||
break;
|
|
||||||
case TOUCH_PAD_DENOISE_CAP_L3:
|
|
||||||
cap_level_s = "L3";
|
|
||||||
break;
|
|
||||||
case TOUCH_PAD_DENOISE_CAP_L4:
|
|
||||||
cap_level_s = "L4";
|
|
||||||
break;
|
|
||||||
case TOUCH_PAD_DENOISE_CAP_L5:
|
|
||||||
cap_level_s = "L5";
|
|
||||||
break;
|
|
||||||
case TOUCH_PAD_DENOISE_CAP_L6:
|
|
||||||
cap_level_s = "L6";
|
|
||||||
break;
|
|
||||||
case TOUCH_PAD_DENOISE_CAP_L7:
|
|
||||||
cap_level_s = "L7";
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
cap_level_s = "UNKNOWN";
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
ESP_LOGCONFIG(TAG, " Denoise capacitance level: %s", cap_level_s);
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
if (this->iir_filter_enabled_()) {
|
|
||||||
ESP_LOGCONFIG(TAG, " IIR Filter: %" PRIu32 "ms", this->iir_filter_);
|
|
||||||
} else {
|
|
||||||
ESP_LOGCONFIG(TAG, " IIR Filter DISABLED");
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (this->setup_mode_) {
|
|
||||||
ESP_LOGCONFIG(TAG, " Setup Mode ENABLED");
|
|
||||||
}
|
|
||||||
|
|
||||||
for (auto *child : this->children_) {
|
|
||||||
LOG_BINARY_SENSOR(" ", "Touch Pad", child);
|
|
||||||
ESP_LOGCONFIG(TAG, " Pad: T%" PRIu32, (uint32_t) child->get_touch_pad());
|
|
||||||
ESP_LOGCONFIG(TAG, " Threshold: %" PRIu32, child->get_threshold());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void ESP32TouchComponent::loop() {
|
|
||||||
const uint32_t now = App.get_loop_component_start_time();
|
|
||||||
bool should_print = this->setup_mode_ && now - this->setup_mode_last_log_print_ > 250;
|
|
||||||
|
|
||||||
// Print debug info for all pads in setup mode
|
|
||||||
if (should_print) {
|
|
||||||
for (auto *child : this->children_) {
|
|
||||||
ESP_LOGD(TAG, "Touch Pad '%s' (T%" PRIu32 "): %" PRIu32, child->get_name().c_str(),
|
|
||||||
(uint32_t) child->get_touch_pad(), child->value_);
|
|
||||||
}
|
|
||||||
this->setup_mode_last_log_print_ = now;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Process any queued touch events from interrupts
|
|
||||||
TouchPadEvent event;
|
|
||||||
while (xQueueReceive(this->touch_queue_, &event, 0) == pdTRUE) {
|
|
||||||
// Find the corresponding sensor
|
|
||||||
for (auto *child : this->children_) {
|
|
||||||
if (child->get_touch_pad() == event.pad) {
|
|
||||||
child->value_ = event.value;
|
|
||||||
|
|
||||||
// The interrupt gives us the touch state directly
|
|
||||||
bool new_state = event.is_touched;
|
|
||||||
|
|
||||||
// Track when we last saw this pad as touched
|
|
||||||
if (new_state) {
|
|
||||||
this->last_touch_time_[event.pad] = now;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Only publish if state changed
|
|
||||||
if (new_state != child->last_state_) {
|
|
||||||
child->last_state_ = new_state;
|
|
||||||
child->publish_state(new_state);
|
|
||||||
#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
|
|
||||||
// ESP32-S2/S3: ISR fires for both touch (ACTIVE) and release (INACTIVE) events
|
|
||||||
ESP_LOGV(TAG, "Touch Pad '%s' state: %s (value: %" PRIu32 ", threshold: %" PRIu32 ")",
|
|
||||||
child->get_name().c_str(), new_state ? "ON" : "OFF", event.value, child->get_threshold());
|
|
||||||
#else
|
|
||||||
// Original ESP32: ISR only fires when touched, release is detected by timeout
|
|
||||||
ESP_LOGV(TAG, "Touch Pad '%s' state: ON (value: %" PRIu32 ", threshold: %" PRIu32 ")",
|
|
||||||
child->get_name().c_str(), event.value, child->get_threshold());
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check for released pads periodically
|
|
||||||
static uint32_t last_release_check = 0;
|
|
||||||
if (now - last_release_check < this->release_check_interval_ms_) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
last_release_check = now;
|
|
||||||
|
|
||||||
for (auto *child : this->children_) {
|
|
||||||
touch_pad_t pad = child->get_touch_pad();
|
|
||||||
uint32_t last_time = this->last_touch_time_[pad];
|
|
||||||
|
|
||||||
// If we've never seen this pad touched (last_time == 0) and enough time has passed
|
|
||||||
// since startup, publish OFF state and mark as published with value 1
|
|
||||||
if (last_time == 0 && now > this->release_timeout_ms_) {
|
|
||||||
child->publish_state(false);
|
|
||||||
this->last_touch_time_[pad] = 1; // Mark as "initial state published"
|
|
||||||
ESP_LOGV(TAG, "Touch Pad '%s' state: OFF (initial)", child->get_name().c_str());
|
|
||||||
} else if (child->last_state_ && last_time > 1) { // last_time > 1 means it's a real timestamp
|
|
||||||
uint32_t time_diff = now - last_time;
|
|
||||||
|
|
||||||
// Check if we haven't seen this pad recently
|
|
||||||
if (time_diff > this->release_timeout_ms_) {
|
|
||||||
// Haven't seen this pad recently, assume it's released
|
|
||||||
child->last_state_ = false;
|
|
||||||
child->publish_state(false);
|
|
||||||
this->last_touch_time_[pad] = 1; // Reset to "initial published" state
|
|
||||||
ESP_LOGV(TAG, "Touch Pad '%s' state: OFF (timeout)", child->get_name().c_str());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void ESP32TouchComponent::on_shutdown() {
|
|
||||||
#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
|
|
||||||
// For ESP32-S2/S3, disable the interrupts we enabled
|
|
||||||
touch_pad_intr_disable(static_cast<touch_pad_intr_mask_t>(TOUCH_PAD_INTR_MASK_ACTIVE | TOUCH_PAD_INTR_MASK_INACTIVE));
|
|
||||||
#else
|
|
||||||
// For original ESP32
|
|
||||||
touch_pad_intr_disable();
|
|
||||||
#endif
|
|
||||||
touch_pad_isr_deregister(touch_isr_handler, this);
|
|
||||||
if (this->touch_queue_) {
|
|
||||||
vQueueDelete(this->touch_queue_);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool is_wakeup_source = false;
|
|
||||||
|
|
||||||
#if !(defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3))
|
|
||||||
if (this->iir_filter_enabled_()) {
|
|
||||||
touch_pad_filter_stop();
|
|
||||||
touch_pad_filter_delete();
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
for (auto *child : this->children_) {
|
|
||||||
if (child->get_wakeup_threshold() != 0) {
|
|
||||||
if (!is_wakeup_source) {
|
|
||||||
is_wakeup_source = true;
|
|
||||||
// Touch sensor FSM mode must be 'TOUCH_FSM_MODE_TIMER' to use it to wake-up.
|
|
||||||
touch_pad_set_fsm_mode(TOUCH_FSM_MODE_TIMER);
|
|
||||||
}
|
|
||||||
|
|
||||||
#if !(defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3))
|
|
||||||
// No filter available when using as wake-up source.
|
|
||||||
touch_pad_config(child->get_touch_pad(), child->get_wakeup_threshold());
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!is_wakeup_source) {
|
|
||||||
touch_pad_deinit();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void IRAM_ATTR ESP32TouchComponent::touch_isr_handler(void *arg) {
|
|
||||||
ESP32TouchComponent *component = static_cast<ESP32TouchComponent *>(arg);
|
|
||||||
|
|
||||||
#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
|
|
||||||
// For S2/S3, read the interrupt status mask to see what type of interrupt occurred
|
|
||||||
uint32_t intr_mask = touch_pad_read_intr_status_mask();
|
|
||||||
touch_pad_intr_clear(static_cast<touch_pad_intr_mask_t>(intr_mask));
|
|
||||||
#else
|
|
||||||
// For original ESP32
|
|
||||||
uint32_t pad_status = touch_pad_get_status();
|
|
||||||
touch_pad_clear_status();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Process all configured pads to check their current state
|
|
||||||
// Send events for ALL pads with valid readings so we catch both touches and releases
|
|
||||||
for (auto *child : component->children_) {
|
|
||||||
touch_pad_t pad = child->get_touch_pad();
|
|
||||||
|
|
||||||
// Read current value using ISR-safe API
|
|
||||||
uint32_t value;
|
|
||||||
#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
|
|
||||||
if (component->filter_configured_()) {
|
|
||||||
touch_pad_filter_read_smooth(pad, &value);
|
|
||||||
} else {
|
|
||||||
// Use low-level HAL function when filter is not configured
|
|
||||||
value = touch_ll_read_raw_data(pad);
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
if (component->iir_filter_enabled_()) {
|
|
||||||
uint16_t temp_value = 0;
|
|
||||||
touch_pad_read_filtered(pad, &temp_value);
|
|
||||||
value = temp_value;
|
|
||||||
} else {
|
|
||||||
// Use low-level HAL function when filter is not enabled
|
|
||||||
value = touch_ll_read_raw_data(pad);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Skip pads with 0 value - they haven't been measured in this cycle
|
|
||||||
if (value == 0) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Determine current touch state based on value vs threshold
|
|
||||||
#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
|
|
||||||
bool is_touched = value > child->get_threshold();
|
|
||||||
#else
|
|
||||||
bool is_touched = value < child->get_threshold();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Always send the current state - the main loop will filter for changes
|
|
||||||
TouchPadEvent event;
|
|
||||||
event.pad = pad;
|
|
||||||
event.value = value;
|
|
||||||
event.is_touched = is_touched;
|
|
||||||
|
|
||||||
// Send to queue from ISR
|
|
||||||
BaseType_t xHigherPriorityTaskWoken = pdFALSE;
|
|
||||||
xQueueSendFromISR(component->touch_queue_, &event, &xHigherPriorityTaskWoken);
|
|
||||||
if (xHigherPriorityTaskWoken) {
|
|
||||||
portYIELD_FROM_ISR();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ESP32TouchBinarySensor::ESP32TouchBinarySensor(touch_pad_t touch_pad, uint32_t threshold, uint32_t wakeup_threshold)
|
|
||||||
: touch_pad_(touch_pad), threshold_(threshold), wakeup_threshold_(wakeup_threshold) {}
|
|
||||||
|
|
||||||
} // namespace esp32_touch
|
|
||||||
} // namespace esphome
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@@ -21,6 +21,10 @@ struct TouchPadEvent {
|
|||||||
touch_pad_t pad;
|
touch_pad_t pad;
|
||||||
uint32_t value;
|
uint32_t value;
|
||||||
bool is_touched; // Whether this pad is currently touched
|
bool is_touched; // Whether this pad is currently touched
|
||||||
|
#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
|
||||||
|
uint32_t intr_mask; // Interrupt mask for S2/S3
|
||||||
|
uint32_t pad_status; // Pad status bitmap for S2/S3
|
||||||
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
class ESP32TouchComponent : public Component {
|
class ESP32TouchComponent : public Component {
|
||||||
@@ -84,6 +88,52 @@ class ESP32TouchComponent : public Component {
|
|||||||
bool iir_filter_enabled_() const { return this->iir_filter_ > 0; }
|
bool iir_filter_enabled_() const { return this->iir_filter_ > 0; }
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Helper functions for dump_config - common to both implementations
|
||||||
|
static const char *get_low_voltage_reference_str(touch_low_volt_t ref) {
|
||||||
|
switch (ref) {
|
||||||
|
case TOUCH_LVOLT_0V5:
|
||||||
|
return "0.5V";
|
||||||
|
case TOUCH_LVOLT_0V6:
|
||||||
|
return "0.6V";
|
||||||
|
case TOUCH_LVOLT_0V7:
|
||||||
|
return "0.7V";
|
||||||
|
case TOUCH_LVOLT_0V8:
|
||||||
|
return "0.8V";
|
||||||
|
default:
|
||||||
|
return "UNKNOWN";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static const char *get_high_voltage_reference_str(touch_high_volt_t ref) {
|
||||||
|
switch (ref) {
|
||||||
|
case TOUCH_HVOLT_2V4:
|
||||||
|
return "2.4V";
|
||||||
|
case TOUCH_HVOLT_2V5:
|
||||||
|
return "2.5V";
|
||||||
|
case TOUCH_HVOLT_2V6:
|
||||||
|
return "2.6V";
|
||||||
|
case TOUCH_HVOLT_2V7:
|
||||||
|
return "2.7V";
|
||||||
|
default:
|
||||||
|
return "UNKNOWN";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static const char *get_voltage_attenuation_str(touch_volt_atten_t atten) {
|
||||||
|
switch (atten) {
|
||||||
|
case TOUCH_HVOLT_ATTEN_1V5:
|
||||||
|
return "1.5V";
|
||||||
|
case TOUCH_HVOLT_ATTEN_1V:
|
||||||
|
return "1V";
|
||||||
|
case TOUCH_HVOLT_ATTEN_0V5:
|
||||||
|
return "0.5V";
|
||||||
|
case TOUCH_HVOLT_ATTEN_0V:
|
||||||
|
return "0V";
|
||||||
|
default:
|
||||||
|
return "UNKNOWN";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
std::vector<ESP32TouchBinarySensor *> children_;
|
std::vector<ESP32TouchBinarySensor *> children_;
|
||||||
bool setup_mode_{false};
|
bool setup_mode_{false};
|
||||||
uint32_t setup_mode_last_log_print_{0};
|
uint32_t setup_mode_last_log_print_{0};
|
||||||
@@ -111,7 +161,8 @@ class ESP32TouchComponent : public Component {
|
|||||||
/// Simple helper class to expose a touch pad value as a binary sensor.
|
/// Simple helper class to expose a touch pad value as a binary sensor.
|
||||||
class ESP32TouchBinarySensor : public binary_sensor::BinarySensor {
|
class ESP32TouchBinarySensor : public binary_sensor::BinarySensor {
|
||||||
public:
|
public:
|
||||||
ESP32TouchBinarySensor(touch_pad_t touch_pad, uint32_t threshold, uint32_t wakeup_threshold);
|
ESP32TouchBinarySensor(touch_pad_t touch_pad, uint32_t threshold, uint32_t wakeup_threshold)
|
||||||
|
: touch_pad_(touch_pad), threshold_(threshold), wakeup_threshold_(wakeup_threshold) {}
|
||||||
|
|
||||||
touch_pad_t get_touch_pad() const { return this->touch_pad_; }
|
touch_pad_t get_touch_pad() const { return this->touch_pad_; }
|
||||||
uint32_t get_threshold() const { return this->threshold_; }
|
uint32_t get_threshold() const { return this->threshold_; }
|
||||||
|
|||||||
270
esphome/components/esp32_touch/esp32_touch_v1.cpp
Normal file
270
esphome/components/esp32_touch/esp32_touch_v1.cpp
Normal file
@@ -0,0 +1,270 @@
|
|||||||
|
#ifdef USE_ESP32_VARIANT_ESP32
|
||||||
|
|
||||||
|
#include "esp32_touch.h"
|
||||||
|
#include "esphome/core/application.h"
|
||||||
|
#include "esphome/core/log.h"
|
||||||
|
#include "esphome/core/hal.h"
|
||||||
|
|
||||||
|
#include <algorithm>
|
||||||
|
#include <cinttypes>
|
||||||
|
|
||||||
|
// Include HAL for ISR-safe touch reading
|
||||||
|
#include "hal/touch_sensor_ll.h"
|
||||||
|
// Include for RTC clock frequency
|
||||||
|
#include "soc/rtc.h"
|
||||||
|
|
||||||
|
namespace esphome {
|
||||||
|
namespace esp32_touch {
|
||||||
|
|
||||||
|
static const char *const TAG = "esp32_touch";
|
||||||
|
|
||||||
|
void ESP32TouchComponent::setup() {
|
||||||
|
ESP_LOGCONFIG(TAG, "Running setup for ESP32");
|
||||||
|
|
||||||
|
touch_pad_init();
|
||||||
|
touch_pad_set_fsm_mode(TOUCH_FSM_MODE_TIMER);
|
||||||
|
|
||||||
|
// Create queue for touch events
|
||||||
|
size_t queue_size = this->children_.size() * 4;
|
||||||
|
if (queue_size < 8)
|
||||||
|
queue_size = 8;
|
||||||
|
|
||||||
|
this->touch_queue_ = xQueueCreate(queue_size, sizeof(TouchPadEvent));
|
||||||
|
if (this->touch_queue_ == nullptr) {
|
||||||
|
ESP_LOGE(TAG, "Failed to create touch event queue of size %d", queue_size);
|
||||||
|
this->mark_failed();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set up IIR filter if enabled
|
||||||
|
if (this->iir_filter_enabled_()) {
|
||||||
|
touch_pad_filter_start(this->iir_filter_);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Configure measurement parameters
|
||||||
|
#if ESP_IDF_VERSION_MAJOR >= 5
|
||||||
|
touch_pad_set_measurement_clock_cycles(this->meas_cycle_);
|
||||||
|
touch_pad_set_measurement_interval(this->sleep_cycle_);
|
||||||
|
#else
|
||||||
|
touch_pad_set_meas_time(this->sleep_cycle_, this->meas_cycle_);
|
||||||
|
#endif
|
||||||
|
touch_pad_set_voltage(this->high_voltage_reference_, this->low_voltage_reference_, this->voltage_attenuation_);
|
||||||
|
|
||||||
|
// Configure each touch pad
|
||||||
|
for (auto *child : this->children_) {
|
||||||
|
touch_pad_config(child->get_touch_pad(), child->get_threshold());
|
||||||
|
}
|
||||||
|
|
||||||
|
// Register ISR handler
|
||||||
|
esp_err_t err = touch_pad_isr_register(touch_isr_handler, this);
|
||||||
|
if (err != ESP_OK) {
|
||||||
|
ESP_LOGE(TAG, "Failed to register touch ISR: %s", esp_err_to_name(err));
|
||||||
|
vQueueDelete(this->touch_queue_);
|
||||||
|
this->touch_queue_ = nullptr;
|
||||||
|
this->mark_failed();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Calculate release timeout based on sleep cycle
|
||||||
|
uint32_t rtc_freq = rtc_clk_slow_freq_get_hz();
|
||||||
|
this->release_timeout_ms_ = (this->sleep_cycle_ * 1000 * 3) / (rtc_freq * 2);
|
||||||
|
if (this->release_timeout_ms_ < 100) {
|
||||||
|
this->release_timeout_ms_ = 100;
|
||||||
|
}
|
||||||
|
this->release_check_interval_ms_ = std::min(this->release_timeout_ms_ / 4, (uint32_t) 50);
|
||||||
|
|
||||||
|
// Enable touch pad interrupt
|
||||||
|
touch_pad_intr_enable();
|
||||||
|
}
|
||||||
|
|
||||||
|
void ESP32TouchComponent::dump_config() {
|
||||||
|
const char *lv_s = get_low_voltage_reference_str(this->low_voltage_reference_);
|
||||||
|
const char *hv_s = get_high_voltage_reference_str(this->high_voltage_reference_);
|
||||||
|
const char *atten_s = get_voltage_attenuation_str(this->voltage_attenuation_);
|
||||||
|
|
||||||
|
ESP_LOGCONFIG(TAG,
|
||||||
|
"Config for ESP32 Touch Hub:\n"
|
||||||
|
" Meas cycle: %.2fms\n"
|
||||||
|
" Sleep cycle: %.2fms\n"
|
||||||
|
" Low Voltage Reference: %s\n"
|
||||||
|
" High Voltage Reference: %s\n"
|
||||||
|
" Voltage Attenuation: %s\n"
|
||||||
|
" ISR Configuration:\n"
|
||||||
|
" Release timeout: %" PRIu32 "ms\n"
|
||||||
|
" Release check interval: %" PRIu32 "ms",
|
||||||
|
this->meas_cycle_ / (8000000.0f / 1000.0f), this->sleep_cycle_ / (150000.0f / 1000.0f), lv_s, hv_s,
|
||||||
|
atten_s, this->release_timeout_ms_, this->release_check_interval_ms_);
|
||||||
|
|
||||||
|
if (this->iir_filter_enabled_()) {
|
||||||
|
ESP_LOGCONFIG(TAG, " IIR Filter: %" PRIu32 "ms", this->iir_filter_);
|
||||||
|
} else {
|
||||||
|
ESP_LOGCONFIG(TAG, " IIR Filter DISABLED");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this->setup_mode_) {
|
||||||
|
ESP_LOGCONFIG(TAG, " Setup Mode ENABLED");
|
||||||
|
}
|
||||||
|
|
||||||
|
for (auto *child : this->children_) {
|
||||||
|
LOG_BINARY_SENSOR(" ", "Touch Pad", child);
|
||||||
|
ESP_LOGCONFIG(TAG, " Pad: T%" PRIu32, (uint32_t) child->get_touch_pad());
|
||||||
|
ESP_LOGCONFIG(TAG, " Threshold: %" PRIu32, child->get_threshold());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ESP32TouchComponent::loop() {
|
||||||
|
const uint32_t now = App.get_loop_component_start_time();
|
||||||
|
bool should_print = this->setup_mode_ && now - this->setup_mode_last_log_print_ > 250;
|
||||||
|
|
||||||
|
// Print debug info for all pads in setup mode
|
||||||
|
if (should_print) {
|
||||||
|
for (auto *child : this->children_) {
|
||||||
|
ESP_LOGD(TAG, "Touch Pad '%s' (T%" PRIu32 "): %" PRIu32, child->get_name().c_str(),
|
||||||
|
(uint32_t) child->get_touch_pad(), child->value_);
|
||||||
|
}
|
||||||
|
this->setup_mode_last_log_print_ = now;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Process any queued touch events from interrupts
|
||||||
|
TouchPadEvent event;
|
||||||
|
while (xQueueReceive(this->touch_queue_, &event, 0) == pdTRUE) {
|
||||||
|
// Find the corresponding sensor
|
||||||
|
for (auto *child : this->children_) {
|
||||||
|
if (child->get_touch_pad() == event.pad) {
|
||||||
|
child->value_ = event.value;
|
||||||
|
|
||||||
|
// The interrupt gives us the touch state directly
|
||||||
|
bool new_state = event.is_touched;
|
||||||
|
|
||||||
|
// Track when we last saw this pad as touched
|
||||||
|
if (new_state) {
|
||||||
|
this->last_touch_time_[event.pad] = now;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Only publish if state changed
|
||||||
|
if (new_state != child->last_state_) {
|
||||||
|
child->last_state_ = new_state;
|
||||||
|
child->publish_state(new_state);
|
||||||
|
// Original ESP32: ISR only fires when touched, release is detected by timeout
|
||||||
|
ESP_LOGV(TAG, "Touch Pad '%s' state: ON (value: %" PRIu32 ", threshold: %" PRIu32 ")",
|
||||||
|
child->get_name().c_str(), event.value, child->get_threshold());
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check for released pads periodically
|
||||||
|
static uint32_t last_release_check = 0;
|
||||||
|
if (now - last_release_check < this->release_check_interval_ms_) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
last_release_check = now;
|
||||||
|
|
||||||
|
for (auto *child : this->children_) {
|
||||||
|
touch_pad_t pad = child->get_touch_pad();
|
||||||
|
uint32_t last_time = this->last_touch_time_[pad];
|
||||||
|
|
||||||
|
// If we've never seen this pad touched (last_time == 0) and enough time has passed
|
||||||
|
// since startup, publish OFF state and mark as published with value 1
|
||||||
|
if (last_time == 0 && now > this->release_timeout_ms_) {
|
||||||
|
child->publish_state(false);
|
||||||
|
this->last_touch_time_[pad] = 1; // Mark as "initial state published"
|
||||||
|
ESP_LOGV(TAG, "Touch Pad '%s' state: OFF (initial)", child->get_name().c_str());
|
||||||
|
} else if (child->last_state_ && last_time > 1) { // last_time > 1 means it's a real timestamp
|
||||||
|
uint32_t time_diff = now - last_time;
|
||||||
|
|
||||||
|
// Check if we haven't seen this pad recently
|
||||||
|
if (time_diff > this->release_timeout_ms_) {
|
||||||
|
// Haven't seen this pad recently, assume it's released
|
||||||
|
child->last_state_ = false;
|
||||||
|
child->publish_state(false);
|
||||||
|
this->last_touch_time_[pad] = 1; // Reset to "initial published" state
|
||||||
|
ESP_LOGV(TAG, "Touch Pad '%s' state: OFF (timeout)", child->get_name().c_str());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ESP32TouchComponent::on_shutdown() {
|
||||||
|
touch_pad_intr_disable();
|
||||||
|
touch_pad_isr_deregister(touch_isr_handler, this);
|
||||||
|
if (this->touch_queue_) {
|
||||||
|
vQueueDelete(this->touch_queue_);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool is_wakeup_source = false;
|
||||||
|
|
||||||
|
if (this->iir_filter_enabled_()) {
|
||||||
|
touch_pad_filter_stop();
|
||||||
|
touch_pad_filter_delete();
|
||||||
|
}
|
||||||
|
|
||||||
|
for (auto *child : this->children_) {
|
||||||
|
if (child->get_wakeup_threshold() != 0) {
|
||||||
|
if (!is_wakeup_source) {
|
||||||
|
is_wakeup_source = true;
|
||||||
|
// Touch sensor FSM mode must be 'TOUCH_FSM_MODE_TIMER' to use it to wake-up.
|
||||||
|
touch_pad_set_fsm_mode(TOUCH_FSM_MODE_TIMER);
|
||||||
|
}
|
||||||
|
|
||||||
|
// No filter available when using as wake-up source.
|
||||||
|
touch_pad_config(child->get_touch_pad(), child->get_wakeup_threshold());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!is_wakeup_source) {
|
||||||
|
touch_pad_deinit();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void IRAM_ATTR ESP32TouchComponent::touch_isr_handler(void *arg) {
|
||||||
|
ESP32TouchComponent *component = static_cast<ESP32TouchComponent *>(arg);
|
||||||
|
|
||||||
|
uint32_t pad_status = touch_pad_get_status();
|
||||||
|
touch_pad_clear_status();
|
||||||
|
|
||||||
|
// Process all configured pads to check their current state
|
||||||
|
for (auto *child : component->children_) {
|
||||||
|
touch_pad_t pad = child->get_touch_pad();
|
||||||
|
|
||||||
|
// Read current value using ISR-safe API
|
||||||
|
uint32_t value;
|
||||||
|
if (component->iir_filter_enabled_()) {
|
||||||
|
uint16_t temp_value = 0;
|
||||||
|
touch_pad_read_filtered(pad, &temp_value);
|
||||||
|
value = temp_value;
|
||||||
|
} else {
|
||||||
|
// Use low-level HAL function when filter is not enabled
|
||||||
|
value = touch_ll_read_raw_data(pad);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Skip pads with 0 value - they haven't been measured in this cycle
|
||||||
|
if (value == 0) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// For original ESP32, lower value means touched
|
||||||
|
bool is_touched = value < child->get_threshold();
|
||||||
|
|
||||||
|
// Always send the current state - the main loop will filter for changes
|
||||||
|
TouchPadEvent event;
|
||||||
|
event.pad = pad;
|
||||||
|
event.value = value;
|
||||||
|
event.is_touched = is_touched;
|
||||||
|
|
||||||
|
// Send to queue from ISR
|
||||||
|
BaseType_t xHigherPriorityTaskWoken = pdFALSE;
|
||||||
|
xQueueSendFromISR(component->touch_queue_, &event, &xHigherPriorityTaskWoken);
|
||||||
|
if (xHigherPriorityTaskWoken) {
|
||||||
|
portYIELD_FROM_ISR();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool ESP32TouchComponent::iir_filter_enabled_() const { return this->iir_filter_ > 0; }
|
||||||
|
|
||||||
|
} // namespace esp32_touch
|
||||||
|
} // namespace esphome
|
||||||
|
|
||||||
|
#endif // USE_ESP32_VARIANT_ESP32
|
||||||
378
esphome/components/esp32_touch/esp32_touch_v2.cpp
Normal file
378
esphome/components/esp32_touch/esp32_touch_v2.cpp
Normal file
@@ -0,0 +1,378 @@
|
|||||||
|
#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
|
||||||
|
|
||||||
|
#include "esp32_touch.h"
|
||||||
|
#include "esphome/core/application.h"
|
||||||
|
#include "esphome/core/log.h"
|
||||||
|
#include "esphome/core/hal.h"
|
||||||
|
|
||||||
|
#include <algorithm>
|
||||||
|
#include <cinttypes>
|
||||||
|
|
||||||
|
// Include HAL for ISR-safe touch reading
|
||||||
|
#include "hal/touch_sensor_ll.h"
|
||||||
|
// Include for RTC clock frequency
|
||||||
|
#include "soc/rtc.h"
|
||||||
|
// Include for ISR-safe printing
|
||||||
|
#include "rom/ets_sys.h"
|
||||||
|
|
||||||
|
namespace esphome {
|
||||||
|
namespace esp32_touch {
|
||||||
|
|
||||||
|
static const char *const TAG = "esp32_touch";
|
||||||
|
|
||||||
|
void ESP32TouchComponent::setup() {
|
||||||
|
ESP_LOGCONFIG(TAG, "Running setup for ESP32-S2/S3");
|
||||||
|
|
||||||
|
touch_pad_init();
|
||||||
|
touch_pad_set_fsm_mode(TOUCH_FSM_MODE_TIMER);
|
||||||
|
|
||||||
|
// Create queue for touch events
|
||||||
|
size_t queue_size = this->children_.size() * 4;
|
||||||
|
if (queue_size < 8)
|
||||||
|
queue_size = 8;
|
||||||
|
|
||||||
|
this->touch_queue_ = xQueueCreate(queue_size, sizeof(TouchPadEvent));
|
||||||
|
if (this->touch_queue_ == nullptr) {
|
||||||
|
ESP_LOGE(TAG, "Failed to create touch event queue of size %d", queue_size);
|
||||||
|
this->mark_failed();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set up filtering if configured
|
||||||
|
if (this->filter_configured_()) {
|
||||||
|
touch_filter_config_t filter_info = {
|
||||||
|
.mode = this->filter_mode_,
|
||||||
|
.debounce_cnt = this->debounce_count_,
|
||||||
|
.noise_thr = this->noise_threshold_,
|
||||||
|
.jitter_step = this->jitter_step_,
|
||||||
|
.smh_lvl = this->smooth_level_,
|
||||||
|
};
|
||||||
|
touch_pad_filter_set_config(&filter_info);
|
||||||
|
touch_pad_filter_enable();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this->denoise_configured_()) {
|
||||||
|
touch_pad_denoise_t denoise = {
|
||||||
|
.grade = this->grade_,
|
||||||
|
.cap_level = this->cap_level_,
|
||||||
|
};
|
||||||
|
touch_pad_denoise_set_config(&denoise);
|
||||||
|
touch_pad_denoise_enable();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this->waterproof_configured_()) {
|
||||||
|
touch_pad_waterproof_t waterproof = {
|
||||||
|
.guard_ring_pad = this->waterproof_guard_ring_pad_,
|
||||||
|
.shield_driver = this->waterproof_shield_driver_,
|
||||||
|
};
|
||||||
|
touch_pad_waterproof_set_config(&waterproof);
|
||||||
|
touch_pad_waterproof_enable();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Configure measurement parameters
|
||||||
|
touch_pad_set_charge_discharge_times(this->meas_cycle_);
|
||||||
|
touch_pad_set_measurement_interval(this->sleep_cycle_);
|
||||||
|
touch_pad_set_voltage(this->high_voltage_reference_, this->low_voltage_reference_, this->voltage_attenuation_);
|
||||||
|
|
||||||
|
// Set up the channel mask for all configured pads
|
||||||
|
uint16_t channel_mask = 0;
|
||||||
|
for (auto *child : this->children_) {
|
||||||
|
channel_mask |= BIT(child->get_touch_pad());
|
||||||
|
}
|
||||||
|
touch_pad_set_channel_mask(channel_mask);
|
||||||
|
|
||||||
|
// Configure each touch pad
|
||||||
|
for (auto *child : this->children_) {
|
||||||
|
// Initialize the touch pad
|
||||||
|
touch_pad_config(child->get_touch_pad());
|
||||||
|
|
||||||
|
// Set threshold
|
||||||
|
if (child->get_threshold() != 0) {
|
||||||
|
touch_pad_set_thresh(child->get_touch_pad(), child->get_threshold());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Configure timeout
|
||||||
|
touch_pad_timeout_set(true, TOUCH_PAD_THRESHOLD_MAX);
|
||||||
|
|
||||||
|
// Register ISR handler with all interrupts
|
||||||
|
esp_err_t err =
|
||||||
|
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));
|
||||||
|
vQueueDelete(this->touch_queue_);
|
||||||
|
this->touch_queue_ = nullptr;
|
||||||
|
this->mark_failed();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Calculate release timeout based on sleep cycle
|
||||||
|
uint32_t rtc_freq = rtc_clk_slow_freq_get_hz();
|
||||||
|
this->release_timeout_ms_ = (this->sleep_cycle_ * 1000 * 3) / (rtc_freq * 2);
|
||||||
|
if (this->release_timeout_ms_ < 100) {
|
||||||
|
this->release_timeout_ms_ = 100;
|
||||||
|
}
|
||||||
|
this->release_check_interval_ms_ = std::min(this->release_timeout_ms_ / 4, (uint32_t) 50);
|
||||||
|
|
||||||
|
// Enable the interrupts we need
|
||||||
|
touch_pad_intr_enable(static_cast<touch_pad_intr_mask_t>(TOUCH_PAD_INTR_MASK_ACTIVE | TOUCH_PAD_INTR_MASK_INACTIVE |
|
||||||
|
TOUCH_PAD_INTR_MASK_TIMEOUT));
|
||||||
|
|
||||||
|
// Start the FSM after all configuration is complete
|
||||||
|
touch_pad_fsm_start();
|
||||||
|
}
|
||||||
|
|
||||||
|
void ESP32TouchComponent::dump_config() {
|
||||||
|
const char *lv_s = get_low_voltage_reference_str(this->low_voltage_reference_);
|
||||||
|
const char *hv_s = get_high_voltage_reference_str(this->high_voltage_reference_);
|
||||||
|
const char *atten_s = get_voltage_attenuation_str(this->voltage_attenuation_);
|
||||||
|
|
||||||
|
ESP_LOGCONFIG(TAG,
|
||||||
|
"Config for ESP32 Touch Hub:\n"
|
||||||
|
" Meas cycle: %.2fms\n"
|
||||||
|
" Sleep cycle: %.2fms\n"
|
||||||
|
" Low Voltage Reference: %s\n"
|
||||||
|
" High Voltage Reference: %s\n"
|
||||||
|
" Voltage Attenuation: %s\n"
|
||||||
|
" ISR Configuration:\n"
|
||||||
|
" Release timeout: %" PRIu32 "ms\n"
|
||||||
|
" Release check interval: %" PRIu32 "ms",
|
||||||
|
this->meas_cycle_ / (8000000.0f / 1000.0f), this->sleep_cycle_ / (150000.0f / 1000.0f), lv_s, hv_s,
|
||||||
|
atten_s, this->release_timeout_ms_, this->release_check_interval_ms_);
|
||||||
|
|
||||||
|
if (this->filter_configured_()) {
|
||||||
|
const char *filter_mode_s;
|
||||||
|
switch (this->filter_mode_) {
|
||||||
|
case TOUCH_PAD_FILTER_IIR_4:
|
||||||
|
filter_mode_s = "IIR_4";
|
||||||
|
break;
|
||||||
|
case TOUCH_PAD_FILTER_IIR_8:
|
||||||
|
filter_mode_s = "IIR_8";
|
||||||
|
break;
|
||||||
|
case TOUCH_PAD_FILTER_IIR_16:
|
||||||
|
filter_mode_s = "IIR_16";
|
||||||
|
break;
|
||||||
|
case TOUCH_PAD_FILTER_IIR_32:
|
||||||
|
filter_mode_s = "IIR_32";
|
||||||
|
break;
|
||||||
|
case TOUCH_PAD_FILTER_IIR_64:
|
||||||
|
filter_mode_s = "IIR_64";
|
||||||
|
break;
|
||||||
|
case TOUCH_PAD_FILTER_IIR_128:
|
||||||
|
filter_mode_s = "IIR_128";
|
||||||
|
break;
|
||||||
|
case TOUCH_PAD_FILTER_IIR_256:
|
||||||
|
filter_mode_s = "IIR_256";
|
||||||
|
break;
|
||||||
|
case TOUCH_PAD_FILTER_JITTER:
|
||||||
|
filter_mode_s = "JITTER";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
filter_mode_s = "UNKNOWN";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
ESP_LOGCONFIG(TAG,
|
||||||
|
" Filter mode: %s\n"
|
||||||
|
" Debounce count: %" PRIu32 "\n"
|
||||||
|
" Noise threshold coefficient: %" PRIu32 "\n"
|
||||||
|
" Jitter filter step size: %" PRIu32,
|
||||||
|
filter_mode_s, this->debounce_count_, this->noise_threshold_, this->jitter_step_);
|
||||||
|
const char *smooth_level_s;
|
||||||
|
switch (this->smooth_level_) {
|
||||||
|
case TOUCH_PAD_SMOOTH_OFF:
|
||||||
|
smooth_level_s = "OFF";
|
||||||
|
break;
|
||||||
|
case TOUCH_PAD_SMOOTH_IIR_2:
|
||||||
|
smooth_level_s = "IIR_2";
|
||||||
|
break;
|
||||||
|
case TOUCH_PAD_SMOOTH_IIR_4:
|
||||||
|
smooth_level_s = "IIR_4";
|
||||||
|
break;
|
||||||
|
case TOUCH_PAD_SMOOTH_IIR_8:
|
||||||
|
smooth_level_s = "IIR_8";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
smooth_level_s = "UNKNOWN";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
ESP_LOGCONFIG(TAG, " Smooth level: %s", smooth_level_s);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this->denoise_configured_()) {
|
||||||
|
const char *grade_s;
|
||||||
|
switch (this->grade_) {
|
||||||
|
case TOUCH_PAD_DENOISE_BIT12:
|
||||||
|
grade_s = "BIT12";
|
||||||
|
break;
|
||||||
|
case TOUCH_PAD_DENOISE_BIT10:
|
||||||
|
grade_s = "BIT10";
|
||||||
|
break;
|
||||||
|
case TOUCH_PAD_DENOISE_BIT8:
|
||||||
|
grade_s = "BIT8";
|
||||||
|
break;
|
||||||
|
case TOUCH_PAD_DENOISE_BIT4:
|
||||||
|
grade_s = "BIT4";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
grade_s = "UNKNOWN";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
ESP_LOGCONFIG(TAG, " Denoise grade: %s", grade_s);
|
||||||
|
|
||||||
|
const char *cap_level_s;
|
||||||
|
switch (this->cap_level_) {
|
||||||
|
case TOUCH_PAD_DENOISE_CAP_L0:
|
||||||
|
cap_level_s = "L0";
|
||||||
|
break;
|
||||||
|
case TOUCH_PAD_DENOISE_CAP_L1:
|
||||||
|
cap_level_s = "L1";
|
||||||
|
break;
|
||||||
|
case TOUCH_PAD_DENOISE_CAP_L2:
|
||||||
|
cap_level_s = "L2";
|
||||||
|
break;
|
||||||
|
case TOUCH_PAD_DENOISE_CAP_L3:
|
||||||
|
cap_level_s = "L3";
|
||||||
|
break;
|
||||||
|
case TOUCH_PAD_DENOISE_CAP_L4:
|
||||||
|
cap_level_s = "L4";
|
||||||
|
break;
|
||||||
|
case TOUCH_PAD_DENOISE_CAP_L5:
|
||||||
|
cap_level_s = "L5";
|
||||||
|
break;
|
||||||
|
case TOUCH_PAD_DENOISE_CAP_L6:
|
||||||
|
cap_level_s = "L6";
|
||||||
|
break;
|
||||||
|
case TOUCH_PAD_DENOISE_CAP_L7:
|
||||||
|
cap_level_s = "L7";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
cap_level_s = "UNKNOWN";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
ESP_LOGCONFIG(TAG, " Denoise capacitance level: %s", cap_level_s);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this->setup_mode_) {
|
||||||
|
ESP_LOGCONFIG(TAG, " Setup Mode ENABLED");
|
||||||
|
}
|
||||||
|
|
||||||
|
for (auto *child : this->children_) {
|
||||||
|
LOG_BINARY_SENSOR(" ", "Touch Pad", child);
|
||||||
|
ESP_LOGCONFIG(TAG, " Pad: T%" PRIu32, (uint32_t) child->get_touch_pad());
|
||||||
|
ESP_LOGCONFIG(TAG, " Threshold: %" PRIu32, child->get_threshold());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ESP32TouchComponent::loop() {
|
||||||
|
const uint32_t now = App.get_loop_component_start_time();
|
||||||
|
bool should_print = this->setup_mode_ && now - this->setup_mode_last_log_print_ > 250;
|
||||||
|
|
||||||
|
// Print debug info for all pads in setup mode
|
||||||
|
if (should_print) {
|
||||||
|
for (auto *child : this->children_) {
|
||||||
|
uint32_t value = 0;
|
||||||
|
touch_pad_read_raw_data(child->get_touch_pad(), &value);
|
||||||
|
child->value_ = value;
|
||||||
|
ESP_LOGD(TAG, "Touch Pad '%s' (T%" PRIu32 "): %" PRIu32, child->get_name().c_str(),
|
||||||
|
(uint32_t) child->get_touch_pad(), value);
|
||||||
|
}
|
||||||
|
this->setup_mode_last_log_print_ = now;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Process any queued touch events from interrupts
|
||||||
|
TouchPadEvent event;
|
||||||
|
while (xQueueReceive(this->touch_queue_, &event, 0) == pdTRUE) {
|
||||||
|
// Handle timeout events
|
||||||
|
if (event.intr_mask & TOUCH_PAD_INTR_MASK_TIMEOUT) {
|
||||||
|
// Resume measurement after timeout
|
||||||
|
touch_pad_timeout_resume();
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle active/inactive events
|
||||||
|
if (event.intr_mask & (TOUCH_PAD_INTR_MASK_ACTIVE | TOUCH_PAD_INTR_MASK_INACTIVE)) {
|
||||||
|
// Process touch status for each pad
|
||||||
|
for (auto *child : this->children_) {
|
||||||
|
touch_pad_t pad = child->get_touch_pad();
|
||||||
|
|
||||||
|
// Check if this pad is in the status mask
|
||||||
|
if (event.pad_status & BIT(pad)) {
|
||||||
|
// Read current value
|
||||||
|
uint32_t value = 0;
|
||||||
|
if (this->filter_configured_()) {
|
||||||
|
touch_pad_filter_read_smooth(pad, &value);
|
||||||
|
} else {
|
||||||
|
touch_pad_read_raw_data(pad, &value);
|
||||||
|
}
|
||||||
|
|
||||||
|
child->value_ = value;
|
||||||
|
|
||||||
|
// For S2/S3, higher value means touched
|
||||||
|
bool is_touched = (event.intr_mask & TOUCH_PAD_INTR_MASK_ACTIVE) != 0;
|
||||||
|
|
||||||
|
if (is_touched != child->last_state_) {
|
||||||
|
child->last_state_ = is_touched;
|
||||||
|
child->publish_state(is_touched);
|
||||||
|
ESP_LOGV(TAG, "Touch Pad '%s' state: %s (value: %" PRIu32 ", threshold: %" PRIu32 ")",
|
||||||
|
child->get_name().c_str(), is_touched ? "ON" : "OFF", value, child->get_threshold());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ESP32TouchComponent::on_shutdown() {
|
||||||
|
// Disable interrupts
|
||||||
|
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);
|
||||||
|
if (this->touch_queue_) {
|
||||||
|
vQueueDelete(this->touch_queue_);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if any pad is configured for wakeup
|
||||||
|
bool is_wakeup_source = false;
|
||||||
|
for (auto *child : this->children_) {
|
||||||
|
if (child->get_wakeup_threshold() != 0) {
|
||||||
|
if (!is_wakeup_source) {
|
||||||
|
is_wakeup_source = true;
|
||||||
|
// Touch sensor FSM mode must be 'TOUCH_FSM_MODE_TIMER' to use it to wake-up.
|
||||||
|
touch_pad_set_fsm_mode(TOUCH_FSM_MODE_TIMER);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!is_wakeup_source) {
|
||||||
|
touch_pad_deinit();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void IRAM_ATTR ESP32TouchComponent::touch_isr_handler(void *arg) {
|
||||||
|
ESP32TouchComponent *component = static_cast<ESP32TouchComponent *>(arg);
|
||||||
|
BaseType_t xHigherPriorityTaskWoken = pdFALSE;
|
||||||
|
|
||||||
|
// Read interrupt status and pad status
|
||||||
|
TouchPadEvent event;
|
||||||
|
event.intr_mask = touch_pad_read_intr_status_mask();
|
||||||
|
event.pad_status = touch_pad_get_status();
|
||||||
|
event.pad = touch_pad_get_current_meas_channel();
|
||||||
|
|
||||||
|
// Send event to queue for processing in main loop
|
||||||
|
xQueueSendFromISR(component->touch_queue_, &event, &xHigherPriorityTaskWoken);
|
||||||
|
|
||||||
|
if (xHigherPriorityTaskWoken) {
|
||||||
|
portYIELD_FROM_ISR();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool ESP32TouchComponent::filter_configured_() const { return this->filter_mode_ != TOUCH_PAD_FILTER_MAX; }
|
||||||
|
|
||||||
|
bool ESP32TouchComponent::denoise_configured_() const { return this->grade_ != TOUCH_PAD_DENOISE_MAX; }
|
||||||
|
|
||||||
|
bool ESP32TouchComponent::waterproof_configured_() const { return this->waterproof_guard_ring_pad_ != TOUCH_PAD_MAX; }
|
||||||
|
|
||||||
|
} // namespace esp32_touch
|
||||||
|
} // namespace esphome
|
||||||
|
|
||||||
|
#endif // USE_ESP32_VARIANT_ESP32S2 || USE_ESP32_VARIANT_ESP32S3
|
||||||
Reference in New Issue
Block a user