espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-04 21:24:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_esp32_touch_example_task_watchdog_issue' into 'master'

Browse Source 
fix(legacy_touch): fixed touch read WDT issue on esp32

Closes IDFGH-14920

See merge request espressif/esp-idf!37974
This commit is contained in:
Kevin (Lao Kaiyao)
2025-03-25 12:30:59 +08:00
parent 80f172bb44 ea5c074858
commit 5b185da014
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/driver/touch_sensor/esp32/touch_sensor.c
View File

@@ -362,11 +362,15 @@ static esp_err_t _touch_pad_read(touch_pad_t touch_num, uint16_t *touch_value, t
if (TOUCH_FSM_MODE_SW == mode) { if (TOUCH_FSM_MODE_SW == mode) {
touch_pad_set_group_mask((1 << touch_num), (1 << touch_num), (1 << touch_num)); touch_pad_set_group_mask((1 << touch_num), (1 << touch_num), (1 << touch_num));
touch_pad_sw_start(); touch_pad_sw_start();
while (!touch_hal_meas_is_done()) {}; while (!touch_hal_meas_is_done()) {
vTaskDelay(1);
}
*touch_value = touch_hal_read_raw_data(touch_num); *touch_value = touch_hal_read_raw_data(touch_num);
touch_pad_clear_group_mask((1 << touch_num), (1 << touch_num), (1 << touch_num)); touch_pad_clear_group_mask((1 << touch_num), (1 << touch_num), (1 << touch_num));
} else if (TOUCH_FSM_MODE_TIMER == mode) { } else if (TOUCH_FSM_MODE_TIMER == mode) {
while (!touch_hal_meas_is_done()) {}; while (!touch_hal_meas_is_done()) {
vTaskDelay(1);
}
*touch_value = touch_hal_read_raw_data(touch_num); *touch_value = touch_hal_read_raw_data(touch_num);
} else { } else {
res = ESP_FAIL; res = ESP_FAIL;