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

fix: clear interrupt in touch sensor initialization

Browse Source
This commit is contained in:
fuzhibo
2021-03-24 16:09:52 +08:00
parent 74649219f4
commit a866f0d8f6
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp32s2/sleep_modes.c
View File

@@ -37,6 +37,9 @@
#include "hal/wdt_hal.h" #include "hal/wdt_hal.h"
#include "hal/clk_gate_ll.h" #include "hal/clk_gate_ll.h"
#include "driver/rtc_io.h" #include "driver/rtc_io.h"
#include "hal/touch_sensor_hal.h"
#include "driver/touch_sensor.h"
#include "driver/touch_sensor_common.h"
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
#include "freertos/task.h" #include "freertos/task.h"
#include "sdkconfig.h" #include "sdkconfig.h"
@@ -458,6 +461,7 @@ static void touch_wakeup_prepare(void)
touch_pad_sleep_channel_t slp_config; touch_pad_sleep_channel_t slp_config;
touch_pad_fsm_stop(); touch_pad_fsm_stop();
touch_pad_clear_channel_mask(SOC_TOUCH_SENSOR_BIT_MASK_MAX); touch_pad_clear_channel_mask(SOC_TOUCH_SENSOR_BIT_MASK_MAX);
touch_ll_intr_clear(TOUCH_PAD_INTR_MASK_ALL); // Clear state from previous wakeup
touch_pad_sleep_channel_get_info(&slp_config); touch_pad_sleep_channel_get_info(&slp_config);
touch_pad_set_channel_mask(BIT(slp_config.touch_num)); touch_pad_set_channel_mask(BIT(slp_config.touch_num));
touch_pad_fsm_start(); touch_pad_fsm_start();

2
components/soc/src/esp32/touch_sensor_hal.c
View File

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

2
components/soc/src/esp32s2/touch_sensor_hal.c
View File

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