espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 19:24:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/clear_interrupt_in_touch_sensor_initialization_backport_v4.3' into 'release/v4.3'

Browse Source 
fix: clear interrupt in touch sensor initialization (backport v4.3)

See merge request espressif/esp-idf!12758
This commit is contained in:
Jiang Jiang Jian
2021-03-26 05:55:18 +00:00
parent 2792c333bc 918875424e
commit 2d26c24e3a
4 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/esp_system/sleep_modes.c
View File

@@ -906,6 +906,7 @@ static void touch_wakeup_prepare(void)
if ((touch_num > TOUCH_PAD_NUM0) && (touch_num < TOUCH_PAD_MAX) && touch_ll_get_fsm_state()) {
touch_ll_stop_fsm();
touch_ll_clear_channel_mask(TOUCH_PAD_BIT_MASK_ALL);
touch_ll_intr_clear(TOUCH_PAD_INTR_MASK_ALL); // Clear state from previous wakeup
touch_ll_set_channel_mask(BIT(touch_num));
touch_ll_start_fsm();
}

2
components/hal/esp32/touch_sensor_hal.c
View File

@@ -19,7 +19,9 @@
void touch_hal_init(void)
{
touch_ll_stop_fsm();
touch_ll_intr_disable();
touch_ll_intr_clear();
touch_ll_clear_channel_mask(TOUCH_PAD_BIT_MASK_ALL);
touch_ll_clear_group_mask(TOUCH_PAD_BIT_MASK_ALL, TOUCH_PAD_BIT_MASK_ALL);
touch_ll_set_trigger_mode(TOUCH_TRIGGER_MODE_DEFAULT);

2
components/hal/esp32s2/touch_sensor_hal.c
View File

@@ -20,7 +20,9 @@
void touch_hal_init(void)
{
touch_ll_stop_fsm();
touch_ll_intr_disable(TOUCH_PAD_INTR_MASK_ALL);
touch_ll_intr_clear(TOUCH_PAD_INTR_MASK_ALL);
touch_ll_clear_channel_mask(TOUCH_PAD_BIT_MASK_ALL);
touch_ll_clear_trigger_status_mask();
touch_ll_set_meas_times(TOUCH_PAD_MEASURE_CYCLE_DEFAULT);

2
components/hal/esp32s3/touch_sensor_hal.c
View File

@@ -20,7 +20,9 @@
void touch_hal_init(void)
{
touch_ll_stop_fsm();
touch_ll_intr_disable(TOUCH_PAD_INTR_MASK_ALL);
touch_ll_intr_clear(TOUCH_PAD_INTR_MASK_ALL);
touch_ll_clear_channel_mask(TOUCH_PAD_BIT_MASK_ALL);
touch_ll_clear_trigger_status_mask();
touch_ll_set_meas_times(TOUCH_PAD_MEASURE_CYCLE_DEFAULT);