From 048ca2a57003d6f122db57dfc93513222380cff0 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Sun, 22 Nov 2020 18:54:18 +0530
Subject: get multiple touchpad working

---
 ports/esp32s2/common-hal/touchio/TouchIn.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/ports/esp32s2/common-hal/touchio/TouchIn.c b/ports/esp32s2/common-hal/touchio/TouchIn.c
index b44234775..4589c46a7 100644
--- a/ports/esp32s2/common-hal/touchio/TouchIn.c
+++ b/ports/esp32s2/common-hal/touchio/TouchIn.c
@@ -25,10 +25,12 @@
  */
 
 #include "shared-bindings/touchio/TouchIn.h"
-#include "py/runtime.h"
 
+#include "py/runtime.h"
 #include "driver/touch_pad.h"
 
+bool touch_inited = false;
+
 static uint16_t get_raw_reading(touchio_touchin_obj_t *self) {
     uint32_t touch_value;
     touch_pad_read_raw_data((touch_pad_t)self->pin->touch_channel, &touch_value);
@@ -45,11 +47,14 @@ void common_hal_touchio_touchin_construct(touchio_touchin_obj_t* self,
     }
     claim_pin(pin);
 
-    touch_pad_init();
-    touch_pad_config((touch_pad_t)pin->touch_channel);
+    if (!touch_inited) {
+        touch_pad_init();
+        touch_pad_set_fsm_mode(TOUCH_FSM_MODE_TIMER);
+        touch_pad_fsm_start();
+        touch_inited = true;
+    }
 
-    touch_pad_set_fsm_mode(TOUCH_FSM_MODE_TIMER);
-    touch_pad_fsm_start();
+    touch_pad_config((touch_pad_t)pin->touch_channel);
 
     // wait for "raw data" to reset
     mp_hal_delay_ms(10);
@@ -79,8 +84,7 @@ void common_hal_touchio_touchin_deinit(touchio_touchin_obj_t* self) {
 }
 
 bool common_hal_touchio_touchin_get_value(touchio_touchin_obj_t *self) {
-    uint16_t reading = get_raw_reading(self);
-    return reading > self->threshold;
+    return get_raw_reading(self) > self->threshold;
 }
 
 uint16_t common_hal_touchio_touchin_get_raw_value(touchio_touchin_obj_t *self) {
-- 
cgit v1.2.3


From 6af48bb24cc12a9547aef8d18d56acf8e0f5695d Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Thu, 26 Nov 2020 11:22:44 +0530
Subject: reset touchin on every vm run

---
 ports/esp32s2/common-hal/touchio/TouchIn.c | 8 +++++++-
 ports/esp32s2/supervisor/port.c            | 5 +++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ports/esp32s2/common-hal/touchio/TouchIn.c b/ports/esp32s2/common-hal/touchio/TouchIn.c
index 4589c46a7..b27cbcf86 100644
--- a/ports/esp32s2/common-hal/touchio/TouchIn.c
+++ b/ports/esp32s2/common-hal/touchio/TouchIn.c
@@ -31,6 +31,13 @@
 
 bool touch_inited = false;
 
+void touchin_reset(void) {
+    if (touch_inited) {
+        touch_pad_deinit();
+        touch_inited = false;
+    }
+}
+
 static uint16_t get_raw_reading(touchio_touchin_obj_t *self) {
     uint32_t touch_value;
     touch_pad_read_raw_data((touch_pad_t)self->pin->touch_channel, &touch_value);
@@ -78,7 +85,6 @@ void common_hal_touchio_touchin_deinit(touchio_touchin_obj_t* self) {
     if (common_hal_touchio_touchin_deinited(self)) {
         return;
     }
-    touch_pad_deinit();
     reset_pin_number(self->pin->touch_channel);
     self->pin = NULL;
 }
diff --git a/ports/esp32s2/supervisor/port.c b/ports/esp32s2/supervisor/port.c
index 876ad739d..e2defc5af 100644
--- a/ports/esp32s2/supervisor/port.c
+++ b/ports/esp32s2/supervisor/port.c
@@ -43,6 +43,7 @@
 #include "common-hal/busio/UART.h"
 #include "common-hal/pulseio/PulseIn.h"
 #include "common-hal/pwmio/PWMOut.h"
+#include "common-hal/touchio/TouchIn.h"
 #include "common-hal/watchdog/WatchDogTimer.h"
 #include "common-hal/wifi/__init__.h"
 #include "supervisor/memory.h"
@@ -127,6 +128,10 @@ void reset_port(void) {
     rtc_reset();
 #endif
 
+#if CIRCUITPY_TOUCHIO_USE_NATIVE
+    touchin_reset();
+#endif
+
 #if CIRCUITPY_WATCHDOG
     watchdog_reset();
 #endif
-- 
cgit v1.2.3