djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4021 from dhalbert/esp32-s2-touch-init-order 

ESP32-S2: Initialize touch in proper order
This commit is contained in:
Jeff Epler 2021-01-19 08:17:27 -06:00 committed by GitHub
parent 6a76b60027 ee48e4b452
commit 914326872f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ports/esp32s2/peripherals/touch.c
View File

@ -46,8 +46,13 @@ void peripherals_touch_init(const touch_pad_t touchpad) {
if (!touch_inited) { if (!touch_inited) {
touch_pad_init(); touch_pad_init();
touch_pad_set_fsm_mode(TOUCH_FSM_MODE_TIMER); touch_pad_set_fsm_mode(TOUCH_FSM_MODE_TIMER);
}
// touch_pad_config() must be done before touch_pad_fsm_start() the first time.
// Otherwise the calibration is wrong and we get maximum raw values if there is
// a trace of any significant length on the pin.
touch_pad_config(touchpad);
if (!touch_inited) {
touch_pad_fsm_start(); touch_pad_fsm_start();
touch_inited = true; touch_inited = true;
} }
touch_pad_config(touchpad);
} }