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

ESP32-S2: Initialize touch in proper order

1 files changed, 6 insertions, 1 deletions

diff --git a/ports/esp32s2/peripherals/touch.c b/ports/esp32s2/peripherals/touch.c
index 6cf33b2bd..cd895b10b 100644
--- a/ports/esp32s2/peripherals/touch.c
+++ b/ports/esp32s2/peripherals/touch.c
@@ -46,8 +46,13 @@ void peripherals_touch_init(const touch_pad_t touchpad) {
     if (!touch_inited) {
         touch_pad_init();
         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_inited = true;
     }
-    touch_pad_config(touchpad);
 }