From 80029f6929ebbf6c0a02c5320e59220b0501bd55 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Wed, 28 Oct 2020 00:12:13 +0530
Subject: [PATCH 1/9] rotaryio implementation for esp32s2

---
 .../common-hal/rotaryio/IncrementalEncoder.c  | 115 ++++++++++++++++++
 .../common-hal/rotaryio/IncrementalEncoder.h  |  41 +++++++
 ports/esp32s2/common-hal/rotaryio/__init__.c  |   1 +
 ports/esp32s2/mpconfigport.mk                 |   2 +-
 4 files changed, 158 insertions(+), 1 deletion(-)
 create mode 100644 ports/esp32s2/common-hal/rotaryio/IncrementalEncoder.c
 create mode 100644 ports/esp32s2/common-hal/rotaryio/IncrementalEncoder.h
 create mode 100644 ports/esp32s2/common-hal/rotaryio/__init__.c

diff --git a/ports/esp32s2/common-hal/rotaryio/IncrementalEncoder.c b/ports/esp32s2/common-hal/rotaryio/IncrementalEncoder.c
new file mode 100644
index 0000000000..bbff363740
--- /dev/null
+++ b/ports/esp32s2/common-hal/rotaryio/IncrementalEncoder.c
@@ -0,0 +1,115 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "common-hal/rotaryio/IncrementalEncoder.h"
+
+#include "py/runtime.h"
+#include "supervisor/shared/translate.h"
+
+#include "driver/pcnt.h"
+
+static void pcnt_reset(int unit) {
+    // Initialize PCNT's counter
+    pcnt_counter_pause(unit);
+    pcnt_counter_clear(unit);
+
+    // Everything is set up, now go to counting
+    pcnt_counter_resume(unit);
+}
+
+static void pcnt_init(int unit, rotaryio_incrementalencoder_obj_t* self) {
+    // Prepare configuration for the PCNT unit
+    pcnt_config_t pcnt_config = {
+        // Set PCNT input signal and control GPIOs
+        .pulse_gpio_num = self->pin_a->number,
+        .ctrl_gpio_num = self->pin_b->number,
+        .channel = PCNT_CHANNEL_0,
+        .unit = unit,
+        // What to do on the positive / negative edge of pulse input?
+        .pos_mode = PCNT_COUNT_DEC,   // Count up on the positive edge
+        .neg_mode = PCNT_COUNT_INC,   // Keep the counter value on the negative edge
+        // What to do when control input is low or high?
+        .lctrl_mode = PCNT_MODE_REVERSE, // Reverse counting direction if low
+        .hctrl_mode = PCNT_MODE_KEEP,    // Keep the primary counter mode if high
+    };
+    // Initialize PCNT unit
+    pcnt_unit_config(&pcnt_config);
+
+    // Configure channel 1
+    pcnt_config.pulse_gpio_num = self->pin_b->number;
+    pcnt_config.ctrl_gpio_num = self->pin_a->number;
+    pcnt_config.channel = PCNT_CHANNEL_1;
+    pcnt_config.pos_mode = PCNT_COUNT_INC;
+    pcnt_config.neg_mode = PCNT_COUNT_DEC;
+    pcnt_unit_config(&pcnt_config);
+
+    // Configure and enable the input filter
+    pcnt_set_filter_value(unit, 100);
+    pcnt_filter_enable(unit);
+
+    pcnt_reset(unit);
+}
+
+void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencoder_obj_t* self,
+    const mcu_pin_obj_t* pin_a, const mcu_pin_obj_t* pin_b) {
+    claim_pin(pin_a);
+    claim_pin(pin_b);
+
+    self->pin_a = pin_a;
+    self->pin_b = pin_b;
+
+    self->position = 0;
+
+    pcnt_init(PCNT_UNIT_0, self);
+}
+
+bool common_hal_rotaryio_incrementalencoder_deinited(rotaryio_incrementalencoder_obj_t* self) {
+    return self->pin_a == NULL;
+}
+
+void common_hal_rotaryio_incrementalencoder_deinit(rotaryio_incrementalencoder_obj_t* self) {
+    if (common_hal_rotaryio_incrementalencoder_deinited(self)) {
+        return;
+    }
+
+    reset_pin_number(self->pin_a->number);
+    self->pin_a = NULL;
+
+    reset_pin_number(self->pin_b->number);
+    self->pin_b = NULL;
+}
+
+mp_int_t common_hal_rotaryio_incrementalencoder_get_position(rotaryio_incrementalencoder_obj_t* self) {
+    int16_t count = 0;
+    pcnt_get_counter_value(PCNT_UNIT_0, &count);
+    return self->position+count;
+}
+
+void common_hal_rotaryio_incrementalencoder_set_position(rotaryio_incrementalencoder_obj_t* self,
+        mp_int_t new_position) {
+    self->position = new_position;
+    pcnt_reset(PCNT_UNIT_0);
+}
diff --git a/ports/esp32s2/common-hal/rotaryio/IncrementalEncoder.h b/ports/esp32s2/common-hal/rotaryio/IncrementalEncoder.h
new file mode 100644
index 0000000000..0cc2830fb7
--- /dev/null
+++ b/ports/esp32s2/common-hal/rotaryio/IncrementalEncoder.h
@@ -0,0 +1,41 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_ESP32S2_COMMON_HAL_ROTARYIO_INCREMENTALENCODER_H
+#define MICROPY_INCLUDED_ESP32S2_COMMON_HAL_ROTARYIO_INCREMENTALENCODER_H
+
+#include "common-hal/microcontroller/Pin.h"
+
+#include "py/obj.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    const mcu_pin_obj_t * pin_a;
+    const mcu_pin_obj_t * pin_b;
+    mp_int_t position;
+} rotaryio_incrementalencoder_obj_t;
+
+#endif // MICROPY_INCLUDED_ESP32S2_COMMON_HAL_ROTARYIO_INCREMENTALENCODER_H
diff --git a/ports/esp32s2/common-hal/rotaryio/__init__.c b/ports/esp32s2/common-hal/rotaryio/__init__.c
new file mode 100644
index 0000000000..0aae79c26a
--- /dev/null
+++ b/ports/esp32s2/common-hal/rotaryio/__init__.c
@@ -0,0 +1 @@
+// No rotaryio module functions.
diff --git a/ports/esp32s2/mpconfigport.mk b/ports/esp32s2/mpconfigport.mk
index 4e8a7bdef2..dadab37515 100644
--- a/ports/esp32s2/mpconfigport.mk
+++ b/ports/esp32s2/mpconfigport.mk
@@ -19,7 +19,7 @@ CIRCUITPY_AUDIOIO = 0
 CIRCUITPY_COUNTIO = 0
 CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_I2CPERIPHERAL = 0
-CIRCUITPY_ROTARYIO = 0
+CIRCUITPY_ROTARYIO = 1
 CIRCUITPY_NVM = 0
 # We don't have enough endpoints to include MIDI.
 CIRCUITPY_USB_MIDI = 0

From b2e83952c026485866a7b5a830d85850b09abb38 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Fri, 6 Nov 2020 15:27:16 -0800
Subject: [PATCH 2/9] Rebrand EInk Portal to MagTag

---
 .../{adafruit_esp32s2_eink_portal => adafruit_magtag}/board.c   | 0
 .../mpconfigboard.h                                             | 2 +-
 .../mpconfigboard.mk                                            | 2 +-
 .../{adafruit_esp32s2_eink_portal => adafruit_magtag}/pins.c    | 0
 .../{adafruit_esp32s2_eink_portal => adafruit_magtag}/sdkconfig | 0
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename ports/esp32s2/boards/{adafruit_esp32s2_eink_portal => adafruit_magtag}/board.c (100%)
 rename ports/esp32s2/boards/{adafruit_esp32s2_eink_portal => adafruit_magtag}/mpconfigboard.h (97%)
 rename ports/esp32s2/boards/{adafruit_esp32s2_eink_portal => adafruit_magtag}/mpconfigboard.mk (92%)
 rename ports/esp32s2/boards/{adafruit_esp32s2_eink_portal => adafruit_magtag}/pins.c (100%)
 rename ports/esp32s2/boards/{adafruit_esp32s2_eink_portal => adafruit_magtag}/sdkconfig (100%)

diff --git a/ports/esp32s2/boards/adafruit_esp32s2_eink_portal/board.c b/ports/esp32s2/boards/adafruit_magtag/board.c
similarity index 100%
rename from ports/esp32s2/boards/adafruit_esp32s2_eink_portal/board.c
rename to ports/esp32s2/boards/adafruit_magtag/board.c
diff --git a/ports/esp32s2/boards/adafruit_esp32s2_eink_portal/mpconfigboard.h b/ports/esp32s2/boards/adafruit_magtag/mpconfigboard.h
similarity index 97%
rename from ports/esp32s2/boards/adafruit_esp32s2_eink_portal/mpconfigboard.h
rename to ports/esp32s2/boards/adafruit_magtag/mpconfigboard.h
index 5a17a0cad1..be376e5a94 100644
--- a/ports/esp32s2/boards/adafruit_esp32s2_eink_portal/mpconfigboard.h
+++ b/ports/esp32s2/boards/adafruit_magtag/mpconfigboard.h
@@ -26,7 +26,7 @@
 
 //Micropython setup
 
-#define MICROPY_HW_BOARD_NAME       "EInk Portal"
+#define MICROPY_HW_BOARD_NAME       "MagTag"
 #define MICROPY_HW_MCU_NAME         "ESP32S2"
 
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO1)
diff --git a/ports/esp32s2/boards/adafruit_esp32s2_eink_portal/mpconfigboard.mk b/ports/esp32s2/boards/adafruit_magtag/mpconfigboard.mk
similarity index 92%
rename from ports/esp32s2/boards/adafruit_esp32s2_eink_portal/mpconfigboard.mk
rename to ports/esp32s2/boards/adafruit_magtag/mpconfigboard.mk
index 31aff57da4..0a141cbe3e 100644
--- a/ports/esp32s2/boards/adafruit_esp32s2_eink_portal/mpconfigboard.mk
+++ b/ports/esp32s2/boards/adafruit_magtag/mpconfigboard.mk
@@ -1,6 +1,6 @@
 USB_VID = 0x239A
 USB_PID = 0x80E6
-USB_PRODUCT = "EInk Portal"
+USB_PRODUCT = "MagTag"
 USB_MANUFACTURER = "Adafruit"
 
 INTERNAL_FLASH_FILESYSTEM = 1
diff --git a/ports/esp32s2/boards/adafruit_esp32s2_eink_portal/pins.c b/ports/esp32s2/boards/adafruit_magtag/pins.c
similarity index 100%
rename from ports/esp32s2/boards/adafruit_esp32s2_eink_portal/pins.c
rename to ports/esp32s2/boards/adafruit_magtag/pins.c
diff --git a/ports/esp32s2/boards/adafruit_esp32s2_eink_portal/sdkconfig b/ports/esp32s2/boards/adafruit_magtag/sdkconfig
similarity index 100%
rename from ports/esp32s2/boards/adafruit_esp32s2_eink_portal/sdkconfig
rename to ports/esp32s2/boards/adafruit_magtag/sdkconfig

From 9ef23e8659d4ee58e3158c63f690108b411015a1 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Fri, 6 Nov 2020 15:29:58 -0800
Subject: [PATCH 3/9] Fix build board list

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 404d2ea2e5..a2e9e92aba 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -421,7 +421,7 @@ jobs:
       fail-fast: false
       matrix:
         board:
-        - "adafruit_esp32s2_eink_portal"
+        - "adafruit_magtag"
         - "adafruit_metro_esp32s2"
         - "electroniccats_bastwifi"
         - "espressif_kaluga_1"

From 55e0e2c4ba7dfa1d3e2ba84a4af3b4f132ae1a23 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Sun, 8 Nov 2020 11:12:32 +0530
Subject: [PATCH 4/9] Update rotaryio implementation

---
 .../common-hal/rotaryio/IncrementalEncoder.c  | 79 ++++++-------------
 .../common-hal/rotaryio/IncrementalEncoder.h  |  9 +--
 2 files changed, 29 insertions(+), 59 deletions(-)

diff --git a/ports/esp32s2/common-hal/rotaryio/IncrementalEncoder.c b/ports/esp32s2/common-hal/rotaryio/IncrementalEncoder.c
index bbff363740..25529ac723 100644
--- a/ports/esp32s2/common-hal/rotaryio/IncrementalEncoder.c
+++ b/ports/esp32s2/common-hal/rotaryio/IncrementalEncoder.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries
+ * Copyright (c) 2020 microDev
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,29 +25,22 @@
  */
 
 #include "common-hal/rotaryio/IncrementalEncoder.h"
+#include "common-hal/microcontroller/Pin.h"
 
 #include "py/runtime.h"
 #include "supervisor/shared/translate.h"
 
-#include "driver/pcnt.h"
+void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencoder_obj_t* self,
+    const mcu_pin_obj_t* pin_a, const mcu_pin_obj_t* pin_b) {
+    claim_pin(pin_a);
+    claim_pin(pin_b);
 
-static void pcnt_reset(int unit) {
-    // Initialize PCNT's counter
-    pcnt_counter_pause(unit);
-    pcnt_counter_clear(unit);
-
-    // Everything is set up, now go to counting
-    pcnt_counter_resume(unit);
-}
-
-static void pcnt_init(int unit, rotaryio_incrementalencoder_obj_t* self) {
     // Prepare configuration for the PCNT unit
-    pcnt_config_t pcnt_config = {
+    const pcnt_config_t pcnt_config = {
         // Set PCNT input signal and control GPIOs
-        .pulse_gpio_num = self->pin_a->number,
-        .ctrl_gpio_num = self->pin_b->number,
+        .pulse_gpio_num = pin_a->number,
+        .ctrl_gpio_num = pin_b->number,
         .channel = PCNT_CHANNEL_0,
-        .unit = unit,
         // What to do on the positive / negative edge of pulse input?
         .pos_mode = PCNT_COUNT_DEC,   // Count up on the positive edge
         .neg_mode = PCNT_COUNT_INC,   // Keep the counter value on the negative edge
@@ -55,61 +48,39 @@ static void pcnt_init(int unit, rotaryio_incrementalencoder_obj_t* self) {
         .lctrl_mode = PCNT_MODE_REVERSE, // Reverse counting direction if low
         .hctrl_mode = PCNT_MODE_KEEP,    // Keep the primary counter mode if high
     };
-    // Initialize PCNT unit
-    pcnt_unit_config(&pcnt_config);
 
-    // Configure channel 1
-    pcnt_config.pulse_gpio_num = self->pin_b->number;
-    pcnt_config.ctrl_gpio_num = self->pin_a->number;
-    pcnt_config.channel = PCNT_CHANNEL_1;
-    pcnt_config.pos_mode = PCNT_COUNT_INC;
-    pcnt_config.neg_mode = PCNT_COUNT_DEC;
-    pcnt_unit_config(&pcnt_config);
+     // Initialize PCNT unit
+    const int8_t unit = peripherals_pcnt_init(pcnt_config);
+    if (unit == -1) {
+        mp_raise_RuntimeError(translate("All PCNT units in use"));
+    }
 
-    // Configure and enable the input filter
-    pcnt_set_filter_value(unit, 100);
-    pcnt_filter_enable(unit);
-
-    pcnt_reset(unit);
-}
-
-void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencoder_obj_t* self,
-    const mcu_pin_obj_t* pin_a, const mcu_pin_obj_t* pin_b) {
-    claim_pin(pin_a);
-    claim_pin(pin_b);
-
-    self->pin_a = pin_a;
-    self->pin_b = pin_b;
-
-    self->position = 0;
-
-    pcnt_init(PCNT_UNIT_0, self);
+    self->pin_a = pin_a->number;
+    self->pin_b = pin_b->number;
+    self->unit = (pcnt_unit_t)unit;
 }
 
 bool common_hal_rotaryio_incrementalencoder_deinited(rotaryio_incrementalencoder_obj_t* self) {
-    return self->pin_a == NULL;
+    return self->unit == PCNT_UNIT_MAX;
 }
 
 void common_hal_rotaryio_incrementalencoder_deinit(rotaryio_incrementalencoder_obj_t* self) {
     if (common_hal_rotaryio_incrementalencoder_deinited(self)) {
         return;
     }
-
-    reset_pin_number(self->pin_a->number);
-    self->pin_a = NULL;
-
-    reset_pin_number(self->pin_b->number);
-    self->pin_b = NULL;
+    reset_pin_number(self->pin_a);
+    reset_pin_number(self->pin_b);
+    peripherals_pcnt_deinit(&self->unit);
 }
 
 mp_int_t common_hal_rotaryio_incrementalencoder_get_position(rotaryio_incrementalencoder_obj_t* self) {
-    int16_t count = 0;
-    pcnt_get_counter_value(PCNT_UNIT_0, &count);
-    return self->position+count;
+    int16_t count;
+    pcnt_get_counter_value(self->unit, &count);
+    return (count/2)+self->position;
 }
 
 void common_hal_rotaryio_incrementalencoder_set_position(rotaryio_incrementalencoder_obj_t* self,
         mp_int_t new_position) {
     self->position = new_position;
-    pcnt_reset(PCNT_UNIT_0);
+    pcnt_counter_clear(self->unit);
 }
diff --git a/ports/esp32s2/common-hal/rotaryio/IncrementalEncoder.h b/ports/esp32s2/common-hal/rotaryio/IncrementalEncoder.h
index 0cc2830fb7..8a717b7b5d 100644
--- a/ports/esp32s2/common-hal/rotaryio/IncrementalEncoder.h
+++ b/ports/esp32s2/common-hal/rotaryio/IncrementalEncoder.h
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries
+ * Copyright (c) 2020 microDev
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -27,15 +27,14 @@
 #ifndef MICROPY_INCLUDED_ESP32S2_COMMON_HAL_ROTARYIO_INCREMENTALENCODER_H
 #define MICROPY_INCLUDED_ESP32S2_COMMON_HAL_ROTARYIO_INCREMENTALENCODER_H
 
-#include "common-hal/microcontroller/Pin.h"
-
 #include "py/obj.h"
+#include "peripherals/pcnt.h"
 
 typedef struct {
     mp_obj_base_t base;
-    const mcu_pin_obj_t * pin_a;
-    const mcu_pin_obj_t * pin_b;
+    uint8_t pin_a, pin_b;
     mp_int_t position;
+    pcnt_unit_t unit;
 } rotaryio_incrementalencoder_obj_t;
 
 #endif // MICROPY_INCLUDED_ESP32S2_COMMON_HAL_ROTARYIO_INCREMENTALENCODER_H

From 7ba2c5772ccbe48c5c52d62493f9c899a1d0963a Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Sun, 8 Nov 2020 11:18:05 +0530
Subject: [PATCH 5/9] Update license

---
 ports/esp32s2/common-hal/touchio/TouchIn.c | 2 +-
 ports/esp32s2/common-hal/touchio/TouchIn.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/esp32s2/common-hal/touchio/TouchIn.c b/ports/esp32s2/common-hal/touchio/TouchIn.c
index 3e3e4b5511..b44234775e 100644
--- a/ports/esp32s2/common-hal/touchio/TouchIn.c
+++ b/ports/esp32s2/common-hal/touchio/TouchIn.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2016 Scott Shawcroft for Adafruit Industries
+ * Copyright (c) 2020 microDev
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/ports/esp32s2/common-hal/touchio/TouchIn.h b/ports/esp32s2/common-hal/touchio/TouchIn.h
index 585bb37bf1..91de209316 100644
--- a/ports/esp32s2/common-hal/touchio/TouchIn.h
+++ b/ports/esp32s2/common-hal/touchio/TouchIn.h
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2016 Scott Shawcroft
+ * Copyright (c) 2020 microDev
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

From 9adb77a2d0179f89c7402451f6b25be74629ffbd Mon Sep 17 00:00:00 2001
From: foamyguy <foamyguy@gmail.com>
Date: Sun, 8 Nov 2020 19:28:46 -0600
Subject: [PATCH 6/9] set moved true when unhiding tilegrid

---
 shared-module/displayio/TileGrid.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/shared-module/displayio/TileGrid.c b/shared-module/displayio/TileGrid.c
index e3642107f8..e8050a5397 100644
--- a/shared-module/displayio/TileGrid.c
+++ b/shared-module/displayio/TileGrid.c
@@ -83,10 +83,16 @@ bool common_hal_displayio_tilegrid_get_hidden(displayio_tilegrid_t* self) {
 
 void common_hal_displayio_tilegrid_set_hidden(displayio_tilegrid_t* self, bool hidden) {
     self->hidden = hidden;
+    if(!hidden){
+        self->moved = true;
+    }
 }
 
 void displayio_tilegrid_set_hidden_by_parent(displayio_tilegrid_t *self, bool hidden) {
     self->hidden_by_parent = hidden;
+    if(!hidden){
+        self->moved = true;
+    }
 }
 
 bool displayio_tilegrid_get_previous_area(displayio_tilegrid_t *self, displayio_area_t* area) {

From d1f15d314bd630b073c70c093053c16ac34131bb Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Mon, 9 Nov 2020 15:03:22 -0800
Subject: [PATCH 7/9] Rename to include display details

---
 .github/workflows/build.yml                                     | 2 +-
 .../{adafruit_magtag => adafruit_magtag_2.9_grayscale}/board.c  | 0
 .../mpconfigboard.h                                             | 0
 .../mpconfigboard.mk                                            | 0
 .../{adafruit_magtag => adafruit_magtag_2.9_grayscale}/pins.c   | 0
 .../sdkconfig                                                   | 0
 6 files changed, 1 insertion(+), 1 deletion(-)
 rename ports/esp32s2/boards/{adafruit_magtag => adafruit_magtag_2.9_grayscale}/board.c (100%)
 rename ports/esp32s2/boards/{adafruit_magtag => adafruit_magtag_2.9_grayscale}/mpconfigboard.h (100%)
 rename ports/esp32s2/boards/{adafruit_magtag => adafruit_magtag_2.9_grayscale}/mpconfigboard.mk (100%)
 rename ports/esp32s2/boards/{adafruit_magtag => adafruit_magtag_2.9_grayscale}/pins.c (100%)
 rename ports/esp32s2/boards/{adafruit_magtag => adafruit_magtag_2.9_grayscale}/sdkconfig (100%)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a2e9e92aba..c83f37e6ed 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -421,7 +421,7 @@ jobs:
       fail-fast: false
       matrix:
         board:
-        - "adafruit_magtag"
+        - "adafruit_magtag_2.9_grayscale"
         - "adafruit_metro_esp32s2"
         - "electroniccats_bastwifi"
         - "espressif_kaluga_1"
diff --git a/ports/esp32s2/boards/adafruit_magtag/board.c b/ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/board.c
similarity index 100%
rename from ports/esp32s2/boards/adafruit_magtag/board.c
rename to ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/board.c
diff --git a/ports/esp32s2/boards/adafruit_magtag/mpconfigboard.h b/ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h
similarity index 100%
rename from ports/esp32s2/boards/adafruit_magtag/mpconfigboard.h
rename to ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h
diff --git a/ports/esp32s2/boards/adafruit_magtag/mpconfigboard.mk b/ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk
similarity index 100%
rename from ports/esp32s2/boards/adafruit_magtag/mpconfigboard.mk
rename to ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk
diff --git a/ports/esp32s2/boards/adafruit_magtag/pins.c b/ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/pins.c
similarity index 100%
rename from ports/esp32s2/boards/adafruit_magtag/pins.c
rename to ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/pins.c
diff --git a/ports/esp32s2/boards/adafruit_magtag/sdkconfig b/ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/sdkconfig
similarity index 100%
rename from ports/esp32s2/boards/adafruit_magtag/sdkconfig
rename to ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/sdkconfig

From 46c9b28dd880d4e2e2764ab67f64356b175f5f98 Mon Sep 17 00:00:00 2001
From: foamyguy <foamyguy@gmail.com>
Date: Mon, 9 Nov 2020 18:14:31 -0600
Subject: [PATCH 8/9] use full_change instead of moved

---
 shared-module/displayio/TileGrid.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared-module/displayio/TileGrid.c b/shared-module/displayio/TileGrid.c
index e8050a5397..19ea10e552 100644
--- a/shared-module/displayio/TileGrid.c
+++ b/shared-module/displayio/TileGrid.c
@@ -84,14 +84,14 @@ bool common_hal_displayio_tilegrid_get_hidden(displayio_tilegrid_t* self) {
 void common_hal_displayio_tilegrid_set_hidden(displayio_tilegrid_t* self, bool hidden) {
     self->hidden = hidden;
     if(!hidden){
-        self->moved = true;
+        self->full_change = true;
     }
 }
 
 void displayio_tilegrid_set_hidden_by_parent(displayio_tilegrid_t *self, bool hidden) {
     self->hidden_by_parent = hidden;
     if(!hidden){
-        self->moved = true;
+        self->full_change = true;
     }
 }
 

From 2d8ebfcf633a0e744e49fe14cc0025d8d7d348fc Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Tue, 10 Nov 2020 10:41:10 -0600
Subject: [PATCH 9/9] esp32s2: Correct port_stack_get_top()

Closes #3649
---
 ports/esp32s2/supervisor/port.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/ports/esp32s2/supervisor/port.c b/ports/esp32s2/supervisor/port.c
index 0b9c03f747..a25bcce00a 100644
--- a/ports/esp32s2/supervisor/port.c
+++ b/ports/esp32s2/supervisor/port.c
@@ -148,7 +148,18 @@ uint32_t *port_stack_get_limit(void) {
 }
 
 uint32_t *port_stack_get_top(void) {
-    return port_stack_get_limit() + CONFIG_ESP_MAIN_TASK_STACK_SIZE / (sizeof(uint32_t) / sizeof(StackType_t));
+    // The sizeof-arithmetic is so that the pointer arithmetic is done on units
+    // of uint32_t instead of units of StackType_t.  StackType_t is an alias
+    // for a byte sized type.
+    //
+    // The main stack is bigger than CONFIG_ESP_MAIN_TASK_STACK_SIZE -- an
+    // "extra" size is added to it (TASK_EXTRA_STACK_SIZE).  This total size is
+    // available as ESP_TASK_MAIN_STACK.  Presumably TASK_EXTRA_STACK_SIZE is
+    // additional stack that can be used by the esp-idf runtime.  But what's
+    // important for us is that some very outermost stack frames, such as
+    // pyexec_friendly_repl, could lie inside the "extra" area and be invisible
+    // to the garbage collector.
+    return port_stack_get_limit() + ESP_TASK_MAIN_STACK / (sizeof(uint32_t) / sizeof(StackType_t));
 }
 
 supervisor_allocation _fixed_stack;