From 4733a672265f97a83353d005160f8e24ed8755b8 Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Wed, 2 Sep 2020 11:27:42 -0400
Subject: Add GDB debugging capability

---
 ports/esp32s2/Makefile                   |  2 +-
 ports/esp32s2/boards/esp32s2-saola-1.cfg | 41 ++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 ports/esp32s2/boards/esp32s2-saola-1.cfg

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/Makefile b/ports/esp32s2/Makefile
index 19b89a13a..db05349b6 100644
--- a/ports/esp32s2/Makefile
+++ b/ports/esp32s2/Makefile
@@ -116,7 +116,7 @@ CFLAGS += $(OPTIMIZATION_FLAGS)
 
 CFLAGS += $(INC) -Werror -Wall -mlongcalls -std=gnu11 -Wl,--gc-sections $(BASE_CFLAGS) $(C_DEFS) $(CFLAGS_MOD) $(COPT)
 
-LDFLAGS = $(CFLAGS) -Wl,-nostdlib  -Wl,-Map=$@.map -Wl,-cref
+LDFLAGS = $(CFLAGS) -Wl,-nostdlib  -Wl,-Map=$@.map -Wl,-cref -Wl,--undefined=uxTopUsedPriority
 LDFLAGS += -L$(BUILD)/esp-idf/esp-idf/esp32s2 \
            -Tesp32s2_out.ld \
            -L$(BUILD)/esp-idf/esp-idf/esp32s2/ld \
diff --git a/ports/esp32s2/boards/esp32s2-saola-1.cfg b/ports/esp32s2/boards/esp32s2-saola-1.cfg
new file mode 100644
index 000000000..677290757
--- /dev/null
+++ b/ports/esp32s2/boards/esp32s2-saola-1.cfg
@@ -0,0 +1,41 @@
+# The ESP32-S2 only supports JTAG.
+transport select jtag
+adapter_khz 1000
+
+# Source the ESP common configuration file
+source [find target/esp_common.cfg]
+
+if { [info exists CHIPNAME] } {
+    set _CHIPNAME $CHIPNAME
+} else {
+    set _CHIPNAME esp32s2
+}
+
+if { [info exists CPUTAPID] } {
+    set _CPUTAPID $CPUTAPID
+} else {
+    set _CPUTAPID 0x120034e5
+}
+
+set _TARGETNAME $_CHIPNAME
+set _CPUNAME cpu
+set _TAPNAME $_CHIPNAME.$_CPUNAME
+
+jtag newtap $_CHIPNAME $_CPUNAME -irlen 5 -expected-id $_CPUTAPID
+
+if { $_RTOS == "none" } {
+    target create $_TARGETNAME esp32s2 -endian little -chain-position $_TAPNAME
+} else {
+    target create $_TARGETNAME esp32s2 -endian little -chain-position $_TAPNAME -rtos $_RTOS
+}
+
+configure_esp_workarea $_TARGETNAME 0x40030000 0x3400 0x3FFE0000 0x6000
+configure_esp_flash_bank $_TARGETNAME $_TARGETNAME $_FLASH_SIZE
+
+xtensa maskisr on
+if { $_SEMIHOST_BASEDIR != "" } {
+    esp semihost_basedir $_SEMIHOST_BASEDIR
+}
+if { $_FLASH_SIZE == 0 } {
+    gdb_breakpoint_override hard
+}
-- 
cgit v1.2.3


From c7c90f47b0986e0f8c4bcba574bccc2352bf700f Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Thu, 10 Sep 2020 17:32:20 -0700
Subject: Add non-DMA SPI support.

This fixes SPI with PSRAM allocated buffers. DMA with SPI2 was
attempted but produced junk output. This manual copy is less than
2x slower than DMA when not interrupted.

Fixes #3339
---
 ports/esp32s2/common-hal/busio/SPI.c | 41 +++++++++++++++++++++++++-----------
 ports/esp32s2/common-hal/busio/SPI.h |  4 ----
 2 files changed, 29 insertions(+), 16 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/common-hal/busio/SPI.c b/ports/esp32s2/common-hal/busio/SPI.c
index a22075cd5..350580ea8 100644
--- a/ports/esp32s2/common-hal/busio/SPI.c
+++ b/ports/esp32s2/common-hal/busio/SPI.c
@@ -183,9 +183,6 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
 
     // spi_hal_init clears the given hal context so set everything after.
     spi_hal_init(hal, host_id);
-    hal->dmadesc_tx = &self->tx_dma;
-    hal->dmadesc_rx = &self->rx_dma;
-    hal->dmadesc_n = 1;
 
     // We don't use native CS.
     // hal->cs_setup = 0;
@@ -196,7 +193,6 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
     hal->half_duplex = 0;
     // hal->tx_lsbfirst = 0;
     // hal->rx_lsbfirst = 0;
-    hal->dma_enabled = 1;
     hal->no_compensate = 1;
     // Ignore CS bits
 
@@ -315,16 +311,34 @@ bool common_hal_busio_spi_transfer(busio_spi_obj_t *self, const uint8_t *data_ou
     hal->rcv_buffer = NULL;
     // Reset timing_conf in case we've moved since the last time we used it.
     hal->timing_conf = &self->timing_conf;
+    lldesc_t tx_dma __attribute__((aligned(16)));
+    lldesc_t rx_dma __attribute__((aligned(16)));
+    hal->dmadesc_tx = &tx_dma;
+    hal->dmadesc_rx = &rx_dma;
+    hal->dmadesc_n = 1;
+
+    size_t burst_length;
+    // If both of the incoming pointers are DMA capable then use DMA. Otherwise, do
+    // bursts the size of the SPI data buffer without DMA.
+    if ((data_out == NULL || esp_ptr_dma_capable(data_out)) &&
+        (data_in == NULL || esp_ptr_dma_capable(data_out))) {
+        hal->dma_enabled = 1;
+        burst_length = LLDESC_MAX_NUM_PER_DESC;
+    } else {
+        hal->dma_enabled = 0;
+        burst_length = sizeof(hal->hw->data_buf);
+    }
+
     // This rounds up.
-    size_t dma_count = (len + LLDESC_MAX_NUM_PER_DESC - 1) / LLDESC_MAX_NUM_PER_DESC;
-    for (size_t i = 0; i < dma_count; i++) {
-        size_t offset = LLDESC_MAX_NUM_PER_DESC * i;
-        size_t dma_len = len - offset;
-        if (dma_len > LLDESC_MAX_NUM_PER_DESC) {
-            dma_len = LLDESC_MAX_NUM_PER_DESC;
+    size_t burst_count = (len + burst_length - 1) / burst_length;
+    for (size_t i = 0; i < burst_count; i++) {
+        size_t offset = burst_length * i;
+        size_t this_length = len - offset;
+        if (this_length > burst_length) {
+            this_length = burst_length;
         }
-        hal->tx_bitlen = dma_len * self->bits;
-        hal->rx_bitlen = dma_len * self->bits;
+        hal->tx_bitlen = this_length * self->bits;
+        hal->rx_bitlen = this_length * self->bits;
         if (data_out != NULL) {
             hal->send_buffer = (uint8_t*) data_out + offset;
         }
@@ -341,6 +355,9 @@ bool common_hal_busio_spi_transfer(busio_spi_obj_t *self, const uint8_t *data_ou
         }
         spi_hal_fetch_result(hal);
     }
+    hal->dmadesc_tx = NULL;
+    hal->dmadesc_rx = NULL;
+    hal->dmadesc_n = 0;
 
     return true;
 }
diff --git a/ports/esp32s2/common-hal/busio/SPI.h b/ports/esp32s2/common-hal/busio/SPI.h
index 6d8203831..38fbe42ff 100644
--- a/ports/esp32s2/common-hal/busio/SPI.h
+++ b/ports/esp32s2/common-hal/busio/SPI.h
@@ -44,10 +44,6 @@ typedef struct {
     spi_hal_context_t hal_context;
     spi_hal_timing_conf_t timing_conf;
     intr_handle_t interrupt;
-    // IDF allocates these in DMA accessible memory so they may need to move when
-    // we use external RAM for CircuitPython.
-    lldesc_t tx_dma;
-    lldesc_t rx_dma;
     uint32_t target_frequency;
     int32_t real_frequency;
     uint8_t polarity;
-- 
cgit v1.2.3


From 305bed6d9e9581ed19d2043622bc77106a0c3b5b Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Fri, 11 Sep 2020 21:06:54 +0530
Subject: Added esp32s2 safe_mode & fixed user_safe_mode

---
 .../boards/espressif_saola_1_wroom/mpconfigboard.h |   4 +
 .../espressif_saola_1_wrover/mpconfigboard.h       |   4 +
 .../boards/microdev_micro_s2/mpconfigboard.h       |   4 +
 supervisor/shared/safe_mode.c                      | 155 +++++++++++----------
 4 files changed, 96 insertions(+), 71 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h b/ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h
index a94f10ea4..6d603ba57 100644
--- a/ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h
+++ b/ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h
@@ -31,4 +31,8 @@
 
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO18)
 
+#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
+
+#define BOARD_USER_SAFE_MODE_ACTION "pressing boot button at start up."
+
 #define AUTORESET_DELAY_MS 500
diff --git a/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h b/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h
index 338186dc5..f5b6c7948 100644
--- a/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h
+++ b/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h
@@ -31,4 +31,8 @@
 
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO18)
 
+#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
+
+#define BOARD_USER_SAFE_MODE_ACTION "pressing boot button at start up."
+
 #define AUTORESET_DELAY_MS 500
diff --git a/ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h b/ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
index bb28fe16a..d844f37d0 100644
--- a/ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
+++ b/ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
@@ -32,4 +32,8 @@
 #define MICROPY_HW_LED (&pin_GPIO21)
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO33)
 
+#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
+
+#define BOARD_USER_SAFE_MODE_ACTION "pressing boot button at start up."
+
 #define AUTORESET_DELAY_MS 500
diff --git a/supervisor/shared/safe_mode.c b/supervisor/shared/safe_mode.c
index 29a0a6a4f..cbbdfe427 100644
--- a/supervisor/shared/safe_mode.c
+++ b/supervisor/shared/safe_mode.c
@@ -60,6 +60,11 @@ safe_mode_t wait_for_safe_mode_reset(void) {
     common_hal_digitalio_digitalinout_construct(&status_led, MICROPY_HW_LED_STATUS);
     common_hal_digitalio_digitalinout_switch_to_output(&status_led, true, DRIVE_MODE_PUSH_PULL);
     #endif
+    #ifdef CIRCUITPY_BOOT_BUTTON
+    digitalio_digitalinout_obj_t boot_button;
+    common_hal_digitalio_digitalinout_construct(&boot_button, CIRCUITPY_BOOT_BUTTON);
+    common_hal_digitalio_digitalinout_switch_to_input(&boot_button, PULL_UP);
+    #endif
     uint64_t start_ticks = supervisor_ticks_ms64();
     uint64_t diff = 0;
     while (diff < 700) {
@@ -67,6 +72,11 @@ safe_mode_t wait_for_safe_mode_reset(void) {
         // Blink on for 100, off for 100, on for 100, off for 100 and on for 200
         common_hal_digitalio_digitalinout_set_value(&status_led, diff > 100 && diff / 100 != 2 && diff / 100 != 4);
         #endif
+	#ifdef CIRCUITPY_BOOT_BUTTON
+        if (!common_hal_digitalio_digitalinout_get_value(&boot_button)) {
+           return USER_SAFE_MODE;
+        }
+        #endif
         diff = supervisor_ticks_ms64() - start_ticks;
     }
     #ifdef MICROPY_HW_LED_STATUS
@@ -103,77 +113,80 @@ void print_safe_mode_message(safe_mode_t reason) {
         return;
     }
     serial_write("\n");
-    // Output a user safe mode string if it's set.
-    #ifdef BOARD_USER_SAFE_MODE
-    if (reason == USER_SAFE_MODE) {
-        serial_write_compressed(translate("You requested starting safe mode by "));
-        serial_write(BOARD_USER_SAFE_MODE_ACTION);
-        serial_write_compressed(translate("\nTo exit, please reset the board without "));
-        serial_write(BOARD_USER_SAFE_MODE_ACTION);
-        serial_write("\n");
-    } else
-    #endif
-        switch (reason) {
-            case MANUAL_SAFE_MODE:
-                serial_write_compressed(translate("CircuitPython is in safe mode because you pressed the reset button during boot. Press again to exit safe mode.\n"));
-                return;
-            case PROGRAMMATIC_SAFE_MODE:
-                serial_write_compressed(translate("The `microcontroller` module was used to boot into safe mode. Press reset to exit safe mode.\n"));
-                return;
-            default:
-                break;
-        }
 
-        serial_write_compressed(translate("You are in safe mode: something unanticipated happened.\n"));
-        switch (reason) {
-            case BROWNOUT:
-                serial_write_compressed(translate("The microcontroller's power dipped. Make sure your power supply provides\nenough power for the whole circuit and press reset (after ejecting CIRCUITPY).\n"));
-                return;
-            case HEAP_OVERWRITTEN:
-                serial_write_compressed(translate("The CircuitPython heap was corrupted because the stack was too small.\nPlease increase the stack size if you know how, or if not:"));
-                serial_write_compressed(FILE_AN_ISSUE);
-                return;
-            case NO_HEAP:
-                serial_write_compressed(translate("CircuitPython was unable to allocate the heap.\n"));
-                serial_write_compressed(FILE_AN_ISSUE);
-                return;
-            default:
-                break;
-        }
+    switch (reason) {
+        case USER_SAFE_MODE:
+            #ifdef BOARD_USER_SAFE_MODE_ACTION
+                // Output a user safe mode string if it's set.
+                serial_write_compressed(translate("You requested starting safe mode by "));
+                serial_write_compressed(translate(BOARD_USER_SAFE_MODE_ACTION));
+                serial_write_compressed(translate("\nTo exit, please reset the board without "));
+                serial_write_compressed(translate(BOARD_USER_SAFE_MODE_ACTION));
+                serial_write("\n");
+            #else
+                // fallthrough
+            #endif
+            return;
+        case MANUAL_SAFE_MODE:
+            serial_write_compressed(translate("CircuitPython is in safe mode because you pressed the reset button during boot. Press again to exit safe mode.\n"));
+            return;
+        case PROGRAMMATIC_SAFE_MODE:
+            serial_write_compressed(translate("The `microcontroller` module was used to boot into safe mode. Press reset to exit safe mode.\n"));
+            return;
+        default:
+            break;
+    }
 
-        serial_write_compressed(translate("CircuitPython core code crashed hard. Whoops!\n"));
-        switch (reason) {
-            case HARD_CRASH:
-                serial_write_compressed(translate("Crash into the HardFault_Handler."));
-                return;
-            case MICROPY_NLR_JUMP_FAIL:
-                serial_write_compressed(translate("MicroPython NLR jump failed. Likely memory corruption."));
-                return;
-            case MICROPY_FATAL_ERROR:
-                serial_write_compressed(translate("MicroPython fatal error."));
-                break;
-            case GC_ALLOC_OUTSIDE_VM:
-                serial_write_compressed(translate("Attempted heap allocation when MicroPython VM not running."));
-                break;
-#ifdef SOFTDEVICE_PRESENT
-            // defined in ports/nrf/bluetooth/bluetooth_common.mk
-            // will print "Unknown reason" if somehow encountered on other ports
-            case NORDIC_SOFT_DEVICE_ASSERT:
-                serial_write_compressed(translate("Nordic Soft Device failure assertion."));
-                break;
-#endif
-            case FLASH_WRITE_FAIL:
-                serial_write_compressed(translate("Failed to write internal flash."));
-                break;
-            case MEM_MANAGE:
-                serial_write_compressed(translate("Invalid memory access."));
-                break;
-            case WATCHDOG_RESET:
-                serial_write_compressed(translate("Watchdog timer expired."));
-                break;
-            default:
-                serial_write_compressed(translate("Unknown reason."));
-                break;
-        }
-        serial_write_compressed(FILE_AN_ISSUE);
+    serial_write_compressed(translate("You are in safe mode: something unanticipated happened.\n"));
+    switch (reason) {
+        case BROWNOUT:
+            serial_write_compressed(translate("The microcontroller's power dipped. Make sure your power supply provides\nenough power for the whole circuit and press reset (after ejecting CIRCUITPY).\n"));
+            return;
+        case HEAP_OVERWRITTEN:
+            serial_write_compressed(translate("The CircuitPython heap was corrupted because the stack was too small.\nPlease increase the stack size if you know how, or if not:"));
+            serial_write_compressed(FILE_AN_ISSUE);
+            return;
+        case NO_HEAP:
+            serial_write_compressed(translate("CircuitPython was unable to allocate the heap.\n"));
+            serial_write_compressed(FILE_AN_ISSUE);
+            return;
+        default:
+            break;
+    }
+
+    serial_write_compressed(translate("CircuitPython core code crashed hard. Whoops!\n"));
+    switch (reason) {
+        case HARD_CRASH:
+            serial_write_compressed(translate("Crash into the HardFault_Handler."));
+            return;
+        case MICROPY_NLR_JUMP_FAIL:
+            serial_write_compressed(translate("MicroPython NLR jump failed. Likely memory corruption."));
+            return;
+        case MICROPY_FATAL_ERROR:
+            serial_write_compressed(translate("MicroPython fatal error."));
+            break;
+        case GC_ALLOC_OUTSIDE_VM:
+            serial_write_compressed(translate("Attempted heap allocation when MicroPython VM not running."));
+            break;
+        #ifdef SOFTDEVICE_PRESENT
+        // defined in ports/nrf/bluetooth/bluetooth_common.mk
+        // will print "Unknown reason" if somehow encountered on other ports
+        case NORDIC_SOFT_DEVICE_ASSERT:
+            serial_write_compressed(translate("Nordic Soft Device failure assertion."));
+            break;
+        #endif
+        case FLASH_WRITE_FAIL:
+            serial_write_compressed(translate("Failed to write internal flash."));
+            break;
+        case MEM_MANAGE:
+            serial_write_compressed(translate("Invalid memory access."));
+            break;
+        case WATCHDOG_RESET:
+            serial_write_compressed(translate("Watchdog timer expired."));
+            break;
+        default:
+            serial_write_compressed(translate("Unknown reason."));
+            break;
+    }
+    serial_write_compressed(FILE_AN_ISSUE);
 }
-- 
cgit v1.2.3


From 4da478382d8e428d3e702dcd8c35f67cf80cc319 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Sat, 12 Sep 2020 17:46:52 +0530
Subject: Fix serial console output & add more boards

---
 ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h   | 4 ++++
 ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h        | 4 ++++
 ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h   | 2 +-
 ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h  | 2 +-
 ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h         | 2 +-
 ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h | 4 ++++
 supervisor/shared/safe_mode.c                                  | 6 +++---
 7 files changed, 18 insertions(+), 6 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h b/ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h
index ed3f23a3c..2af3515f4 100644
--- a/ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h
+++ b/ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h
@@ -29,4 +29,8 @@
 #define MICROPY_HW_BOARD_NAME       "BastWiFi"
 #define MICROPY_HW_MCU_NAME         "ESP32S2"
 
+#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
+
+#define BOARD_USER_SAFE_MODE_ACTION "pressing boot button at start up.\n"
+
 #define AUTORESET_DELAY_MS 500
diff --git a/ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h b/ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h
index 84d15ffc2..a4c8e6576 100644
--- a/ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h
+++ b/ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h
@@ -31,4 +31,8 @@
 
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO45)
 
+#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
+
+#define BOARD_USER_SAFE_MODE_ACTION "pressing boot button at start up.\n"
+
 #define AUTORESET_DELAY_MS 500
diff --git a/ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h b/ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h
index 6d603ba57..335aaeb5e 100644
--- a/ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h
+++ b/ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h
@@ -33,6 +33,6 @@
 
 #define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
 
-#define BOARD_USER_SAFE_MODE_ACTION "pressing boot button at start up."
+#define BOARD_USER_SAFE_MODE_ACTION "pressing boot button at start up.\n"
 
 #define AUTORESET_DELAY_MS 500
diff --git a/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h b/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h
index f5b6c7948..d3ef8bb26 100644
--- a/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h
+++ b/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h
@@ -33,6 +33,6 @@
 
 #define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
 
-#define BOARD_USER_SAFE_MODE_ACTION "pressing boot button at start up."
+#define BOARD_USER_SAFE_MODE_ACTION "pressing boot button at start up.\n"
 
 #define AUTORESET_DELAY_MS 500
diff --git a/ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h b/ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
index d844f37d0..1a1ef7a6c 100644
--- a/ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
+++ b/ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
@@ -34,6 +34,6 @@
 
 #define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
 
-#define BOARD_USER_SAFE_MODE_ACTION "pressing boot button at start up."
+#define BOARD_USER_SAFE_MODE_ACTION "pressing boot button at start up.\n"
 
 #define AUTORESET_DELAY_MS 500
diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h b/ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h
index 93fb0c573..a65d00206 100644
--- a/ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h
+++ b/ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h
@@ -29,6 +29,10 @@
 #define MICROPY_HW_BOARD_NAME       "FeatherS2"
 #define MICROPY_HW_MCU_NAME         "ESP32S2"
 
+#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
+
+#define BOARD_USER_SAFE_MODE_ACTION "pressing boot button at start up.\n"
+
 #define AUTORESET_DELAY_MS 500
 
 // Doesn't work with this on.
diff --git a/supervisor/shared/safe_mode.c b/supervisor/shared/safe_mode.c
index cbbdfe427..f4f23378a 100644
--- a/supervisor/shared/safe_mode.c
+++ b/supervisor/shared/safe_mode.c
@@ -72,7 +72,7 @@ safe_mode_t wait_for_safe_mode_reset(void) {
         // Blink on for 100, off for 100, on for 100, off for 100 and on for 200
         common_hal_digitalio_digitalinout_set_value(&status_led, diff > 100 && diff / 100 != 2 && diff / 100 != 4);
         #endif
-	#ifdef CIRCUITPY_BOOT_BUTTON
+	    #ifdef CIRCUITPY_BOOT_BUTTON
         if (!common_hal_digitalio_digitalinout_get_value(&boot_button)) {
            return USER_SAFE_MODE;
         }
@@ -120,11 +120,11 @@ void print_safe_mode_message(safe_mode_t reason) {
                 // Output a user safe mode string if it's set.
                 serial_write_compressed(translate("You requested starting safe mode by "));
                 serial_write_compressed(translate(BOARD_USER_SAFE_MODE_ACTION));
-                serial_write_compressed(translate("\nTo exit, please reset the board without "));
+                serial_write_compressed(translate("To exit, please reset the board without "));
                 serial_write_compressed(translate(BOARD_USER_SAFE_MODE_ACTION));
-                serial_write("\n");
             #else
                 // fallthrough
+                serial_write_compressed(translate("CircuitPython is in safe mode with status being USER_SAFE_MODE but no specific reason was provided.\n"));
             #endif
             return;
         case MANUAL_SAFE_MODE:
-- 
cgit v1.2.3


From e504438fd223c9bb0b9d6950a699f1283ece137c Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Mon, 14 Sep 2020 11:58:13 -0400
Subject: Remove unlicensed file, fix reset pin type check

---
 ports/esp32s2/boards/esp32s2-saola-1.cfg | 41 --------------------------------
 shared-module/displayio/I2CDisplay.c     |  4 ++--
 2 files changed, 2 insertions(+), 43 deletions(-)
 delete mode 100644 ports/esp32s2/boards/esp32s2-saola-1.cfg

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/boards/esp32s2-saola-1.cfg b/ports/esp32s2/boards/esp32s2-saola-1.cfg
deleted file mode 100644
index 677290757..000000000
--- a/ports/esp32s2/boards/esp32s2-saola-1.cfg
+++ /dev/null
@@ -1,41 +0,0 @@
-# The ESP32-S2 only supports JTAG.
-transport select jtag
-adapter_khz 1000
-
-# Source the ESP common configuration file
-source [find target/esp_common.cfg]
-
-if { [info exists CHIPNAME] } {
-    set _CHIPNAME $CHIPNAME
-} else {
-    set _CHIPNAME esp32s2
-}
-
-if { [info exists CPUTAPID] } {
-    set _CPUTAPID $CPUTAPID
-} else {
-    set _CPUTAPID 0x120034e5
-}
-
-set _TARGETNAME $_CHIPNAME
-set _CPUNAME cpu
-set _TAPNAME $_CHIPNAME.$_CPUNAME
-
-jtag newtap $_CHIPNAME $_CPUNAME -irlen 5 -expected-id $_CPUTAPID
-
-if { $_RTOS == "none" } {
-    target create $_TARGETNAME esp32s2 -endian little -chain-position $_TAPNAME
-} else {
-    target create $_TARGETNAME esp32s2 -endian little -chain-position $_TAPNAME -rtos $_RTOS
-}
-
-configure_esp_workarea $_TARGETNAME 0x40030000 0x3400 0x3FFE0000 0x6000
-configure_esp_flash_bank $_TARGETNAME $_TARGETNAME $_FLASH_SIZE
-
-xtensa maskisr on
-if { $_SEMIHOST_BASEDIR != "" } {
-    esp semihost_basedir $_SEMIHOST_BASEDIR
-}
-if { $_FLASH_SIZE == 0 } {
-    gdb_breakpoint_override hard
-}
diff --git a/shared-module/displayio/I2CDisplay.c b/shared-module/displayio/I2CDisplay.c
index 9e9e17881..5bd03dcd6 100644
--- a/shared-module/displayio/I2CDisplay.c
+++ b/shared-module/displayio/I2CDisplay.c
@@ -72,8 +72,8 @@ void common_hal_displayio_i2cdisplay_deinit(displayio_i2cdisplay_obj_t* self) {
         common_hal_busio_i2c_deinit(self->bus);
     }
 
-    if (self->reset.pin) {
-        common_hal_reset_pin(self->reset.pin);
+    if (self->reset.base.type == &digitalio_digitalinout_type) {
+        common_hal_digitalio_digitalinout_deinit(&self->reset);
     }
 }
 
-- 
cgit v1.2.3


From 6ecfdda580a7d27b1aaeb7d37f63fdb7f10b3779 Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Mon, 14 Sep 2020 13:18:51 -0400
Subject: Add Readme

---
 ports/esp32s2/README.md | 88 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 ports/esp32s2/README.md

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/README.md b/ports/esp32s2/README.md
new file mode 100644
index 000000000..86aa99a13
--- /dev/null
+++ b/ports/esp32s2/README.md
@@ -0,0 +1,88 @@
+# Circuitpython on ESP32-S2 #
+
+This port adds the ESP32-S2 line of modules from Espressif to Circuitpython. ESP32-S2 modules are low power, single-core Wi-Fi microcontroller SoCs designed for IoT applications.
+
+## How this port is organized: ##
+
+- **bindings/** contains some required bindings to the ESP-IDF for exceptions and memory.
+- **boards/** contains the configuration files for each development board and breakout available on the port.
+- **common-hal/** contains the port-specific module implementations, used by shared-module and shared-bindings.
+- **esp-idf/** contains the Espressif IoT development framework installation, includign all the drivers for the port.
+- **modules/** contains information specific to certain ESP32-S2 hardware modules, such as the pins used for flash and RAM on the WROVER and WROOM.
+- **peripherals/** contains peripheral setup files and peripheral mapping information, sorted by family and sub-variant. Most files in this directory can be generated with the python scripts in **tools/**.
+- **supervisor/** contains port-specific implementations of internal flash, serial and USB, as well as the **port.c** file, which initializes the port at startup.
+- **tools/** includes useful python scripts for debugging and other purposes.
+
+At the root level, refer to **mpconfigboard.h** and **mpconfigport.mk** for port specific settings and a list of enabled circuitpython modules.
+
+## Connecting to the ESP32-S2 ##
+
+The USB port built into ESP32-S2 boards such as the Saola is not the native USB of the board, but a debugging and programming interface. The actual ESP32-S2 native USB which exposes the Circuitpython drive and CDC connection is located on IO pins 19 and 20:
+
+| GPIO | USB         |
+| ---- | ----------- |
+| 20   | D+ (green)  |
+| 19   | D- (white)  |
+| GND  | GND (black) |
+| 5V   | +5V (red)   |
+
+Connect these pins using a [USB adapter](https://www.adafruit.com/product/4090) or [breakout cable](https://www.adafruit.com/product/4448) to access the Circuitpython drive.
+
+## Building and flashing ##
+
+Before building or flashing the ESP32-S2, you must [install the esp-idf](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/get-started/index.html). This must be re-done ever time the esp-idf is updated, but not every time you build. From the port root, run:
+
+```
+./esp-idf/install.sh
+```
+
+Additionally, any time you open a new bash environment for building or flashing, you must add the esp-idf tools to your path:
+
+```
+. esp-idf/export.sh
+```
+
+To build for a board such as the Saola 1 Wrover and flash it over the UART interface, run the following:
+
+```
+make BOARD=espressif_saola_1_wrover flash
+```
+
+On MacOS, you may need to directly specify the port. You can determine the correct port on your machine by running `ls /dev/tty.usb*` and selecting the one that appears only when your development board is plugged in. Example:
+
+```
+make BOARD=espressif_saola_1_wrover flash PORT=/dev/tty.usbserial-1421120
+```
+
+## Debugging ##
+
+The ESP32-S2 supports JTAG debugging over OpenOCD using a JLink or other probe hardware. The official tutorials can be found on the Espressif website [here](https://docs.espressif.com/projects/esp-idf/en/latest/esp32s2/api-guides/jtag-debugging/index.html), but they are mostly for the ESP32-S2 Kaluga, which has built-in debugging.
+
+OpenOCD is automatically installed and added to your bash environment during the esp-idf installation and setup process. You can double check that it is installed by using `openocd --version`, as per the tutorial. Attach the JTAG probe pins according to the [instructions](https://docs.espressif.com/projects/esp-idf/en/latest/esp32s2/api-guides/jtag-debugging/configure-other-jtag.html) for JTAG debugging on boards that do not contain an integrated debugger.
+
+Once the debugger is connected physically, you must run OpenOCD with attached configuration files specifying the **interface** (your debugger probe) and either a **target** or a **board** (targets are for SoCs only, and can be used when a full board configuration file doesn't exist). You can find the path location of these files by checking the `OPENOCD_SCRIPTS` environmental variable by running `echo $OPENOCD_SCRIPTS` in bash. Interfaces will be in the `interface/` directory, and targets and boards in the `target/` and `board/` directories, respectively.
+
+**Note:** Unfortunately, there are no board files for the esp32-s2 other than the Kaluga, and the included `target/esp32s2.cfg` target file will not work by default on the Jlink for boards like the Saola 1, as the default speed is incorrect. In addition, these files are covered under the GPL and cannot be included in Circuitpython. Thus, you must make a copy of the esp32s2.cfg file yourself and add the following line manually, under `transport select jtag` at the start of the file:
+
+```
+adapter_khz 1000
+```
+
+Once this is complete, your final OpenOCD command may look something like this:
+
+`openocd -f interface/jlink.cfg -f SOMEPATH/copied-esp32s2-saola-1.cfg`
+
+Where `SOMEPATH` is the location of your copied configuration file (this can be placed in the port/boards director with a prefix to ignore it with `.gitignore`, for instance). Interface, target and board config files sourced from espressif only need their paths from the $OPENOCD_SCRIPTS location, you don't need to include their full path. Once OpenOCD is running, connect to GDB with:
+
+`xtensa-esp32s2-elf-gdb build-espressif_saola_1_wrover/firmware.elf`
+
+And follow the Espressif GDB tutorial [instructions](https://docs.espressif.com/projects/esp-idf/en/latest/esp32s2/api-guides/jtag-debugging/using-debugger.html) for connecting, or add them to your `gdbinit`:
+
+```
+target remote :3333
+set remote hardware-watchpoint-limit 2
+mon reset halt
+flushregs
+thb app_main
+c
+```
-- 
cgit v1.2.3


From 3640ef2b7f5cfa2c7938b7d0d23132a033756ba5 Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Mon, 14 Sep 2020 17:37:55 -0400
Subject: Fix toctree, incorrect flash port assumptions

---
 docs/supported_ports.rst | 1 +
 ports/esp32s2/README.md  | 8 +-------
 2 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/docs/supported_ports.rst b/docs/supported_ports.rst
index 09571afb6..e74067e28 100644
--- a/docs/supported_ports.rst
+++ b/docs/supported_ports.rst
@@ -17,3 +17,4 @@ is limited.
     ../ports/mimxrt10xx/README
     ../ports/nrf/README
     ../ports/stm/README
+    ../ports/esp32s2/README
diff --git a/ports/esp32s2/README.md b/ports/esp32s2/README.md
index 86aa99a13..5b664df08 100644
--- a/ports/esp32s2/README.md
+++ b/ports/esp32s2/README.md
@@ -42,13 +42,7 @@ Additionally, any time you open a new bash environment for building or flashing,
 . esp-idf/export.sh
 ```
 
-To build for a board such as the Saola 1 Wrover and flash it over the UART interface, run the following:
-
-```
-make BOARD=espressif_saola_1_wrover flash
-```
-
-On MacOS, you may need to directly specify the port. You can determine the correct port on your machine by running `ls /dev/tty.usb*` and selecting the one that appears only when your development board is plugged in. Example:
+Building boards such as the Saola is typically done through `make flash`. The default port is `tty.SLAB_USBtoUART`, which will only work on certain Mac setups. On most machines, both Mac and Linux, you will need to set the port yourself by running `ls /dev/tty.usb*` and selecting the one that only appears when your development board is plugged in. An example make command with the port setting is as follows:
 
 ```
 make BOARD=espressif_saola_1_wrover flash PORT=/dev/tty.usbserial-1421120
-- 
cgit v1.2.3


From 8fcdc7da16a978d7c65bd3c82c46b11c5178714c Mon Sep 17 00:00:00 2001
From: askpatricw <4002194+askpatrickw@users.noreply.github.com>
Date: Mon, 14 Sep 2020 23:24:44 -0700
Subject: RTC enabled

---
 ports/esp32s2/common-hal/rtc/RTC.c      | 52 +++++++++++++++++++++++++++++++++
 ports/esp32s2/common-hal/rtc/RTC.h      | 34 +++++++++++++++++++++
 ports/esp32s2/common-hal/rtc/__init__.c |  0
 ports/esp32s2/mpconfigport.mk           |  2 +-
 4 files changed, 87 insertions(+), 1 deletion(-)
 create mode 100644 ports/esp32s2/common-hal/rtc/RTC.c
 create mode 100644 ports/esp32s2/common-hal/rtc/RTC.h
 create mode 100644 ports/esp32s2/common-hal/rtc/__init__.c

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/common-hal/rtc/RTC.c b/ports/esp32s2/common-hal/rtc/RTC.c
new file mode 100644
index 000000000..1218186a8
--- /dev/null
+++ b/ports/esp32s2/common-hal/rtc/RTC.c
@@ -0,0 +1,52 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2019 Sony Semiconductor Solutions Corporation
+ *
+ * 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 <sys/time.h>
+
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "soc/rtc_periph.h"
+#include "shared-bindings/rtc/RTC.h"
+
+void common_hal_rtc_get_time(timeutils_struct_time_t *tm) {
+    struct timeval tv_now;
+    gettimeofday(&tv_now, NULL);
+    timeutils_seconds_since_2000_to_struct_time(tv_now.tv_sec, tm);
+}
+
+void common_hal_rtc_set_time(timeutils_struct_time_t *tm) {
+    struct timeval tv_now = {0};
+    tv_now.tv_sec = timeutils_seconds_since_2000(tm->tm_year, tm->tm_mon, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec);
+    settimeofday(&tv_now, NULL);
+}
+
+int common_hal_rtc_get_calibration(void) {
+    return 0;
+}
+
+void common_hal_rtc_set_calibration(int calibration) {
+    mp_raise_NotImplementedError(translate("RTC calibration is not supported on this board"));
+}
diff --git a/ports/esp32s2/common-hal/rtc/RTC.h b/ports/esp32s2/common-hal/rtc/RTC.h
new file mode 100644
index 000000000..e51f1f784
--- /dev/null
+++ b/ports/esp32s2/common-hal/rtc/RTC.h
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Noralf Trønnes
+ *
+ * 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_NRF_COMMON_HAL_RTC_RTC_H
+#define MICROPY_INCLUDED_NRF_COMMON_HAL_RTC_RTC_H
+
+extern void rtc_init(void);
+extern void rtc_reset(void);
+extern void common_hal_rtc_init(void);
+
+#endif  // MICROPY_INCLUDED_NRF_COMMON_HAL_RTC_RTC_H
diff --git a/ports/esp32s2/common-hal/rtc/__init__.c b/ports/esp32s2/common-hal/rtc/__init__.c
new file mode 100644
index 000000000..e69de29bb
diff --git a/ports/esp32s2/mpconfigport.mk b/ports/esp32s2/mpconfigport.mk
index ee98ce1f4..8f057784a 100644
--- a/ports/esp32s2/mpconfigport.mk
+++ b/ports/esp32s2/mpconfigport.mk
@@ -21,7 +21,7 @@ CIRCUITPY_COUNTIO = 0
 CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_ROTARYIO = 0
-CIRCUITPY_RTC = 0
+CIRCUITPY_RTC = 1
 CIRCUITPY_NVM = 0
 # We don't have enough endpoints to include MIDI.
 CIRCUITPY_USB_MIDI = 0
-- 
cgit v1.2.3


From f9f614b3a2878383cad845f72ffef034bd2be951 Mon Sep 17 00:00:00 2001
From: askpatricw <4002194+askpatrickw@users.noreply.github.com>
Date: Tue, 15 Sep 2020 11:28:31 -0700
Subject: code review feedback

---
 ports/esp32s2/mpconfigport.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/mpconfigport.mk b/ports/esp32s2/mpconfigport.mk
index 8f057784a..95a845736 100644
--- a/ports/esp32s2/mpconfigport.mk
+++ b/ports/esp32s2/mpconfigport.mk
@@ -13,7 +13,7 @@ USB_SERIAL_NUMBER_LENGTH = 12
 LONGINT_IMPL = MPZ
 
 # These modules are implemented in ports/<port>/common-hal:
-CIRCUITPY_FULL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
 CIRCUITPY_ANALOGIO = 0
 CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_AUDIOIO = 0
-- 
cgit v1.2.3


From bd381e434f00360a5089261b7ab108d6c0fd0ad9 Mon Sep 17 00:00:00 2001
From: askpatricw <4002194+askpatrickw@users.noreply.github.com>
Date: Tue, 15 Sep 2020 13:02:26 -0700
Subject: Revert "code review feedback"

This reverts commit f9f614b3a2878383cad845f72ffef034bd2be951.
---
 ports/esp32s2/mpconfigport.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/mpconfigport.mk b/ports/esp32s2/mpconfigport.mk
index 95a845736..8f057784a 100644
--- a/ports/esp32s2/mpconfigport.mk
+++ b/ports/esp32s2/mpconfigport.mk
@@ -13,7 +13,7 @@ USB_SERIAL_NUMBER_LENGTH = 12
 LONGINT_IMPL = MPZ
 
 # These modules are implemented in ports/<port>/common-hal:
-CIRCUITPY_FULL_BUILD = 0
+CIRCUITPY_FULL_BUILD = 1
 CIRCUITPY_ANALOGIO = 0
 CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_AUDIOIO = 0
-- 
cgit v1.2.3


From 2bd169ec327abd5af0cb34ea51a766341cdaae4a Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Tue, 15 Sep 2020 18:12:06 -0700
Subject: Add partition layouts for 8 and 16 MB as well.

---
 ports/esp32s2/Makefile                |  2 +-
 ports/esp32s2/partitions-16MB.csv     | 10 ++++++++++
 ports/esp32s2/partitions-4MB.csv      | 10 ++++++++++
 ports/esp32s2/partitions-8MB.csv      | 10 ++++++++++
 ports/esp32s2/partitions.csv          | 10 ----------
 ports/esp32s2/sdkconfig-16MB.defaults | 10 ++++++++++
 ports/esp32s2/sdkconfig-4MB.defaults  | 10 ++++++++++
 ports/esp32s2/sdkconfig-8MB.defaults  | 10 ++++++++++
 ports/esp32s2/sdkconfig.defaults      |  8 --------
 9 files changed, 61 insertions(+), 19 deletions(-)
 create mode 100644 ports/esp32s2/partitions-16MB.csv
 create mode 100644 ports/esp32s2/partitions-4MB.csv
 create mode 100644 ports/esp32s2/partitions-8MB.csv
 delete mode 100644 ports/esp32s2/partitions.csv
 create mode 100644 ports/esp32s2/sdkconfig-16MB.defaults
 create mode 100644 ports/esp32s2/sdkconfig-4MB.defaults
 create mode 100644 ports/esp32s2/sdkconfig-8MB.defaults

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/Makefile b/ports/esp32s2/Makefile
index 64068b02d..229a3bf3a 100644
--- a/ports/esp32s2/Makefile
+++ b/ports/esp32s2/Makefile
@@ -230,7 +230,7 @@ $(BUILD)/esp-idf:
 
 # create the config headers
 $(BUILD)/esp-idf/config/sdkconfig.h: boards/$(BOARD)/sdkconfig | $(BUILD)/esp-idf
-	IDF_PATH=$(IDF_PATH) cmake -S . -B $(BUILD)/esp-idf -DSDKCONFIG=$(BUILD)/esp-idf/sdkconfig -DSDKCONFIG_DEFAULTS="sdkconfig.defaults;boards/$(BOARD)/sdkconfig" -DCMAKE_TOOLCHAIN_FILE=$(IDF_PATH)/tools/cmake/toolchain-esp32s2.cmake -DIDF_TARGET=esp32s2 -GNinja
+	IDF_PATH=$(IDF_PATH) cmake -S . -B $(BUILD)/esp-idf -DSDKCONFIG=$(BUILD)/esp-idf/sdkconfig -DSDKCONFIG_DEFAULTS="sdkconfig.defaults;sdkconfig-$(CIRCUITPY_ESP_FLASH_SIZE).defaults;boards/$(BOARD)/sdkconfig" -DCMAKE_TOOLCHAIN_FILE=$(IDF_PATH)/tools/cmake/toolchain-esp32s2.cmake -DIDF_TARGET=esp32s2 -GNinja
 
 # build a lib
 # Adding -d explain -j 1 -v to the ninja line will output debug info
diff --git a/ports/esp32s2/partitions-16MB.csv b/ports/esp32s2/partitions-16MB.csv
new file mode 100644
index 000000000..13ea81bea
--- /dev/null
+++ b/ports/esp32s2/partitions-16MB.csv
@@ -0,0 +1,10 @@
+# ESP-IDF Partition Table
+# Name,   Type, SubType, Offset,  Size, Flags
+# bootloader.bin,,          0x1000, 32K
+# partition table,,         0x8000, 4K
+nvs,      data, nvs,      0x9000,  20K,
+otadata,  data, ota,      0xe000,  8K,
+ota_0,    0,    ota_0,   0x10000,  2048K,
+ota_1,    0,    ota_1,  0x210000,  2048K,
+uf2,      app,  factory,0x410000,  256K,
+user_fs,  data, fat,    0x450000,  11968K,
diff --git a/ports/esp32s2/partitions-4MB.csv b/ports/esp32s2/partitions-4MB.csv
new file mode 100644
index 000000000..cf9b3cca8
--- /dev/null
+++ b/ports/esp32s2/partitions-4MB.csv
@@ -0,0 +1,10 @@
+# ESP-IDF Partition Table
+# Name,   Type, SubType, Offset,  Size, Flags
+# bootloader.bin,,          0x1000, 32K
+# partition table,,         0x8000, 4K
+nvs,      data, nvs,      0x9000,  20K,
+otadata,  data, ota,      0xe000,  8K,
+ota_0,    0,    ota_0,   0x10000,  1408K,
+ota_1,    0,    ota_1,  0x170000,  1408K,
+uf2,      app,  factory,0x2d0000,  256K,
+user_fs,  data, fat,    0x310000,  960K,
diff --git a/ports/esp32s2/partitions-8MB.csv b/ports/esp32s2/partitions-8MB.csv
new file mode 100644
index 000000000..f4ba9b60a
--- /dev/null
+++ b/ports/esp32s2/partitions-8MB.csv
@@ -0,0 +1,10 @@
+# ESP-IDF Partition Table
+# Name,   Type, SubType, Offset,  Size, Flags
+# bootloader.bin,,          0x1000, 32K
+# partition table,,         0x8000, 4K
+nvs,      data, nvs,      0x9000,  20K,
+otadata,  data, ota,      0xe000,  8K,
+ota_0,    0,    ota_0,   0x10000,  2048K,
+ota_1,    0,    ota_1,  0x210000,  2048K,
+uf2,      app,  factory,0x410000,  256K,
+user_fs,  data, fat,    0x450000,  3776K,
diff --git a/ports/esp32s2/partitions.csv b/ports/esp32s2/partitions.csv
deleted file mode 100644
index cf9b3cca8..000000000
--- a/ports/esp32s2/partitions.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-# ESP-IDF Partition Table
-# Name,   Type, SubType, Offset,  Size, Flags
-# bootloader.bin,,          0x1000, 32K
-# partition table,,         0x8000, 4K
-nvs,      data, nvs,      0x9000,  20K,
-otadata,  data, ota,      0xe000,  8K,
-ota_0,    0,    ota_0,   0x10000,  1408K,
-ota_1,    0,    ota_1,  0x170000,  1408K,
-uf2,      app,  factory,0x2d0000,  256K,
-user_fs,  data, fat,    0x310000,  960K,
diff --git a/ports/esp32s2/sdkconfig-16MB.defaults b/ports/esp32s2/sdkconfig-16MB.defaults
new file mode 100644
index 000000000..af477999b
--- /dev/null
+++ b/ports/esp32s2/sdkconfig-16MB.defaults
@@ -0,0 +1,10 @@
+
+# CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE="16MB"
+
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-16MB.csv"
+CONFIG_PARTITION_TABLE_FILENAME="partitions-16MB.csv"
diff --git a/ports/esp32s2/sdkconfig-4MB.defaults b/ports/esp32s2/sdkconfig-4MB.defaults
new file mode 100644
index 000000000..561f971c3
--- /dev/null
+++ b/ports/esp32s2/sdkconfig-4MB.defaults
@@ -0,0 +1,10 @@
+
+# CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+# CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set
+CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
+
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MB.csv"
+CONFIG_PARTITION_TABLE_FILENAME="partitions-4MB.csv"
diff --git a/ports/esp32s2/sdkconfig-8MB.defaults b/ports/esp32s2/sdkconfig-8MB.defaults
new file mode 100644
index 000000000..fcff17f46
--- /dev/null
+++ b/ports/esp32s2/sdkconfig-8MB.defaults
@@ -0,0 +1,10 @@
+
+# CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set
+CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
+# CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set
+CONFIG_ESPTOOLPY_FLASHSIZE="8MB"
+
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-8MB.csv"
+CONFIG_PARTITION_TABLE_FILENAME="partitions-8MB.csv"
diff --git a/ports/esp32s2/sdkconfig.defaults b/ports/esp32s2/sdkconfig.defaults
index c0a56c143..4094367e0 100644
--- a/ports/esp32s2/sdkconfig.defaults
+++ b/ports/esp32s2/sdkconfig.defaults
@@ -88,12 +88,6 @@ CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
 # CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set
 # CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set
 CONFIG_ESPTOOLPY_FLASHFREQ="40m"
-# CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
-# CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
-# CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
-# CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set
-CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
 CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
 CONFIG_ESPTOOLPY_BEFORE_RESET=y
 # CONFIG_ESPTOOLPY_BEFORE_NORESET is not set
@@ -119,8 +113,6 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 # CONFIG_PARTITION_TABLE_SINGLE_APP is not set
 # CONFIG_PARTITION_TABLE_TWO_OTA is not set
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
-CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_OFFSET=0x8000
 CONFIG_PARTITION_TABLE_MD5=y
 # end of Partition Table
-- 
cgit v1.2.3


From fead60d2d877073aad7d4303ff885781f3cff269 Mon Sep 17 00:00:00 2001
From: "Ryan T. Hamilton" <astrobokonon@gmail.com>
Date: Tue, 15 Sep 2020 23:32:53 -0700
Subject: Add BSSID to Network

---
 ports/esp32s2/common-hal/wifi/Network.c |  6 ++++++
 shared-bindings/wifi/Network.c          | 18 ++++++++++++++++++
 shared-bindings/wifi/Network.h          |  1 +
 3 files changed, 25 insertions(+)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/common-hal/wifi/Network.c b/ports/esp32s2/common-hal/wifi/Network.c
index 0320e8f92..e90b3d552 100644
--- a/ports/esp32s2/common-hal/wifi/Network.c
+++ b/ports/esp32s2/common-hal/wifi/Network.c
@@ -35,6 +35,12 @@ mp_obj_t common_hal_wifi_network_get_ssid(wifi_network_obj_t *self) {
 	return mp_obj_new_str(cstr, strlen(cstr));
 }
 
+#define MAC_ADDRESS_LENGTH 6
+
+mp_obj_t common_hal_wifi_network_get_bssid(wifi_network_obj_t *self) {
+    return mp_obj_new_bytes(self->record.bssid, MAC_ADDRESS_LENGTH);
+}
+
 mp_obj_t common_hal_wifi_network_get_rssi(wifi_network_obj_t *self) {
     return mp_obj_new_int(self->record.rssi);
 }
diff --git a/shared-bindings/wifi/Network.c b/shared-bindings/wifi/Network.c
index b6d5e0901..bf970a9c0 100644
--- a/shared-bindings/wifi/Network.c
+++ b/shared-bindings/wifi/Network.c
@@ -58,6 +58,23 @@ const mp_obj_property_t wifi_network_ssid_obj = {
 };
 
 
+//|     bssid: bytes
+//|     """BSSID of the network (usually the AP's MAC address)"""
+//|
+STATIC mp_obj_t wifi_network_get_bssid(mp_obj_t self) {
+    return common_hal_wifi_network_get_bssid(self);
+
+}
+MP_DEFINE_CONST_FUN_OBJ_1(wifi_network_get_bssid_obj, wifi_network_get_bssid);
+
+const mp_obj_property_t wifi_network_bssid_obj = {
+    .base.type = &mp_type_property,
+    .proxy = { (mp_obj_t)&wifi_network_get_bssid_obj,
+               (mp_obj_t)&mp_const_none_obj,
+               (mp_obj_t)&mp_const_none_obj },
+};
+
+
 //|     rssi: int
 //|     """Signal strength of the network"""
 //|
@@ -94,6 +111,7 @@ const mp_obj_property_t wifi_network_channel_obj = {
 
 STATIC const mp_rom_map_elem_t wifi_network_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ssid), MP_ROM_PTR(&wifi_network_ssid_obj) },
+    { MP_ROM_QSTR(MP_QSTR_bssid), MP_ROM_PTR(&wifi_network_bssid_obj) },
     { MP_ROM_QSTR(MP_QSTR_rssi), MP_ROM_PTR(&wifi_network_rssi_obj) },
     { MP_ROM_QSTR(MP_QSTR_channel), MP_ROM_PTR(&wifi_network_channel_obj) },
 };
diff --git a/shared-bindings/wifi/Network.h b/shared-bindings/wifi/Network.h
index 6a7f7be4a..c9bbc685e 100644
--- a/shared-bindings/wifi/Network.h
+++ b/shared-bindings/wifi/Network.h
@@ -36,6 +36,7 @@
 const mp_obj_type_t wifi_network_type;
 
 extern mp_obj_t common_hal_wifi_network_get_ssid(wifi_network_obj_t *self);
+extern mp_obj_t common_hal_wifi_network_get_bssid(wifi_network_obj_t *self);
 extern mp_obj_t common_hal_wifi_network_get_rssi(wifi_network_obj_t *self);
 extern mp_obj_t common_hal_wifi_network_get_channel(wifi_network_obj_t *self);
 
-- 
cgit v1.2.3


From c06aeda399142b50d7fc049effc22db4e2da6830 Mon Sep 17 00:00:00 2001
From: Rémi Sarrailh <remi@madnerd.org>
Date: Wed, 16 Sep 2020 13:10:01 +0200
Subject: Add Muselab nanoesp32 s2 definition

---
 .github/workflows/build.yml                        |  1 +
 ports/esp32s2/boards/muselab_nanoesp32_s2/board.c  | 47 +++++++++++++++++++++
 .../boards/muselab_nanoesp32_s2/mpconfigboard.h    | 34 +++++++++++++++
 .../boards/muselab_nanoesp32_s2/mpconfigboard.mk   | 17 ++++++++
 ports/esp32s2/boards/muselab_nanoesp32_s2/pins.c   | 48 ++++++++++++++++++++++
 .../esp32s2/boards/muselab_nanoesp32_s2/sdkconfig  |  0
 6 files changed, 147 insertions(+)
 create mode 100644 ports/esp32s2/boards/muselab_nanoesp32_s2/board.c
 create mode 100644 ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h
 create mode 100644 ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.mk
 create mode 100644 ports/esp32s2/boards/muselab_nanoesp32_s2/pins.c
 create mode 100644 ports/esp32s2/boards/muselab_nanoesp32_s2/sdkconfig

(limited to 'ports/esp32s2')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 513ef2930..49e52dbb2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -244,6 +244,7 @@ jobs:
         - "metro_nrf52840_express"
         - "mini_sam_m4"
         - "monster_m4sk"
+	- "muselabnanoesp32_s2"
         - "ndgarage_ndbit6"
         - "ndgarage_ndbit6_v2"
         - "nfc_copy_cat"
diff --git a/ports/esp32s2/boards/muselab_nanoesp32_s2/board.c b/ports/esp32s2/boards/muselab_nanoesp32_s2/board.c
new file mode 100644
index 000000000..9f708874b
--- /dev/null
+++ b/ports/esp32s2/boards/muselab_nanoesp32_s2/board.c
@@ -0,0 +1,47 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 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 "boards/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
+
+void board_init(void) {
+    // USB
+    common_hal_never_reset_pin(&pin_GPIO19);
+    common_hal_never_reset_pin(&pin_GPIO20);
+
+    // Debug UART
+    common_hal_never_reset_pin(&pin_GPIO43);
+    common_hal_never_reset_pin(&pin_GPIO44);
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+
+}
diff --git a/ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h b/ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h
new file mode 100644
index 000000000..5a165decc
--- /dev/null
+++ b/ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 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.
+ */
+
+//Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "nanoESP32-S2"
+#define MICROPY_HW_MCU_NAME         "ESP32S2"
+
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO18)
+
+#define AUTORESET_DELAY_MS 500
diff --git a/ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.mk b/ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.mk
new file mode 100644
index 000000000..449676d38
--- /dev/null
+++ b/ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.mk
@@ -0,0 +1,17 @@
+USB_VID = 0x239A
+USB_PID = 0x80DE
+USB_PRODUCT = "nanoESP32-S2"
+USB_MANUFACTURER = "Muselab"
+
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = MPZ
+
+# The default queue depth of 16 overflows on release builds,
+# so increase it to 32.
+CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
+
+CIRCUITPY_ESP_FLASH_MODE=dio
+CIRCUITPY_ESP_FLASH_FREQ=40m
+CIRCUITPY_ESP_FLASH_SIZE=4MB
+
+CIRCUITPY_MODULE=wroom
diff --git a/ports/esp32s2/boards/muselab_nanoesp32_s2/pins.c b/ports/esp32s2/boards/muselab_nanoesp32_s2/pins.c
new file mode 100644
index 000000000..0562d9331
--- /dev/null
+++ b/ports/esp32s2/boards/muselab_nanoesp32_s2/pins.c
@@ -0,0 +1,48 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) },
+
+
+    { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_IO26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_IO33), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_IO34), MP_ROM_PTR(&pin_GPIO34) },
+    { MP_ROM_QSTR(MP_QSTR_IO35), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_IO40), MP_ROM_PTR(&pin_GPIO40) },
+    { MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41) },
+    { MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) },
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
+    { MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44) },
+    { MP_ROM_QSTR(MP_QSTR_IO45), MP_ROM_PTR(&pin_GPIO45) },
+    { MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46) },
+
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO18) },
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
diff --git a/ports/esp32s2/boards/muselab_nanoesp32_s2/sdkconfig b/ports/esp32s2/boards/muselab_nanoesp32_s2/sdkconfig
new file mode 100644
index 000000000..e69de29bb
-- 
cgit v1.2.3


From 478a4b6405df620f3c8933faae9b81a76dd5a87b Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Wed, 16 Sep 2020 10:51:08 -0400
Subject: Clarify location of port root

---
 ports/esp32s2/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/README.md b/ports/esp32s2/README.md
index 5b664df08..8a6dfbd2d 100644
--- a/ports/esp32s2/README.md
+++ b/ports/esp32s2/README.md
@@ -30,7 +30,7 @@ Connect these pins using a [USB adapter](https://www.adafruit.com/product/4090)
 
 ## Building and flashing ##
 
-Before building or flashing the ESP32-S2, you must [install the esp-idf](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/get-started/index.html). This must be re-done ever time the esp-idf is updated, but not every time you build. From the port root, run:
+Before building or flashing the ESP32-S2, you must [install the esp-idf](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/get-started/index.html). This must be re-done ever time the esp-idf is updated, but not every time you build. Run `cd ports/esp32s2` from `circuitpython/` to move to the esp32s2 port root, and run:
 
 ```
 ./esp-idf/install.sh
-- 
cgit v1.2.3


From 18285f96e8a2600afcfcc1a63fa5df6388a8da19 Mon Sep 17 00:00:00 2001
From: askpatricw <4002194+askpatrickw@users.noreply.github.com>
Date: Wed, 16 Sep 2020 10:13:07 -0700
Subject: RTC is pickd up automatically

---
 ports/esp32s2/mpconfigport.mk | 1 -
 1 file changed, 1 deletion(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/mpconfigport.mk b/ports/esp32s2/mpconfigport.mk
index 8f057784a..bbaabb1c3 100644
--- a/ports/esp32s2/mpconfigport.mk
+++ b/ports/esp32s2/mpconfigport.mk
@@ -21,7 +21,6 @@ CIRCUITPY_COUNTIO = 0
 CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_ROTARYIO = 0
-CIRCUITPY_RTC = 1
 CIRCUITPY_NVM = 0
 # We don't have enough endpoints to include MIDI.
 CIRCUITPY_USB_MIDI = 0
-- 
cgit v1.2.3


From daa1dd278d3ee389be63723f4eabee1ab82c9a92 Mon Sep 17 00:00:00 2001
From: "Ryan T. Hamilton" <astrobokonon@gmail.com>
Date: Wed, 16 Sep 2020 16:25:17 -0700
Subject: connect now accepts bssid

---
 ports/esp32s2/common-hal/wifi/Radio.c | 10 +++++++++-
 shared-bindings/wifi/Radio.c          | 18 +++++++++++++++---
 shared-bindings/wifi/Radio.h          |  2 +-
 3 files changed, 25 insertions(+), 5 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/common-hal/wifi/Radio.c b/ports/esp32s2/common-hal/wifi/Radio.c
index 3c6ab5757..9ba384ca1 100644
--- a/ports/esp32s2/common-hal/wifi/Radio.c
+++ b/ports/esp32s2/common-hal/wifi/Radio.c
@@ -104,7 +104,7 @@ void common_hal_wifi_radio_stop_scanning_networks(wifi_radio_obj_t *self) {
     self->current_scan = NULL;
 }
 
-wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t* ssid, size_t ssid_len, uint8_t* password, size_t password_len, uint8_t channel, mp_float_t timeout) {
+wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t* ssid, size_t ssid_len, uint8_t* password, size_t password_len, uint8_t channel, mp_float_t timeout, uint8_t* bssid, size_t bssid_len) {
     // check enabled
     wifi_config_t* config = &self->sta_config;
     memcpy(&config->sta.ssid, ssid, ssid_len);
@@ -112,6 +112,14 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t
     memcpy(&config->sta.password, password, password_len);
     config->sta.password[password_len] = 0;
     config->sta.channel = channel;
+    // From esp_wifi_types.h:
+    //   Generally, station_config.bssid_set needs to be 0; and it needs
+    //   to be 1 only when users need to check the MAC address of the AP
+    if (bssid_len > 0){
+        memcpy(&config->sta.bssid, bssid, bssid_len);
+        config->sta.bssid[bssid_len] = 0;
+        config->sta.bssid_set = 1;
+    }
     esp_wifi_set_config(ESP_IF_WIFI_STA, config);
     self->starting_retries = 5;
     self->retries_left = 5;
diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c
index 329dcb1b5..928f21da9 100644
--- a/shared-bindings/wifi/Radio.c
+++ b/shared-bindings/wifi/Radio.c
@@ -108,11 +108,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_stop_scanning_networks_obj, wifi_rad
 //|         ...
 //|
 STATIC mp_obj_t wifi_radio_connect(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_ssid, ARG_password, ARG_channel, ARG_timeout };
+    enum { ARG_ssid, ARG_password, ARG_channel, ARG_bssid, ARG_timeout };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_ssid, MP_ARG_REQUIRED | MP_ARG_OBJ },
         { MP_QSTR_password,  MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_channel, MP_ARG_KW_ONLY |  MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_bssid, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
     };
 
@@ -125,7 +126,6 @@ STATIC mp_obj_t wifi_radio_connect(size_t n_args, const mp_obj_t *pos_args, mp_m
         timeout = mp_obj_get_float(args[ARG_timeout].u_obj);
     }
 
-
     mp_buffer_info_t ssid;
     mp_get_buffer_raise(args[ARG_ssid].u_obj, &ssid, MP_BUFFER_READ);
 
@@ -138,7 +138,19 @@ STATIC mp_obj_t wifi_radio_connect(size_t n_args, const mp_obj_t *pos_args, mp_m
         }
     }
 
-    wifi_radio_error_t error = common_hal_wifi_radio_connect(self, ssid.buf, ssid.len, password.buf, password.len, args[ARG_channel].u_int, timeout);
+    #define MAC_ADDRESS_LENGTH 6
+
+    mp_buffer_info_t bssid;
+    bssid.len = 0;
+    // Should probably make sure bssid is just bytes and not something else too
+    if (args[ARG_bssid].u_obj != MP_OBJ_NULL) {
+        mp_get_buffer_raise(args[ARG_bssid].u_obj, &bssid, MP_BUFFER_READ);
+        if (bssid.len != MAC_ADDRESS_LENGTH) {
+            mp_raise_ValueError(translate("Invalid BSSID"));
+        }
+    }
+
+    wifi_radio_error_t error = common_hal_wifi_radio_connect(self, ssid.buf, ssid.len, password.buf, password.len, args[ARG_channel].u_int, timeout, bssid.buf, bssid.len);
     if (error == WIFI_RADIO_ERROR_AUTH) {
         mp_raise_ConnectionError(translate("Authentication failure"));
     } else if (error == WIFI_RADIO_ERROR_NO_AP_FOUND) {
diff --git a/shared-bindings/wifi/Radio.h b/shared-bindings/wifi/Radio.h
index 812814f9e..b5341d51c 100644
--- a/shared-bindings/wifi/Radio.h
+++ b/shared-bindings/wifi/Radio.h
@@ -51,7 +51,7 @@ extern mp_obj_t common_hal_wifi_radio_get_mac_address(wifi_radio_obj_t *self);
 extern mp_obj_t common_hal_wifi_radio_start_scanning_networks(wifi_radio_obj_t *self);
 extern void common_hal_wifi_radio_stop_scanning_networks(wifi_radio_obj_t *self);
 
-extern wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t* ssid, size_t ssid_len, uint8_t* password, size_t password_len, uint8_t channel, mp_float_t timeout);
+extern wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t* ssid, size_t ssid_len, uint8_t* password, size_t password_len, uint8_t channel, mp_float_t timeout, uint8_t* bssid, size_t bssid_len);
 
 extern mp_obj_t common_hal_wifi_radio_get_ipv4_address(wifi_radio_obj_t *self);
 
-- 
cgit v1.2.3


From 1805e92038a16d5bada953bdf52b7ae99524f2fa Mon Sep 17 00:00:00 2001
From: "Ryan T. Hamilton" <astrobokonon@gmail.com>
Date: Thu, 17 Sep 2020 15:04:27 -0700
Subject: Add else case for non-bssid usage

---
 ports/esp32s2/common-hal/wifi/Radio.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/common-hal/wifi/Radio.c b/ports/esp32s2/common-hal/wifi/Radio.c
index 9ba384ca1..a0b8b6adc 100644
--- a/ports/esp32s2/common-hal/wifi/Radio.c
+++ b/ports/esp32s2/common-hal/wifi/Radio.c
@@ -119,6 +119,8 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t
         memcpy(&config->sta.bssid, bssid, bssid_len);
         config->sta.bssid[bssid_len] = 0;
         config->sta.bssid_set = 1;
+    } else {
+        config->sta.bssid_set = 0;
     }
     esp_wifi_set_config(ESP_IF_WIFI_STA, config);
     self->starting_retries = 5;
-- 
cgit v1.2.3


From 17bdc969dbd060eec60de067f21f8d4143e80bd8 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Thu, 17 Sep 2020 16:01:23 -0700
Subject: Reorganize sdkconfigs and release UF2s

---
 .pre-commit-config.yaml                            |   2 +-
 ports/esp32s2/Makefile                             |  18 +-
 ports/esp32s2/boards/microdev_micro_s2/sdkconfig   |   3 +-
 .../boards/unexpectedmaker_feathers2/sdkconfig     |   3 +-
 ports/esp32s2/esp-idf-config/partitions-16MB.csv   |  10 +
 ports/esp32s2/esp-idf-config/partitions-4MB.csv    |  10 +
 ports/esp32s2/esp-idf-config/partitions-8MB.csv    |  10 +
 .../esp32s2/esp-idf-config/sdkconfig-16MB.defaults |   9 +
 .../esp32s2/esp-idf-config/sdkconfig-4MB.defaults  |   9 +
 .../esp32s2/esp-idf-config/sdkconfig-8MB.defaults  |   9 +
 .../esp-idf-config/sdkconfig-debug.defaults        |  13 +
 .../esp32s2/esp-idf-config/sdkconfig-opt.defaults  |  12 +
 ports/esp32s2/esp-idf-config/sdkconfig.defaults    | 853 +++++++++++++++++++++
 ports/esp32s2/partitions-16MB.csv                  |  10 -
 ports/esp32s2/partitions-4MB.csv                   |  10 -
 ports/esp32s2/partitions-8MB.csv                   |  10 -
 ports/esp32s2/sdkconfig-16MB.defaults              |  10 -
 ports/esp32s2/sdkconfig-4MB.defaults               |  10 -
 ports/esp32s2/sdkconfig-8MB.defaults               |  10 -
 ports/esp32s2/sdkconfig.defaults                   | 853 ---------------------
 tools/build_board_info.py                          |   2 +-
 21 files changed, 952 insertions(+), 924 deletions(-)
 create mode 100644 ports/esp32s2/esp-idf-config/partitions-16MB.csv
 create mode 100644 ports/esp32s2/esp-idf-config/partitions-4MB.csv
 create mode 100644 ports/esp32s2/esp-idf-config/partitions-8MB.csv
 create mode 100644 ports/esp32s2/esp-idf-config/sdkconfig-16MB.defaults
 create mode 100644 ports/esp32s2/esp-idf-config/sdkconfig-4MB.defaults
 create mode 100644 ports/esp32s2/esp-idf-config/sdkconfig-8MB.defaults
 create mode 100644 ports/esp32s2/esp-idf-config/sdkconfig-debug.defaults
 create mode 100644 ports/esp32s2/esp-idf-config/sdkconfig-opt.defaults
 create mode 100644 ports/esp32s2/esp-idf-config/sdkconfig.defaults
 delete mode 100644 ports/esp32s2/partitions-16MB.csv
 delete mode 100644 ports/esp32s2/partitions-4MB.csv
 delete mode 100644 ports/esp32s2/partitions-8MB.csv
 delete mode 100644 ports/esp32s2/sdkconfig-16MB.defaults
 delete mode 100644 ports/esp32s2/sdkconfig-4MB.defaults
 delete mode 100644 ports/esp32s2/sdkconfig-8MB.defaults
 delete mode 100644 ports/esp32s2/sdkconfig.defaults

(limited to 'ports/esp32s2')

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 7c41ca3ce..322f37da4 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,6 +8,6 @@ repos:
     hooks:
     -   id: check-yaml
     -   id: end-of-file-fixer
-        exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*)'
+        exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/esp32s2/esp-idf-config/.*|ports/esp32s2/boards/.*/sdkconfig)'
     -   id: trailing-whitespace
         exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*)'
diff --git a/ports/esp32s2/Makefile b/ports/esp32s2/Makefile
index 229a3bf3a..662be481e 100644
--- a/ports/esp32s2/Makefile
+++ b/ports/esp32s2/Makefile
@@ -228,9 +228,17 @@ IDF_PATH = $(realpath ./esp-idf)
 $(BUILD)/esp-idf:
 	$(Q)$(MKDIR) -p $@
 
+FLASH_SDKCONFIG = esp-idf-config/sdkconfig-$(CIRCUITPY_ESP_FLASH_SIZE).defaults
+ifeq ($(DEBUG), 1)
+	DEBUG_SDKCONFIG = esp-idf-config/sdkconfig-debug.defaults
+else
+	DEBUG_SDKCONFIG = esp-idf-config/sdkconfig-opt.defaults
+endif
+SDKCONFIGS = esp-idf-config/sdkconfig.defaults;$(DEBUG_SDKCONFIG);$(FLASH_SDKCONFIG);boards/$(BOARD)/sdkconfig
+
 # create the config headers
 $(BUILD)/esp-idf/config/sdkconfig.h: boards/$(BOARD)/sdkconfig | $(BUILD)/esp-idf
-	IDF_PATH=$(IDF_PATH) cmake -S . -B $(BUILD)/esp-idf -DSDKCONFIG=$(BUILD)/esp-idf/sdkconfig -DSDKCONFIG_DEFAULTS="sdkconfig.defaults;sdkconfig-$(CIRCUITPY_ESP_FLASH_SIZE).defaults;boards/$(BOARD)/sdkconfig" -DCMAKE_TOOLCHAIN_FILE=$(IDF_PATH)/tools/cmake/toolchain-esp32s2.cmake -DIDF_TARGET=esp32s2 -GNinja
+	IDF_PATH=$(IDF_PATH) cmake -S . -B $(BUILD)/esp-idf -DSDKCONFIG=$(BUILD)/esp-idf/sdkconfig -DSDKCONFIG_DEFAULTS="$(SDKCONFIGS)" -DCMAKE_TOOLCHAIN_FILE=$(IDF_PATH)/tools/cmake/toolchain-esp32s2.cmake -DIDF_TARGET=esp32s2 -GNinja
 
 # build a lib
 # Adding -d explain -j 1 -v to the ninja line will output debug info
@@ -247,10 +255,12 @@ $(BUILD)/esp-idf/esp-idf/esp32s2/ld/esp32s2.project.ld: $(BUILD)/esp-idf/config/
 $(BUILD)/esp-idf/partition_table/partition-table.bin: $(BUILD)/esp-idf/config/sdkconfig.h
 	IDF_PATH=$(IDF_PATH) ninja -C $(BUILD)/esp-idf partition_table/partition-table.bin
 
-# run menuconfig
+# run menuconfig and then remove standard settings
 menuconfig: $(BUILD)/esp-idf/config
 	$(Q)ninja -C $(BUILD)/esp-idf menuconfig
-	$(Q)diff --old-line-format= --unchanged-line-format= sdkconfig.defaults $(BUILD)/esp-idf/sdkconfig > boards/$(BOARD)/sdkconfig || true
+	$(Q)diff --old-line-format= --unchanged-line-format= esp-idf-config/sdkconfig.defaults $(BUILD)/esp-idf/sdkconfig > $(BUILD)/sdkconfig.diff || true
+	$(Q)grep -Fvxf $(FLASH_SDKCONFIG) $(BUILD)/sdkconfig.diff > $(BUILD)/sdkconfig.stripped1
+	$(Q)grep -Fvxf $(DEBUG_SDKCONFIG) $(BUILD)/sdkconfig.stripped1 > boards/$(BOARD)/sdkconfig
 
 # qstr builds include headers so we need to make sure they are up to date
 $(HEADER_BUILD)/qstr.i.last: | $(BUILD)/esp-idf/config/sdkconfig.h
@@ -307,8 +317,6 @@ $(BUILD)/firmware.elf: $(OBJ) | esp-idf-stamp
 $(BUILD)/circuitpython-firmware.bin: $(BUILD)/firmware.elf
 	$(STEPECHO) "Create $@"
 	$(Q)esptool.py --chip esp32s2 elf2image $(FLASH_FLAGS) --elf-sha256-offset 0xb0 -o $@ $^
-#	$(Q)$(OBJCOPY) -O binary $^ $@
-#   $(Q)$(OBJCOPY) -O binary -j .vectors -j .text -j .data $^ $@
 
 $(BUILD)/firmware.bin: $(BUILD)/circuitpython-firmware.bin | esp-idf-stamp
 	$(Q)$(PYTHON) ../../tools/join_bins.py $@ 0x1000 $(BUILD)/esp-idf/bootloader/bootloader.bin 0x8000 $(BUILD)/esp-idf/partition_table/partition-table.bin 0x10000 $(BUILD)/circuitpython-firmware.bin
diff --git a/ports/esp32s2/boards/microdev_micro_s2/sdkconfig b/ports/esp32s2/boards/microdev_micro_s2/sdkconfig
index b73c4a8c2..67ac6d2f3 100644
--- a/ports/esp32s2/boards/microdev_micro_s2/sdkconfig
+++ b/ports/esp32s2/boards/microdev_micro_s2/sdkconfig
@@ -16,10 +16,8 @@ CONFIG_DEFAULT_PSRAM_CLK_IO=30
 CONFIG_DEFAULT_PSRAM_CS_IO=26
 # end of PSRAM clock and cs IO for ESP32S2
 
-CONFIG_SPIRAM_SPIWP_SD3_PIN=28
 # CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
 # CONFIG_SPIRAM_RODATA is not set
-# CONFIG_SPIRAM_USE_AHB_DBUS3 is not set
 # CONFIG_SPIRAM_SPEED_80M is not set
 CONFIG_SPIRAM_SPEED_40M=y
 # CONFIG_SPIRAM_SPEED_26M is not set
@@ -33,3 +31,4 @@ CONFIG_SPIRAM_USE_MEMMAP=y
 CONFIG_SPIRAM_MEMTEST=y
 # CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
 # end of SPI RAM config
+
diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2/sdkconfig b/ports/esp32s2/boards/unexpectedmaker_feathers2/sdkconfig
index b73c4a8c2..67ac6d2f3 100644
--- a/ports/esp32s2/boards/unexpectedmaker_feathers2/sdkconfig
+++ b/ports/esp32s2/boards/unexpectedmaker_feathers2/sdkconfig
@@ -16,10 +16,8 @@ CONFIG_DEFAULT_PSRAM_CLK_IO=30
 CONFIG_DEFAULT_PSRAM_CS_IO=26
 # end of PSRAM clock and cs IO for ESP32S2
 
-CONFIG_SPIRAM_SPIWP_SD3_PIN=28
 # CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
 # CONFIG_SPIRAM_RODATA is not set
-# CONFIG_SPIRAM_USE_AHB_DBUS3 is not set
 # CONFIG_SPIRAM_SPEED_80M is not set
 CONFIG_SPIRAM_SPEED_40M=y
 # CONFIG_SPIRAM_SPEED_26M is not set
@@ -33,3 +31,4 @@ CONFIG_SPIRAM_USE_MEMMAP=y
 CONFIG_SPIRAM_MEMTEST=y
 # CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
 # end of SPI RAM config
+
diff --git a/ports/esp32s2/esp-idf-config/partitions-16MB.csv b/ports/esp32s2/esp-idf-config/partitions-16MB.csv
new file mode 100644
index 000000000..13ea81bea
--- /dev/null
+++ b/ports/esp32s2/esp-idf-config/partitions-16MB.csv
@@ -0,0 +1,10 @@
+# ESP-IDF Partition Table
+# Name,   Type, SubType, Offset,  Size, Flags
+# bootloader.bin,,          0x1000, 32K
+# partition table,,         0x8000, 4K
+nvs,      data, nvs,      0x9000,  20K,
+otadata,  data, ota,      0xe000,  8K,
+ota_0,    0,    ota_0,   0x10000,  2048K,
+ota_1,    0,    ota_1,  0x210000,  2048K,
+uf2,      app,  factory,0x410000,  256K,
+user_fs,  data, fat,    0x450000,  11968K,
diff --git a/ports/esp32s2/esp-idf-config/partitions-4MB.csv b/ports/esp32s2/esp-idf-config/partitions-4MB.csv
new file mode 100644
index 000000000..cf9b3cca8
--- /dev/null
+++ b/ports/esp32s2/esp-idf-config/partitions-4MB.csv
@@ -0,0 +1,10 @@
+# ESP-IDF Partition Table
+# Name,   Type, SubType, Offset,  Size, Flags
+# bootloader.bin,,          0x1000, 32K
+# partition table,,         0x8000, 4K
+nvs,      data, nvs,      0x9000,  20K,
+otadata,  data, ota,      0xe000,  8K,
+ota_0,    0,    ota_0,   0x10000,  1408K,
+ota_1,    0,    ota_1,  0x170000,  1408K,
+uf2,      app,  factory,0x2d0000,  256K,
+user_fs,  data, fat,    0x310000,  960K,
diff --git a/ports/esp32s2/esp-idf-config/partitions-8MB.csv b/ports/esp32s2/esp-idf-config/partitions-8MB.csv
new file mode 100644
index 000000000..f4ba9b60a
--- /dev/null
+++ b/ports/esp32s2/esp-idf-config/partitions-8MB.csv
@@ -0,0 +1,10 @@
+# ESP-IDF Partition Table
+# Name,   Type, SubType, Offset,  Size, Flags
+# bootloader.bin,,          0x1000, 32K
+# partition table,,         0x8000, 4K
+nvs,      data, nvs,      0x9000,  20K,
+otadata,  data, ota,      0xe000,  8K,
+ota_0,    0,    ota_0,   0x10000,  2048K,
+ota_1,    0,    ota_1,  0x210000,  2048K,
+uf2,      app,  factory,0x410000,  256K,
+user_fs,  data, fat,    0x450000,  3776K,
diff --git a/ports/esp32s2/esp-idf-config/sdkconfig-16MB.defaults b/ports/esp32s2/esp-idf-config/sdkconfig-16MB.defaults
new file mode 100644
index 000000000..2299feccd
--- /dev/null
+++ b/ports/esp32s2/esp-idf-config/sdkconfig-16MB.defaults
@@ -0,0 +1,9 @@
+# No newlines in this file so they are preserved in the board sdkconfig.
+# CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE="16MB"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-16MB.csv"
+CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-16MB.csv"
\ No newline at end of file
diff --git a/ports/esp32s2/esp-idf-config/sdkconfig-4MB.defaults b/ports/esp32s2/esp-idf-config/sdkconfig-4MB.defaults
new file mode 100644
index 000000000..4da90d1bc
--- /dev/null
+++ b/ports/esp32s2/esp-idf-config/sdkconfig-4MB.defaults
@@ -0,0 +1,9 @@
+# No newlines in this file so they are preserved in the board sdkconfig.
+# CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+# CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set
+CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-4MB.csv"
+CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-4MB.csv"
\ No newline at end of file
diff --git a/ports/esp32s2/esp-idf-config/sdkconfig-8MB.defaults b/ports/esp32s2/esp-idf-config/sdkconfig-8MB.defaults
new file mode 100644
index 000000000..af681c5ea
--- /dev/null
+++ b/ports/esp32s2/esp-idf-config/sdkconfig-8MB.defaults
@@ -0,0 +1,9 @@
+# No newlines in this file so they are preserved in the board sdkconfig.
+# CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set
+CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
+# CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set
+CONFIG_ESPTOOLPY_FLASHSIZE="8MB"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-8MB.csv"
+CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-8MB.csv"
\ No newline at end of file
diff --git a/ports/esp32s2/esp-idf-config/sdkconfig-debug.defaults b/ports/esp32s2/esp-idf-config/sdkconfig-debug.defaults
new file mode 100644
index 000000000..f45f6ae9f
--- /dev/null
+++ b/ports/esp32s2/esp-idf-config/sdkconfig-debug.defaults
@@ -0,0 +1,13 @@
+# No newlines in this file so they are preserved in the board sdkconfig.
+CONFIG_ESP_ERR_TO_NAME_LOOKUP=y
+CONFIG_ESP_CONSOLE_UART_DEFAULT=y
+# CONFIG_ESP_CONSOLE_USB_CDC is not set
+# CONFIG_ESP_CONSOLE_UART_CUSTOM is not set
+# CONFIG_ESP_CONSOLE_NONE is not set
+CONFIG_ESP_CONSOLE_UART=y
+CONFIG_ESP_CONSOLE_UART_NUM=0
+CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
+CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
+# CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT is not set
+# CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
+# CONFIG_ESP_SYSTEM_PANIC_GDBSTUB is not set
\ No newline at end of file
diff --git a/ports/esp32s2/esp-idf-config/sdkconfig-opt.defaults b/ports/esp32s2/esp-idf-config/sdkconfig-opt.defaults
new file mode 100644
index 000000000..af0746bc0
--- /dev/null
+++ b/ports/esp32s2/esp-idf-config/sdkconfig-opt.defaults
@@ -0,0 +1,12 @@
+# No newlines in this file so they are preserved in the board sdkconfig.
+# CONFIG_ESP_ERR_TO_NAME_LOOKUP is not set
+# CONFIG_ESP_CONSOLE_UART_DEFAULT is not set
+# CONFIG_CONSOLE_UART_DEFAULT is not set
+CONFIG_ESP_CONSOLE_UART_NONE=y
+CONFIG_ESP_CONSOLE_NONE=y
+CONFIG_ESP_CONSOLE_UART_NUM=-1
+CONFIG_CONSOLE_UART_NUM=-1
+# CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT is not set
+CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT=y
+# CONFIG_ESP32S2_PANIC_PRINT_HALT is not set
+CONFIG_ESP32S2_PANIC_SILENT_REBOOT=y
\ No newline at end of file
diff --git a/ports/esp32s2/esp-idf-config/sdkconfig.defaults b/ports/esp32s2/esp-idf-config/sdkconfig.defaults
new file mode 100644
index 000000000..4094367e0
--- /dev/null
+++ b/ports/esp32s2/esp-idf-config/sdkconfig.defaults
@@ -0,0 +1,853 @@
+#
+# Automatically generated file. DO NOT EDIT.
+# Espressif IoT Development Framework (ESP-IDF) Project Configuration
+#
+CONFIG_IDF_CMAKE=y
+CONFIG_IDF_TARGET="esp32s2"
+CONFIG_IDF_TARGET_ESP32S2=y
+CONFIG_IDF_FIRMWARE_CHIP_ID=0x0002
+
+#
+# SDK tool configuration
+#
+CONFIG_SDK_TOOLPREFIX="xtensa-esp32s2-elf-"
+# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
+# end of SDK tool configuration
+
+#
+# Build type
+#
+CONFIG_APP_BUILD_TYPE_APP_2NDBOOT=y
+# CONFIG_APP_BUILD_TYPE_ELF_RAM is not set
+CONFIG_APP_BUILD_GENERATE_BINARIES=y
+CONFIG_APP_BUILD_BOOTLOADER=y
+CONFIG_APP_BUILD_USE_FLASH_SECTIONS=y
+# end of Build type
+
+#
+# Application manager
+#
+CONFIG_APP_COMPILE_TIME_DATE=y
+# CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set
+# CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set
+# CONFIG_APP_PROJECT_VER_FROM_CONFIG is not set
+CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16
+# end of Application manager
+
+#
+# Bootloader config
+#
+CONFIG_BOOTLOADER_OFFSET_IN_FLASH=0x1000
+CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
+# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_DEBUG is not set
+# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_PERF is not set
+# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_NONE is not set
+# CONFIG_BOOTLOADER_LOG_LEVEL_NONE is not set
+# CONFIG_BOOTLOADER_LOG_LEVEL_ERROR is not set
+# CONFIG_BOOTLOADER_LOG_LEVEL_WARN is not set
+CONFIG_BOOTLOADER_LOG_LEVEL_INFO=y
+# CONFIG_BOOTLOADER_LOG_LEVEL_DEBUG is not set
+# CONFIG_BOOTLOADER_LOG_LEVEL_VERBOSE is not set
+CONFIG_BOOTLOADER_LOG_LEVEL=3
+# CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_8V is not set
+CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y
+# CONFIG_BOOTLOADER_FACTORY_RESET is not set
+# CONFIG_BOOTLOADER_APP_TEST is not set
+CONFIG_BOOTLOADER_WDT_ENABLE=y
+# CONFIG_BOOTLOADER_WDT_DISABLE_IN_USER_CODE is not set
+CONFIG_BOOTLOADER_WDT_TIME_MS=9000
+# CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE is not set
+# CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP is not set
+CONFIG_BOOTLOADER_RESERVE_RTC_SIZE=0
+# CONFIG_BOOTLOADER_CUSTOM_RESERVE_RTC is not set
+# end of Bootloader config
+
+#
+# Security features
+#
+CONFIG_SECURE_TARGET_HAS_SECURE_ROM_DL_MODE=y
+# CONFIG_SECURE_SIGNED_APPS_NO_SECURE_BOOT is not set
+# CONFIG_SECURE_BOOT is not set
+# CONFIG_SECURE_FLASH_ENC_ENABLED is not set
+# CONFIG_SECURE_DISABLE_ROM_DL_MODE is not set
+# CONFIG_SECURE_ENABLE_SECURE_ROM_DL_MODE is not set
+# end of Security features
+
+#
+# Serial flasher config
+#
+CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200
+CONFIG_ESPTOOLPY_WITH_STUB=y
+# CONFIG_ESPTOOLPY_FLASHMODE_QIO is not set
+# CONFIG_ESPTOOLPY_FLASHMODE_QOUT is not set
+CONFIG_ESPTOOLPY_FLASHMODE_DIO=y
+# CONFIG_ESPTOOLPY_FLASHMODE_DOUT is not set
+CONFIG_ESPTOOLPY_FLASHMODE="dio"
+# CONFIG_ESPTOOLPY_FLASHFREQ_80M is not set
+CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
+# CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set
+# CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set
+CONFIG_ESPTOOLPY_FLASHFREQ="40m"
+CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
+CONFIG_ESPTOOLPY_BEFORE_RESET=y
+# CONFIG_ESPTOOLPY_BEFORE_NORESET is not set
+CONFIG_ESPTOOLPY_BEFORE="default_reset"
+CONFIG_ESPTOOLPY_AFTER_RESET=y
+# CONFIG_ESPTOOLPY_AFTER_NORESET is not set
+CONFIG_ESPTOOLPY_AFTER="hard_reset"
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_CONSOLE is not set
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_9600B is not set
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_57600B is not set
+CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_230400B is not set
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_921600B is not set
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_2MB is not set
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER is not set
+CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER_VAL=115200
+CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
+# end of Serial flasher config
+
+#
+# Partition Table
+#
+# CONFIG_PARTITION_TABLE_SINGLE_APP is not set
+# CONFIG_PARTITION_TABLE_TWO_OTA is not set
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_OFFSET=0x8000
+CONFIG_PARTITION_TABLE_MD5=y
+# end of Partition Table
+
+#
+# Compiler options
+#
+# CONFIG_COMPILER_OPTIMIZATION_DEFAULT is not set
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y
+# CONFIG_COMPILER_OPTIMIZATION_PERF is not set
+# CONFIG_COMPILER_OPTIMIZATION_NONE is not set
+# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE is not set
+CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
+# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE is not set
+# CONFIG_COMPILER_CXX_EXCEPTIONS is not set
+# CONFIG_COMPILER_CXX_RTTI is not set
+CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y
+# CONFIG_COMPILER_STACK_CHECK_MODE_NORM is not set
+# CONFIG_COMPILER_STACK_CHECK_MODE_STRONG is not set
+# CONFIG_COMPILER_STACK_CHECK_MODE_ALL is not set
+# CONFIG_COMPILER_WARN_WRITE_STRINGS is not set
+# CONFIG_COMPILER_DISABLE_GCC8_WARNINGS is not set
+# end of Compiler options
+
+#
+# Component config
+#
+
+#
+# Application Level Tracing
+#
+# CONFIG_APPTRACE_DEST_TRAX is not set
+CONFIG_APPTRACE_DEST_NONE=y
+CONFIG_APPTRACE_LOCK_ENABLE=y
+# end of Application Level Tracing
+
+#
+# Driver configurations
+#
+
+#
+# ADC configuration
+#
+# CONFIG_ADC_FORCE_XPD_FSM is not set
+CONFIG_ADC_DISABLE_DAC=y
+# end of ADC configuration
+
+#
+# SPI configuration
+#
+# CONFIG_SPI_MASTER_IN_IRAM is not set
+CONFIG_SPI_MASTER_ISR_IN_IRAM=y
+# CONFIG_SPI_SLAVE_IN_IRAM is not set
+CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
+# end of SPI configuration
+
+#
+# UART configuration
+#
+# CONFIG_UART_ISR_IN_IRAM is not set
+# end of UART configuration
+# end of Driver configurations
+
+#
+# eFuse Bit Manager
+#
+# CONFIG_EFUSE_CUSTOM_TABLE is not set
+# CONFIG_EFUSE_VIRTUAL is not set
+CONFIG_EFUSE_MAX_BLK_LEN=256
+# end of eFuse Bit Manager
+
+#
+# ESP-TLS
+#
+CONFIG_ESP_TLS_USING_MBEDTLS=y
+CONFIG_ESP_TLS_SERVER=y
+# CONFIG_ESP_TLS_PSK_VERIFICATION is not set
+# end of ESP-TLS
+
+#
+# ESP32S2-specific
+#
+# CONFIG_ESP32S2_DEFAULT_CPU_FREQ_80 is not set
+# CONFIG_ESP32S2_DEFAULT_CPU_FREQ_160 is not set
+CONFIG_ESP32S2_DEFAULT_CPU_FREQ_240=y
+CONFIG_ESP32S2_DEFAULT_CPU_FREQ_MHZ=240
+
+#
+# Memory protection
+#
+# CONFIG_ESP32S2_MEMPROT_FEATURE is not set
+# end of Memory protection
+
+#
+# Cache config
+#
+# CONFIG_ESP32S2_INSTRUCTION_CACHE_8KB is not set
+CONFIG_ESP32S2_INSTRUCTION_CACHE_16KB=y
+# CONFIG_ESP32S2_INSTRUCTION_CACHE_LINE_16B is not set
+CONFIG_ESP32S2_INSTRUCTION_CACHE_LINE_32B=y
+# CONFIG_ESP32S2_DATA_CACHE_0KB is not set
+# CONFIG_ESP32S2_DATA_CACHE_8KB is not set
+CONFIG_ESP32S2_DATA_CACHE_16KB=y
+# CONFIG_ESP32S2_DATA_CACHE_LINE_16B is not set
+CONFIG_ESP32S2_DATA_CACHE_LINE_32B=y
+# CONFIG_ESP32S2_INSTRUCTION_CACHE_WRAP is not set
+# CONFIG_ESP32S2_DATA_CACHE_WRAP is not set
+# end of Cache config
+
+# CONFIG_ESP32S2_SPIRAM_SUPPORT is not set
+# CONFIG_ESP32S2_TRAX is not set
+CONFIG_ESP32S2_TRACEMEM_RESERVE_DRAM=0x0
+# CONFIG_ESP32S2_UNIVERSAL_MAC_ADDRESSES_ONE is not set
+CONFIG_ESP32S2_UNIVERSAL_MAC_ADDRESSES_TWO=y
+CONFIG_ESP32S2_UNIVERSAL_MAC_ADDRESSES=2
+# CONFIG_ESP32S2_ULP_COPROC_ENABLED is not set
+CONFIG_ESP32S2_ULP_COPROC_RESERVE_MEM=0
+CONFIG_ESP32S2_DEBUG_OCDAWARE=y
+# CONFIG_ESP32S2_DEBUG_STUBS_ENABLE is not set
+CONFIG_ESP32S2_BROWNOUT_DET=y
+CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_7=y
+# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_6 is not set
+# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_5 is not set
+# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_4 is not set
+# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_3 is not set
+# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_2 is not set
+# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_1 is not set
+CONFIG_ESP32S2_BROWNOUT_DET_LVL=7
+CONFIG_ESP32S2_TIME_SYSCALL_USE_RTC_FRC1=y
+# CONFIG_ESP32S2_TIME_SYSCALL_USE_RTC is not set
+# CONFIG_ESP32S2_TIME_SYSCALL_USE_FRC1 is not set
+# CONFIG_ESP32S2_TIME_SYSCALL_USE_NONE is not set
+CONFIG_ESP32S2_RTC_CLK_SRC_INT_RC=y
+# CONFIG_ESP32S2_RTC_CLK_SRC_EXT_CRYS is not set
+# CONFIG_ESP32S2_RTC_CLK_SRC_EXT_OSC is not set
+# CONFIG_ESP32S2_RTC_CLK_SRC_INT_8MD256 is not set
+CONFIG_ESP32S2_RTC_CLK_CAL_CYCLES=576
+# CONFIG_ESP32S2_NO_BLOBS is not set
+# CONFIG_ESP32S2_KEEP_USB_ALIVE is not set
+# CONFIG_ESP32S2_RTCDATA_IN_FAST_MEM is not set
+# CONFIG_ESP32S2_USE_FIXED_STATIC_RAM_SIZE is not set
+CONFIG_ESP32S2_ALLOW_RTC_FAST_MEM_AS_HEAP=y
+# end of ESP32S2-specific
+
+#
+# Power Management
+#
+# CONFIG_PM_ENABLE is not set
+# end of Power Management
+
+#
+# Common ESP-related
+#
+CONFIG_ESP_ERR_TO_NAME_LOOKUP=y
+CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32
+CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2304
+CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192
+CONFIG_ESP_IPC_TASK_STACK_SIZE=1024
+CONFIG_ESP_MINIMAL_SHARED_STACK_SIZE=2048
+CONFIG_ESP_CONSOLE_UART_DEFAULT=y
+# CONFIG_ESP_CONSOLE_USB_CDC is not set
+# CONFIG_ESP_CONSOLE_UART_CUSTOM is not set
+# CONFIG_ESP_CONSOLE_NONE is not set
+CONFIG_ESP_CONSOLE_UART=y
+CONFIG_ESP_CONSOLE_UART_NUM=0
+CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
+CONFIG_ESP_INT_WDT=y
+CONFIG_ESP_INT_WDT_TIMEOUT_MS=300
+# CONFIG_ESP_TASK_WDT is not set
+# CONFIG_ESP_PANIC_HANDLER_IRAM is not set
+CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_STA=y
+CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_AP=y
+# end of Common ESP-related
+
+#
+# Ethernet
+#
+# CONFIG_ETH_USE_SPI_ETHERNET is not set
+# CONFIG_ETH_USE_OPENETH is not set
+# end of Ethernet
+
+#
+# Event Loop Library
+#
+# CONFIG_ESP_EVENT_LOOP_PROFILING is not set
+CONFIG_ESP_EVENT_POST_FROM_ISR=y
+CONFIG_ESP_EVENT_POST_FROM_IRAM_ISR=y
+# end of Event Loop Library
+
+#
+# ESP NETIF Adapter
+#
+CONFIG_ESP_NETIF_IP_LOST_TIMER_INTERVAL=120
+CONFIG_ESP_NETIF_TCPIP_LWIP=y
+# CONFIG_ESP_NETIF_LOOPBACK is not set
+# CONFIG_ESP_NETIF_TCPIP_ADAPTER_COMPATIBLE_LAYER is not set
+# end of ESP NETIF Adapter
+
+#
+# ESP System Settings
+#
+CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
+# CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT is not set
+# CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
+# CONFIG_ESP_SYSTEM_PANIC_GDBSTUB is not set
+CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE=y
+# end of ESP System Settings
+
+#
+# High resolution timer (esp_timer)
+#
+# CONFIG_ESP_TIMER_PROFILING is not set
+CONFIG_ESP_TIMER_TASK_STACK_SIZE=3584
+CONFIG_ESP_TIMER_IMPL_SYSTIMER=y
+# end of High resolution timer (esp_timer)
+
+#
+# Wi-Fi
+#
+CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=10
+CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32
+# CONFIG_ESP32_WIFI_STATIC_TX_BUFFER is not set
+CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y
+CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=1
+CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=32
+# CONFIG_ESP32_WIFI_CSI_ENABLED is not set
+CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
+CONFIG_ESP32_WIFI_TX_BA_WIN=6
+CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
+CONFIG_ESP32_WIFI_RX_BA_WIN=6
+# CONFIG_ESP32_WIFI_NVS_ENABLED is not set
+CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752
+CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32
+# CONFIG_ESP32_WIFI_DEBUG_LOG_ENABLE is not set
+CONFIG_ESP32_WIFI_IRAM_OPT=y
+CONFIG_ESP32_WIFI_RX_IRAM_OPT=y
+# CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE is not set
+# end of Wi-Fi
+
+#
+# PHY
+#
+# CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION is not set
+CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20
+CONFIG_ESP32_PHY_MAX_TX_POWER=20
+# end of PHY
+
+#
+# Core dump
+#
+# CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set
+# CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set
+CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y
+# end of Core dump
+
+#
+# FreeRTOS
+#
+CONFIG_FREERTOS_UNICORE=y
+CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF
+CONFIG_FREERTOS_CORETIMER_0=y
+# CONFIG_FREERTOS_CORETIMER_1 is not set
+CONFIG_FREERTOS_OPTIMIZED_SCHEDULER=y
+CONFIG_FREERTOS_HZ=100
+CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=y
+# CONFIG_FREERTOS_CHECK_STACKOVERFLOW_NONE is not set
+# CONFIG_FREERTOS_CHECK_STACKOVERFLOW_PTRVAL is not set
+CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY=y
+# CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK is not set
+CONFIG_FREERTOS_INTERRUPT_BACKTRACE=y
+CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=1
+CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y
+# CONFIG_FREERTOS_ASSERT_FAIL_PRINT_CONTINUE is not set
+# CONFIG_FREERTOS_ASSERT_DISABLE is not set
+CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1536
+CONFIG_FREERTOS_ISR_STACKSIZE=1536
+# CONFIG_FREERTOS_LEGACY_HOOKS is not set
+CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16
+CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
+# CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set
+CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1
+CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2048
+CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10
+CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0
+# CONFIG_FREERTOS_USE_TRACE_FACILITY is not set
+# CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS is not set
+CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y
+# CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE is not set
+CONFIG_FREERTOS_DEBUG_OCDAWARE=y
+# end of FreeRTOS
+
+#
+# Heap memory debugging
+#
+CONFIG_HEAP_POISONING_DISABLED=y
+# CONFIG_HEAP_POISONING_LIGHT is not set
+# CONFIG_HEAP_POISONING_COMPREHENSIVE is not set
+CONFIG_HEAP_TRACING_OFF=y
+# CONFIG_HEAP_TRACING_STANDALONE is not set
+# CONFIG_HEAP_TRACING_TOHOST is not set
+# CONFIG_HEAP_ABORT_WHEN_ALLOCATION_FAILS is not set
+# end of Heap memory debugging
+
+#
+# Log output
+#
+# CONFIG_LOG_DEFAULT_LEVEL_NONE is not set
+# CONFIG_LOG_DEFAULT_LEVEL_ERROR is not set
+# CONFIG_LOG_DEFAULT_LEVEL_WARN is not set
+CONFIG_LOG_DEFAULT_LEVEL_INFO=y
+# CONFIG_LOG_DEFAULT_LEVEL_DEBUG is not set
+# CONFIG_LOG_DEFAULT_LEVEL_VERBOSE is not set
+CONFIG_LOG_DEFAULT_LEVEL=3
+CONFIG_LOG_COLORS=y
+CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y
+# CONFIG_LOG_TIMESTAMP_SOURCE_SYSTEM is not set
+# end of Log output
+
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
+CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y
+# CONFIG_LWIP_L2_TO_L3_COPY is not set
+# CONFIG_LWIP_IRAM_OPTIMIZATION is not set
+CONFIG_LWIP_TIMERS_ONDEMAND=y
+CONFIG_LWIP_MAX_SOCKETS=10
+# CONFIG_LWIP_USE_ONLY_LWIP_SELECT is not set
+# CONFIG_LWIP_SO_LINGER is not set
+CONFIG_LWIP_SO_REUSE=y
+CONFIG_LWIP_SO_REUSE_RXTOALL=y
+CONFIG_LWIP_SO_RCVBUF=y
+# CONFIG_LWIP_NETBUF_RECVINFO is not set
+CONFIG_LWIP_IP4_FRAG=y
+CONFIG_LWIP_IP6_FRAG=y
+# CONFIG_LWIP_IP4_REASSEMBLY is not set
+# CONFIG_LWIP_IP6_REASSEMBLY is not set
+# CONFIG_LWIP_IP_FORWARD is not set
+# CONFIG_LWIP_STATS is not set
+# CONFIG_LWIP_ETHARP_TRUST_IP_MAC is not set
+CONFIG_LWIP_ESP_GRATUITOUS_ARP=y
+CONFIG_LWIP_GARP_TMR_INTERVAL=60
+CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32
+CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y
+# CONFIG_LWIP_DHCP_RESTORE_LAST_IP is not set
+
+#
+# DHCP server
+#
+CONFIG_LWIP_DHCPS_LEASE_UNIT=60
+CONFIG_LWIP_DHCPS_MAX_STATION_NUM=8
+# end of DHCP server
+
+# CONFIG_LWIP_AUTOIP is not set
+# CONFIG_LWIP_IPV6_AUTOCONFIG is not set
+CONFIG_LWIP_NETIF_LOOPBACK=y
+CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8
+
+#
+# TCP
+#
+CONFIG_LWIP_MAX_ACTIVE_TCP=16
+CONFIG_LWIP_MAX_LISTENING_TCP=16
+CONFIG_LWIP_TCP_MAXRTX=12
+CONFIG_LWIP_TCP_SYNMAXRTX=6
+CONFIG_LWIP_TCP_MSS=1440
+CONFIG_LWIP_TCP_TMR_INTERVAL=250
+CONFIG_LWIP_TCP_MSL=60000
+CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5744
+CONFIG_LWIP_TCP_WND_DEFAULT=5744
+CONFIG_LWIP_TCP_RECVMBOX_SIZE=6
+CONFIG_LWIP_TCP_QUEUE_OOSEQ=y
+# CONFIG_LWIP_TCP_SACK_OUT is not set
+# CONFIG_LWIP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES is not set
+CONFIG_LWIP_TCP_OVERSIZE_MSS=y
+# CONFIG_LWIP_TCP_OVERSIZE_QUARTER_MSS is not set
+# CONFIG_LWIP_TCP_OVERSIZE_DISABLE is not set
+CONFIG_LWIP_TCP_RTO_TIME=3000
+# end of TCP
+
+#
+# UDP
+#
+CONFIG_LWIP_MAX_UDP_PCBS=16
+CONFIG_LWIP_UDP_RECVMBOX_SIZE=6
+# end of UDP
+
+CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=3072
+CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y
+# CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0 is not set
+CONFIG_LWIP_TCPIP_TASK_AFFINITY=0x7FFFFFFF
+# CONFIG_LWIP_PPP_SUPPORT is not set
+# CONFIG_LWIP_SLIP_SUPPORT is not set
+
+#
+# ICMP
+#
+# CONFIG_LWIP_MULTICAST_PING is not set
+# CONFIG_LWIP_BROADCAST_PING is not set
+# end of ICMP
+
+#
+# LWIP RAW API
+#
+CONFIG_LWIP_MAX_RAW_PCBS=16
+# end of LWIP RAW API
+
+#
+# SNTP
+#
+CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
+CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
+# end of SNTP
+
+CONFIG_LWIP_ESP_LWIP_ASSERT=y
+
+#
+# Debug
+#
+# CONFIG_LWIP_NETIF_DEBUG is not set
+# CONFIG_LWIP_PBUF_DEBUG is not set
+# CONFIG_LWIP_ETHARP_DEBUG is not set
+# CONFIG_LWIP_API_LIB_DEBUG is not set
+# CONFIG_LWIP_SOCKETS_DEBUG is not set
+# CONFIG_LWIP_IP_DEBUG is not set
+# CONFIG_LWIP_ICMP_DEBUG is not set
+# CONFIG_LWIP_IP6_DEBUG is not set
+# CONFIG_LWIP_ICMP6_DEBUG is not set
+# end of Debug
+# end of LWIP
+
+#
+# mbedTLS
+#
+CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=y
+# CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC is not set
+# CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC is not set
+CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y
+CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=16384
+CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=4096
+# CONFIG_MBEDTLS_DYNAMIC_BUFFER is not set
+# CONFIG_MBEDTLS_DEBUG is not set
+
+#
+# Certificate Bundle
+#
+CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=y
+CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL=y
+# CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN is not set
+# CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_NONE is not set
+# CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE is not set
+# end of Certificate Bundle
+
+# CONFIG_MBEDTLS_ECP_RESTARTABLE is not set
+# CONFIG_MBEDTLS_CMAC_C is not set
+CONFIG_MBEDTLS_HARDWARE_AES=y
+CONFIG_MBEDTLS_AES_USE_INTERRUPT=y
+CONFIG_MBEDTLS_HARDWARE_GCM=y
+CONFIG_MBEDTLS_HARDWARE_MPI=y
+CONFIG_MBEDTLS_HARDWARE_SHA=y
+# CONFIG_MBEDTLS_ATCA_HW_ECDSA_SIGN is not set
+# CONFIG_MBEDTLS_ATCA_HW_ECDSA_VERIFY is not set
+CONFIG_MBEDTLS_HAVE_TIME=y
+# CONFIG_MBEDTLS_HAVE_TIME_DATE is not set
+CONFIG_MBEDTLS_ECDSA_DETERMINISTIC=y
+CONFIG_MBEDTLS_SHA512_C=y
+CONFIG_MBEDTLS_TLS_SERVER_AND_CLIENT=y
+# CONFIG_MBEDTLS_TLS_SERVER_ONLY is not set
+# CONFIG_MBEDTLS_TLS_CLIENT_ONLY is not set
+# CONFIG_MBEDTLS_TLS_DISABLED is not set
+CONFIG_MBEDTLS_TLS_SERVER=y
+CONFIG_MBEDTLS_TLS_CLIENT=y
+CONFIG_MBEDTLS_TLS_ENABLED=y
+
+#
+# TLS Key Exchange Methods
+#
+CONFIG_MBEDTLS_PSK_MODES=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_PSK=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_PSK=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_RSA_PSK=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_RSA=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_ELLIPTIC_CURVE=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA=y
+# end of TLS Key Exchange Methods
+
+CONFIG_MBEDTLS_SSL_RENEGOTIATION=y
+# CONFIG_MBEDTLS_SSL_PROTO_SSL3 is not set
+# CONFIG_MBEDTLS_SSL_PROTO_TLS1 is not set
+# CONFIG_MBEDTLS_SSL_PROTO_TLS1_1 is not set
+CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y
+CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
+CONFIG_MBEDTLS_SSL_ALPN=y
+CONFIG_MBEDTLS_CLIENT_SSL_SESSION_TICKETS=y
+CONFIG_MBEDTLS_SERVER_SSL_SESSION_TICKETS=y
+
+#
+# Symmetric Ciphers
+#
+CONFIG_MBEDTLS_AES_C=y
+# CONFIG_MBEDTLS_CAMELLIA_C is not set
+# CONFIG_MBEDTLS_DES_C is not set
+CONFIG_MBEDTLS_RC4_DISABLED=y
+# CONFIG_MBEDTLS_RC4_ENABLED_NO_DEFAULT is not set
+# CONFIG_MBEDTLS_RC4_ENABLED is not set
+# CONFIG_MBEDTLS_BLOWFISH_C is not set
+# CONFIG_MBEDTLS_XTEA_C is not set
+CONFIG_MBEDTLS_CCM_C=y
+CONFIG_MBEDTLS_GCM_C=y
+# end of Symmetric Ciphers
+
+# CONFIG_MBEDTLS_RIPEMD160_C is not set
+
+#
+# Certificates
+#
+CONFIG_MBEDTLS_PEM_PARSE_C=y
+CONFIG_MBEDTLS_PEM_WRITE_C=y
+CONFIG_MBEDTLS_X509_CRL_PARSE_C=y
+CONFIG_MBEDTLS_X509_CSR_PARSE_C=y
+# end of Certificates
+
+CONFIG_MBEDTLS_ECP_C=y
+CONFIG_MBEDTLS_ECDH_C=y
+CONFIG_MBEDTLS_ECDSA_C=y
+# CONFIG_MBEDTLS_ECJPAKE_C is not set
+CONFIG_MBEDTLS_ECP_DP_SECP192R1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_SECP224R1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_SECP384R1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_SECP192K1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_SECP224K1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_SECP256K1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_BP256R1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_BP384R1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_CURVE25519_ENABLED=y
+CONFIG_MBEDTLS_ECP_NIST_OPTIM=y
+# CONFIG_MBEDTLS_POLY1305_C is not set
+# CONFIG_MBEDTLS_CHACHA20_C is not set
+# CONFIG_MBEDTLS_HKDF_C is not set
+# CONFIG_MBEDTLS_THREADING_C is not set
+# CONFIG_MBEDTLS_SECURITY_RISKS is not set
+# end of mbedTLS
+
+#
+# Newlib
+#
+CONFIG_NEWLIB_STDOUT_LINE_ENDING_CRLF=y
+# CONFIG_NEWLIB_STDOUT_LINE_ENDING_LF is not set
+# CONFIG_NEWLIB_STDOUT_LINE_ENDING_CR is not set
+# CONFIG_NEWLIB_STDIN_LINE_ENDING_CRLF is not set
+# CONFIG_NEWLIB_STDIN_LINE_ENDING_LF is not set
+CONFIG_NEWLIB_STDIN_LINE_ENDING_CR=y
+# CONFIG_NEWLIB_NANO_FORMAT is not set
+# end of Newlib
+
+#
+# NVS
+#
+# end of NVS
+
+#
+# PThreads
+#
+CONFIG_PTHREAD_TASK_PRIO_DEFAULT=5
+CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072
+CONFIG_PTHREAD_STACK_MIN=768
+CONFIG_PTHREAD_TASK_CORE_DEFAULT=-1
+CONFIG_PTHREAD_TASK_NAME_DEFAULT="pthread"
+# end of PThreads
+
+#
+# SPI Flash driver
+#
+# CONFIG_SPI_FLASH_VERIFY_WRITE is not set
+# CONFIG_SPI_FLASH_ENABLE_COUNTERS is not set
+CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y
+CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y
+# CONFIG_SPI_FLASH_DANGEROUS_WRITE_FAILS is not set
+# CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED is not set
+# CONFIG_SPI_FLASH_USE_LEGACY_IMPL is not set
+# CONFIG_SPI_FLASH_BYPASS_BLOCK_ERASE is not set
+CONFIG_SPI_FLASH_YIELD_DURING_ERASE=y
+CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=20
+CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=1
+CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=8192
+
+#
+# Auto-detect flash chips
+#
+CONFIG_SPI_FLASH_SUPPORT_ISSI_CHIP=y
+CONFIG_SPI_FLASH_SUPPORT_MXIC_CHIP=y
+CONFIG_SPI_FLASH_SUPPORT_GD_CHIP=y
+# end of Auto-detect flash chips
+# end of SPI Flash driver
+
+#
+# Virtual file system
+#
+CONFIG_VFS_SUPPORT_IO=y
+CONFIG_VFS_SUPPORT_DIR=y
+CONFIG_VFS_SUPPORT_SELECT=y
+CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT=y
+CONFIG_VFS_SUPPORT_TERMIOS=y
+
+#
+# Host File System I/O (Semihosting)
+#
+CONFIG_VFS_SEMIHOSTFS_MAX_MOUNT_POINTS=1
+CONFIG_VFS_SEMIHOSTFS_HOST_PATH_MAX_LEN=128
+# end of Host File System I/O (Semihosting)
+# end of Virtual file system
+
+#
+# Supplicant
+#
+CONFIG_WPA_MBEDTLS_CRYPTO=y
+# CONFIG_WPA_DEBUG_PRINT is not set
+# CONFIG_WPA_TESTING_OPTIONS is not set
+# CONFIG_WPA_WPS_WARS is not set
+# end of Supplicant
+# end of Component config
+
+#
+# Compatibility options
+#
+# CONFIG_LEGACY_INCLUDE_COMMON_HEADERS is not set
+# end of Compatibility options
+
+# Deprecated options for backward compatibility
+CONFIG_TOOLPREFIX="xtensa-esp32s2-elf-"
+# CONFIG_LOG_BOOTLOADER_LEVEL_NONE is not set
+# CONFIG_LOG_BOOTLOADER_LEVEL_ERROR is not set
+# CONFIG_LOG_BOOTLOADER_LEVEL_WARN is not set
+CONFIG_LOG_BOOTLOADER_LEVEL_INFO=y
+# CONFIG_LOG_BOOTLOADER_LEVEL_DEBUG is not set
+# CONFIG_LOG_BOOTLOADER_LEVEL_VERBOSE is not set
+CONFIG_LOG_BOOTLOADER_LEVEL=3
+# CONFIG_APP_ROLLBACK_ENABLE is not set
+# CONFIG_FLASH_ENCRYPTION_ENABLED is not set
+# CONFIG_FLASHMODE_QIO is not set
+# CONFIG_FLASHMODE_QOUT is not set
+CONFIG_FLASHMODE_DIO=y
+# CONFIG_FLASHMODE_DOUT is not set
+# CONFIG_MONITOR_BAUD_9600B is not set
+# CONFIG_MONITOR_BAUD_57600B is not set
+CONFIG_MONITOR_BAUD_115200B=y
+# CONFIG_MONITOR_BAUD_230400B is not set
+# CONFIG_MONITOR_BAUD_921600B is not set
+# CONFIG_MONITOR_BAUD_2MB is not set
+# CONFIG_MONITOR_BAUD_OTHER is not set
+CONFIG_MONITOR_BAUD_OTHER_VAL=115200
+CONFIG_MONITOR_BAUD=115200
+# CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set
+CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y
+# CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED is not set
+CONFIG_OPTIMIZATION_ASSERTIONS_SILENT=y
+# CONFIG_OPTIMIZATION_ASSERTIONS_DISABLED is not set
+# CONFIG_CXX_EXCEPTIONS is not set
+CONFIG_STACK_CHECK_NONE=y
+# CONFIG_STACK_CHECK_NORM is not set
+# CONFIG_STACK_CHECK_STRONG is not set
+# CONFIG_STACK_CHECK_ALL is not set
+# CONFIG_WARN_WRITE_STRINGS is not set
+# CONFIG_DISABLE_GCC8_WARNINGS is not set
+# CONFIG_ESP32_APPTRACE_DEST_TRAX is not set
+CONFIG_ESP32_APPTRACE_DEST_NONE=y
+CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y
+CONFIG_ADC2_DISABLE_DAC=y
+CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32
+CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2304
+CONFIG_MAIN_TASK_STACK_SIZE=8192
+CONFIG_IPC_TASK_STACK_SIZE=1024
+CONFIG_CONSOLE_UART_DEFAULT=y
+# CONFIG_CONSOLE_UART_CUSTOM is not set
+# CONFIG_ESP_CONSOLE_UART_NONE is not set
+CONFIG_CONSOLE_UART=y
+CONFIG_CONSOLE_UART_NUM=0
+CONFIG_CONSOLE_UART_BAUDRATE=115200
+CONFIG_INT_WDT=y
+CONFIG_INT_WDT_TIMEOUT_MS=300
+# CONFIG_TASK_WDT is not set
+# CONFIG_EVENT_LOOP_PROFILING is not set
+CONFIG_POST_EVENTS_FROM_ISR=y
+CONFIG_POST_EVENTS_FROM_IRAM_ISR=y
+CONFIG_ESP32S2_PANIC_PRINT_HALT=y
+# CONFIG_ESP32S2_PANIC_PRINT_REBOOT is not set
+# CONFIG_ESP32S2_PANIC_SILENT_REBOOT is not set
+# CONFIG_ESP32S2_PANIC_GDBSTUB is not set
+CONFIG_TIMER_TASK_STACK_SIZE=3584
+CONFIG_SUPPORT_STATIC_ALLOCATION=y
+# CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK is not set
+CONFIG_TIMER_TASK_PRIORITY=1
+CONFIG_TIMER_TASK_STACK_DEPTH=2048
+CONFIG_TIMER_QUEUE_LENGTH=10
+# CONFIG_L2_TO_L3_COPY is not set
+# CONFIG_USE_ONLY_LWIP_SELECT is not set
+CONFIG_ESP_GRATUITOUS_ARP=y
+CONFIG_GARP_TMR_INTERVAL=60
+CONFIG_TCPIP_RECVMBOX_SIZE=32
+CONFIG_TCP_MAXRTX=12
+CONFIG_TCP_SYNMAXRTX=6
+CONFIG_TCP_MSS=1440
+CONFIG_TCP_MSL=60000
+CONFIG_TCP_SND_BUF_DEFAULT=5744
+CONFIG_TCP_WND_DEFAULT=5744
+CONFIG_TCP_RECVMBOX_SIZE=6
+CONFIG_TCP_QUEUE_OOSEQ=y
+# CONFIG_ESP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES is not set
+CONFIG_TCP_OVERSIZE_MSS=y
+# CONFIG_TCP_OVERSIZE_QUARTER_MSS is not set
+# CONFIG_TCP_OVERSIZE_DISABLE is not set
+CONFIG_UDP_RECVMBOX_SIZE=6
+CONFIG_TCPIP_TASK_STACK_SIZE=3072
+CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y
+# CONFIG_TCPIP_TASK_AFFINITY_CPU0 is not set
+CONFIG_TCPIP_TASK_AFFINITY=0x7FFFFFFF
+# CONFIG_PPP_SUPPORT is not set
+CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5
+CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072
+CONFIG_ESP32_PTHREAD_STACK_MIN=768
+CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=-1
+CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread"
+CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ABORTS=y
+# CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_FAILS is not set
+# CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ALLOWED is not set
+CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y
+CONFIG_SUPPORT_TERMIOS=y
+CONFIG_SEMIHOSTFS_MAX_MOUNT_POINTS=1
+CONFIG_SEMIHOSTFS_HOST_PATH_MAX_LEN=128
+# End of deprecated options
diff --git a/ports/esp32s2/partitions-16MB.csv b/ports/esp32s2/partitions-16MB.csv
deleted file mode 100644
index 13ea81bea..000000000
--- a/ports/esp32s2/partitions-16MB.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-# ESP-IDF Partition Table
-# Name,   Type, SubType, Offset,  Size, Flags
-# bootloader.bin,,          0x1000, 32K
-# partition table,,         0x8000, 4K
-nvs,      data, nvs,      0x9000,  20K,
-otadata,  data, ota,      0xe000,  8K,
-ota_0,    0,    ota_0,   0x10000,  2048K,
-ota_1,    0,    ota_1,  0x210000,  2048K,
-uf2,      app,  factory,0x410000,  256K,
-user_fs,  data, fat,    0x450000,  11968K,
diff --git a/ports/esp32s2/partitions-4MB.csv b/ports/esp32s2/partitions-4MB.csv
deleted file mode 100644
index cf9b3cca8..000000000
--- a/ports/esp32s2/partitions-4MB.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-# ESP-IDF Partition Table
-# Name,   Type, SubType, Offset,  Size, Flags
-# bootloader.bin,,          0x1000, 32K
-# partition table,,         0x8000, 4K
-nvs,      data, nvs,      0x9000,  20K,
-otadata,  data, ota,      0xe000,  8K,
-ota_0,    0,    ota_0,   0x10000,  1408K,
-ota_1,    0,    ota_1,  0x170000,  1408K,
-uf2,      app,  factory,0x2d0000,  256K,
-user_fs,  data, fat,    0x310000,  960K,
diff --git a/ports/esp32s2/partitions-8MB.csv b/ports/esp32s2/partitions-8MB.csv
deleted file mode 100644
index f4ba9b60a..000000000
--- a/ports/esp32s2/partitions-8MB.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-# ESP-IDF Partition Table
-# Name,   Type, SubType, Offset,  Size, Flags
-# bootloader.bin,,          0x1000, 32K
-# partition table,,         0x8000, 4K
-nvs,      data, nvs,      0x9000,  20K,
-otadata,  data, ota,      0xe000,  8K,
-ota_0,    0,    ota_0,   0x10000,  2048K,
-ota_1,    0,    ota_1,  0x210000,  2048K,
-uf2,      app,  factory,0x410000,  256K,
-user_fs,  data, fat,    0x450000,  3776K,
diff --git a/ports/esp32s2/sdkconfig-16MB.defaults b/ports/esp32s2/sdkconfig-16MB.defaults
deleted file mode 100644
index af477999b..000000000
--- a/ports/esp32s2/sdkconfig-16MB.defaults
+++ /dev/null
@@ -1,10 +0,0 @@
-
-# CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
-# CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set
-# CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set
-# CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
-CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
-CONFIG_ESPTOOLPY_FLASHSIZE="16MB"
-
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-16MB.csv"
-CONFIG_PARTITION_TABLE_FILENAME="partitions-16MB.csv"
diff --git a/ports/esp32s2/sdkconfig-4MB.defaults b/ports/esp32s2/sdkconfig-4MB.defaults
deleted file mode 100644
index 561f971c3..000000000
--- a/ports/esp32s2/sdkconfig-4MB.defaults
+++ /dev/null
@@ -1,10 +0,0 @@
-
-# CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
-# CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
-# CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
-# CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set
-CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
-
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MB.csv"
-CONFIG_PARTITION_TABLE_FILENAME="partitions-4MB.csv"
diff --git a/ports/esp32s2/sdkconfig-8MB.defaults b/ports/esp32s2/sdkconfig-8MB.defaults
deleted file mode 100644
index fcff17f46..000000000
--- a/ports/esp32s2/sdkconfig-8MB.defaults
+++ /dev/null
@@ -1,10 +0,0 @@
-
-# CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
-# CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set
-# CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set
-CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
-# CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set
-CONFIG_ESPTOOLPY_FLASHSIZE="8MB"
-
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-8MB.csv"
-CONFIG_PARTITION_TABLE_FILENAME="partitions-8MB.csv"
diff --git a/ports/esp32s2/sdkconfig.defaults b/ports/esp32s2/sdkconfig.defaults
deleted file mode 100644
index 4094367e0..000000000
--- a/ports/esp32s2/sdkconfig.defaults
+++ /dev/null
@@ -1,853 +0,0 @@
-#
-# Automatically generated file. DO NOT EDIT.
-# Espressif IoT Development Framework (ESP-IDF) Project Configuration
-#
-CONFIG_IDF_CMAKE=y
-CONFIG_IDF_TARGET="esp32s2"
-CONFIG_IDF_TARGET_ESP32S2=y
-CONFIG_IDF_FIRMWARE_CHIP_ID=0x0002
-
-#
-# SDK tool configuration
-#
-CONFIG_SDK_TOOLPREFIX="xtensa-esp32s2-elf-"
-# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
-# end of SDK tool configuration
-
-#
-# Build type
-#
-CONFIG_APP_BUILD_TYPE_APP_2NDBOOT=y
-# CONFIG_APP_BUILD_TYPE_ELF_RAM is not set
-CONFIG_APP_BUILD_GENERATE_BINARIES=y
-CONFIG_APP_BUILD_BOOTLOADER=y
-CONFIG_APP_BUILD_USE_FLASH_SECTIONS=y
-# end of Build type
-
-#
-# Application manager
-#
-CONFIG_APP_COMPILE_TIME_DATE=y
-# CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set
-# CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set
-# CONFIG_APP_PROJECT_VER_FROM_CONFIG is not set
-CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16
-# end of Application manager
-
-#
-# Bootloader config
-#
-CONFIG_BOOTLOADER_OFFSET_IN_FLASH=0x1000
-CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
-# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_DEBUG is not set
-# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_PERF is not set
-# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_NONE is not set
-# CONFIG_BOOTLOADER_LOG_LEVEL_NONE is not set
-# CONFIG_BOOTLOADER_LOG_LEVEL_ERROR is not set
-# CONFIG_BOOTLOADER_LOG_LEVEL_WARN is not set
-CONFIG_BOOTLOADER_LOG_LEVEL_INFO=y
-# CONFIG_BOOTLOADER_LOG_LEVEL_DEBUG is not set
-# CONFIG_BOOTLOADER_LOG_LEVEL_VERBOSE is not set
-CONFIG_BOOTLOADER_LOG_LEVEL=3
-# CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_8V is not set
-CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y
-# CONFIG_BOOTLOADER_FACTORY_RESET is not set
-# CONFIG_BOOTLOADER_APP_TEST is not set
-CONFIG_BOOTLOADER_WDT_ENABLE=y
-# CONFIG_BOOTLOADER_WDT_DISABLE_IN_USER_CODE is not set
-CONFIG_BOOTLOADER_WDT_TIME_MS=9000
-# CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE is not set
-# CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP is not set
-CONFIG_BOOTLOADER_RESERVE_RTC_SIZE=0
-# CONFIG_BOOTLOADER_CUSTOM_RESERVE_RTC is not set
-# end of Bootloader config
-
-#
-# Security features
-#
-CONFIG_SECURE_TARGET_HAS_SECURE_ROM_DL_MODE=y
-# CONFIG_SECURE_SIGNED_APPS_NO_SECURE_BOOT is not set
-# CONFIG_SECURE_BOOT is not set
-# CONFIG_SECURE_FLASH_ENC_ENABLED is not set
-# CONFIG_SECURE_DISABLE_ROM_DL_MODE is not set
-# CONFIG_SECURE_ENABLE_SECURE_ROM_DL_MODE is not set
-# end of Security features
-
-#
-# Serial flasher config
-#
-CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200
-CONFIG_ESPTOOLPY_WITH_STUB=y
-# CONFIG_ESPTOOLPY_FLASHMODE_QIO is not set
-# CONFIG_ESPTOOLPY_FLASHMODE_QOUT is not set
-CONFIG_ESPTOOLPY_FLASHMODE_DIO=y
-# CONFIG_ESPTOOLPY_FLASHMODE_DOUT is not set
-CONFIG_ESPTOOLPY_FLASHMODE="dio"
-# CONFIG_ESPTOOLPY_FLASHFREQ_80M is not set
-CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
-# CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set
-# CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set
-CONFIG_ESPTOOLPY_FLASHFREQ="40m"
-CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
-CONFIG_ESPTOOLPY_BEFORE_RESET=y
-# CONFIG_ESPTOOLPY_BEFORE_NORESET is not set
-CONFIG_ESPTOOLPY_BEFORE="default_reset"
-CONFIG_ESPTOOLPY_AFTER_RESET=y
-# CONFIG_ESPTOOLPY_AFTER_NORESET is not set
-CONFIG_ESPTOOLPY_AFTER="hard_reset"
-# CONFIG_ESPTOOLPY_MONITOR_BAUD_CONSOLE is not set
-# CONFIG_ESPTOOLPY_MONITOR_BAUD_9600B is not set
-# CONFIG_ESPTOOLPY_MONITOR_BAUD_57600B is not set
-CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
-# CONFIG_ESPTOOLPY_MONITOR_BAUD_230400B is not set
-# CONFIG_ESPTOOLPY_MONITOR_BAUD_921600B is not set
-# CONFIG_ESPTOOLPY_MONITOR_BAUD_2MB is not set
-# CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER is not set
-CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER_VAL=115200
-CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
-# end of Serial flasher config
-
-#
-# Partition Table
-#
-# CONFIG_PARTITION_TABLE_SINGLE_APP is not set
-# CONFIG_PARTITION_TABLE_TWO_OTA is not set
-CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_OFFSET=0x8000
-CONFIG_PARTITION_TABLE_MD5=y
-# end of Partition Table
-
-#
-# Compiler options
-#
-# CONFIG_COMPILER_OPTIMIZATION_DEFAULT is not set
-CONFIG_COMPILER_OPTIMIZATION_SIZE=y
-# CONFIG_COMPILER_OPTIMIZATION_PERF is not set
-# CONFIG_COMPILER_OPTIMIZATION_NONE is not set
-# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE is not set
-CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
-# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE is not set
-# CONFIG_COMPILER_CXX_EXCEPTIONS is not set
-# CONFIG_COMPILER_CXX_RTTI is not set
-CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y
-# CONFIG_COMPILER_STACK_CHECK_MODE_NORM is not set
-# CONFIG_COMPILER_STACK_CHECK_MODE_STRONG is not set
-# CONFIG_COMPILER_STACK_CHECK_MODE_ALL is not set
-# CONFIG_COMPILER_WARN_WRITE_STRINGS is not set
-# CONFIG_COMPILER_DISABLE_GCC8_WARNINGS is not set
-# end of Compiler options
-
-#
-# Component config
-#
-
-#
-# Application Level Tracing
-#
-# CONFIG_APPTRACE_DEST_TRAX is not set
-CONFIG_APPTRACE_DEST_NONE=y
-CONFIG_APPTRACE_LOCK_ENABLE=y
-# end of Application Level Tracing
-
-#
-# Driver configurations
-#
-
-#
-# ADC configuration
-#
-# CONFIG_ADC_FORCE_XPD_FSM is not set
-CONFIG_ADC_DISABLE_DAC=y
-# end of ADC configuration
-
-#
-# SPI configuration
-#
-# CONFIG_SPI_MASTER_IN_IRAM is not set
-CONFIG_SPI_MASTER_ISR_IN_IRAM=y
-# CONFIG_SPI_SLAVE_IN_IRAM is not set
-CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
-# end of SPI configuration
-
-#
-# UART configuration
-#
-# CONFIG_UART_ISR_IN_IRAM is not set
-# end of UART configuration
-# end of Driver configurations
-
-#
-# eFuse Bit Manager
-#
-# CONFIG_EFUSE_CUSTOM_TABLE is not set
-# CONFIG_EFUSE_VIRTUAL is not set
-CONFIG_EFUSE_MAX_BLK_LEN=256
-# end of eFuse Bit Manager
-
-#
-# ESP-TLS
-#
-CONFIG_ESP_TLS_USING_MBEDTLS=y
-CONFIG_ESP_TLS_SERVER=y
-# CONFIG_ESP_TLS_PSK_VERIFICATION is not set
-# end of ESP-TLS
-
-#
-# ESP32S2-specific
-#
-# CONFIG_ESP32S2_DEFAULT_CPU_FREQ_80 is not set
-# CONFIG_ESP32S2_DEFAULT_CPU_FREQ_160 is not set
-CONFIG_ESP32S2_DEFAULT_CPU_FREQ_240=y
-CONFIG_ESP32S2_DEFAULT_CPU_FREQ_MHZ=240
-
-#
-# Memory protection
-#
-# CONFIG_ESP32S2_MEMPROT_FEATURE is not set
-# end of Memory protection
-
-#
-# Cache config
-#
-# CONFIG_ESP32S2_INSTRUCTION_CACHE_8KB is not set
-CONFIG_ESP32S2_INSTRUCTION_CACHE_16KB=y
-# CONFIG_ESP32S2_INSTRUCTION_CACHE_LINE_16B is not set
-CONFIG_ESP32S2_INSTRUCTION_CACHE_LINE_32B=y
-# CONFIG_ESP32S2_DATA_CACHE_0KB is not set
-# CONFIG_ESP32S2_DATA_CACHE_8KB is not set
-CONFIG_ESP32S2_DATA_CACHE_16KB=y
-# CONFIG_ESP32S2_DATA_CACHE_LINE_16B is not set
-CONFIG_ESP32S2_DATA_CACHE_LINE_32B=y
-# CONFIG_ESP32S2_INSTRUCTION_CACHE_WRAP is not set
-# CONFIG_ESP32S2_DATA_CACHE_WRAP is not set
-# end of Cache config
-
-# CONFIG_ESP32S2_SPIRAM_SUPPORT is not set
-# CONFIG_ESP32S2_TRAX is not set
-CONFIG_ESP32S2_TRACEMEM_RESERVE_DRAM=0x0
-# CONFIG_ESP32S2_UNIVERSAL_MAC_ADDRESSES_ONE is not set
-CONFIG_ESP32S2_UNIVERSAL_MAC_ADDRESSES_TWO=y
-CONFIG_ESP32S2_UNIVERSAL_MAC_ADDRESSES=2
-# CONFIG_ESP32S2_ULP_COPROC_ENABLED is not set
-CONFIG_ESP32S2_ULP_COPROC_RESERVE_MEM=0
-CONFIG_ESP32S2_DEBUG_OCDAWARE=y
-# CONFIG_ESP32S2_DEBUG_STUBS_ENABLE is not set
-CONFIG_ESP32S2_BROWNOUT_DET=y
-CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_7=y
-# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_6 is not set
-# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_5 is not set
-# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_4 is not set
-# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_3 is not set
-# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_2 is not set
-# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_1 is not set
-CONFIG_ESP32S2_BROWNOUT_DET_LVL=7
-CONFIG_ESP32S2_TIME_SYSCALL_USE_RTC_FRC1=y
-# CONFIG_ESP32S2_TIME_SYSCALL_USE_RTC is not set
-# CONFIG_ESP32S2_TIME_SYSCALL_USE_FRC1 is not set
-# CONFIG_ESP32S2_TIME_SYSCALL_USE_NONE is not set
-CONFIG_ESP32S2_RTC_CLK_SRC_INT_RC=y
-# CONFIG_ESP32S2_RTC_CLK_SRC_EXT_CRYS is not set
-# CONFIG_ESP32S2_RTC_CLK_SRC_EXT_OSC is not set
-# CONFIG_ESP32S2_RTC_CLK_SRC_INT_8MD256 is not set
-CONFIG_ESP32S2_RTC_CLK_CAL_CYCLES=576
-# CONFIG_ESP32S2_NO_BLOBS is not set
-# CONFIG_ESP32S2_KEEP_USB_ALIVE is not set
-# CONFIG_ESP32S2_RTCDATA_IN_FAST_MEM is not set
-# CONFIG_ESP32S2_USE_FIXED_STATIC_RAM_SIZE is not set
-CONFIG_ESP32S2_ALLOW_RTC_FAST_MEM_AS_HEAP=y
-# end of ESP32S2-specific
-
-#
-# Power Management
-#
-# CONFIG_PM_ENABLE is not set
-# end of Power Management
-
-#
-# Common ESP-related
-#
-CONFIG_ESP_ERR_TO_NAME_LOOKUP=y
-CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32
-CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2304
-CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192
-CONFIG_ESP_IPC_TASK_STACK_SIZE=1024
-CONFIG_ESP_MINIMAL_SHARED_STACK_SIZE=2048
-CONFIG_ESP_CONSOLE_UART_DEFAULT=y
-# CONFIG_ESP_CONSOLE_USB_CDC is not set
-# CONFIG_ESP_CONSOLE_UART_CUSTOM is not set
-# CONFIG_ESP_CONSOLE_NONE is not set
-CONFIG_ESP_CONSOLE_UART=y
-CONFIG_ESP_CONSOLE_UART_NUM=0
-CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
-CONFIG_ESP_INT_WDT=y
-CONFIG_ESP_INT_WDT_TIMEOUT_MS=300
-# CONFIG_ESP_TASK_WDT is not set
-# CONFIG_ESP_PANIC_HANDLER_IRAM is not set
-CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_STA=y
-CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_AP=y
-# end of Common ESP-related
-
-#
-# Ethernet
-#
-# CONFIG_ETH_USE_SPI_ETHERNET is not set
-# CONFIG_ETH_USE_OPENETH is not set
-# end of Ethernet
-
-#
-# Event Loop Library
-#
-# CONFIG_ESP_EVENT_LOOP_PROFILING is not set
-CONFIG_ESP_EVENT_POST_FROM_ISR=y
-CONFIG_ESP_EVENT_POST_FROM_IRAM_ISR=y
-# end of Event Loop Library
-
-#
-# ESP NETIF Adapter
-#
-CONFIG_ESP_NETIF_IP_LOST_TIMER_INTERVAL=120
-CONFIG_ESP_NETIF_TCPIP_LWIP=y
-# CONFIG_ESP_NETIF_LOOPBACK is not set
-# CONFIG_ESP_NETIF_TCPIP_ADAPTER_COMPATIBLE_LAYER is not set
-# end of ESP NETIF Adapter
-
-#
-# ESP System Settings
-#
-CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
-# CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT is not set
-# CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
-# CONFIG_ESP_SYSTEM_PANIC_GDBSTUB is not set
-CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE=y
-# end of ESP System Settings
-
-#
-# High resolution timer (esp_timer)
-#
-# CONFIG_ESP_TIMER_PROFILING is not set
-CONFIG_ESP_TIMER_TASK_STACK_SIZE=3584
-CONFIG_ESP_TIMER_IMPL_SYSTIMER=y
-# end of High resolution timer (esp_timer)
-
-#
-# Wi-Fi
-#
-CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=10
-CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32
-# CONFIG_ESP32_WIFI_STATIC_TX_BUFFER is not set
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y
-CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=1
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=32
-# CONFIG_ESP32_WIFI_CSI_ENABLED is not set
-CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP32_WIFI_TX_BA_WIN=6
-CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP32_WIFI_RX_BA_WIN=6
-# CONFIG_ESP32_WIFI_NVS_ENABLED is not set
-CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752
-CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32
-# CONFIG_ESP32_WIFI_DEBUG_LOG_ENABLE is not set
-CONFIG_ESP32_WIFI_IRAM_OPT=y
-CONFIG_ESP32_WIFI_RX_IRAM_OPT=y
-# CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE is not set
-# end of Wi-Fi
-
-#
-# PHY
-#
-# CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION is not set
-CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20
-CONFIG_ESP32_PHY_MAX_TX_POWER=20
-# end of PHY
-
-#
-# Core dump
-#
-# CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set
-# CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set
-CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y
-# end of Core dump
-
-#
-# FreeRTOS
-#
-CONFIG_FREERTOS_UNICORE=y
-CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF
-CONFIG_FREERTOS_CORETIMER_0=y
-# CONFIG_FREERTOS_CORETIMER_1 is not set
-CONFIG_FREERTOS_OPTIMIZED_SCHEDULER=y
-CONFIG_FREERTOS_HZ=100
-CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=y
-# CONFIG_FREERTOS_CHECK_STACKOVERFLOW_NONE is not set
-# CONFIG_FREERTOS_CHECK_STACKOVERFLOW_PTRVAL is not set
-CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY=y
-# CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK is not set
-CONFIG_FREERTOS_INTERRUPT_BACKTRACE=y
-CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=1
-CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y
-# CONFIG_FREERTOS_ASSERT_FAIL_PRINT_CONTINUE is not set
-# CONFIG_FREERTOS_ASSERT_DISABLE is not set
-CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1536
-CONFIG_FREERTOS_ISR_STACKSIZE=1536
-# CONFIG_FREERTOS_LEGACY_HOOKS is not set
-CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16
-CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
-# CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set
-CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1
-CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2048
-CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10
-CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0
-# CONFIG_FREERTOS_USE_TRACE_FACILITY is not set
-# CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS is not set
-CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y
-# CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE is not set
-CONFIG_FREERTOS_DEBUG_OCDAWARE=y
-# end of FreeRTOS
-
-#
-# Heap memory debugging
-#
-CONFIG_HEAP_POISONING_DISABLED=y
-# CONFIG_HEAP_POISONING_LIGHT is not set
-# CONFIG_HEAP_POISONING_COMPREHENSIVE is not set
-CONFIG_HEAP_TRACING_OFF=y
-# CONFIG_HEAP_TRACING_STANDALONE is not set
-# CONFIG_HEAP_TRACING_TOHOST is not set
-# CONFIG_HEAP_ABORT_WHEN_ALLOCATION_FAILS is not set
-# end of Heap memory debugging
-
-#
-# Log output
-#
-# CONFIG_LOG_DEFAULT_LEVEL_NONE is not set
-# CONFIG_LOG_DEFAULT_LEVEL_ERROR is not set
-# CONFIG_LOG_DEFAULT_LEVEL_WARN is not set
-CONFIG_LOG_DEFAULT_LEVEL_INFO=y
-# CONFIG_LOG_DEFAULT_LEVEL_DEBUG is not set
-# CONFIG_LOG_DEFAULT_LEVEL_VERBOSE is not set
-CONFIG_LOG_DEFAULT_LEVEL=3
-CONFIG_LOG_COLORS=y
-CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y
-# CONFIG_LOG_TIMESTAMP_SOURCE_SYSTEM is not set
-# end of Log output
-
-#
-# LWIP
-#
-CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
-CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y
-# CONFIG_LWIP_L2_TO_L3_COPY is not set
-# CONFIG_LWIP_IRAM_OPTIMIZATION is not set
-CONFIG_LWIP_TIMERS_ONDEMAND=y
-CONFIG_LWIP_MAX_SOCKETS=10
-# CONFIG_LWIP_USE_ONLY_LWIP_SELECT is not set
-# CONFIG_LWIP_SO_LINGER is not set
-CONFIG_LWIP_SO_REUSE=y
-CONFIG_LWIP_SO_REUSE_RXTOALL=y
-CONFIG_LWIP_SO_RCVBUF=y
-# CONFIG_LWIP_NETBUF_RECVINFO is not set
-CONFIG_LWIP_IP4_FRAG=y
-CONFIG_LWIP_IP6_FRAG=y
-# CONFIG_LWIP_IP4_REASSEMBLY is not set
-# CONFIG_LWIP_IP6_REASSEMBLY is not set
-# CONFIG_LWIP_IP_FORWARD is not set
-# CONFIG_LWIP_STATS is not set
-# CONFIG_LWIP_ETHARP_TRUST_IP_MAC is not set
-CONFIG_LWIP_ESP_GRATUITOUS_ARP=y
-CONFIG_LWIP_GARP_TMR_INTERVAL=60
-CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32
-CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y
-# CONFIG_LWIP_DHCP_RESTORE_LAST_IP is not set
-
-#
-# DHCP server
-#
-CONFIG_LWIP_DHCPS_LEASE_UNIT=60
-CONFIG_LWIP_DHCPS_MAX_STATION_NUM=8
-# end of DHCP server
-
-# CONFIG_LWIP_AUTOIP is not set
-# CONFIG_LWIP_IPV6_AUTOCONFIG is not set
-CONFIG_LWIP_NETIF_LOOPBACK=y
-CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8
-
-#
-# TCP
-#
-CONFIG_LWIP_MAX_ACTIVE_TCP=16
-CONFIG_LWIP_MAX_LISTENING_TCP=16
-CONFIG_LWIP_TCP_MAXRTX=12
-CONFIG_LWIP_TCP_SYNMAXRTX=6
-CONFIG_LWIP_TCP_MSS=1440
-CONFIG_LWIP_TCP_TMR_INTERVAL=250
-CONFIG_LWIP_TCP_MSL=60000
-CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5744
-CONFIG_LWIP_TCP_WND_DEFAULT=5744
-CONFIG_LWIP_TCP_RECVMBOX_SIZE=6
-CONFIG_LWIP_TCP_QUEUE_OOSEQ=y
-# CONFIG_LWIP_TCP_SACK_OUT is not set
-# CONFIG_LWIP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES is not set
-CONFIG_LWIP_TCP_OVERSIZE_MSS=y
-# CONFIG_LWIP_TCP_OVERSIZE_QUARTER_MSS is not set
-# CONFIG_LWIP_TCP_OVERSIZE_DISABLE is not set
-CONFIG_LWIP_TCP_RTO_TIME=3000
-# end of TCP
-
-#
-# UDP
-#
-CONFIG_LWIP_MAX_UDP_PCBS=16
-CONFIG_LWIP_UDP_RECVMBOX_SIZE=6
-# end of UDP
-
-CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=3072
-CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y
-# CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0 is not set
-CONFIG_LWIP_TCPIP_TASK_AFFINITY=0x7FFFFFFF
-# CONFIG_LWIP_PPP_SUPPORT is not set
-# CONFIG_LWIP_SLIP_SUPPORT is not set
-
-#
-# ICMP
-#
-# CONFIG_LWIP_MULTICAST_PING is not set
-# CONFIG_LWIP_BROADCAST_PING is not set
-# end of ICMP
-
-#
-# LWIP RAW API
-#
-CONFIG_LWIP_MAX_RAW_PCBS=16
-# end of LWIP RAW API
-
-#
-# SNTP
-#
-CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
-CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
-# end of SNTP
-
-CONFIG_LWIP_ESP_LWIP_ASSERT=y
-
-#
-# Debug
-#
-# CONFIG_LWIP_NETIF_DEBUG is not set
-# CONFIG_LWIP_PBUF_DEBUG is not set
-# CONFIG_LWIP_ETHARP_DEBUG is not set
-# CONFIG_LWIP_API_LIB_DEBUG is not set
-# CONFIG_LWIP_SOCKETS_DEBUG is not set
-# CONFIG_LWIP_IP_DEBUG is not set
-# CONFIG_LWIP_ICMP_DEBUG is not set
-# CONFIG_LWIP_IP6_DEBUG is not set
-# CONFIG_LWIP_ICMP6_DEBUG is not set
-# end of Debug
-# end of LWIP
-
-#
-# mbedTLS
-#
-CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=y
-# CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC is not set
-# CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC is not set
-CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y
-CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=16384
-CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=4096
-# CONFIG_MBEDTLS_DYNAMIC_BUFFER is not set
-# CONFIG_MBEDTLS_DEBUG is not set
-
-#
-# Certificate Bundle
-#
-CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=y
-CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL=y
-# CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN is not set
-# CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_NONE is not set
-# CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE is not set
-# end of Certificate Bundle
-
-# CONFIG_MBEDTLS_ECP_RESTARTABLE is not set
-# CONFIG_MBEDTLS_CMAC_C is not set
-CONFIG_MBEDTLS_HARDWARE_AES=y
-CONFIG_MBEDTLS_AES_USE_INTERRUPT=y
-CONFIG_MBEDTLS_HARDWARE_GCM=y
-CONFIG_MBEDTLS_HARDWARE_MPI=y
-CONFIG_MBEDTLS_HARDWARE_SHA=y
-# CONFIG_MBEDTLS_ATCA_HW_ECDSA_SIGN is not set
-# CONFIG_MBEDTLS_ATCA_HW_ECDSA_VERIFY is not set
-CONFIG_MBEDTLS_HAVE_TIME=y
-# CONFIG_MBEDTLS_HAVE_TIME_DATE is not set
-CONFIG_MBEDTLS_ECDSA_DETERMINISTIC=y
-CONFIG_MBEDTLS_SHA512_C=y
-CONFIG_MBEDTLS_TLS_SERVER_AND_CLIENT=y
-# CONFIG_MBEDTLS_TLS_SERVER_ONLY is not set
-# CONFIG_MBEDTLS_TLS_CLIENT_ONLY is not set
-# CONFIG_MBEDTLS_TLS_DISABLED is not set
-CONFIG_MBEDTLS_TLS_SERVER=y
-CONFIG_MBEDTLS_TLS_CLIENT=y
-CONFIG_MBEDTLS_TLS_ENABLED=y
-
-#
-# TLS Key Exchange Methods
-#
-CONFIG_MBEDTLS_PSK_MODES=y
-CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
-CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_PSK=y
-CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_PSK=y
-CONFIG_MBEDTLS_KEY_EXCHANGE_RSA_PSK=y
-CONFIG_MBEDTLS_KEY_EXCHANGE_RSA=y
-CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA=y
-CONFIG_MBEDTLS_KEY_EXCHANGE_ELLIPTIC_CURVE=y
-CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA=y
-CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA=y
-CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA=y
-CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA=y
-# end of TLS Key Exchange Methods
-
-CONFIG_MBEDTLS_SSL_RENEGOTIATION=y
-# CONFIG_MBEDTLS_SSL_PROTO_SSL3 is not set
-# CONFIG_MBEDTLS_SSL_PROTO_TLS1 is not set
-# CONFIG_MBEDTLS_SSL_PROTO_TLS1_1 is not set
-CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y
-CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
-CONFIG_MBEDTLS_SSL_ALPN=y
-CONFIG_MBEDTLS_CLIENT_SSL_SESSION_TICKETS=y
-CONFIG_MBEDTLS_SERVER_SSL_SESSION_TICKETS=y
-
-#
-# Symmetric Ciphers
-#
-CONFIG_MBEDTLS_AES_C=y
-# CONFIG_MBEDTLS_CAMELLIA_C is not set
-# CONFIG_MBEDTLS_DES_C is not set
-CONFIG_MBEDTLS_RC4_DISABLED=y
-# CONFIG_MBEDTLS_RC4_ENABLED_NO_DEFAULT is not set
-# CONFIG_MBEDTLS_RC4_ENABLED is not set
-# CONFIG_MBEDTLS_BLOWFISH_C is not set
-# CONFIG_MBEDTLS_XTEA_C is not set
-CONFIG_MBEDTLS_CCM_C=y
-CONFIG_MBEDTLS_GCM_C=y
-# end of Symmetric Ciphers
-
-# CONFIG_MBEDTLS_RIPEMD160_C is not set
-
-#
-# Certificates
-#
-CONFIG_MBEDTLS_PEM_PARSE_C=y
-CONFIG_MBEDTLS_PEM_WRITE_C=y
-CONFIG_MBEDTLS_X509_CRL_PARSE_C=y
-CONFIG_MBEDTLS_X509_CSR_PARSE_C=y
-# end of Certificates
-
-CONFIG_MBEDTLS_ECP_C=y
-CONFIG_MBEDTLS_ECDH_C=y
-CONFIG_MBEDTLS_ECDSA_C=y
-# CONFIG_MBEDTLS_ECJPAKE_C is not set
-CONFIG_MBEDTLS_ECP_DP_SECP192R1_ENABLED=y
-CONFIG_MBEDTLS_ECP_DP_SECP224R1_ENABLED=y
-CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED=y
-CONFIG_MBEDTLS_ECP_DP_SECP384R1_ENABLED=y
-CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED=y
-CONFIG_MBEDTLS_ECP_DP_SECP192K1_ENABLED=y
-CONFIG_MBEDTLS_ECP_DP_SECP224K1_ENABLED=y
-CONFIG_MBEDTLS_ECP_DP_SECP256K1_ENABLED=y
-CONFIG_MBEDTLS_ECP_DP_BP256R1_ENABLED=y
-CONFIG_MBEDTLS_ECP_DP_BP384R1_ENABLED=y
-CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED=y
-CONFIG_MBEDTLS_ECP_DP_CURVE25519_ENABLED=y
-CONFIG_MBEDTLS_ECP_NIST_OPTIM=y
-# CONFIG_MBEDTLS_POLY1305_C is not set
-# CONFIG_MBEDTLS_CHACHA20_C is not set
-# CONFIG_MBEDTLS_HKDF_C is not set
-# CONFIG_MBEDTLS_THREADING_C is not set
-# CONFIG_MBEDTLS_SECURITY_RISKS is not set
-# end of mbedTLS
-
-#
-# Newlib
-#
-CONFIG_NEWLIB_STDOUT_LINE_ENDING_CRLF=y
-# CONFIG_NEWLIB_STDOUT_LINE_ENDING_LF is not set
-# CONFIG_NEWLIB_STDOUT_LINE_ENDING_CR is not set
-# CONFIG_NEWLIB_STDIN_LINE_ENDING_CRLF is not set
-# CONFIG_NEWLIB_STDIN_LINE_ENDING_LF is not set
-CONFIG_NEWLIB_STDIN_LINE_ENDING_CR=y
-# CONFIG_NEWLIB_NANO_FORMAT is not set
-# end of Newlib
-
-#
-# NVS
-#
-# end of NVS
-
-#
-# PThreads
-#
-CONFIG_PTHREAD_TASK_PRIO_DEFAULT=5
-CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072
-CONFIG_PTHREAD_STACK_MIN=768
-CONFIG_PTHREAD_TASK_CORE_DEFAULT=-1
-CONFIG_PTHREAD_TASK_NAME_DEFAULT="pthread"
-# end of PThreads
-
-#
-# SPI Flash driver
-#
-# CONFIG_SPI_FLASH_VERIFY_WRITE is not set
-# CONFIG_SPI_FLASH_ENABLE_COUNTERS is not set
-CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y
-CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y
-# CONFIG_SPI_FLASH_DANGEROUS_WRITE_FAILS is not set
-# CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED is not set
-# CONFIG_SPI_FLASH_USE_LEGACY_IMPL is not set
-# CONFIG_SPI_FLASH_BYPASS_BLOCK_ERASE is not set
-CONFIG_SPI_FLASH_YIELD_DURING_ERASE=y
-CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=20
-CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=1
-CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=8192
-
-#
-# Auto-detect flash chips
-#
-CONFIG_SPI_FLASH_SUPPORT_ISSI_CHIP=y
-CONFIG_SPI_FLASH_SUPPORT_MXIC_CHIP=y
-CONFIG_SPI_FLASH_SUPPORT_GD_CHIP=y
-# end of Auto-detect flash chips
-# end of SPI Flash driver
-
-#
-# Virtual file system
-#
-CONFIG_VFS_SUPPORT_IO=y
-CONFIG_VFS_SUPPORT_DIR=y
-CONFIG_VFS_SUPPORT_SELECT=y
-CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT=y
-CONFIG_VFS_SUPPORT_TERMIOS=y
-
-#
-# Host File System I/O (Semihosting)
-#
-CONFIG_VFS_SEMIHOSTFS_MAX_MOUNT_POINTS=1
-CONFIG_VFS_SEMIHOSTFS_HOST_PATH_MAX_LEN=128
-# end of Host File System I/O (Semihosting)
-# end of Virtual file system
-
-#
-# Supplicant
-#
-CONFIG_WPA_MBEDTLS_CRYPTO=y
-# CONFIG_WPA_DEBUG_PRINT is not set
-# CONFIG_WPA_TESTING_OPTIONS is not set
-# CONFIG_WPA_WPS_WARS is not set
-# end of Supplicant
-# end of Component config
-
-#
-# Compatibility options
-#
-# CONFIG_LEGACY_INCLUDE_COMMON_HEADERS is not set
-# end of Compatibility options
-
-# Deprecated options for backward compatibility
-CONFIG_TOOLPREFIX="xtensa-esp32s2-elf-"
-# CONFIG_LOG_BOOTLOADER_LEVEL_NONE is not set
-# CONFIG_LOG_BOOTLOADER_LEVEL_ERROR is not set
-# CONFIG_LOG_BOOTLOADER_LEVEL_WARN is not set
-CONFIG_LOG_BOOTLOADER_LEVEL_INFO=y
-# CONFIG_LOG_BOOTLOADER_LEVEL_DEBUG is not set
-# CONFIG_LOG_BOOTLOADER_LEVEL_VERBOSE is not set
-CONFIG_LOG_BOOTLOADER_LEVEL=3
-# CONFIG_APP_ROLLBACK_ENABLE is not set
-# CONFIG_FLASH_ENCRYPTION_ENABLED is not set
-# CONFIG_FLASHMODE_QIO is not set
-# CONFIG_FLASHMODE_QOUT is not set
-CONFIG_FLASHMODE_DIO=y
-# CONFIG_FLASHMODE_DOUT is not set
-# CONFIG_MONITOR_BAUD_9600B is not set
-# CONFIG_MONITOR_BAUD_57600B is not set
-CONFIG_MONITOR_BAUD_115200B=y
-# CONFIG_MONITOR_BAUD_230400B is not set
-# CONFIG_MONITOR_BAUD_921600B is not set
-# CONFIG_MONITOR_BAUD_2MB is not set
-# CONFIG_MONITOR_BAUD_OTHER is not set
-CONFIG_MONITOR_BAUD_OTHER_VAL=115200
-CONFIG_MONITOR_BAUD=115200
-# CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set
-CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y
-# CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED is not set
-CONFIG_OPTIMIZATION_ASSERTIONS_SILENT=y
-# CONFIG_OPTIMIZATION_ASSERTIONS_DISABLED is not set
-# CONFIG_CXX_EXCEPTIONS is not set
-CONFIG_STACK_CHECK_NONE=y
-# CONFIG_STACK_CHECK_NORM is not set
-# CONFIG_STACK_CHECK_STRONG is not set
-# CONFIG_STACK_CHECK_ALL is not set
-# CONFIG_WARN_WRITE_STRINGS is not set
-# CONFIG_DISABLE_GCC8_WARNINGS is not set
-# CONFIG_ESP32_APPTRACE_DEST_TRAX is not set
-CONFIG_ESP32_APPTRACE_DEST_NONE=y
-CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y
-CONFIG_ADC2_DISABLE_DAC=y
-CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32
-CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2304
-CONFIG_MAIN_TASK_STACK_SIZE=8192
-CONFIG_IPC_TASK_STACK_SIZE=1024
-CONFIG_CONSOLE_UART_DEFAULT=y
-# CONFIG_CONSOLE_UART_CUSTOM is not set
-# CONFIG_ESP_CONSOLE_UART_NONE is not set
-CONFIG_CONSOLE_UART=y
-CONFIG_CONSOLE_UART_NUM=0
-CONFIG_CONSOLE_UART_BAUDRATE=115200
-CONFIG_INT_WDT=y
-CONFIG_INT_WDT_TIMEOUT_MS=300
-# CONFIG_TASK_WDT is not set
-# CONFIG_EVENT_LOOP_PROFILING is not set
-CONFIG_POST_EVENTS_FROM_ISR=y
-CONFIG_POST_EVENTS_FROM_IRAM_ISR=y
-CONFIG_ESP32S2_PANIC_PRINT_HALT=y
-# CONFIG_ESP32S2_PANIC_PRINT_REBOOT is not set
-# CONFIG_ESP32S2_PANIC_SILENT_REBOOT is not set
-# CONFIG_ESP32S2_PANIC_GDBSTUB is not set
-CONFIG_TIMER_TASK_STACK_SIZE=3584
-CONFIG_SUPPORT_STATIC_ALLOCATION=y
-# CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK is not set
-CONFIG_TIMER_TASK_PRIORITY=1
-CONFIG_TIMER_TASK_STACK_DEPTH=2048
-CONFIG_TIMER_QUEUE_LENGTH=10
-# CONFIG_L2_TO_L3_COPY is not set
-# CONFIG_USE_ONLY_LWIP_SELECT is not set
-CONFIG_ESP_GRATUITOUS_ARP=y
-CONFIG_GARP_TMR_INTERVAL=60
-CONFIG_TCPIP_RECVMBOX_SIZE=32
-CONFIG_TCP_MAXRTX=12
-CONFIG_TCP_SYNMAXRTX=6
-CONFIG_TCP_MSS=1440
-CONFIG_TCP_MSL=60000
-CONFIG_TCP_SND_BUF_DEFAULT=5744
-CONFIG_TCP_WND_DEFAULT=5744
-CONFIG_TCP_RECVMBOX_SIZE=6
-CONFIG_TCP_QUEUE_OOSEQ=y
-# CONFIG_ESP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES is not set
-CONFIG_TCP_OVERSIZE_MSS=y
-# CONFIG_TCP_OVERSIZE_QUARTER_MSS is not set
-# CONFIG_TCP_OVERSIZE_DISABLE is not set
-CONFIG_UDP_RECVMBOX_SIZE=6
-CONFIG_TCPIP_TASK_STACK_SIZE=3072
-CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y
-# CONFIG_TCPIP_TASK_AFFINITY_CPU0 is not set
-CONFIG_TCPIP_TASK_AFFINITY=0x7FFFFFFF
-# CONFIG_PPP_SUPPORT is not set
-CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5
-CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072
-CONFIG_ESP32_PTHREAD_STACK_MIN=768
-CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=-1
-CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread"
-CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ABORTS=y
-# CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_FAILS is not set
-# CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ALLOWED is not set
-CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y
-CONFIG_SUPPORT_TERMIOS=y
-CONFIG_SEMIHOSTFS_MAX_MOUNT_POINTS=1
-CONFIG_SEMIHOSTFS_HOST_PATH_MAX_LEN=128
-# End of deprecated options
diff --git a/tools/build_board_info.py b/tools/build_board_info.py
index 6ed8b8c16..f83282ea9 100644
--- a/tools/build_board_info.py
+++ b/tools/build_board_info.py
@@ -42,7 +42,7 @@ extension_by_port = {
     "cxd56": SPK,
     "mimxrt10xx": HEX_UF2,
     "litex": DFU,
-    "esp32s2": BIN
+    "esp32s2": BIN_UF2
 }
 
 # Per board overrides
-- 
cgit v1.2.3


From 04ffd0dca0db404028da8ef2eb43f82b6e1b24ab Mon Sep 17 00:00:00 2001
From: "Ryan T. Hamilton" <astrobokonon@gmail.com>
Date: Sat, 19 Sep 2020 13:38:04 -0700
Subject: Add gateway, subnet, and rssi info for current connected AP

ap_rssi is a bound method, which I'm not keen on, but it works
---
 ports/esp32s2/common-hal/wifi/Radio.c | 38 ++++++++++++++++++++++++++++++
 shared-bindings/wifi/Radio.c          | 44 +++++++++++++++++++++++++++++++++++
 shared-bindings/wifi/Radio.h          |  3 +++
 3 files changed, 85 insertions(+)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/common-hal/wifi/Radio.c b/ports/esp32s2/common-hal/wifi/Radio.c
index a0b8b6adc..4b2e7b64e 100644
--- a/ports/esp32s2/common-hal/wifi/Radio.c
+++ b/ports/esp32s2/common-hal/wifi/Radio.c
@@ -147,6 +147,44 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t
     return WIFI_RADIO_ERROR_NONE;
 }
 
+mp_obj_t common_hal_wifi_radio_get_ap_rssi(wifi_radio_obj_t *self) {
+    if (!esp_netif_is_netif_up(self->netif)) {
+        return mp_const_none;
+    }
+    // Make sure the interface is in STA mode
+    wifi_mode_t if_mode;
+    esp_wifi_get_mode(&if_mode);
+    if (if_mode != WIFI_MODE_STA){
+        return mp_const_none;
+    }
+
+    wifi_ap_record_t ap_info;
+    esp_wifi_sta_get_ap_info(&ap_info);
+
+    mp_obj_t rssi;
+    rssi = MP_OBJ_NEW_SMALL_INT(ap_info.rssi);
+
+    return rssi;
+}
+
+mp_obj_t common_hal_wifi_radio_get_ipv4_gateway(wifi_radio_obj_t *self) {
+    if (!esp_netif_is_netif_up(self->netif)) {
+        return mp_const_none;
+    }
+    esp_netif_ip_info_t ip_info;
+    esp_netif_get_ip_info(self->netif, &ip_info);
+    return common_hal_ipaddress_new_ipv4address(ip_info.gw.addr);
+}
+
+mp_obj_t common_hal_wifi_radio_get_ipv4_subnet(wifi_radio_obj_t *self) {
+    if (!esp_netif_is_netif_up(self->netif)) {
+        return mp_const_none;
+    }
+    esp_netif_ip_info_t ip_info;
+    esp_netif_get_ip_info(self->netif, &ip_info);
+    return common_hal_ipaddress_new_ipv4address(ip_info.netmask.addr);
+}
+
 mp_obj_t common_hal_wifi_radio_get_ipv4_address(wifi_radio_obj_t *self) {
     if (!esp_netif_is_netif_up(self->netif)) {
         return mp_const_none;
diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c
index 928f21da9..6f1935191 100644
--- a/shared-bindings/wifi/Radio.c
+++ b/shared-bindings/wifi/Radio.c
@@ -163,6 +163,47 @@ STATIC mp_obj_t wifi_radio_connect(size_t n_args, const mp_obj_t *pos_args, mp_m
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_connect_obj, 1, wifi_radio_connect);
 
+//|     ap_rssi: int
+//|     """RSSI of the currently connected AP. Returns none if not connected"""
+//|
+STATIC mp_obj_t wifi_radio_get_ap_rssi(mp_obj_t self) {
+    return common_hal_wifi_radio_get_ap_rssi(self);
+
+}
+MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ap_rssi_obj, wifi_radio_get_ap_rssi);
+
+//|     ipv4_gateway: Optional[ipaddress.IPv4Address]
+//|     """IP v4 Address of the gateway when connected to an access point. None otherwise."""
+//|
+STATIC mp_obj_t wifi_radio_get_ipv4_gateway(mp_obj_t self) {
+    return common_hal_wifi_radio_get_ipv4_gateway(self);
+
+}
+MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_gateway_obj, wifi_radio_get_ipv4_gateway);
+
+const mp_obj_property_t wifi_radio_ipv4_gateway_obj = {
+    .base.type = &mp_type_property,
+    .proxy = { (mp_obj_t)&wifi_radio_get_ipv4_gateway_obj,
+               (mp_obj_t)&mp_const_none_obj,
+               (mp_obj_t)&mp_const_none_obj },
+};
+
+//|     ipv4_subnet: Optional[ipaddress.IPv4Address]
+//|     """IP v4 Address of the subnet when connected to an access point. None otherwise."""
+//|
+STATIC mp_obj_t wifi_radio_get_ipv4_subnet(mp_obj_t self) {
+    return common_hal_wifi_radio_get_ipv4_subnet(self);
+
+}
+MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_subnet_obj, wifi_radio_get_ipv4_subnet);
+
+const mp_obj_property_t wifi_radio_ipv4_subnet_obj = {
+    .base.type = &mp_type_property,
+    .proxy = { (mp_obj_t)&wifi_radio_get_ipv4_subnet_obj,
+               (mp_obj_t)&mp_const_none_obj,
+               (mp_obj_t)&mp_const_none_obj },
+};
+
 //|     ipv4_address: Optional[ipaddress.IPv4Address]
 //|     """IP v4 Address of the radio when connected to an access point. None otherwise."""
 //|
@@ -219,6 +260,9 @@ STATIC const mp_rom_map_elem_t wifi_radio_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_connect),    MP_ROM_PTR(&wifi_radio_connect_obj) },
     // { MP_ROM_QSTR(MP_QSTR_connect_to_enterprise),    MP_ROM_PTR(&wifi_radio_connect_to_enterprise_obj) },
 
+    { MP_ROM_QSTR(MP_QSTR_ap_rssi),    MP_ROM_PTR(&wifi_radio_get_ap_rssi_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ipv4_gateway),    MP_ROM_PTR(&wifi_radio_ipv4_gateway_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ipv4_subnet),    MP_ROM_PTR(&wifi_radio_ipv4_subnet_obj) },
     { MP_ROM_QSTR(MP_QSTR_ipv4_address),    MP_ROM_PTR(&wifi_radio_ipv4_address_obj) },
 
     // { MP_ROM_QSTR(MP_QSTR_access_point_active),   MP_ROM_PTR(&wifi_radio_access_point_active_obj) },
diff --git a/shared-bindings/wifi/Radio.h b/shared-bindings/wifi/Radio.h
index b5341d51c..3c8ecbebd 100644
--- a/shared-bindings/wifi/Radio.h
+++ b/shared-bindings/wifi/Radio.h
@@ -53,6 +53,9 @@ extern void common_hal_wifi_radio_stop_scanning_networks(wifi_radio_obj_t *self)
 
 extern wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t* ssid, size_t ssid_len, uint8_t* password, size_t password_len, uint8_t channel, mp_float_t timeout, uint8_t* bssid, size_t bssid_len);
 
+extern mp_obj_t common_hal_wifi_radio_get_ap_rssi(wifi_radio_obj_t *self);
+extern mp_obj_t common_hal_wifi_radio_get_ipv4_gateway(wifi_radio_obj_t *self);
+extern mp_obj_t common_hal_wifi_radio_get_ipv4_subnet(wifi_radio_obj_t *self);
 extern mp_obj_t common_hal_wifi_radio_get_ipv4_address(wifi_radio_obj_t *self);
 
 extern mp_int_t common_hal_wifi_radio_ping(wifi_radio_obj_t *self, mp_obj_t ip_address, mp_float_t timeout);
-- 
cgit v1.2.3


From bc8863a3c788c7a44c164e35c71a7ec83cf29823 Mon Sep 17 00:00:00 2001
From: "Ryan T. Hamilton" <astrobokonon@gmail.com>
Date: Sat, 19 Sep 2020 21:04:07 -0700
Subject: Simplify now that I have it working

still need to figure out the bound method business
---
 ports/esp32s2/common-hal/wifi/Radio.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/common-hal/wifi/Radio.c b/ports/esp32s2/common-hal/wifi/Radio.c
index 4b2e7b64e..5bc69eab4 100644
--- a/ports/esp32s2/common-hal/wifi/Radio.c
+++ b/ports/esp32s2/common-hal/wifi/Radio.c
@@ -151,6 +151,7 @@ mp_obj_t common_hal_wifi_radio_get_ap_rssi(wifi_radio_obj_t *self) {
     if (!esp_netif_is_netif_up(self->netif)) {
         return mp_const_none;
     }
+
     // Make sure the interface is in STA mode
     wifi_mode_t if_mode;
     esp_wifi_get_mode(&if_mode);
@@ -161,10 +162,7 @@ mp_obj_t common_hal_wifi_radio_get_ap_rssi(wifi_radio_obj_t *self) {
     wifi_ap_record_t ap_info;
     esp_wifi_sta_get_ap_info(&ap_info);
 
-    mp_obj_t rssi;
-    rssi = MP_OBJ_NEW_SMALL_INT(ap_info.rssi);
-
-    return rssi;
+    return MP_OBJ_NEW_SMALL_INT(ap_info.rssi);
 }
 
 mp_obj_t common_hal_wifi_radio_get_ipv4_gateway(wifi_radio_obj_t *self) {
-- 
cgit v1.2.3


From 40ec7a66e424c37da7556bdea303a4e5da30985c Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Mon, 21 Sep 2020 14:39:31 +0530
Subject: Update microS2 config files

---
 .../boards/microdev_micro_s2/mpconfigboard.h        |  3 ++-
 .../boards/microdev_micro_s2/mpconfigboard.mk       |  1 +
 ports/esp32s2/boards/microdev_micro_s2/pins.c       | 21 ++++++++++++++++++++-
 3 files changed, 23 insertions(+), 2 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h b/ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
index 1a1ef7a6c..c138c8ed1 100644
--- a/ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
+++ b/ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
@@ -26,10 +26,11 @@
 
 //Micropython setup
 
-#define MICROPY_HW_BOARD_NAME       "microDev microS2"
+#define MICROPY_HW_BOARD_NAME       "microS2"
 #define MICROPY_HW_MCU_NAME         "ESP32S2"
 
 #define MICROPY_HW_LED (&pin_GPIO21)
+#define MICROPY_HW_BUTTON (&pin_GPIO0)
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO33)
 
 #define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
diff --git a/ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.mk b/ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.mk
index 783e7ad4c..515617095 100644
--- a/ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.mk
+++ b/ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.mk
@@ -2,6 +2,7 @@ USB_VID = 0x239A
 USB_PID = 0x80C6
 USB_PRODUCT = "microS2"
 USB_MANUFACTURER = "microDev"
+USB_DEVICES = "CDC,MSC,HID"
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
diff --git a/ports/esp32s2/boards/microdev_micro_s2/pins.c b/ports/esp32s2/boards/microdev_micro_s2/pins.c
index 25300b5c3..bd230ed38 100644
--- a/ports/esp32s2/boards/microdev_micro_s2/pins.c
+++ b/ports/esp32s2/boards/microdev_micro_s2/pins.c
@@ -42,8 +42,27 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
     { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
 
-    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO2) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO37) },
+
+    { MP_ROM_QSTR(MP_QSTR_MTCK), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_MTDO), MP_ROM_PTR(&pin_GPIO40) },
+    { MP_ROM_QSTR(MP_QSTR_MTDI), MP_ROM_PTR(&pin_GPIO41) },
+    { MP_ROM_QSTR(MP_QSTR_MTMS), MP_ROM_PTR(&pin_GPIO42) },
 
+    { MP_ROM_QSTR(MP_QSTR_DAC1), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_DAC2), MP_ROM_PTR(&pin_GPIO18) },
+
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },
     { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO33) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
+    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
-- 
cgit v1.2.3


From 22d9a94f2b880c57b7939e3e08a6fecd1ef59720 Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Mon, 21 Sep 2020 13:47:14 -0400
Subject: Use write_value, add missing pin exceptions

---
 ports/esp32s2/common-hal/busio/SPI.c | 49 ++++++++++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 5 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/common-hal/busio/SPI.c b/ports/esp32s2/common-hal/busio/SPI.c
index 350580ea8..6e4e34474 100644
--- a/ports/esp32s2/common-hal/busio/SPI.c
+++ b/ports/esp32s2/common-hal/busio/SPI.c
@@ -115,6 +115,16 @@ static void spi_bus_intr_disable(void *self)
 void common_hal_busio_spi_construct(busio_spi_obj_t *self,
         const mcu_pin_obj_t * clock, const mcu_pin_obj_t * mosi,
         const mcu_pin_obj_t * miso) {
+
+    //SCK is not optional. MOSI and MISO are
+    if (!clock) {
+        mp_raise_ValueError(translate("Must provide SCK pin"));
+    }
+
+    if (!miso && !mosi) {
+        mp_raise_ValueError(translate("Must provide MISO or MOSI pin"));
+    }
+
     spi_bus_config_t bus_config;
     bus_config.mosi_io_num = mosi != NULL ? mosi->number : -1;
     bus_config.miso_io_num = miso != NULL ? miso->number : -1;
@@ -212,8 +222,12 @@ void common_hal_busio_spi_never_reset(busio_spi_obj_t *self) {
     spi_never_reset[self->host_id] = true;
 
     common_hal_never_reset_pin(self->clock_pin);
-    common_hal_never_reset_pin(self->MOSI_pin);
-    common_hal_never_reset_pin(self->MISO_pin);
+    if (self->MOSI_pin != NULL) {
+        common_hal_never_reset_pin(self->MOSI_pin);
+    }
+    if (self->MISO_pin != NULL) {
+        common_hal_never_reset_pin(self->MISO_pin);
+    }
 }
 
 bool common_hal_busio_spi_deinited(busio_spi_obj_t *self) {
@@ -236,9 +250,15 @@ void common_hal_busio_spi_deinit(busio_spi_obj_t *self) {
     spi_bus_free(self->host_id);
 
     common_hal_reset_pin(self->clock_pin);
-    common_hal_reset_pin(self->MOSI_pin);
-    common_hal_reset_pin(self->MISO_pin);
+    if (self->MOSI_pin != NULL) {
+        common_hal_reset_pin(self->MOSI_pin);
+    }
+    if (self->MISO_pin != NULL) {
+        common_hal_reset_pin(self->MISO_pin);
+    }
     self->clock_pin = NULL;
+    self->MISO_pin = NULL;
+    self->MOSI_pin = NULL;
 }
 
 bool common_hal_busio_spi_configure(busio_spi_obj_t *self,
@@ -293,18 +313,37 @@ void common_hal_busio_spi_unlock(busio_spi_obj_t *self) {
 
 bool common_hal_busio_spi_write(busio_spi_obj_t *self,
         const uint8_t *data, size_t len) {
+    if (self->MOSI_pin == NULL) {
+        mp_raise_ValueError(translate("No MOSI Pin"));
+    }
     return common_hal_busio_spi_transfer(self, data, NULL, len);
 }
 
 bool common_hal_busio_spi_read(busio_spi_obj_t *self,
         uint8_t *data, size_t len, uint8_t write_value) {
-    return common_hal_busio_spi_transfer(self, NULL, data, len);
+
+    if (self->MISO_pin == NULL) {
+        mp_raise_ValueError(translate("No MISO Pin"));
+    }
+    if (self->MOSI_pin == NULL) {
+        return common_hal_busio_spi_transfer(self, NULL, data, len);
+    } else {
+        memset(data, write_value, len);
+        return common_hal_busio_spi_transfer(self, data, data, len);
+    }
 }
 
 bool common_hal_busio_spi_transfer(busio_spi_obj_t *self, const uint8_t *data_out, uint8_t *data_in, size_t len) {
     if (len == 0) {
         return true;
     }
+    // Other than the read special case, stop transfers that don't have a pin/array match
+    if (!self->MOSI_pin && (data_out != data_in)) {
+        mp_raise_ValueError(translate("No MOSI Pin"));
+    }
+    if (!self->MISO_pin && data_in) {
+        mp_raise_ValueError(translate("No MISO Pin"));
+    }
 
     spi_hal_context_t* hal = &self->hal_context;
     hal->send_buffer = NULL;
-- 
cgit v1.2.3


From 2fa269ccbc981c00eaf4f0bf6d7f5eaa52db4d08 Mon Sep 17 00:00:00 2001
From: "Ryan T. Hamilton" <astrobokonon@gmail.com>
Date: Mon, 21 Sep 2020 20:56:03 -0700
Subject: Additional error handling

---
 ports/esp32s2/common-hal/wifi/Radio.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/common-hal/wifi/Radio.c b/ports/esp32s2/common-hal/wifi/Radio.c
index 5bc69eab4..44f0fe2cf 100644
--- a/ports/esp32s2/common-hal/wifi/Radio.c
+++ b/ports/esp32s2/common-hal/wifi/Radio.c
@@ -160,9 +160,15 @@ mp_obj_t common_hal_wifi_radio_get_ap_rssi(wifi_radio_obj_t *self) {
     }
 
     wifi_ap_record_t ap_info;
-    esp_wifi_sta_get_ap_info(&ap_info);
-
-    return MP_OBJ_NEW_SMALL_INT(ap_info.rssi);
+    // From esp_wifi.h, the possible return values (typos theirs):
+    //    ESP_OK: succeed
+    //    ESP_ERR_WIFI_CONN: The station interface don't initialized
+    //    ESP_ERR_WIFI_NOT_CONNECT: The station is in disconnect status
+    if (esp_wifi_sta_get_ap_info(&ap_info) != ESP_OK){
+        return mp_const_none;
+    } else {
+        return mp_obj_new_int(ap_info.rssi);
+    }
 }
 
 mp_obj_t common_hal_wifi_radio_get_ipv4_gateway(wifi_radio_obj_t *self) {
-- 
cgit v1.2.3


From a77966a73640a8699d116e0f484199338c4477e9 Mon Sep 17 00:00:00 2001
From: "Ryan T. Hamilton" <astrobokonon@gmail.com>
Date: Mon, 21 Sep 2020 21:36:46 -0700
Subject: Try to reuse/share existing objects

---
 ports/esp32s2/common-hal/wifi/Radio.c | 24 +++++++++---------------
 ports/esp32s2/common-hal/wifi/Radio.h |  2 ++
 2 files changed, 11 insertions(+), 15 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/common-hal/wifi/Radio.c b/ports/esp32s2/common-hal/wifi/Radio.c
index 44f0fe2cf..ab6177859 100644
--- a/ports/esp32s2/common-hal/wifi/Radio.c
+++ b/ports/esp32s2/common-hal/wifi/Radio.c
@@ -153,21 +153,18 @@ mp_obj_t common_hal_wifi_radio_get_ap_rssi(wifi_radio_obj_t *self) {
     }
 
     // Make sure the interface is in STA mode
-    wifi_mode_t if_mode;
-    esp_wifi_get_mode(&if_mode);
-    if (if_mode != WIFI_MODE_STA){
+    if (self->sta_mode){
         return mp_const_none;
     }
 
-    wifi_ap_record_t ap_info;
     // From esp_wifi.h, the possible return values (typos theirs):
     //    ESP_OK: succeed
     //    ESP_ERR_WIFI_CONN: The station interface don't initialized
     //    ESP_ERR_WIFI_NOT_CONNECT: The station is in disconnect status
-    if (esp_wifi_sta_get_ap_info(&ap_info) != ESP_OK){
+    if (esp_wifi_sta_get_ap_info(&self->ap_info) != ESP_OK){
         return mp_const_none;
     } else {
-        return mp_obj_new_int(ap_info.rssi);
+        return mp_obj_new_int(self->ap_info.rssi);
     }
 }
 
@@ -175,27 +172,24 @@ mp_obj_t common_hal_wifi_radio_get_ipv4_gateway(wifi_radio_obj_t *self) {
     if (!esp_netif_is_netif_up(self->netif)) {
         return mp_const_none;
     }
-    esp_netif_ip_info_t ip_info;
-    esp_netif_get_ip_info(self->netif, &ip_info);
-    return common_hal_ipaddress_new_ipv4address(ip_info.gw.addr);
+    esp_netif_get_ip_info(self->netif, &self->ip_info);
+    return common_hal_ipaddress_new_ipv4address(self->ip_info.gw.addr);
 }
 
 mp_obj_t common_hal_wifi_radio_get_ipv4_subnet(wifi_radio_obj_t *self) {
     if (!esp_netif_is_netif_up(self->netif)) {
         return mp_const_none;
     }
-    esp_netif_ip_info_t ip_info;
-    esp_netif_get_ip_info(self->netif, &ip_info);
-    return common_hal_ipaddress_new_ipv4address(ip_info.netmask.addr);
+    esp_netif_get_ip_info(self->netif, &self->ip_info);
+    return common_hal_ipaddress_new_ipv4address(self->ip_info.netmask.addr);
 }
 
 mp_obj_t common_hal_wifi_radio_get_ipv4_address(wifi_radio_obj_t *self) {
     if (!esp_netif_is_netif_up(self->netif)) {
         return mp_const_none;
     }
-    esp_netif_ip_info_t ip_info;
-    esp_netif_get_ip_info(self->netif, &ip_info);
-    return common_hal_ipaddress_new_ipv4address(ip_info.ip.addr);
+    esp_netif_get_ip_info(self->netif, &self->ip_info);
+    return common_hal_ipaddress_new_ipv4address(self->ip_info.ip.addr);
 }
 
 mp_int_t common_hal_wifi_radio_ping(wifi_radio_obj_t *self, mp_obj_t ip_address, mp_float_t timeout) {
diff --git a/ports/esp32s2/common-hal/wifi/Radio.h b/ports/esp32s2/common-hal/wifi/Radio.h
index 205aef176..ddcd9dc0d 100644
--- a/ports/esp32s2/common-hal/wifi/Radio.h
+++ b/ports/esp32s2/common-hal/wifi/Radio.h
@@ -46,6 +46,8 @@ typedef struct {
     StaticEventGroup_t event_group;
     EventGroupHandle_t event_group_handle;
     wifi_config_t sta_config;
+    wifi_ap_record_t ap_info;
+    esp_netif_ip_info_t ip_info;
     esp_netif_t *netif;
     bool started;
     bool ap_mode;
-- 
cgit v1.2.3


From add230b4da7c32c1b6fee3a328ccb8eebede42c5 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Tue, 22 Sep 2020 11:37:12 +0530
Subject: Update port.c

---
 ports/esp32s2/supervisor/port.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/supervisor/port.c b/ports/esp32s2/supervisor/port.c
index e52b7f376..3de63278d 100644
--- a/ports/esp32s2/supervisor/port.c
+++ b/ports/esp32s2/supervisor/port.c
@@ -43,6 +43,7 @@
 #include "common-hal/wifi/__init__.h"
 #include "supervisor/memory.h"
 #include "supervisor/shared/tick.h"
+#include "shared-bindings/rtc/__init__.h"
 
 #include "peripherals/rmt.h"
 #include "esp-idf/components/heap/include/esp_heap_caps.h"
@@ -106,6 +107,11 @@ void reset_port(void) {
     spi_reset();
     uart_reset();
 #endif
+
+#if CIRCUITPY_RTC
+    rtc_reset();
+#endif
+
 #if CIRCUITPY_WIFI
     wifi_reset();
 #endif
-- 
cgit v1.2.3


From 00517b26009d6b721145995e40725625b5152afd Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Wed, 23 Sep 2020 11:39:39 -0400
Subject: Move missing pin warning to shared-bindings

---
 ports/esp32s2/common-hal/busio/SPI.c | 9 ---------
 ports/stm/common-hal/busio/SPI.c     | 9 ---------
 shared-bindings/busio/SPI.c          | 4 ++++
 3 files changed, 4 insertions(+), 18 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/common-hal/busio/SPI.c b/ports/esp32s2/common-hal/busio/SPI.c
index 6e4e34474..eaafa87b7 100644
--- a/ports/esp32s2/common-hal/busio/SPI.c
+++ b/ports/esp32s2/common-hal/busio/SPI.c
@@ -116,15 +116,6 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
         const mcu_pin_obj_t * clock, const mcu_pin_obj_t * mosi,
         const mcu_pin_obj_t * miso) {
 
-    //SCK is not optional. MOSI and MISO are
-    if (!clock) {
-        mp_raise_ValueError(translate("Must provide SCK pin"));
-    }
-
-    if (!miso && !mosi) {
-        mp_raise_ValueError(translate("Must provide MISO or MOSI pin"));
-    }
-
     spi_bus_config_t bus_config;
     bus_config.mosi_io_num = mosi != NULL ? mosi->number : -1;
     bus_config.miso_io_num = miso != NULL ? miso->number : -1;
diff --git a/ports/stm/common-hal/busio/SPI.c b/ports/stm/common-hal/busio/SPI.c
index 913385e96..29fbdee56 100644
--- a/ports/stm/common-hal/busio/SPI.c
+++ b/ports/stm/common-hal/busio/SPI.c
@@ -127,15 +127,6 @@ STATIC int check_pins(busio_spi_obj_t *self,
     uint8_t mosi_len = MP_ARRAY_SIZE(mcu_spi_mosi_list);
     uint8_t miso_len = MP_ARRAY_SIZE(mcu_spi_miso_list);
 
-    //SCK is not optional. MOSI and MISO are
-    if (!sck) {
-        mp_raise_ValueError(translate("Must provide SCK pin"));
-    }
-
-    if (!miso && !mosi) {
-        mp_raise_ValueError(translate("Must provide MISO or MOSI pin"));
-    }
-
     // Loop over each possibility for SCK.  Check whether MISO and/or MOSI can be used on the same peripheral
     for (uint i = 0; i < sck_len; i++) {
         const mcu_periph_obj_t *mcu_spi_sck = &mcu_spi_sck_list[i];
diff --git a/shared-bindings/busio/SPI.c b/shared-bindings/busio/SPI.c
index aefe4f5a7..e47564c8c 100644
--- a/shared-bindings/busio/SPI.c
+++ b/shared-bindings/busio/SPI.c
@@ -96,6 +96,10 @@ STATIC mp_obj_t busio_spi_make_new(const mp_obj_type_t *type, size_t n_args, con
     const mcu_pin_obj_t* mosi = validate_obj_is_free_pin_or_none(args[ARG_MOSI].u_obj);
     const mcu_pin_obj_t* miso = validate_obj_is_free_pin_or_none(args[ARG_MISO].u_obj);
 
+    if (!miso && !mosi) {
+        mp_raise_ValueError(translate("Must provide MISO or MOSI pin"));
+    }
+
     common_hal_busio_spi_construct(self, clock, mosi, miso);
     return MP_OBJ_FROM_PTR(self);
 }
-- 
cgit v1.2.3


From 128b4a013b83b02953b1cfd7f246bdd30dab5f9a Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Mon, 28 Sep 2020 12:11:08 -0400
Subject: Add non-calibrated ADC

---
 locale/circuitpython.pot                      |  12 +--
 ports/esp32s2/Makefile                        |  51 ++++++-------
 ports/esp32s2/common-hal/analogio/AnalogIn.c  | 103 ++++++++++++++++++++++++++
 ports/esp32s2/common-hal/analogio/AnalogIn.h  |  50 +++++++++++++
 ports/esp32s2/common-hal/analogio/AnalogOut.c |  60 +++++++++++++++
 ports/esp32s2/common-hal/analogio/AnalogOut.h |  44 +++++++++++
 ports/esp32s2/common-hal/analogio/__init__.c  |   1 +
 ports/esp32s2/mpconfigport.mk                 |   2 +-
 ports/esp32s2/peripherals/pins.c              |  94 +++++++++++------------
 ports/esp32s2/peripherals/pins.h              |   3 +
 10 files changed, 342 insertions(+), 78 deletions(-)
 create mode 100644 ports/esp32s2/common-hal/analogio/AnalogIn.c
 create mode 100644 ports/esp32s2/common-hal/analogio/AnalogIn.h
 create mode 100644 ports/esp32s2/common-hal/analogio/AnalogOut.c
 create mode 100644 ports/esp32s2/common-hal/analogio/AnalogOut.h
 create mode 100644 ports/esp32s2/common-hal/analogio/__init__.c

(limited to 'ports/esp32s2')

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index c9114dd5c..2d994b01d 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-21 16:45-0500\n"
+"POT-Creation-Date: 2020-09-25 18:14-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1167,14 +1167,10 @@ msgstr ""
 msgid "Must be a %q subclass."
 msgstr ""
 
-#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c
+#: ports/mimxrt10xx/common-hal/busio/SPI.c shared-bindings/busio/SPI.c
 msgid "Must provide MISO or MOSI pin"
 msgstr ""
 
-#: ports/stm/common-hal/busio/SPI.c
-msgid "Must provide SCK pin"
-msgstr ""
-
 #: shared-bindings/rgbmatrix/RGBMatrix.c
 #, c-format
 msgid "Must use a multiple of 6 rgb pins, not %d"
@@ -1415,6 +1411,10 @@ msgstr ""
 msgid "Pull not used when direction is output."
 msgstr ""
 
+#: ports/stm/ref/pulseout-pre-timeralloc.c
+msgid "PulseOut not supported on this chip"
+msgstr ""
+
 #: ports/stm/common-hal/os/__init__.c
 msgid "RNG DeInit Error"
 msgstr ""
diff --git a/ports/esp32s2/Makefile b/ports/esp32s2/Makefile
index 229a3bf3a..013da7d89 100644
--- a/ports/esp32s2/Makefile
+++ b/ports/esp32s2/Makefile
@@ -73,30 +73,31 @@ INC += -I./peripherals
 INC += -I../../lib/mp-readline
 INC += -I../../lib/tinyusb/src
 INC += -I../../supervisor/shared/usb
-INC += -Iesp-idf/components/freertos/include/freertos
-INC += -Iesp-idf/components/freertos/xtensa/include
-INC += -Iesp-idf/components/esp32s2/include
-INC += -Iesp-idf/components/xtensa/esp32s2/include
-INC += -Iesp-idf/components/esp_common/include
-INC += -Iesp-idf/components/esp_event/include
-INC += -Iesp-idf/components/esp_netif/include
-INC += -Iesp-idf/components/esp_ringbuf/include
-INC += -Iesp-idf/components/esp_rom/include
-INC += -Iesp-idf/components/esp_wifi/include
-INC += -Iesp-idf/components/xtensa/include
-INC += -Iesp-idf/components/esp_timer/include
-INC += -Iesp-idf/components/mbedtls/mbedtls/include
-INC += -Iesp-idf/components/mbedtls/port/include/
-INC += -Iesp-idf/components/newlib/platform_include
-INC += -Iesp-idf/components/lwip/lwip/src/include
-INC += -Iesp-idf/components/lwip/port/esp32/include
-INC += -Iesp-idf/components/lwip/include/apps/sntp
-INC += -Iesp-idf/components/soc/include
-INC += -Iesp-idf/components/soc/src/esp32s2/include
-INC += -Iesp-idf/components/soc/soc/include
-INC += -Iesp-idf/components/soc/soc/esp32s2/include
-INC += -Iesp-idf/components/heap/include
-INC += -Iesp-idf/components/esp_system/include
+INC += -isystem esp-idf/components/freertos/include/freertos
+INC += -isystem esp-idf/components/freertos/xtensa/include
+INC += -isystem esp-idf/components/esp32s2/include
+INC += -isystem esp-idf/components/driver/esp32s2/include
+INC += -isystem esp-idf/components/xtensa/esp32s2/include
+INC += -isystem esp-idf/components/esp_common/include
+INC += -isystem esp-idf/components/esp_event/include
+INC += -isystem esp-idf/components/esp_netif/include
+INC += -isystem esp-idf/components/esp_ringbuf/include
+INC += -isystem esp-idf/components/esp_rom/include
+INC += -isystem esp-idf/components/esp_wifi/include
+INC += -isystem esp-idf/components/xtensa/include
+INC += -isystem esp-idf/components/esp_timer/include
+INC += -isystem esp-idf/components/mbedtls/mbedtls/include
+INC += -isystem esp-idf/components/mbedtls/port/include/
+INC += -isystem esp-idf/components/newlib/platform_include
+INC += -isystem esp-idf/components/lwip/lwip/src/include
+INC += -isystem esp-idf/components/lwip/port/esp32/include
+INC += -isystem esp-idf/components/lwip/include/apps/sntp
+INC += -isystem esp-idf/components/soc/include
+INC += -isystem esp-idf/components/soc/src/esp32s2/include
+INC += -isystem esp-idf/components/soc/soc/include
+INC += -isystem esp-idf/components/soc/soc/esp32s2/include
+INC += -isystem esp-idf/components/heap/include
+INC += -isystem esp-idf/components/esp_system/include
 INC += -I$(BUILD)/esp-idf/config
 
 CFLAGS += -DHAVE_CONFIG_H \
@@ -260,7 +261,7 @@ ESP_IDF_COMPONENTS_LINK = freertos log esp_system esp32s2 bootloader_support pth
 
 ESP_IDF_COMPONENTS_INCLUDE = driver freertos log soc
 
-INC += $(foreach component, $(ESP_IDF_COMPONENTS_INCLUDE), -Iesp-idf/components/$(component)/include)
+INC += $(foreach component, $(ESP_IDF_COMPONENTS_INCLUDE), -isystem esp-idf/components/$(component)/include)
 
 ESP_IDF_COMPONENTS_EXPANDED = $(foreach component, $(ESP_IDF_COMPONENTS_LINK), $(BUILD)/esp-idf/esp-idf/$(component)/lib$(component).a)
 ESP_IDF_WIFI_COMPONENTS_EXPANDED = $(foreach component, $(ESP_IDF_WIFI_COMPONENTS_LINK), $(BUILD)/esp-idf/esp-idf/$(component)/lib$(component).a)
diff --git a/ports/esp32s2/common-hal/analogio/AnalogIn.c b/ports/esp32s2/common-hal/analogio/AnalogIn.c
new file mode 100644
index 000000000..1a15fc77c
--- /dev/null
+++ b/ports/esp32s2/common-hal/analogio/AnalogIn.c
@@ -0,0 +1,103 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Lucian Copeland 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/analogio/AnalogIn.h"
+#include "py/mperrno.h"
+#include "py/runtime.h"
+#include "supervisor/shared/translate.h"
+
+#include "driver/adc.h"
+// TODO: Add when ESP-IDF is updated latest version
+// #include "esp-idf/components/esp_adc_cal/include/esp_adc_cal.h"
+
+#include "shared-bindings/microcontroller/Pin.h"
+
+#define DEFAULT_VREF        1100
+#define NO_OF_SAMPLES       64
+#define ATTENUATION         ADC_ATTEN_DB_11
+#define DATA_WIDTH          ADC_WIDTH_BIT_13
+
+void common_hal_analogio_analogin_construct(analogio_analogin_obj_t* self,
+        const mcu_pin_obj_t *pin) {
+    if (pin->adc_index == 0 || pin->adc_channel == ADC_CHANNEL_MAX) {
+        mp_raise_ValueError(translate("Pin does not have ADC capabilities"));
+    }
+    common_hal_mcu_pin_claim(pin);
+    self->pin = pin;
+}
+
+bool common_hal_analogio_analogin_deinited(analogio_analogin_obj_t *self) {
+    return self->pin == NULL;
+}
+
+void common_hal_analogio_analogin_deinit(analogio_analogin_obj_t *self) {
+    if (common_hal_analogio_analogin_deinited(self)) {
+        return;
+    }
+    reset_pin_number(self->pin->number);
+    self->pin = NULL;
+}
+
+uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) {
+    if (self->pin->adc_index == ADC_UNIT_1) {
+        adc1_config_width(DATA_WIDTH);
+        adc1_config_channel_atten((adc1_channel_t)self->pin->adc_channel, ATTENUATION);
+    } else if (self->pin->adc_index == ADC_UNIT_2) {
+        adc2_config_channel_atten((adc2_channel_t)self->pin->adc_channel, ATTENUATION);
+    }
+
+    // TODO: esp_adc_cal is only available in the latest version of the esp-idf. Enable when we update.
+    // Automatically select calibration process depending on status of efuse
+    // esp_adc_cal_characteristics_t *adc_chars = calloc(1, sizeof(esp_adc_cal_characteristics_t));
+    // esp_adc_cal_characterize(self->pin->adc_index, ATTENUATION, DATA_WIDTH, DEFAULT_VREF, adc_chars);
+
+    uint32_t adc_reading = 0;
+    //Multisampling
+    for (int i = 0; i < NO_OF_SAMPLES; i++) {
+        if (self->pin->adc_index == ADC_UNIT_1) {
+            adc_reading += adc1_get_raw((adc1_channel_t)self->pin->adc_channel);
+        } else {
+            int raw;
+            esp_err_t r = adc2_get_raw((adc2_channel_t)self->pin->adc_channel, DATA_WIDTH, &raw);
+            if ( r != ESP_OK ) {
+                mp_raise_ValueError(translate("ADC2 is being used by WiFi"));
+            }
+            adc_reading += raw;
+        }
+    }
+    adc_reading /= NO_OF_SAMPLES;
+
+    // This corrects non-linear regions of the ADC range with a LUT, so it's a better reading than raw
+    // Enable when ESP-IDF is updated
+    //uint32_t voltage = esp_adc_cal_raw_to_voltage(adc_reading, adc_chars);
+    //return voltage * ((1 << 16) - 1)/3300;
+
+    return adc_reading;
+}
+
+float common_hal_analogio_analogin_get_reference_voltage(analogio_analogin_obj_t *self) {
+    return 3.3f;
+}
diff --git a/ports/esp32s2/common-hal/analogio/AnalogIn.h b/ports/esp32s2/common-hal/analogio/AnalogIn.h
new file mode 100644
index 000000000..5ea4a913d
--- /dev/null
+++ b/ports/esp32s2/common-hal/analogio/AnalogIn.h
@@ -0,0 +1,50 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Lucian Copeland 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_ANALOGIO_ANALOGIN_H
+#define MICROPY_INCLUDED_ESP32S2_COMMON_HAL_ANALOGIO_ANALOGIN_H
+
+#include "common-hal/microcontroller/Pin.h"
+
+#include "esp-idf/components/soc/include/hal/adc_types.h"
+#include "FreeRTOS.h"
+#include "freertos/semphr.h"
+#include "py/obj.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    const mcu_pin_obj_t * pin;
+} analogio_analogin_obj_t;
+
+static inline uint8_t stm32_adc_units(uint8_t adc_packed) {
+    return adc_packed >> 5;
+}
+
+static inline uint8_t stm32_adc_channel(uint8_t adc_packed) {
+    return adc_packed & 0x1f;
+}
+
+#endif // MICROPY_INCLUDED_ESP32S2_COMMON_HAL_ANALOGIO_ANALOGIN_H
diff --git a/ports/esp32s2/common-hal/analogio/AnalogOut.c b/ports/esp32s2/common-hal/analogio/AnalogOut.c
new file mode 100644
index 000000000..d67dc6083
--- /dev/null
+++ b/ports/esp32s2/common-hal/analogio/AnalogOut.c
@@ -0,0 +1,60 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * SPDX-FileCopyrightText: Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2019, Lucian Copeland 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 <stdint.h>
+#include <string.h>
+
+#include "py/mperrno.h"
+#include "py/runtime.h"
+
+#include "shared-bindings/analogio/AnalogOut.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "supervisor/shared/translate.h"
+
+#include "common-hal/microcontroller/Pin.h"
+
+void common_hal_analogio_analogout_construct(analogio_analogout_obj_t* self,
+        const mcu_pin_obj_t *pin) {
+    //mp_raise_ValueError(translate("No DAC on chip"));
+}
+
+bool common_hal_analogio_analogout_deinited(analogio_analogout_obj_t *self) {
+    return true;
+}
+
+void common_hal_analogio_analogout_deinit(analogio_analogout_obj_t *self) {
+
+}
+
+void common_hal_analogio_analogout_set_value(analogio_analogout_obj_t *self,
+        uint16_t value) {
+
+}
+
+void analogout_reset(void) {
+
+}
diff --git a/ports/esp32s2/common-hal/analogio/AnalogOut.h b/ports/esp32s2/common-hal/analogio/AnalogOut.h
new file mode 100644
index 000000000..d5f29ffd7
--- /dev/null
+++ b/ports/esp32s2/common-hal/analogio/AnalogOut.h
@@ -0,0 +1,44 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Scott Shawcroft
+ * Copyright (c) 2019 Lucian Copeland 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_STM32F4_COMMON_HAL_ANALOGIO_ANALOGOUT_H
+#define MICROPY_INCLUDED_STM32F4_COMMON_HAL_ANALOGIO_ANALOGOUT_H
+
+#include "common-hal/microcontroller/Pin.h"
+
+#include "py/obj.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    const mcu_pin_obj_t * pin;
+    uint8_t channel;
+    uint8_t dac_index:1;
+} analogio_analogout_obj_t;
+
+void analogout_reset(void);
+
+#endif // MICROPY_INCLUDED_STM32F4_COMMON_HAL_ANALOGIO_ANALOGOUT_H
diff --git a/ports/esp32s2/common-hal/analogio/__init__.c b/ports/esp32s2/common-hal/analogio/__init__.c
new file mode 100644
index 000000000..eea58c77d
--- /dev/null
+++ b/ports/esp32s2/common-hal/analogio/__init__.c
@@ -0,0 +1 @@
+// No analogio module functions.
diff --git a/ports/esp32s2/mpconfigport.mk b/ports/esp32s2/mpconfigport.mk
index bbaabb1c3..d68fe469d 100644
--- a/ports/esp32s2/mpconfigport.mk
+++ b/ports/esp32s2/mpconfigport.mk
@@ -13,8 +13,8 @@ USB_SERIAL_NUMBER_LENGTH = 12
 LONGINT_IMPL = MPZ
 
 # These modules are implemented in ports/<port>/common-hal:
+# CIRCUITPY_ANALOGIO = 0
 CIRCUITPY_FULL_BUILD = 1
-CIRCUITPY_ANALOGIO = 0
 CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_AUDIOIO = 0
 CIRCUITPY_COUNTIO = 0
diff --git a/ports/esp32s2/peripherals/pins.c b/ports/esp32s2/peripherals/pins.c
index 34fd6483e..2c8b61c62 100755
--- a/ports/esp32s2/peripherals/pins.c
+++ b/ports/esp32s2/peripherals/pins.c
@@ -26,56 +26,58 @@
 
 #include "peripherals/pins.h"
 
-#define NO_ADC 0xff
+#define NO_ADC 0
+#define NO_ADC_CHANNEL ADC_CHANNEL_MAX
 
 // This macro is used to simplify pin definition in boards/<board>/pins.c
-#define PIN(p_name, p_number) \
+#define PIN(p_name, p_number, p_adc_index, p_adc_channel) \
 const mcu_pin_obj_t pin_## p_name = { \
     PIN_PREFIX_VALUES \
     .number = p_number, \
+    .adc_index = p_adc_index, \
+    .adc_channel = p_adc_channel, \
 }
 
-PIN(GPIO0, 0);
-PIN(GPIO1, 1);
-PIN(GPIO2, 2);
-PIN(GPIO3, 3);
-PIN(GPIO4, 4);
-PIN(GPIO5, 5);
-PIN(GPIO6, 6);
-PIN(GPIO7, 7);
-PIN(GPIO8, 8);
-PIN(GPIO9, 9);
-PIN(GPIO10, 10);
-PIN(GPIO11, 11);
-PIN(GPIO12, 12);
-PIN(GPIO13, 13);
-PIN(GPIO14, 14);
-PIN(GPIO15, 15);
-PIN(GPIO16, 16);
-PIN(GPIO17, 17);
-PIN(GPIO18, 18);
-
-PIN(GPIO19, 19);
-PIN(GPIO20, 20);
-PIN(GPIO21, 21);
-PIN(GPIO26, 26);
-PIN(GPIO27, 27);
-PIN(GPIO28, 28);
-PIN(GPIO29, 29);
-PIN(GPIO30, 30);
-PIN(GPIO31, 31);
-PIN(GPIO32, 32);
-PIN(GPIO33, 33);
-PIN(GPIO34, 34);
-PIN(GPIO35, 35);
-PIN(GPIO36, 36);
-PIN(GPIO37, 37);
-PIN(GPIO38, 38);
-PIN(GPIO39, 39);
-PIN(GPIO40, 40);
-PIN(GPIO41, 41);
-PIN(GPIO42, 42);
-PIN(GPIO43, 43);
-PIN(GPIO44, 44);
-PIN(GPIO45, 45);
-PIN(GPIO46, 46);
+PIN(GPIO0, 0, NO_ADC, NO_ADC_CHANNEL);
+PIN(GPIO1, 1, ADC_UNIT_1, ADC_CHANNEL_0);
+PIN(GPIO2, 2, ADC_UNIT_1, ADC_CHANNEL_1);
+PIN(GPIO3, 3, ADC_UNIT_1, ADC_CHANNEL_2);
+PIN(GPIO4, 4, ADC_UNIT_1, ADC_CHANNEL_3);
+PIN(GPIO5, 5, ADC_UNIT_1, ADC_CHANNEL_4);
+PIN(GPIO6, 6, ADC_UNIT_1, ADC_CHANNEL_5);
+PIN(GPIO7, 7, ADC_UNIT_1, ADC_CHANNEL_6);
+PIN(GPIO8, 8, ADC_UNIT_1, ADC_CHANNEL_7);
+PIN(GPIO9, 9, ADC_UNIT_1, ADC_CHANNEL_8);
+PIN(GPIO10, 10, ADC_UNIT_1, ADC_CHANNEL_9);
+PIN(GPIO11, 11, ADC_UNIT_2, ADC_CHANNEL_0);
+PIN(GPIO12, 12, ADC_UNIT_2, ADC_CHANNEL_1);
+PIN(GPIO13, 13, ADC_UNIT_2, ADC_CHANNEL_2);
+PIN(GPIO14, 14, ADC_UNIT_2, ADC_CHANNEL_3);
+PIN(GPIO15, 15, ADC_UNIT_2, ADC_CHANNEL_4);
+PIN(GPIO16, 16, ADC_UNIT_2, ADC_CHANNEL_5);
+PIN(GPIO17, 17, ADC_UNIT_2, ADC_CHANNEL_6);
+PIN(GPIO18, 18, ADC_UNIT_2, ADC_CHANNEL_7);
+PIN(GPIO19, 19, ADC_UNIT_2, ADC_CHANNEL_8);
+PIN(GPIO20, 20, ADC_UNIT_2, ADC_CHANNEL_9);
+PIN(GPIO21, 21, NO_ADC, NO_ADC_CHANNEL);
+PIN(GPIO26, 26, NO_ADC, NO_ADC_CHANNEL);
+PIN(GPIO27, 27, NO_ADC, NO_ADC_CHANNEL);
+PIN(GPIO28, 28, NO_ADC, NO_ADC_CHANNEL);
+PIN(GPIO29, 29, NO_ADC, NO_ADC_CHANNEL);
+PIN(GPIO30, 30, NO_ADC, NO_ADC_CHANNEL);
+PIN(GPIO31, 31, NO_ADC, NO_ADC_CHANNEL);
+PIN(GPIO32, 32, NO_ADC, NO_ADC_CHANNEL);
+PIN(GPIO33, 33, NO_ADC, NO_ADC_CHANNEL);
+PIN(GPIO34, 34, NO_ADC, NO_ADC_CHANNEL);
+PIN(GPIO35, 35, NO_ADC, NO_ADC_CHANNEL);
+PIN(GPIO36, 36, NO_ADC, NO_ADC_CHANNEL);
+PIN(GPIO37, 37, NO_ADC, NO_ADC_CHANNEL);
+PIN(GPIO38, 38, NO_ADC, NO_ADC_CHANNEL);
+PIN(GPIO39, 39, NO_ADC, NO_ADC_CHANNEL);
+PIN(GPIO40, 40, NO_ADC, NO_ADC_CHANNEL);
+PIN(GPIO41, 41, NO_ADC, NO_ADC_CHANNEL);
+PIN(GPIO42, 42, NO_ADC, NO_ADC_CHANNEL);
+PIN(GPIO43, 43, NO_ADC, NO_ADC_CHANNEL);
+PIN(GPIO44, 44, NO_ADC, NO_ADC_CHANNEL);
+PIN(GPIO45, 45, NO_ADC, NO_ADC_CHANNEL);
+PIN(GPIO46, 46, NO_ADC, NO_ADC_CHANNEL);
diff --git a/ports/esp32s2/peripherals/pins.h b/ports/esp32s2/peripherals/pins.h
index 07d0b908e..3f41cf35b 100644
--- a/ports/esp32s2/peripherals/pins.h
+++ b/ports/esp32s2/peripherals/pins.h
@@ -35,10 +35,13 @@
 #include "esp32s2_peripherals_config.h"
 #include "esp-idf/config/sdkconfig.h"
 #include "esp-idf/components/soc/include/hal/gpio_types.h"
+#include "esp-idf/components/soc/include/hal/adc_types.h"
 
 typedef struct {
     PIN_PREFIX_FIELDS
     gpio_num_t number;
+    uint8_t adc_index:2;
+    uint8_t adc_channel:6;
 } mcu_pin_obj_t;
 
 extern const mcu_pin_obj_t pin_GPIO0;
-- 
cgit v1.2.3


From abdbbf9e242e7ae8234d338f0b1d7a0c26fa6ad1 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Mon, 28 Sep 2020 15:10:12 -0700
Subject: One grep

---
 ports/esp32s2/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/Makefile b/ports/esp32s2/Makefile
index 662be481e..a32c83013 100644
--- a/ports/esp32s2/Makefile
+++ b/ports/esp32s2/Makefile
@@ -259,8 +259,7 @@ $(BUILD)/esp-idf/partition_table/partition-table.bin: $(BUILD)/esp-idf/config/sd
 menuconfig: $(BUILD)/esp-idf/config
 	$(Q)ninja -C $(BUILD)/esp-idf menuconfig
 	$(Q)diff --old-line-format= --unchanged-line-format= esp-idf-config/sdkconfig.defaults $(BUILD)/esp-idf/sdkconfig > $(BUILD)/sdkconfig.diff || true
-	$(Q)grep -Fvxf $(FLASH_SDKCONFIG) $(BUILD)/sdkconfig.diff > $(BUILD)/sdkconfig.stripped1
-	$(Q)grep -Fvxf $(DEBUG_SDKCONFIG) $(BUILD)/sdkconfig.stripped1 > boards/$(BOARD)/sdkconfig
+	$(Q)grep -Fvxf $(DEBUG_SDKCONFIG) -f $(FLASH_SDKCONFIG) $(BUILD)/sdkconfig.diff > boards/$(BOARD)/sdkconfig
 
 # qstr builds include headers so we need to make sure they are up to date
 $(HEADER_BUILD)/qstr.i.last: | $(BUILD)/esp-idf/config/sdkconfig.h
-- 
cgit v1.2.3


From 66d55738c1315b223d3e5ed6bc710f8b1e443836 Mon Sep 17 00:00:00 2001
From: "Ryan T. Hamilton" <astrobokonon@gmail.com>
Date: Mon, 28 Sep 2020 16:49:20 -0700
Subject: Enable DNS info

---
 ports/esp32s2/common-hal/wifi/Radio.c | 14 ++++++++++++++
 ports/esp32s2/common-hal/wifi/Radio.h |  1 +
 shared-bindings/wifi/Radio.c          | 17 +++++++++++++++++
 shared-bindings/wifi/Radio.h          |  1 +
 4 files changed, 33 insertions(+)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/common-hal/wifi/Radio.c b/ports/esp32s2/common-hal/wifi/Radio.c
index ab6177859..0184793a1 100644
--- a/ports/esp32s2/common-hal/wifi/Radio.c
+++ b/ports/esp32s2/common-hal/wifi/Radio.c
@@ -192,6 +192,20 @@ mp_obj_t common_hal_wifi_radio_get_ipv4_address(wifi_radio_obj_t *self) {
     return common_hal_ipaddress_new_ipv4address(self->ip_info.ip.addr);
 }
 
+mp_obj_t common_hal_wifi_radio_get_ipv4_dns(wifi_radio_obj_t *self) {
+    if (!esp_netif_is_netif_up(self->netif)) {
+        return mp_const_none;
+    }
+
+    esp_netif_get_dns_info(self->netif, ESP_NETIF_DNS_MAIN, &self->dns_info);
+
+    // dns_info is of type esp_netif_dns_info_t, which is just ever so slightly
+    // different than esp_netif_ip_info_t used for
+    // common_hal_wifi_radio_get_ipv4_address (includes both ipv4 and 6),
+    // so some extra jumping is required to get to the actual address
+    return common_hal_ipaddress_new_ipv4address(self->dns_info.ip.u_addr.ip4.addr);
+}
+
 mp_int_t common_hal_wifi_radio_ping(wifi_radio_obj_t *self, mp_obj_t ip_address, mp_float_t timeout) {
     esp_ping_config_t ping_config = ESP_PING_DEFAULT_CONFIG();
     ipaddress_ipaddress_to_esp_idf(ip_address, &ping_config.target_addr);
diff --git a/ports/esp32s2/common-hal/wifi/Radio.h b/ports/esp32s2/common-hal/wifi/Radio.h
index ddcd9dc0d..7c0cb996d 100644
--- a/ports/esp32s2/common-hal/wifi/Radio.h
+++ b/ports/esp32s2/common-hal/wifi/Radio.h
@@ -48,6 +48,7 @@ typedef struct {
     wifi_config_t sta_config;
     wifi_ap_record_t ap_info;
     esp_netif_ip_info_t ip_info;
+    esp_netif_dns_info_t dns_info;
     esp_netif_t *netif;
     bool started;
     bool ap_mode;
diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c
index 6c4e6a4f6..8c556aafe 100644
--- a/shared-bindings/wifi/Radio.c
+++ b/shared-bindings/wifi/Radio.c
@@ -227,6 +227,22 @@ const mp_obj_property_t wifi_radio_ipv4_address_obj = {
                (mp_obj_t)&mp_const_none_obj },
 };
 
+//|     ipv4_dns: Optional[ipaddress.IPv4Address]
+//|     """IP v4 Address of the DNS server in use when connected to an access point. None otherwise."""
+//|
+STATIC mp_obj_t wifi_radio_get_ipv4_dns(mp_obj_t self) {
+    return common_hal_wifi_radio_get_ipv4_dns(self);
+
+}
+MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_dns_obj, wifi_radio_get_ipv4_dns);
+
+const mp_obj_property_t wifi_radio_ipv4_dns_obj = {
+    .base.type = &mp_type_property,
+    .proxy = { (mp_obj_t)&wifi_radio_get_ipv4_dns_obj,
+               (mp_obj_t)&mp_const_none_obj,
+               (mp_obj_t)&mp_const_none_obj },
+};
+
 //|     def ping(self, ip, *, timeout: float = 0.5) -> float:
 //|         """Ping an IP to test connectivity. Returns echo time in seconds.
 //|            Returns None when it times out."""
@@ -268,6 +284,7 @@ STATIC const mp_rom_map_elem_t wifi_radio_locals_dict_table[] = {
     // { MP_ROM_QSTR(MP_QSTR_connect_to_enterprise),    MP_ROM_PTR(&wifi_radio_connect_to_enterprise_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_ap_rssi),    MP_ROM_PTR(&wifi_radio_ap_rssi_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ipv4_dns),    MP_ROM_PTR(&wifi_radio_ipv4_dns_obj) },
     { MP_ROM_QSTR(MP_QSTR_ipv4_gateway),    MP_ROM_PTR(&wifi_radio_ipv4_gateway_obj) },
     { MP_ROM_QSTR(MP_QSTR_ipv4_subnet),    MP_ROM_PTR(&wifi_radio_ipv4_subnet_obj) },
     { MP_ROM_QSTR(MP_QSTR_ipv4_address),    MP_ROM_PTR(&wifi_radio_ipv4_address_obj) },
diff --git a/shared-bindings/wifi/Radio.h b/shared-bindings/wifi/Radio.h
index 3c8ecbebd..fd0807a86 100644
--- a/shared-bindings/wifi/Radio.h
+++ b/shared-bindings/wifi/Radio.h
@@ -54,6 +54,7 @@ extern void common_hal_wifi_radio_stop_scanning_networks(wifi_radio_obj_t *self)
 extern wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t* ssid, size_t ssid_len, uint8_t* password, size_t password_len, uint8_t channel, mp_float_t timeout, uint8_t* bssid, size_t bssid_len);
 
 extern mp_obj_t common_hal_wifi_radio_get_ap_rssi(wifi_radio_obj_t *self);
+extern mp_obj_t common_hal_wifi_radio_get_ipv4_dns(wifi_radio_obj_t *self);
 extern mp_obj_t common_hal_wifi_radio_get_ipv4_gateway(wifi_radio_obj_t *self);
 extern mp_obj_t common_hal_wifi_radio_get_ipv4_subnet(wifi_radio_obj_t *self);
 extern mp_obj_t common_hal_wifi_radio_get_ipv4_address(wifi_radio_obj_t *self);
-- 
cgit v1.2.3


From 726dcdb60aa84b5070e5484a19e896abdaffeb93 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Thu, 24 Sep 2020 11:20:32 -0500
Subject: Add some NORETURN attributes

I have a function where it should be impossible to reach the end, so I put in a safe-mode reset at the bottom:
```
int find_unused_slot(void) {
    // precondition: you already verified that a slot was available
    for (int i=0; i<NUM_SLOTS; i++) {
        if( slot_free(i)) {
            return i;
        }
    }
    safe_mode_reset(MICROPY_FATAL_ERROR);
}
```
However, the compiler still gave a diagnostic, because safe_mode_reset was not declared NORETURN.

So I started by teaching the compiler that reset_into_safe_mode never returned.  This leads at least one level deeper due to reset_cpu needing to be a NORETURN function.  Each port is a little different in this area.  I also marked reset_to_bootloader as NORETURN.
Additional notes:

 * stm32's reset_to_bootloader was not implemented, but now does a bare reset.  Most stm32s are not fitted with uf2 bootloaders anyway.
 * ditto cxd56
 * esp32s2 did not implement reset_cpu at all.  I used esp_restart().  (not tested)
 * litex did not implement reset_cpu at all.  I used reboot_ctrl_write.  But notably this is what reset_to_bootloader already did, so one or the other must be incorrect (not tested).  reboot_ctrl_write cannot be declared NORETURN, as it returns unless the special value 0xac is written), so a new unreachable forever-loop is added.
 * cxd56's reset is via a boardctl() call which can't generically be declared NORETURN, so a new unreacahble "for(;;)" forever-loop is added.
 * In several places, NVIC_SystemReset is redeclared with NORETURN applied.  This is accepted just fine by gcc.  I chose this as preferable to editing the multiple copies of CMSIS headers where it is normally declared.
 * the stub safe_mode reset simply aborts.  This is used in mpy-cross.
---
 ports/atmel-samd/reset.c        | 2 ++
 ports/atmel-samd/reset.h        | 6 ++++--
 ports/cxd56/supervisor/port.c   | 5 +++++
 ports/esp32s2/supervisor/port.c | 1 +
 ports/litex/supervisor/port.c   | 8 ++++++++
 ports/mimxrt10xx/reset.h        | 4 ++--
 ports/nrf/supervisor/port.c     | 2 ++
 ports/stm/supervisor/port.c     | 4 +++-
 supervisor/port.h               | 4 ++--
 supervisor/shared/safe_mode.h   | 4 +++-
 supervisor/stub/safe_mode.c     | 5 +++--
 11 files changed, 35 insertions(+), 10 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/atmel-samd/reset.c b/ports/atmel-samd/reset.c
index 735639cc4..066c9897a 100644
--- a/ports/atmel-samd/reset.c
+++ b/ports/atmel-samd/reset.c
@@ -29,6 +29,8 @@
 #include "reset.h"
 #include "supervisor/filesystem.h"
 
+void NVIC_SystemReset(void) NORETURN;
+
 void reset(void) {
     filesystem_flush();
     NVIC_SystemReset();
diff --git a/ports/atmel-samd/reset.h b/ports/atmel-samd/reset.h
index b589d2611..482eb6ee8 100644
--- a/ports/atmel-samd/reset.h
+++ b/ports/atmel-samd/reset.h
@@ -29,14 +29,16 @@
 #include <stdbool.h>
 #include <stdint.h>
 
+#include "py/mpconfig.h"
+
 // Copied from inc/uf2.h in https://github.com/Microsoft/uf2-samd21
 #define DBL_TAP_MAGIC 0xf01669ef // Randomly selected, adjusted to have first and last bit set
 #define DBL_TAP_MAGIC_QUICK_BOOT 0xf02669ef
 
 extern uint32_t _bootloader_dbl_tap;
 
-void reset_to_bootloader(void);
-void reset(void);
+void reset_to_bootloader(void) NORETURN;
+void reset(void) NORETURN;
 bool bootloader_available(void);
 
 #endif  // MICROPY_INCLUDED_ATMEL_SAMD_RESET_H
diff --git a/ports/cxd56/supervisor/port.c b/ports/cxd56/supervisor/port.c
index 6164f7411..92d335cd5 100644
--- a/ports/cxd56/supervisor/port.c
+++ b/ports/cxd56/supervisor/port.c
@@ -71,6 +71,8 @@ safe_mode_t port_init(void) {
 
 void reset_cpu(void) {
     boardctl(BOARDIOC_RESET, 0);
+    for (;;) {
+    }
 }
 
 void reset_port(void) {
@@ -91,6 +93,9 @@ void reset_port(void) {
 }
 
 void reset_to_bootloader(void) {
+    boardctl(BOARDIOC_RESET, 0);
+    for (;;) {
+    }
 }
 
 supervisor_allocation* port_fixed_stack(void) {
diff --git a/ports/esp32s2/supervisor/port.c b/ports/esp32s2/supervisor/port.c
index 3de63278d..60331d08e 100644
--- a/ports/esp32s2/supervisor/port.c
+++ b/ports/esp32s2/supervisor/port.c
@@ -121,6 +121,7 @@ void reset_to_bootloader(void) {
 }
 
 void reset_cpu(void) {
+    esp_restart();
 }
 
 uint32_t *port_heap_get_bottom(void) {
diff --git a/ports/litex/supervisor/port.c b/ports/litex/supervisor/port.c
index 3125072e6..e55eb49f0 100644
--- a/ports/litex/supervisor/port.c
+++ b/ports/litex/supervisor/port.c
@@ -85,9 +85,17 @@ void reset_port(void) {
 
 void reset_to_bootloader(void) {
     reboot_ctrl_write(0xac);
+    for(;;) {}
 }
 
 void reset_cpu(void) {
+    // "You can reset Fomu by writing a special value to the CSR_REBOOT_CTRL
+    // register at 0xe0006000L. All writes to this register must start with
+    // 0xac, to ensure random values aren’t written. We can reboot Fomu by
+    // simply writing this value" --
+    //     https://workshop.fomu.im/en/latest/riscv.html
+    reboot_ctrl_write(0xac);
+    for(;;) {}
 }
 
 supervisor_allocation* port_fixed_stack(void) {
diff --git a/ports/mimxrt10xx/reset.h b/ports/mimxrt10xx/reset.h
index dc3106cf0..c7569202c 100644
--- a/ports/mimxrt10xx/reset.h
+++ b/ports/mimxrt10xx/reset.h
@@ -34,8 +34,8 @@
 #define DBL_TAP_MAGIC 0xf01669ef // Randomly selected, adjusted to have first and last bit set
 #define DBL_TAP_MAGIC_QUICK_BOOT 0xf02669ef
 
-void reset_to_bootloader(void);
-void reset(void);
+void reset_to_bootloader(void) NORETURN;
+void reset(void) NORETURN;
 bool bootloader_available(void);
 
 #endif  // MICROPY_INCLUDED_MIMXRT10XX_RESET_H
diff --git a/ports/nrf/supervisor/port.c b/ports/nrf/supervisor/port.c
index 2945f244d..bc8b47be7 100644
--- a/ports/nrf/supervisor/port.c
+++ b/ports/nrf/supervisor/port.c
@@ -234,6 +234,8 @@ void reset_cpu(void) {
     uint32_t ticks = nrfx_rtc_counter_get(&rtc_instance);
     overflow_tracker.overflowed_ticks += ticks / 32;
     NVIC_SystemReset();
+    for (;;) {
+    }
 }
 
 // The uninitialized data section is placed directly after BSS, under the theory
diff --git a/ports/stm/supervisor/port.c b/ports/stm/supervisor/port.c
index e21105001..bb304a317 100644
--- a/ports/stm/supervisor/port.c
+++ b/ports/stm/supervisor/port.c
@@ -56,6 +56,8 @@
 
 #include STM32_HAL_H
 
+void NVIC_SystemReset(void) NORETURN;
+
 #if (CPY_STM32H7) || (CPY_STM32F7)
 
 // Device memories must be accessed in order.
@@ -247,7 +249,7 @@ void reset_port(void) {
 }
 
 void reset_to_bootloader(void) {
-
+    NVIC_SystemReset();
 }
 
 void reset_cpu(void) {
diff --git a/supervisor/port.h b/supervisor/port.h
index ddb96bd52..f5b3c15d1 100644
--- a/supervisor/port.h
+++ b/supervisor/port.h
@@ -44,7 +44,7 @@ extern uint32_t _ebss;
 safe_mode_t port_init(void);
 
 // Reset the microcontroller completely.
-void reset_cpu(void);
+void reset_cpu(void) NORETURN;
 
 // Reset the microcontroller state.
 void reset_port(void);
@@ -53,7 +53,7 @@ void reset_port(void);
 void reset_board(void);
 
 // Reset to the bootloader
-void reset_to_bootloader(void);
+void reset_to_bootloader(void) NORETURN;
 
 // Get stack limit address
 uint32_t *port_stack_get_limit(void);
diff --git a/supervisor/shared/safe_mode.h b/supervisor/shared/safe_mode.h
index 7d3cd63b5..34fc3c8ae 100644
--- a/supervisor/shared/safe_mode.h
+++ b/supervisor/shared/safe_mode.h
@@ -27,6 +27,8 @@
 #ifndef MICROPY_INCLUDED_SUPERVISOR_SAFE_MODE_H
 #define MICROPY_INCLUDED_SUPERVISOR_SAFE_MODE_H
 
+#include "py/mpconfig.h"
+
 typedef enum {
   NO_SAFE_MODE = 0,
   BROWNOUT,
@@ -48,7 +50,7 @@ typedef enum {
 safe_mode_t wait_for_safe_mode_reset(void);
 
 void safe_mode_on_next_reset(safe_mode_t reason);
-void reset_into_safe_mode(safe_mode_t reason);
+void reset_into_safe_mode(safe_mode_t reason) NORETURN;
 
 void print_safe_mode_message(safe_mode_t reason);
 
diff --git a/supervisor/stub/safe_mode.c b/supervisor/stub/safe_mode.c
index 8072be2c6..a70ac6b6d 100644
--- a/supervisor/stub/safe_mode.c
+++ b/supervisor/stub/safe_mode.c
@@ -26,14 +26,15 @@
 
 #include "supervisor/shared/safe_mode.h"
 
+#include <stdlib.h>
+
 safe_mode_t wait_for_safe_mode_reset(void) {
     return NO_SAFE_MODE;
 }
 
 void reset_into_safe_mode(safe_mode_t reason) {
     (void) reason;
-    for (;;) {
-    }
+    abort();
 }
 
 void print_safe_mode_message(safe_mode_t reason) {
-- 
cgit v1.2.3


From 1dbb59271c6086fa26088c9672be19bb1f66cdfd Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 25 Sep 2020 13:28:04 -0500
Subject: esp32: Use esp_restart from reset_to_bootloader; redeclare it
 NORETURN

---
 ports/esp32s2/supervisor/port.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/supervisor/port.c b/ports/esp32s2/supervisor/port.c
index 60331d08e..8b41076e1 100644
--- a/ports/esp32s2/supervisor/port.c
+++ b/ports/esp32s2/supervisor/port.c
@@ -56,6 +56,8 @@ uint32_t heap_size;
 
 STATIC esp_timer_handle_t _tick_timer;
 
+extern void esp_restart(void) NORETURN;
+
 void tick_timer_cb(void* arg) {
     supervisor_tick();
 }
@@ -118,6 +120,7 @@ void reset_port(void) {
 }
 
 void reset_to_bootloader(void) {
+    esp_restart();
 }
 
 void reset_cpu(void) {
-- 
cgit v1.2.3


From 2a4a244245e3e03bfb89dcc49e56e83b71291bb2 Mon Sep 17 00:00:00 2001
From: "Ryan T. Hamilton" <astrobokonon@gmail.com>
Date: Mon, 28 Sep 2020 17:25:09 -0700
Subject: Add ap_ssid and ap_bssid

---
 ports/esp32s2/common-hal/wifi/Radio.c | 39 +++++++++++++++++++++++++++++++++--
 shared-bindings/wifi/Radio.c          | 34 ++++++++++++++++++++++++++++++
 shared-bindings/wifi/Radio.h          |  2 ++
 3 files changed, 73 insertions(+), 2 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/common-hal/wifi/Radio.c b/ports/esp32s2/common-hal/wifi/Radio.c
index 0184793a1..019e8316c 100644
--- a/ports/esp32s2/common-hal/wifi/Radio.c
+++ b/ports/esp32s2/common-hal/wifi/Radio.c
@@ -38,6 +38,8 @@
 #include "esp-idf/components/esp_wifi/include/esp_wifi.h"
 #include "esp-idf/components/lwip/include/apps/ping/ping_sock.h"
 
+#define MAC_ADDRESS_LENGTH 6
+
 static void start_station(wifi_radio_obj_t *self) {
     if (self->sta_mode) {
         return;
@@ -73,8 +75,6 @@ void common_hal_wifi_radio_set_enabled(wifi_radio_obj_t *self, bool enabled) {
     }
 }
 
-#define MAC_ADDRESS_LENGTH 6
-
 mp_obj_t common_hal_wifi_radio_get_mac_address(wifi_radio_obj_t *self) {
     uint8_t mac[MAC_ADDRESS_LENGTH];
     esp_wifi_get_mac(ESP_IF_WIFI_STA, mac);
@@ -168,6 +168,41 @@ mp_obj_t common_hal_wifi_radio_get_ap_rssi(wifi_radio_obj_t *self) {
     }
 }
 
+mp_obj_t common_hal_wifi_radio_get_ap_ssid(wifi_radio_obj_t *self) {
+    if (!esp_netif_is_netif_up(self->netif)) {
+        return mp_const_none;
+    }
+
+    // Make sure the interface is in STA mode
+    if (self->sta_mode){
+        return mp_const_none;
+    }
+
+    if (esp_wifi_sta_get_ap_info(&self->ap_info) != ESP_OK){
+        return mp_const_none;
+    } else {
+        const char* cstr = (const char*) self->ap_info.ssid;
+        return mp_obj_new_str(cstr, strlen(cstr));
+    }
+}
+
+mp_obj_t common_hal_wifi_radio_get_ap_bssid(wifi_radio_obj_t *self) {
+    if (!esp_netif_is_netif_up(self->netif)) {
+        return mp_const_none;
+    }
+
+    // Make sure the interface is in STA mode
+    if (self->sta_mode){
+        return mp_const_none;
+    }
+
+    if (esp_wifi_sta_get_ap_info(&self->ap_info) != ESP_OK){
+        return mp_const_none;
+    } else {
+        return mp_obj_new_bytes(self->ap_info.bssid, MAC_ADDRESS_LENGTH);
+    }
+}
+
 mp_obj_t common_hal_wifi_radio_get_ipv4_gateway(wifi_radio_obj_t *self) {
     if (!esp_netif_is_netif_up(self->netif)) {
         return mp_const_none;
diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c
index 8c556aafe..96abadf6f 100644
--- a/shared-bindings/wifi/Radio.c
+++ b/shared-bindings/wifi/Radio.c
@@ -179,6 +179,38 @@ const mp_obj_property_t wifi_radio_ap_rssi_obj = {
                (mp_obj_t)&mp_const_none_obj },
 };
 
+//|     ap_ssid: int
+//|     """SSID of the currently connected AP. Returns none if not connected"""
+//|
+STATIC mp_obj_t wifi_radio_get_ap_ssid(mp_obj_t self) {
+    return common_hal_wifi_radio_get_ap_ssid(self);
+
+}
+MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ap_ssid_obj, wifi_radio_get_ap_ssid);
+
+const mp_obj_property_t wifi_radio_ap_ssid_obj = {
+    .base.type = &mp_type_property,
+    .proxy = { (mp_obj_t)&wifi_radio_get_ap_ssid_obj,
+               (mp_obj_t)&mp_const_none_obj,
+               (mp_obj_t)&mp_const_none_obj },
+};
+
+//|     ap_bssid: int
+//|     """BSSID (usually MAC) of the currently connected AP. Returns none if not connected"""
+//|
+STATIC mp_obj_t wifi_radio_get_ap_bssid(mp_obj_t self) {
+    return common_hal_wifi_radio_get_ap_bssid(self);
+
+}
+MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ap_bssid_obj, wifi_radio_get_ap_bssid);
+
+const mp_obj_property_t wifi_radio_ap_bssid_obj = {
+    .base.type = &mp_type_property,
+    .proxy = { (mp_obj_t)&wifi_radio_get_ap_bssid_obj,
+               (mp_obj_t)&mp_const_none_obj,
+               (mp_obj_t)&mp_const_none_obj },
+};
+
 //|     ipv4_gateway: Optional[ipaddress.IPv4Address]
 //|     """IP v4 Address of the gateway when connected to an access point. None otherwise."""
 //|
@@ -284,6 +316,8 @@ STATIC const mp_rom_map_elem_t wifi_radio_locals_dict_table[] = {
     // { MP_ROM_QSTR(MP_QSTR_connect_to_enterprise),    MP_ROM_PTR(&wifi_radio_connect_to_enterprise_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_ap_rssi),    MP_ROM_PTR(&wifi_radio_ap_rssi_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ap_ssid),    MP_ROM_PTR(&wifi_radio_ap_ssid_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ap_bssid),    MP_ROM_PTR(&wifi_radio_ap_bssid_obj) },
     { MP_ROM_QSTR(MP_QSTR_ipv4_dns),    MP_ROM_PTR(&wifi_radio_ipv4_dns_obj) },
     { MP_ROM_QSTR(MP_QSTR_ipv4_gateway),    MP_ROM_PTR(&wifi_radio_ipv4_gateway_obj) },
     { MP_ROM_QSTR(MP_QSTR_ipv4_subnet),    MP_ROM_PTR(&wifi_radio_ipv4_subnet_obj) },
diff --git a/shared-bindings/wifi/Radio.h b/shared-bindings/wifi/Radio.h
index fd0807a86..bf30ac340 100644
--- a/shared-bindings/wifi/Radio.h
+++ b/shared-bindings/wifi/Radio.h
@@ -54,6 +54,8 @@ extern void common_hal_wifi_radio_stop_scanning_networks(wifi_radio_obj_t *self)
 extern wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t* ssid, size_t ssid_len, uint8_t* password, size_t password_len, uint8_t channel, mp_float_t timeout, uint8_t* bssid, size_t bssid_len);
 
 extern mp_obj_t common_hal_wifi_radio_get_ap_rssi(wifi_radio_obj_t *self);
+extern mp_obj_t common_hal_wifi_radio_get_ap_ssid(wifi_radio_obj_t *self);
+extern mp_obj_t common_hal_wifi_radio_get_ap_bssid(wifi_radio_obj_t *self);
 extern mp_obj_t common_hal_wifi_radio_get_ipv4_dns(wifi_radio_obj_t *self);
 extern mp_obj_t common_hal_wifi_radio_get_ipv4_gateway(wifi_radio_obj_t *self);
 extern mp_obj_t common_hal_wifi_radio_get_ipv4_subnet(wifi_radio_obj_t *self);
-- 
cgit v1.2.3


From 4c7d9e3aafbde08399d9839d6cde968f4d1ae005 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Tue, 29 Sep 2020 11:14:30 +0530
Subject: Update make translate script

---
 Makefile                                           |   7 +-
 locale/circuitpython.pot                           | 139 ++++++++++++++++++---
 .../circuitplayground_express/mpconfigboard.h      |   2 +-
 .../mpconfigboard.h                                |   2 +-
 .../mpconfigboard.h                                |   2 +-
 .../boards/escornabot_makech/mpconfigboard.h       |   2 +-
 ports/atmel-samd/boards/meowmeow/mpconfigboard.h   |   2 +-
 .../boards/electroniccats_bastwifi/mpconfigboard.h |   2 +-
 .../boards/espressif_kaluga_1/mpconfigboard.h      |   2 +-
 .../boards/espressif_saola_1_wroom/mpconfigboard.h |   2 +-
 .../espressif_saola_1_wrover/mpconfigboard.h       |   2 +-
 .../boards/microdev_micro_s2/mpconfigboard.h       |   2 +-
 .../boards/muselab_nanoesp32_s2/mpconfigboard.h    |   4 +
 .../unexpectedmaker_feathers2/mpconfigboard.h      |   2 +-
 supervisor/shared/safe_mode.c                      |   4 +-
 15 files changed, 145 insertions(+), 31 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/Makefile b/Makefile
index d016b770f..e7b2bb044 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,8 @@ ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(BASEOPTS)
 # the i18n builder cannot share the environment and doctrees with the others
 I18NSPHINXOPTS  = $(BASEOPTS)
 
-TRANSLATE_SOURCES = extmod lib main.c ports/atmel-samd ports/cxd56 ports/mimxrt10xx ports/nrf ports/stm py shared-bindings shared-module supervisor
+TRANSLATE_SOURCES = extmod lib main.c ports/atmel-samd ports/cxd56 ports/esp32s2 ports/mimxrt10xx ports/nrf ports/stm py shared-bindings shared-module supervisor
+TRANSLATE_SOURCES_EXC = -path ports/*/build-* -o -path ports/esp32s2/esp-idf
 
 .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext stubs
 
@@ -210,7 +211,7 @@ pseudoxml:
 all-source:
 
 locale/circuitpython.pot: all-source
-	find $(TRANSLATE_SOURCES) -iname "*.c" -print | (LC_ALL=C sort) | xgettext -f- -L C -s --add-location=file --keyword=translate -o circuitpython.pot -p locale
+	find $(TRANSLATE_SOURCES) -type d \( $(TRANSLATE_SOURCES_EXC) \) -prune -o -type f \( -iname "*.c" -o -iname "*.h" \) -print | (LC_ALL=C sort) | xgettext -f- -L C -s --add-location=file --keyword=translate -o circuitpython.pot -p locale
 
 # Historically, `make translate` updated the .pot file and ran msgmerge.
 # However, this was a frequent source of merge conflicts.  Weblate can perform
@@ -235,7 +236,7 @@ merge-translate:
 
 .PHONY: check-translate
 check-translate:
-	find $(TRANSLATE_SOURCES) -iname "*.c" -print | (LC_ALL=C sort) | xgettext -f- -L C -s --add-location=file --keyword=translate -o circuitpython.pot.tmp -p locale
+	find $(TRANSLATE_SOURCES) -type d \( $(TRANSLATE_SOURCES_EXC) \) -prune -o -type f \( -iname "*.c" -o -iname "*.h" \) -print | (LC_ALL=C sort) | xgettext -f- -L C -s --add-location=file --keyword=translate -o circuitpython.pot.tmp -p locale
 	$(PYTHON) tools/check_translations.py locale/circuitpython.pot.tmp locale/circuitpython.pot; status=$$?; rm -f locale/circuitpython.pot.tmp; exit $$status
 
 stubs:
diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 2b395356c..b6de5667e 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-24 16:55-0500\n"
+"POT-Creation-Date: 2020-09-29 11:11+0530\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -280,7 +280,7 @@ msgstr ""
 msgid "Address type out of range"
 msgstr ""
 
-#: ports/nrf/common-hal/busio/I2C.c
+#: ports/esp32s2/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
 msgid "All I2C peripherals are in use"
 msgstr ""
 
@@ -288,11 +288,11 @@ msgstr ""
 msgid "All RX FIFOs in use"
 msgstr ""
 
-#: ports/nrf/common-hal/busio/SPI.c
+#: ports/esp32s2/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c
 msgid "All SPI peripherals are in use"
 msgstr ""
 
-#: ports/nrf/common-hal/busio/UART.c
+#: ports/esp32s2/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
 msgid "All UART peripherals are in use"
 msgstr ""
 
@@ -314,6 +314,9 @@ msgstr ""
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/atmel-samd/common-hal/pulseio/PulseOut.c
 #: ports/cxd56/common-hal/pulseio/PulseOut.c
+#: ports/esp32s2/common-hal/neopixel_write/__init__.c
+#: ports/esp32s2/common-hal/pulseio/PulseIn.c
+#: ports/esp32s2/common-hal/pulseio/PulseOut.c
 #: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c ports/nrf/peripherals/nrf/timers.c
 #: ports/stm/peripherals/timers.c shared-bindings/pwmio/PWMOut.c
@@ -333,6 +336,10 @@ msgstr ""
 msgid "Already running"
 msgstr ""
 
+#: ports/esp32s2/common-hal/wifi/Radio.c
+msgid "Already scanning for wifi networks"
+msgstr ""
+
 #: ports/cxd56/common-hal/analogio/AnalogIn.c
 msgid "AnalogIn not supported on given pin"
 msgstr ""
@@ -550,6 +557,7 @@ msgstr ""
 msgid "Cannot set value when direction is input."
 msgstr ""
 
+#: ports/esp32s2/common-hal/busio/UART.c
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "Cannot specify RTS or CTS in RS485 mode"
 msgstr ""
@@ -640,14 +648,15 @@ msgid "Could not initialize SDCard"
 msgstr ""
 
 #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c
+#: ports/esp32s2/common-hal/busio/UART.c
 msgid "Could not initialize UART"
 msgstr ""
 
-#: ports/stm/common-hal/pwmio/PWMOut.c
+#: ports/esp32s2/common-hal/pwmio/PWMOut.c ports/stm/common-hal/pwmio/PWMOut.c
 msgid "Could not initialize channel"
 msgstr ""
 
-#: ports/stm/common-hal/pwmio/PWMOut.c
+#: ports/esp32s2/common-hal/pwmio/PWMOut.c ports/stm/common-hal/pwmio/PWMOut.c
 msgid "Could not initialize timer"
 msgstr ""
 
@@ -663,6 +672,10 @@ msgstr ""
 msgid "Could not restart PWM"
 msgstr ""
 
+#: ports/esp32s2/common-hal/neopixel_write/__init__.c
+msgid "Could not retrieve clock"
+msgstr ""
+
 #: shared-bindings/_bleio/Adapter.c
 msgid "Could not set address"
 msgstr ""
@@ -753,6 +766,10 @@ msgstr ""
 msgid "ECB only operates on 16 bytes at a time"
 msgstr ""
 
+#: ports/esp32s2/common-hal/busio/SPI.c
+msgid "ESP-IDF memory allocation failed"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
 #: ports/atmel-samd/common-hal/ps2io/Ps2.c
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
@@ -810,6 +827,10 @@ msgstr ""
 msgid "FFT is defined for ndarrays only"
 msgstr ""
 
+#: ports/esp32s2/common-hal/socketpool/Socket.c
+msgid "Failed SSL handshake"
+msgstr ""
+
 #: shared-bindings/ps2io/Ps2.c
 msgid "Failed sending command."
 msgstr ""
@@ -826,12 +847,21 @@ msgstr ""
 #: ports/atmel-samd/common-hal/busio/UART.c
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
+#: ports/esp32s2/common-hal/pulseio/PulseIn.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
 #: ports/stm/common-hal/pulseio/PulseIn.c
 #, c-format
 msgid "Failed to allocate RX buffer of %d bytes"
 msgstr ""
 
+#: ports/esp32s2/common-hal/wifi/__init__.c
+msgid "Failed to allocate Wifi memory"
+msgstr ""
+
+#: ports/esp32s2/common-hal/wifi/ScannedNetworks.c
+msgid "Failed to allocate wifi scan memory"
+msgstr ""
+
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Failed to connect: internal error"
 msgstr ""
@@ -840,6 +870,10 @@ msgstr ""
 msgid "Failed to connect: timeout"
 msgstr ""
 
+#: ports/esp32s2/common-hal/wifi/__init__.c
+msgid "Failed to init wifi"
+msgstr ""
+
 #: shared-module/audiomp3/MP3Decoder.c
 msgid "Failed to parse MP3 file"
 msgstr ""
@@ -933,7 +967,7 @@ msgstr ""
 msgid "Input taking too long"
 msgstr ""
 
-#: py/moduerrno.c
+#: ports/esp32s2/common-hal/neopixel_write/__init__.c py/moduerrno.c
 msgid "Input/output error"
 msgstr ""
 
@@ -1026,6 +1060,10 @@ msgstr ""
 msgid "Invalid format chunk size"
 msgstr ""
 
+#: ports/esp32s2/common-hal/pwmio/PWMOut.c
+msgid "Invalid frequency"
+msgstr ""
+
 #: ports/stm/common-hal/pwmio/PWMOut.c
 msgid "Invalid frequency supplied"
 msgstr ""
@@ -1063,6 +1101,8 @@ msgstr ""
 #: ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.c
 #: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c
 #: ports/cxd56/common-hal/busio/UART.c ports/cxd56/common-hal/sdioio/SDCard.c
+#: ports/esp32s2/common-hal/busio/I2C.c ports/esp32s2/common-hal/busio/SPI.c
+#: ports/esp32s2/common-hal/busio/UART.c
 #: ports/mimxrt10xx/common-hal/busio/I2C.c
 #: ports/mimxrt10xx/common-hal/busio/SPI.c
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/I2C.c
@@ -1194,21 +1234,25 @@ msgstr ""
 msgid "No DMA channel found"
 msgstr ""
 
-#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c
+#: ports/esp32s2/common-hal/busio/SPI.c ports/mimxrt10xx/common-hal/busio/SPI.c
+#: ports/stm/common-hal/busio/SPI.c
 msgid "No MISO Pin"
 msgstr ""
 
-#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c
+#: ports/esp32s2/common-hal/busio/SPI.c ports/mimxrt10xx/common-hal/busio/SPI.c
+#: ports/stm/common-hal/busio/SPI.c
 msgid "No MOSI Pin"
 msgstr ""
 
 #: ports/atmel-samd/common-hal/busio/UART.c
+#: ports/esp32s2/common-hal/busio/UART.c
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
 #: ports/stm/common-hal/busio/UART.c
 msgid "No RX pin"
 msgstr ""
 
 #: ports/atmel-samd/common-hal/busio/UART.c
+#: ports/esp32s2/common-hal/busio/UART.c
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
 #: ports/stm/common-hal/busio/UART.c
 msgid "No TX pin"
@@ -1251,6 +1295,14 @@ msgstr ""
 msgid "No long integer support"
 msgstr ""
 
+#: ports/esp32s2/common-hal/pwmio/PWMOut.c
+msgid "No more channels available"
+msgstr ""
+
+#: ports/esp32s2/common-hal/pwmio/PWMOut.c
+msgid "No more timers available"
+msgstr ""
+
 #: ports/stm/common-hal/pwmio/PWMOut.c
 msgid "No more timers available on this pin."
 msgstr ""
@@ -1314,6 +1366,14 @@ msgstr ""
 msgid "Only 8 or 16 bit mono with "
 msgstr ""
 
+#: ports/esp32s2/common-hal/socketpool/SocketPool.c
+msgid "Only IPv4 SOCK_STREAM sockets supported"
+msgstr ""
+
+#: ports/esp32s2/common-hal/wifi/__init__.c
+msgid "Only IPv4 addresses supported"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 #, c-format
 msgid ""
@@ -1331,6 +1391,10 @@ msgstr ""
 msgid "Only raw int supported for ip"
 msgstr ""
 
+#: ports/esp32s2/common-hal/socketpool/SocketPool.c
+msgid "Out of sockets"
+msgstr ""
+
 #: shared-bindings/audiobusio/PDMIn.c
 msgid "Oversample must be multiple of 8."
 msgstr ""
@@ -1345,6 +1409,7 @@ msgid ""
 "PWM frequency not writable when variable_frequency is False on construction."
 msgstr ""
 
+#: ports/esp32s2/common-hal/displayio/ParallelBus.c
 #: ports/mimxrt10xx/common-hal/displayio/ParallelBus.c
 #: ports/stm/common-hal/displayio/ParallelBus.c
 msgid "ParallelBus not yet supported"
@@ -1390,6 +1455,12 @@ msgstr ""
 msgid "Polygon needs at least 3 points"
 msgstr ""
 
+#: ports/esp32s2/common-hal/pulseio/PulseOut.c
+msgid ""
+"Port does not accept PWM carrier. Pass a pin, frequency and duty cycle "
+"instead"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/pulseio/PulseOut.c
 #: ports/cxd56/common-hal/pulseio/PulseOut.c
 #: ports/nrf/common-hal/pulseio/PulseOut.c
@@ -1419,12 +1490,13 @@ msgstr ""
 msgid "RNG Init Error"
 msgstr ""
 
+#: ports/esp32s2/common-hal/busio/UART.c
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "RS485 inversion specified when not in RS485 mode"
 msgstr ""
 
-#: ports/cxd56/common-hal/rtc/RTC.c ports/mimxrt10xx/common-hal/rtc/RTC.c
-#: ports/nrf/common-hal/rtc/RTC.c
+#: ports/cxd56/common-hal/rtc/RTC.c ports/esp32s2/common-hal/rtc/RTC.c
+#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/rtc/RTC.c
 msgid "RTC calibration is not supported on this board"
 msgstr ""
 
@@ -1478,7 +1550,7 @@ msgstr ""
 msgid "SD card CSD format not supported"
 msgstr ""
 
-#: ports/atmel-samd/common-hal/busio/I2C.c
+#: ports/atmel-samd/common-hal/busio/I2C.c ports/esp32s2/common-hal/busio/I2C.c
 #: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
 msgid "SDA or SCL needs a pull up"
 msgstr ""
@@ -1546,6 +1618,10 @@ msgstr ""
 msgid "Slices not supported"
 msgstr ""
 
+#: ports/esp32s2/common-hal/socketpool/SocketPool.c
+msgid "SocketPool can only be used with wifi.radio"
+msgstr ""
+
 #: shared-bindings/aesio/aes.c
 msgid "Source and destination buffers must be the same length"
 msgstr ""
@@ -1708,6 +1784,10 @@ msgstr ""
 msgid "Unable to allocate buffers for signed conversion"
 msgstr ""
 
+#: ports/esp32s2/common-hal/busio/I2C.c
+msgid "Unable to create lock"
+msgstr ""
+
 #: shared-module/displayio/I2CDisplay.c
 #, c-format
 msgid "Unable to find I2C Display at %x"
@@ -1734,6 +1814,11 @@ msgstr ""
 msgid "Unexpected nrfx uuid type"
 msgstr ""
 
+#: ports/esp32s2/common-hal/socketpool/Socket.c
+#, c-format
+msgid "Unhandled ESP TLS error %d %d %x %d"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "Unknown failure"
 msgstr ""
@@ -1769,7 +1854,7 @@ msgid ""
 msgstr ""
 
 #: ports/atmel-samd/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/I2C.c
-#: ports/stm/common-hal/busio/I2C.c
+#: ports/esp32s2/common-hal/busio/UART.c ports/stm/common-hal/busio/I2C.c
 msgid "Unsupported baudrate"
 msgstr ""
 
@@ -2009,6 +2094,7 @@ msgid "byteorder is not a string"
 msgstr ""
 
 #: ports/atmel-samd/common-hal/busio/UART.c
+#: ports/esp32s2/common-hal/busio/UART.c
 msgid "bytes > 8 bits not supported"
 msgstr ""
 
@@ -2523,7 +2609,7 @@ msgstr ""
 msgid "index is out of bounds"
 msgstr ""
 
-#: py/obj.c
+#: ports/esp32s2/common-hal/pulseio/PulseIn.c py/obj.c
 msgid "index out of range"
 msgstr ""
 
@@ -3026,6 +3112,10 @@ msgstr ""
 msgid "polygon can only be registered in one parent"
 msgstr ""
 
+#: ports/esp32s2/common-hal/pulseio/PulseIn.c
+msgid "pop from an empty PulseIn"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
 #: ports/nrf/common-hal/pulseio/PulseIn.c
@@ -3042,6 +3132,24 @@ msgstr ""
 msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
+#: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h
+#: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h
+#: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h
+#: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h
+#: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
+#: ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h
+#: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h
+msgid "pressing boot button at start up.\n"
+msgstr ""
+
+#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+#: ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h
+#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+msgid "pressing both buttons at start up.\n"
+msgstr ""
+
 #: extmod/modutimeq.c
 msgid "queue overflow"
 msgstr ""
@@ -3284,7 +3392,8 @@ msgstr ""
 msgid "tuple/list has wrong length"
 msgstr ""
 
-#: ports/atmel-samd/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
+#: ports/atmel-samd/common-hal/busio/UART.c
+#: ports/esp32s2/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
 #: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c
 msgid "tx and rx cannot both be None"
 msgstr ""
diff --git a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
index 54789f04f..4321335e5 100644
--- a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+++ b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
@@ -25,7 +25,7 @@
 #define CALIBRATE_CRYSTALLESS 1
 
 // Explanation of how a user got into safe mode.
-#define BOARD_USER_SAFE_MODE_ACTION "pressing both buttons at start up.\n"
+#define BOARD_USER_SAFE_MODE_ACTION translate("pressing both buttons at start up.\n")
 
 // Increase stack size slightly due to CPX library import nesting
 #define CIRCUITPY_DEFAULT_STACK_SIZE  (4248) //divisible by 8
diff --git a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
index e377275b7..5673be290 100644
--- a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+++ b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
@@ -27,7 +27,7 @@
 #define USER_NEOPIXELS_PIN      (&pin_PB23)
 
 // Explanation of how a user got into safe mode.
-#define BOARD_USER_SAFE_MODE_ACTION "pressing both buttons at start up.\n"
+#define BOARD_USER_SAFE_MODE_ACTION translate("pressing both buttons at start up.\n")
 
 // Increase stack size slightly due to CPX library import nesting
 #define CIRCUITPY_DEFAULT_STACK_SIZE  (4248) // divisible by 8
diff --git a/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h b/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
index cacbed0de..fab235149 100644
--- a/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+++ b/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
@@ -25,7 +25,7 @@
 #define CALIBRATE_CRYSTALLESS 1
 
 // Explanation of how a user got into safe mode.
-#define BOARD_USER_SAFE_MODE_ACTION "pressing both buttons at start up.\n"
+#define BOARD_USER_SAFE_MODE_ACTION translate("pressing both buttons at start up.\n")
 
 // Increase stack size slightly due to CPX library import nesting.
 #define CIRCUITPY_DEFAULT_STACK_SIZE  (4248)  // divisible by 8
diff --git a/ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h b/ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h
index ac1add545..c4c8c4f3c 100644
--- a/ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h
+++ b/ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h
@@ -11,7 +11,7 @@
 #define CALIBRATE_CRYSTALLESS 1
 
 // Explanation of how a user got into safe mode.
-#define BOARD_USER_SAFE_MODE_ACTION "pressing both buttons at start up.\n"
+#define BOARD_USER_SAFE_MODE_ACTION translate("pressing both buttons at start up.\n")
 
 #define DEFAULT_I2C_BUS_SCL (&pin_PA08)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA09)
diff --git a/ports/atmel-samd/boards/meowmeow/mpconfigboard.h b/ports/atmel-samd/boards/meowmeow/mpconfigboard.h
index 79d477cac..7bbbf3322 100644
--- a/ports/atmel-samd/boards/meowmeow/mpconfigboard.h
+++ b/ports/atmel-samd/boards/meowmeow/mpconfigboard.h
@@ -11,7 +11,7 @@
 #define CALIBRATE_CRYSTALLESS 1
 
 // Explanation of how a user got into safe mode.
-#define BOARD_USER_SAFE_MODE_ACTION "pressing both buttons at start up.\n"
+#define BOARD_USER_SAFE_MODE_ACTION translate("pressing both buttons at start up.\n")
 
 #define DEFAULT_I2C_BUS_SCL (&pin_PA01)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA00)
diff --git a/ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h b/ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h
index 2af3515f4..1ec61e946 100644
--- a/ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h
+++ b/ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h
@@ -31,6 +31,6 @@
 
 #define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
 
-#define BOARD_USER_SAFE_MODE_ACTION "pressing boot button at start up.\n"
+#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
 
 #define AUTORESET_DELAY_MS 500
diff --git a/ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h b/ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h
index a4c8e6576..2c0f175ab 100644
--- a/ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h
+++ b/ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h
@@ -33,6 +33,6 @@
 
 #define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
 
-#define BOARD_USER_SAFE_MODE_ACTION "pressing boot button at start up.\n"
+#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
 
 #define AUTORESET_DELAY_MS 500
diff --git a/ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h b/ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h
index 335aaeb5e..3f628c0f1 100644
--- a/ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h
+++ b/ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h
@@ -33,6 +33,6 @@
 
 #define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
 
-#define BOARD_USER_SAFE_MODE_ACTION "pressing boot button at start up.\n"
+#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
 
 #define AUTORESET_DELAY_MS 500
diff --git a/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h b/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h
index d3ef8bb26..961522891 100644
--- a/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h
+++ b/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h
@@ -33,6 +33,6 @@
 
 #define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
 
-#define BOARD_USER_SAFE_MODE_ACTION "pressing boot button at start up.\n"
+#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
 
 #define AUTORESET_DELAY_MS 500
diff --git a/ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h b/ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
index c138c8ed1..b87b5dfa0 100644
--- a/ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
+++ b/ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
@@ -35,6 +35,6 @@
 
 #define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
 
-#define BOARD_USER_SAFE_MODE_ACTION "pressing boot button at start up.\n"
+#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
 
 #define AUTORESET_DELAY_MS 500
diff --git a/ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h b/ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h
index 5a165decc..6b05ac06f 100644
--- a/ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h
+++ b/ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h
@@ -31,4 +31,8 @@
 
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO18)
 
+#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
+
+#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
+
 #define AUTORESET_DELAY_MS 500
diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h b/ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h
index a65d00206..e5fed4e32 100644
--- a/ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h
+++ b/ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h
@@ -31,7 +31,7 @@
 
 #define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
 
-#define BOARD_USER_SAFE_MODE_ACTION "pressing boot button at start up.\n"
+#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
 
 #define AUTORESET_DELAY_MS 500
 
diff --git a/supervisor/shared/safe_mode.c b/supervisor/shared/safe_mode.c
index 1cf36e4b7..d59e754ed 100644
--- a/supervisor/shared/safe_mode.c
+++ b/supervisor/shared/safe_mode.c
@@ -119,9 +119,9 @@ void print_safe_mode_message(safe_mode_t reason) {
             #ifdef BOARD_USER_SAFE_MODE_ACTION
                 // Output a user safe mode string if it's set.
                 serial_write_compressed(translate("You requested starting safe mode by "));
-                serial_write_compressed(translate(BOARD_USER_SAFE_MODE_ACTION));
+                serial_write_compressed(BOARD_USER_SAFE_MODE_ACTION);
                 serial_write_compressed(translate("To exit, please reset the board without "));
-                serial_write_compressed(translate(BOARD_USER_SAFE_MODE_ACTION));
+                serial_write_compressed(BOARD_USER_SAFE_MODE_ACTION);
             #else
                 break;
             #endif
-- 
cgit v1.2.3


From 2f6d7c90028304d2f38dc17b88ec0514ffe1f256 Mon Sep 17 00:00:00 2001
From: "Ryan T. Hamilton" <astrobokonon@gmail.com>
Date: Tue, 29 Sep 2020 13:41:56 -0700
Subject: Make sure you're a STA before connecting

---
 ports/esp32s2/common-hal/wifi/Radio.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/common-hal/wifi/Radio.c b/ports/esp32s2/common-hal/wifi/Radio.c
index a0b8b6adc..277a837fd 100644
--- a/ports/esp32s2/common-hal/wifi/Radio.c
+++ b/ports/esp32s2/common-hal/wifi/Radio.c
@@ -106,6 +106,8 @@ void common_hal_wifi_radio_stop_scanning_networks(wifi_radio_obj_t *self) {
 
 wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t* ssid, size_t ssid_len, uint8_t* password, size_t password_len, uint8_t channel, mp_float_t timeout, uint8_t* bssid, size_t bssid_len) {
     // check enabled
+    start_station(self);
+
     wifi_config_t* config = &self->sta_config;
     memcpy(&config->sta.ssid, ssid, ssid_len);
     config->sta.ssid[ssid_len] = 0;
-- 
cgit v1.2.3


From a2a0aa058f3330478343faed0345b6a02b0a3b3d Mon Sep 17 00:00:00 2001
From: Seon Rozenblum <seon@unexpectedmaker.com>
Date: Wed, 23 Sep 2020 05:20:10 +1000
Subject: Updated UM boards

---
 .../unexpectedmaker_feathers2/adafruit_dotstar.py  | 198 +++++++++++
 .../adafruit_pypixelbuf.py                         | 374 +++++++++++++++++++++
 .../unexpectedmaker_feathers2/adafruit_requests.py | 311 +++++++++++++++++
 .../boards/unexpectedmaker_feathers2/feathers2.py  |  47 +++
 .../unexpectedmaker_feathers2/mpconfigboard.h      |   5 +-
 .../unexpectedmaker_feathers2/mpconfigboard.mk     |   4 +
 .../boards/unexpectedmaker_feathers2/pins.c        |  64 +++-
 .../adafruit_dotstar.py                            | 198 +++++++++++
 .../adafruit_pypixelbuf.py                         | 374 +++++++++++++++++++++
 .../unexpectedmaker_feathers2_prerelease/board.c   |  56 +++
 .../feathers2.py                                   |  47 +++
 .../mpconfigboard.h                                |  40 +++
 .../mpconfigboard.mk                               |  21 ++
 .../unexpectedmaker_feathers2_prerelease/pins.c    |  56 +++
 .../unexpectedmaker_feathers2_prerelease/sdkconfig |  35 ++
 .../unexpectedmaker_pros2/adafruit_dotstar.py      | 198 +++++++++++
 .../unexpectedmaker_pros2/adafruit_pypixelbuf.py   | 374 +++++++++++++++++++++
 ports/esp32s2/boards/unexpectedmaker_pros2/board.c |  56 +++
 .../boards/unexpectedmaker_pros2/mpconfigboard.h   |  35 ++
 .../boards/unexpectedmaker_pros2/mpconfigboard.mk  |  21 ++
 ports/esp32s2/boards/unexpectedmaker_pros2/pins.c  |  58 ++++
 .../esp32s2/boards/unexpectedmaker_pros2/pros2.py  |  63 ++++
 .../esp32s2/boards/unexpectedmaker_pros2/sdkconfig |  35 ++
 23 files changed, 2659 insertions(+), 11 deletions(-)
 create mode 100755 ports/esp32s2/boards/unexpectedmaker_feathers2/adafruit_dotstar.py
 create mode 100755 ports/esp32s2/boards/unexpectedmaker_feathers2/adafruit_pypixelbuf.py
 create mode 100755 ports/esp32s2/boards/unexpectedmaker_feathers2/adafruit_requests.py
 create mode 100644 ports/esp32s2/boards/unexpectedmaker_feathers2/feathers2.py
 create mode 100755 ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/adafruit_dotstar.py
 create mode 100755 ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/adafruit_pypixelbuf.py
 create mode 100644 ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/board.c
 create mode 100644 ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/feathers2.py
 create mode 100644 ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
 create mode 100644 ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.mk
 create mode 100644 ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/pins.c
 create mode 100644 ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/sdkconfig
 create mode 100755 ports/esp32s2/boards/unexpectedmaker_pros2/adafruit_dotstar.py
 create mode 100755 ports/esp32s2/boards/unexpectedmaker_pros2/adafruit_pypixelbuf.py
 create mode 100644 ports/esp32s2/boards/unexpectedmaker_pros2/board.c
 create mode 100644 ports/esp32s2/boards/unexpectedmaker_pros2/mpconfigboard.h
 create mode 100644 ports/esp32s2/boards/unexpectedmaker_pros2/mpconfigboard.mk
 create mode 100644 ports/esp32s2/boards/unexpectedmaker_pros2/pins.c
 create mode 100644 ports/esp32s2/boards/unexpectedmaker_pros2/pros2.py
 create mode 100644 ports/esp32s2/boards/unexpectedmaker_pros2/sdkconfig

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2/adafruit_dotstar.py b/ports/esp32s2/boards/unexpectedmaker_feathers2/adafruit_dotstar.py
new file mode 100755
index 000000000..65fbbe868
--- /dev/null
+++ b/ports/esp32s2/boards/unexpectedmaker_feathers2/adafruit_dotstar.py
@@ -0,0 +1,198 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2016 Damien P. George (original Neopixel object)
+# Copyright (c) 2017 Ladyada
+# Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
+# Copyright (c) 2019 Roy Hooper
+#
+# 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.
+
+"""
+`adafruit_dotstar` - DotStar strip driver (for CircuitPython 5.0+ with _pixelbuf)
+=================================================================================
+
+* Author(s): Damien P. George, Limor Fried, Scott Shawcroft & Roy Hooper
+"""
+
+# pylint: disable=ungrouped-imports
+import sys
+import busio
+import digitalio
+
+if sys.implementation.version[0] < 5:
+    import adafruit_pypixelbuf as _pixelbuf
+else:
+    try:
+        import _pixelbuf
+    except ImportError:
+        import adafruit_pypixelbuf as _pixelbuf
+
+__version__ = "0.0.0-auto.0"
+__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DotStar.git"
+
+START_HEADER_SIZE = 4
+
+# Pixel color order constants
+RBG = "PRBG"
+"""Red Blue Green"""
+RGB = "PRGB"
+"""Red Green Blue"""
+GRB = "PGRB"
+"""Green Red Blue"""
+GBR = "PGBR"
+"""Green Blue Red"""
+BRG = "PBRG"
+"""Blue Red Green"""
+BGR = "PBGR"
+"""Blue Green Red"""
+
+
+class DotStar(_pixelbuf.PixelBuf):
+    """
+    A sequence of dotstars.
+
+    :param ~microcontroller.Pin clock: The pin to output dotstar clock on.
+    :param ~microcontroller.Pin data: The pin to output dotstar data on.
+    :param int n: The number of dotstars in the chain
+    :param float brightness: Brightness of the pixels between 0.0 and 1.0
+    :param bool auto_write: True if the dotstars should immediately change when
+        set. If False, `show` must be called explicitly.
+    :param str pixel_order: Set the pixel order on the strip - different
+         strips implement this differently. If you send red, and it looks blue
+         or green on the strip, modify this! It should be one of the values above.
+    :param int baudrate: Desired clock rate if using hardware SPI (ignored if
+        using 'soft' SPI). This is only a recommendation; the actual clock
+        rate may be slightly different depending on what the system hardware
+        can provide.
+
+    Example for Gemma M0:
+
+    .. code-block:: python
+
+        import adafruit_dotstar
+        import time
+        from board import *
+
+        RED = 0x100000
+
+        with adafruit_dotstar.DotStar(APA102_SCK, APA102_MOSI, 1) as pixels:
+            pixels[0] = RED
+            time.sleep(2)
+
+    .. py:method:: DotStar.show()
+
+        Shows the new colors on the dotstars themselves if they haven't already
+        been autowritten.
+
+        The colors may or may not be showing after this function returns because
+        it may be done asynchronously.
+
+    .. py:method:: DotStar.fill(color)
+
+        Colors all dotstars the given ***color***.
+
+    .. py:attribute:: brightness
+
+        Overall brightness of all dotstars (0 to 1.0)
+    """
+
+    def __init__(
+        self,
+        clock,
+        data,
+        n,
+        *,
+        brightness=1.0,
+        auto_write=True,
+        pixel_order=BGR,
+        baudrate=4000000
+    ):
+        self._spi = None
+        try:
+            self._spi = busio.SPI(clock, MOSI=data)
+            while not self._spi.try_lock():
+                pass
+            self._spi.configure(baudrate=baudrate)
+
+        except (NotImplementedError, ValueError):
+            self.dpin = digitalio.DigitalInOut(data)
+            self.cpin = digitalio.DigitalInOut(clock)
+            self.dpin.direction = digitalio.Direction.OUTPUT
+            self.cpin.direction = digitalio.Direction.OUTPUT
+            self.cpin.value = False
+
+        # Supply one extra clock cycle for each two pixels in the strip.
+        trailer_size = n // 16
+        if n % 16 != 0:
+            trailer_size += 1
+
+        # Four empty bytes for the header.
+        header = bytearray(START_HEADER_SIZE)
+        # 0xff bytes for the trailer.
+        trailer = bytearray(b"\xff") * trailer_size
+
+        super().__init__(
+            n,
+            byteorder=pixel_order,
+            brightness=brightness,
+            auto_write=auto_write,
+            header=header,
+            trailer=trailer,
+        )
+
+    def deinit(self):
+        """Blank out the DotStars and release the resources."""
+        self.fill(0)
+        self.show()
+        if self._spi:
+            self._spi.deinit()
+        else:
+            self.dpin.deinit()
+            self.cpin.deinit()
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exception_type, exception_value, traceback):
+        self.deinit()
+
+    def __repr__(self):
+        return "[" + ", ".join([str(x) for x in self]) + "]"
+
+    @property
+    def n(self):
+        """
+        The number of dotstars in the chain (read-only)
+        """
+        return len(self)
+
+    def _transmit(self, buffer):
+        if self._spi:
+            self._spi.write(buffer)
+        else:
+            self._ds_writebytes(buffer)
+
+    def _ds_writebytes(self, buffer):
+        for b in buffer:
+            for _ in range(8):
+                self.dpin.value = b & 0x80
+                self.cpin.value = True
+                self.cpin.value = False
+                b = b << 1
+        self.cpin.value = False
diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2/adafruit_pypixelbuf.py b/ports/esp32s2/boards/unexpectedmaker_feathers2/adafruit_pypixelbuf.py
new file mode 100755
index 000000000..3cb83e970
--- /dev/null
+++ b/ports/esp32s2/boards/unexpectedmaker_feathers2/adafruit_pypixelbuf.py
@@ -0,0 +1,374 @@
+# The MIT License (MIT)
+#
+# Based on the Adafruit NeoPixel and Adafruit Dotstar CircuitPython drivers.
+# Copyright (c) 2019-2020 Roy Hooper
+#
+# 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.
+
+"""
+`adafruit_pypixelbuf` - A pure python implementation of _pixelbuf
+=================================================================
+This class is used when _pixelbuf is not available in CircuitPython.  It is based on the work
+in neopixel.py and adafruit_dotstar.py.
+
+* Author(s): Damien P. George &  Limor Fried & Scott Shawcroft & Roy Hooper
+"""
+
+DOTSTAR_LED_START_FULL_BRIGHT = 0xFF
+DOTSTAR_LED_START = 0b11100000  # Three "1" bits, followed by 5 brightness bits
+DOTSTAR_LED_BRIGHTNESS = 0b00011111
+
+
+class PixelBuf:  # pylint: disable=too-many-instance-attributes
+    """
+    A sequence of RGB/RGBW pixels.
+
+    This is the pure python implementation of CircuitPython's _pixelbuf.
+
+    :param ~int n: Number of pixels
+    :param ~str byteorder: Byte order string constant (also sets bpp)
+    :param ~float brightness: Brightness (0 to 1.0, default 1.0)
+    :param ~bool auto_write: Whether to automatically write pixels (Default False)
+    :param bytes header: Sequence of bytes to always send before pixel values.
+    :param bytes trailer: Sequence of bytes to always send after pixel values.
+    """
+
+    def __init__(  # pylint: disable=too-many-locals,too-many-arguments
+        self,
+        n,
+        byteorder="BGR",
+        brightness=1.0,
+        auto_write=False,
+        header=None,
+        trailer=None,
+    ):
+
+        bpp, byteorder_tuple, has_white, dotstar_mode = self.parse_byteorder(byteorder)
+
+        self.auto_write = False
+
+        effective_bpp = 4 if dotstar_mode else bpp
+        _bytes = effective_bpp * n
+        buf = bytearray(_bytes)
+        offset = 0
+
+        if header is not None:
+            if not isinstance(header, bytearray):
+                raise TypeError("header must be a bytearray")
+            buf = header + buf
+            offset = len(header)
+
+        if trailer is not None:
+            if not isinstance(trailer, bytearray):
+                raise TypeError("trailer must be a bytearray")
+            buf += trailer
+
+        self._pixels = n
+        self._bytes = _bytes
+        self._byteorder = byteorder_tuple
+        self._byteorder_string = byteorder
+        self._has_white = has_white
+        self._bpp = bpp
+        self._pre_brightness_buffer = None
+        self._post_brightness_buffer = buf
+        self._offset = offset
+        self._dotstar_mode = dotstar_mode
+        self._pixel_step = effective_bpp
+
+        if dotstar_mode:
+            self._byteorder_tuple = (
+                byteorder_tuple[0] + 1,
+                byteorder_tuple[1] + 1,
+                byteorder_tuple[2] + 1,
+                0,
+            )
+            # Initialize the buffer with the dotstar start bytes.
+            for i in range(self._offset, self._bytes + self._offset, 4):
+                self._post_brightness_buffer[i] = DOTSTAR_LED_START_FULL_BRIGHT
+
+        self._brightness = 1.0
+        self.brightness = brightness
+
+        self.auto_write = auto_write
+
+    @staticmethod
+    def parse_byteorder(byteorder):
+        """
+        Parse a Byteorder string for validity and determine bpp, byte order, and
+        dostar brightness bits.
+
+        Byteorder strings may contain the following characters:
+            R - Red
+            G - Green
+            B - Blue
+            W - White
+            P - PWM (PWM Duty cycle for pixel - dotstars 0 - 1.0)
+
+        :param: ~str bpp: bpp string.
+        :return: ~tuple: bpp, byteorder, has_white, dotstar_mode
+        """
+        bpp = len(byteorder)
+        dotstar_mode = False
+        has_white = False
+
+        if byteorder.strip("RGBWP") != "":
+            raise ValueError("Invalid Byteorder string")
+
+        try:
+            r = byteorder.index("R")
+            g = byteorder.index("G")
+            b = byteorder.index("B")
+        except ValueError:
+            raise ValueError("Invalid Byteorder string")
+        if "W" in byteorder:
+            w = byteorder.index("W")
+            byteorder = (r, g, b, w)
+            has_white = True
+        elif "P" in byteorder:
+            lum = byteorder.index("P")
+            byteorder = (r, g, b, lum)
+            dotstar_mode = True
+        else:
+            byteorder = (r, g, b)
+
+        return bpp, byteorder, has_white, dotstar_mode
+
+    @property
+    def bpp(self):
+        """
+        The number of bytes per pixel in the buffer (read-only).
+        """
+        return self._bpp
+
+    @property
+    def brightness(self):
+        """
+        Float value between 0 and 1.  Output brightness.
+
+        When brightness is less than 1.0, a second buffer will be used to store the color values
+        before they are adjusted for brightness.
+        """
+        return self._brightness
+
+    @brightness.setter
+    def brightness(self, value):
+        value = min(max(value, 0.0), 1.0)
+        change = value - self._brightness
+        if -0.001 < change < 0.001:
+            return
+
+        self._brightness = value
+
+        if self._pre_brightness_buffer is None:
+            self._pre_brightness_buffer = bytearray(self._post_brightness_buffer)
+
+        # Adjust brightness of existing pixels
+        offset_check = self._offset % self._pixel_step
+        for i in range(self._offset, self._bytes + self._offset):
+            # Don't adjust per-pixel luminance bytes in dotstar mode
+            if self._dotstar_mode and (i % 4 != offset_check):
+                continue
+            self._post_brightness_buffer[i] = int(
+                self._pre_brightness_buffer[i] * self._brightness
+            )
+
+        if self.auto_write:
+            self.show()
+
+    @property
+    def byteorder(self):
+        """
+        ByteOrder string for the buffer (read-only)
+        """
+        return self._byteorder_string
+
+    def __len__(self):
+        """
+        Number of pixels.
+        """
+        return self._pixels
+
+    def show(self):
+        """
+        Call the associated write function to display the pixels
+        """
+        return self._transmit(self._post_brightness_buffer)
+
+    def fill(self, color):
+        """
+        Fills the given pixelbuf with the given color.
+        :param pixelbuf: A pixel object.
+        :param color: Color to set.
+        """
+        r, g, b, w = self._parse_color(color)
+        for i in range(self._pixels):
+            self._set_item(i, r, g, b, w)
+        if self.auto_write:
+            self.show()
+
+    def _parse_color(self, value):
+        r = 0
+        g = 0
+        b = 0
+        w = 0
+        if isinstance(value, int):
+            r = value >> 16
+            g = (value >> 8) & 0xFF
+            b = value & 0xFF
+            w = 0
+
+            if self._dotstar_mode:
+                w = 1.0
+        else:
+            if len(value) < 3 or len(value) > 4:
+                raise ValueError(
+                    "Expected tuple of length {}, got {}".format(self._bpp, len(value))
+                )
+            if len(value) == self._bpp:
+                if self._bpp == 3:
+                    r, g, b = value
+                else:
+                    r, g, b, w = value
+            elif len(value) == 3:
+                r, g, b = value
+                if self._dotstar_mode:
+                    w = 1.0
+
+        if self._bpp == 4:
+            if self._dotstar_mode:
+                # LED startframe is three "1" bits, followed by 5 brightness bits
+                # then 8 bits for each of R, G, and B. The order of those 3 are configurable and
+                # vary based on hardware
+                w = (int(w * 31) & 0b00011111) | DOTSTAR_LED_START
+            elif (
+                self._has_white
+                and (isinstance(value, int) or len(value) == 3)
+                and r == g
+                and g == b
+            ):
+                # If all components are the same and we have a white pixel then use it
+                # instead of the individual components when all 4 values aren't explicitly given.
+                w = r
+                r = 0
+                g = 0
+                b = 0
+
+        return (r, g, b, w)
+
+    def _set_item(
+        self, index, r, g, b, w
+    ):  # pylint: disable=too-many-locals,too-many-branches,too-many-arguments
+        if index < 0:
+            index += len(self)
+        if index >= self._pixels or index < 0:
+            raise IndexError
+        offset = self._offset + (index * self._bpp)
+
+        if self._pre_brightness_buffer is not None:
+            if self._bpp == 4:
+                self._pre_brightness_buffer[offset + self._byteorder[3]] = w
+            self._pre_brightness_buffer[offset + self._byteorder[0]] = r
+            self._pre_brightness_buffer[offset + self._byteorder[1]] = g
+            self._pre_brightness_buffer[offset + self._byteorder[2]] = b
+
+        if self._bpp == 4:
+            # Only apply brightness if w is actually white (aka not DotStar.)
+            if not self._dotstar_mode:
+                w = int(w * self._brightness)
+            self._post_brightness_buffer[offset + self._byteorder[3]] = w
+
+        self._post_brightness_buffer[offset + self._byteorder[0]] = int(
+            r * self._brightness
+        )
+        self._post_brightness_buffer[offset + self._byteorder[1]] = int(
+            g * self._brightness
+        )
+        self._post_brightness_buffer[offset + self._byteorder[2]] = int(
+            b * self._brightness
+        )
+
+    def __setitem__(self, index, val):
+        if isinstance(index, slice):
+            start, stop, step = index.indices(self._pixels)
+            for val_i, in_i in enumerate(range(start, stop, step)):
+                r, g, b, w = self._parse_color(val[val_i])
+                self._set_item(in_i, r, g, b, w)
+        else:
+            r, g, b, w = self._parse_color(val)
+            self._set_item(index, r, g, b, w)
+
+        if self.auto_write:
+            self.show()
+
+    def _getitem(self, index):
+        start = self._offset + (index * self._bpp)
+        buffer = (
+            self._pre_brightness_buffer
+            if self._pre_brightness_buffer is not None
+            else self._post_brightness_buffer
+        )
+        value = [
+            buffer[start + self._byteorder[0]],
+            buffer[start + self._byteorder[1]],
+            buffer[start + self._byteorder[2]],
+        ]
+        if self._has_white:
+            value.append(buffer[start + self._byteorder[3]])
+        elif self._dotstar_mode:
+            value.append(
+                (buffer[start + self._byteorder[3]] & DOTSTAR_LED_BRIGHTNESS) / 31.0
+            )
+        return value
+
+    def __getitem__(self, index):
+        if isinstance(index, slice):
+            out = []
+            for in_i in range(
+                *index.indices(len(self._post_brightness_buffer) // self._bpp)
+            ):
+                out.append(self._getitem(in_i))
+            return out
+        if index < 0:
+            index += len(self)
+        if index >= self._pixels or index < 0:
+            raise IndexError
+        return self._getitem(index)
+
+    def _transmit(self, buffer):
+        raise NotImplementedError("Must be subclassed")
+
+
+def wheel(pos):
+    """
+    Helper to create a colorwheel.
+
+    :param pos: int 0-255 of color value to return
+    :return: tuple of RGB values
+    """
+    # Input a value 0 to 255 to get a color value.
+    # The colours are a transition r - g - b - back to r.
+    if pos < 0 or pos > 255:
+        return 0, 0, 0
+    if pos < 85:
+        return 255 - pos * 3, pos * 3, 0
+    if pos < 170:
+        pos -= 85
+        return 0, 255 - pos * 3, pos * 3
+    pos -= 170
+    return pos * 3, 0, 255 - pos * 3
diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2/adafruit_requests.py b/ports/esp32s2/boards/unexpectedmaker_feathers2/adafruit_requests.py
new file mode 100755
index 000000000..0888937bf
--- /dev/null
+++ b/ports/esp32s2/boards/unexpectedmaker_feathers2/adafruit_requests.py
@@ -0,0 +1,311 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2019 ladyada 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.
+"""
+`adafruit_requests`
+================================================================================
+
+A requests-like library for web interfacing
+
+
+* Author(s): ladyada, Paul Sokolovsky
+
+Implementation Notes
+--------------------
+
+Adapted from https://github.com/micropython/micropython-lib/tree/master/urequests
+
+micropython-lib consists of multiple modules from different sources and
+authors. Each module comes under its own licensing terms. Short name of
+a license can be found in a file within a module directory (usually
+metadata.txt or setup.py). Complete text of each license used is provided
+at https://github.com/micropython/micropython-lib/blob/master/LICENSE
+
+author='Paul Sokolovsky'
+license='MIT'
+
+**Software and Dependencies:**
+
+* Adafruit CircuitPython firmware for the supported boards:
+  https://github.com/adafruit/circuitpython/releases
+
+"""
+
+import gc
+
+__version__ = "0.0.0-auto.0"
+__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_Requests.git"
+
+_the_interface = None  # pylint: disable=invalid-name
+_the_sock = None  # pylint: disable=invalid-name
+
+
+def set_socket(sock, iface=None):
+    """Helper to set the global socket and optionally set the global network interface.
+    :param sock: socket object.
+    :param iface: internet interface object
+
+    """
+    global _the_sock  # pylint: disable=invalid-name, global-statement
+    _the_sock = sock
+    if iface:
+        global _the_interface  # pylint: disable=invalid-name, global-statement
+        _the_interface = iface
+        _the_sock.set_interface(iface)
+
+
+class Response:
+    """The response from a request, contains all the headers/content"""
+
+    encoding = None
+
+    def __init__(self, sock):
+        self.socket = sock
+        self.encoding = "utf-8"
+        self._cached = None
+        self.status_code = None
+        self.reason = None
+        self._read_so_far = 0
+        self.headers = {}
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        self.close()
+
+    def close(self):
+        """Close, delete and collect the response data"""
+        if self.socket:
+            self.socket.close()
+            del self.socket
+        del self._cached
+        gc.collect()
+
+    @property
+    def content(self):
+        """The HTTP content direct from the socket, as bytes"""
+        # print(self.headers)
+        try:
+            content_length = int(self.headers["content-length"])
+        except KeyError:
+            content_length = 0
+        # print("Content length:", content_length)
+        if self._cached is None:
+            try:
+                self._cached = self.socket.recv(content_length)
+            finally:
+                self.socket.close()
+                self.socket = None
+        # print("Buffer length:", len(self._cached))
+        return self._cached
+
+    @property
+    def text(self):
+        """The HTTP content, encoded into a string according to the HTTP
+        header encoding"""
+        return str(self.content, self.encoding)
+
+    def json(self):
+        """The HTTP content, parsed into a json dictionary"""
+        # pylint: disable=import-outside-toplevel
+        try:
+            import json as json_module
+        except ImportError:
+            import ujson as json_module
+        return json_module.loads(self.content)
+
+    def iter_content(self, chunk_size=1, decode_unicode=False):
+        """An iterator that will stream data by only reading 'chunk_size'
+        bytes and yielding them, when we can't buffer the whole datastream"""
+        if decode_unicode:
+            raise NotImplementedError("Unicode not supported")
+
+        while True:
+            chunk = self.socket.recv(chunk_size)
+            if chunk:
+                yield chunk
+            else:
+                return
+
+
+# pylint: disable=too-many-branches, too-many-statements, unused-argument, too-many-arguments, too-many-locals
+def request(method, url, data=None, json=None, headers=None, stream=False, timeout=1):
+    """Perform an HTTP request to the given url which we will parse to determine
+    whether to use SSL ('https://') or not. We can also send some provided 'data'
+    or a json dictionary which we will stringify. 'headers' is optional HTTP headers
+    sent along. 'stream' will determine if we buffer everything, or whether to only
+    read only when requested
+    """
+    global _the_interface  # pylint: disable=global-statement, invalid-name
+    global _the_sock  # pylint: disable=global-statement, invalid-name
+
+    if not headers:
+        headers = {}
+
+    try:
+        proto, dummy, host, path = url.split("/", 3)
+        # replace spaces in path
+        path = path.replace(" ", "%20")
+    except ValueError:
+        proto, dummy, host = url.split("/", 2)
+        path = ""
+    if proto == "http:":
+        port = 80
+    elif proto == "https:":
+        port = 443
+    else:
+        raise ValueError("Unsupported protocol: " + proto)
+
+    if ":" in host:
+        host, port = host.split(":", 1)
+        port = int(port)
+
+    addr_info = _the_sock.getaddrinfo(host, port, 0, _the_sock.SOCK_STREAM)[0]
+    sock = _the_sock.socket(addr_info[0], addr_info[1], addr_info[2])
+    resp = Response(sock)  # our response
+
+    sock.settimeout(timeout)  # socket read timeout
+
+    try:
+        if proto == "https:":
+            conntype = _the_interface.TLS_MODE
+            sock.connect(
+                (host, port), conntype
+            )  # for SSL we need to know the host name
+        else:
+            conntype = _the_interface.TCP_MODE
+            sock.connect(addr_info[-1], conntype)
+        sock.send(
+            b"%s /%s HTTP/1.0\r\n" % (bytes(method, "utf-8"), bytes(path, "utf-8"))
+        )
+        if "Host" not in headers:
+            sock.send(b"Host: %s\r\n" % bytes(host, "utf-8"))
+        if "User-Agent" not in headers:
+            sock.send(b"User-Agent: Adafruit CircuitPython\r\n")
+        # Iterate over keys to avoid tuple alloc
+        for k in headers:
+            sock.send(k.encode())
+            sock.send(b": ")
+            sock.send(headers[k].encode())
+            sock.send(b"\r\n")
+        if json is not None:
+            assert data is None
+            # pylint: disable=import-outside-toplevel
+            try:
+                import json as json_module
+            except ImportError:
+                import ujson as json_module
+            # pylint: enable=import-outside-toplevel
+            data = json_module.dumps(json)
+            sock.send(b"Content-Type: application/json\r\n")
+        if data:
+            if isinstance(data, dict):
+                sock.send(b"Content-Type: application/x-www-form-urlencoded\r\n")
+                _post_data = ""
+                for k in data:
+                    _post_data = "{}&{}={}".format(_post_data, k, data[k])
+                data = _post_data[1:]
+            sock.send(b"Content-Length: %d\r\n" % len(data))
+        sock.send(b"\r\n")
+        if data:
+            if isinstance(data, bytearray):
+                sock.send(bytes(data))
+            else:
+                sock.send(bytes(data, "utf-8"))
+
+        line = sock.readline()
+        # print(line)
+        line = line.split(None, 2)
+        status = int(line[1])
+        reason = ""
+        if len(line) > 2:
+            reason = line[2].rstrip()
+        resp.headers = parse_headers(sock)
+        if resp.headers.get("transfer-encoding"):
+            if "chunked" in resp.headers.get("transfer-encoding"):
+                raise ValueError("Unsupported " + resp.headers.get("transfer-encoding"))
+        elif resp.headers.get("location") and not 200 <= status <= 299:
+            raise NotImplementedError("Redirects not yet supported")
+
+    except:
+        sock.close()
+        raise
+
+    resp.status_code = status
+    resp.reason = reason
+    return resp
+
+
+def parse_headers(sock):
+    """
+    Parses the header portion of an HTTP request/response from the socket.
+    Expects first line of HTTP request/response to have been read already
+    return: header dictionary
+    rtype: Dict
+    """
+    headers = {}
+    while True:
+        line = sock.readline()
+        if not line or line == b"\r\n":
+            break
+
+        # print("**line: ", line)
+        splits = line.split(b": ", 1)
+        title = splits[0]
+        content = ""
+        if len(splits) > 1:
+            content = splits[1]
+        if title and content:
+            title = str(title.lower(), "utf-8")
+            content = str(content, "utf-8")
+            headers[title] = content
+    return headers
+
+
+def head(url, **kw):
+    """Send HTTP HEAD request"""
+    return request("HEAD", url, **kw)
+
+
+def get(url, **kw):
+    """Send HTTP GET request"""
+    return request("GET", url, **kw)
+
+
+def post(url, **kw):
+    """Send HTTP POST request"""
+    return request("POST", url, **kw)
+
+
+def put(url, **kw):
+    """Send HTTP PUT request"""
+    return request("PUT", url, **kw)
+
+
+def patch(url, **kw):
+    """Send HTTP PATCH request"""
+    return request("PATCH", url, **kw)
+
+
+def delete(url, **kw):
+    """Send HTTP DELETE request"""
+    return request("DELETE", url, **kw)
diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2/feathers2.py b/ports/esp32s2/boards/unexpectedmaker_feathers2/feathers2.py
new file mode 100644
index 000000000..0631cad7f
--- /dev/null
+++ b/ports/esp32s2/boards/unexpectedmaker_feathers2/feathers2.py
@@ -0,0 +1,47 @@
+# FeatherS2 Helper Library
+# 2020 Seon Rozenblum, Unexpected Maker
+#
+# Project home:
+#   https://feathers2.io
+#
+
+# Import required libraries
+import time
+import board
+from digitalio import DigitalInOut, Direction, Pull
+ 
+
+# Helper functions
+
+def enable_LDO2(state):
+    """Set the power for the second on-board LDO to allow no current draw when not needed."""
+
+    # Grab a reference to the LDO2 IO (21 in this case)
+    ldo2 = DigitalInOut(board.LDO2)
+    ldo2.direction = Direction.OUTPUT
+
+    # Set the LDO2 power pin on / off
+    ldo2.value = state
+
+    # A small delay to let the IO change state
+    time.sleep(0.035)
+
+
+# Dotstar rainbow colour wheel
+def dotstar_color_wheel(wheel_pos):
+    """Color wheel to allow for cycling through the rainbow of RGB colors."""
+    wheel_pos = wheel_pos % 255
+
+    if wheel_pos < 85:
+        return 255 - wheel_pos * 3, 0, wheel_pos * 3
+    elif wheel_pos < 170:
+        wheel_pos -= 85
+        return 0, wheel_pos * 3, 255 - wheel_pos * 3
+    else:
+        wheel_pos -= 170
+        return wheel_pos * 3, 255 - wheel_pos * 3, 0
+
+
+
+# Disable LDO2 by default
+enable_LDO2(False)
diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h b/ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h
index e5fed4e32..a77de1511 100644
--- a/ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h
+++ b/ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h
@@ -35,6 +35,5 @@
 
 #define AUTORESET_DELAY_MS 500
 
-// Doesn't work with this on.
-// #define MICROPY_HW_APA102_MOSI   (&pin_GPIO44)
-// #define MICROPY_HW_APA102_SCK    (&pin_GPIO45)
+#define MICROPY_HW_APA102_MOSI   (&pin_GPIO40)
+#define MICROPY_HW_APA102_SCK    (&pin_GPIO45)
diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.mk b/ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.mk
index 294736d17..91c321af9 100644
--- a/ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.mk
+++ b/ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.mk
@@ -16,3 +16,7 @@ CIRCUITPY_ESP_FLASH_FREQ=40m
 CIRCUITPY_ESP_FLASH_SIZE=16MB
 
 CIRCUITPY_BITBANG_APA102 = 1
+
+# Include these Python libraries in firmware.
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar
+
diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2/pins.c b/ports/esp32s2/boards/unexpectedmaker_feathers2/pins.c
index e8dd2edf6..5a29e029c 100644
--- a/ports/esp32s2/boards/unexpectedmaker_feathers2/pins.c
+++ b/ports/esp32s2/boards/unexpectedmaker_feathers2/pins.c
@@ -1,55 +1,103 @@
 #include "shared-bindings/board/__init__.h"
 
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) },
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO17) },
     { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO17) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },
     { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO18) },
     { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO18) },
 
-    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO14) },
-    { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO13) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
     { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO12) },
     { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO12) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },
     { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO6) },
     { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO6) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
     { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO5) },
     { MP_ROM_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_GPIO5) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) },
     { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO36) },
     { MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO36) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO35), MP_ROM_PTR(&pin_GPIO35) },
     { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO35) },
     { MP_ROM_QSTR(MP_QSTR_D24), MP_ROM_PTR(&pin_GPIO35) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) },
     { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO37) },
     { MP_ROM_QSTR(MP_QSTR_D23), MP_ROM_PTR(&pin_GPIO37) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44) },
     { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO44) },
     { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) },
     { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO43) },
     { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
 
-    // Moving to 9 and 8
-    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO38) },
-    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO8) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO9) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },
     { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_A10), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },
     { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_A9), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
     { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO7) },
-    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO8) },
-    { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_A8), MP_ROM_PTR(&pin_GPIO7) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO33), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_D20), MP_ROM_PTR(&pin_GPIO33) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO38) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
     { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO10) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },
     { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO11) },
 
-    { MP_ROM_QSTR(MP_QSTR_APA102_MOSI), MP_ROM_PTR(&pin_GPIO44) }, // MTDO
+    // { MP_ROM_QSTR(MP_QSTR_IO40), MP_ROM_PTR(&pin_GPIO40) }, // MTDO
+    { MP_ROM_QSTR(MP_QSTR_APA102_MOSI), MP_ROM_PTR(&pin_GPIO40) }, // MTDO
+
+    // { MP_ROM_QSTR(MP_QSTR_IO45), MP_ROM_PTR(&pin_GPIO45) },
     { MP_ROM_QSTR(MP_QSTR_APA102_SCK), MP_ROM_PTR(&pin_GPIO45) },
 
+
+    { MP_ROM_QSTR(MP_QSTR_LDO2), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
     { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_AMB), MP_ROM_PTR(&pin_GPIO4) },
+
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
     { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
     { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/adafruit_dotstar.py b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/adafruit_dotstar.py
new file mode 100755
index 000000000..65fbbe868
--- /dev/null
+++ b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/adafruit_dotstar.py
@@ -0,0 +1,198 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2016 Damien P. George (original Neopixel object)
+# Copyright (c) 2017 Ladyada
+# Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
+# Copyright (c) 2019 Roy Hooper
+#
+# 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.
+
+"""
+`adafruit_dotstar` - DotStar strip driver (for CircuitPython 5.0+ with _pixelbuf)
+=================================================================================
+
+* Author(s): Damien P. George, Limor Fried, Scott Shawcroft & Roy Hooper
+"""
+
+# pylint: disable=ungrouped-imports
+import sys
+import busio
+import digitalio
+
+if sys.implementation.version[0] < 5:
+    import adafruit_pypixelbuf as _pixelbuf
+else:
+    try:
+        import _pixelbuf
+    except ImportError:
+        import adafruit_pypixelbuf as _pixelbuf
+
+__version__ = "0.0.0-auto.0"
+__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DotStar.git"
+
+START_HEADER_SIZE = 4
+
+# Pixel color order constants
+RBG = "PRBG"
+"""Red Blue Green"""
+RGB = "PRGB"
+"""Red Green Blue"""
+GRB = "PGRB"
+"""Green Red Blue"""
+GBR = "PGBR"
+"""Green Blue Red"""
+BRG = "PBRG"
+"""Blue Red Green"""
+BGR = "PBGR"
+"""Blue Green Red"""
+
+
+class DotStar(_pixelbuf.PixelBuf):
+    """
+    A sequence of dotstars.
+
+    :param ~microcontroller.Pin clock: The pin to output dotstar clock on.
+    :param ~microcontroller.Pin data: The pin to output dotstar data on.
+    :param int n: The number of dotstars in the chain
+    :param float brightness: Brightness of the pixels between 0.0 and 1.0
+    :param bool auto_write: True if the dotstars should immediately change when
+        set. If False, `show` must be called explicitly.
+    :param str pixel_order: Set the pixel order on the strip - different
+         strips implement this differently. If you send red, and it looks blue
+         or green on the strip, modify this! It should be one of the values above.
+    :param int baudrate: Desired clock rate if using hardware SPI (ignored if
+        using 'soft' SPI). This is only a recommendation; the actual clock
+        rate may be slightly different depending on what the system hardware
+        can provide.
+
+    Example for Gemma M0:
+
+    .. code-block:: python
+
+        import adafruit_dotstar
+        import time
+        from board import *
+
+        RED = 0x100000
+
+        with adafruit_dotstar.DotStar(APA102_SCK, APA102_MOSI, 1) as pixels:
+            pixels[0] = RED
+            time.sleep(2)
+
+    .. py:method:: DotStar.show()
+
+        Shows the new colors on the dotstars themselves if they haven't already
+        been autowritten.
+
+        The colors may or may not be showing after this function returns because
+        it may be done asynchronously.
+
+    .. py:method:: DotStar.fill(color)
+
+        Colors all dotstars the given ***color***.
+
+    .. py:attribute:: brightness
+
+        Overall brightness of all dotstars (0 to 1.0)
+    """
+
+    def __init__(
+        self,
+        clock,
+        data,
+        n,
+        *,
+        brightness=1.0,
+        auto_write=True,
+        pixel_order=BGR,
+        baudrate=4000000
+    ):
+        self._spi = None
+        try:
+            self._spi = busio.SPI(clock, MOSI=data)
+            while not self._spi.try_lock():
+                pass
+            self._spi.configure(baudrate=baudrate)
+
+        except (NotImplementedError, ValueError):
+            self.dpin = digitalio.DigitalInOut(data)
+            self.cpin = digitalio.DigitalInOut(clock)
+            self.dpin.direction = digitalio.Direction.OUTPUT
+            self.cpin.direction = digitalio.Direction.OUTPUT
+            self.cpin.value = False
+
+        # Supply one extra clock cycle for each two pixels in the strip.
+        trailer_size = n // 16
+        if n % 16 != 0:
+            trailer_size += 1
+
+        # Four empty bytes for the header.
+        header = bytearray(START_HEADER_SIZE)
+        # 0xff bytes for the trailer.
+        trailer = bytearray(b"\xff") * trailer_size
+
+        super().__init__(
+            n,
+            byteorder=pixel_order,
+            brightness=brightness,
+            auto_write=auto_write,
+            header=header,
+            trailer=trailer,
+        )
+
+    def deinit(self):
+        """Blank out the DotStars and release the resources."""
+        self.fill(0)
+        self.show()
+        if self._spi:
+            self._spi.deinit()
+        else:
+            self.dpin.deinit()
+            self.cpin.deinit()
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exception_type, exception_value, traceback):
+        self.deinit()
+
+    def __repr__(self):
+        return "[" + ", ".join([str(x) for x in self]) + "]"
+
+    @property
+    def n(self):
+        """
+        The number of dotstars in the chain (read-only)
+        """
+        return len(self)
+
+    def _transmit(self, buffer):
+        if self._spi:
+            self._spi.write(buffer)
+        else:
+            self._ds_writebytes(buffer)
+
+    def _ds_writebytes(self, buffer):
+        for b in buffer:
+            for _ in range(8):
+                self.dpin.value = b & 0x80
+                self.cpin.value = True
+                self.cpin.value = False
+                b = b << 1
+        self.cpin.value = False
diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/adafruit_pypixelbuf.py b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/adafruit_pypixelbuf.py
new file mode 100755
index 000000000..3cb83e970
--- /dev/null
+++ b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/adafruit_pypixelbuf.py
@@ -0,0 +1,374 @@
+# The MIT License (MIT)
+#
+# Based on the Adafruit NeoPixel and Adafruit Dotstar CircuitPython drivers.
+# Copyright (c) 2019-2020 Roy Hooper
+#
+# 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.
+
+"""
+`adafruit_pypixelbuf` - A pure python implementation of _pixelbuf
+=================================================================
+This class is used when _pixelbuf is not available in CircuitPython.  It is based on the work
+in neopixel.py and adafruit_dotstar.py.
+
+* Author(s): Damien P. George &  Limor Fried & Scott Shawcroft & Roy Hooper
+"""
+
+DOTSTAR_LED_START_FULL_BRIGHT = 0xFF
+DOTSTAR_LED_START = 0b11100000  # Three "1" bits, followed by 5 brightness bits
+DOTSTAR_LED_BRIGHTNESS = 0b00011111
+
+
+class PixelBuf:  # pylint: disable=too-many-instance-attributes
+    """
+    A sequence of RGB/RGBW pixels.
+
+    This is the pure python implementation of CircuitPython's _pixelbuf.
+
+    :param ~int n: Number of pixels
+    :param ~str byteorder: Byte order string constant (also sets bpp)
+    :param ~float brightness: Brightness (0 to 1.0, default 1.0)
+    :param ~bool auto_write: Whether to automatically write pixels (Default False)
+    :param bytes header: Sequence of bytes to always send before pixel values.
+    :param bytes trailer: Sequence of bytes to always send after pixel values.
+    """
+
+    def __init__(  # pylint: disable=too-many-locals,too-many-arguments
+        self,
+        n,
+        byteorder="BGR",
+        brightness=1.0,
+        auto_write=False,
+        header=None,
+        trailer=None,
+    ):
+
+        bpp, byteorder_tuple, has_white, dotstar_mode = self.parse_byteorder(byteorder)
+
+        self.auto_write = False
+
+        effective_bpp = 4 if dotstar_mode else bpp
+        _bytes = effective_bpp * n
+        buf = bytearray(_bytes)
+        offset = 0
+
+        if header is not None:
+            if not isinstance(header, bytearray):
+                raise TypeError("header must be a bytearray")
+            buf = header + buf
+            offset = len(header)
+
+        if trailer is not None:
+            if not isinstance(trailer, bytearray):
+                raise TypeError("trailer must be a bytearray")
+            buf += trailer
+
+        self._pixels = n
+        self._bytes = _bytes
+        self._byteorder = byteorder_tuple
+        self._byteorder_string = byteorder
+        self._has_white = has_white
+        self._bpp = bpp
+        self._pre_brightness_buffer = None
+        self._post_brightness_buffer = buf
+        self._offset = offset
+        self._dotstar_mode = dotstar_mode
+        self._pixel_step = effective_bpp
+
+        if dotstar_mode:
+            self._byteorder_tuple = (
+                byteorder_tuple[0] + 1,
+                byteorder_tuple[1] + 1,
+                byteorder_tuple[2] + 1,
+                0,
+            )
+            # Initialize the buffer with the dotstar start bytes.
+            for i in range(self._offset, self._bytes + self._offset, 4):
+                self._post_brightness_buffer[i] = DOTSTAR_LED_START_FULL_BRIGHT
+
+        self._brightness = 1.0
+        self.brightness = brightness
+
+        self.auto_write = auto_write
+
+    @staticmethod
+    def parse_byteorder(byteorder):
+        """
+        Parse a Byteorder string for validity and determine bpp, byte order, and
+        dostar brightness bits.
+
+        Byteorder strings may contain the following characters:
+            R - Red
+            G - Green
+            B - Blue
+            W - White
+            P - PWM (PWM Duty cycle for pixel - dotstars 0 - 1.0)
+
+        :param: ~str bpp: bpp string.
+        :return: ~tuple: bpp, byteorder, has_white, dotstar_mode
+        """
+        bpp = len(byteorder)
+        dotstar_mode = False
+        has_white = False
+
+        if byteorder.strip("RGBWP") != "":
+            raise ValueError("Invalid Byteorder string")
+
+        try:
+            r = byteorder.index("R")
+            g = byteorder.index("G")
+            b = byteorder.index("B")
+        except ValueError:
+            raise ValueError("Invalid Byteorder string")
+        if "W" in byteorder:
+            w = byteorder.index("W")
+            byteorder = (r, g, b, w)
+            has_white = True
+        elif "P" in byteorder:
+            lum = byteorder.index("P")
+            byteorder = (r, g, b, lum)
+            dotstar_mode = True
+        else:
+            byteorder = (r, g, b)
+
+        return bpp, byteorder, has_white, dotstar_mode
+
+    @property
+    def bpp(self):
+        """
+        The number of bytes per pixel in the buffer (read-only).
+        """
+        return self._bpp
+
+    @property
+    def brightness(self):
+        """
+        Float value between 0 and 1.  Output brightness.
+
+        When brightness is less than 1.0, a second buffer will be used to store the color values
+        before they are adjusted for brightness.
+        """
+        return self._brightness
+
+    @brightness.setter
+    def brightness(self, value):
+        value = min(max(value, 0.0), 1.0)
+        change = value - self._brightness
+        if -0.001 < change < 0.001:
+            return
+
+        self._brightness = value
+
+        if self._pre_brightness_buffer is None:
+            self._pre_brightness_buffer = bytearray(self._post_brightness_buffer)
+
+        # Adjust brightness of existing pixels
+        offset_check = self._offset % self._pixel_step
+        for i in range(self._offset, self._bytes + self._offset):
+            # Don't adjust per-pixel luminance bytes in dotstar mode
+            if self._dotstar_mode and (i % 4 != offset_check):
+                continue
+            self._post_brightness_buffer[i] = int(
+                self._pre_brightness_buffer[i] * self._brightness
+            )
+
+        if self.auto_write:
+            self.show()
+
+    @property
+    def byteorder(self):
+        """
+        ByteOrder string for the buffer (read-only)
+        """
+        return self._byteorder_string
+
+    def __len__(self):
+        """
+        Number of pixels.
+        """
+        return self._pixels
+
+    def show(self):
+        """
+        Call the associated write function to display the pixels
+        """
+        return self._transmit(self._post_brightness_buffer)
+
+    def fill(self, color):
+        """
+        Fills the given pixelbuf with the given color.
+        :param pixelbuf: A pixel object.
+        :param color: Color to set.
+        """
+        r, g, b, w = self._parse_color(color)
+        for i in range(self._pixels):
+            self._set_item(i, r, g, b, w)
+        if self.auto_write:
+            self.show()
+
+    def _parse_color(self, value):
+        r = 0
+        g = 0
+        b = 0
+        w = 0
+        if isinstance(value, int):
+            r = value >> 16
+            g = (value >> 8) & 0xFF
+            b = value & 0xFF
+            w = 0
+
+            if self._dotstar_mode:
+                w = 1.0
+        else:
+            if len(value) < 3 or len(value) > 4:
+                raise ValueError(
+                    "Expected tuple of length {}, got {}".format(self._bpp, len(value))
+                )
+            if len(value) == self._bpp:
+                if self._bpp == 3:
+                    r, g, b = value
+                else:
+                    r, g, b, w = value
+            elif len(value) == 3:
+                r, g, b = value
+                if self._dotstar_mode:
+                    w = 1.0
+
+        if self._bpp == 4:
+            if self._dotstar_mode:
+                # LED startframe is three "1" bits, followed by 5 brightness bits
+                # then 8 bits for each of R, G, and B. The order of those 3 are configurable and
+                # vary based on hardware
+                w = (int(w * 31) & 0b00011111) | DOTSTAR_LED_START
+            elif (
+                self._has_white
+                and (isinstance(value, int) or len(value) == 3)
+                and r == g
+                and g == b
+            ):
+                # If all components are the same and we have a white pixel then use it
+                # instead of the individual components when all 4 values aren't explicitly given.
+                w = r
+                r = 0
+                g = 0
+                b = 0
+
+        return (r, g, b, w)
+
+    def _set_item(
+        self, index, r, g, b, w
+    ):  # pylint: disable=too-many-locals,too-many-branches,too-many-arguments
+        if index < 0:
+            index += len(self)
+        if index >= self._pixels or index < 0:
+            raise IndexError
+        offset = self._offset + (index * self._bpp)
+
+        if self._pre_brightness_buffer is not None:
+            if self._bpp == 4:
+                self._pre_brightness_buffer[offset + self._byteorder[3]] = w
+            self._pre_brightness_buffer[offset + self._byteorder[0]] = r
+            self._pre_brightness_buffer[offset + self._byteorder[1]] = g
+            self._pre_brightness_buffer[offset + self._byteorder[2]] = b
+
+        if self._bpp == 4:
+            # Only apply brightness if w is actually white (aka not DotStar.)
+            if not self._dotstar_mode:
+                w = int(w * self._brightness)
+            self._post_brightness_buffer[offset + self._byteorder[3]] = w
+
+        self._post_brightness_buffer[offset + self._byteorder[0]] = int(
+            r * self._brightness
+        )
+        self._post_brightness_buffer[offset + self._byteorder[1]] = int(
+            g * self._brightness
+        )
+        self._post_brightness_buffer[offset + self._byteorder[2]] = int(
+            b * self._brightness
+        )
+
+    def __setitem__(self, index, val):
+        if isinstance(index, slice):
+            start, stop, step = index.indices(self._pixels)
+            for val_i, in_i in enumerate(range(start, stop, step)):
+                r, g, b, w = self._parse_color(val[val_i])
+                self._set_item(in_i, r, g, b, w)
+        else:
+            r, g, b, w = self._parse_color(val)
+            self._set_item(index, r, g, b, w)
+
+        if self.auto_write:
+            self.show()
+
+    def _getitem(self, index):
+        start = self._offset + (index * self._bpp)
+        buffer = (
+            self._pre_brightness_buffer
+            if self._pre_brightness_buffer is not None
+            else self._post_brightness_buffer
+        )
+        value = [
+            buffer[start + self._byteorder[0]],
+            buffer[start + self._byteorder[1]],
+            buffer[start + self._byteorder[2]],
+        ]
+        if self._has_white:
+            value.append(buffer[start + self._byteorder[3]])
+        elif self._dotstar_mode:
+            value.append(
+                (buffer[start + self._byteorder[3]] & DOTSTAR_LED_BRIGHTNESS) / 31.0
+            )
+        return value
+
+    def __getitem__(self, index):
+        if isinstance(index, slice):
+            out = []
+            for in_i in range(
+                *index.indices(len(self._post_brightness_buffer) // self._bpp)
+            ):
+                out.append(self._getitem(in_i))
+            return out
+        if index < 0:
+            index += len(self)
+        if index >= self._pixels or index < 0:
+            raise IndexError
+        return self._getitem(index)
+
+    def _transmit(self, buffer):
+        raise NotImplementedError("Must be subclassed")
+
+
+def wheel(pos):
+    """
+    Helper to create a colorwheel.
+
+    :param pos: int 0-255 of color value to return
+    :return: tuple of RGB values
+    """
+    # Input a value 0 to 255 to get a color value.
+    # The colours are a transition r - g - b - back to r.
+    if pos < 0 or pos > 255:
+        return 0, 0, 0
+    if pos < 85:
+        return 255 - pos * 3, pos * 3, 0
+    if pos < 170:
+        pos -= 85
+        return 0, 255 - pos * 3, pos * 3
+    pos -= 170
+    return pos * 3, 0, 255 - pos * 3
diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/board.c b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/board.c
new file mode 100644
index 000000000..1dc30b5af
--- /dev/null
+++ b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/board.c
@@ -0,0 +1,56 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 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 "boards/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
+
+void board_init(void) {
+    // USB
+    common_hal_never_reset_pin(&pin_GPIO19);
+    common_hal_never_reset_pin(&pin_GPIO20);
+
+    // Debug UART
+    common_hal_never_reset_pin(&pin_GPIO43);
+    common_hal_never_reset_pin(&pin_GPIO44);
+
+    // SPI Flash and RAM
+    common_hal_never_reset_pin(&pin_GPIO26);
+    common_hal_never_reset_pin(&pin_GPIO27);
+    common_hal_never_reset_pin(&pin_GPIO28);
+    common_hal_never_reset_pin(&pin_GPIO29);
+    common_hal_never_reset_pin(&pin_GPIO30);
+    common_hal_never_reset_pin(&pin_GPIO31);
+    common_hal_never_reset_pin(&pin_GPIO32);
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+
+}
diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/feathers2.py b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/feathers2.py
new file mode 100644
index 000000000..0631cad7f
--- /dev/null
+++ b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/feathers2.py
@@ -0,0 +1,47 @@
+# FeatherS2 Helper Library
+# 2020 Seon Rozenblum, Unexpected Maker
+#
+# Project home:
+#   https://feathers2.io
+#
+
+# Import required libraries
+import time
+import board
+from digitalio import DigitalInOut, Direction, Pull
+ 
+
+# Helper functions
+
+def enable_LDO2(state):
+    """Set the power for the second on-board LDO to allow no current draw when not needed."""
+
+    # Grab a reference to the LDO2 IO (21 in this case)
+    ldo2 = DigitalInOut(board.LDO2)
+    ldo2.direction = Direction.OUTPUT
+
+    # Set the LDO2 power pin on / off
+    ldo2.value = state
+
+    # A small delay to let the IO change state
+    time.sleep(0.035)
+
+
+# Dotstar rainbow colour wheel
+def dotstar_color_wheel(wheel_pos):
+    """Color wheel to allow for cycling through the rainbow of RGB colors."""
+    wheel_pos = wheel_pos % 255
+
+    if wheel_pos < 85:
+        return 255 - wheel_pos * 3, 0, wheel_pos * 3
+    elif wheel_pos < 170:
+        wheel_pos -= 85
+        return 0, wheel_pos * 3, 255 - wheel_pos * 3
+    else:
+        wheel_pos -= 170
+        return wheel_pos * 3, 255 - wheel_pos * 3, 0
+
+
+
+# Disable LDO2 by default
+enable_LDO2(False)
diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
new file mode 100644
index 000000000..a65d00206
--- /dev/null
+++ b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 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.
+ */
+
+//Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "FeatherS2"
+#define MICROPY_HW_MCU_NAME         "ESP32S2"
+
+#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
+
+#define BOARD_USER_SAFE_MODE_ACTION "pressing boot button at start up.\n"
+
+#define AUTORESET_DELAY_MS 500
+
+// Doesn't work with this on.
+// #define MICROPY_HW_APA102_MOSI   (&pin_GPIO44)
+// #define MICROPY_HW_APA102_SCK    (&pin_GPIO45)
diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.mk b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.mk
new file mode 100644
index 000000000..4c809471b
--- /dev/null
+++ b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.mk
@@ -0,0 +1,21 @@
+USB_VID = 0x239A
+USB_PID = 0x80AC
+USB_PRODUCT = "FeatherS2"
+USB_MANUFACTURER = "UnexpectedMaker"
+USB_DEVICES = "CDC,MSC,HID"
+
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = MPZ
+
+# The default queue depth of 16 overflows on release builds,
+# so increase it to 32.
+CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
+
+CIRCUITPY_ESP_FLASH_MODE=qio
+CIRCUITPY_ESP_FLASH_FREQ=40m
+CIRCUITPY_ESP_FLASH_SIZE=16MB
+
+CIRCUITPY_BITBANG_APA102 = 1
+
+# Include these Python libraries in firmware.
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar
\ No newline at end of file
diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/pins.c b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/pins.c
new file mode 100644
index 000000000..9476cafdf
--- /dev/null
+++ b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/pins.c
@@ -0,0 +1,56 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO17) },
+
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO18) },
+
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO12) },
+
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO6) },
+
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO36) },
+
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_D24), MP_ROM_PTR(&pin_GPIO35) },
+
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_D23), MP_ROM_PTR(&pin_GPIO37) },
+
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO44) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
+
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
+
+    // Moving to 9 and 8
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO11) },
+
+    { MP_ROM_QSTR(MP_QSTR_APA102_MOSI), MP_ROM_PTR(&pin_GPIO40) }, // MTDO
+    { MP_ROM_QSTR(MP_QSTR_APA102_SCK), MP_ROM_PTR(&pin_GPIO45) },
+    { MP_ROM_QSTR(MP_QSTR_LDO2), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_AMB), MP_ROM_PTR(&pin_GPIO4) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
+    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/sdkconfig b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/sdkconfig
new file mode 100644
index 000000000..b73c4a8c2
--- /dev/null
+++ b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/sdkconfig
@@ -0,0 +1,35 @@
+CONFIG_ESP32S2_SPIRAM_SUPPORT=y
+
+#
+# SPI RAM config
+#
+# CONFIG_SPIRAM_TYPE_AUTO is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+CONFIG_SPIRAM_TYPE_ESPPSRAM64=y
+CONFIG_SPIRAM_SIZE=8388608
+
+#
+# PSRAM clock and cs IO for ESP32S2
+#
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
+CONFIG_DEFAULT_PSRAM_CS_IO=26
+# end of PSRAM clock and cs IO for ESP32S2
+
+CONFIG_SPIRAM_SPIWP_SD3_PIN=28
+# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
+# CONFIG_SPIRAM_RODATA is not set
+# CONFIG_SPIRAM_USE_AHB_DBUS3 is not set
+# CONFIG_SPIRAM_SPEED_80M is not set
+CONFIG_SPIRAM_SPEED_40M=y
+# CONFIG_SPIRAM_SPEED_26M is not set
+# CONFIG_SPIRAM_SPEED_20M is not set
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
+CONFIG_SPIRAM_USE_MEMMAP=y
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
+# end of SPI RAM config
diff --git a/ports/esp32s2/boards/unexpectedmaker_pros2/adafruit_dotstar.py b/ports/esp32s2/boards/unexpectedmaker_pros2/adafruit_dotstar.py
new file mode 100755
index 000000000..65fbbe868
--- /dev/null
+++ b/ports/esp32s2/boards/unexpectedmaker_pros2/adafruit_dotstar.py
@@ -0,0 +1,198 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2016 Damien P. George (original Neopixel object)
+# Copyright (c) 2017 Ladyada
+# Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
+# Copyright (c) 2019 Roy Hooper
+#
+# 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.
+
+"""
+`adafruit_dotstar` - DotStar strip driver (for CircuitPython 5.0+ with _pixelbuf)
+=================================================================================
+
+* Author(s): Damien P. George, Limor Fried, Scott Shawcroft & Roy Hooper
+"""
+
+# pylint: disable=ungrouped-imports
+import sys
+import busio
+import digitalio
+
+if sys.implementation.version[0] < 5:
+    import adafruit_pypixelbuf as _pixelbuf
+else:
+    try:
+        import _pixelbuf
+    except ImportError:
+        import adafruit_pypixelbuf as _pixelbuf
+
+__version__ = "0.0.0-auto.0"
+__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DotStar.git"
+
+START_HEADER_SIZE = 4
+
+# Pixel color order constants
+RBG = "PRBG"
+"""Red Blue Green"""
+RGB = "PRGB"
+"""Red Green Blue"""
+GRB = "PGRB"
+"""Green Red Blue"""
+GBR = "PGBR"
+"""Green Blue Red"""
+BRG = "PBRG"
+"""Blue Red Green"""
+BGR = "PBGR"
+"""Blue Green Red"""
+
+
+class DotStar(_pixelbuf.PixelBuf):
+    """
+    A sequence of dotstars.
+
+    :param ~microcontroller.Pin clock: The pin to output dotstar clock on.
+    :param ~microcontroller.Pin data: The pin to output dotstar data on.
+    :param int n: The number of dotstars in the chain
+    :param float brightness: Brightness of the pixels between 0.0 and 1.0
+    :param bool auto_write: True if the dotstars should immediately change when
+        set. If False, `show` must be called explicitly.
+    :param str pixel_order: Set the pixel order on the strip - different
+         strips implement this differently. If you send red, and it looks blue
+         or green on the strip, modify this! It should be one of the values above.
+    :param int baudrate: Desired clock rate if using hardware SPI (ignored if
+        using 'soft' SPI). This is only a recommendation; the actual clock
+        rate may be slightly different depending on what the system hardware
+        can provide.
+
+    Example for Gemma M0:
+
+    .. code-block:: python
+
+        import adafruit_dotstar
+        import time
+        from board import *
+
+        RED = 0x100000
+
+        with adafruit_dotstar.DotStar(APA102_SCK, APA102_MOSI, 1) as pixels:
+            pixels[0] = RED
+            time.sleep(2)
+
+    .. py:method:: DotStar.show()
+
+        Shows the new colors on the dotstars themselves if they haven't already
+        been autowritten.
+
+        The colors may or may not be showing after this function returns because
+        it may be done asynchronously.
+
+    .. py:method:: DotStar.fill(color)
+
+        Colors all dotstars the given ***color***.
+
+    .. py:attribute:: brightness
+
+        Overall brightness of all dotstars (0 to 1.0)
+    """
+
+    def __init__(
+        self,
+        clock,
+        data,
+        n,
+        *,
+        brightness=1.0,
+        auto_write=True,
+        pixel_order=BGR,
+        baudrate=4000000
+    ):
+        self._spi = None
+        try:
+            self._spi = busio.SPI(clock, MOSI=data)
+            while not self._spi.try_lock():
+                pass
+            self._spi.configure(baudrate=baudrate)
+
+        except (NotImplementedError, ValueError):
+            self.dpin = digitalio.DigitalInOut(data)
+            self.cpin = digitalio.DigitalInOut(clock)
+            self.dpin.direction = digitalio.Direction.OUTPUT
+            self.cpin.direction = digitalio.Direction.OUTPUT
+            self.cpin.value = False
+
+        # Supply one extra clock cycle for each two pixels in the strip.
+        trailer_size = n // 16
+        if n % 16 != 0:
+            trailer_size += 1
+
+        # Four empty bytes for the header.
+        header = bytearray(START_HEADER_SIZE)
+        # 0xff bytes for the trailer.
+        trailer = bytearray(b"\xff") * trailer_size
+
+        super().__init__(
+            n,
+            byteorder=pixel_order,
+            brightness=brightness,
+            auto_write=auto_write,
+            header=header,
+            trailer=trailer,
+        )
+
+    def deinit(self):
+        """Blank out the DotStars and release the resources."""
+        self.fill(0)
+        self.show()
+        if self._spi:
+            self._spi.deinit()
+        else:
+            self.dpin.deinit()
+            self.cpin.deinit()
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exception_type, exception_value, traceback):
+        self.deinit()
+
+    def __repr__(self):
+        return "[" + ", ".join([str(x) for x in self]) + "]"
+
+    @property
+    def n(self):
+        """
+        The number of dotstars in the chain (read-only)
+        """
+        return len(self)
+
+    def _transmit(self, buffer):
+        if self._spi:
+            self._spi.write(buffer)
+        else:
+            self._ds_writebytes(buffer)
+
+    def _ds_writebytes(self, buffer):
+        for b in buffer:
+            for _ in range(8):
+                self.dpin.value = b & 0x80
+                self.cpin.value = True
+                self.cpin.value = False
+                b = b << 1
+        self.cpin.value = False
diff --git a/ports/esp32s2/boards/unexpectedmaker_pros2/adafruit_pypixelbuf.py b/ports/esp32s2/boards/unexpectedmaker_pros2/adafruit_pypixelbuf.py
new file mode 100755
index 000000000..3cb83e970
--- /dev/null
+++ b/ports/esp32s2/boards/unexpectedmaker_pros2/adafruit_pypixelbuf.py
@@ -0,0 +1,374 @@
+# The MIT License (MIT)
+#
+# Based on the Adafruit NeoPixel and Adafruit Dotstar CircuitPython drivers.
+# Copyright (c) 2019-2020 Roy Hooper
+#
+# 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.
+
+"""
+`adafruit_pypixelbuf` - A pure python implementation of _pixelbuf
+=================================================================
+This class is used when _pixelbuf is not available in CircuitPython.  It is based on the work
+in neopixel.py and adafruit_dotstar.py.
+
+* Author(s): Damien P. George &  Limor Fried & Scott Shawcroft & Roy Hooper
+"""
+
+DOTSTAR_LED_START_FULL_BRIGHT = 0xFF
+DOTSTAR_LED_START = 0b11100000  # Three "1" bits, followed by 5 brightness bits
+DOTSTAR_LED_BRIGHTNESS = 0b00011111
+
+
+class PixelBuf:  # pylint: disable=too-many-instance-attributes
+    """
+    A sequence of RGB/RGBW pixels.
+
+    This is the pure python implementation of CircuitPython's _pixelbuf.
+
+    :param ~int n: Number of pixels
+    :param ~str byteorder: Byte order string constant (also sets bpp)
+    :param ~float brightness: Brightness (0 to 1.0, default 1.0)
+    :param ~bool auto_write: Whether to automatically write pixels (Default False)
+    :param bytes header: Sequence of bytes to always send before pixel values.
+    :param bytes trailer: Sequence of bytes to always send after pixel values.
+    """
+
+    def __init__(  # pylint: disable=too-many-locals,too-many-arguments
+        self,
+        n,
+        byteorder="BGR",
+        brightness=1.0,
+        auto_write=False,
+        header=None,
+        trailer=None,
+    ):
+
+        bpp, byteorder_tuple, has_white, dotstar_mode = self.parse_byteorder(byteorder)
+
+        self.auto_write = False
+
+        effective_bpp = 4 if dotstar_mode else bpp
+        _bytes = effective_bpp * n
+        buf = bytearray(_bytes)
+        offset = 0
+
+        if header is not None:
+            if not isinstance(header, bytearray):
+                raise TypeError("header must be a bytearray")
+            buf = header + buf
+            offset = len(header)
+
+        if trailer is not None:
+            if not isinstance(trailer, bytearray):
+                raise TypeError("trailer must be a bytearray")
+            buf += trailer
+
+        self._pixels = n
+        self._bytes = _bytes
+        self._byteorder = byteorder_tuple
+        self._byteorder_string = byteorder
+        self._has_white = has_white
+        self._bpp = bpp
+        self._pre_brightness_buffer = None
+        self._post_brightness_buffer = buf
+        self._offset = offset
+        self._dotstar_mode = dotstar_mode
+        self._pixel_step = effective_bpp
+
+        if dotstar_mode:
+            self._byteorder_tuple = (
+                byteorder_tuple[0] + 1,
+                byteorder_tuple[1] + 1,
+                byteorder_tuple[2] + 1,
+                0,
+            )
+            # Initialize the buffer with the dotstar start bytes.
+            for i in range(self._offset, self._bytes + self._offset, 4):
+                self._post_brightness_buffer[i] = DOTSTAR_LED_START_FULL_BRIGHT
+
+        self._brightness = 1.0
+        self.brightness = brightness
+
+        self.auto_write = auto_write
+
+    @staticmethod
+    def parse_byteorder(byteorder):
+        """
+        Parse a Byteorder string for validity and determine bpp, byte order, and
+        dostar brightness bits.
+
+        Byteorder strings may contain the following characters:
+            R - Red
+            G - Green
+            B - Blue
+            W - White
+            P - PWM (PWM Duty cycle for pixel - dotstars 0 - 1.0)
+
+        :param: ~str bpp: bpp string.
+        :return: ~tuple: bpp, byteorder, has_white, dotstar_mode
+        """
+        bpp = len(byteorder)
+        dotstar_mode = False
+        has_white = False
+
+        if byteorder.strip("RGBWP") != "":
+            raise ValueError("Invalid Byteorder string")
+
+        try:
+            r = byteorder.index("R")
+            g = byteorder.index("G")
+            b = byteorder.index("B")
+        except ValueError:
+            raise ValueError("Invalid Byteorder string")
+        if "W" in byteorder:
+            w = byteorder.index("W")
+            byteorder = (r, g, b, w)
+            has_white = True
+        elif "P" in byteorder:
+            lum = byteorder.index("P")
+            byteorder = (r, g, b, lum)
+            dotstar_mode = True
+        else:
+            byteorder = (r, g, b)
+
+        return bpp, byteorder, has_white, dotstar_mode
+
+    @property
+    def bpp(self):
+        """
+        The number of bytes per pixel in the buffer (read-only).
+        """
+        return self._bpp
+
+    @property
+    def brightness(self):
+        """
+        Float value between 0 and 1.  Output brightness.
+
+        When brightness is less than 1.0, a second buffer will be used to store the color values
+        before they are adjusted for brightness.
+        """
+        return self._brightness
+
+    @brightness.setter
+    def brightness(self, value):
+        value = min(max(value, 0.0), 1.0)
+        change = value - self._brightness
+        if -0.001 < change < 0.001:
+            return
+
+        self._brightness = value
+
+        if self._pre_brightness_buffer is None:
+            self._pre_brightness_buffer = bytearray(self._post_brightness_buffer)
+
+        # Adjust brightness of existing pixels
+        offset_check = self._offset % self._pixel_step
+        for i in range(self._offset, self._bytes + self._offset):
+            # Don't adjust per-pixel luminance bytes in dotstar mode
+            if self._dotstar_mode and (i % 4 != offset_check):
+                continue
+            self._post_brightness_buffer[i] = int(
+                self._pre_brightness_buffer[i] * self._brightness
+            )
+
+        if self.auto_write:
+            self.show()
+
+    @property
+    def byteorder(self):
+        """
+        ByteOrder string for the buffer (read-only)
+        """
+        return self._byteorder_string
+
+    def __len__(self):
+        """
+        Number of pixels.
+        """
+        return self._pixels
+
+    def show(self):
+        """
+        Call the associated write function to display the pixels
+        """
+        return self._transmit(self._post_brightness_buffer)
+
+    def fill(self, color):
+        """
+        Fills the given pixelbuf with the given color.
+        :param pixelbuf: A pixel object.
+        :param color: Color to set.
+        """
+        r, g, b, w = self._parse_color(color)
+        for i in range(self._pixels):
+            self._set_item(i, r, g, b, w)
+        if self.auto_write:
+            self.show()
+
+    def _parse_color(self, value):
+        r = 0
+        g = 0
+        b = 0
+        w = 0
+        if isinstance(value, int):
+            r = value >> 16
+            g = (value >> 8) & 0xFF
+            b = value & 0xFF
+            w = 0
+
+            if self._dotstar_mode:
+                w = 1.0
+        else:
+            if len(value) < 3 or len(value) > 4:
+                raise ValueError(
+                    "Expected tuple of length {}, got {}".format(self._bpp, len(value))
+                )
+            if len(value) == self._bpp:
+                if self._bpp == 3:
+                    r, g, b = value
+                else:
+                    r, g, b, w = value
+            elif len(value) == 3:
+                r, g, b = value
+                if self._dotstar_mode:
+                    w = 1.0
+
+        if self._bpp == 4:
+            if self._dotstar_mode:
+                # LED startframe is three "1" bits, followed by 5 brightness bits
+                # then 8 bits for each of R, G, and B. The order of those 3 are configurable and
+                # vary based on hardware
+                w = (int(w * 31) & 0b00011111) | DOTSTAR_LED_START
+            elif (
+                self._has_white
+                and (isinstance(value, int) or len(value) == 3)
+                and r == g
+                and g == b
+            ):
+                # If all components are the same and we have a white pixel then use it
+                # instead of the individual components when all 4 values aren't explicitly given.
+                w = r
+                r = 0
+                g = 0
+                b = 0
+
+        return (r, g, b, w)
+
+    def _set_item(
+        self, index, r, g, b, w
+    ):  # pylint: disable=too-many-locals,too-many-branches,too-many-arguments
+        if index < 0:
+            index += len(self)
+        if index >= self._pixels or index < 0:
+            raise IndexError
+        offset = self._offset + (index * self._bpp)
+
+        if self._pre_brightness_buffer is not None:
+            if self._bpp == 4:
+                self._pre_brightness_buffer[offset + self._byteorder[3]] = w
+            self._pre_brightness_buffer[offset + self._byteorder[0]] = r
+            self._pre_brightness_buffer[offset + self._byteorder[1]] = g
+            self._pre_brightness_buffer[offset + self._byteorder[2]] = b
+
+        if self._bpp == 4:
+            # Only apply brightness if w is actually white (aka not DotStar.)
+            if not self._dotstar_mode:
+                w = int(w * self._brightness)
+            self._post_brightness_buffer[offset + self._byteorder[3]] = w
+
+        self._post_brightness_buffer[offset + self._byteorder[0]] = int(
+            r * self._brightness
+        )
+        self._post_brightness_buffer[offset + self._byteorder[1]] = int(
+            g * self._brightness
+        )
+        self._post_brightness_buffer[offset + self._byteorder[2]] = int(
+            b * self._brightness
+        )
+
+    def __setitem__(self, index, val):
+        if isinstance(index, slice):
+            start, stop, step = index.indices(self._pixels)
+            for val_i, in_i in enumerate(range(start, stop, step)):
+                r, g, b, w = self._parse_color(val[val_i])
+                self._set_item(in_i, r, g, b, w)
+        else:
+            r, g, b, w = self._parse_color(val)
+            self._set_item(index, r, g, b, w)
+
+        if self.auto_write:
+            self.show()
+
+    def _getitem(self, index):
+        start = self._offset + (index * self._bpp)
+        buffer = (
+            self._pre_brightness_buffer
+            if self._pre_brightness_buffer is not None
+            else self._post_brightness_buffer
+        )
+        value = [
+            buffer[start + self._byteorder[0]],
+            buffer[start + self._byteorder[1]],
+            buffer[start + self._byteorder[2]],
+        ]
+        if self._has_white:
+            value.append(buffer[start + self._byteorder[3]])
+        elif self._dotstar_mode:
+            value.append(
+                (buffer[start + self._byteorder[3]] & DOTSTAR_LED_BRIGHTNESS) / 31.0
+            )
+        return value
+
+    def __getitem__(self, index):
+        if isinstance(index, slice):
+            out = []
+            for in_i in range(
+                *index.indices(len(self._post_brightness_buffer) // self._bpp)
+            ):
+                out.append(self._getitem(in_i))
+            return out
+        if index < 0:
+            index += len(self)
+        if index >= self._pixels or index < 0:
+            raise IndexError
+        return self._getitem(index)
+
+    def _transmit(self, buffer):
+        raise NotImplementedError("Must be subclassed")
+
+
+def wheel(pos):
+    """
+    Helper to create a colorwheel.
+
+    :param pos: int 0-255 of color value to return
+    :return: tuple of RGB values
+    """
+    # Input a value 0 to 255 to get a color value.
+    # The colours are a transition r - g - b - back to r.
+    if pos < 0 or pos > 255:
+        return 0, 0, 0
+    if pos < 85:
+        return 255 - pos * 3, pos * 3, 0
+    if pos < 170:
+        pos -= 85
+        return 0, 255 - pos * 3, pos * 3
+    pos -= 170
+    return pos * 3, 0, 255 - pos * 3
diff --git a/ports/esp32s2/boards/unexpectedmaker_pros2/board.c b/ports/esp32s2/boards/unexpectedmaker_pros2/board.c
new file mode 100644
index 000000000..1dc30b5af
--- /dev/null
+++ b/ports/esp32s2/boards/unexpectedmaker_pros2/board.c
@@ -0,0 +1,56 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 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 "boards/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
+
+void board_init(void) {
+    // USB
+    common_hal_never_reset_pin(&pin_GPIO19);
+    common_hal_never_reset_pin(&pin_GPIO20);
+
+    // Debug UART
+    common_hal_never_reset_pin(&pin_GPIO43);
+    common_hal_never_reset_pin(&pin_GPIO44);
+
+    // SPI Flash and RAM
+    common_hal_never_reset_pin(&pin_GPIO26);
+    common_hal_never_reset_pin(&pin_GPIO27);
+    common_hal_never_reset_pin(&pin_GPIO28);
+    common_hal_never_reset_pin(&pin_GPIO29);
+    common_hal_never_reset_pin(&pin_GPIO30);
+    common_hal_never_reset_pin(&pin_GPIO31);
+    common_hal_never_reset_pin(&pin_GPIO32);
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+
+}
diff --git a/ports/esp32s2/boards/unexpectedmaker_pros2/mpconfigboard.h b/ports/esp32s2/boards/unexpectedmaker_pros2/mpconfigboard.h
new file mode 100644
index 000000000..2cfb7b6a0
--- /dev/null
+++ b/ports/esp32s2/boards/unexpectedmaker_pros2/mpconfigboard.h
@@ -0,0 +1,35 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 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.
+ */
+
+//Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "ProS2"
+#define MICROPY_HW_MCU_NAME         "ESP32S2"
+
+#define AUTORESET_DELAY_MS 500
+
+#define MICROPY_HW_APA102_MOSI   (&pin_GPIO40)
+#define MICROPY_HW_APA102_SCK    (&pin_GPIO45)
diff --git a/ports/esp32s2/boards/unexpectedmaker_pros2/mpconfigboard.mk b/ports/esp32s2/boards/unexpectedmaker_pros2/mpconfigboard.mk
new file mode 100644
index 000000000..cb6823ba6
--- /dev/null
+++ b/ports/esp32s2/boards/unexpectedmaker_pros2/mpconfigboard.mk
@@ -0,0 +1,21 @@
+USB_VID = 0x239A
+USB_PID = 0x80AA
+USB_PRODUCT = "ProS2"
+USB_MANUFACTURER = "UnexpectedMaker"
+USB_DEVICES = "CDC,MSC,HID"
+
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = MPZ
+
+# The default queue depth of 16 overflows on release builds,
+# so increase it to 32.
+CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
+
+CIRCUITPY_ESP_FLASH_MODE=qio
+CIRCUITPY_ESP_FLASH_FREQ=40m
+CIRCUITPY_ESP_FLASH_SIZE=16MB
+
+CIRCUITPY_BITBANG_APA102 = 1
+
+# Include these Python libraries in firmware.
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar
diff --git a/ports/esp32s2/boards/unexpectedmaker_pros2/pins.c b/ports/esp32s2/boards/unexpectedmaker_pros2/pins.c
new file mode 100644
index 000000000..349ad1bd5
--- /dev/null
+++ b/ports/esp32s2/boards/unexpectedmaker_pros2/pins.c
@@ -0,0 +1,58 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO17) },
+
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO18) },
+
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO4) },
+
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO12) },
+
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO6) },
+
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO36) },
+
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_D24), MP_ROM_PTR(&pin_GPIO35) },
+
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_D23), MP_ROM_PTR(&pin_GPIO37) },
+
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO44) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
+
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO11) },
+
+    { MP_ROM_QSTR(MP_QSTR_APA102_MOSI), MP_ROM_PTR(&pin_GPIO40) }, // MTDO
+    { MP_ROM_QSTR(MP_QSTR_APA102_SCK), MP_ROM_PTR(&pin_GPIO45) },
+
+    { MP_ROM_QSTR(MP_QSTR_LDO2), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_VBAT_SENSE), MP_ROM_PTR(&pin_GPIO14) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
+    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
diff --git a/ports/esp32s2/boards/unexpectedmaker_pros2/pros2.py b/ports/esp32s2/boards/unexpectedmaker_pros2/pros2.py
new file mode 100644
index 000000000..3d2397d5d
--- /dev/null
+++ b/ports/esp32s2/boards/unexpectedmaker_pros2/pros2.py
@@ -0,0 +1,63 @@
+# Pros2 Helper Library
+# 2020 Seon Rozenblum, Unexpected Maker
+#
+# Project home:
+#   https://pros2.io
+#
+
+# Import required libraries
+import time
+import board
+from digitalio import DigitalInOut, Direction, Pull
+from analogio import AnalogIn
+ 
+
+# Helper functions
+
+def enable_LDO2(state):
+    """Set the power for the second on-board LDO to allow no current draw when not needed."""
+
+    # Grab a reference to the LDO2 IO (21 in this case)
+    ldo2 = DigitalInOut(board.LDO2)
+    ldo2.direction = Direction.OUTPUT
+
+    # Set the LDO2 power pin on / off
+    ldo2.value = state
+
+    # A small delay to let the IO change state
+    time.sleep(0.035)
+
+
+# Dotstar rainbow colour wheel
+def dotstar_color_wheel(wheel_pos):
+    """Color wheel to allow for cycling through the rainbow of RGB colors."""
+    wheel_pos = wheel_pos % 255
+
+    if wheel_pos < 85:
+        return 255 - wheel_pos * 3, 0, wheel_pos * 3
+    elif wheel_pos < 170:
+        wheel_pos -= 85
+        return 0, wheel_pos * 3, 255 - wheel_pos * 3
+    else:
+        wheel_pos -= 170
+        return wheel_pos * 3, 255 - wheel_pos * 3, 0
+
+
+# Get a *rough* estimate of the current battery voltage
+# If the battery is not present, the charge IC will still report it's trying to charge at X voltage
+# so it will still show a voltage.
+def get_battery_voltage():
+    """
+    Returns the current battery voltage. If no battery is connected, returns 3.7V
+    This is an approximation only, but useful to detect of the charge state of the battery is getting low.
+    """
+    adc = AnalogIn(board.VBAT_SENSE)
+
+    measured_vbat = adc.value  # Read the value
+    measured_vbat /= 4095  # divide by 4095 as we are using the default ADC voltage range of 0-1V
+    measured_vbat *= 3.7  # Multiply by 3.7V, our reference voltage
+    return measured_vbat
+
+
+# Disable LDO2 by default
+enable_LDO2(False)
diff --git a/ports/esp32s2/boards/unexpectedmaker_pros2/sdkconfig b/ports/esp32s2/boards/unexpectedmaker_pros2/sdkconfig
new file mode 100644
index 000000000..b73c4a8c2
--- /dev/null
+++ b/ports/esp32s2/boards/unexpectedmaker_pros2/sdkconfig
@@ -0,0 +1,35 @@
+CONFIG_ESP32S2_SPIRAM_SUPPORT=y
+
+#
+# SPI RAM config
+#
+# CONFIG_SPIRAM_TYPE_AUTO is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+CONFIG_SPIRAM_TYPE_ESPPSRAM64=y
+CONFIG_SPIRAM_SIZE=8388608
+
+#
+# PSRAM clock and cs IO for ESP32S2
+#
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
+CONFIG_DEFAULT_PSRAM_CS_IO=26
+# end of PSRAM clock and cs IO for ESP32S2
+
+CONFIG_SPIRAM_SPIWP_SD3_PIN=28
+# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
+# CONFIG_SPIRAM_RODATA is not set
+# CONFIG_SPIRAM_USE_AHB_DBUS3 is not set
+# CONFIG_SPIRAM_SPEED_80M is not set
+CONFIG_SPIRAM_SPEED_40M=y
+# CONFIG_SPIRAM_SPEED_26M is not set
+# CONFIG_SPIRAM_SPEED_20M is not set
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
+CONFIG_SPIRAM_USE_MEMMAP=y
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
+# end of SPI RAM config
-- 
cgit v1.2.3


From 4b1a7d812e93223ba4247eb3a96c4c94bdc96bb9 Mon Sep 17 00:00:00 2001
From: Seon Rozenblum <seon@unexpectedmaker.com>
Date: Wed, 23 Sep 2020 05:20:10 +1000
Subject: Updated UM boards

---
 .github/workflows/build.yml                        |  1 +
 .../unexpectedmaker_feathers2/mpconfigboard.mk     |  3 +-
 .../mpconfigboard.mk                               |  2 +-
 .../unexpectedmaker_feathers2_prerelease/pins.c    | 48 +++++++++++++++++++++-
 4 files changed, 50 insertions(+), 4 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1c68a3e5c..40bf65209 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -421,6 +421,7 @@ jobs:
         - "microdev_micro_s2"
         - "muselab_nanoesp32_s2"
         - "unexpectedmaker_feathers2"
+        - "unexpectedmaker_feathers2_prerelease"
 
     steps:
     - name: Set up Python 3.8
diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.mk b/ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.mk
index 91c321af9..9857c0761 100644
--- a/ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.mk
+++ b/ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.mk
@@ -18,5 +18,4 @@ CIRCUITPY_ESP_FLASH_SIZE=16MB
 CIRCUITPY_BITBANG_APA102 = 1
 
 # Include these Python libraries in firmware.
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar
-
+# FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar
diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.mk b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.mk
index 4c809471b..9857c0761 100644
--- a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.mk
+++ b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.mk
@@ -18,4 +18,4 @@ CIRCUITPY_ESP_FLASH_SIZE=16MB
 CIRCUITPY_BITBANG_APA102 = 1
 
 # Include these Python libraries in firmware.
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar
\ No newline at end of file
+# FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar
diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/pins.c b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/pins.c
index 9476cafdf..967f5e8d9 100644
--- a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/pins.c
+++ b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/pins.c
@@ -1,52 +1,98 @@
 #include "shared-bindings/board/__init__.h"
 
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) },
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO17) },
     { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO17) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },
     { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO18) },
     { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO18) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
     { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO12) },
     { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO12) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },
     { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO6) },
     { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO6) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
     { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO5) },
     { MP_ROM_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_GPIO5) },
 
+     { MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) },
     { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO36) },
     { MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO36) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO35), MP_ROM_PTR(&pin_GPIO35) },
     { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO35) },
     { MP_ROM_QSTR(MP_QSTR_D24), MP_ROM_PTR(&pin_GPIO35) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) },
     { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO37) },
     { MP_ROM_QSTR(MP_QSTR_D23), MP_ROM_PTR(&pin_GPIO37) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44) },
     { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO44) },
     { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) },
     { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO43) },
     { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
 
-    // Moving to 9 and 8
     { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO38) },
+
     { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_IO33), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_D20), MP_ROM_PTR(&pin_GPIO33) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },
     { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_A10), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },
     { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_A9), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
     { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_A8), MP_ROM_PTR(&pin_GPIO7) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
     { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO8) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
     { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO9) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
     { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO10) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },
     { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO11) },
 
     { MP_ROM_QSTR(MP_QSTR_APA102_MOSI), MP_ROM_PTR(&pin_GPIO40) }, // MTDO
     { MP_ROM_QSTR(MP_QSTR_APA102_SCK), MP_ROM_PTR(&pin_GPIO45) },
+
     { MP_ROM_QSTR(MP_QSTR_LDO2), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
     { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
     { MP_ROM_QSTR(MP_QSTR_AMB), MP_ROM_PTR(&pin_GPIO4) },
 
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
-- 
cgit v1.2.3


From 819b5faa71ab8aa13a82308cc6fc820df46ec83b Mon Sep 17 00:00:00 2001
From: Seon Rozenblum <seon@unexpectedmaker.com>
Date: Wed, 30 Sep 2020 10:02:50 +1000
Subject: Removed ProS2 board files for now

---
 .../unexpectedmaker_feathers2/adafruit_dotstar.py  | 198 -----------
 .../adafruit_pypixelbuf.py                         | 374 ---------------------
 .../unexpectedmaker_feathers2/adafruit_requests.py | 311 -----------------
 .../boards/unexpectedmaker_feathers2/feathers2.py  |  47 ---
 .../boards/unexpectedmaker_feathers2/pins.c        |   7 +-
 .../adafruit_dotstar.py                            | 198 -----------
 .../adafruit_pypixelbuf.py                         | 374 ---------------------
 .../feathers2.py                                   |  47 ---
 .../mpconfigboard.h                                |   8 +-
 .../unexpectedmaker_pros2/adafruit_dotstar.py      | 198 -----------
 .../unexpectedmaker_pros2/adafruit_pypixelbuf.py   | 374 ---------------------
 ports/esp32s2/boards/unexpectedmaker_pros2/board.c |  56 ---
 .../boards/unexpectedmaker_pros2/mpconfigboard.h   |  35 --
 .../boards/unexpectedmaker_pros2/mpconfigboard.mk  |  21 --
 ports/esp32s2/boards/unexpectedmaker_pros2/pins.c  |  58 ----
 .../esp32s2/boards/unexpectedmaker_pros2/pros2.py  |  63 ----
 .../esp32s2/boards/unexpectedmaker_pros2/sdkconfig |  35 --
 17 files changed, 5 insertions(+), 2399 deletions(-)
 delete mode 100755 ports/esp32s2/boards/unexpectedmaker_feathers2/adafruit_dotstar.py
 delete mode 100755 ports/esp32s2/boards/unexpectedmaker_feathers2/adafruit_pypixelbuf.py
 delete mode 100755 ports/esp32s2/boards/unexpectedmaker_feathers2/adafruit_requests.py
 delete mode 100644 ports/esp32s2/boards/unexpectedmaker_feathers2/feathers2.py
 delete mode 100755 ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/adafruit_dotstar.py
 delete mode 100755 ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/adafruit_pypixelbuf.py
 delete mode 100644 ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/feathers2.py
 delete mode 100755 ports/esp32s2/boards/unexpectedmaker_pros2/adafruit_dotstar.py
 delete mode 100755 ports/esp32s2/boards/unexpectedmaker_pros2/adafruit_pypixelbuf.py
 delete mode 100644 ports/esp32s2/boards/unexpectedmaker_pros2/board.c
 delete mode 100644 ports/esp32s2/boards/unexpectedmaker_pros2/mpconfigboard.h
 delete mode 100644 ports/esp32s2/boards/unexpectedmaker_pros2/mpconfigboard.mk
 delete mode 100644 ports/esp32s2/boards/unexpectedmaker_pros2/pins.c
 delete mode 100644 ports/esp32s2/boards/unexpectedmaker_pros2/pros2.py
 delete mode 100644 ports/esp32s2/boards/unexpectedmaker_pros2/sdkconfig

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2/adafruit_dotstar.py b/ports/esp32s2/boards/unexpectedmaker_feathers2/adafruit_dotstar.py
deleted file mode 100755
index 65fbbe868..000000000
--- a/ports/esp32s2/boards/unexpectedmaker_feathers2/adafruit_dotstar.py
+++ /dev/null
@@ -1,198 +0,0 @@
-# The MIT License (MIT)
-#
-# Copyright (c) 2016 Damien P. George (original Neopixel object)
-# Copyright (c) 2017 Ladyada
-# Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
-# Copyright (c) 2019 Roy Hooper
-#
-# 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.
-
-"""
-`adafruit_dotstar` - DotStar strip driver (for CircuitPython 5.0+ with _pixelbuf)
-=================================================================================
-
-* Author(s): Damien P. George, Limor Fried, Scott Shawcroft & Roy Hooper
-"""
-
-# pylint: disable=ungrouped-imports
-import sys
-import busio
-import digitalio
-
-if sys.implementation.version[0] < 5:
-    import adafruit_pypixelbuf as _pixelbuf
-else:
-    try:
-        import _pixelbuf
-    except ImportError:
-        import adafruit_pypixelbuf as _pixelbuf
-
-__version__ = "0.0.0-auto.0"
-__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DotStar.git"
-
-START_HEADER_SIZE = 4
-
-# Pixel color order constants
-RBG = "PRBG"
-"""Red Blue Green"""
-RGB = "PRGB"
-"""Red Green Blue"""
-GRB = "PGRB"
-"""Green Red Blue"""
-GBR = "PGBR"
-"""Green Blue Red"""
-BRG = "PBRG"
-"""Blue Red Green"""
-BGR = "PBGR"
-"""Blue Green Red"""
-
-
-class DotStar(_pixelbuf.PixelBuf):
-    """
-    A sequence of dotstars.
-
-    :param ~microcontroller.Pin clock: The pin to output dotstar clock on.
-    :param ~microcontroller.Pin data: The pin to output dotstar data on.
-    :param int n: The number of dotstars in the chain
-    :param float brightness: Brightness of the pixels between 0.0 and 1.0
-    :param bool auto_write: True if the dotstars should immediately change when
-        set. If False, `show` must be called explicitly.
-    :param str pixel_order: Set the pixel order on the strip - different
-         strips implement this differently. If you send red, and it looks blue
-         or green on the strip, modify this! It should be one of the values above.
-    :param int baudrate: Desired clock rate if using hardware SPI (ignored if
-        using 'soft' SPI). This is only a recommendation; the actual clock
-        rate may be slightly different depending on what the system hardware
-        can provide.
-
-    Example for Gemma M0:
-
-    .. code-block:: python
-
-        import adafruit_dotstar
-        import time
-        from board import *
-
-        RED = 0x100000
-
-        with adafruit_dotstar.DotStar(APA102_SCK, APA102_MOSI, 1) as pixels:
-            pixels[0] = RED
-            time.sleep(2)
-
-    .. py:method:: DotStar.show()
-
-        Shows the new colors on the dotstars themselves if they haven't already
-        been autowritten.
-
-        The colors may or may not be showing after this function returns because
-        it may be done asynchronously.
-
-    .. py:method:: DotStar.fill(color)
-
-        Colors all dotstars the given ***color***.
-
-    .. py:attribute:: brightness
-
-        Overall brightness of all dotstars (0 to 1.0)
-    """
-
-    def __init__(
-        self,
-        clock,
-        data,
-        n,
-        *,
-        brightness=1.0,
-        auto_write=True,
-        pixel_order=BGR,
-        baudrate=4000000
-    ):
-        self._spi = None
-        try:
-            self._spi = busio.SPI(clock, MOSI=data)
-            while not self._spi.try_lock():
-                pass
-            self._spi.configure(baudrate=baudrate)
-
-        except (NotImplementedError, ValueError):
-            self.dpin = digitalio.DigitalInOut(data)
-            self.cpin = digitalio.DigitalInOut(clock)
-            self.dpin.direction = digitalio.Direction.OUTPUT
-            self.cpin.direction = digitalio.Direction.OUTPUT
-            self.cpin.value = False
-
-        # Supply one extra clock cycle for each two pixels in the strip.
-        trailer_size = n // 16
-        if n % 16 != 0:
-            trailer_size += 1
-
-        # Four empty bytes for the header.
-        header = bytearray(START_HEADER_SIZE)
-        # 0xff bytes for the trailer.
-        trailer = bytearray(b"\xff") * trailer_size
-
-        super().__init__(
-            n,
-            byteorder=pixel_order,
-            brightness=brightness,
-            auto_write=auto_write,
-            header=header,
-            trailer=trailer,
-        )
-
-    def deinit(self):
-        """Blank out the DotStars and release the resources."""
-        self.fill(0)
-        self.show()
-        if self._spi:
-            self._spi.deinit()
-        else:
-            self.dpin.deinit()
-            self.cpin.deinit()
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, exception_type, exception_value, traceback):
-        self.deinit()
-
-    def __repr__(self):
-        return "[" + ", ".join([str(x) for x in self]) + "]"
-
-    @property
-    def n(self):
-        """
-        The number of dotstars in the chain (read-only)
-        """
-        return len(self)
-
-    def _transmit(self, buffer):
-        if self._spi:
-            self._spi.write(buffer)
-        else:
-            self._ds_writebytes(buffer)
-
-    def _ds_writebytes(self, buffer):
-        for b in buffer:
-            for _ in range(8):
-                self.dpin.value = b & 0x80
-                self.cpin.value = True
-                self.cpin.value = False
-                b = b << 1
-        self.cpin.value = False
diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2/adafruit_pypixelbuf.py b/ports/esp32s2/boards/unexpectedmaker_feathers2/adafruit_pypixelbuf.py
deleted file mode 100755
index 3cb83e970..000000000
--- a/ports/esp32s2/boards/unexpectedmaker_feathers2/adafruit_pypixelbuf.py
+++ /dev/null
@@ -1,374 +0,0 @@
-# The MIT License (MIT)
-#
-# Based on the Adafruit NeoPixel and Adafruit Dotstar CircuitPython drivers.
-# Copyright (c) 2019-2020 Roy Hooper
-#
-# 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.
-
-"""
-`adafruit_pypixelbuf` - A pure python implementation of _pixelbuf
-=================================================================
-This class is used when _pixelbuf is not available in CircuitPython.  It is based on the work
-in neopixel.py and adafruit_dotstar.py.
-
-* Author(s): Damien P. George &  Limor Fried & Scott Shawcroft & Roy Hooper
-"""
-
-DOTSTAR_LED_START_FULL_BRIGHT = 0xFF
-DOTSTAR_LED_START = 0b11100000  # Three "1" bits, followed by 5 brightness bits
-DOTSTAR_LED_BRIGHTNESS = 0b00011111
-
-
-class PixelBuf:  # pylint: disable=too-many-instance-attributes
-    """
-    A sequence of RGB/RGBW pixels.
-
-    This is the pure python implementation of CircuitPython's _pixelbuf.
-
-    :param ~int n: Number of pixels
-    :param ~str byteorder: Byte order string constant (also sets bpp)
-    :param ~float brightness: Brightness (0 to 1.0, default 1.0)
-    :param ~bool auto_write: Whether to automatically write pixels (Default False)
-    :param bytes header: Sequence of bytes to always send before pixel values.
-    :param bytes trailer: Sequence of bytes to always send after pixel values.
-    """
-
-    def __init__(  # pylint: disable=too-many-locals,too-many-arguments
-        self,
-        n,
-        byteorder="BGR",
-        brightness=1.0,
-        auto_write=False,
-        header=None,
-        trailer=None,
-    ):
-
-        bpp, byteorder_tuple, has_white, dotstar_mode = self.parse_byteorder(byteorder)
-
-        self.auto_write = False
-
-        effective_bpp = 4 if dotstar_mode else bpp
-        _bytes = effective_bpp * n
-        buf = bytearray(_bytes)
-        offset = 0
-
-        if header is not None:
-            if not isinstance(header, bytearray):
-                raise TypeError("header must be a bytearray")
-            buf = header + buf
-            offset = len(header)
-
-        if trailer is not None:
-            if not isinstance(trailer, bytearray):
-                raise TypeError("trailer must be a bytearray")
-            buf += trailer
-
-        self._pixels = n
-        self._bytes = _bytes
-        self._byteorder = byteorder_tuple
-        self._byteorder_string = byteorder
-        self._has_white = has_white
-        self._bpp = bpp
-        self._pre_brightness_buffer = None
-        self._post_brightness_buffer = buf
-        self._offset = offset
-        self._dotstar_mode = dotstar_mode
-        self._pixel_step = effective_bpp
-
-        if dotstar_mode:
-            self._byteorder_tuple = (
-                byteorder_tuple[0] + 1,
-                byteorder_tuple[1] + 1,
-                byteorder_tuple[2] + 1,
-                0,
-            )
-            # Initialize the buffer with the dotstar start bytes.
-            for i in range(self._offset, self._bytes + self._offset, 4):
-                self._post_brightness_buffer[i] = DOTSTAR_LED_START_FULL_BRIGHT
-
-        self._brightness = 1.0
-        self.brightness = brightness
-
-        self.auto_write = auto_write
-
-    @staticmethod
-    def parse_byteorder(byteorder):
-        """
-        Parse a Byteorder string for validity and determine bpp, byte order, and
-        dostar brightness bits.
-
-        Byteorder strings may contain the following characters:
-            R - Red
-            G - Green
-            B - Blue
-            W - White
-            P - PWM (PWM Duty cycle for pixel - dotstars 0 - 1.0)
-
-        :param: ~str bpp: bpp string.
-        :return: ~tuple: bpp, byteorder, has_white, dotstar_mode
-        """
-        bpp = len(byteorder)
-        dotstar_mode = False
-        has_white = False
-
-        if byteorder.strip("RGBWP") != "":
-            raise ValueError("Invalid Byteorder string")
-
-        try:
-            r = byteorder.index("R")
-            g = byteorder.index("G")
-            b = byteorder.index("B")
-        except ValueError:
-            raise ValueError("Invalid Byteorder string")
-        if "W" in byteorder:
-            w = byteorder.index("W")
-            byteorder = (r, g, b, w)
-            has_white = True
-        elif "P" in byteorder:
-            lum = byteorder.index("P")
-            byteorder = (r, g, b, lum)
-            dotstar_mode = True
-        else:
-            byteorder = (r, g, b)
-
-        return bpp, byteorder, has_white, dotstar_mode
-
-    @property
-    def bpp(self):
-        """
-        The number of bytes per pixel in the buffer (read-only).
-        """
-        return self._bpp
-
-    @property
-    def brightness(self):
-        """
-        Float value between 0 and 1.  Output brightness.
-
-        When brightness is less than 1.0, a second buffer will be used to store the color values
-        before they are adjusted for brightness.
-        """
-        return self._brightness
-
-    @brightness.setter
-    def brightness(self, value):
-        value = min(max(value, 0.0), 1.0)
-        change = value - self._brightness
-        if -0.001 < change < 0.001:
-            return
-
-        self._brightness = value
-
-        if self._pre_brightness_buffer is None:
-            self._pre_brightness_buffer = bytearray(self._post_brightness_buffer)
-
-        # Adjust brightness of existing pixels
-        offset_check = self._offset % self._pixel_step
-        for i in range(self._offset, self._bytes + self._offset):
-            # Don't adjust per-pixel luminance bytes in dotstar mode
-            if self._dotstar_mode and (i % 4 != offset_check):
-                continue
-            self._post_brightness_buffer[i] = int(
-                self._pre_brightness_buffer[i] * self._brightness
-            )
-
-        if self.auto_write:
-            self.show()
-
-    @property
-    def byteorder(self):
-        """
-        ByteOrder string for the buffer (read-only)
-        """
-        return self._byteorder_string
-
-    def __len__(self):
-        """
-        Number of pixels.
-        """
-        return self._pixels
-
-    def show(self):
-        """
-        Call the associated write function to display the pixels
-        """
-        return self._transmit(self._post_brightness_buffer)
-
-    def fill(self, color):
-        """
-        Fills the given pixelbuf with the given color.
-        :param pixelbuf: A pixel object.
-        :param color: Color to set.
-        """
-        r, g, b, w = self._parse_color(color)
-        for i in range(self._pixels):
-            self._set_item(i, r, g, b, w)
-        if self.auto_write:
-            self.show()
-
-    def _parse_color(self, value):
-        r = 0
-        g = 0
-        b = 0
-        w = 0
-        if isinstance(value, int):
-            r = value >> 16
-            g = (value >> 8) & 0xFF
-            b = value & 0xFF
-            w = 0
-
-            if self._dotstar_mode:
-                w = 1.0
-        else:
-            if len(value) < 3 or len(value) > 4:
-                raise ValueError(
-                    "Expected tuple of length {}, got {}".format(self._bpp, len(value))
-                )
-            if len(value) == self._bpp:
-                if self._bpp == 3:
-                    r, g, b = value
-                else:
-                    r, g, b, w = value
-            elif len(value) == 3:
-                r, g, b = value
-                if self._dotstar_mode:
-                    w = 1.0
-
-        if self._bpp == 4:
-            if self._dotstar_mode:
-                # LED startframe is three "1" bits, followed by 5 brightness bits
-                # then 8 bits for each of R, G, and B. The order of those 3 are configurable and
-                # vary based on hardware
-                w = (int(w * 31) & 0b00011111) | DOTSTAR_LED_START
-            elif (
-                self._has_white
-                and (isinstance(value, int) or len(value) == 3)
-                and r == g
-                and g == b
-            ):
-                # If all components are the same and we have a white pixel then use it
-                # instead of the individual components when all 4 values aren't explicitly given.
-                w = r
-                r = 0
-                g = 0
-                b = 0
-
-        return (r, g, b, w)
-
-    def _set_item(
-        self, index, r, g, b, w
-    ):  # pylint: disable=too-many-locals,too-many-branches,too-many-arguments
-        if index < 0:
-            index += len(self)
-        if index >= self._pixels or index < 0:
-            raise IndexError
-        offset = self._offset + (index * self._bpp)
-
-        if self._pre_brightness_buffer is not None:
-            if self._bpp == 4:
-                self._pre_brightness_buffer[offset + self._byteorder[3]] = w
-            self._pre_brightness_buffer[offset + self._byteorder[0]] = r
-            self._pre_brightness_buffer[offset + self._byteorder[1]] = g
-            self._pre_brightness_buffer[offset + self._byteorder[2]] = b
-
-        if self._bpp == 4:
-            # Only apply brightness if w is actually white (aka not DotStar.)
-            if not self._dotstar_mode:
-                w = int(w * self._brightness)
-            self._post_brightness_buffer[offset + self._byteorder[3]] = w
-
-        self._post_brightness_buffer[offset + self._byteorder[0]] = int(
-            r * self._brightness
-        )
-        self._post_brightness_buffer[offset + self._byteorder[1]] = int(
-            g * self._brightness
-        )
-        self._post_brightness_buffer[offset + self._byteorder[2]] = int(
-            b * self._brightness
-        )
-
-    def __setitem__(self, index, val):
-        if isinstance(index, slice):
-            start, stop, step = index.indices(self._pixels)
-            for val_i, in_i in enumerate(range(start, stop, step)):
-                r, g, b, w = self._parse_color(val[val_i])
-                self._set_item(in_i, r, g, b, w)
-        else:
-            r, g, b, w = self._parse_color(val)
-            self._set_item(index, r, g, b, w)
-
-        if self.auto_write:
-            self.show()
-
-    def _getitem(self, index):
-        start = self._offset + (index * self._bpp)
-        buffer = (
-            self._pre_brightness_buffer
-            if self._pre_brightness_buffer is not None
-            else self._post_brightness_buffer
-        )
-        value = [
-            buffer[start + self._byteorder[0]],
-            buffer[start + self._byteorder[1]],
-            buffer[start + self._byteorder[2]],
-        ]
-        if self._has_white:
-            value.append(buffer[start + self._byteorder[3]])
-        elif self._dotstar_mode:
-            value.append(
-                (buffer[start + self._byteorder[3]] & DOTSTAR_LED_BRIGHTNESS) / 31.0
-            )
-        return value
-
-    def __getitem__(self, index):
-        if isinstance(index, slice):
-            out = []
-            for in_i in range(
-                *index.indices(len(self._post_brightness_buffer) // self._bpp)
-            ):
-                out.append(self._getitem(in_i))
-            return out
-        if index < 0:
-            index += len(self)
-        if index >= self._pixels or index < 0:
-            raise IndexError
-        return self._getitem(index)
-
-    def _transmit(self, buffer):
-        raise NotImplementedError("Must be subclassed")
-
-
-def wheel(pos):
-    """
-    Helper to create a colorwheel.
-
-    :param pos: int 0-255 of color value to return
-    :return: tuple of RGB values
-    """
-    # Input a value 0 to 255 to get a color value.
-    # The colours are a transition r - g - b - back to r.
-    if pos < 0 or pos > 255:
-        return 0, 0, 0
-    if pos < 85:
-        return 255 - pos * 3, pos * 3, 0
-    if pos < 170:
-        pos -= 85
-        return 0, 255 - pos * 3, pos * 3
-    pos -= 170
-    return pos * 3, 0, 255 - pos * 3
diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2/adafruit_requests.py b/ports/esp32s2/boards/unexpectedmaker_feathers2/adafruit_requests.py
deleted file mode 100755
index 0888937bf..000000000
--- a/ports/esp32s2/boards/unexpectedmaker_feathers2/adafruit_requests.py
+++ /dev/null
@@ -1,311 +0,0 @@
-# The MIT License (MIT)
-#
-# Copyright (c) 2019 ladyada 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.
-"""
-`adafruit_requests`
-================================================================================
-
-A requests-like library for web interfacing
-
-
-* Author(s): ladyada, Paul Sokolovsky
-
-Implementation Notes
---------------------
-
-Adapted from https://github.com/micropython/micropython-lib/tree/master/urequests
-
-micropython-lib consists of multiple modules from different sources and
-authors. Each module comes under its own licensing terms. Short name of
-a license can be found in a file within a module directory (usually
-metadata.txt or setup.py). Complete text of each license used is provided
-at https://github.com/micropython/micropython-lib/blob/master/LICENSE
-
-author='Paul Sokolovsky'
-license='MIT'
-
-**Software and Dependencies:**
-
-* Adafruit CircuitPython firmware for the supported boards:
-  https://github.com/adafruit/circuitpython/releases
-
-"""
-
-import gc
-
-__version__ = "0.0.0-auto.0"
-__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_Requests.git"
-
-_the_interface = None  # pylint: disable=invalid-name
-_the_sock = None  # pylint: disable=invalid-name
-
-
-def set_socket(sock, iface=None):
-    """Helper to set the global socket and optionally set the global network interface.
-    :param sock: socket object.
-    :param iface: internet interface object
-
-    """
-    global _the_sock  # pylint: disable=invalid-name, global-statement
-    _the_sock = sock
-    if iface:
-        global _the_interface  # pylint: disable=invalid-name, global-statement
-        _the_interface = iface
-        _the_sock.set_interface(iface)
-
-
-class Response:
-    """The response from a request, contains all the headers/content"""
-
-    encoding = None
-
-    def __init__(self, sock):
-        self.socket = sock
-        self.encoding = "utf-8"
-        self._cached = None
-        self.status_code = None
-        self.reason = None
-        self._read_so_far = 0
-        self.headers = {}
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, exc_type, exc_value, traceback):
-        self.close()
-
-    def close(self):
-        """Close, delete and collect the response data"""
-        if self.socket:
-            self.socket.close()
-            del self.socket
-        del self._cached
-        gc.collect()
-
-    @property
-    def content(self):
-        """The HTTP content direct from the socket, as bytes"""
-        # print(self.headers)
-        try:
-            content_length = int(self.headers["content-length"])
-        except KeyError:
-            content_length = 0
-        # print("Content length:", content_length)
-        if self._cached is None:
-            try:
-                self._cached = self.socket.recv(content_length)
-            finally:
-                self.socket.close()
-                self.socket = None
-        # print("Buffer length:", len(self._cached))
-        return self._cached
-
-    @property
-    def text(self):
-        """The HTTP content, encoded into a string according to the HTTP
-        header encoding"""
-        return str(self.content, self.encoding)
-
-    def json(self):
-        """The HTTP content, parsed into a json dictionary"""
-        # pylint: disable=import-outside-toplevel
-        try:
-            import json as json_module
-        except ImportError:
-            import ujson as json_module
-        return json_module.loads(self.content)
-
-    def iter_content(self, chunk_size=1, decode_unicode=False):
-        """An iterator that will stream data by only reading 'chunk_size'
-        bytes and yielding them, when we can't buffer the whole datastream"""
-        if decode_unicode:
-            raise NotImplementedError("Unicode not supported")
-
-        while True:
-            chunk = self.socket.recv(chunk_size)
-            if chunk:
-                yield chunk
-            else:
-                return
-
-
-# pylint: disable=too-many-branches, too-many-statements, unused-argument, too-many-arguments, too-many-locals
-def request(method, url, data=None, json=None, headers=None, stream=False, timeout=1):
-    """Perform an HTTP request to the given url which we will parse to determine
-    whether to use SSL ('https://') or not. We can also send some provided 'data'
-    or a json dictionary which we will stringify. 'headers' is optional HTTP headers
-    sent along. 'stream' will determine if we buffer everything, or whether to only
-    read only when requested
-    """
-    global _the_interface  # pylint: disable=global-statement, invalid-name
-    global _the_sock  # pylint: disable=global-statement, invalid-name
-
-    if not headers:
-        headers = {}
-
-    try:
-        proto, dummy, host, path = url.split("/", 3)
-        # replace spaces in path
-        path = path.replace(" ", "%20")
-    except ValueError:
-        proto, dummy, host = url.split("/", 2)
-        path = ""
-    if proto == "http:":
-        port = 80
-    elif proto == "https:":
-        port = 443
-    else:
-        raise ValueError("Unsupported protocol: " + proto)
-
-    if ":" in host:
-        host, port = host.split(":", 1)
-        port = int(port)
-
-    addr_info = _the_sock.getaddrinfo(host, port, 0, _the_sock.SOCK_STREAM)[0]
-    sock = _the_sock.socket(addr_info[0], addr_info[1], addr_info[2])
-    resp = Response(sock)  # our response
-
-    sock.settimeout(timeout)  # socket read timeout
-
-    try:
-        if proto == "https:":
-            conntype = _the_interface.TLS_MODE
-            sock.connect(
-                (host, port), conntype
-            )  # for SSL we need to know the host name
-        else:
-            conntype = _the_interface.TCP_MODE
-            sock.connect(addr_info[-1], conntype)
-        sock.send(
-            b"%s /%s HTTP/1.0\r\n" % (bytes(method, "utf-8"), bytes(path, "utf-8"))
-        )
-        if "Host" not in headers:
-            sock.send(b"Host: %s\r\n" % bytes(host, "utf-8"))
-        if "User-Agent" not in headers:
-            sock.send(b"User-Agent: Adafruit CircuitPython\r\n")
-        # Iterate over keys to avoid tuple alloc
-        for k in headers:
-            sock.send(k.encode())
-            sock.send(b": ")
-            sock.send(headers[k].encode())
-            sock.send(b"\r\n")
-        if json is not None:
-            assert data is None
-            # pylint: disable=import-outside-toplevel
-            try:
-                import json as json_module
-            except ImportError:
-                import ujson as json_module
-            # pylint: enable=import-outside-toplevel
-            data = json_module.dumps(json)
-            sock.send(b"Content-Type: application/json\r\n")
-        if data:
-            if isinstance(data, dict):
-                sock.send(b"Content-Type: application/x-www-form-urlencoded\r\n")
-                _post_data = ""
-                for k in data:
-                    _post_data = "{}&{}={}".format(_post_data, k, data[k])
-                data = _post_data[1:]
-            sock.send(b"Content-Length: %d\r\n" % len(data))
-        sock.send(b"\r\n")
-        if data:
-            if isinstance(data, bytearray):
-                sock.send(bytes(data))
-            else:
-                sock.send(bytes(data, "utf-8"))
-
-        line = sock.readline()
-        # print(line)
-        line = line.split(None, 2)
-        status = int(line[1])
-        reason = ""
-        if len(line) > 2:
-            reason = line[2].rstrip()
-        resp.headers = parse_headers(sock)
-        if resp.headers.get("transfer-encoding"):
-            if "chunked" in resp.headers.get("transfer-encoding"):
-                raise ValueError("Unsupported " + resp.headers.get("transfer-encoding"))
-        elif resp.headers.get("location") and not 200 <= status <= 299:
-            raise NotImplementedError("Redirects not yet supported")
-
-    except:
-        sock.close()
-        raise
-
-    resp.status_code = status
-    resp.reason = reason
-    return resp
-
-
-def parse_headers(sock):
-    """
-    Parses the header portion of an HTTP request/response from the socket.
-    Expects first line of HTTP request/response to have been read already
-    return: header dictionary
-    rtype: Dict
-    """
-    headers = {}
-    while True:
-        line = sock.readline()
-        if not line or line == b"\r\n":
-            break
-
-        # print("**line: ", line)
-        splits = line.split(b": ", 1)
-        title = splits[0]
-        content = ""
-        if len(splits) > 1:
-            content = splits[1]
-        if title and content:
-            title = str(title.lower(), "utf-8")
-            content = str(content, "utf-8")
-            headers[title] = content
-    return headers
-
-
-def head(url, **kw):
-    """Send HTTP HEAD request"""
-    return request("HEAD", url, **kw)
-
-
-def get(url, **kw):
-    """Send HTTP GET request"""
-    return request("GET", url, **kw)
-
-
-def post(url, **kw):
-    """Send HTTP POST request"""
-    return request("POST", url, **kw)
-
-
-def put(url, **kw):
-    """Send HTTP PUT request"""
-    return request("PUT", url, **kw)
-
-
-def patch(url, **kw):
-    """Send HTTP PATCH request"""
-    return request("PATCH", url, **kw)
-
-
-def delete(url, **kw):
-    """Send HTTP DELETE request"""
-    return request("DELETE", url, **kw)
diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2/feathers2.py b/ports/esp32s2/boards/unexpectedmaker_feathers2/feathers2.py
deleted file mode 100644
index 0631cad7f..000000000
--- a/ports/esp32s2/boards/unexpectedmaker_feathers2/feathers2.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# FeatherS2 Helper Library
-# 2020 Seon Rozenblum, Unexpected Maker
-#
-# Project home:
-#   https://feathers2.io
-#
-
-# Import required libraries
-import time
-import board
-from digitalio import DigitalInOut, Direction, Pull
- 
-
-# Helper functions
-
-def enable_LDO2(state):
-    """Set the power for the second on-board LDO to allow no current draw when not needed."""
-
-    # Grab a reference to the LDO2 IO (21 in this case)
-    ldo2 = DigitalInOut(board.LDO2)
-    ldo2.direction = Direction.OUTPUT
-
-    # Set the LDO2 power pin on / off
-    ldo2.value = state
-
-    # A small delay to let the IO change state
-    time.sleep(0.035)
-
-
-# Dotstar rainbow colour wheel
-def dotstar_color_wheel(wheel_pos):
-    """Color wheel to allow for cycling through the rainbow of RGB colors."""
-    wheel_pos = wheel_pos % 255
-
-    if wheel_pos < 85:
-        return 255 - wheel_pos * 3, 0, wheel_pos * 3
-    elif wheel_pos < 170:
-        wheel_pos -= 85
-        return 0, wheel_pos * 3, 255 - wheel_pos * 3
-    else:
-        wheel_pos -= 170
-        return wheel_pos * 3, 255 - wheel_pos * 3, 0
-
-
-
-# Disable LDO2 by default
-enable_LDO2(False)
diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2/pins.c b/ports/esp32s2/boards/unexpectedmaker_feathers2/pins.c
index 5a29e029c..c294fb9d3 100644
--- a/ports/esp32s2/boards/unexpectedmaker_feathers2/pins.c
+++ b/ports/esp32s2/boards/unexpectedmaker_feathers2/pins.c
@@ -45,12 +45,12 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO43) },
     { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
 
-    { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
     { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
     { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO8) },
 
-    { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
     { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
     { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO9) },
 
     { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },
@@ -82,10 +82,7 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO11) },
     { MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO11) },
 
-    // { MP_ROM_QSTR(MP_QSTR_IO40), MP_ROM_PTR(&pin_GPIO40) }, // MTDO
     { MP_ROM_QSTR(MP_QSTR_APA102_MOSI), MP_ROM_PTR(&pin_GPIO40) }, // MTDO
-
-    // { MP_ROM_QSTR(MP_QSTR_IO45), MP_ROM_PTR(&pin_GPIO45) },
     { MP_ROM_QSTR(MP_QSTR_APA102_SCK), MP_ROM_PTR(&pin_GPIO45) },
 
 
diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/adafruit_dotstar.py b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/adafruit_dotstar.py
deleted file mode 100755
index 65fbbe868..000000000
--- a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/adafruit_dotstar.py
+++ /dev/null
@@ -1,198 +0,0 @@
-# The MIT License (MIT)
-#
-# Copyright (c) 2016 Damien P. George (original Neopixel object)
-# Copyright (c) 2017 Ladyada
-# Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
-# Copyright (c) 2019 Roy Hooper
-#
-# 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.
-
-"""
-`adafruit_dotstar` - DotStar strip driver (for CircuitPython 5.0+ with _pixelbuf)
-=================================================================================
-
-* Author(s): Damien P. George, Limor Fried, Scott Shawcroft & Roy Hooper
-"""
-
-# pylint: disable=ungrouped-imports
-import sys
-import busio
-import digitalio
-
-if sys.implementation.version[0] < 5:
-    import adafruit_pypixelbuf as _pixelbuf
-else:
-    try:
-        import _pixelbuf
-    except ImportError:
-        import adafruit_pypixelbuf as _pixelbuf
-
-__version__ = "0.0.0-auto.0"
-__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DotStar.git"
-
-START_HEADER_SIZE = 4
-
-# Pixel color order constants
-RBG = "PRBG"
-"""Red Blue Green"""
-RGB = "PRGB"
-"""Red Green Blue"""
-GRB = "PGRB"
-"""Green Red Blue"""
-GBR = "PGBR"
-"""Green Blue Red"""
-BRG = "PBRG"
-"""Blue Red Green"""
-BGR = "PBGR"
-"""Blue Green Red"""
-
-
-class DotStar(_pixelbuf.PixelBuf):
-    """
-    A sequence of dotstars.
-
-    :param ~microcontroller.Pin clock: The pin to output dotstar clock on.
-    :param ~microcontroller.Pin data: The pin to output dotstar data on.
-    :param int n: The number of dotstars in the chain
-    :param float brightness: Brightness of the pixels between 0.0 and 1.0
-    :param bool auto_write: True if the dotstars should immediately change when
-        set. If False, `show` must be called explicitly.
-    :param str pixel_order: Set the pixel order on the strip - different
-         strips implement this differently. If you send red, and it looks blue
-         or green on the strip, modify this! It should be one of the values above.
-    :param int baudrate: Desired clock rate if using hardware SPI (ignored if
-        using 'soft' SPI). This is only a recommendation; the actual clock
-        rate may be slightly different depending on what the system hardware
-        can provide.
-
-    Example for Gemma M0:
-
-    .. code-block:: python
-
-        import adafruit_dotstar
-        import time
-        from board import *
-
-        RED = 0x100000
-
-        with adafruit_dotstar.DotStar(APA102_SCK, APA102_MOSI, 1) as pixels:
-            pixels[0] = RED
-            time.sleep(2)
-
-    .. py:method:: DotStar.show()
-
-        Shows the new colors on the dotstars themselves if they haven't already
-        been autowritten.
-
-        The colors may or may not be showing after this function returns because
-        it may be done asynchronously.
-
-    .. py:method:: DotStar.fill(color)
-
-        Colors all dotstars the given ***color***.
-
-    .. py:attribute:: brightness
-
-        Overall brightness of all dotstars (0 to 1.0)
-    """
-
-    def __init__(
-        self,
-        clock,
-        data,
-        n,
-        *,
-        brightness=1.0,
-        auto_write=True,
-        pixel_order=BGR,
-        baudrate=4000000
-    ):
-        self._spi = None
-        try:
-            self._spi = busio.SPI(clock, MOSI=data)
-            while not self._spi.try_lock():
-                pass
-            self._spi.configure(baudrate=baudrate)
-
-        except (NotImplementedError, ValueError):
-            self.dpin = digitalio.DigitalInOut(data)
-            self.cpin = digitalio.DigitalInOut(clock)
-            self.dpin.direction = digitalio.Direction.OUTPUT
-            self.cpin.direction = digitalio.Direction.OUTPUT
-            self.cpin.value = False
-
-        # Supply one extra clock cycle for each two pixels in the strip.
-        trailer_size = n // 16
-        if n % 16 != 0:
-            trailer_size += 1
-
-        # Four empty bytes for the header.
-        header = bytearray(START_HEADER_SIZE)
-        # 0xff bytes for the trailer.
-        trailer = bytearray(b"\xff") * trailer_size
-
-        super().__init__(
-            n,
-            byteorder=pixel_order,
-            brightness=brightness,
-            auto_write=auto_write,
-            header=header,
-            trailer=trailer,
-        )
-
-    def deinit(self):
-        """Blank out the DotStars and release the resources."""
-        self.fill(0)
-        self.show()
-        if self._spi:
-            self._spi.deinit()
-        else:
-            self.dpin.deinit()
-            self.cpin.deinit()
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, exception_type, exception_value, traceback):
-        self.deinit()
-
-    def __repr__(self):
-        return "[" + ", ".join([str(x) for x in self]) + "]"
-
-    @property
-    def n(self):
-        """
-        The number of dotstars in the chain (read-only)
-        """
-        return len(self)
-
-    def _transmit(self, buffer):
-        if self._spi:
-            self._spi.write(buffer)
-        else:
-            self._ds_writebytes(buffer)
-
-    def _ds_writebytes(self, buffer):
-        for b in buffer:
-            for _ in range(8):
-                self.dpin.value = b & 0x80
-                self.cpin.value = True
-                self.cpin.value = False
-                b = b << 1
-        self.cpin.value = False
diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/adafruit_pypixelbuf.py b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/adafruit_pypixelbuf.py
deleted file mode 100755
index 3cb83e970..000000000
--- a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/adafruit_pypixelbuf.py
+++ /dev/null
@@ -1,374 +0,0 @@
-# The MIT License (MIT)
-#
-# Based on the Adafruit NeoPixel and Adafruit Dotstar CircuitPython drivers.
-# Copyright (c) 2019-2020 Roy Hooper
-#
-# 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.
-
-"""
-`adafruit_pypixelbuf` - A pure python implementation of _pixelbuf
-=================================================================
-This class is used when _pixelbuf is not available in CircuitPython.  It is based on the work
-in neopixel.py and adafruit_dotstar.py.
-
-* Author(s): Damien P. George &  Limor Fried & Scott Shawcroft & Roy Hooper
-"""
-
-DOTSTAR_LED_START_FULL_BRIGHT = 0xFF
-DOTSTAR_LED_START = 0b11100000  # Three "1" bits, followed by 5 brightness bits
-DOTSTAR_LED_BRIGHTNESS = 0b00011111
-
-
-class PixelBuf:  # pylint: disable=too-many-instance-attributes
-    """
-    A sequence of RGB/RGBW pixels.
-
-    This is the pure python implementation of CircuitPython's _pixelbuf.
-
-    :param ~int n: Number of pixels
-    :param ~str byteorder: Byte order string constant (also sets bpp)
-    :param ~float brightness: Brightness (0 to 1.0, default 1.0)
-    :param ~bool auto_write: Whether to automatically write pixels (Default False)
-    :param bytes header: Sequence of bytes to always send before pixel values.
-    :param bytes trailer: Sequence of bytes to always send after pixel values.
-    """
-
-    def __init__(  # pylint: disable=too-many-locals,too-many-arguments
-        self,
-        n,
-        byteorder="BGR",
-        brightness=1.0,
-        auto_write=False,
-        header=None,
-        trailer=None,
-    ):
-
-        bpp, byteorder_tuple, has_white, dotstar_mode = self.parse_byteorder(byteorder)
-
-        self.auto_write = False
-
-        effective_bpp = 4 if dotstar_mode else bpp
-        _bytes = effective_bpp * n
-        buf = bytearray(_bytes)
-        offset = 0
-
-        if header is not None:
-            if not isinstance(header, bytearray):
-                raise TypeError("header must be a bytearray")
-            buf = header + buf
-            offset = len(header)
-
-        if trailer is not None:
-            if not isinstance(trailer, bytearray):
-                raise TypeError("trailer must be a bytearray")
-            buf += trailer
-
-        self._pixels = n
-        self._bytes = _bytes
-        self._byteorder = byteorder_tuple
-        self._byteorder_string = byteorder
-        self._has_white = has_white
-        self._bpp = bpp
-        self._pre_brightness_buffer = None
-        self._post_brightness_buffer = buf
-        self._offset = offset
-        self._dotstar_mode = dotstar_mode
-        self._pixel_step = effective_bpp
-
-        if dotstar_mode:
-            self._byteorder_tuple = (
-                byteorder_tuple[0] + 1,
-                byteorder_tuple[1] + 1,
-                byteorder_tuple[2] + 1,
-                0,
-            )
-            # Initialize the buffer with the dotstar start bytes.
-            for i in range(self._offset, self._bytes + self._offset, 4):
-                self._post_brightness_buffer[i] = DOTSTAR_LED_START_FULL_BRIGHT
-
-        self._brightness = 1.0
-        self.brightness = brightness
-
-        self.auto_write = auto_write
-
-    @staticmethod
-    def parse_byteorder(byteorder):
-        """
-        Parse a Byteorder string for validity and determine bpp, byte order, and
-        dostar brightness bits.
-
-        Byteorder strings may contain the following characters:
-            R - Red
-            G - Green
-            B - Blue
-            W - White
-            P - PWM (PWM Duty cycle for pixel - dotstars 0 - 1.0)
-
-        :param: ~str bpp: bpp string.
-        :return: ~tuple: bpp, byteorder, has_white, dotstar_mode
-        """
-        bpp = len(byteorder)
-        dotstar_mode = False
-        has_white = False
-
-        if byteorder.strip("RGBWP") != "":
-            raise ValueError("Invalid Byteorder string")
-
-        try:
-            r = byteorder.index("R")
-            g = byteorder.index("G")
-            b = byteorder.index("B")
-        except ValueError:
-            raise ValueError("Invalid Byteorder string")
-        if "W" in byteorder:
-            w = byteorder.index("W")
-            byteorder = (r, g, b, w)
-            has_white = True
-        elif "P" in byteorder:
-            lum = byteorder.index("P")
-            byteorder = (r, g, b, lum)
-            dotstar_mode = True
-        else:
-            byteorder = (r, g, b)
-
-        return bpp, byteorder, has_white, dotstar_mode
-
-    @property
-    def bpp(self):
-        """
-        The number of bytes per pixel in the buffer (read-only).
-        """
-        return self._bpp
-
-    @property
-    def brightness(self):
-        """
-        Float value between 0 and 1.  Output brightness.
-
-        When brightness is less than 1.0, a second buffer will be used to store the color values
-        before they are adjusted for brightness.
-        """
-        return self._brightness
-
-    @brightness.setter
-    def brightness(self, value):
-        value = min(max(value, 0.0), 1.0)
-        change = value - self._brightness
-        if -0.001 < change < 0.001:
-            return
-
-        self._brightness = value
-
-        if self._pre_brightness_buffer is None:
-            self._pre_brightness_buffer = bytearray(self._post_brightness_buffer)
-
-        # Adjust brightness of existing pixels
-        offset_check = self._offset % self._pixel_step
-        for i in range(self._offset, self._bytes + self._offset):
-            # Don't adjust per-pixel luminance bytes in dotstar mode
-            if self._dotstar_mode and (i % 4 != offset_check):
-                continue
-            self._post_brightness_buffer[i] = int(
-                self._pre_brightness_buffer[i] * self._brightness
-            )
-
-        if self.auto_write:
-            self.show()
-
-    @property
-    def byteorder(self):
-        """
-        ByteOrder string for the buffer (read-only)
-        """
-        return self._byteorder_string
-
-    def __len__(self):
-        """
-        Number of pixels.
-        """
-        return self._pixels
-
-    def show(self):
-        """
-        Call the associated write function to display the pixels
-        """
-        return self._transmit(self._post_brightness_buffer)
-
-    def fill(self, color):
-        """
-        Fills the given pixelbuf with the given color.
-        :param pixelbuf: A pixel object.
-        :param color: Color to set.
-        """
-        r, g, b, w = self._parse_color(color)
-        for i in range(self._pixels):
-            self._set_item(i, r, g, b, w)
-        if self.auto_write:
-            self.show()
-
-    def _parse_color(self, value):
-        r = 0
-        g = 0
-        b = 0
-        w = 0
-        if isinstance(value, int):
-            r = value >> 16
-            g = (value >> 8) & 0xFF
-            b = value & 0xFF
-            w = 0
-
-            if self._dotstar_mode:
-                w = 1.0
-        else:
-            if len(value) < 3 or len(value) > 4:
-                raise ValueError(
-                    "Expected tuple of length {}, got {}".format(self._bpp, len(value))
-                )
-            if len(value) == self._bpp:
-                if self._bpp == 3:
-                    r, g, b = value
-                else:
-                    r, g, b, w = value
-            elif len(value) == 3:
-                r, g, b = value
-                if self._dotstar_mode:
-                    w = 1.0
-
-        if self._bpp == 4:
-            if self._dotstar_mode:
-                # LED startframe is three "1" bits, followed by 5 brightness bits
-                # then 8 bits for each of R, G, and B. The order of those 3 are configurable and
-                # vary based on hardware
-                w = (int(w * 31) & 0b00011111) | DOTSTAR_LED_START
-            elif (
-                self._has_white
-                and (isinstance(value, int) or len(value) == 3)
-                and r == g
-                and g == b
-            ):
-                # If all components are the same and we have a white pixel then use it
-                # instead of the individual components when all 4 values aren't explicitly given.
-                w = r
-                r = 0
-                g = 0
-                b = 0
-
-        return (r, g, b, w)
-
-    def _set_item(
-        self, index, r, g, b, w
-    ):  # pylint: disable=too-many-locals,too-many-branches,too-many-arguments
-        if index < 0:
-            index += len(self)
-        if index >= self._pixels or index < 0:
-            raise IndexError
-        offset = self._offset + (index * self._bpp)
-
-        if self._pre_brightness_buffer is not None:
-            if self._bpp == 4:
-                self._pre_brightness_buffer[offset + self._byteorder[3]] = w
-            self._pre_brightness_buffer[offset + self._byteorder[0]] = r
-            self._pre_brightness_buffer[offset + self._byteorder[1]] = g
-            self._pre_brightness_buffer[offset + self._byteorder[2]] = b
-
-        if self._bpp == 4:
-            # Only apply brightness if w is actually white (aka not DotStar.)
-            if not self._dotstar_mode:
-                w = int(w * self._brightness)
-            self._post_brightness_buffer[offset + self._byteorder[3]] = w
-
-        self._post_brightness_buffer[offset + self._byteorder[0]] = int(
-            r * self._brightness
-        )
-        self._post_brightness_buffer[offset + self._byteorder[1]] = int(
-            g * self._brightness
-        )
-        self._post_brightness_buffer[offset + self._byteorder[2]] = int(
-            b * self._brightness
-        )
-
-    def __setitem__(self, index, val):
-        if isinstance(index, slice):
-            start, stop, step = index.indices(self._pixels)
-            for val_i, in_i in enumerate(range(start, stop, step)):
-                r, g, b, w = self._parse_color(val[val_i])
-                self._set_item(in_i, r, g, b, w)
-        else:
-            r, g, b, w = self._parse_color(val)
-            self._set_item(index, r, g, b, w)
-
-        if self.auto_write:
-            self.show()
-
-    def _getitem(self, index):
-        start = self._offset + (index * self._bpp)
-        buffer = (
-            self._pre_brightness_buffer
-            if self._pre_brightness_buffer is not None
-            else self._post_brightness_buffer
-        )
-        value = [
-            buffer[start + self._byteorder[0]],
-            buffer[start + self._byteorder[1]],
-            buffer[start + self._byteorder[2]],
-        ]
-        if self._has_white:
-            value.append(buffer[start + self._byteorder[3]])
-        elif self._dotstar_mode:
-            value.append(
-                (buffer[start + self._byteorder[3]] & DOTSTAR_LED_BRIGHTNESS) / 31.0
-            )
-        return value
-
-    def __getitem__(self, index):
-        if isinstance(index, slice):
-            out = []
-            for in_i in range(
-                *index.indices(len(self._post_brightness_buffer) // self._bpp)
-            ):
-                out.append(self._getitem(in_i))
-            return out
-        if index < 0:
-            index += len(self)
-        if index >= self._pixels or index < 0:
-            raise IndexError
-        return self._getitem(index)
-
-    def _transmit(self, buffer):
-        raise NotImplementedError("Must be subclassed")
-
-
-def wheel(pos):
-    """
-    Helper to create a colorwheel.
-
-    :param pos: int 0-255 of color value to return
-    :return: tuple of RGB values
-    """
-    # Input a value 0 to 255 to get a color value.
-    # The colours are a transition r - g - b - back to r.
-    if pos < 0 or pos > 255:
-        return 0, 0, 0
-    if pos < 85:
-        return 255 - pos * 3, pos * 3, 0
-    if pos < 170:
-        pos -= 85
-        return 0, 255 - pos * 3, pos * 3
-    pos -= 170
-    return pos * 3, 0, 255 - pos * 3
diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/feathers2.py b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/feathers2.py
deleted file mode 100644
index 0631cad7f..000000000
--- a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/feathers2.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# FeatherS2 Helper Library
-# 2020 Seon Rozenblum, Unexpected Maker
-#
-# Project home:
-#   https://feathers2.io
-#
-
-# Import required libraries
-import time
-import board
-from digitalio import DigitalInOut, Direction, Pull
- 
-
-# Helper functions
-
-def enable_LDO2(state):
-    """Set the power for the second on-board LDO to allow no current draw when not needed."""
-
-    # Grab a reference to the LDO2 IO (21 in this case)
-    ldo2 = DigitalInOut(board.LDO2)
-    ldo2.direction = Direction.OUTPUT
-
-    # Set the LDO2 power pin on / off
-    ldo2.value = state
-
-    # A small delay to let the IO change state
-    time.sleep(0.035)
-
-
-# Dotstar rainbow colour wheel
-def dotstar_color_wheel(wheel_pos):
-    """Color wheel to allow for cycling through the rainbow of RGB colors."""
-    wheel_pos = wheel_pos % 255
-
-    if wheel_pos < 85:
-        return 255 - wheel_pos * 3, 0, wheel_pos * 3
-    elif wheel_pos < 170:
-        wheel_pos -= 85
-        return 0, wheel_pos * 3, 255 - wheel_pos * 3
-    else:
-        wheel_pos -= 170
-        return wheel_pos * 3, 255 - wheel_pos * 3, 0
-
-
-
-# Disable LDO2 by default
-enable_LDO2(False)
diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
index a65d00206..726c46e40 100644
--- a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
+++ b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
@@ -30,11 +30,9 @@
 #define MICROPY_HW_MCU_NAME         "ESP32S2"
 
 #define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
-
-#define BOARD_USER_SAFE_MODE_ACTION "pressing boot button at start up.\n"
+#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
 
 #define AUTORESET_DELAY_MS 500
 
-// Doesn't work with this on.
-// #define MICROPY_HW_APA102_MOSI   (&pin_GPIO44)
-// #define MICROPY_HW_APA102_SCK    (&pin_GPIO45)
+#define MICROPY_HW_APA102_MOSI   (&pin_GPIO40)
+#define MICROPY_HW_APA102_SCK    (&pin_GPIO45)
\ No newline at end of file
diff --git a/ports/esp32s2/boards/unexpectedmaker_pros2/adafruit_dotstar.py b/ports/esp32s2/boards/unexpectedmaker_pros2/adafruit_dotstar.py
deleted file mode 100755
index 65fbbe868..000000000
--- a/ports/esp32s2/boards/unexpectedmaker_pros2/adafruit_dotstar.py
+++ /dev/null
@@ -1,198 +0,0 @@
-# The MIT License (MIT)
-#
-# Copyright (c) 2016 Damien P. George (original Neopixel object)
-# Copyright (c) 2017 Ladyada
-# Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
-# Copyright (c) 2019 Roy Hooper
-#
-# 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.
-
-"""
-`adafruit_dotstar` - DotStar strip driver (for CircuitPython 5.0+ with _pixelbuf)
-=================================================================================
-
-* Author(s): Damien P. George, Limor Fried, Scott Shawcroft & Roy Hooper
-"""
-
-# pylint: disable=ungrouped-imports
-import sys
-import busio
-import digitalio
-
-if sys.implementation.version[0] < 5:
-    import adafruit_pypixelbuf as _pixelbuf
-else:
-    try:
-        import _pixelbuf
-    except ImportError:
-        import adafruit_pypixelbuf as _pixelbuf
-
-__version__ = "0.0.0-auto.0"
-__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DotStar.git"
-
-START_HEADER_SIZE = 4
-
-# Pixel color order constants
-RBG = "PRBG"
-"""Red Blue Green"""
-RGB = "PRGB"
-"""Red Green Blue"""
-GRB = "PGRB"
-"""Green Red Blue"""
-GBR = "PGBR"
-"""Green Blue Red"""
-BRG = "PBRG"
-"""Blue Red Green"""
-BGR = "PBGR"
-"""Blue Green Red"""
-
-
-class DotStar(_pixelbuf.PixelBuf):
-    """
-    A sequence of dotstars.
-
-    :param ~microcontroller.Pin clock: The pin to output dotstar clock on.
-    :param ~microcontroller.Pin data: The pin to output dotstar data on.
-    :param int n: The number of dotstars in the chain
-    :param float brightness: Brightness of the pixels between 0.0 and 1.0
-    :param bool auto_write: True if the dotstars should immediately change when
-        set. If False, `show` must be called explicitly.
-    :param str pixel_order: Set the pixel order on the strip - different
-         strips implement this differently. If you send red, and it looks blue
-         or green on the strip, modify this! It should be one of the values above.
-    :param int baudrate: Desired clock rate if using hardware SPI (ignored if
-        using 'soft' SPI). This is only a recommendation; the actual clock
-        rate may be slightly different depending on what the system hardware
-        can provide.
-
-    Example for Gemma M0:
-
-    .. code-block:: python
-
-        import adafruit_dotstar
-        import time
-        from board import *
-
-        RED = 0x100000
-
-        with adafruit_dotstar.DotStar(APA102_SCK, APA102_MOSI, 1) as pixels:
-            pixels[0] = RED
-            time.sleep(2)
-
-    .. py:method:: DotStar.show()
-
-        Shows the new colors on the dotstars themselves if they haven't already
-        been autowritten.
-
-        The colors may or may not be showing after this function returns because
-        it may be done asynchronously.
-
-    .. py:method:: DotStar.fill(color)
-
-        Colors all dotstars the given ***color***.
-
-    .. py:attribute:: brightness
-
-        Overall brightness of all dotstars (0 to 1.0)
-    """
-
-    def __init__(
-        self,
-        clock,
-        data,
-        n,
-        *,
-        brightness=1.0,
-        auto_write=True,
-        pixel_order=BGR,
-        baudrate=4000000
-    ):
-        self._spi = None
-        try:
-            self._spi = busio.SPI(clock, MOSI=data)
-            while not self._spi.try_lock():
-                pass
-            self._spi.configure(baudrate=baudrate)
-
-        except (NotImplementedError, ValueError):
-            self.dpin = digitalio.DigitalInOut(data)
-            self.cpin = digitalio.DigitalInOut(clock)
-            self.dpin.direction = digitalio.Direction.OUTPUT
-            self.cpin.direction = digitalio.Direction.OUTPUT
-            self.cpin.value = False
-
-        # Supply one extra clock cycle for each two pixels in the strip.
-        trailer_size = n // 16
-        if n % 16 != 0:
-            trailer_size += 1
-
-        # Four empty bytes for the header.
-        header = bytearray(START_HEADER_SIZE)
-        # 0xff bytes for the trailer.
-        trailer = bytearray(b"\xff") * trailer_size
-
-        super().__init__(
-            n,
-            byteorder=pixel_order,
-            brightness=brightness,
-            auto_write=auto_write,
-            header=header,
-            trailer=trailer,
-        )
-
-    def deinit(self):
-        """Blank out the DotStars and release the resources."""
-        self.fill(0)
-        self.show()
-        if self._spi:
-            self._spi.deinit()
-        else:
-            self.dpin.deinit()
-            self.cpin.deinit()
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, exception_type, exception_value, traceback):
-        self.deinit()
-
-    def __repr__(self):
-        return "[" + ", ".join([str(x) for x in self]) + "]"
-
-    @property
-    def n(self):
-        """
-        The number of dotstars in the chain (read-only)
-        """
-        return len(self)
-
-    def _transmit(self, buffer):
-        if self._spi:
-            self._spi.write(buffer)
-        else:
-            self._ds_writebytes(buffer)
-
-    def _ds_writebytes(self, buffer):
-        for b in buffer:
-            for _ in range(8):
-                self.dpin.value = b & 0x80
-                self.cpin.value = True
-                self.cpin.value = False
-                b = b << 1
-        self.cpin.value = False
diff --git a/ports/esp32s2/boards/unexpectedmaker_pros2/adafruit_pypixelbuf.py b/ports/esp32s2/boards/unexpectedmaker_pros2/adafruit_pypixelbuf.py
deleted file mode 100755
index 3cb83e970..000000000
--- a/ports/esp32s2/boards/unexpectedmaker_pros2/adafruit_pypixelbuf.py
+++ /dev/null
@@ -1,374 +0,0 @@
-# The MIT License (MIT)
-#
-# Based on the Adafruit NeoPixel and Adafruit Dotstar CircuitPython drivers.
-# Copyright (c) 2019-2020 Roy Hooper
-#
-# 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.
-
-"""
-`adafruit_pypixelbuf` - A pure python implementation of _pixelbuf
-=================================================================
-This class is used when _pixelbuf is not available in CircuitPython.  It is based on the work
-in neopixel.py and adafruit_dotstar.py.
-
-* Author(s): Damien P. George &  Limor Fried & Scott Shawcroft & Roy Hooper
-"""
-
-DOTSTAR_LED_START_FULL_BRIGHT = 0xFF
-DOTSTAR_LED_START = 0b11100000  # Three "1" bits, followed by 5 brightness bits
-DOTSTAR_LED_BRIGHTNESS = 0b00011111
-
-
-class PixelBuf:  # pylint: disable=too-many-instance-attributes
-    """
-    A sequence of RGB/RGBW pixels.
-
-    This is the pure python implementation of CircuitPython's _pixelbuf.
-
-    :param ~int n: Number of pixels
-    :param ~str byteorder: Byte order string constant (also sets bpp)
-    :param ~float brightness: Brightness (0 to 1.0, default 1.0)
-    :param ~bool auto_write: Whether to automatically write pixels (Default False)
-    :param bytes header: Sequence of bytes to always send before pixel values.
-    :param bytes trailer: Sequence of bytes to always send after pixel values.
-    """
-
-    def __init__(  # pylint: disable=too-many-locals,too-many-arguments
-        self,
-        n,
-        byteorder="BGR",
-        brightness=1.0,
-        auto_write=False,
-        header=None,
-        trailer=None,
-    ):
-
-        bpp, byteorder_tuple, has_white, dotstar_mode = self.parse_byteorder(byteorder)
-
-        self.auto_write = False
-
-        effective_bpp = 4 if dotstar_mode else bpp
-        _bytes = effective_bpp * n
-        buf = bytearray(_bytes)
-        offset = 0
-
-        if header is not None:
-            if not isinstance(header, bytearray):
-                raise TypeError("header must be a bytearray")
-            buf = header + buf
-            offset = len(header)
-
-        if trailer is not None:
-            if not isinstance(trailer, bytearray):
-                raise TypeError("trailer must be a bytearray")
-            buf += trailer
-
-        self._pixels = n
-        self._bytes = _bytes
-        self._byteorder = byteorder_tuple
-        self._byteorder_string = byteorder
-        self._has_white = has_white
-        self._bpp = bpp
-        self._pre_brightness_buffer = None
-        self._post_brightness_buffer = buf
-        self._offset = offset
-        self._dotstar_mode = dotstar_mode
-        self._pixel_step = effective_bpp
-
-        if dotstar_mode:
-            self._byteorder_tuple = (
-                byteorder_tuple[0] + 1,
-                byteorder_tuple[1] + 1,
-                byteorder_tuple[2] + 1,
-                0,
-            )
-            # Initialize the buffer with the dotstar start bytes.
-            for i in range(self._offset, self._bytes + self._offset, 4):
-                self._post_brightness_buffer[i] = DOTSTAR_LED_START_FULL_BRIGHT
-
-        self._brightness = 1.0
-        self.brightness = brightness
-
-        self.auto_write = auto_write
-
-    @staticmethod
-    def parse_byteorder(byteorder):
-        """
-        Parse a Byteorder string for validity and determine bpp, byte order, and
-        dostar brightness bits.
-
-        Byteorder strings may contain the following characters:
-            R - Red
-            G - Green
-            B - Blue
-            W - White
-            P - PWM (PWM Duty cycle for pixel - dotstars 0 - 1.0)
-
-        :param: ~str bpp: bpp string.
-        :return: ~tuple: bpp, byteorder, has_white, dotstar_mode
-        """
-        bpp = len(byteorder)
-        dotstar_mode = False
-        has_white = False
-
-        if byteorder.strip("RGBWP") != "":
-            raise ValueError("Invalid Byteorder string")
-
-        try:
-            r = byteorder.index("R")
-            g = byteorder.index("G")
-            b = byteorder.index("B")
-        except ValueError:
-            raise ValueError("Invalid Byteorder string")
-        if "W" in byteorder:
-            w = byteorder.index("W")
-            byteorder = (r, g, b, w)
-            has_white = True
-        elif "P" in byteorder:
-            lum = byteorder.index("P")
-            byteorder = (r, g, b, lum)
-            dotstar_mode = True
-        else:
-            byteorder = (r, g, b)
-
-        return bpp, byteorder, has_white, dotstar_mode
-
-    @property
-    def bpp(self):
-        """
-        The number of bytes per pixel in the buffer (read-only).
-        """
-        return self._bpp
-
-    @property
-    def brightness(self):
-        """
-        Float value between 0 and 1.  Output brightness.
-
-        When brightness is less than 1.0, a second buffer will be used to store the color values
-        before they are adjusted for brightness.
-        """
-        return self._brightness
-
-    @brightness.setter
-    def brightness(self, value):
-        value = min(max(value, 0.0), 1.0)
-        change = value - self._brightness
-        if -0.001 < change < 0.001:
-            return
-
-        self._brightness = value
-
-        if self._pre_brightness_buffer is None:
-            self._pre_brightness_buffer = bytearray(self._post_brightness_buffer)
-
-        # Adjust brightness of existing pixels
-        offset_check = self._offset % self._pixel_step
-        for i in range(self._offset, self._bytes + self._offset):
-            # Don't adjust per-pixel luminance bytes in dotstar mode
-            if self._dotstar_mode and (i % 4 != offset_check):
-                continue
-            self._post_brightness_buffer[i] = int(
-                self._pre_brightness_buffer[i] * self._brightness
-            )
-
-        if self.auto_write:
-            self.show()
-
-    @property
-    def byteorder(self):
-        """
-        ByteOrder string for the buffer (read-only)
-        """
-        return self._byteorder_string
-
-    def __len__(self):
-        """
-        Number of pixels.
-        """
-        return self._pixels
-
-    def show(self):
-        """
-        Call the associated write function to display the pixels
-        """
-        return self._transmit(self._post_brightness_buffer)
-
-    def fill(self, color):
-        """
-        Fills the given pixelbuf with the given color.
-        :param pixelbuf: A pixel object.
-        :param color: Color to set.
-        """
-        r, g, b, w = self._parse_color(color)
-        for i in range(self._pixels):
-            self._set_item(i, r, g, b, w)
-        if self.auto_write:
-            self.show()
-
-    def _parse_color(self, value):
-        r = 0
-        g = 0
-        b = 0
-        w = 0
-        if isinstance(value, int):
-            r = value >> 16
-            g = (value >> 8) & 0xFF
-            b = value & 0xFF
-            w = 0
-
-            if self._dotstar_mode:
-                w = 1.0
-        else:
-            if len(value) < 3 or len(value) > 4:
-                raise ValueError(
-                    "Expected tuple of length {}, got {}".format(self._bpp, len(value))
-                )
-            if len(value) == self._bpp:
-                if self._bpp == 3:
-                    r, g, b = value
-                else:
-                    r, g, b, w = value
-            elif len(value) == 3:
-                r, g, b = value
-                if self._dotstar_mode:
-                    w = 1.0
-
-        if self._bpp == 4:
-            if self._dotstar_mode:
-                # LED startframe is three "1" bits, followed by 5 brightness bits
-                # then 8 bits for each of R, G, and B. The order of those 3 are configurable and
-                # vary based on hardware
-                w = (int(w * 31) & 0b00011111) | DOTSTAR_LED_START
-            elif (
-                self._has_white
-                and (isinstance(value, int) or len(value) == 3)
-                and r == g
-                and g == b
-            ):
-                # If all components are the same and we have a white pixel then use it
-                # instead of the individual components when all 4 values aren't explicitly given.
-                w = r
-                r = 0
-                g = 0
-                b = 0
-
-        return (r, g, b, w)
-
-    def _set_item(
-        self, index, r, g, b, w
-    ):  # pylint: disable=too-many-locals,too-many-branches,too-many-arguments
-        if index < 0:
-            index += len(self)
-        if index >= self._pixels or index < 0:
-            raise IndexError
-        offset = self._offset + (index * self._bpp)
-
-        if self._pre_brightness_buffer is not None:
-            if self._bpp == 4:
-                self._pre_brightness_buffer[offset + self._byteorder[3]] = w
-            self._pre_brightness_buffer[offset + self._byteorder[0]] = r
-            self._pre_brightness_buffer[offset + self._byteorder[1]] = g
-            self._pre_brightness_buffer[offset + self._byteorder[2]] = b
-
-        if self._bpp == 4:
-            # Only apply brightness if w is actually white (aka not DotStar.)
-            if not self._dotstar_mode:
-                w = int(w * self._brightness)
-            self._post_brightness_buffer[offset + self._byteorder[3]] = w
-
-        self._post_brightness_buffer[offset + self._byteorder[0]] = int(
-            r * self._brightness
-        )
-        self._post_brightness_buffer[offset + self._byteorder[1]] = int(
-            g * self._brightness
-        )
-        self._post_brightness_buffer[offset + self._byteorder[2]] = int(
-            b * self._brightness
-        )
-
-    def __setitem__(self, index, val):
-        if isinstance(index, slice):
-            start, stop, step = index.indices(self._pixels)
-            for val_i, in_i in enumerate(range(start, stop, step)):
-                r, g, b, w = self._parse_color(val[val_i])
-                self._set_item(in_i, r, g, b, w)
-        else:
-            r, g, b, w = self._parse_color(val)
-            self._set_item(index, r, g, b, w)
-
-        if self.auto_write:
-            self.show()
-
-    def _getitem(self, index):
-        start = self._offset + (index * self._bpp)
-        buffer = (
-            self._pre_brightness_buffer
-            if self._pre_brightness_buffer is not None
-            else self._post_brightness_buffer
-        )
-        value = [
-            buffer[start + self._byteorder[0]],
-            buffer[start + self._byteorder[1]],
-            buffer[start + self._byteorder[2]],
-        ]
-        if self._has_white:
-            value.append(buffer[start + self._byteorder[3]])
-        elif self._dotstar_mode:
-            value.append(
-                (buffer[start + self._byteorder[3]] & DOTSTAR_LED_BRIGHTNESS) / 31.0
-            )
-        return value
-
-    def __getitem__(self, index):
-        if isinstance(index, slice):
-            out = []
-            for in_i in range(
-                *index.indices(len(self._post_brightness_buffer) // self._bpp)
-            ):
-                out.append(self._getitem(in_i))
-            return out
-        if index < 0:
-            index += len(self)
-        if index >= self._pixels or index < 0:
-            raise IndexError
-        return self._getitem(index)
-
-    def _transmit(self, buffer):
-        raise NotImplementedError("Must be subclassed")
-
-
-def wheel(pos):
-    """
-    Helper to create a colorwheel.
-
-    :param pos: int 0-255 of color value to return
-    :return: tuple of RGB values
-    """
-    # Input a value 0 to 255 to get a color value.
-    # The colours are a transition r - g - b - back to r.
-    if pos < 0 or pos > 255:
-        return 0, 0, 0
-    if pos < 85:
-        return 255 - pos * 3, pos * 3, 0
-    if pos < 170:
-        pos -= 85
-        return 0, 255 - pos * 3, pos * 3
-    pos -= 170
-    return pos * 3, 0, 255 - pos * 3
diff --git a/ports/esp32s2/boards/unexpectedmaker_pros2/board.c b/ports/esp32s2/boards/unexpectedmaker_pros2/board.c
deleted file mode 100644
index 1dc30b5af..000000000
--- a/ports/esp32s2/boards/unexpectedmaker_pros2/board.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 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 "boards/board.h"
-#include "mpconfigboard.h"
-#include "shared-bindings/microcontroller/Pin.h"
-
-void board_init(void) {
-    // USB
-    common_hal_never_reset_pin(&pin_GPIO19);
-    common_hal_never_reset_pin(&pin_GPIO20);
-
-    // Debug UART
-    common_hal_never_reset_pin(&pin_GPIO43);
-    common_hal_never_reset_pin(&pin_GPIO44);
-
-    // SPI Flash and RAM
-    common_hal_never_reset_pin(&pin_GPIO26);
-    common_hal_never_reset_pin(&pin_GPIO27);
-    common_hal_never_reset_pin(&pin_GPIO28);
-    common_hal_never_reset_pin(&pin_GPIO29);
-    common_hal_never_reset_pin(&pin_GPIO30);
-    common_hal_never_reset_pin(&pin_GPIO31);
-    common_hal_never_reset_pin(&pin_GPIO32);
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-
-}
diff --git a/ports/esp32s2/boards/unexpectedmaker_pros2/mpconfigboard.h b/ports/esp32s2/boards/unexpectedmaker_pros2/mpconfigboard.h
deleted file mode 100644
index 2cfb7b6a0..000000000
--- a/ports/esp32s2/boards/unexpectedmaker_pros2/mpconfigboard.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2019 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.
- */
-
-//Micropython setup
-
-#define MICROPY_HW_BOARD_NAME       "ProS2"
-#define MICROPY_HW_MCU_NAME         "ESP32S2"
-
-#define AUTORESET_DELAY_MS 500
-
-#define MICROPY_HW_APA102_MOSI   (&pin_GPIO40)
-#define MICROPY_HW_APA102_SCK    (&pin_GPIO45)
diff --git a/ports/esp32s2/boards/unexpectedmaker_pros2/mpconfigboard.mk b/ports/esp32s2/boards/unexpectedmaker_pros2/mpconfigboard.mk
deleted file mode 100644
index cb6823ba6..000000000
--- a/ports/esp32s2/boards/unexpectedmaker_pros2/mpconfigboard.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-USB_VID = 0x239A
-USB_PID = 0x80AA
-USB_PRODUCT = "ProS2"
-USB_MANUFACTURER = "UnexpectedMaker"
-USB_DEVICES = "CDC,MSC,HID"
-
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
-# The default queue depth of 16 overflows on release builds,
-# so increase it to 32.
-CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
-
-CIRCUITPY_ESP_FLASH_MODE=qio
-CIRCUITPY_ESP_FLASH_FREQ=40m
-CIRCUITPY_ESP_FLASH_SIZE=16MB
-
-CIRCUITPY_BITBANG_APA102 = 1
-
-# Include these Python libraries in firmware.
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar
diff --git a/ports/esp32s2/boards/unexpectedmaker_pros2/pins.c b/ports/esp32s2/boards/unexpectedmaker_pros2/pins.c
deleted file mode 100644
index 349ad1bd5..000000000
--- a/ports/esp32s2/boards/unexpectedmaker_pros2/pins.c
+++ /dev/null
@@ -1,58 +0,0 @@
-#include "shared-bindings/board/__init__.h"
-
-STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO17) },
-    { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO17) },
-
-    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO18) },
-    { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO18) },
-
-    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO4) },
-    { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO4) },
-
-    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO12) },
-    { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO12) },
-
-    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO6) },
-    { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO6) },
-
-    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO5) },
-    { MP_ROM_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_GPIO5) },
-
-    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO36) },
-    { MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO36) },
-
-    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO35) },
-    { MP_ROM_QSTR(MP_QSTR_D24), MP_ROM_PTR(&pin_GPIO35) },
-
-    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO37) },
-    { MP_ROM_QSTR(MP_QSTR_D23), MP_ROM_PTR(&pin_GPIO37) },
-
-    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO44) },
-    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
-
-    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO43) },
-    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
-
-    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO8) },
-    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO9) },
-    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO1) },
-    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO3) },
-    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO7) },
-    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO8) },
-    { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO9) },
-    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO10) },
-    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO11) },
-
-    { MP_ROM_QSTR(MP_QSTR_APA102_MOSI), MP_ROM_PTR(&pin_GPIO40) }, // MTDO
-    { MP_ROM_QSTR(MP_QSTR_APA102_SCK), MP_ROM_PTR(&pin_GPIO45) },
-
-    { MP_ROM_QSTR(MP_QSTR_LDO2), MP_ROM_PTR(&pin_GPIO21) },
-
-    { MP_ROM_QSTR(MP_QSTR_VBAT_SENSE), MP_ROM_PTR(&pin_GPIO14) },
-
-    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
-    { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
-    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
-};
-MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
diff --git a/ports/esp32s2/boards/unexpectedmaker_pros2/pros2.py b/ports/esp32s2/boards/unexpectedmaker_pros2/pros2.py
deleted file mode 100644
index 3d2397d5d..000000000
--- a/ports/esp32s2/boards/unexpectedmaker_pros2/pros2.py
+++ /dev/null
@@ -1,63 +0,0 @@
-# Pros2 Helper Library
-# 2020 Seon Rozenblum, Unexpected Maker
-#
-# Project home:
-#   https://pros2.io
-#
-
-# Import required libraries
-import time
-import board
-from digitalio import DigitalInOut, Direction, Pull
-from analogio import AnalogIn
- 
-
-# Helper functions
-
-def enable_LDO2(state):
-    """Set the power for the second on-board LDO to allow no current draw when not needed."""
-
-    # Grab a reference to the LDO2 IO (21 in this case)
-    ldo2 = DigitalInOut(board.LDO2)
-    ldo2.direction = Direction.OUTPUT
-
-    # Set the LDO2 power pin on / off
-    ldo2.value = state
-
-    # A small delay to let the IO change state
-    time.sleep(0.035)
-
-
-# Dotstar rainbow colour wheel
-def dotstar_color_wheel(wheel_pos):
-    """Color wheel to allow for cycling through the rainbow of RGB colors."""
-    wheel_pos = wheel_pos % 255
-
-    if wheel_pos < 85:
-        return 255 - wheel_pos * 3, 0, wheel_pos * 3
-    elif wheel_pos < 170:
-        wheel_pos -= 85
-        return 0, wheel_pos * 3, 255 - wheel_pos * 3
-    else:
-        wheel_pos -= 170
-        return wheel_pos * 3, 255 - wheel_pos * 3, 0
-
-
-# Get a *rough* estimate of the current battery voltage
-# If the battery is not present, the charge IC will still report it's trying to charge at X voltage
-# so it will still show a voltage.
-def get_battery_voltage():
-    """
-    Returns the current battery voltage. If no battery is connected, returns 3.7V
-    This is an approximation only, but useful to detect of the charge state of the battery is getting low.
-    """
-    adc = AnalogIn(board.VBAT_SENSE)
-
-    measured_vbat = adc.value  # Read the value
-    measured_vbat /= 4095  # divide by 4095 as we are using the default ADC voltage range of 0-1V
-    measured_vbat *= 3.7  # Multiply by 3.7V, our reference voltage
-    return measured_vbat
-
-
-# Disable LDO2 by default
-enable_LDO2(False)
diff --git a/ports/esp32s2/boards/unexpectedmaker_pros2/sdkconfig b/ports/esp32s2/boards/unexpectedmaker_pros2/sdkconfig
deleted file mode 100644
index b73c4a8c2..000000000
--- a/ports/esp32s2/boards/unexpectedmaker_pros2/sdkconfig
+++ /dev/null
@@ -1,35 +0,0 @@
-CONFIG_ESP32S2_SPIRAM_SUPPORT=y
-
-#
-# SPI RAM config
-#
-# CONFIG_SPIRAM_TYPE_AUTO is not set
-# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set
-# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
-CONFIG_SPIRAM_TYPE_ESPPSRAM64=y
-CONFIG_SPIRAM_SIZE=8388608
-
-#
-# PSRAM clock and cs IO for ESP32S2
-#
-CONFIG_DEFAULT_PSRAM_CLK_IO=30
-CONFIG_DEFAULT_PSRAM_CS_IO=26
-# end of PSRAM clock and cs IO for ESP32S2
-
-CONFIG_SPIRAM_SPIWP_SD3_PIN=28
-# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
-# CONFIG_SPIRAM_RODATA is not set
-# CONFIG_SPIRAM_USE_AHB_DBUS3 is not set
-# CONFIG_SPIRAM_SPEED_80M is not set
-CONFIG_SPIRAM_SPEED_40M=y
-# CONFIG_SPIRAM_SPEED_26M is not set
-# CONFIG_SPIRAM_SPEED_20M is not set
-CONFIG_SPIRAM=y
-CONFIG_SPIRAM_BOOT_INIT=y
-# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
-CONFIG_SPIRAM_USE_MEMMAP=y
-# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
-# CONFIG_SPIRAM_USE_MALLOC is not set
-CONFIG_SPIRAM_MEMTEST=y
-# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
-# end of SPI RAM config
-- 
cgit v1.2.3


From 66b8559fd4e4ea7d50adb12a87b7bac208b5fc16 Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Mon, 28 Sep 2020 18:59:29 -0400
Subject: Change submodule, rework all includes

---
 .gitmodules                                        |  6 +--
 ports/esp32s2/Makefile                             | 61 ++++++++++++----------
 ports/esp32s2/bindings/espidf/__init__.c           |  2 +-
 ports/esp32s2/common-hal/busio/I2C.c               |  2 +-
 ports/esp32s2/common-hal/busio/I2C.h               |  2 +-
 ports/esp32s2/common-hal/busio/SPI.c               |  2 +-
 ports/esp32s2/common-hal/busio/SPI.h               |  6 +--
 ports/esp32s2/common-hal/busio/UART.c              |  2 +-
 ports/esp32s2/common-hal/busio/UART.h              |  2 +-
 ports/esp32s2/common-hal/digitalio/DigitalInOut.c  |  4 +-
 ports/esp32s2/common-hal/microcontroller/Pin.c     |  4 +-
 .../esp32s2/common-hal/microcontroller/Processor.c |  2 +-
 ports/esp32s2/common-hal/neopixel_write/__init__.c |  4 +-
 ports/esp32s2/common-hal/pulseio/PulseIn.h         |  4 +-
 ports/esp32s2/common-hal/pulseio/PulseOut.h        |  4 +-
 ports/esp32s2/common-hal/pwmio/PWMOut.c            |  2 +-
 ports/esp32s2/common-hal/pwmio/PWMOut.h            |  2 +-
 ports/esp32s2/common-hal/rtc/RTC.c                 |  2 +-
 ports/esp32s2/common-hal/socketpool/Socket.h       |  3 +-
 ports/esp32s2/common-hal/socketpool/SocketPool.c   |  2 +-
 ports/esp32s2/common-hal/ssl/SSLContext.h          |  2 +-
 ports/esp32s2/common-hal/ssl/__init__.c            |  2 +-
 ports/esp32s2/common-hal/wifi/Network.h            |  2 +-
 ports/esp32s2/common-hal/wifi/Radio.c              |  4 +-
 ports/esp32s2/common-hal/wifi/Radio.h              |  2 +-
 ports/esp32s2/common-hal/wifi/ScannedNetworks.c    |  2 +-
 ports/esp32s2/common-hal/wifi/ScannedNetworks.h    |  3 +-
 ports/esp32s2/common-hal/wifi/__init__.c           |  7 +--
 ports/esp32s2/esp-idf                              |  2 +-
 ports/esp32s2/mphalport.c                          |  4 +-
 ports/esp32s2/peripherals/pins.h                   |  2 +-
 ports/esp32s2/peripherals/rmt.c                    |  2 +-
 ports/esp32s2/peripherals/rmt.h                    |  2 +-
 ports/esp32s2/supervisor/internal_flash.c          |  2 +-
 ports/esp32s2/supervisor/port.c                    |  4 +-
 ports/esp32s2/supervisor/usb.c                     |  8 +--
 shared-bindings/socketpool/Socket.c                |  1 -
 shared-bindings/socketpool/SocketPool.c            |  1 -
 shared-bindings/wifi/ScannedNetworks.c             |  1 -
 39 files changed, 89 insertions(+), 82 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/.gitmodules b/.gitmodules
index 3603cea69..f66ce8aaf 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -144,12 +144,12 @@
 [submodule "frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center"]
 	path = frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center
 	url = https://github.com/adafruit/Adafruit_CircuitPython_BLE_Apple_Notification_Center
-[submodule "ports/esp32s2/esp-idf"]
-	path = ports/esp32s2/esp-idf
-	url = https://github.com/tannewt/esp-idf.git
 [submodule "frozen/Adafruit_CircuitPython_RFM9x"]
 	path = frozen/Adafruit_CircuitPython_RFM9x
 	url = https://github.com/adafruit/Adafruit_CircuitPython_RFM9x.git
 [submodule "frozen/Adafruit_CircuitPython_RFM69"]
 	path = frozen/Adafruit_CircuitPython_RFM69
 	url = https://github.com/adafruit/Adafruit_CircuitPython_RFM69.git
+[submodule "ports/esp32s2/esp-idf"]
+	path = ports/esp32s2/esp-idf
+	url = https://github.com/espressif/esp-idf.git
diff --git a/ports/esp32s2/Makefile b/ports/esp32s2/Makefile
index 229a3bf3a..49b9c6d2b 100644
--- a/ports/esp32s2/Makefile
+++ b/ports/esp32s2/Makefile
@@ -73,30 +73,37 @@ INC += -I./peripherals
 INC += -I../../lib/mp-readline
 INC += -I../../lib/tinyusb/src
 INC += -I../../supervisor/shared/usb
-INC += -Iesp-idf/components/freertos/include/freertos
-INC += -Iesp-idf/components/freertos/xtensa/include
-INC += -Iesp-idf/components/esp32s2/include
-INC += -Iesp-idf/components/xtensa/esp32s2/include
-INC += -Iesp-idf/components/esp_common/include
-INC += -Iesp-idf/components/esp_event/include
-INC += -Iesp-idf/components/esp_netif/include
-INC += -Iesp-idf/components/esp_ringbuf/include
-INC += -Iesp-idf/components/esp_rom/include
-INC += -Iesp-idf/components/esp_wifi/include
-INC += -Iesp-idf/components/xtensa/include
-INC += -Iesp-idf/components/esp_timer/include
-INC += -Iesp-idf/components/mbedtls/mbedtls/include
-INC += -Iesp-idf/components/mbedtls/port/include/
-INC += -Iesp-idf/components/newlib/platform_include
-INC += -Iesp-idf/components/lwip/lwip/src/include
-INC += -Iesp-idf/components/lwip/port/esp32/include
-INC += -Iesp-idf/components/lwip/include/apps/sntp
-INC += -Iesp-idf/components/soc/include
-INC += -Iesp-idf/components/soc/src/esp32s2/include
-INC += -Iesp-idf/components/soc/soc/include
-INC += -Iesp-idf/components/soc/soc/esp32s2/include
-INC += -Iesp-idf/components/heap/include
-INC += -Iesp-idf/components/esp_system/include
+
+INC += -isystem esp-idf
+INC += -isystem esp-idf/components/driver/include
+INC += -isystem esp-idf/components/hal/esp32s2/include
+INC += -isystem esp-idf/components/hal/include
+
+INC += -isystem esp-idf/components/freertos/include/freertos
+INC += -isystem esp-idf/components/freertos/xtensa/include
+INC += -isystem esp-idf/components/esp32s2/include
+INC += -isystem esp-idf/components/xtensa/esp32s2/include
+INC += -isystem esp-idf/components/esp_common/include
+INC += -isystem esp-idf/components/esp_event/include
+INC += -isystem esp-idf/components/esp_netif/include
+INC += -isystem esp-idf/components/esp_ringbuf/include
+INC += -isystem esp-idf/components/esp_rom/include
+INC += -isystem esp-idf/components/esp_wifi/include
+INC += -isystem esp-idf/components/xtensa/include
+INC += -isystem esp-idf/components/esp_timer/include
+INC += -isystem esp-idf/components/mbedtls/mbedtls/include
+INC += -isystem esp-idf/components/mbedtls/port/include/
+INC += -isystem esp-idf/components/newlib/platform_include
+INC += -isystem esp-idf/components/lwip/lwip/src/include
+INC += -isystem esp-idf/components/lwip/port/esp32/include
+INC += -isystem esp-idf/components/lwip/include/apps/sntp
+INC += -isystem esp-idf/components/hal/include
+INC += -isystem esp-idf/components/soc/include
+INC += -isystem esp-idf/components/soc/src/esp32s2/include
+INC += -isystem esp-idf/components/soc/soc/include
+INC += -isystem esp-idf/components/soc/soc/esp32s2/include
+INC += -isystem esp-idf/components/heap/include
+INC += -isystem esp-idf/components/esp_system/include
 INC += -I$(BUILD)/esp-idf/config
 
 CFLAGS += -DHAVE_CONFIG_H \
@@ -256,7 +263,7 @@ menuconfig: $(BUILD)/esp-idf/config
 $(HEADER_BUILD)/qstr.i.last: | $(BUILD)/esp-idf/config/sdkconfig.h
 
 # Order here matters
-ESP_IDF_COMPONENTS_LINK = freertos log esp_system esp32s2 bootloader_support pthread esp_timer vfs spi_flash app_update esp_common esp32s2 heap newlib driver xtensa soc esp_ringbuf esp_wifi esp_event wpa_supplicant mbedtls efuse nvs_flash esp_netif lwip esp_rom esp-tls
+ESP_IDF_COMPONENTS_LINK = freertos log hal esp_system esp32s2 bootloader_support pthread esp_timer vfs spi_flash app_update esp_common esp32s2 heap newlib driver xtensa soc esp_ringbuf esp_wifi esp_event wpa_supplicant mbedtls efuse nvs_flash esp_netif lwip esp_rom esp-tls
 
 ESP_IDF_COMPONENTS_INCLUDE = driver freertos log soc
 
@@ -268,11 +275,11 @@ ESP_IDF_WIFI_COMPONENTS_EXPANDED = $(foreach component, $(ESP_IDF_WIFI_COMPONENT
 MBEDTLS_COMPONENTS_LINK = crypto tls x509
 MBEDTLS_COMPONENTS_LINK_EXPANDED = $(foreach component, $(MBEDTLS_COMPONENTS_LINK), $(BUILD)/esp-idf/esp-idf/mbedtls/mbedtls/library/libmbed$(component).a)
 
-BINARY_BLOBS = esp-idf/components/xtensa/esp32s2/libhal.a
+BINARY_BLOBS = esp-idf/components/xtensa/esp32s2/libxt_hal.a
 BINARY_WIFI_BLOBS = libcoexist.a libcore.a libespnow.a libmesh.a libnet80211.a libpp.a librtc.a libsmartconfig.a libphy.a
 BINARY_BLOBS += $(addprefix esp-idf/components/esp_wifi/lib/esp32s2/, $(BINARY_WIFI_BLOBS))
 
-ESP_IDF_COMPONENTS_EXPANDED += $(BUILD)/esp-idf/esp-idf/soc/soc/esp32s2/libsoc_esp32s2.a esp-idf/components/xtensa/esp32s2/libhal.a
+ESP_IDF_COMPONENTS_EXPANDED += $(BUILD)/esp-idf/esp-idf/soc/soc/esp32s2/libsoc_esp32s2.a esp-idf/components/xtensa/esp32s2/libxt_hal.a
 ESP_AUTOGEN_LD = $(BUILD)/esp-idf/esp-idf/esp32s2/esp32s2_out.ld $(BUILD)/esp-idf/esp-idf/esp32s2/ld/esp32s2.project.ld
 
 FLASH_FLAGS = --flash_mode $(CIRCUITPY_ESP_FLASH_MODE) --flash_freq $(CIRCUITPY_ESP_FLASH_FREQ) --flash_size $(CIRCUITPY_ESP_FLASH_SIZE)
diff --git a/ports/esp32s2/bindings/espidf/__init__.c b/ports/esp32s2/bindings/espidf/__init__.c
index 3b910cfe6..554bfaa39 100644
--- a/ports/esp32s2/bindings/espidf/__init__.c
+++ b/ports/esp32s2/bindings/espidf/__init__.c
@@ -29,7 +29,7 @@
 
 #include "bindings/espidf/__init__.h"
 
-#include "esp-idf/components/heap/include/esp_heap_caps.h"
+#include "components/heap/include/esp_heap_caps.h"
 
 //| """Direct access to a few ESP-IDF details. This module *should not* include any functionality
 //|    that could be implemented by other frameworks. It should only include ESP-IDF specific
diff --git a/ports/esp32s2/common-hal/busio/I2C.c b/ports/esp32s2/common-hal/busio/I2C.c
index 57270372f..6f1953128 100644
--- a/ports/esp32s2/common-hal/busio/I2C.c
+++ b/ports/esp32s2/common-hal/busio/I2C.c
@@ -28,7 +28,7 @@
 #include "py/mperrno.h"
 #include "py/runtime.h"
 
-#include "driver/i2c.h"
+#include "components/driver/include/driver/i2c.h"
 
 #include "shared-bindings/microcontroller/__init__.h"
 #include "shared-bindings/microcontroller/Pin.h"
diff --git a/ports/esp32s2/common-hal/busio/I2C.h b/ports/esp32s2/common-hal/busio/I2C.h
index 24a3fd495..c39d6d744 100644
--- a/ports/esp32s2/common-hal/busio/I2C.h
+++ b/ports/esp32s2/common-hal/busio/I2C.h
@@ -29,7 +29,7 @@
 
 #include "common-hal/microcontroller/Pin.h"
 
-#include "esp-idf/components/soc/include/hal/i2c_types.h"
+#include "components/hal/include/hal/i2c_types.h"
 #include "FreeRTOS.h"
 #include "freertos/semphr.h"
 #include "py/obj.h"
diff --git a/ports/esp32s2/common-hal/busio/SPI.c b/ports/esp32s2/common-hal/busio/SPI.c
index eaafa87b7..1906ca6f0 100644
--- a/ports/esp32s2/common-hal/busio/SPI.c
+++ b/ports/esp32s2/common-hal/busio/SPI.c
@@ -266,7 +266,7 @@ bool common_hal_busio_spi_configure(busio_spi_obj_t *self,
     self->bits = bits;
     self->target_frequency = baudrate;
     self->hal_context.timing_conf = &self->timing_conf;
-    esp_err_t result =  spi_hal_get_clock_conf(&self->hal_context,
+    esp_err_t result =  spi_hal_cal_clock_conf(&self->hal_context,
                                                self->target_frequency,
                                                128 /* duty_cycle */,
                                                self->connected_through_gpio,
diff --git a/ports/esp32s2/common-hal/busio/SPI.h b/ports/esp32s2/common-hal/busio/SPI.h
index 38fbe42ff..f6c1c344a 100644
--- a/ports/esp32s2/common-hal/busio/SPI.h
+++ b/ports/esp32s2/common-hal/busio/SPI.h
@@ -29,9 +29,9 @@
 
 #include "common-hal/microcontroller/Pin.h"
 
-#include "esp-idf/components/driver/include/driver/spi_common_internal.h"
-#include "esp-idf/components/soc/include/hal/spi_hal.h"
-#include "esp-idf/components/soc/include/hal/spi_types.h"
+#include "components/driver/include/driver/spi_common_internal.h"
+#include "components/hal/include/hal/spi_hal.h"
+#include "components/hal/include/hal/spi_types.h"
 #include "py/obj.h"
 
 typedef struct {
diff --git a/ports/esp32s2/common-hal/busio/UART.c b/ports/esp32s2/common-hal/busio/UART.c
index b0162adba..98cebba67 100644
--- a/ports/esp32s2/common-hal/busio/UART.c
+++ b/ports/esp32s2/common-hal/busio/UART.c
@@ -27,7 +27,7 @@
 #include "shared-bindings/microcontroller/__init__.h"
 #include "shared-bindings/busio/UART.h"
 
-#include "driver/uart.h"
+#include "components/driver/include/driver/uart.h"
 
 #include "mpconfigport.h"
 #include "lib/utils/interrupt_char.h"
diff --git a/ports/esp32s2/common-hal/busio/UART.h b/ports/esp32s2/common-hal/busio/UART.h
index b3cc92966..1d7f13511 100644
--- a/ports/esp32s2/common-hal/busio/UART.h
+++ b/ports/esp32s2/common-hal/busio/UART.h
@@ -29,7 +29,7 @@
 
 #include "common-hal/microcontroller/Pin.h"
 
-#include "esp-idf/components/soc/include/hal/uart_types.h"
+#include "components/hal/include/hal/uart_types.h"
 #include "py/obj.h"
 
 typedef struct {
diff --git a/ports/esp32s2/common-hal/digitalio/DigitalInOut.c b/ports/esp32s2/common-hal/digitalio/DigitalInOut.c
index fb3ee10ad..2c7902616 100644
--- a/ports/esp32s2/common-hal/digitalio/DigitalInOut.c
+++ b/ports/esp32s2/common-hal/digitalio/DigitalInOut.c
@@ -28,9 +28,9 @@
 #include "py/runtime.h"
 #include "supervisor/shared/translate.h"
 
-#include "driver/gpio.h"
+#include "components/driver/include/driver/gpio.h"
 
-#include "esp-idf/components/soc/include/hal/gpio_hal.h"
+#include "components/hal/include/hal/gpio_hal.h"
 
 void common_hal_digitalio_digitalinout_never_reset(
         digitalio_digitalinout_obj_t *self) {
diff --git a/ports/esp32s2/common-hal/microcontroller/Pin.c b/ports/esp32s2/common-hal/microcontroller/Pin.c
index 546dca848..3c2611efe 100644
--- a/ports/esp32s2/common-hal/microcontroller/Pin.c
+++ b/ports/esp32s2/common-hal/microcontroller/Pin.c
@@ -31,8 +31,8 @@
 
 #include "py/mphal.h"
 
-#include "esp-idf/components/driver/include/driver/gpio.h"
-#include "esp-idf/components/soc/include/hal/gpio_hal.h"
+#include "components/driver/include/driver/gpio.h"
+#include "components/hal/include/hal/gpio_hal.h"
 
 #ifdef MICROPY_HW_NEOPIXEL
 bool neopixel_in_use;
diff --git a/ports/esp32s2/common-hal/microcontroller/Processor.c b/ports/esp32s2/common-hal/microcontroller/Processor.c
index c64fa010e..b81521601 100644
--- a/ports/esp32s2/common-hal/microcontroller/Processor.c
+++ b/ports/esp32s2/common-hal/microcontroller/Processor.c
@@ -34,7 +34,7 @@
 
 #include "soc/efuse_reg.h"
 
-#include "esp-idf/components/driver/esp32s2/include/driver/temp_sensor.h"
+#include "components/driver/esp32s2/include/driver/temp_sensor.h"
 
 float common_hal_mcu_processor_get_temperature(void) {
     float tsens_out;
diff --git a/ports/esp32s2/common-hal/neopixel_write/__init__.c b/ports/esp32s2/common-hal/neopixel_write/__init__.c
index 193d754f4..553cb79f8 100644
--- a/ports/esp32s2/common-hal/neopixel_write/__init__.c
+++ b/ports/esp32s2/common-hal/neopixel_write/__init__.c
@@ -43,8 +43,8 @@
 #include "py/mphal.h"
 #include "py/runtime.h"
 #include "shared-bindings/neopixel_write/__init__.h"
-#include "driver/rmt.h"
-#include "rmt.h"
+#include "components/driver/include/driver/rmt.h"
+#include "peripherals/rmt.h"
 
 #define WS2812_T0H_NS (350)
 #define WS2812_T0L_NS (1000)
diff --git a/ports/esp32s2/common-hal/pulseio/PulseIn.h b/ports/esp32s2/common-hal/pulseio/PulseIn.h
index 97d70d4b0..289605ed0 100644
--- a/ports/esp32s2/common-hal/pulseio/PulseIn.h
+++ b/ports/esp32s2/common-hal/pulseio/PulseIn.h
@@ -30,8 +30,8 @@
 #include "common-hal/microcontroller/Pin.h"
 
 #include "py/obj.h"
-#include "driver/rmt.h"
-#include "rmt.h"
+#include "components/driver/include/driver/rmt.h"
+#include "peripherals/rmt.h"
 
 typedef struct {
     mp_obj_base_t base;
diff --git a/ports/esp32s2/common-hal/pulseio/PulseOut.h b/ports/esp32s2/common-hal/pulseio/PulseOut.h
index 629591af6..c3952452f 100644
--- a/ports/esp32s2/common-hal/pulseio/PulseOut.h
+++ b/ports/esp32s2/common-hal/pulseio/PulseOut.h
@@ -28,8 +28,8 @@
 #define MICROPY_INCLUDED_ESP32S2_COMMON_HAL_PULSEIO_PULSEOUT_H
 
 #include "common-hal/microcontroller/Pin.h"
-#include "driver/rmt.h"
-#include "rmt.h"
+#include "components/driver/include/driver/rmt.h"
+#include "peripherals/rmt.h"
 
 #include "py/obj.h"
 
diff --git a/ports/esp32s2/common-hal/pwmio/PWMOut.c b/ports/esp32s2/common-hal/pwmio/PWMOut.c
index d745b7789..e1fdd4760 100644
--- a/ports/esp32s2/common-hal/pwmio/PWMOut.c
+++ b/ports/esp32s2/common-hal/pwmio/PWMOut.c
@@ -28,7 +28,7 @@
 #include "common-hal/pwmio/PWMOut.h"
 #include "shared-bindings/pwmio/PWMOut.h"
 #include "py/runtime.h"
-#include "driver/ledc.h"
+#include "components/driver/include/driver/ledc.h"
 
 #define INDEX_EMPTY 0xFF
 
diff --git a/ports/esp32s2/common-hal/pwmio/PWMOut.h b/ports/esp32s2/common-hal/pwmio/PWMOut.h
index c489e5a27..9055dee8e 100644
--- a/ports/esp32s2/common-hal/pwmio/PWMOut.h
+++ b/ports/esp32s2/common-hal/pwmio/PWMOut.h
@@ -28,7 +28,7 @@
 #define MICROPY_INCLUDED_ESP32S2_COMMON_HAL_PWMIO_PWMOUT_H
 
 #include "common-hal/microcontroller/Pin.h"
-#include "driver/ledc.h"
+#include "components/driver/include/driver/ledc.h"
 
 typedef struct {
     mp_obj_base_t base;
diff --git a/ports/esp32s2/common-hal/rtc/RTC.c b/ports/esp32s2/common-hal/rtc/RTC.c
index 1218186a8..4d8713639 100644
--- a/ports/esp32s2/common-hal/rtc/RTC.c
+++ b/ports/esp32s2/common-hal/rtc/RTC.c
@@ -28,7 +28,7 @@
 
 #include "py/obj.h"
 #include "py/runtime.h"
-#include "soc/rtc_periph.h"
+#include "components/soc/soc/include/soc/rtc_periph.h"
 #include "shared-bindings/rtc/RTC.h"
 
 void common_hal_rtc_get_time(timeutils_struct_time_t *tm) {
diff --git a/ports/esp32s2/common-hal/socketpool/Socket.h b/ports/esp32s2/common-hal/socketpool/Socket.h
index c23dd171c..de63c8ab2 100644
--- a/ports/esp32s2/common-hal/socketpool/Socket.h
+++ b/ports/esp32s2/common-hal/socketpool/Socket.h
@@ -32,7 +32,8 @@
 #include "common-hal/socketpool/SocketPool.h"
 #include "common-hal/ssl/SSLContext.h"
 
-#include "esp-idf/components/esp-tls/esp_tls.h"
+#include "components/esp-tls/esp_tls.h"
+#include "components/log/include/esp_log.h"
 
 typedef struct {
     mp_obj_base_t base;
diff --git a/ports/esp32s2/common-hal/socketpool/SocketPool.c b/ports/esp32s2/common-hal/socketpool/SocketPool.c
index 4a07f21c4..1d4d04b03 100644
--- a/ports/esp32s2/common-hal/socketpool/SocketPool.c
+++ b/ports/esp32s2/common-hal/socketpool/SocketPool.c
@@ -29,7 +29,7 @@
 #include "py/runtime.h"
 #include "shared-bindings/wifi/__init__.h"
 
-#include "esp-idf/components/lwip/lwip/src/include/lwip/netdb.h"
+#include "components/lwip/lwip/src/include/lwip/netdb.h"
 
 #include "bindings/espidf/__init__.h"
 
diff --git a/ports/esp32s2/common-hal/ssl/SSLContext.h b/ports/esp32s2/common-hal/ssl/SSLContext.h
index 41d199f08..e359ac0de 100644
--- a/ports/esp32s2/common-hal/ssl/SSLContext.h
+++ b/ports/esp32s2/common-hal/ssl/SSLContext.h
@@ -29,7 +29,7 @@
 
 #include "py/obj.h"
 
-#include "esp-idf/components/esp-tls/esp_tls.h"
+#include "components/esp-tls/esp_tls.h"
 
 typedef struct {
     mp_obj_base_t base;
diff --git a/ports/esp32s2/common-hal/ssl/__init__.c b/ports/esp32s2/common-hal/ssl/__init__.c
index a105e5362..8d386d0c3 100644
--- a/ports/esp32s2/common-hal/ssl/__init__.c
+++ b/ports/esp32s2/common-hal/ssl/__init__.c
@@ -26,7 +26,7 @@
 
 #include "shared-bindings/ssl/SSLContext.h"
 
-#include "esp-idf/components/mbedtls/esp_crt_bundle/include/esp_crt_bundle.h"
+#include "components/mbedtls/esp_crt_bundle/include/esp_crt_bundle.h"
 
 void common_hal_ssl_create_default_context(ssl_sslcontext_obj_t* self) {
     memset(&self->ssl_config, 0, sizeof(esp_tls_cfg_t));
diff --git a/ports/esp32s2/common-hal/wifi/Network.h b/ports/esp32s2/common-hal/wifi/Network.h
index ab75fcafe..9345bb457 100644
--- a/ports/esp32s2/common-hal/wifi/Network.h
+++ b/ports/esp32s2/common-hal/wifi/Network.h
@@ -29,7 +29,7 @@
 
 #include "py/obj.h"
 
-#include "esp-idf/components/esp_wifi/include/esp_wifi_types.h"
+#include "components/esp_wifi/include/esp_wifi_types.h"
 
 typedef struct {
     mp_obj_base_t base;
diff --git a/ports/esp32s2/common-hal/wifi/Radio.c b/ports/esp32s2/common-hal/wifi/Radio.c
index a0b8b6adc..ac3e2ee4c 100644
--- a/ports/esp32s2/common-hal/wifi/Radio.c
+++ b/ports/esp32s2/common-hal/wifi/Radio.c
@@ -35,8 +35,8 @@
 #include "shared-bindings/wifi/ScannedNetworks.h"
 #include "shared-module/ipaddress/__init__.h"
 
-#include "esp-idf/components/esp_wifi/include/esp_wifi.h"
-#include "esp-idf/components/lwip/include/apps/ping/ping_sock.h"
+#include "components/esp_wifi/include/esp_wifi.h"
+#include "components/lwip/include/apps/ping/ping_sock.h"
 
 static void start_station(wifi_radio_obj_t *self) {
     if (self->sta_mode) {
diff --git a/ports/esp32s2/common-hal/wifi/Radio.h b/ports/esp32s2/common-hal/wifi/Radio.h
index 205aef176..8679cbef1 100644
--- a/ports/esp32s2/common-hal/wifi/Radio.h
+++ b/ports/esp32s2/common-hal/wifi/Radio.h
@@ -29,7 +29,7 @@
 
 #include "py/obj.h"
 
-#include "esp-idf/components/esp_event/include/esp_event.h"
+#include "components/esp_event/include/esp_event.h"
 
 #include "shared-bindings/wifi/ScannedNetworks.h"
 
diff --git a/ports/esp32s2/common-hal/wifi/ScannedNetworks.c b/ports/esp32s2/common-hal/wifi/ScannedNetworks.c
index 507c6d186..cc733308d 100644
--- a/ports/esp32s2/common-hal/wifi/ScannedNetworks.c
+++ b/ports/esp32s2/common-hal/wifi/ScannedNetworks.c
@@ -37,7 +37,7 @@
 #include "shared-bindings/wifi/Radio.h"
 #include "shared-bindings/wifi/ScannedNetworks.h"
 
-#include "esp-idf/components/esp_wifi/include/esp_wifi.h"
+#include "components/esp_wifi/include/esp_wifi.h"
 
 static void wifi_scannednetworks_done(wifi_scannednetworks_obj_t *self) {
     self->done = true;
diff --git a/ports/esp32s2/common-hal/wifi/ScannedNetworks.h b/ports/esp32s2/common-hal/wifi/ScannedNetworks.h
index cd57e95f2..db0c2a148 100644
--- a/ports/esp32s2/common-hal/wifi/ScannedNetworks.h
+++ b/ports/esp32s2/common-hal/wifi/ScannedNetworks.h
@@ -35,7 +35,8 @@
 #include "FreeRTOS.h"
 #include "freertos/event_groups.h"
 
-#include "esp-idf/components/esp_wifi/include/esp_wifi_types.h"
+#include "components/esp_wifi/include/esp_wifi_types.h"
+#include "components/log/include/esp_log.h"
 
 typedef struct {
     mp_obj_base_t base;
diff --git a/ports/esp32s2/common-hal/wifi/__init__.c b/ports/esp32s2/common-hal/wifi/__init__.c
index b9ea9da06..5c8d2e952 100644
--- a/ports/esp32s2/common-hal/wifi/__init__.c
+++ b/ports/esp32s2/common-hal/wifi/__init__.c
@@ -31,13 +31,14 @@
 
 #include "py/runtime.h"
 
-#include "esp-idf/components/esp_wifi/include/esp_wifi.h"
+#include "components/esp_wifi/include/esp_wifi.h"
 
-#include "esp-idf/components/heap/include/esp_heap_caps.h"
+#include "components/heap/include/esp_heap_caps.h"
 
 wifi_radio_obj_t common_hal_wifi_radio_obj;
 
-#include "esp_log.h"
+#include "components/log/include/esp_log.h"
+
 static const char* TAG = "wifi";
 
 static void event_handler(void* arg, esp_event_base_t event_base,
diff --git a/ports/esp32s2/esp-idf b/ports/esp32s2/esp-idf
index de733cdab..8bc19ba89 160000
--- a/ports/esp32s2/esp-idf
+++ b/ports/esp32s2/esp-idf
@@ -1 +1 @@
-Subproject commit de733cdab556c5713c94ba95078f4024dd56fd87
+Subproject commit 8bc19ba893e5544d571a753d82b44a84799b94b1
diff --git a/ports/esp32s2/mphalport.c b/ports/esp32s2/mphalport.c
index e1662a6ce..9b4c4bc5e 100644
--- a/ports/esp32s2/mphalport.c
+++ b/ports/esp32s2/mphalport.c
@@ -31,8 +31,8 @@
 #include "py/mpstate.h"
 #include "py/gc.h"
 
-#include "esp-idf/components/xtensa/include/esp_debug_helpers.h"
-#include "esp-idf/components/esp_rom/include/esp32s2/rom/ets_sys.h"
+#include "components/xtensa/include/esp_debug_helpers.h"
+#include "components/esp_rom/include/esp32s2/rom/ets_sys.h"
 
 void mp_hal_delay_us(mp_uint_t delay) {
     ets_delay_us(delay);
diff --git a/ports/esp32s2/peripherals/pins.h b/ports/esp32s2/peripherals/pins.h
index 07d0b908e..9776fbb78 100644
--- a/ports/esp32s2/peripherals/pins.h
+++ b/ports/esp32s2/peripherals/pins.h
@@ -34,7 +34,7 @@
 
 #include "esp32s2_peripherals_config.h"
 #include "esp-idf/config/sdkconfig.h"
-#include "esp-idf/components/soc/include/hal/gpio_types.h"
+#include "components/hal/include/hal/gpio_types.h"
 
 typedef struct {
     PIN_PREFIX_FIELDS
diff --git a/ports/esp32s2/peripherals/rmt.c b/ports/esp32s2/peripherals/rmt.c
index b7629dbd5..2be5f06d8 100644
--- a/ports/esp32s2/peripherals/rmt.c
+++ b/ports/esp32s2/peripherals/rmt.c
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-#include "rmt.h"
+#include "peripherals/rmt.h"
 #include "py/runtime.h"
 
 bool rmt_reserved_channels[RMT_CHANNEL_MAX];
diff --git a/ports/esp32s2/peripherals/rmt.h b/ports/esp32s2/peripherals/rmt.h
index 01ed09907..020f8dc3e 100644
--- a/ports/esp32s2/peripherals/rmt.h
+++ b/ports/esp32s2/peripherals/rmt.h
@@ -28,7 +28,7 @@
 #define MICROPY_INCLUDED_ESP32S2_PERIPHERALS_RMT_H
 
 #include "py/mphal.h"
-#include "driver/rmt.h"
+#include "components/driver/include/driver/rmt.h"
 #include <stdint.h>
 
 void esp32s2_peripherals_rmt_reset(void);
diff --git a/ports/esp32s2/supervisor/internal_flash.c b/ports/esp32s2/supervisor/internal_flash.c
index 4b216a095..de69a49f9 100644
--- a/ports/esp32s2/supervisor/internal_flash.c
+++ b/ports/esp32s2/supervisor/internal_flash.c
@@ -37,7 +37,7 @@
 #include "py/runtime.h"
 #include "lib/oofatfs/ff.h"
 
-#include "esp-idf/components/spi_flash/include/esp_partition.h"
+#include "components/spi_flash/include/esp_partition.h"
 
 #include "supervisor/usb.h"
 
diff --git a/ports/esp32s2/supervisor/port.c b/ports/esp32s2/supervisor/port.c
index 3de63278d..d2630617b 100644
--- a/ports/esp32s2/supervisor/port.c
+++ b/ports/esp32s2/supervisor/port.c
@@ -46,8 +46,8 @@
 #include "shared-bindings/rtc/__init__.h"
 
 #include "peripherals/rmt.h"
-#include "esp-idf/components/heap/include/esp_heap_caps.h"
-#include "esp-idf/components/soc/soc/esp32s2/include/soc/cache_memory.h"
+#include "components/heap/include/esp_heap_caps.h"
+#include "components/soc/soc/esp32s2/include/soc/cache_memory.h"
 
 #define HEAP_SIZE (48 * 1024)
 
diff --git a/ports/esp32s2/supervisor/usb.c b/ports/esp32s2/supervisor/usb.c
index 39eb8204f..c91c2ec4b 100644
--- a/ports/esp32s2/supervisor/usb.c
+++ b/ports/esp32s2/supervisor/usb.c
@@ -29,10 +29,10 @@
 #include "lib/utils/interrupt_char.h"
 #include "lib/mp-readline/readline.h"
 
-#include "esp-idf/components/soc/soc/esp32s2/include/soc/usb_periph.h"
-#include "esp-idf/components/driver/include/driver/periph_ctrl.h"
-#include "esp-idf/components/driver/include/driver/gpio.h"
-#include "esp-idf/components/esp_rom/include/esp32s2/rom/gpio.h"
+#include "components/soc/soc/esp32s2/include/soc/usb_periph.h"
+#include "components/driver/include/driver/periph_ctrl.h"
+#include "components/driver/include/driver/gpio.h"
+#include "components/esp_rom/include/esp32s2/rom/gpio.h"
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
diff --git a/shared-bindings/socketpool/Socket.c b/shared-bindings/socketpool/Socket.c
index e1b1e6967..de05b8eb4 100644
--- a/shared-bindings/socketpool/Socket.c
+++ b/shared-bindings/socketpool/Socket.c
@@ -36,7 +36,6 @@
 #include "py/runtime.h"
 #include "py/mperrno.h"
 
-#include "esp_log.h"
 static const char* TAG = "socket binding";
 
 //| class Socket:
diff --git a/shared-bindings/socketpool/SocketPool.c b/shared-bindings/socketpool/SocketPool.c
index 0eeebd691..9f56e8c7e 100644
--- a/shared-bindings/socketpool/SocketPool.c
+++ b/shared-bindings/socketpool/SocketPool.c
@@ -37,7 +37,6 @@
 #include "shared-bindings/socketpool/Socket.h"
 #include "shared-bindings/socketpool/SocketPool.h"
 
-#include "esp_log.h"
 static const char* TAG = "socketpool binding";
 
 //| class SocketPool:
diff --git a/shared-bindings/wifi/ScannedNetworks.c b/shared-bindings/wifi/ScannedNetworks.c
index c927d7282..d04f0f92a 100644
--- a/shared-bindings/wifi/ScannedNetworks.c
+++ b/shared-bindings/wifi/ScannedNetworks.c
@@ -32,7 +32,6 @@
 #include "py/runtime.h"
 #include "shared-bindings/wifi/ScannedNetworks.h"
 
-#include "esp_log.h"
 static const char *TAG = "cp iternext";
 
 //| class ScannedNetworks:
-- 
cgit v1.2.3


From a09a158ddc89da5c870437a0706c862944e08321 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Wed, 30 Sep 2020 11:36:51 -0700
Subject: Fix trailing line

---
 .../esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
index 726c46e40..ee97d62c6 100644
--- a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
+++ b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
@@ -35,4 +35,4 @@
 #define AUTORESET_DELAY_MS 500
 
 #define MICROPY_HW_APA102_MOSI   (&pin_GPIO40)
-#define MICROPY_HW_APA102_SCK    (&pin_GPIO45)
\ No newline at end of file
+#define MICROPY_HW_APA102_SCK    (&pin_GPIO45)
-- 
cgit v1.2.3


From a739d314f1a9f5fee6517eb425a2c691969fd7f7 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Tue, 29 Sep 2020 13:04:39 -0700
Subject: Add Metro ESP32S2

Also fix two bugs:
* Crash when resetting board.SPI when it hasn't been inited.
* Reading back the output value is always false. Fixes #3353
---
 .../esp32s2/boards/adafruit_metro_esp32s2/board.c  | 43 +++++++++++++++++++
 .../boards/adafruit_metro_esp32s2/mpconfigboard.h  | 48 ++++++++++++++++++++++
 .../boards/adafruit_metro_esp32s2/mpconfigboard.mk | 17 ++++++++
 ports/esp32s2/boards/adafruit_metro_esp32s2/pins.c | 44 ++++++++++++++++++++
 .../boards/adafruit_metro_esp32s2/sdkconfig        | 33 +++++++++++++++
 ports/esp32s2/common-hal/digitalio/DigitalInOut.c  | 18 +++++++-
 ports/esp32s2/common-hal/digitalio/DigitalInOut.h  |  1 +
 shared-module/board/__init__.c                     |  4 +-
 8 files changed, 205 insertions(+), 3 deletions(-)
 create mode 100644 ports/esp32s2/boards/adafruit_metro_esp32s2/board.c
 create mode 100644 ports/esp32s2/boards/adafruit_metro_esp32s2/mpconfigboard.h
 create mode 100644 ports/esp32s2/boards/adafruit_metro_esp32s2/mpconfigboard.mk
 create mode 100644 ports/esp32s2/boards/adafruit_metro_esp32s2/pins.c
 create mode 100644 ports/esp32s2/boards/adafruit_metro_esp32s2/sdkconfig

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/boards/adafruit_metro_esp32s2/board.c b/ports/esp32s2/boards/adafruit_metro_esp32s2/board.c
new file mode 100644
index 000000000..7380be6da
--- /dev/null
+++ b/ports/esp32s2/boards/adafruit_metro_esp32s2/board.c
@@ -0,0 +1,43 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 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 "boards/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
+
+void board_init(void) {
+    // USB
+    common_hal_never_reset_pin(&pin_GPIO19);
+    common_hal_never_reset_pin(&pin_GPIO20);
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+
+}
diff --git a/ports/esp32s2/boards/adafruit_metro_esp32s2/mpconfigboard.h b/ports/esp32s2/boards/adafruit_metro_esp32s2/mpconfigboard.h
new file mode 100644
index 000000000..7280aab9c
--- /dev/null
+++ b/ports/esp32s2/boards/adafruit_metro_esp32s2/mpconfigboard.h
@@ -0,0 +1,48 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 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.
+ */
+
+//Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "Metro ESP32S2"
+#define MICROPY_HW_MCU_NAME         "ESP32S2"
+
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO45)
+
+#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
+
+#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
+
+#define AUTORESET_DELAY_MS 500
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO34)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO33)
+
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO36)
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO35)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO37)
+
+#define DEFAULT_UART_BUS_RX (&pin_GPIO5)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO6)
diff --git a/ports/esp32s2/boards/adafruit_metro_esp32s2/mpconfigboard.mk b/ports/esp32s2/boards/adafruit_metro_esp32s2/mpconfigboard.mk
new file mode 100644
index 000000000..e78098d64
--- /dev/null
+++ b/ports/esp32s2/boards/adafruit_metro_esp32s2/mpconfigboard.mk
@@ -0,0 +1,17 @@
+USB_VID = 0x239A
+USB_PID = 0x80E0
+USB_PRODUCT = "Metro ESP32S2"
+USB_MANUFACTURER = "Adafruit"
+
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = MPZ
+
+# The default queue depth of 16 overflows on release builds,
+# so increase it to 32.
+CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
+
+CIRCUITPY_ESP_FLASH_MODE=dio
+CIRCUITPY_ESP_FLASH_FREQ=40m
+CIRCUITPY_ESP_FLASH_SIZE=4MB
+
+CIRCUITPY_MODULE=wrover
diff --git a/ports/esp32s2/boards/adafruit_metro_esp32s2/pins.c b/ports/esp32s2/boards/adafruit_metro_esp32s2/pins.c
new file mode 100644
index 000000000..08d2b2a1a
--- /dev/null
+++ b/ports/esp32s2/boards/adafruit_metro_esp32s2/pins.c
@@ -0,0 +1,44 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
+    { MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO4) },
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO42) },
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SDA),MP_ROM_PTR(&pin_GPIO33) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SCL),MP_ROM_PTR(&pin_GPIO34) },
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO45) },
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_DEBUG_RX), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_DEBUG_TX), MP_ROM_PTR(&pin_GPIO37) },
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_MOSI),MP_ROM_PTR(&pin_GPIO35) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_MISO),MP_ROM_PTR(&pin_GPIO37) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
+    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
diff --git a/ports/esp32s2/boards/adafruit_metro_esp32s2/sdkconfig b/ports/esp32s2/boards/adafruit_metro_esp32s2/sdkconfig
new file mode 100644
index 000000000..9d8bbde96
--- /dev/null
+++ b/ports/esp32s2/boards/adafruit_metro_esp32s2/sdkconfig
@@ -0,0 +1,33 @@
+CONFIG_ESP32S2_SPIRAM_SUPPORT=y
+
+#
+# SPI RAM config
+#
+# CONFIG_SPIRAM_TYPE_AUTO is not set
+CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
+CONFIG_SPIRAM_SIZE=2097152
+
+#
+# PSRAM clock and cs IO for ESP32S2
+#
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
+CONFIG_DEFAULT_PSRAM_CS_IO=26
+# end of PSRAM clock and cs IO for ESP32S2
+
+# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
+# CONFIG_SPIRAM_RODATA is not set
+# CONFIG_SPIRAM_SPEED_80M is not set
+CONFIG_SPIRAM_SPEED_40M=y
+# CONFIG_SPIRAM_SPEED_26M is not set
+# CONFIG_SPIRAM_SPEED_20M is not set
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
+CONFIG_SPIRAM_USE_MEMMAP=y
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
+# end of SPI RAM config
diff --git a/ports/esp32s2/common-hal/digitalio/DigitalInOut.c b/ports/esp32s2/common-hal/digitalio/DigitalInOut.c
index fb3ee10ad..d27985181 100644
--- a/ports/esp32s2/common-hal/digitalio/DigitalInOut.c
+++ b/ports/esp32s2/common-hal/digitalio/DigitalInOut.c
@@ -42,6 +42,16 @@ digitalinout_result_t common_hal_digitalio_digitalinout_construct(
     claim_pin(pin);
     self->pin = pin;
 
+    gpio_config_t config;
+    config.pin_bit_mask = 1ull << pin->number;
+    config.mode = GPIO_MODE_INPUT;
+    config.pull_up_en = GPIO_PULLUP_DISABLE;
+    config.pull_down_en = GPIO_PULLDOWN_DISABLE;
+    config.intr_type = GPIO_INTR_DISABLE;
+    if (gpio_config(&config) != ESP_OK) {
+        return DIGITALINOUT_PIN_BUSY;
+    }
+
     return DIGITALINOUT_OK;
 }
 
@@ -67,7 +77,7 @@ void common_hal_digitalio_digitalinout_switch_to_input(
 digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(
         digitalio_digitalinout_obj_t *self, bool value,
         digitalio_drive_mode_t drive_mode) {
-    gpio_set_level(self->pin->number, value);
+    common_hal_digitalio_digitalinout_set_value(self, value);
     return common_hal_digitalio_digitalinout_set_drive_mode(self, drive_mode);
 }
 
@@ -82,12 +92,16 @@ digitalio_direction_t common_hal_digitalio_digitalinout_get_direction(
 
 void common_hal_digitalio_digitalinout_set_value(
         digitalio_digitalinout_obj_t *self, bool value) {
+    self->output_value = value;
     gpio_set_level(self->pin->number, value);
 }
 
 bool common_hal_digitalio_digitalinout_get_value(
         digitalio_digitalinout_obj_t *self) {
-    return gpio_get_level(self->pin->number) == 1;
+    if (common_hal_digitalio_digitalinout_get_direction(self) == DIRECTION_INPUT) {
+        return gpio_get_level(self->pin->number) == 1;
+    }
+    return self->output_value;
 }
 
 digitalinout_result_t common_hal_digitalio_digitalinout_set_drive_mode(
diff --git a/ports/esp32s2/common-hal/digitalio/DigitalInOut.h b/ports/esp32s2/common-hal/digitalio/DigitalInOut.h
index 6877f1741..c09c5502d 100644
--- a/ports/esp32s2/common-hal/digitalio/DigitalInOut.h
+++ b/ports/esp32s2/common-hal/digitalio/DigitalInOut.h
@@ -33,6 +33,7 @@
 typedef struct {
     mp_obj_base_t base;
     const mcu_pin_obj_t *pin;
+    bool output_value;
 } digitalio_digitalinout_obj_t;
 
 #endif // MICROPY_INCLUDED_ESP32S2_COMMON_HAL_DIGITALIO_DIGITALINOUT_H
diff --git a/shared-module/board/__init__.c b/shared-module/board/__init__.c
index fb4f731b8..39b68a0f1 100644
--- a/shared-module/board/__init__.c
+++ b/shared-module/board/__init__.c
@@ -167,7 +167,9 @@ void reset_board_busses(void) {
     }
     #endif
     // make sure SPI lock is not held over a soft reset
-    common_hal_busio_spi_unlock(&spi_obj);
+    if (spi_singleton != NULL) {
+        common_hal_busio_spi_unlock(spi_singleton);
+    }
     if (!display_using_spi) {
         spi_singleton = NULL;
     }
-- 
cgit v1.2.3


From e01e8dd6b9c886c091bdbe735f4a3f63a4fb6859 Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Wed, 30 Sep 2020 16:36:13 -0400
Subject: Revert HAL refactor changes to avoid USB breaking changes past
 esp-idf dde6222cd

---
 ports/esp32s2/Makefile                            | 6 +++---
 ports/esp32s2/common-hal/busio/I2C.h              | 2 +-
 ports/esp32s2/common-hal/busio/SPI.h              | 4 ++--
 ports/esp32s2/common-hal/busio/UART.h             | 2 +-
 ports/esp32s2/common-hal/digitalio/DigitalInOut.c | 2 +-
 ports/esp32s2/common-hal/microcontroller/Pin.c    | 2 +-
 ports/esp32s2/esp-idf                             | 2 +-
 ports/esp32s2/peripherals/pins.h                  | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/Makefile b/ports/esp32s2/Makefile
index 49b9c6d2b..700af9b19 100644
--- a/ports/esp32s2/Makefile
+++ b/ports/esp32s2/Makefile
@@ -263,7 +263,7 @@ menuconfig: $(BUILD)/esp-idf/config
 $(HEADER_BUILD)/qstr.i.last: | $(BUILD)/esp-idf/config/sdkconfig.h
 
 # Order here matters
-ESP_IDF_COMPONENTS_LINK = freertos log hal esp_system esp32s2 bootloader_support pthread esp_timer vfs spi_flash app_update esp_common esp32s2 heap newlib driver xtensa soc esp_ringbuf esp_wifi esp_event wpa_supplicant mbedtls efuse nvs_flash esp_netif lwip esp_rom esp-tls
+ESP_IDF_COMPONENTS_LINK = freertos log esp_system esp32s2 bootloader_support pthread esp_timer vfs spi_flash app_update esp_common esp32s2 heap newlib driver xtensa soc esp_ringbuf esp_wifi esp_event wpa_supplicant mbedtls efuse nvs_flash esp_netif lwip esp_rom esp-tls
 
 ESP_IDF_COMPONENTS_INCLUDE = driver freertos log soc
 
@@ -275,11 +275,11 @@ ESP_IDF_WIFI_COMPONENTS_EXPANDED = $(foreach component, $(ESP_IDF_WIFI_COMPONENT
 MBEDTLS_COMPONENTS_LINK = crypto tls x509
 MBEDTLS_COMPONENTS_LINK_EXPANDED = $(foreach component, $(MBEDTLS_COMPONENTS_LINK), $(BUILD)/esp-idf/esp-idf/mbedtls/mbedtls/library/libmbed$(component).a)
 
-BINARY_BLOBS = esp-idf/components/xtensa/esp32s2/libxt_hal.a
+BINARY_BLOBS = esp-idf/components/xtensa/esp32s2/libhal.a
 BINARY_WIFI_BLOBS = libcoexist.a libcore.a libespnow.a libmesh.a libnet80211.a libpp.a librtc.a libsmartconfig.a libphy.a
 BINARY_BLOBS += $(addprefix esp-idf/components/esp_wifi/lib/esp32s2/, $(BINARY_WIFI_BLOBS))
 
-ESP_IDF_COMPONENTS_EXPANDED += $(BUILD)/esp-idf/esp-idf/soc/soc/esp32s2/libsoc_esp32s2.a esp-idf/components/xtensa/esp32s2/libxt_hal.a
+ESP_IDF_COMPONENTS_EXPANDED += $(BUILD)/esp-idf/esp-idf/soc/soc/esp32s2/libsoc_esp32s2.a esp-idf/components/xtensa/esp32s2/libhal.a
 ESP_AUTOGEN_LD = $(BUILD)/esp-idf/esp-idf/esp32s2/esp32s2_out.ld $(BUILD)/esp-idf/esp-idf/esp32s2/ld/esp32s2.project.ld
 
 FLASH_FLAGS = --flash_mode $(CIRCUITPY_ESP_FLASH_MODE) --flash_freq $(CIRCUITPY_ESP_FLASH_FREQ) --flash_size $(CIRCUITPY_ESP_FLASH_SIZE)
diff --git a/ports/esp32s2/common-hal/busio/I2C.h b/ports/esp32s2/common-hal/busio/I2C.h
index c39d6d744..1a989e30a 100644
--- a/ports/esp32s2/common-hal/busio/I2C.h
+++ b/ports/esp32s2/common-hal/busio/I2C.h
@@ -29,7 +29,7 @@
 
 #include "common-hal/microcontroller/Pin.h"
 
-#include "components/hal/include/hal/i2c_types.h"
+#include "components/soc/include/hal/i2c_types.h"
 #include "FreeRTOS.h"
 #include "freertos/semphr.h"
 #include "py/obj.h"
diff --git a/ports/esp32s2/common-hal/busio/SPI.h b/ports/esp32s2/common-hal/busio/SPI.h
index f6c1c344a..d6203feae 100644
--- a/ports/esp32s2/common-hal/busio/SPI.h
+++ b/ports/esp32s2/common-hal/busio/SPI.h
@@ -30,8 +30,8 @@
 #include "common-hal/microcontroller/Pin.h"
 
 #include "components/driver/include/driver/spi_common_internal.h"
-#include "components/hal/include/hal/spi_hal.h"
-#include "components/hal/include/hal/spi_types.h"
+#include "components/soc/include/hal/spi_hal.h"
+#include "components/soc/include/hal/spi_types.h"
 #include "py/obj.h"
 
 typedef struct {
diff --git a/ports/esp32s2/common-hal/busio/UART.h b/ports/esp32s2/common-hal/busio/UART.h
index 1d7f13511..751fb2e00 100644
--- a/ports/esp32s2/common-hal/busio/UART.h
+++ b/ports/esp32s2/common-hal/busio/UART.h
@@ -29,7 +29,7 @@
 
 #include "common-hal/microcontroller/Pin.h"
 
-#include "components/hal/include/hal/uart_types.h"
+#include "components/soc/include/hal/uart_types.h"
 #include "py/obj.h"
 
 typedef struct {
diff --git a/ports/esp32s2/common-hal/digitalio/DigitalInOut.c b/ports/esp32s2/common-hal/digitalio/DigitalInOut.c
index 2c7902616..46c47a285 100644
--- a/ports/esp32s2/common-hal/digitalio/DigitalInOut.c
+++ b/ports/esp32s2/common-hal/digitalio/DigitalInOut.c
@@ -30,7 +30,7 @@
 
 #include "components/driver/include/driver/gpio.h"
 
-#include "components/hal/include/hal/gpio_hal.h"
+#include "components/soc/include/hal/gpio_hal.h"
 
 void common_hal_digitalio_digitalinout_never_reset(
         digitalio_digitalinout_obj_t *self) {
diff --git a/ports/esp32s2/common-hal/microcontroller/Pin.c b/ports/esp32s2/common-hal/microcontroller/Pin.c
index 3c2611efe..0f4669fe0 100644
--- a/ports/esp32s2/common-hal/microcontroller/Pin.c
+++ b/ports/esp32s2/common-hal/microcontroller/Pin.c
@@ -32,7 +32,7 @@
 #include "py/mphal.h"
 
 #include "components/driver/include/driver/gpio.h"
-#include "components/hal/include/hal/gpio_hal.h"
+#include "components/soc/include/hal/gpio_hal.h"
 
 #ifdef MICROPY_HW_NEOPIXEL
 bool neopixel_in_use;
diff --git a/ports/esp32s2/esp-idf b/ports/esp32s2/esp-idf
index 8bc19ba89..dde6222cd 160000
--- a/ports/esp32s2/esp-idf
+++ b/ports/esp32s2/esp-idf
@@ -1 +1 @@
-Subproject commit 8bc19ba893e5544d571a753d82b44a84799b94b1
+Subproject commit dde6222cdceca978b2588fbf0eb25b8255741fba
diff --git a/ports/esp32s2/peripherals/pins.h b/ports/esp32s2/peripherals/pins.h
index 9776fbb78..0cf63a029 100644
--- a/ports/esp32s2/peripherals/pins.h
+++ b/ports/esp32s2/peripherals/pins.h
@@ -34,7 +34,7 @@
 
 #include "esp32s2_peripherals_config.h"
 #include "esp-idf/config/sdkconfig.h"
-#include "components/hal/include/hal/gpio_types.h"
+#include "components/soc/include/hal/gpio_types.h"
 
 typedef struct {
     PIN_PREFIX_FIELDS
-- 
cgit v1.2.3


From 0bbd067a17eaf89ec5fdc87d18555edb4608f784 Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Thu, 1 Oct 2020 13:06:48 -0400
Subject: Revert ADC calibration removal, complete merge

---
 ports/esp32s2/Makefile                       |  5 +----
 ports/esp32s2/common-hal/analogio/AnalogIn.c | 18 +++++++-----------
 ports/esp32s2/common-hal/analogio/AnalogIn.h |  2 +-
 3 files changed, 9 insertions(+), 16 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/Makefile b/ports/esp32s2/Makefile
index 128983505..f19c960f4 100644
--- a/ports/esp32s2/Makefile
+++ b/ports/esp32s2/Makefile
@@ -77,6 +77,7 @@ INC += -I../../supervisor/shared/usb
 INC += -isystem esp-idf
 INC += -isystem esp-idf/components/driver/include
 INC += -isystem esp-idf/components/hal/esp32s2/include
+INC += -isystem esp-idf/components/driver/esp32s2/include
 INC += -isystem esp-idf/components/hal/include
 
 INC += -isystem esp-idf/components/freertos/include/freertos
@@ -97,10 +98,6 @@ INC += -isystem esp-idf/components/newlib/platform_include
 INC += -isystem esp-idf/components/lwip/lwip/src/include
 INC += -isystem esp-idf/components/lwip/port/esp32/include
 INC += -isystem esp-idf/components/lwip/include/apps/sntp
-<<<<<<< HEAD
-=======
-INC += -isystem esp-idf/components/hal/include
->>>>>>> esp32-update-idf
 INC += -isystem esp-idf/components/soc/include
 INC += -isystem esp-idf/components/soc/src/esp32s2/include
 INC += -isystem esp-idf/components/soc/soc/include
diff --git a/ports/esp32s2/common-hal/analogio/AnalogIn.c b/ports/esp32s2/common-hal/analogio/AnalogIn.c
index 1a15fc77c..d8acc5728 100644
--- a/ports/esp32s2/common-hal/analogio/AnalogIn.c
+++ b/ports/esp32s2/common-hal/analogio/AnalogIn.c
@@ -29,9 +29,9 @@
 #include "py/runtime.h"
 #include "supervisor/shared/translate.h"
 
-#include "driver/adc.h"
-// TODO: Add when ESP-IDF is updated latest version
-// #include "esp-idf/components/esp_adc_cal/include/esp_adc_cal.h"
+#include "components/driver/include/driver/adc_common.h"
+
+#include "components/esp_adc_cal/include/esp_adc_cal.h"
 
 #include "shared-bindings/microcontroller/Pin.h"
 
@@ -69,10 +69,9 @@ uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) {
         adc2_config_channel_atten((adc2_channel_t)self->pin->adc_channel, ATTENUATION);
     }
 
-    // TODO: esp_adc_cal is only available in the latest version of the esp-idf. Enable when we update.
     // Automatically select calibration process depending on status of efuse
-    // esp_adc_cal_characteristics_t *adc_chars = calloc(1, sizeof(esp_adc_cal_characteristics_t));
-    // esp_adc_cal_characterize(self->pin->adc_index, ATTENUATION, DATA_WIDTH, DEFAULT_VREF, adc_chars);
+    esp_adc_cal_characteristics_t *adc_chars = calloc(1, sizeof(esp_adc_cal_characteristics_t));
+    esp_adc_cal_characterize(self->pin->adc_index, ATTENUATION, DATA_WIDTH, DEFAULT_VREF, adc_chars);
 
     uint32_t adc_reading = 0;
     //Multisampling
@@ -91,11 +90,8 @@ uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) {
     adc_reading /= NO_OF_SAMPLES;
 
     // This corrects non-linear regions of the ADC range with a LUT, so it's a better reading than raw
-    // Enable when ESP-IDF is updated
-    //uint32_t voltage = esp_adc_cal_raw_to_voltage(adc_reading, adc_chars);
-    //return voltage * ((1 << 16) - 1)/3300;
-
-    return adc_reading;
+    uint32_t voltage = esp_adc_cal_raw_to_voltage(adc_reading, adc_chars);
+    return voltage * ((1 << 16) - 1)/3300;
 }
 
 float common_hal_analogio_analogin_get_reference_voltage(analogio_analogin_obj_t *self) {
diff --git a/ports/esp32s2/common-hal/analogio/AnalogIn.h b/ports/esp32s2/common-hal/analogio/AnalogIn.h
index 5ea4a913d..548cbb5cc 100644
--- a/ports/esp32s2/common-hal/analogio/AnalogIn.h
+++ b/ports/esp32s2/common-hal/analogio/AnalogIn.h
@@ -29,7 +29,7 @@
 
 #include "common-hal/microcontroller/Pin.h"
 
-#include "esp-idf/components/soc/include/hal/adc_types.h"
+#include "components/soc/include/hal/adc_types.h"
 #include "FreeRTOS.h"
 #include "freertos/semphr.h"
 #include "py/obj.h"
-- 
cgit v1.2.3


From 9a3bd82f40784c53f39d3fb806476c6fd2083da6 Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Thu, 1 Oct 2020 13:19:54 -0400
Subject: Update TinyUSB include compatibility

---
 ports/esp32s2/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/Makefile b/ports/esp32s2/Makefile
index 700af9b19..04b3e4346 100644
--- a/ports/esp32s2/Makefile
+++ b/ports/esp32s2/Makefile
@@ -76,9 +76,6 @@ INC += -I../../supervisor/shared/usb
 
 INC += -isystem esp-idf
 INC += -isystem esp-idf/components/driver/include
-INC += -isystem esp-idf/components/hal/esp32s2/include
-INC += -isystem esp-idf/components/hal/include
-
 INC += -isystem esp-idf/components/freertos/include/freertos
 INC += -isystem esp-idf/components/freertos/xtensa/include
 INC += -isystem esp-idf/components/esp32s2/include
@@ -98,6 +95,8 @@ INC += -isystem esp-idf/components/lwip/lwip/src/include
 INC += -isystem esp-idf/components/lwip/port/esp32/include
 INC += -isystem esp-idf/components/lwip/include/apps/sntp
 INC += -isystem esp-idf/components/hal/include
+INC += -isystem esp-idf/components/hal/esp32s2/include
+INC += -isystem esp-idf/components/log/include/
 INC += -isystem esp-idf/components/soc/include
 INC += -isystem esp-idf/components/soc/src/esp32s2/include
 INC += -isystem esp-idf/components/soc/soc/include
-- 
cgit v1.2.3


From 0467a828808f15cc5f0e502667f61e4a448450df Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Mon, 5 Oct 2020 12:58:42 -0400
Subject: Fix/remove various style issues

---
 locale/circuitpython.pot                      | 2 +-
 ports/esp32s2/common-hal/analogio/AnalogIn.h  | 8 --------
 ports/esp32s2/common-hal/analogio/AnalogOut.c | 3 +--
 ports/esp32s2/common-hal/analogio/AnalogOut.h | 4 ++--
 ports/esp32s2/mpconfigport.mk                 | 1 -
 5 files changed, 4 insertions(+), 14 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index d0bbe6707..1960a3694 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-10-01 17:17-0400\n"
+"POT-Creation-Date: 2020-10-05 12:59-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/ports/esp32s2/common-hal/analogio/AnalogIn.h b/ports/esp32s2/common-hal/analogio/AnalogIn.h
index 548cbb5cc..b9c4866f2 100644
--- a/ports/esp32s2/common-hal/analogio/AnalogIn.h
+++ b/ports/esp32s2/common-hal/analogio/AnalogIn.h
@@ -39,12 +39,4 @@ typedef struct {
     const mcu_pin_obj_t * pin;
 } analogio_analogin_obj_t;
 
-static inline uint8_t stm32_adc_units(uint8_t adc_packed) {
-    return adc_packed >> 5;
-}
-
-static inline uint8_t stm32_adc_channel(uint8_t adc_packed) {
-    return adc_packed & 0x1f;
-}
-
 #endif // MICROPY_INCLUDED_ESP32S2_COMMON_HAL_ANALOGIO_ANALOGIN_H
diff --git a/ports/esp32s2/common-hal/analogio/AnalogOut.c b/ports/esp32s2/common-hal/analogio/AnalogOut.c
index d67dc6083..b23c40514 100644
--- a/ports/esp32s2/common-hal/analogio/AnalogOut.c
+++ b/ports/esp32s2/common-hal/analogio/AnalogOut.c
@@ -39,7 +39,7 @@
 
 void common_hal_analogio_analogout_construct(analogio_analogout_obj_t* self,
         const mcu_pin_obj_t *pin) {
-    //mp_raise_ValueError(translate("No DAC on chip"));
+    mp_raise_NotImplementedError(translate("No DAC on chip"));
 }
 
 bool common_hal_analogio_analogout_deinited(analogio_analogout_obj_t *self) {
@@ -52,7 +52,6 @@ void common_hal_analogio_analogout_deinit(analogio_analogout_obj_t *self) {
 
 void common_hal_analogio_analogout_set_value(analogio_analogout_obj_t *self,
         uint16_t value) {
-
 }
 
 void analogout_reset(void) {
diff --git a/ports/esp32s2/common-hal/analogio/AnalogOut.h b/ports/esp32s2/common-hal/analogio/AnalogOut.h
index d5f29ffd7..a8cbc39d5 100644
--- a/ports/esp32s2/common-hal/analogio/AnalogOut.h
+++ b/ports/esp32s2/common-hal/analogio/AnalogOut.h
@@ -25,8 +25,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_STM32F4_COMMON_HAL_ANALOGIO_ANALOGOUT_H
-#define MICROPY_INCLUDED_STM32F4_COMMON_HAL_ANALOGIO_ANALOGOUT_H
+#ifndef MICROPY_INCLUDED_ESP32S2_COMMON_HAL_ANALOGIO_ANALOGOUT_H
+#define MICROPY_INCLUDED_ESP32S2_COMMON_HAL_ANALOGIO_ANALOGOUT_H
 
 #include "common-hal/microcontroller/Pin.h"
 
diff --git a/ports/esp32s2/mpconfigport.mk b/ports/esp32s2/mpconfigport.mk
index d68fe469d..4e8a7bdef 100644
--- a/ports/esp32s2/mpconfigport.mk
+++ b/ports/esp32s2/mpconfigport.mk
@@ -13,7 +13,6 @@ USB_SERIAL_NUMBER_LENGTH = 12
 LONGINT_IMPL = MPZ
 
 # These modules are implemented in ports/<port>/common-hal:
-# CIRCUITPY_ANALOGIO = 0
 CIRCUITPY_FULL_BUILD = 1
 CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_AUDIOIO = 0
-- 
cgit v1.2.3


From 5c00ba8592fd0b9eba9e5c795630638a79fc4044 Mon Sep 17 00:00:00 2001
From: Seon Rozenblum <seon@unexpectedmaker.com>
Date: Fri, 2 Oct 2020 19:25:04 +1000
Subject: Removed hardware APA settings from mpconfigboard.h because they make
 the APA flicker on boot. I need to look into why,  but I don't think they are
 being used for anything right now anyway.

---
 ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h        | 4 ++--
 .../boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h b/ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h
index a77de1511..5a885f29c 100644
--- a/ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h
+++ b/ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h
@@ -35,5 +35,5 @@
 
 #define AUTORESET_DELAY_MS 500
 
-#define MICROPY_HW_APA102_MOSI   (&pin_GPIO40)
-#define MICROPY_HW_APA102_SCK    (&pin_GPIO45)
+// #define MICROPY_HW_APA102_MOSI   (&pin_GPIO40)
+// #define MICROPY_HW_APA102_SCK    (&pin_GPIO45)
diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
index ee97d62c6..90a368006 100644
--- a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
+++ b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
@@ -34,5 +34,5 @@
 
 #define AUTORESET_DELAY_MS 500
 
-#define MICROPY_HW_APA102_MOSI   (&pin_GPIO40)
-#define MICROPY_HW_APA102_SCK    (&pin_GPIO45)
+// #define MICROPY_HW_APA102_MOSI   (&pin_GPIO40)
+// #define MICROPY_HW_APA102_SCK    (&pin_GPIO45)
-- 
cgit v1.2.3


From 0d7552b67eac91500db5e5ba25607df8bd3e16e5 Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Tue, 6 Oct 2020 12:48:28 -0400
Subject: Update ESP-IDF to newer fixed fork

---
 .gitmodules           | 2 +-
 ports/esp32s2/esp-idf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/.gitmodules b/.gitmodules
index f66ce8aaf..b1ae2276c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -152,4 +152,4 @@
 	url = https://github.com/adafruit/Adafruit_CircuitPython_RFM69.git
 [submodule "ports/esp32s2/esp-idf"]
 	path = ports/esp32s2/esp-idf
-	url = https://github.com/espressif/esp-idf.git
+	url = https://github.com/hierophect/esp-idf.git
diff --git a/ports/esp32s2/esp-idf b/ports/esp32s2/esp-idf
index dde6222cd..a7f777988 160000
--- a/ports/esp32s2/esp-idf
+++ b/ports/esp32s2/esp-idf
@@ -1 +1 @@
-Subproject commit dde6222cdceca978b2588fbf0eb25b8255741fba
+Subproject commit a7f77798816661f7c4ae198f3878bc92a9274f82
-- 
cgit v1.2.3


From 68cb384f8faed451c3e31a83ae087646b0c0a9f6 Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Tue, 6 Oct 2020 13:29:12 -0400
Subject: Remove logging from shared-bindings, fix translations, revert config
 target macro

---
 locale/circuitpython.pot                        | 14 +++++++++-----
 ports/esp32s2/common-hal/socketpool/Socket.h    |  1 -
 ports/esp32s2/common-hal/wifi/ScannedNetworks.h |  1 -
 ports/esp32s2/mpconfigport.h                    |  3 ---
 shared-bindings/socketpool/Socket.c             |  3 ---
 shared-bindings/socketpool/SocketPool.c         |  3 ---
 shared-bindings/wifi/ScannedNetworks.c          |  3 ---
 7 files changed, 9 insertions(+), 19 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 62e1fbb10..199f39c58 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-10-05 12:59-0400\n"
+"POT-Creation-Date: 2020-10-06 13:26-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -271,6 +271,10 @@ msgstr ""
 msgid "A hardware interrupt channel is already in use"
 msgstr ""
 
+#: ports/esp32s2/common-hal/analogio/AnalogIn.c
+msgid "ADC2 is being used by WiFi"
+msgstr ""
+
 #: shared-bindings/_bleio/Address.c shared-bindings/ipaddress/IPv4Address.c
 #, c-format
 msgid "Address must be %d bytes long"
@@ -1225,6 +1229,7 @@ msgid "No CCCD for this Characteristic"
 msgstr ""
 
 #: ports/atmel-samd/common-hal/analogio/AnalogOut.c
+#: ports/esp32s2/common-hal/analogio/AnalogOut.c
 #: ports/stm/common-hal/analogio/AnalogOut.c
 msgid "No DAC on chip"
 msgstr ""
@@ -1421,6 +1426,7 @@ msgstr ""
 
 #: ports/atmel-samd/common-hal/analogio/AnalogIn.c
 #: ports/cxd56/common-hal/analogio/AnalogIn.c
+#: ports/esp32s2/common-hal/analogio/AnalogIn.c
 #: ports/mimxrt10xx/common-hal/analogio/AnalogIn.c
 #: ports/nrf/common-hal/analogio/AnalogIn.c
 #: ports/stm/common-hal/analogio/AnalogIn.c
@@ -1482,10 +1488,6 @@ msgstr ""
 msgid "Pull not used when direction is output."
 msgstr ""
 
-#: ports/stm/ref/pulseout-pre-timeralloc.c
-msgid "PulseOut not supported on this chip"
-msgstr ""
-
 #: ports/stm/common-hal/os/__init__.c
 msgid "RNG DeInit Error"
 msgstr ""
@@ -3148,6 +3150,7 @@ msgstr ""
 msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
+#: ports/esp32s2/boards/adafruit_metro_esp32s2/mpconfigboard.h
 #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h
 #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h
 #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h
@@ -3155,6 +3158,7 @@ msgstr ""
 #: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
 #: ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h
 #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h
+#: ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
 msgid "pressing boot button at start up.\n"
 msgstr ""
 
diff --git a/ports/esp32s2/common-hal/socketpool/Socket.h b/ports/esp32s2/common-hal/socketpool/Socket.h
index de63c8ab2..62b5ded58 100644
--- a/ports/esp32s2/common-hal/socketpool/Socket.h
+++ b/ports/esp32s2/common-hal/socketpool/Socket.h
@@ -33,7 +33,6 @@
 #include "common-hal/ssl/SSLContext.h"
 
 #include "components/esp-tls/esp_tls.h"
-#include "components/log/include/esp_log.h"
 
 typedef struct {
     mp_obj_base_t base;
diff --git a/ports/esp32s2/common-hal/wifi/ScannedNetworks.h b/ports/esp32s2/common-hal/wifi/ScannedNetworks.h
index db0c2a148..36da387f2 100644
--- a/ports/esp32s2/common-hal/wifi/ScannedNetworks.h
+++ b/ports/esp32s2/common-hal/wifi/ScannedNetworks.h
@@ -36,7 +36,6 @@
 #include "freertos/event_groups.h"
 
 #include "components/esp_wifi/include/esp_wifi_types.h"
-#include "components/log/include/esp_log.h"
 
 typedef struct {
     mp_obj_base_t base;
diff --git a/ports/esp32s2/mpconfigport.h b/ports/esp32s2/mpconfigport.h
index 066d0fd2c..cec8dd35d 100644
--- a/ports/esp32s2/mpconfigport.h
+++ b/ports/esp32s2/mpconfigport.h
@@ -36,9 +36,6 @@
 
 #include "py/circuitpy_mpconfig.h"
 
-// ESP-IDF leaves this undefined but uses it everywhere.
-// Defining it will reduce chance of undef errors.
-#define CONFIG_IDF_TARGET_ESP32             (0)
 
 #define MICROPY_PORT_ROOT_POINTERS \
 	CIRCUITPY_COMMON_ROOT_POINTERS
diff --git a/shared-bindings/socketpool/Socket.c b/shared-bindings/socketpool/Socket.c
index de05b8eb4..b0af57a5d 100644
--- a/shared-bindings/socketpool/Socket.c
+++ b/shared-bindings/socketpool/Socket.c
@@ -36,8 +36,6 @@
 #include "py/runtime.h"
 #include "py/mperrno.h"
 
-static const char* TAG = "socket binding";
-
 //| class Socket:
 //|     """TCP, UDP and RAW socket. Cannot be created directly. Instead, call
 //|        `SocketPool.socket()`.
@@ -182,7 +180,6 @@ STATIC mp_obj_t socketpool_socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
 
     bool ok = common_hal_socketpool_socket_connect(self, host, hostlen, port);
     if (!ok) {
-        ESP_EARLY_LOGW(TAG, "socket connect failed");
         mp_raise_OSError(0);
     }
 
diff --git a/shared-bindings/socketpool/SocketPool.c b/shared-bindings/socketpool/SocketPool.c
index 9f56e8c7e..527cf7e98 100644
--- a/shared-bindings/socketpool/SocketPool.c
+++ b/shared-bindings/socketpool/SocketPool.c
@@ -37,8 +37,6 @@
 #include "shared-bindings/socketpool/Socket.h"
 #include "shared-bindings/socketpool/SocketPool.h"
 
-static const char* TAG = "socketpool binding";
-
 //| class SocketPool:
 //|     """A pool of socket resources available for the given radio. Only one
 //|        SocketPool can be created for each radio.
@@ -121,7 +119,6 @@ STATIC mp_obj_t socketpool_socketpool_getaddrinfo(size_t n_args, const mp_obj_t
     }
 
     if (ip_str == mp_const_none) {
-        ESP_EARLY_LOGW(TAG, "no ip str");
         mp_raise_OSError(0);
     }
 
diff --git a/shared-bindings/wifi/ScannedNetworks.c b/shared-bindings/wifi/ScannedNetworks.c
index d04f0f92a..9316faa45 100644
--- a/shared-bindings/wifi/ScannedNetworks.c
+++ b/shared-bindings/wifi/ScannedNetworks.c
@@ -32,8 +32,6 @@
 #include "py/runtime.h"
 #include "shared-bindings/wifi/ScannedNetworks.h"
 
-static const char *TAG = "cp iternext";
-
 //| class ScannedNetworks:
 //|     """Iterates over all `wifi.Network` objects found while scanning. This object is always created
 //|     by a `wifi.Radio`: it has no user-visible constructor."""
@@ -46,7 +44,6 @@ STATIC mp_obj_t scannednetworks_iternext(mp_obj_t self_in) {
         return network;
     }
 
-    ESP_EARLY_LOGI(TAG, "stop iteration");
     return MP_OBJ_STOP_ITERATION;
 }
 
-- 
cgit v1.2.3


From d5c8e557691f307871aabdf7d10f49768c43b4f9 Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Tue, 6 Oct 2020 15:00:26 -0400
Subject: Add AnalogIO

---
 ports/esp32s2/common-hal/analogio/AnalogOut.c | 22 ++++++++++++++++++----
 ports/esp32s2/common-hal/analogio/AnalogOut.h |  1 -
 ports/esp32s2/supervisor/port.c               |  5 +++++
 3 files changed, 23 insertions(+), 5 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/common-hal/analogio/AnalogOut.c b/ports/esp32s2/common-hal/analogio/AnalogOut.c
index b23c40514..a85a17183 100644
--- a/ports/esp32s2/common-hal/analogio/AnalogOut.c
+++ b/ports/esp32s2/common-hal/analogio/AnalogOut.c
@@ -35,25 +35,39 @@
 #include "shared-bindings/microcontroller/Pin.h"
 #include "supervisor/shared/translate.h"
 
+#include "components/driver/include/driver/dac.h"
+
 #include "common-hal/microcontroller/Pin.h"
 
 void common_hal_analogio_analogout_construct(analogio_analogout_obj_t* self,
         const mcu_pin_obj_t *pin) {
-    mp_raise_NotImplementedError(translate("No DAC on chip"));
+    if (pin == &pin_GPIO17) {
+        self->channel = DAC_CHANNEL_1;
+    } else if (pin == &pin_GPIO18) {
+        self->channel = DAC_CHANNEL_2;
+    } else {
+        mp_raise_ValueError(translate("Invalid DAC pin supplied"));
+    }
+    dac_output_enable(self->channel);
 }
 
 bool common_hal_analogio_analogout_deinited(analogio_analogout_obj_t *self) {
-    return true;
+    return (self->channel == DAC_CHANNEL_MAX);
 }
 
 void common_hal_analogio_analogout_deinit(analogio_analogout_obj_t *self) {
-
+    dac_output_disable(self->channel);
+    self->channel = DAC_CHANNEL_MAX;
 }
 
 void common_hal_analogio_analogout_set_value(analogio_analogout_obj_t *self,
         uint16_t value) {
+    uint8_t dac_value = (value * 255) / 65535;
+    dac_output_enable(self->channel);
+    dac_output_voltage(self->channel, dac_value);
 }
 
 void analogout_reset(void) {
-
+    dac_output_disable(DAC_CHANNEL_1);
+    dac_output_disable(DAC_CHANNEL_2);
 }
diff --git a/ports/esp32s2/common-hal/analogio/AnalogOut.h b/ports/esp32s2/common-hal/analogio/AnalogOut.h
index a8cbc39d5..6285151ba 100644
--- a/ports/esp32s2/common-hal/analogio/AnalogOut.h
+++ b/ports/esp32s2/common-hal/analogio/AnalogOut.h
@@ -36,7 +36,6 @@ typedef struct {
     mp_obj_base_t base;
     const mcu_pin_obj_t * pin;
     uint8_t channel;
-    uint8_t dac_index:1;
 } analogio_analogout_obj_t;
 
 void analogout_reset(void);
diff --git a/ports/esp32s2/supervisor/port.c b/ports/esp32s2/supervisor/port.c
index 4290b9bb4..0b9c03f74 100644
--- a/ports/esp32s2/supervisor/port.c
+++ b/ports/esp32s2/supervisor/port.c
@@ -35,6 +35,7 @@
 #include "freertos/task.h"
 
 #include "common-hal/microcontroller/Pin.h"
+#include "common-hal/analogio/AnalogOut.h"
 #include "common-hal/busio/I2C.h"
 #include "common-hal/busio/SPI.h"
 #include "common-hal/busio/UART.h"
@@ -95,6 +96,10 @@ void reset_port(void) {
     // A larger delay so the idle task can run and do any IDF cleanup needed.
     vTaskDelay(4);
 
+#if CIRCUITPY_ANALOGIO
+    analogout_reset();
+#endif
+
 #if CIRCUITPY_PULSEIO
     esp32s2_peripherals_rmt_reset();
     pulsein_reset();
-- 
cgit v1.2.3


From b7ed18d622fb6ca5b02034cbd2ac8d256374d77d Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Thu, 8 Oct 2020 00:52:00 +0700
Subject: change idf to espressif

fix hal includes
---
 .gitmodules                                       | 2 +-
 ports/esp32s2/common-hal/busio/I2C.h              | 2 +-
 ports/esp32s2/common-hal/busio/SPI.h              | 4 ++--
 ports/esp32s2/common-hal/busio/UART.h             | 2 +-
 ports/esp32s2/common-hal/digitalio/DigitalInOut.c | 2 +-
 ports/esp32s2/common-hal/microcontroller/Pin.c    | 2 +-
 ports/esp32s2/esp-idf                             | 2 +-
 ports/esp32s2/peripherals/pins.h                  | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/.gitmodules b/.gitmodules
index b1ae2276c..f66ce8aaf 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -152,4 +152,4 @@
 	url = https://github.com/adafruit/Adafruit_CircuitPython_RFM69.git
 [submodule "ports/esp32s2/esp-idf"]
 	path = ports/esp32s2/esp-idf
-	url = https://github.com/hierophect/esp-idf.git
+	url = https://github.com/espressif/esp-idf.git
diff --git a/ports/esp32s2/common-hal/busio/I2C.h b/ports/esp32s2/common-hal/busio/I2C.h
index 1a989e30a..c39d6d744 100644
--- a/ports/esp32s2/common-hal/busio/I2C.h
+++ b/ports/esp32s2/common-hal/busio/I2C.h
@@ -29,7 +29,7 @@
 
 #include "common-hal/microcontroller/Pin.h"
 
-#include "components/soc/include/hal/i2c_types.h"
+#include "components/hal/include/hal/i2c_types.h"
 #include "FreeRTOS.h"
 #include "freertos/semphr.h"
 #include "py/obj.h"
diff --git a/ports/esp32s2/common-hal/busio/SPI.h b/ports/esp32s2/common-hal/busio/SPI.h
index d6203feae..f6c1c344a 100644
--- a/ports/esp32s2/common-hal/busio/SPI.h
+++ b/ports/esp32s2/common-hal/busio/SPI.h
@@ -30,8 +30,8 @@
 #include "common-hal/microcontroller/Pin.h"
 
 #include "components/driver/include/driver/spi_common_internal.h"
-#include "components/soc/include/hal/spi_hal.h"
-#include "components/soc/include/hal/spi_types.h"
+#include "components/hal/include/hal/spi_hal.h"
+#include "components/hal/include/hal/spi_types.h"
 #include "py/obj.h"
 
 typedef struct {
diff --git a/ports/esp32s2/common-hal/busio/UART.h b/ports/esp32s2/common-hal/busio/UART.h
index 751fb2e00..1d7f13511 100644
--- a/ports/esp32s2/common-hal/busio/UART.h
+++ b/ports/esp32s2/common-hal/busio/UART.h
@@ -29,7 +29,7 @@
 
 #include "common-hal/microcontroller/Pin.h"
 
-#include "components/soc/include/hal/uart_types.h"
+#include "components/hal/include/hal/uart_types.h"
 #include "py/obj.h"
 
 typedef struct {
diff --git a/ports/esp32s2/common-hal/digitalio/DigitalInOut.c b/ports/esp32s2/common-hal/digitalio/DigitalInOut.c
index a2a0209f9..152db1e71 100644
--- a/ports/esp32s2/common-hal/digitalio/DigitalInOut.c
+++ b/ports/esp32s2/common-hal/digitalio/DigitalInOut.c
@@ -30,7 +30,7 @@
 
 #include "components/driver/include/driver/gpio.h"
 
-#include "components/soc/include/hal/gpio_hal.h"
+#include "components/hal/include/hal/gpio_hal.h"
 
 void common_hal_digitalio_digitalinout_never_reset(
         digitalio_digitalinout_obj_t *self) {
diff --git a/ports/esp32s2/common-hal/microcontroller/Pin.c b/ports/esp32s2/common-hal/microcontroller/Pin.c
index 0f4669fe0..3c2611efe 100644
--- a/ports/esp32s2/common-hal/microcontroller/Pin.c
+++ b/ports/esp32s2/common-hal/microcontroller/Pin.c
@@ -32,7 +32,7 @@
 #include "py/mphal.h"
 
 #include "components/driver/include/driver/gpio.h"
-#include "components/soc/include/hal/gpio_hal.h"
+#include "components/hal/include/hal/gpio_hal.h"
 
 #ifdef MICROPY_HW_NEOPIXEL
 bool neopixel_in_use;
diff --git a/ports/esp32s2/esp-idf b/ports/esp32s2/esp-idf
index a7f777988..8bc19ba89 160000
--- a/ports/esp32s2/esp-idf
+++ b/ports/esp32s2/esp-idf
@@ -1 +1 @@
-Subproject commit a7f77798816661f7c4ae198f3878bc92a9274f82
+Subproject commit 8bc19ba893e5544d571a753d82b44a84799b94b1
diff --git a/ports/esp32s2/peripherals/pins.h b/ports/esp32s2/peripherals/pins.h
index 0cf63a029..9776fbb78 100644
--- a/ports/esp32s2/peripherals/pins.h
+++ b/ports/esp32s2/peripherals/pins.h
@@ -34,7 +34,7 @@
 
 #include "esp32s2_peripherals_config.h"
 #include "esp-idf/config/sdkconfig.h"
-#include "components/soc/include/hal/gpio_types.h"
+#include "components/hal/include/hal/gpio_types.h"
 
 typedef struct {
     PIN_PREFIX_FIELDS
-- 
cgit v1.2.3


From d93a1961c4dc3f0bc02b79b6ac116638a4f64794 Mon Sep 17 00:00:00 2001
From: Seon Rozenblum <seon@unexpectedmaker.com>
Date: Thu, 8 Oct 2020 14:03:16 +1100
Subject: Fixed the FeatherS2 prerelease hardware name

---
 .../esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
index 90a368006..93d901bec 100644
--- a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
+++ b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
@@ -26,7 +26,7 @@
 
 //Micropython setup
 
-#define MICROPY_HW_BOARD_NAME       "FeatherS2"
+#define MICROPY_HW_BOARD_NAME       "FeatherS2 PreRelease"
 #define MICROPY_HW_MCU_NAME         "ESP32S2"
 
 #define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
-- 
cgit v1.2.3


From e1fc85c56bb5e308d497c09eca8154243f85a83c Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Thu, 8 Oct 2020 13:30:32 +0700
Subject: fix usb issue with latest idf

---
 ports/esp32s2/Makefile         |  6 +++---
 ports/esp32s2/supervisor/usb.c | 34 ++++++++++++++++++++++++++++++----
 2 files changed, 33 insertions(+), 7 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/Makefile b/ports/esp32s2/Makefile
index f8818eca0..935ced7cc 100644
--- a/ports/esp32s2/Makefile
+++ b/ports/esp32s2/Makefile
@@ -271,7 +271,7 @@ menuconfig: $(BUILD)/esp-idf/config
 $(HEADER_BUILD)/qstr.i.last: | $(BUILD)/esp-idf/config/sdkconfig.h
 
 # Order here matters
-ESP_IDF_COMPONENTS_LINK = freertos log esp_system esp32s2 bootloader_support pthread esp_timer vfs spi_flash app_update esp_common esp32s2 heap newlib driver xtensa soc esp_ringbuf esp_wifi esp_event wpa_supplicant mbedtls efuse nvs_flash esp_netif lwip esp_rom esp-tls
+ESP_IDF_COMPONENTS_LINK = freertos log hal esp_system esp32s2 bootloader_support pthread esp_timer vfs spi_flash app_update esp_common esp32s2 heap newlib driver xtensa soc esp_ringbuf esp_wifi esp_event wpa_supplicant mbedtls efuse nvs_flash esp_netif lwip esp_rom esp-tls
 
 ESP_IDF_COMPONENTS_INCLUDE = driver freertos log soc
 
@@ -283,11 +283,11 @@ ESP_IDF_WIFI_COMPONENTS_EXPANDED = $(foreach component, $(ESP_IDF_WIFI_COMPONENT
 MBEDTLS_COMPONENTS_LINK = crypto tls x509
 MBEDTLS_COMPONENTS_LINK_EXPANDED = $(foreach component, $(MBEDTLS_COMPONENTS_LINK), $(BUILD)/esp-idf/esp-idf/mbedtls/mbedtls/library/libmbed$(component).a)
 
-BINARY_BLOBS = esp-idf/components/xtensa/esp32s2/libhal.a
+BINARY_BLOBS = esp-idf/components/xtensa/esp32s2/libxt_hal.a
 BINARY_WIFI_BLOBS = libcoexist.a libcore.a libespnow.a libmesh.a libnet80211.a libpp.a librtc.a libsmartconfig.a libphy.a
 BINARY_BLOBS += $(addprefix esp-idf/components/esp_wifi/lib/esp32s2/, $(BINARY_WIFI_BLOBS))
 
-ESP_IDF_COMPONENTS_EXPANDED += $(BUILD)/esp-idf/esp-idf/soc/soc/esp32s2/libsoc_esp32s2.a esp-idf/components/xtensa/esp32s2/libhal.a
+ESP_IDF_COMPONENTS_EXPANDED += $(BUILD)/esp-idf/esp-idf/soc/soc/esp32s2/libsoc_esp32s2.a esp-idf/components/xtensa/esp32s2/libxt_hal.a
 ESP_AUTOGEN_LD = $(BUILD)/esp-idf/esp-idf/esp32s2/esp32s2_out.ld $(BUILD)/esp-idf/esp-idf/esp32s2/ld/esp32s2.project.ld
 
 FLASH_FLAGS = --flash_mode $(CIRCUITPY_ESP_FLASH_MODE) --flash_freq $(CIRCUITPY_ESP_FLASH_FREQ) --flash_size $(CIRCUITPY_ESP_FLASH_SIZE)
diff --git a/ports/esp32s2/supervisor/usb.c b/ports/esp32s2/supervisor/usb.c
index c91c2ec4b..1ad6af047 100644
--- a/ports/esp32s2/supervisor/usb.c
+++ b/ports/esp32s2/supervisor/usb.c
@@ -33,6 +33,8 @@
 #include "components/driver/include/driver/periph_ctrl.h"
 #include "components/driver/include/driver/gpio.h"
 #include "components/esp_rom/include/esp32s2/rom/gpio.h"
+#include "components/esp_rom/include/esp_rom_gpio.h"
+#include "components/hal/esp32s2/include/hal/gpio_ll.h"
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
@@ -68,6 +70,33 @@ void usb_device_task(void* param)
   }
 }
 
+static void configure_pins (usb_hal_context_t *usb)
+{
+    /* usb_periph_iopins currently configures USB_OTG as USB Device.
+     * Introduce additional parameters in usb_hal_context_t when adding support
+     * for USB Host.
+     */
+    for ( const usb_iopin_dsc_t *iopin = usb_periph_iopins; iopin->pin != -1; ++iopin ) {
+        if ( (usb->use_external_phy) || (iopin->ext_phy_only == 0) ) {
+            esp_rom_gpio_pad_select_gpio(iopin->pin);
+            if ( iopin->is_output ) {
+                esp_rom_gpio_connect_out_signal(iopin->pin, iopin->func, false, false);
+            }
+            else {
+                esp_rom_gpio_connect_in_signal(iopin->pin, iopin->func, false);
+                if ( (iopin->pin != GPIO_FUNC_IN_LOW) && (iopin->pin != GPIO_FUNC_IN_HIGH) ) {
+                    gpio_ll_input_enable(&GPIO, iopin->pin);
+                }
+            }
+            esp_rom_gpio_pad_unhold(iopin->pin);
+        }
+    }
+    if ( !usb->use_external_phy ) {
+        gpio_set_drive_capability(USBPHY_DM_NUM, GPIO_DRIVE_CAP_3);
+        gpio_set_drive_capability(USBPHY_DP_NUM, GPIO_DRIVE_CAP_3);
+    }
+}
+
 void init_usb_hardware(void) {
     periph_module_reset(PERIPH_USB_MODULE);
     periph_module_enable(PERIPH_USB_MODULE);
@@ -75,10 +104,7 @@ void init_usb_hardware(void) {
         .use_external_phy = false // use built-in PHY
     };
     usb_hal_init(&hal);
-
-    // Initialize the pin drive strength.
-    gpio_set_drive_capability(USBPHY_DM_NUM, GPIO_DRIVE_CAP_3);
-    gpio_set_drive_capability(USBPHY_DP_NUM, GPIO_DRIVE_CAP_3);
+    configure_pins(&hal);
 
     (void) xTaskCreateStatic(usb_device_task,
                              "usbd",
-- 
cgit v1.2.3


From 2b2003f3e70a1e829bdd1ccffb1ed5bf933696dd Mon Sep 17 00:00:00 2001
From: askpatricw <4002194+askpatrickw@users.noreply.github.com>
Date: Thu, 8 Oct 2020 22:46:10 -0700
Subject: Set default hostname

---
 ports/esp32s2/boards/adafruit_metro_esp32s2/sdkconfig | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/boards/adafruit_metro_esp32s2/sdkconfig b/ports/esp32s2/boards/adafruit_metro_esp32s2/sdkconfig
index 9d8bbde96..80b9a2cf8 100644
--- a/ports/esp32s2/boards/adafruit_metro_esp32s2/sdkconfig
+++ b/ports/esp32s2/boards/adafruit_metro_esp32s2/sdkconfig
@@ -31,3 +31,9 @@ CONFIG_SPIRAM_USE_MEMMAP=y
 CONFIG_SPIRAM_MEMTEST=y
 # CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
 # end of SPI RAM config
+
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="Metro-ESP32S2"
+# end of LWIP
-- 
cgit v1.2.3


From b9e308c248ec953ebd2fc8c16c03b2cc06cfafc5 Mon Sep 17 00:00:00 2001
From: Targett363 <targett363@aol.com>
Date: Sat, 10 Oct 2020 21:11:06 +0100
Subject: Adding Wroom and Wrover board files

---
 .../boards/targett_module_clip_wroom/board.c       | 51 ++++++++++++++++++++++
 .../targett_module_clip_wroom/mpconfigboard.h      | 40 +++++++++++++++++
 .../targett_module_clip_wroom/mpconfigboard.mk     | 17 ++++++++
 .../boards/targett_module_clip_wroom/pins.c        | 48 ++++++++++++++++++++
 .../boards/targett_module_clip_wroom/sdkconfig     |  0
 .../boards/targett_module_clip_wrover/board.c      | 47 ++++++++++++++++++++
 .../targett_module_clip_wrover/mpconfigboard.h     | 38 ++++++++++++++++
 .../targett_module_clip_wrover/mpconfigboard.mk    | 17 ++++++++
 .../boards/targett_module_clip_wrover/pins.c       | 48 ++++++++++++++++++++
 .../boards/targett_module_clip_wrover/sdkconfig    | 33 ++++++++++++++
 10 files changed, 339 insertions(+)
 create mode 100644 ports/esp32s2/boards/targett_module_clip_wroom/board.c
 create mode 100644 ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h
 create mode 100644 ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.mk
 create mode 100644 ports/esp32s2/boards/targett_module_clip_wroom/pins.c
 create mode 100644 ports/esp32s2/boards/targett_module_clip_wroom/sdkconfig
 create mode 100644 ports/esp32s2/boards/targett_module_clip_wrover/board.c
 create mode 100644 ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h
 create mode 100644 ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.mk
 create mode 100644 ports/esp32s2/boards/targett_module_clip_wrover/pins.c
 create mode 100644 ports/esp32s2/boards/targett_module_clip_wrover/sdkconfig

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/boards/targett_module_clip_wroom/board.c b/ports/esp32s2/boards/targett_module_clip_wroom/board.c
new file mode 100644
index 000000000..7f5de0e0d
--- /dev/null
+++ b/ports/esp32s2/boards/targett_module_clip_wroom/board.c
@@ -0,0 +1,51 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 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 "boards/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
+
+void board_init(void) {
+    // USB
+    common_hal_never_reset_pin(&pin_GPIO19);
+    common_hal_never_reset_pin(&pin_GPIO20);
+
+    // Debug UART
+    common_hal_never_reset_pin(&pin_GPIO43);
+    common_hal_never_reset_pin(&pin_GPIO44);
+
+    // Crystal
+    common_hal_never_reset_pin(&pin_GPIO15);
+    common_hal_never_reset_pin(&pin_GPIO16);
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+
+}
diff --git a/ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h b/ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h
new file mode 100644
index 000000000..6cf69138e
--- /dev/null
+++ b/ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 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.
+ */
+
+//Micropython setup
+
+//Essentially the same as the Saola board but without the neopixel
+
+#define MICROPY_HW_BOARD_NAME       "Targett Module Clip w/Wroom"
+#define MICROPY_HW_MCU_NAME         "ESP32S2"
+
+//#define MICROPY_HW_NEOPIXEL (&pin_GPIO18)
+
+#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
+
+#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
+
+#define AUTORESET_DELAY_MS 500
diff --git a/ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.mk b/ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.mk
new file mode 100644
index 000000000..71793344e
--- /dev/null
+++ b/ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.mk
@@ -0,0 +1,17 @@
+USB_VID = 0x239A
+USB_PID = 0x80A8
+USB_PRODUCT = "Targett Module Clip w/WROOM"
+USB_MANUFACTURER = "Targett"
+
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = MPZ
+
+# The default queue depth of 16 overflows on release builds,
+# so increase it to 32.
+CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
+
+CIRCUITPY_ESP_FLASH_MODE=dio
+CIRCUITPY_ESP_FLASH_FREQ=40m
+CIRCUITPY_ESP_FLASH_SIZE=4MB
+
+CIRCUITPY_MODULE=wroom
diff --git a/ports/esp32s2/boards/targett_module_clip_wroom/pins.c b/ports/esp32s2/boards/targett_module_clip_wroom/pins.c
new file mode 100644
index 000000000..99db09645
--- /dev/null
+++ b/ports/esp32s2/boards/targett_module_clip_wroom/pins.c
@@ -0,0 +1,48 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) },
+
+
+    { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_IO26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_IO33), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_IO34), MP_ROM_PTR(&pin_GPIO34) },
+    { MP_ROM_QSTR(MP_QSTR_IO35), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_IO40), MP_ROM_PTR(&pin_GPIO40) },
+    { MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41) },
+    { MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) },
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
+    { MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44) },
+    { MP_ROM_QSTR(MP_QSTR_IO45), MP_ROM_PTR(&pin_GPIO45) },
+    { MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46) },
+
+    //{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO18) },
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
diff --git a/ports/esp32s2/boards/targett_module_clip_wroom/sdkconfig b/ports/esp32s2/boards/targett_module_clip_wroom/sdkconfig
new file mode 100644
index 000000000..e69de29bb
diff --git a/ports/esp32s2/boards/targett_module_clip_wrover/board.c b/ports/esp32s2/boards/targett_module_clip_wrover/board.c
new file mode 100644
index 000000000..9f708874b
--- /dev/null
+++ b/ports/esp32s2/boards/targett_module_clip_wrover/board.c
@@ -0,0 +1,47 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 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 "boards/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
+
+void board_init(void) {
+    // USB
+    common_hal_never_reset_pin(&pin_GPIO19);
+    common_hal_never_reset_pin(&pin_GPIO20);
+
+    // Debug UART
+    common_hal_never_reset_pin(&pin_GPIO43);
+    common_hal_never_reset_pin(&pin_GPIO44);
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+
+}
diff --git a/ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h b/ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h
new file mode 100644
index 000000000..961522891
--- /dev/null
+++ b/ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 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.
+ */
+
+//Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "Saola 1 w/Wrover"
+#define MICROPY_HW_MCU_NAME         "ESP32S2"
+
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO18)
+
+#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
+
+#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
+
+#define AUTORESET_DELAY_MS 500
diff --git a/ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.mk b/ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.mk
new file mode 100644
index 000000000..d5ff1c5ac
--- /dev/null
+++ b/ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.mk
@@ -0,0 +1,17 @@
+USB_VID = 0x239A
+USB_PID = 0x80A6
+USB_PRODUCT = "Saola 1 w/WROVER"
+USB_MANUFACTURER = "Espressif"
+
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = MPZ
+
+# The default queue depth of 16 overflows on release builds,
+# so increase it to 32.
+CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
+
+CIRCUITPY_ESP_FLASH_MODE=dio
+CIRCUITPY_ESP_FLASH_FREQ=40m
+CIRCUITPY_ESP_FLASH_SIZE=4MB
+
+CIRCUITPY_MODULE=wrover
diff --git a/ports/esp32s2/boards/targett_module_clip_wrover/pins.c b/ports/esp32s2/boards/targett_module_clip_wrover/pins.c
new file mode 100644
index 000000000..0562d9331
--- /dev/null
+++ b/ports/esp32s2/boards/targett_module_clip_wrover/pins.c
@@ -0,0 +1,48 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) },
+
+
+    { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_IO26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_IO33), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_IO34), MP_ROM_PTR(&pin_GPIO34) },
+    { MP_ROM_QSTR(MP_QSTR_IO35), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_IO40), MP_ROM_PTR(&pin_GPIO40) },
+    { MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41) },
+    { MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) },
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
+    { MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44) },
+    { MP_ROM_QSTR(MP_QSTR_IO45), MP_ROM_PTR(&pin_GPIO45) },
+    { MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46) },
+
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO18) },
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
diff --git a/ports/esp32s2/boards/targett_module_clip_wrover/sdkconfig b/ports/esp32s2/boards/targett_module_clip_wrover/sdkconfig
new file mode 100644
index 000000000..9d8bbde96
--- /dev/null
+++ b/ports/esp32s2/boards/targett_module_clip_wrover/sdkconfig
@@ -0,0 +1,33 @@
+CONFIG_ESP32S2_SPIRAM_SUPPORT=y
+
+#
+# SPI RAM config
+#
+# CONFIG_SPIRAM_TYPE_AUTO is not set
+CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
+CONFIG_SPIRAM_SIZE=2097152
+
+#
+# PSRAM clock and cs IO for ESP32S2
+#
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
+CONFIG_DEFAULT_PSRAM_CS_IO=26
+# end of PSRAM clock and cs IO for ESP32S2
+
+# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
+# CONFIG_SPIRAM_RODATA is not set
+# CONFIG_SPIRAM_SPEED_80M is not set
+CONFIG_SPIRAM_SPEED_40M=y
+# CONFIG_SPIRAM_SPEED_26M is not set
+# CONFIG_SPIRAM_SPEED_20M is not set
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
+CONFIG_SPIRAM_USE_MEMMAP=y
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
+# end of SPI RAM config
-- 
cgit v1.2.3


From f38e868e90fb467cf0f910e4990ffacba07abefb Mon Sep 17 00:00:00 2001
From: Targett363 <targett363@aol.com>
Date: Sat, 10 Oct 2020 21:28:26 +0100
Subject: Actually adding Wrover board files this time

---
 ports/esp32s2/boards/espressif_saola_1_wrover/board.c          | 4 ++++
 ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h  | 6 ++++--
 ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.mk | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/boards/espressif_saola_1_wrover/board.c b/ports/esp32s2/boards/espressif_saola_1_wrover/board.c
index 9f708874b..83dcb920a 100644
--- a/ports/esp32s2/boards/espressif_saola_1_wrover/board.c
+++ b/ports/esp32s2/boards/espressif_saola_1_wrover/board.c
@@ -36,6 +36,10 @@ void board_init(void) {
     // Debug UART
     common_hal_never_reset_pin(&pin_GPIO43);
     common_hal_never_reset_pin(&pin_GPIO44);
+
+    //Crystal
+    common_hal_never_reset_pin(&pin_GPIO15);
+    common_hal_never_reset_pin(&pin_GPIO16);
 }
 
 bool board_requests_safe_mode(void) {
diff --git a/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h b/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h
index 961522891..3c74d27fa 100644
--- a/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h
+++ b/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h
@@ -26,10 +26,12 @@
 
 //Micropython setup
 
-#define MICROPY_HW_BOARD_NAME       "Saola 1 w/Wrover"
+//Same setup as the Saola board but with no Neopixel on board
+
+#define MICROPY_HW_BOARD_NAME       "Targett Module Clip w/Wrover"
 #define MICROPY_HW_MCU_NAME         "ESP32S2"
 
-#define MICROPY_HW_NEOPIXEL (&pin_GPIO18)
+//#define MICROPY_HW_NEOPIXEL (&pin_GPIO18)
 
 #define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
 
diff --git a/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.mk b/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.mk
index d5ff1c5ac..4b70f4a68 100644
--- a/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.mk
+++ b/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.mk
@@ -1,7 +1,7 @@
 USB_VID = 0x239A
 USB_PID = 0x80A6
-USB_PRODUCT = "Saola 1 w/WROVER"
-USB_MANUFACTURER = "Espressif"
+USB_PRODUCT = "Targett Module Clip w/WROVER"
+USB_MANUFACTURER = "Targett"
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
-- 
cgit v1.2.3


From 74954286f09b2fc861db759232569520552f7cd8 Mon Sep 17 00:00:00 2001
From: Targett363 <targett363@aol.com>
Date: Sat, 10 Oct 2020 21:44:14 +0100
Subject: Putting the Saola Wrover files back and adding my Wrover board files
 this time

---
 ports/esp32s2/boards/espressif_saola_1_wrover/board.c            | 4 ----
 ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h    | 6 ++----
 ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.mk   | 4 ++--
 ports/esp32s2/boards/targett_module_clip_wrover/board.c          | 4 ++++
 ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h  | 6 ++++--
 ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.mk | 4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/boards/espressif_saola_1_wrover/board.c b/ports/esp32s2/boards/espressif_saola_1_wrover/board.c
index 83dcb920a..9f708874b 100644
--- a/ports/esp32s2/boards/espressif_saola_1_wrover/board.c
+++ b/ports/esp32s2/boards/espressif_saola_1_wrover/board.c
@@ -36,10 +36,6 @@ void board_init(void) {
     // Debug UART
     common_hal_never_reset_pin(&pin_GPIO43);
     common_hal_never_reset_pin(&pin_GPIO44);
-
-    //Crystal
-    common_hal_never_reset_pin(&pin_GPIO15);
-    common_hal_never_reset_pin(&pin_GPIO16);
 }
 
 bool board_requests_safe_mode(void) {
diff --git a/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h b/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h
index 3c74d27fa..961522891 100644
--- a/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h
+++ b/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h
@@ -26,12 +26,10 @@
 
 //Micropython setup
 
-//Same setup as the Saola board but with no Neopixel on board
-
-#define MICROPY_HW_BOARD_NAME       "Targett Module Clip w/Wrover"
+#define MICROPY_HW_BOARD_NAME       "Saola 1 w/Wrover"
 #define MICROPY_HW_MCU_NAME         "ESP32S2"
 
-//#define MICROPY_HW_NEOPIXEL (&pin_GPIO18)
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO18)
 
 #define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
 
diff --git a/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.mk b/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.mk
index 4b70f4a68..d5ff1c5ac 100644
--- a/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.mk
+++ b/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.mk
@@ -1,7 +1,7 @@
 USB_VID = 0x239A
 USB_PID = 0x80A6
-USB_PRODUCT = "Targett Module Clip w/WROVER"
-USB_MANUFACTURER = "Targett"
+USB_PRODUCT = "Saola 1 w/WROVER"
+USB_MANUFACTURER = "Espressif"
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
diff --git a/ports/esp32s2/boards/targett_module_clip_wrover/board.c b/ports/esp32s2/boards/targett_module_clip_wrover/board.c
index 9f708874b..83dcb920a 100644
--- a/ports/esp32s2/boards/targett_module_clip_wrover/board.c
+++ b/ports/esp32s2/boards/targett_module_clip_wrover/board.c
@@ -36,6 +36,10 @@ void board_init(void) {
     // Debug UART
     common_hal_never_reset_pin(&pin_GPIO43);
     common_hal_never_reset_pin(&pin_GPIO44);
+
+    //Crystal
+    common_hal_never_reset_pin(&pin_GPIO15);
+    common_hal_never_reset_pin(&pin_GPIO16);
 }
 
 bool board_requests_safe_mode(void) {
diff --git a/ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h b/ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h
index 961522891..3c74d27fa 100644
--- a/ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h
+++ b/ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h
@@ -26,10 +26,12 @@
 
 //Micropython setup
 
-#define MICROPY_HW_BOARD_NAME       "Saola 1 w/Wrover"
+//Same setup as the Saola board but with no Neopixel on board
+
+#define MICROPY_HW_BOARD_NAME       "Targett Module Clip w/Wrover"
 #define MICROPY_HW_MCU_NAME         "ESP32S2"
 
-#define MICROPY_HW_NEOPIXEL (&pin_GPIO18)
+//#define MICROPY_HW_NEOPIXEL (&pin_GPIO18)
 
 #define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
 
diff --git a/ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.mk b/ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.mk
index d5ff1c5ac..4b70f4a68 100644
--- a/ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.mk
+++ b/ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.mk
@@ -1,7 +1,7 @@
 USB_VID = 0x239A
 USB_PID = 0x80A6
-USB_PRODUCT = "Saola 1 w/WROVER"
-USB_MANUFACTURER = "Espressif"
+USB_PRODUCT = "Targett Module Clip w/WROVER"
+USB_MANUFACTURER = "Targett"
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
-- 
cgit v1.2.3


From ead0d51fd711d38bab8dc7cff8373b6fdd60a180 Mon Sep 17 00:00:00 2001
From: Targett363 <targett363@aol.com>
Date: Sat, 10 Oct 2020 22:22:01 +0100
Subject: Commenting out Neopixel in pins.c

---
 ports/esp32s2/boards/targett_module_clip_wrover/pins.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/boards/targett_module_clip_wrover/pins.c b/ports/esp32s2/boards/targett_module_clip_wrover/pins.c
index 0562d9331..99db09645 100644
--- a/ports/esp32s2/boards/targett_module_clip_wrover/pins.c
+++ b/ports/esp32s2/boards/targett_module_clip_wrover/pins.c
@@ -43,6 +43,6 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_IO45), MP_ROM_PTR(&pin_GPIO45) },
     { MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46) },
 
-    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO18) },
+    //{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO18) },
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
-- 
cgit v1.2.3


From 5721cf0710202294476c83500394a8dbd1c20d5b Mon Sep 17 00:00:00 2001
From: Targett363 <targett363@aol.com>
Date: Sat, 10 Oct 2020 22:42:24 +0100
Subject: tidying up board names

---
 ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.mk  | 2 +-
 ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.mk b/ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.mk
index 71793344e..580caa71b 100644
--- a/ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.mk
+++ b/ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.mk
@@ -1,6 +1,6 @@
 USB_VID = 0x239A
 USB_PID = 0x80A8
-USB_PRODUCT = "Targett Module Clip w/WROOM"
+USB_PRODUCT = "Targett Module Clip w/Wroom"
 USB_MANUFACTURER = "Targett"
 
 INTERNAL_FLASH_FILESYSTEM = 1
diff --git a/ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.mk b/ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.mk
index 4b70f4a68..6832d2101 100644
--- a/ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.mk
+++ b/ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.mk
@@ -1,6 +1,6 @@
 USB_VID = 0x239A
 USB_PID = 0x80A6
-USB_PRODUCT = "Targett Module Clip w/WROVER"
+USB_PRODUCT = "Targett Module Clip w/Wrover"
 USB_MANUFACTURER = "Targett"
 
 INTERNAL_FLASH_FILESYSTEM = 1
-- 
cgit v1.2.3


From 60deb321d1801ad86c9dfcfc09fd4c69eec1ef06 Mon Sep 17 00:00:00 2001
From: Targett363 <targett363@aol.com>
Date: Sat, 10 Oct 2020 23:55:05 +0100
Subject: adding USB PID VID

---
 ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.mk  | 4 ++--
 ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.mk | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.mk b/ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.mk
index 580caa71b..e307d7d62 100644
--- a/ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.mk
+++ b/ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.mk
@@ -1,5 +1,5 @@
-USB_VID = 0x239A
-USB_PID = 0x80A8
+USB_VID = 0x1209
+USB_PID = 0x0011
 USB_PRODUCT = "Targett Module Clip w/Wroom"
 USB_MANUFACTURER = "Targett"
 
diff --git a/ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.mk b/ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.mk
index 6832d2101..aff5ffd6c 100644
--- a/ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.mk
+++ b/ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.mk
@@ -1,5 +1,5 @@
-USB_VID = 0x239A
-USB_PID = 0x80A6
+USB_VID = 0x1209
+USB_PID = 0x0012
 USB_PRODUCT = "Targett Module Clip w/Wrover"
 USB_MANUFACTURER = "Targett"
 
-- 
cgit v1.2.3


From 8ddbebd2c1500ceba4b6628882f5a128743d323d Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Mon, 12 Oct 2020 13:35:15 -0500
Subject: esp32s2: fix build after qstr rule changes

---
 ports/esp32s2/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/Makefile b/ports/esp32s2/Makefile
index a97ab0b00..8d891edd0 100644
--- a/ports/esp32s2/Makefile
+++ b/ports/esp32s2/Makefile
@@ -269,7 +269,7 @@ menuconfig: $(BUILD)/esp-idf/config
 	$(Q)grep -Fvxf $(DEBUG_SDKCONFIG) -f $(FLASH_SDKCONFIG) $(BUILD)/sdkconfig.diff > boards/$(BOARD)/sdkconfig
 
 # qstr builds include headers so we need to make sure they are up to date
-$(HEADER_BUILD)/qstr.i.last: | $(BUILD)/esp-idf/config/sdkconfig.h
+$(HEADER_BUILD)/qstr.split: | $(BUILD)/esp-idf/config/sdkconfig.h
 
 ESP_IDF_COMPONENTS_LINK = freertos log hal esp_system esp_adc_cal esp32s2 bootloader_support pthread esp_timer vfs spi_flash app_update esp_common esp32s2 heap newlib driver xtensa soc esp_ringbuf esp_wifi esp_event wpa_supplicant mbedtls efuse nvs_flash esp_netif lwip esp_rom esp-tls
 
-- 
cgit v1.2.3


From ceb531086ed2e5d1e2ee1f1439820a5145fd981e Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Tue, 13 Oct 2020 14:22:02 +0530
Subject: Add method to set custom hostname

---
 locale/circuitpython.pot                         |  8 ++++++--
 ports/esp32s2/boards/microdev_micro_s2/sdkconfig |  5 +++++
 ports/esp32s2/common-hal/wifi/Radio.c            |  4 ++++
 shared-bindings/wifi/Radio.c                     | 22 ++++++++++++++++++++++
 shared-bindings/wifi/Radio.h                     |  3 ++-
 5 files changed, 39 insertions(+), 3 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index fc564feea..76681d209 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-10-10 23:49-0700\n"
+"POT-Creation-Date: 2020-10-12 14:16+0530\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -947,6 +947,10 @@ msgstr ""
 msgid "Hardware in use, try alternative pins"
 msgstr ""
 
+#: shared-bindings/wifi/Radio.c
+msgid "Hostname must be between 1 and 63 characters"
+msgstr ""
+
 #: extmod/vfs_posix_file.c py/objstringio.c
 msgid "I/O operation on closed file"
 msgstr ""
@@ -1026,6 +1030,7 @@ msgstr ""
 msgid "Invalid BSSID"
 msgstr ""
 
+#: ports/esp32s2/common-hal/analogio/AnalogOut.c
 #: ports/stm/common-hal/analogio/AnalogOut.c
 msgid "Invalid DAC pin supplied"
 msgstr ""
@@ -1237,7 +1242,6 @@ msgid "No CCCD for this Characteristic"
 msgstr ""
 
 #: ports/atmel-samd/common-hal/analogio/AnalogOut.c
-#: ports/esp32s2/common-hal/analogio/AnalogOut.c
 #: ports/stm/common-hal/analogio/AnalogOut.c
 msgid "No DAC on chip"
 msgstr ""
diff --git a/ports/esp32s2/boards/microdev_micro_s2/sdkconfig b/ports/esp32s2/boards/microdev_micro_s2/sdkconfig
index 67ac6d2f3..4b8cc5cc3 100644
--- a/ports/esp32s2/boards/microdev_micro_s2/sdkconfig
+++ b/ports/esp32s2/boards/microdev_micro_s2/sdkconfig
@@ -32,3 +32,8 @@ CONFIG_SPIRAM_MEMTEST=y
 # CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
 # end of SPI RAM config
 
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="microS2"
+# end of LWIP
diff --git a/ports/esp32s2/common-hal/wifi/Radio.c b/ports/esp32s2/common-hal/wifi/Radio.c
index b62ad611b..61d63e1f2 100644
--- a/ports/esp32s2/common-hal/wifi/Radio.c
+++ b/ports/esp32s2/common-hal/wifi/Radio.c
@@ -104,6 +104,10 @@ void common_hal_wifi_radio_stop_scanning_networks(wifi_radio_obj_t *self) {
     self->current_scan = NULL;
 }
 
+void common_hal_wifi_radio_set_hostname(wifi_radio_obj_t *self, const char *hostname) {
+    esp_netif_set_hostname(self->netif, hostname);
+}
+
 wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t* ssid, size_t ssid_len, uint8_t* password, size_t password_len, uint8_t channel, mp_float_t timeout, uint8_t* bssid, size_t bssid_len) {
     // check enabled
     start_station(self);
diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c
index 928f21da9..9c774e141 100644
--- a/shared-bindings/wifi/Radio.c
+++ b/shared-bindings/wifi/Radio.c
@@ -102,6 +102,26 @@ STATIC mp_obj_t wifi_radio_stop_scanning_networks(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_stop_scanning_networks_obj, wifi_radio_stop_scanning_networks);
 
+//|     def set_hostname(self, hostname: ReadableBuffer) -> None:
+//|         """Sets hostname for wifi interface. When the hostname is altered after interface started/connected
+//|            the changes would only be reflected once the interface restarts/reconnects."""
+//|         ...
+//|
+STATIC mp_obj_t wifi_radio_set_hostname(mp_obj_t self_in, mp_obj_t hostname_in) {
+    mp_buffer_info_t hostname;
+    mp_get_buffer_raise(hostname_in, &hostname, MP_BUFFER_READ);
+
+    if (hostname.len < 1 || hostname.len > 63) {
+        mp_raise_ValueError(translate("Hostname must be between 1 and 63 characters"));
+    }
+
+    wifi_radio_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_wifi_radio_set_hostname(self, hostname.buf);
+
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(wifi_radio_set_hostname_obj, wifi_radio_set_hostname);
+
 //|     def connect(self, ssid: ReadableBuffer, password: ReadableBuffer = b"", *, channel: Optional[int] = 0, timeout: Optional[float] = None) -> bool:
 //|         """Connects to the given ssid and waits for an ip address. Reconnections are handled
 //|            automatically once one connection succeeds."""
@@ -216,6 +236,8 @@ STATIC const mp_rom_map_elem_t wifi_radio_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_start_scanning_networks),    MP_ROM_PTR(&wifi_radio_start_scanning_networks_obj) },
     { MP_ROM_QSTR(MP_QSTR_stop_scanning_networks),    MP_ROM_PTR(&wifi_radio_stop_scanning_networks_obj) },
 
+    { MP_ROM_QSTR(MP_QSTR_set_hostname),    MP_ROM_PTR(&wifi_radio_set_hostname_obj) },
+
     { MP_ROM_QSTR(MP_QSTR_connect),    MP_ROM_PTR(&wifi_radio_connect_obj) },
     // { MP_ROM_QSTR(MP_QSTR_connect_to_enterprise),    MP_ROM_PTR(&wifi_radio_connect_to_enterprise_obj) },
 
diff --git a/shared-bindings/wifi/Radio.h b/shared-bindings/wifi/Radio.h
index b5341d51c..4226ae2a9 100644
--- a/shared-bindings/wifi/Radio.h
+++ b/shared-bindings/wifi/Radio.h
@@ -35,7 +35,6 @@
 
 const mp_obj_type_t wifi_radio_type;
 
-
 typedef enum {
     WIFI_RADIO_ERROR_NONE,
     WIFI_RADIO_ERROR_UNKNOWN,
@@ -46,6 +45,8 @@ typedef enum {
 extern bool common_hal_wifi_radio_get_enabled(wifi_radio_obj_t *self);
 extern void common_hal_wifi_radio_set_enabled(wifi_radio_obj_t *self, bool enabled);
 
+extern void common_hal_wifi_radio_set_hostname(wifi_radio_obj_t *self, const char *hostname);
+
 extern mp_obj_t common_hal_wifi_radio_get_mac_address(wifi_radio_obj_t *self);
 
 extern mp_obj_t common_hal_wifi_radio_start_scanning_networks(wifi_radio_obj_t *self);
-- 
cgit v1.2.3


From 18fbff4f57e0c0b25ecaa3e1064c71b7a09f320b Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Wed, 14 Oct 2020 11:11:59 +0530
Subject: Update wifi hostname method

---
 ports/esp32s2/common-hal/wifi/Radio.c |  9 +++++++++
 shared-bindings/wifi/Radio.c          | 23 +++++++++++++++++------
 shared-bindings/wifi/Radio.h          |  1 +
 3 files changed, 27 insertions(+), 6 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/common-hal/wifi/Radio.c b/ports/esp32s2/common-hal/wifi/Radio.c
index 61d63e1f2..5e349c09d 100644
--- a/ports/esp32s2/common-hal/wifi/Radio.c
+++ b/ports/esp32s2/common-hal/wifi/Radio.c
@@ -104,6 +104,15 @@ void common_hal_wifi_radio_stop_scanning_networks(wifi_radio_obj_t *self) {
     self->current_scan = NULL;
 }
 
+mp_obj_t common_hal_wifi_radio_get_hostname(wifi_radio_obj_t *self) {
+    const char *hostname = NULL;
+    esp_netif_get_hostname(self->netif, &hostname);
+    if (hostname == NULL) {
+        return mp_const_none;
+    }
+    return mp_obj_new_str(hostname, strlen(hostname));
+}
+
 void common_hal_wifi_radio_set_hostname(wifi_radio_obj_t *self, const char *hostname) {
     esp_netif_set_hostname(self->netif, hostname);
 }
diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c
index 9c774e141..481294463 100644
--- a/shared-bindings/wifi/Radio.c
+++ b/shared-bindings/wifi/Radio.c
@@ -50,7 +50,6 @@
 //|
 STATIC mp_obj_t wifi_radio_get_enabled(mp_obj_t self) {
     return mp_obj_new_bool(common_hal_wifi_radio_get_enabled(self));
-
 }
 MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_enabled_obj, wifi_radio_get_enabled);
 
@@ -102,11 +101,16 @@ STATIC mp_obj_t wifi_radio_stop_scanning_networks(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_stop_scanning_networks_obj, wifi_radio_stop_scanning_networks);
 
-//|     def set_hostname(self, hostname: ReadableBuffer) -> None:
-//|         """Sets hostname for wifi interface. When the hostname is altered after interface started/connected
-//|            the changes would only be reflected once the interface restarts/reconnects."""
-//|         ...
+//|     hostname: ReadableBuffer
+//|     """Hostname for wifi interface. When the hostname is altered after interface started/connected
+//|        the changes would only be reflected once the interface restarts/reconnects."""
 //|
+STATIC mp_obj_t wifi_radio_get_hostname(mp_obj_t self_in) {
+    wifi_radio_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return common_hal_wifi_radio_get_hostname(self);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_hostname_obj, wifi_radio_get_hostname);
+
 STATIC mp_obj_t wifi_radio_set_hostname(mp_obj_t self_in, mp_obj_t hostname_in) {
     mp_buffer_info_t hostname;
     mp_get_buffer_raise(hostname_in, &hostname, MP_BUFFER_READ);
@@ -122,6 +126,13 @@ STATIC mp_obj_t wifi_radio_set_hostname(mp_obj_t self_in, mp_obj_t hostname_in)
 }
 MP_DEFINE_CONST_FUN_OBJ_2(wifi_radio_set_hostname_obj, wifi_radio_set_hostname);
 
+const mp_obj_property_t wifi_radio_hostname_obj = {
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&wifi_radio_get_hostname_obj,
+              (mp_obj_t)&wifi_radio_set_hostname_obj,
+              (mp_obj_t)&mp_const_none_obj},
+};
+
 //|     def connect(self, ssid: ReadableBuffer, password: ReadableBuffer = b"", *, channel: Optional[int] = 0, timeout: Optional[float] = None) -> bool:
 //|         """Connects to the given ssid and waits for an ip address. Reconnections are handled
 //|            automatically once one connection succeeds."""
@@ -236,7 +247,7 @@ STATIC const mp_rom_map_elem_t wifi_radio_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_start_scanning_networks),    MP_ROM_PTR(&wifi_radio_start_scanning_networks_obj) },
     { MP_ROM_QSTR(MP_QSTR_stop_scanning_networks),    MP_ROM_PTR(&wifi_radio_stop_scanning_networks_obj) },
 
-    { MP_ROM_QSTR(MP_QSTR_set_hostname),    MP_ROM_PTR(&wifi_radio_set_hostname_obj) },
+    { MP_ROM_QSTR(MP_QSTR_hostname),    MP_ROM_PTR(&wifi_radio_hostname_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_connect),    MP_ROM_PTR(&wifi_radio_connect_obj) },
     // { MP_ROM_QSTR(MP_QSTR_connect_to_enterprise),    MP_ROM_PTR(&wifi_radio_connect_to_enterprise_obj) },
diff --git a/shared-bindings/wifi/Radio.h b/shared-bindings/wifi/Radio.h
index 4226ae2a9..a6a616154 100644
--- a/shared-bindings/wifi/Radio.h
+++ b/shared-bindings/wifi/Radio.h
@@ -45,6 +45,7 @@ typedef enum {
 extern bool common_hal_wifi_radio_get_enabled(wifi_radio_obj_t *self);
 extern void common_hal_wifi_radio_set_enabled(wifi_radio_obj_t *self, bool enabled);
 
+extern mp_obj_t common_hal_wifi_radio_get_hostname(wifi_radio_obj_t *self);
 extern void common_hal_wifi_radio_set_hostname(wifi_radio_obj_t *self, const char *hostname);
 
 extern mp_obj_t common_hal_wifi_radio_get_mac_address(wifi_radio_obj_t *self);
-- 
cgit v1.2.3


From 45a3bd1c042dd27eacf78cdcf116f97a7839eee0 Mon Sep 17 00:00:00 2001
From: Seon Rozenblum <seon@unexpectedmaker.com>
Date: Wed, 14 Oct 2020 19:18:38 +1100
Subject: Added default LWIP hostnames to FeatherS2 boards

---
 ports/esp32s2/boards/unexpectedmaker_feathers2/sdkconfig            | 5 +++++
 ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/sdkconfig | 6 ++++++
 2 files changed, 11 insertions(+)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2/sdkconfig b/ports/esp32s2/boards/unexpectedmaker_feathers2/sdkconfig
index 67ac6d2f3..c9d44460c 100644
--- a/ports/esp32s2/boards/unexpectedmaker_feathers2/sdkconfig
+++ b/ports/esp32s2/boards/unexpectedmaker_feathers2/sdkconfig
@@ -32,3 +32,8 @@ CONFIG_SPIRAM_MEMTEST=y
 # CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
 # end of SPI RAM config
 
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="UMFeatherS2"
+# end of LWIP
diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/sdkconfig b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/sdkconfig
index b73c4a8c2..00e0bb256 100644
--- a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/sdkconfig
+++ b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/sdkconfig
@@ -33,3 +33,9 @@ CONFIG_SPIRAM_USE_MEMMAP=y
 CONFIG_SPIRAM_MEMTEST=y
 # CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
 # end of SPI RAM config
+
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="UMFeatherS2"
+# end of LWIP
-- 
cgit v1.2.3


From b336039aab03bd9f609bad0c211981961b6685d2 Mon Sep 17 00:00:00 2001
From: "Ryan T. Hamilton" <astrobokonon@gmail.com>
Date: Thu, 15 Oct 2020 23:18:30 -0700
Subject: Disable the long way and return an ap_info object

still needs work and cleanup
---
 ports/esp32s2/common-hal/wifi/Radio.c | 69 +++++++++++++++++++----------
 ports/esp32s2/common-hal/wifi/Radio.h |  2 +
 shared-bindings/wifi/Radio.c          | 83 +++++++++++++++++++++--------------
 shared-bindings/wifi/Radio.h          |  5 ++-
 4 files changed, 102 insertions(+), 57 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/common-hal/wifi/Radio.c b/ports/esp32s2/common-hal/wifi/Radio.c
index 13bcccc80..b1f9e67e0 100644
--- a/ports/esp32s2/common-hal/wifi/Radio.c
+++ b/ports/esp32s2/common-hal/wifi/Radio.c
@@ -25,6 +25,7 @@
  */
 
 #include "shared-bindings/wifi/Radio.h"
+#include "shared-bindings/wifi/Network.h"
 
 #include <string.h>
 
@@ -149,7 +150,7 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t
     return WIFI_RADIO_ERROR_NONE;
 }
 
-mp_obj_t common_hal_wifi_radio_get_ap_rssi(wifi_radio_obj_t *self) {
+mp_obj_t common_hal_wifi_radio_get_ap_info(wifi_radio_obj_t *self) {
     if (!esp_netif_is_netif_up(self->netif)) {
         return mp_const_none;
     }
@@ -159,18 +160,21 @@ mp_obj_t common_hal_wifi_radio_get_ap_rssi(wifi_radio_obj_t *self) {
         return mp_const_none;
     }
 
+    wifi_network_obj_t *apnet = m_new_obj(wifi_network_obj_t);
+    apnet->base.type = &wifi_network_type;
     // From esp_wifi.h, the possible return values (typos theirs):
     //    ESP_OK: succeed
     //    ESP_ERR_WIFI_CONN: The station interface don't initialized
     //    ESP_ERR_WIFI_NOT_CONNECT: The station is in disconnect status
-    if (esp_wifi_sta_get_ap_info(&self->ap_info) != ESP_OK){
+    if (esp_wifi_sta_get_ap_info(&self->apnet.record) != ESP_OK){
         return mp_const_none;
     } else {
-        return mp_obj_new_int(self->ap_info.rssi);
+        memcpy(&apnet->record, &self->apnet.record, sizeof(wifi_ap_record_t));
+        return MP_OBJ_FROM_PTR(apnet);
     }
 }
 
-mp_obj_t common_hal_wifi_radio_get_ap_ssid(wifi_radio_obj_t *self) {
+mp_obj_t common_hal_wifi_radio_get_ap_rssi(wifi_radio_obj_t *self) {
     if (!esp_netif_is_netif_up(self->netif)) {
         return mp_const_none;
     }
@@ -180,30 +184,51 @@ mp_obj_t common_hal_wifi_radio_get_ap_ssid(wifi_radio_obj_t *self) {
         return mp_const_none;
     }
 
+    // From esp_wifi.h, the possible return values (typos theirs):
+    //    ESP_OK: succeed
+    //    ESP_ERR_WIFI_CONN: The station interface don't initialized
+    //    ESP_ERR_WIFI_NOT_CONNECT: The station is in disconnect status
     if (esp_wifi_sta_get_ap_info(&self->ap_info) != ESP_OK){
         return mp_const_none;
     } else {
-        const char* cstr = (const char*) self->ap_info.ssid;
-        return mp_obj_new_str(cstr, strlen(cstr));
+        return mp_obj_new_int(self->ap_info.rssi);
     }
 }
 
-mp_obj_t common_hal_wifi_radio_get_ap_bssid(wifi_radio_obj_t *self) {
-    if (!esp_netif_is_netif_up(self->netif)) {
-        return mp_const_none;
-    }
-
-    // Make sure the interface is in STA mode
-    if (self->sta_mode){
-        return mp_const_none;
-    }
-
-    if (esp_wifi_sta_get_ap_info(&self->ap_info) != ESP_OK){
-        return mp_const_none;
-    } else {
-        return mp_obj_new_bytes(self->ap_info.bssid, MAC_ADDRESS_LENGTH);
-    }
-}
+// mp_obj_t common_hal_wifi_radio_get_ap_ssid(wifi_radio_obj_t *self) {
+//     if (!esp_netif_is_netif_up(self->netif)) {
+//         return mp_const_none;
+//     }
+
+//     // Make sure the interface is in STA mode
+//     if (self->sta_mode){
+//         return mp_const_none;
+//     }
+
+//     if (esp_wifi_sta_get_ap_info(&self->ap_info) != ESP_OK){
+//         return mp_const_none;
+//     } else {
+//         const char* cstr = (const char*) self->ap_info.ssid;
+//         return mp_obj_new_str(cstr, strlen(cstr));
+//     }
+// }
+
+// mp_obj_t common_hal_wifi_radio_get_ap_bssid(wifi_radio_obj_t *self) {
+//     if (!esp_netif_is_netif_up(self->netif)) {
+//         return mp_const_none;
+//     }
+
+//     // Make sure the interface is in STA mode
+//     if (self->sta_mode){
+//         return mp_const_none;
+//     }
+
+//     if (esp_wifi_sta_get_ap_info(&self->ap_info) != ESP_OK){
+//         return mp_const_none;
+//     } else {
+//         return mp_obj_new_bytes(self->ap_info.bssid, MAC_ADDRESS_LENGTH);
+//     }
+// }
 
 mp_obj_t common_hal_wifi_radio_get_ipv4_gateway(wifi_radio_obj_t *self) {
     if (!esp_netif_is_netif_up(self->netif)) {
diff --git a/ports/esp32s2/common-hal/wifi/Radio.h b/ports/esp32s2/common-hal/wifi/Radio.h
index 272c3a62e..f441096f7 100644
--- a/ports/esp32s2/common-hal/wifi/Radio.h
+++ b/ports/esp32s2/common-hal/wifi/Radio.h
@@ -32,6 +32,7 @@
 #include "components/esp_event/include/esp_event.h"
 
 #include "shared-bindings/wifi/ScannedNetworks.h"
+#include "shared-bindings/wifi/Network.h"
 
 // Event bits for the Radio event group.
 #define WIFI_SCAN_DONE_BIT BIT0
@@ -47,6 +48,7 @@ typedef struct {
     EventGroupHandle_t event_group_handle;
     wifi_config_t sta_config;
     wifi_ap_record_t ap_info;
+    wifi_network_obj_t apnet;
     esp_netif_ip_info_t ip_info;
     esp_netif_dns_info_t dns_info;
     esp_netif_t *netif;
diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c
index 96abadf6f..d75532769 100644
--- a/shared-bindings/wifi/Radio.c
+++ b/shared-bindings/wifi/Radio.c
@@ -179,37 +179,37 @@ const mp_obj_property_t wifi_radio_ap_rssi_obj = {
                (mp_obj_t)&mp_const_none_obj },
 };
 
-//|     ap_ssid: int
-//|     """SSID of the currently connected AP. Returns none if not connected"""
-//|
-STATIC mp_obj_t wifi_radio_get_ap_ssid(mp_obj_t self) {
-    return common_hal_wifi_radio_get_ap_ssid(self);
-
-}
-MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ap_ssid_obj, wifi_radio_get_ap_ssid);
-
-const mp_obj_property_t wifi_radio_ap_ssid_obj = {
-    .base.type = &mp_type_property,
-    .proxy = { (mp_obj_t)&wifi_radio_get_ap_ssid_obj,
-               (mp_obj_t)&mp_const_none_obj,
-               (mp_obj_t)&mp_const_none_obj },
-};
-
-//|     ap_bssid: int
-//|     """BSSID (usually MAC) of the currently connected AP. Returns none if not connected"""
-//|
-STATIC mp_obj_t wifi_radio_get_ap_bssid(mp_obj_t self) {
-    return common_hal_wifi_radio_get_ap_bssid(self);
-
-}
-MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ap_bssid_obj, wifi_radio_get_ap_bssid);
-
-const mp_obj_property_t wifi_radio_ap_bssid_obj = {
-    .base.type = &mp_type_property,
-    .proxy = { (mp_obj_t)&wifi_radio_get_ap_bssid_obj,
-               (mp_obj_t)&mp_const_none_obj,
-               (mp_obj_t)&mp_const_none_obj },
-};
+// //|     ap_ssid: int
+// //|     """SSID of the currently connected AP. Returns none if not connected"""
+// //|
+// STATIC mp_obj_t wifi_radio_get_ap_ssid(mp_obj_t self) {
+//     return common_hal_wifi_radio_get_ap_ssid(self);
+
+// }
+// MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ap_ssid_obj, wifi_radio_get_ap_ssid);
+
+// const mp_obj_property_t wifi_radio_ap_ssid_obj = {
+//     .base.type = &mp_type_property,
+//     .proxy = { (mp_obj_t)&wifi_radio_get_ap_ssid_obj,
+//                (mp_obj_t)&mp_const_none_obj,
+//                (mp_obj_t)&mp_const_none_obj },
+// };
+
+// //|     ap_bssid: int
+// //|     """BSSID (usually MAC) of the currently connected AP. Returns none if not connected"""
+// //|
+// STATIC mp_obj_t wifi_radio_get_ap_bssid(mp_obj_t self) {
+//     return common_hal_wifi_radio_get_ap_bssid(self);
+
+// }
+// MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ap_bssid_obj, wifi_radio_get_ap_bssid);
+
+// const mp_obj_property_t wifi_radio_ap_bssid_obj = {
+//     .base.type = &mp_type_property,
+//     .proxy = { (mp_obj_t)&wifi_radio_get_ap_bssid_obj,
+//                (mp_obj_t)&mp_const_none_obj,
+//                (mp_obj_t)&mp_const_none_obj },
+// };
 
 //|     ipv4_gateway: Optional[ipaddress.IPv4Address]
 //|     """IP v4 Address of the gateway when connected to an access point. None otherwise."""
@@ -275,6 +275,22 @@ const mp_obj_property_t wifi_radio_ipv4_dns_obj = {
                (mp_obj_t)&mp_const_none_obj },
 };
 
+//|     ap_info: Optional[Network]
+//|     """None otherwise."""
+//|
+STATIC mp_obj_t wifi_radio_get_ap_info(mp_obj_t self) {
+    return common_hal_wifi_radio_get_ap_info(self);
+
+}
+MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ap_info_obj, wifi_radio_get_ap_info);
+
+const mp_obj_property_t wifi_radio_ap_info_obj = {
+    .base.type = &mp_type_property,
+    .proxy = { (mp_obj_t)&wifi_radio_get_ap_info_obj,
+               (mp_obj_t)&mp_const_none_obj,
+               (mp_obj_t)&mp_const_none_obj },
+};
+
 //|     def ping(self, ip, *, timeout: float = 0.5) -> float:
 //|         """Ping an IP to test connectivity. Returns echo time in seconds.
 //|            Returns None when it times out."""
@@ -315,9 +331,10 @@ STATIC const mp_rom_map_elem_t wifi_radio_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_connect),    MP_ROM_PTR(&wifi_radio_connect_obj) },
     // { MP_ROM_QSTR(MP_QSTR_connect_to_enterprise),    MP_ROM_PTR(&wifi_radio_connect_to_enterprise_obj) },
 
+    { MP_ROM_QSTR(MP_QSTR_ap_info),    MP_ROM_PTR(&wifi_radio_ap_info_obj) },
     { MP_ROM_QSTR(MP_QSTR_ap_rssi),    MP_ROM_PTR(&wifi_radio_ap_rssi_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ap_ssid),    MP_ROM_PTR(&wifi_radio_ap_ssid_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ap_bssid),    MP_ROM_PTR(&wifi_radio_ap_bssid_obj) },
+    // { MP_ROM_QSTR(MP_QSTR_ap_ssid),    MP_ROM_PTR(&wifi_radio_ap_ssid_obj) },
+    // { MP_ROM_QSTR(MP_QSTR_ap_bssid),    MP_ROM_PTR(&wifi_radio_ap_bssid_obj) },
     { MP_ROM_QSTR(MP_QSTR_ipv4_dns),    MP_ROM_PTR(&wifi_radio_ipv4_dns_obj) },
     { MP_ROM_QSTR(MP_QSTR_ipv4_gateway),    MP_ROM_PTR(&wifi_radio_ipv4_gateway_obj) },
     { MP_ROM_QSTR(MP_QSTR_ipv4_subnet),    MP_ROM_PTR(&wifi_radio_ipv4_subnet_obj) },
diff --git a/shared-bindings/wifi/Radio.h b/shared-bindings/wifi/Radio.h
index bf30ac340..6dca40c56 100644
--- a/shared-bindings/wifi/Radio.h
+++ b/shared-bindings/wifi/Radio.h
@@ -53,9 +53,10 @@ extern void common_hal_wifi_radio_stop_scanning_networks(wifi_radio_obj_t *self)
 
 extern wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t* ssid, size_t ssid_len, uint8_t* password, size_t password_len, uint8_t channel, mp_float_t timeout, uint8_t* bssid, size_t bssid_len);
 
+extern mp_obj_t common_hal_wifi_radio_get_ap_info(wifi_radio_obj_t *self);
 extern mp_obj_t common_hal_wifi_radio_get_ap_rssi(wifi_radio_obj_t *self);
-extern mp_obj_t common_hal_wifi_radio_get_ap_ssid(wifi_radio_obj_t *self);
-extern mp_obj_t common_hal_wifi_radio_get_ap_bssid(wifi_radio_obj_t *self);
+// extern mp_obj_t common_hal_wifi_radio_get_ap_ssid(wifi_radio_obj_t *self);
+// extern mp_obj_t common_hal_wifi_radio_get_ap_bssid(wifi_radio_obj_t *self);
 extern mp_obj_t common_hal_wifi_radio_get_ipv4_dns(wifi_radio_obj_t *self);
 extern mp_obj_t common_hal_wifi_radio_get_ipv4_gateway(wifi_radio_obj_t *self);
 extern mp_obj_t common_hal_wifi_radio_get_ipv4_subnet(wifi_radio_obj_t *self);
-- 
cgit v1.2.3


From 9d840aab0b81db61e185eeac5d8359489ff36320 Mon Sep 17 00:00:00 2001
From: "Ryan T. Hamilton" <astrobokonon@gmail.com>
Date: Thu, 15 Oct 2020 23:45:11 -0700
Subject: Cleaned up and now testing

---
 ports/esp32s2/common-hal/wifi/Radio.c | 66 +++--------------------------------
 ports/esp32s2/common-hal/wifi/Radio.h |  3 +-
 shared-bindings/wifi/Radio.c          | 53 +---------------------------
 shared-bindings/wifi/Radio.h          |  3 --
 4 files changed, 7 insertions(+), 118 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/common-hal/wifi/Radio.c b/ports/esp32s2/common-hal/wifi/Radio.c
index b1f9e67e0..6203a151b 100644
--- a/ports/esp32s2/common-hal/wifi/Radio.c
+++ b/ports/esp32s2/common-hal/wifi/Radio.c
@@ -160,76 +160,20 @@ mp_obj_t common_hal_wifi_radio_get_ap_info(wifi_radio_obj_t *self) {
         return mp_const_none;
     }
 
-    wifi_network_obj_t *apnet = m_new_obj(wifi_network_obj_t);
-    apnet->base.type = &wifi_network_type;
+    wifi_network_obj_t *ap_info = m_new_obj(wifi_network_obj_t);
+    ap_info->base.type = &wifi_network_type;
     // From esp_wifi.h, the possible return values (typos theirs):
     //    ESP_OK: succeed
     //    ESP_ERR_WIFI_CONN: The station interface don't initialized
     //    ESP_ERR_WIFI_NOT_CONNECT: The station is in disconnect status
-    if (esp_wifi_sta_get_ap_info(&self->apnet.record) != ESP_OK){
+    if (esp_wifi_sta_get_ap_info(&self->ap_info.record) != ESP_OK){
         return mp_const_none;
     } else {
-        memcpy(&apnet->record, &self->apnet.record, sizeof(wifi_ap_record_t));
-        return MP_OBJ_FROM_PTR(apnet);
+        memcpy(&ap_info->record, &self->ap_info.record, sizeof(wifi_ap_record_t));
+        return MP_OBJ_FROM_PTR(ap_info);
     }
 }
 
-mp_obj_t common_hal_wifi_radio_get_ap_rssi(wifi_radio_obj_t *self) {
-    if (!esp_netif_is_netif_up(self->netif)) {
-        return mp_const_none;
-    }
-
-    // Make sure the interface is in STA mode
-    if (self->sta_mode){
-        return mp_const_none;
-    }
-
-    // From esp_wifi.h, the possible return values (typos theirs):
-    //    ESP_OK: succeed
-    //    ESP_ERR_WIFI_CONN: The station interface don't initialized
-    //    ESP_ERR_WIFI_NOT_CONNECT: The station is in disconnect status
-    if (esp_wifi_sta_get_ap_info(&self->ap_info) != ESP_OK){
-        return mp_const_none;
-    } else {
-        return mp_obj_new_int(self->ap_info.rssi);
-    }
-}
-
-// mp_obj_t common_hal_wifi_radio_get_ap_ssid(wifi_radio_obj_t *self) {
-//     if (!esp_netif_is_netif_up(self->netif)) {
-//         return mp_const_none;
-//     }
-
-//     // Make sure the interface is in STA mode
-//     if (self->sta_mode){
-//         return mp_const_none;
-//     }
-
-//     if (esp_wifi_sta_get_ap_info(&self->ap_info) != ESP_OK){
-//         return mp_const_none;
-//     } else {
-//         const char* cstr = (const char*) self->ap_info.ssid;
-//         return mp_obj_new_str(cstr, strlen(cstr));
-//     }
-// }
-
-// mp_obj_t common_hal_wifi_radio_get_ap_bssid(wifi_radio_obj_t *self) {
-//     if (!esp_netif_is_netif_up(self->netif)) {
-//         return mp_const_none;
-//     }
-
-//     // Make sure the interface is in STA mode
-//     if (self->sta_mode){
-//         return mp_const_none;
-//     }
-
-//     if (esp_wifi_sta_get_ap_info(&self->ap_info) != ESP_OK){
-//         return mp_const_none;
-//     } else {
-//         return mp_obj_new_bytes(self->ap_info.bssid, MAC_ADDRESS_LENGTH);
-//     }
-// }
-
 mp_obj_t common_hal_wifi_radio_get_ipv4_gateway(wifi_radio_obj_t *self) {
     if (!esp_netif_is_netif_up(self->netif)) {
         return mp_const_none;
diff --git a/ports/esp32s2/common-hal/wifi/Radio.h b/ports/esp32s2/common-hal/wifi/Radio.h
index f441096f7..c7f484eaf 100644
--- a/ports/esp32s2/common-hal/wifi/Radio.h
+++ b/ports/esp32s2/common-hal/wifi/Radio.h
@@ -47,8 +47,7 @@ typedef struct {
     StaticEventGroup_t event_group;
     EventGroupHandle_t event_group_handle;
     wifi_config_t sta_config;
-    wifi_ap_record_t ap_info;
-    wifi_network_obj_t apnet;
+    wifi_network_obj_t ap_info;
     esp_netif_ip_info_t ip_info;
     esp_netif_dns_info_t dns_info;
     esp_netif_t *netif;
diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c
index d75532769..450331009 100644
--- a/shared-bindings/wifi/Radio.c
+++ b/shared-bindings/wifi/Radio.c
@@ -163,54 +163,6 @@ STATIC mp_obj_t wifi_radio_connect(size_t n_args, const mp_obj_t *pos_args, mp_m
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_connect_obj, 1, wifi_radio_connect);
 
-//|     ap_rssi: int
-//|     """RSSI of the currently connected AP. Returns none if not connected"""
-//|
-STATIC mp_obj_t wifi_radio_get_ap_rssi(mp_obj_t self) {
-    return common_hal_wifi_radio_get_ap_rssi(self);
-
-}
-MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ap_rssi_obj, wifi_radio_get_ap_rssi);
-
-const mp_obj_property_t wifi_radio_ap_rssi_obj = {
-    .base.type = &mp_type_property,
-    .proxy = { (mp_obj_t)&wifi_radio_get_ap_rssi_obj,
-               (mp_obj_t)&mp_const_none_obj,
-               (mp_obj_t)&mp_const_none_obj },
-};
-
-// //|     ap_ssid: int
-// //|     """SSID of the currently connected AP. Returns none if not connected"""
-// //|
-// STATIC mp_obj_t wifi_radio_get_ap_ssid(mp_obj_t self) {
-//     return common_hal_wifi_radio_get_ap_ssid(self);
-
-// }
-// MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ap_ssid_obj, wifi_radio_get_ap_ssid);
-
-// const mp_obj_property_t wifi_radio_ap_ssid_obj = {
-//     .base.type = &mp_type_property,
-//     .proxy = { (mp_obj_t)&wifi_radio_get_ap_ssid_obj,
-//                (mp_obj_t)&mp_const_none_obj,
-//                (mp_obj_t)&mp_const_none_obj },
-// };
-
-// //|     ap_bssid: int
-// //|     """BSSID (usually MAC) of the currently connected AP. Returns none if not connected"""
-// //|
-// STATIC mp_obj_t wifi_radio_get_ap_bssid(mp_obj_t self) {
-//     return common_hal_wifi_radio_get_ap_bssid(self);
-
-// }
-// MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ap_bssid_obj, wifi_radio_get_ap_bssid);
-
-// const mp_obj_property_t wifi_radio_ap_bssid_obj = {
-//     .base.type = &mp_type_property,
-//     .proxy = { (mp_obj_t)&wifi_radio_get_ap_bssid_obj,
-//                (mp_obj_t)&mp_const_none_obj,
-//                (mp_obj_t)&mp_const_none_obj },
-// };
-
 //|     ipv4_gateway: Optional[ipaddress.IPv4Address]
 //|     """IP v4 Address of the gateway when connected to an access point. None otherwise."""
 //|
@@ -276,7 +228,7 @@ const mp_obj_property_t wifi_radio_ipv4_dns_obj = {
 };
 
 //|     ap_info: Optional[Network]
-//|     """None otherwise."""
+//|     """Network object containing BSSID, SSID, channel, and RSSI when connected to an access point. None otherwise."""
 //|
 STATIC mp_obj_t wifi_radio_get_ap_info(mp_obj_t self) {
     return common_hal_wifi_radio_get_ap_info(self);
@@ -332,9 +284,6 @@ STATIC const mp_rom_map_elem_t wifi_radio_locals_dict_table[] = {
     // { MP_ROM_QSTR(MP_QSTR_connect_to_enterprise),    MP_ROM_PTR(&wifi_radio_connect_to_enterprise_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_ap_info),    MP_ROM_PTR(&wifi_radio_ap_info_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ap_rssi),    MP_ROM_PTR(&wifi_radio_ap_rssi_obj) },
-    // { MP_ROM_QSTR(MP_QSTR_ap_ssid),    MP_ROM_PTR(&wifi_radio_ap_ssid_obj) },
-    // { MP_ROM_QSTR(MP_QSTR_ap_bssid),    MP_ROM_PTR(&wifi_radio_ap_bssid_obj) },
     { MP_ROM_QSTR(MP_QSTR_ipv4_dns),    MP_ROM_PTR(&wifi_radio_ipv4_dns_obj) },
     { MP_ROM_QSTR(MP_QSTR_ipv4_gateway),    MP_ROM_PTR(&wifi_radio_ipv4_gateway_obj) },
     { MP_ROM_QSTR(MP_QSTR_ipv4_subnet),    MP_ROM_PTR(&wifi_radio_ipv4_subnet_obj) },
diff --git a/shared-bindings/wifi/Radio.h b/shared-bindings/wifi/Radio.h
index 6dca40c56..38cc93337 100644
--- a/shared-bindings/wifi/Radio.h
+++ b/shared-bindings/wifi/Radio.h
@@ -54,9 +54,6 @@ extern void common_hal_wifi_radio_stop_scanning_networks(wifi_radio_obj_t *self)
 extern wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t* ssid, size_t ssid_len, uint8_t* password, size_t password_len, uint8_t channel, mp_float_t timeout, uint8_t* bssid, size_t bssid_len);
 
 extern mp_obj_t common_hal_wifi_radio_get_ap_info(wifi_radio_obj_t *self);
-extern mp_obj_t common_hal_wifi_radio_get_ap_rssi(wifi_radio_obj_t *self);
-// extern mp_obj_t common_hal_wifi_radio_get_ap_ssid(wifi_radio_obj_t *self);
-// extern mp_obj_t common_hal_wifi_radio_get_ap_bssid(wifi_radio_obj_t *self);
 extern mp_obj_t common_hal_wifi_radio_get_ipv4_dns(wifi_radio_obj_t *self);
 extern mp_obj_t common_hal_wifi_radio_get_ipv4_gateway(wifi_radio_obj_t *self);
 extern mp_obj_t common_hal_wifi_radio_get_ipv4_subnet(wifi_radio_obj_t *self);
-- 
cgit v1.2.3


From 76f1db7a8795f2594db6b6d0d6f38a48a2cfd8af Mon Sep 17 00:00:00 2001
From: "Ryan T. Hamilton" <astrobokonon@gmail.com>
Date: Sat, 17 Oct 2020 00:23:31 -0700
Subject: Set sta_mode flag for actual use/checking

---
 ports/esp32s2/common-hal/wifi/Radio.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/common-hal/wifi/Radio.c b/ports/esp32s2/common-hal/wifi/Radio.c
index 6203a151b..80afc5eaa 100644
--- a/ports/esp32s2/common-hal/wifi/Radio.c
+++ b/ports/esp32s2/common-hal/wifi/Radio.c
@@ -53,6 +53,8 @@ static void start_station(wifi_radio_obj_t *self) {
     }
     esp_wifi_set_mode(next_mode);
 
+    self->sta_mode = 1;
+
     esp_wifi_set_config(WIFI_MODE_STA, &self->sta_config);
 }
 
@@ -156,7 +158,7 @@ mp_obj_t common_hal_wifi_radio_get_ap_info(wifi_radio_obj_t *self) {
     }
 
     // Make sure the interface is in STA mode
-    if (self->sta_mode){
+    if (!self->sta_mode){
         return mp_const_none;
     }
 
-- 
cgit v1.2.3


From d6805c0dd40e142654fd45e4d6d43af08871a2c8 Mon Sep 17 00:00:00 2001
From: askpatricw <4002194+askpatrickw@users.noreply.github.com>
Date: Sun, 18 Oct 2020 17:15:59 -0700
Subject: SDA and SCL were flipped

---
 ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/pins.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/pins.c b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/pins.c
index 967f5e8d9..a1036f850 100644
--- a/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/pins.c
+++ b/ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/pins.c
@@ -46,11 +46,11 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO43) },
     { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
 
-    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO38) },
     { MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) },
     { MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO38) },
 
-    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO33) },
     { MP_ROM_QSTR(MP_QSTR_IO33), MP_ROM_PTR(&pin_GPIO33) },
     { MP_ROM_QSTR(MP_QSTR_D20), MP_ROM_PTR(&pin_GPIO33) },
 
-- 
cgit v1.2.3


From a2fce305d6b9407ad6af4e6d4721c47fc9e264d4 Mon Sep 17 00:00:00 2001
From: Targett363 <targett363@aol.com>
Date: Tue, 20 Oct 2020 10:42:14 +0100
Subject: Replacing placeholder PIDs with correct PIDs

---
 ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.mk  | 2 +-
 ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.mk b/ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.mk
index e307d7d62..f88cb75d2 100644
--- a/ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.mk
+++ b/ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x1209
-USB_PID = 0x0011
+USB_PID = 0x3252
 USB_PRODUCT = "Targett Module Clip w/Wroom"
 USB_MANUFACTURER = "Targett"
 
diff --git a/ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.mk b/ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.mk
index aff5ffd6c..e2dc15584 100644
--- a/ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.mk
+++ b/ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x1209
-USB_PID = 0x0012
+USB_PID = 0x3253
 USB_PRODUCT = "Targett Module Clip w/Wrover"
 USB_MANUFACTURER = "Targett"
 
-- 
cgit v1.2.3


From c58b0adf64a99916a3b360d62dee3b2964f3876b Mon Sep 17 00:00:00 2001
From: "Ryan T. Hamilton" <astrobokonon@gmail.com>
Date: Tue, 20 Oct 2020 14:49:57 -0700
Subject: Reset sta_mode and ap_mode flags

---
 ports/esp32s2/common-hal/wifi/__init__.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/common-hal/wifi/__init__.c b/ports/esp32s2/common-hal/wifi/__init__.c
index 5c8d2e952..65186e9b1 100644
--- a/ports/esp32s2/common-hal/wifi/__init__.c
+++ b/ports/esp32s2/common-hal/wifi/__init__.c
@@ -100,6 +100,13 @@ void common_hal_wifi_init(void) {
     wifi_radio_obj_t* self = &common_hal_wifi_radio_obj;
     self->netif = esp_netif_create_default_wifi_sta();
 
+    // Even though we just called esp_netif_create_default_wifi_sta,
+    //   station mode isn't actually set until esp_wifi_set_mode()
+    //   is called and the configuration is loaded via esp_wifi_set_config().
+    // Set both convienence flags to false so it's not forgotten.
+    self->sta_mode = 0;
+    self->ap_mode = 0;
+
     self->event_group_handle = xEventGroupCreateStatic(&self->event_group);
     ESP_ERROR_CHECK(esp_event_handler_instance_register(WIFI_EVENT,
                                                         ESP_EVENT_ANY_ID,
-- 
cgit v1.2.3


From e202da4dadeadfe22d30251d99c5247f024bd746 Mon Sep 17 00:00:00 2001
From: "Ryan T. Hamilton" <astrobokonon@gmail.com>
Date: Tue, 20 Oct 2020 15:14:35 -0700
Subject: Change comment wording

---
 ports/esp32s2/common-hal/wifi/__init__.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/common-hal/wifi/__init__.c b/ports/esp32s2/common-hal/wifi/__init__.c
index 65186e9b1..833ef0623 100644
--- a/ports/esp32s2/common-hal/wifi/__init__.c
+++ b/ports/esp32s2/common-hal/wifi/__init__.c
@@ -101,7 +101,7 @@ void common_hal_wifi_init(void) {
     self->netif = esp_netif_create_default_wifi_sta();
 
     // Even though we just called esp_netif_create_default_wifi_sta,
-    //   station mode isn't actually set until esp_wifi_set_mode()
+    //   station mode isn't actually ready for use until esp_wifi_set_mode()
     //   is called and the configuration is loaded via esp_wifi_set_config().
     // Set both convienence flags to false so it's not forgotten.
     self->sta_mode = 0;
-- 
cgit v1.2.3


From f431f859e74a92099079bd8753c2319566dbf3c7 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Thu, 22 Oct 2020 21:32:44 +0530
Subject: Initial support for native touchio

---
 ports/esp32s2/common-hal/touchio/TouchIn.c  | 109 ++++++++++++++++++++++++++++
 ports/esp32s2/common-hal/touchio/TouchIn.h  |  42 +++++++++++
 ports/esp32s2/common-hal/touchio/__init__.c |   1 +
 ports/esp32s2/mpconfigport.mk               |   4 +
 ports/esp32s2/peripherals/pins.c            |  95 +++++++++++++-----------
 ports/esp32s2/peripherals/pins.h            |   1 +
 6 files changed, 208 insertions(+), 44 deletions(-)
 create mode 100644 ports/esp32s2/common-hal/touchio/TouchIn.c
 create mode 100644 ports/esp32s2/common-hal/touchio/TouchIn.h
 create mode 100644 ports/esp32s2/common-hal/touchio/__init__.c

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/common-hal/touchio/TouchIn.c b/ports/esp32s2/common-hal/touchio/TouchIn.c
new file mode 100644
index 000000000..7d30d1a32
--- /dev/null
+++ b/ports/esp32s2/common-hal/touchio/TouchIn.c
@@ -0,0 +1,109 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 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 "shared-bindings/touchio/TouchIn.h"
+#include "py/runtime.h"
+
+#include "driver/touch_pad.h"
+
+static const touch_pad_t touch_pad[] = {
+    TOUCH_PAD_NUM1,
+    TOUCH_PAD_NUM2,
+    TOUCH_PAD_NUM3,
+    TOUCH_PAD_NUM4,
+    TOUCH_PAD_NUM5,
+    TOUCH_PAD_NUM6,
+    TOUCH_PAD_NUM7,
+    TOUCH_PAD_NUM8,
+    TOUCH_PAD_NUM9,
+    TOUCH_PAD_NUM10,
+    TOUCH_PAD_NUM11,
+    TOUCH_PAD_NUM12,
+    TOUCH_PAD_NUM13,
+    TOUCH_PAD_NUM14
+};
+
+static uint16_t get_raw_reading(touchio_touchin_obj_t *self) {
+    uint32_t touch_value;
+    touch_pad_read_raw_data(touch_pad[self->pin], &touch_value);
+    return touch_value;
+}
+
+void common_hal_touchio_touchin_construct(touchio_touchin_obj_t* self,
+        const mcu_pin_obj_t *pin) {
+    if (!pin->has_touch) {
+        mp_raise_ValueError(translate("Invalid pin"));
+    }
+    claim_pin(pin);
+
+    touch_pad_init();
+    touch_pad_config(touch_pad[pin->number]);
+
+    touch_pad_set_fsm_mode(TOUCH_FSM_MODE_TIMER);
+    touch_pad_fsm_start();
+
+    // Initial values for pins will vary, depending on what peripherals the pins
+    // share on-chip.
+
+    // Set a "touched" threshold not too far above the initial value.
+    // For simple finger touch, the values may vary as much as a factor of two,
+    // but for touches using fruit or other objects, the difference is much less.
+
+    self->pin = pin->number;
+    self->threshold = get_raw_reading(self) + 100;
+}
+
+bool common_hal_touchio_touchin_deinited(touchio_touchin_obj_t* self) {
+    return self->pin == 0xff;
+}
+
+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);
+    self->pin = 0xff;
+}
+
+bool common_hal_touchio_touchin_get_value(touchio_touchin_obj_t *self) {
+    uint16_t reading = get_raw_reading(self);
+    return reading > self->threshold;
+}
+
+uint16_t common_hal_touchio_touchin_get_raw_value(touchio_touchin_obj_t *self) {
+    return get_raw_reading(self);
+}
+
+uint16_t common_hal_touchio_touchin_get_threshold(touchio_touchin_obj_t *self) {
+    return self->threshold;
+}
+
+void common_hal_touchio_touchin_set_threshold(touchio_touchin_obj_t *self, uint16_t new_threshold) {
+    self->threshold = new_threshold;
+}
diff --git a/ports/esp32s2/common-hal/touchio/TouchIn.h b/ports/esp32s2/common-hal/touchio/TouchIn.h
new file mode 100644
index 000000000..81d80c9dd
--- /dev/null
+++ b/ports/esp32s2/common-hal/touchio/TouchIn.h
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Scott Shawcroft
+ *
+ * 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_TOUCHIO_TOUCHIN_H
+#define MICROPY_INCLUDED_ESP32S2_COMMON_HAL_TOUCHIO_TOUCHIN_H
+
+#include "common-hal/microcontroller/Pin.h"
+
+#include "py/obj.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    uint8_t pin;
+    uint16_t threshold;
+} touchio_touchin_obj_t;
+
+void touchin_reset(void);
+
+#endif // MICROPY_INCLUDED_ESP32S2_COMMON_HAL_TOUCHIO_TOUCHIN_H
diff --git a/ports/esp32s2/common-hal/touchio/__init__.c b/ports/esp32s2/common-hal/touchio/__init__.c
new file mode 100644
index 000000000..d2290447c
--- /dev/null
+++ b/ports/esp32s2/common-hal/touchio/__init__.c
@@ -0,0 +1 @@
+// No touchio module functions.
diff --git a/ports/esp32s2/mpconfigport.mk b/ports/esp32s2/mpconfigport.mk
index 4e8a7bdef..60a3a14ca 100644
--- a/ports/esp32s2/mpconfigport.mk
+++ b/ports/esp32s2/mpconfigport.mk
@@ -26,4 +26,8 @@ CIRCUITPY_USB_MIDI = 0
 CIRCUITPY_WIFI = 1
 CIRCUITPY_ESPIDF = 1
 
+ifndef CIRCUITPY_TOUCHIO_USE_NATIVE
+CIRCUITPY_TOUCHIO_USE_NATIVE = 1
+endif
+
 CIRCUITPY_MODULE ?= none
diff --git a/ports/esp32s2/peripherals/pins.c b/ports/esp32s2/peripherals/pins.c
index 2c8b61c62..e372c84b1 100755
--- a/ports/esp32s2/peripherals/pins.c
+++ b/ports/esp32s2/peripherals/pins.c
@@ -29,55 +29,62 @@
 #define NO_ADC 0
 #define NO_ADC_CHANNEL ADC_CHANNEL_MAX
 
+#define TOUCH \
+    .has_touch = true,
+
+#define NO_TOUCH \
+    .has_touch = false,
+
 // This macro is used to simplify pin definition in boards/<board>/pins.c
-#define PIN(p_name, p_number, p_adc_index, p_adc_channel) \
+#define PIN(p_name, p_number, p_adc_index, p_adc_channel, p_touch_channel) \
 const mcu_pin_obj_t pin_## p_name = { \
     PIN_PREFIX_VALUES \
     .number = p_number, \
     .adc_index = p_adc_index, \
     .adc_channel = p_adc_channel, \
+    p_touch_channel \
 }
 
-PIN(GPIO0, 0, NO_ADC, NO_ADC_CHANNEL);
-PIN(GPIO1, 1, ADC_UNIT_1, ADC_CHANNEL_0);
-PIN(GPIO2, 2, ADC_UNIT_1, ADC_CHANNEL_1);
-PIN(GPIO3, 3, ADC_UNIT_1, ADC_CHANNEL_2);
-PIN(GPIO4, 4, ADC_UNIT_1, ADC_CHANNEL_3);
-PIN(GPIO5, 5, ADC_UNIT_1, ADC_CHANNEL_4);
-PIN(GPIO6, 6, ADC_UNIT_1, ADC_CHANNEL_5);
-PIN(GPIO7, 7, ADC_UNIT_1, ADC_CHANNEL_6);
-PIN(GPIO8, 8, ADC_UNIT_1, ADC_CHANNEL_7);
-PIN(GPIO9, 9, ADC_UNIT_1, ADC_CHANNEL_8);
-PIN(GPIO10, 10, ADC_UNIT_1, ADC_CHANNEL_9);
-PIN(GPIO11, 11, ADC_UNIT_2, ADC_CHANNEL_0);
-PIN(GPIO12, 12, ADC_UNIT_2, ADC_CHANNEL_1);
-PIN(GPIO13, 13, ADC_UNIT_2, ADC_CHANNEL_2);
-PIN(GPIO14, 14, ADC_UNIT_2, ADC_CHANNEL_3);
-PIN(GPIO15, 15, ADC_UNIT_2, ADC_CHANNEL_4);
-PIN(GPIO16, 16, ADC_UNIT_2, ADC_CHANNEL_5);
-PIN(GPIO17, 17, ADC_UNIT_2, ADC_CHANNEL_6);
-PIN(GPIO18, 18, ADC_UNIT_2, ADC_CHANNEL_7);
-PIN(GPIO19, 19, ADC_UNIT_2, ADC_CHANNEL_8);
-PIN(GPIO20, 20, ADC_UNIT_2, ADC_CHANNEL_9);
-PIN(GPIO21, 21, NO_ADC, NO_ADC_CHANNEL);
-PIN(GPIO26, 26, NO_ADC, NO_ADC_CHANNEL);
-PIN(GPIO27, 27, NO_ADC, NO_ADC_CHANNEL);
-PIN(GPIO28, 28, NO_ADC, NO_ADC_CHANNEL);
-PIN(GPIO29, 29, NO_ADC, NO_ADC_CHANNEL);
-PIN(GPIO30, 30, NO_ADC, NO_ADC_CHANNEL);
-PIN(GPIO31, 31, NO_ADC, NO_ADC_CHANNEL);
-PIN(GPIO32, 32, NO_ADC, NO_ADC_CHANNEL);
-PIN(GPIO33, 33, NO_ADC, NO_ADC_CHANNEL);
-PIN(GPIO34, 34, NO_ADC, NO_ADC_CHANNEL);
-PIN(GPIO35, 35, NO_ADC, NO_ADC_CHANNEL);
-PIN(GPIO36, 36, NO_ADC, NO_ADC_CHANNEL);
-PIN(GPIO37, 37, NO_ADC, NO_ADC_CHANNEL);
-PIN(GPIO38, 38, NO_ADC, NO_ADC_CHANNEL);
-PIN(GPIO39, 39, NO_ADC, NO_ADC_CHANNEL);
-PIN(GPIO40, 40, NO_ADC, NO_ADC_CHANNEL);
-PIN(GPIO41, 41, NO_ADC, NO_ADC_CHANNEL);
-PIN(GPIO42, 42, NO_ADC, NO_ADC_CHANNEL);
-PIN(GPIO43, 43, NO_ADC, NO_ADC_CHANNEL);
-PIN(GPIO44, 44, NO_ADC, NO_ADC_CHANNEL);
-PIN(GPIO45, 45, NO_ADC, NO_ADC_CHANNEL);
-PIN(GPIO46, 46, NO_ADC, NO_ADC_CHANNEL);
+PIN(GPIO0, 0, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
+PIN(GPIO1, 1, ADC_UNIT_1, ADC_CHANNEL_0, TOUCH);
+PIN(GPIO2, 2, ADC_UNIT_1, ADC_CHANNEL_1, TOUCH);
+PIN(GPIO3, 3, ADC_UNIT_1, ADC_CHANNEL_2, TOUCH);
+PIN(GPIO4, 4, ADC_UNIT_1, ADC_CHANNEL_3, TOUCH);
+PIN(GPIO5, 5, ADC_UNIT_1, ADC_CHANNEL_4, TOUCH);
+PIN(GPIO6, 6, ADC_UNIT_1, ADC_CHANNEL_5, TOUCH);
+PIN(GPIO7, 7, ADC_UNIT_1, ADC_CHANNEL_6, TOUCH);
+PIN(GPIO8, 8, ADC_UNIT_1, ADC_CHANNEL_7, TOUCH);
+PIN(GPIO9, 9, ADC_UNIT_1, ADC_CHANNEL_8, TOUCH);
+PIN(GPIO10, 10, ADC_UNIT_1, ADC_CHANNEL_9, TOUCH);
+PIN(GPIO11, 11, ADC_UNIT_2, ADC_CHANNEL_0, TOUCH);
+PIN(GPIO12, 12, ADC_UNIT_2, ADC_CHANNEL_1, TOUCH);
+PIN(GPIO13, 13, ADC_UNIT_2, ADC_CHANNEL_2, TOUCH);
+PIN(GPIO14, 14, ADC_UNIT_2, ADC_CHANNEL_3, TOUCH);
+PIN(GPIO15, 15, ADC_UNIT_2, ADC_CHANNEL_4, NO_TOUCH);
+PIN(GPIO16, 16, ADC_UNIT_2, ADC_CHANNEL_5, NO_TOUCH);
+PIN(GPIO17, 17, ADC_UNIT_2, ADC_CHANNEL_6, NO_TOUCH);
+PIN(GPIO18, 18, ADC_UNIT_2, ADC_CHANNEL_7, NO_TOUCH);
+PIN(GPIO19, 19, ADC_UNIT_2, ADC_CHANNEL_8, NO_TOUCH);
+PIN(GPIO20, 20, ADC_UNIT_2, ADC_CHANNEL_9, NO_TOUCH);
+PIN(GPIO21, 21, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
+PIN(GPIO26, 26, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
+PIN(GPIO27, 27, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
+PIN(GPIO28, 28, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
+PIN(GPIO29, 29, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
+PIN(GPIO30, 30, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
+PIN(GPIO31, 31, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
+PIN(GPIO32, 32, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
+PIN(GPIO33, 33, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
+PIN(GPIO34, 34, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
+PIN(GPIO35, 35, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
+PIN(GPIO36, 36, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
+PIN(GPIO37, 37, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
+PIN(GPIO38, 38, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
+PIN(GPIO39, 39, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
+PIN(GPIO40, 40, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
+PIN(GPIO41, 41, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
+PIN(GPIO42, 42, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
+PIN(GPIO43, 43, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
+PIN(GPIO44, 44, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
+PIN(GPIO45, 45, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
+PIN(GPIO46, 46, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
diff --git a/ports/esp32s2/peripherals/pins.h b/ports/esp32s2/peripherals/pins.h
index 84123a80e..8be57f320 100644
--- a/ports/esp32s2/peripherals/pins.h
+++ b/ports/esp32s2/peripherals/pins.h
@@ -41,6 +41,7 @@
 typedef struct {
     PIN_PREFIX_FIELDS
     gpio_num_t number;
+    bool has_touch:1;
     uint8_t adc_index:2;
     uint8_t adc_channel:6;
 } mcu_pin_obj_t;
-- 
cgit v1.2.3


From ef97ed6ab6938bc9c12987d7584cbc715a0f85bf Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Fri, 23 Oct 2020 13:17:49 +0530
Subject: Update touchio implementation

---
 ports/esp32s2/common-hal/touchio/TouchIn.c | 41 +++++--------
 ports/esp32s2/common-hal/touchio/TouchIn.h |  2 +-
 ports/esp32s2/peripherals/pins.c           | 94 ++++++++++++++----------------
 ports/esp32s2/peripherals/pins.h           |  3 +-
 4 files changed, 62 insertions(+), 78 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/common-hal/touchio/TouchIn.c b/ports/esp32s2/common-hal/touchio/TouchIn.c
index 7d30d1a32..3e3e4b551 100644
--- a/ports/esp32s2/common-hal/touchio/TouchIn.c
+++ b/ports/esp32s2/common-hal/touchio/TouchIn.c
@@ -29,42 +29,31 @@
 
 #include "driver/touch_pad.h"
 
-static const touch_pad_t touch_pad[] = {
-    TOUCH_PAD_NUM1,
-    TOUCH_PAD_NUM2,
-    TOUCH_PAD_NUM3,
-    TOUCH_PAD_NUM4,
-    TOUCH_PAD_NUM5,
-    TOUCH_PAD_NUM6,
-    TOUCH_PAD_NUM7,
-    TOUCH_PAD_NUM8,
-    TOUCH_PAD_NUM9,
-    TOUCH_PAD_NUM10,
-    TOUCH_PAD_NUM11,
-    TOUCH_PAD_NUM12,
-    TOUCH_PAD_NUM13,
-    TOUCH_PAD_NUM14
-};
-
 static uint16_t get_raw_reading(touchio_touchin_obj_t *self) {
     uint32_t touch_value;
-    touch_pad_read_raw_data(touch_pad[self->pin], &touch_value);
+    touch_pad_read_raw_data((touch_pad_t)self->pin->touch_channel, &touch_value);
+    if (touch_value > UINT16_MAX) {
+        return UINT16_MAX;
+    }
     return touch_value;
 }
 
 void common_hal_touchio_touchin_construct(touchio_touchin_obj_t* self,
         const mcu_pin_obj_t *pin) {
-    if (!pin->has_touch) {
+    if (pin->touch_channel == TOUCH_PAD_MAX) {
         mp_raise_ValueError(translate("Invalid pin"));
     }
     claim_pin(pin);
 
     touch_pad_init();
-    touch_pad_config(touch_pad[pin->number]);
+    touch_pad_config((touch_pad_t)pin->touch_channel);
 
     touch_pad_set_fsm_mode(TOUCH_FSM_MODE_TIMER);
     touch_pad_fsm_start();
 
+    // wait for "raw data" to reset
+    mp_hal_delay_ms(10);
+
     // Initial values for pins will vary, depending on what peripherals the pins
     // share on-chip.
 
@@ -72,23 +61,21 @@ void common_hal_touchio_touchin_construct(touchio_touchin_obj_t* self,
     // For simple finger touch, the values may vary as much as a factor of two,
     // but for touches using fruit or other objects, the difference is much less.
 
-    self->pin = pin->number;
+    self->pin = pin;
     self->threshold = get_raw_reading(self) + 100;
 }
 
 bool common_hal_touchio_touchin_deinited(touchio_touchin_obj_t* self) {
-    return self->pin == 0xff;
+    return self->pin == NULL;
 }
 
 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);
-    self->pin = 0xff;
+    touch_pad_deinit();
+    reset_pin_number(self->pin->touch_channel);
+    self->pin = NULL;
 }
 
 bool common_hal_touchio_touchin_get_value(touchio_touchin_obj_t *self) {
diff --git a/ports/esp32s2/common-hal/touchio/TouchIn.h b/ports/esp32s2/common-hal/touchio/TouchIn.h
index 81d80c9dd..585bb37bf 100644
--- a/ports/esp32s2/common-hal/touchio/TouchIn.h
+++ b/ports/esp32s2/common-hal/touchio/TouchIn.h
@@ -33,7 +33,7 @@
 
 typedef struct {
     mp_obj_base_t base;
-    uint8_t pin;
+    const mcu_pin_obj_t * pin;
     uint16_t threshold;
 } touchio_touchin_obj_t;
 
diff --git a/ports/esp32s2/peripherals/pins.c b/ports/esp32s2/peripherals/pins.c
index e372c84b1..0d3d89ad5 100755
--- a/ports/esp32s2/peripherals/pins.c
+++ b/ports/esp32s2/peripherals/pins.c
@@ -29,11 +29,7 @@
 #define NO_ADC 0
 #define NO_ADC_CHANNEL ADC_CHANNEL_MAX
 
-#define TOUCH \
-    .has_touch = true,
-
-#define NO_TOUCH \
-    .has_touch = false,
+#define NO_TOUCH_CHANNEL TOUCH_PAD_MAX
 
 // This macro is used to simplify pin definition in boards/<board>/pins.c
 #define PIN(p_name, p_number, p_adc_index, p_adc_channel, p_touch_channel) \
@@ -42,49 +38,49 @@ const mcu_pin_obj_t pin_## p_name = { \
     .number = p_number, \
     .adc_index = p_adc_index, \
     .adc_channel = p_adc_channel, \
-    p_touch_channel \
+    .touch_channel = p_touch_channel, \
 }
 
-PIN(GPIO0, 0, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
-PIN(GPIO1, 1, ADC_UNIT_1, ADC_CHANNEL_0, TOUCH);
-PIN(GPIO2, 2, ADC_UNIT_1, ADC_CHANNEL_1, TOUCH);
-PIN(GPIO3, 3, ADC_UNIT_1, ADC_CHANNEL_2, TOUCH);
-PIN(GPIO4, 4, ADC_UNIT_1, ADC_CHANNEL_3, TOUCH);
-PIN(GPIO5, 5, ADC_UNIT_1, ADC_CHANNEL_4, TOUCH);
-PIN(GPIO6, 6, ADC_UNIT_1, ADC_CHANNEL_5, TOUCH);
-PIN(GPIO7, 7, ADC_UNIT_1, ADC_CHANNEL_6, TOUCH);
-PIN(GPIO8, 8, ADC_UNIT_1, ADC_CHANNEL_7, TOUCH);
-PIN(GPIO9, 9, ADC_UNIT_1, ADC_CHANNEL_8, TOUCH);
-PIN(GPIO10, 10, ADC_UNIT_1, ADC_CHANNEL_9, TOUCH);
-PIN(GPIO11, 11, ADC_UNIT_2, ADC_CHANNEL_0, TOUCH);
-PIN(GPIO12, 12, ADC_UNIT_2, ADC_CHANNEL_1, TOUCH);
-PIN(GPIO13, 13, ADC_UNIT_2, ADC_CHANNEL_2, TOUCH);
-PIN(GPIO14, 14, ADC_UNIT_2, ADC_CHANNEL_3, TOUCH);
-PIN(GPIO15, 15, ADC_UNIT_2, ADC_CHANNEL_4, NO_TOUCH);
-PIN(GPIO16, 16, ADC_UNIT_2, ADC_CHANNEL_5, NO_TOUCH);
-PIN(GPIO17, 17, ADC_UNIT_2, ADC_CHANNEL_6, NO_TOUCH);
-PIN(GPIO18, 18, ADC_UNIT_2, ADC_CHANNEL_7, NO_TOUCH);
-PIN(GPIO19, 19, ADC_UNIT_2, ADC_CHANNEL_8, NO_TOUCH);
-PIN(GPIO20, 20, ADC_UNIT_2, ADC_CHANNEL_9, NO_TOUCH);
-PIN(GPIO21, 21, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
-PIN(GPIO26, 26, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
-PIN(GPIO27, 27, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
-PIN(GPIO28, 28, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
-PIN(GPIO29, 29, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
-PIN(GPIO30, 30, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
-PIN(GPIO31, 31, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
-PIN(GPIO32, 32, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
-PIN(GPIO33, 33, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
-PIN(GPIO34, 34, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
-PIN(GPIO35, 35, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
-PIN(GPIO36, 36, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
-PIN(GPIO37, 37, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
-PIN(GPIO38, 38, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
-PIN(GPIO39, 39, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
-PIN(GPIO40, 40, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
-PIN(GPIO41, 41, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
-PIN(GPIO42, 42, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
-PIN(GPIO43, 43, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
-PIN(GPIO44, 44, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
-PIN(GPIO45, 45, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
-PIN(GPIO46, 46, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
+PIN(GPIO0, 0, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+PIN(GPIO1, 1, ADC_UNIT_1, ADC_CHANNEL_0, TOUCH_PAD_NUM1);
+PIN(GPIO2, 2, ADC_UNIT_1, ADC_CHANNEL_1, TOUCH_PAD_NUM2);
+PIN(GPIO3, 3, ADC_UNIT_1, ADC_CHANNEL_2, TOUCH_PAD_NUM3);
+PIN(GPIO4, 4, ADC_UNIT_1, ADC_CHANNEL_3, TOUCH_PAD_NUM4);
+PIN(GPIO5, 5, ADC_UNIT_1, ADC_CHANNEL_4, TOUCH_PAD_NUM5);
+PIN(GPIO6, 6, ADC_UNIT_1, ADC_CHANNEL_5, TOUCH_PAD_NUM6);
+PIN(GPIO7, 7, ADC_UNIT_1, ADC_CHANNEL_6, TOUCH_PAD_NUM7);
+PIN(GPIO8, 8, ADC_UNIT_1, ADC_CHANNEL_7, TOUCH_PAD_NUM8);
+PIN(GPIO9, 9, ADC_UNIT_1, ADC_CHANNEL_8, TOUCH_PAD_NUM9);
+PIN(GPIO10, 10, ADC_UNIT_1, ADC_CHANNEL_9, TOUCH_PAD_NUM10);
+PIN(GPIO11, 11, ADC_UNIT_2, ADC_CHANNEL_0, TOUCH_PAD_NUM11);
+PIN(GPIO12, 12, ADC_UNIT_2, ADC_CHANNEL_1, TOUCH_PAD_NUM12);
+PIN(GPIO13, 13, ADC_UNIT_2, ADC_CHANNEL_2, TOUCH_PAD_NUM13);
+PIN(GPIO14, 14, ADC_UNIT_2, ADC_CHANNEL_3, TOUCH_PAD_NUM14);
+PIN(GPIO15, 15, ADC_UNIT_2, ADC_CHANNEL_4, NO_TOUCH_CHANNEL);
+PIN(GPIO16, 16, ADC_UNIT_2, ADC_CHANNEL_5, NO_TOUCH_CHANNEL);
+PIN(GPIO17, 17, ADC_UNIT_2, ADC_CHANNEL_6, NO_TOUCH_CHANNEL);
+PIN(GPIO18, 18, ADC_UNIT_2, ADC_CHANNEL_7, NO_TOUCH_CHANNEL);
+PIN(GPIO19, 19, ADC_UNIT_2, ADC_CHANNEL_8, NO_TOUCH_CHANNEL);
+PIN(GPIO20, 20, ADC_UNIT_2, ADC_CHANNEL_9, NO_TOUCH_CHANNEL);
+PIN(GPIO21, 21, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+PIN(GPIO26, 26, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+PIN(GPIO27, 27, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+PIN(GPIO28, 28, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+PIN(GPIO29, 29, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+PIN(GPIO30, 30, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+PIN(GPIO31, 31, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+PIN(GPIO32, 32, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+PIN(GPIO33, 33, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+PIN(GPIO34, 34, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+PIN(GPIO35, 35, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+PIN(GPIO36, 36, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+PIN(GPIO37, 37, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+PIN(GPIO38, 38, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+PIN(GPIO39, 39, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+PIN(GPIO40, 40, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+PIN(GPIO41, 41, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+PIN(GPIO42, 42, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+PIN(GPIO43, 43, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+PIN(GPIO44, 44, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+PIN(GPIO45, 45, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+PIN(GPIO46, 46, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
diff --git a/ports/esp32s2/peripherals/pins.h b/ports/esp32s2/peripherals/pins.h
index 8be57f320..c78eb8385 100644
--- a/ports/esp32s2/peripherals/pins.h
+++ b/ports/esp32s2/peripherals/pins.h
@@ -37,13 +37,14 @@
 
 #include "components/hal/include/hal/gpio_types.h"
 #include "components/hal/include/hal/adc_types.h"
+#include "components/hal/include/hal/touch_sensor_types.h"
 
 typedef struct {
     PIN_PREFIX_FIELDS
     gpio_num_t number;
-    bool has_touch:1;
     uint8_t adc_index:2;
     uint8_t adc_channel:6;
+    uint8_t touch_channel;
 } mcu_pin_obj_t;
 
 extern const mcu_pin_obj_t pin_GPIO0;
-- 
cgit v1.2.3


From 396d92f867c66673c8dffc77f7c0cbcaa83a157f Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Wed, 21 Oct 2020 10:38:01 -0500
Subject: esp32s2: Add canio

This works in loopback mode, though the hardware filtering only permits a
single address or mask filter.
---
 ports/esp32s2/Makefile                             |   4 +-
 .../boards/espressif_kaluga_1/mpconfigboard.mk     |   2 +-
 ports/esp32s2/common-hal/canio/CAN.c               | 297 +++++++++++++++++++++
 ports/esp32s2/common-hal/canio/CAN.h               |  52 ++++
 ports/esp32s2/common-hal/canio/Listener.c          | 182 +++++++++++++
 ports/esp32s2/common-hal/canio/Listener.h          |  40 +++
 ports/esp32s2/common-hal/canio/__init__.c          |  25 ++
 ports/esp32s2/common-hal/canio/__init__.h          |  27 ++
 ports/esp32s2/mpconfigport.mk                      |   1 +
 9 files changed, 627 insertions(+), 3 deletions(-)
 create mode 100644 ports/esp32s2/common-hal/canio/CAN.c
 create mode 100644 ports/esp32s2/common-hal/canio/CAN.h
 create mode 100644 ports/esp32s2/common-hal/canio/Listener.c
 create mode 100644 ports/esp32s2/common-hal/canio/Listener.h
 create mode 100644 ports/esp32s2/common-hal/canio/__init__.c
 create mode 100644 ports/esp32s2/common-hal/canio/__init__.h

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/Makefile b/ports/esp32s2/Makefile
index 8d891edd0..5d8ccad50 100644
--- a/ports/esp32s2/Makefile
+++ b/ports/esp32s2/Makefile
@@ -331,10 +331,10 @@ $(BUILD)/firmware.uf2: $(BUILD)/circuitpython-firmware.bin
 	$(Q)$(PYTHON3) $(TOP)/tools/uf2/utils/uf2conv.py -f 0xbfdd4eee -b 0x0000 -c -o $@ $^
 
 flash: $(BUILD)/firmware.bin
-	esptool.py --chip esp32s2 -p $(PORT) --no-stub -b 460800 --before=default_reset --after=hard_reset write_flash $(FLASH_FLAGS) 0x0000 $^
+	esptool.py --chip esp32s2 -p $(PORT) -b 460800 --before=default_reset --after=hard_reset write_flash $(FLASH_FLAGS) 0x0000 $^
 
 flash-circuitpython-only: $(BUILD)/circuitpython-firmware.bin
-	esptool.py --chip esp32s2 -p $(PORT) --no-stub -b 460800 --before=default_reset --after=hard_reset write_flash $(FLASH_FLAGS) 0x10000 $^
+	esptool.py --chip esp32s2 -p $(PORT) -b 460800 --before=default_reset --after=hard_reset write_flash $(FLASH_FLAGS) 0x10000 $^
 
 include $(TOP)/py/mkrules.mk
 
diff --git a/ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.mk b/ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.mk
index ba85e46ef..2dce03881 100644
--- a/ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.mk
+++ b/ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.mk
@@ -11,7 +11,7 @@ LONGINT_IMPL = MPZ
 CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 
 CIRCUITPY_ESP_FLASH_MODE=dio
-CIRCUITPY_ESP_FLASH_FREQ=40m
+CIRCUITPY_ESP_FLASH_FREQ=80m
 CIRCUITPY_ESP_FLASH_SIZE=4MB
 
 CIRCUITPY_MODULE=wrover
diff --git a/ports/esp32s2/common-hal/canio/CAN.c b/ports/esp32s2/common-hal/canio/CAN.c
new file mode 100644
index 000000000..f1741969d
--- /dev/null
+++ b/ports/esp32s2/common-hal/canio/CAN.c
@@ -0,0 +1,297 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Jeff Epler 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 <string.h>
+
+#include "py/runtime.h"
+#include "py/mperrno.h"
+
+#include "common-hal/canio/CAN.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "shared-bindings/util.h"
+#include "supervisor/port.h"
+#include "hal/twai_ll.h"
+
+#include "hal/twai_types.h"
+
+STATIC bool reserved_can;
+
+twai_timing_config_t get_t_config(int baudrate) {
+    switch(baudrate) {
+    case 1000000:
+    {
+        twai_timing_config_t t_config = TWAI_TIMING_CONFIG_1MBITS();
+        return t_config;
+    }
+    case 800000:
+    {
+        twai_timing_config_t t_config = TWAI_TIMING_CONFIG_800KBITS();
+        return t_config;
+    }
+    case 500000:
+    {
+        twai_timing_config_t t_config = TWAI_TIMING_CONFIG_500KBITS();
+        return t_config;
+    }
+    case 250000:
+    {
+        twai_timing_config_t t_config = TWAI_TIMING_CONFIG_250KBITS();
+        return t_config;
+    }
+    case 125000:
+    {
+        twai_timing_config_t t_config = TWAI_TIMING_CONFIG_125KBITS();
+        return t_config;
+    }
+    case 100000:
+    {
+        twai_timing_config_t t_config = TWAI_TIMING_CONFIG_100KBITS();
+        return t_config;
+    }
+    case 50000:
+    {
+        twai_timing_config_t t_config = TWAI_TIMING_CONFIG_50KBITS();
+        return t_config;
+    }
+    case 25000:
+    {
+        twai_timing_config_t t_config = TWAI_TIMING_CONFIG_25KBITS();
+        return t_config;
+    }
+    case 20000:
+    {
+        twai_timing_config_t t_config = TWAI_TIMING_CONFIG_20KBITS();
+        return t_config;
+    }
+    case 16000:
+    {
+        twai_timing_config_t t_config = TWAI_TIMING_CONFIG_16KBITS();
+        return t_config;
+    }
+    case 12500:
+    {
+        twai_timing_config_t t_config = TWAI_TIMING_CONFIG_12_5KBITS();
+        return t_config;
+    }
+    case 10000:
+    {
+        twai_timing_config_t t_config = TWAI_TIMING_CONFIG_10KBITS();
+        return t_config;
+    }
+    case 5000:
+    {
+        twai_timing_config_t t_config = TWAI_TIMING_CONFIG_5KBITS();
+        return t_config;
+    }
+    case 1000:
+    {
+        twai_timing_config_t t_config = TWAI_TIMING_CONFIG_1KBITS();
+        return t_config;
+    }
+    default:
+        mp_raise_ValueError(translate("Baudrate not supported by peripheral"));
+    }
+}
+
+__attribute__((optimize("O0")))
+void common_hal_canio_can_construct(canio_can_obj_t *self, mcu_pin_obj_t *tx, mcu_pin_obj_t *rx, int baudrate, bool loopback, bool silent)
+{
+#define DIV_ROUND(a, b) (((a) + (b)/2) / (b))
+#define DIV_ROUND_UP(a, b) (((a) + (b) - 1) / (b))
+    if (reserved_can) {
+        mp_raise_ValueError(translate("All CAN peripherals are in use"));
+    }
+
+    if (loopback && silent) {
+        mp_raise_ValueError(translate("loopback + silent mode not supported by peripheral"));
+    }
+
+    self->t_config = get_t_config(baudrate);;
+    twai_general_config_t g_config = TWAI_GENERAL_CONFIG_DEFAULT(-1, -1, TWAI_MODE_NORMAL);
+    g_config.tx_io = tx->number;
+    g_config.rx_io = rx->number;
+    if (loopback) {
+        g_config.mode = TWAI_MODE_NO_ACK;
+    }
+    if (silent) {
+        g_config.mode = TWAI_MODE_LISTEN_ONLY;
+    }
+    self->g_config = g_config;
+
+    {
+    twai_filter_config_t f_config = TWAI_FILTER_CONFIG_ACCEPT_ALL();
+    self->f_config = f_config;
+    }
+
+    esp_err_t result = twai_driver_install(&self->g_config, &self->t_config, &self->f_config);
+    if (result == ESP_ERR_NO_MEM) {
+        mp_raise_msg(&mp_type_MemoryError, translate("ESP-IDF memory allocation failed"));
+    } else if (result == ESP_ERR_INVALID_ARG) {
+        mp_raise_ValueError(translate("Invalid pins"));
+    } else if (result != ESP_OK) {
+        mp_raise_OSError_msg_varg(translate("twai_driver_install returned esp-idf error #%d"), (int)result);
+    }
+
+    result = twai_start();
+    if (result != ESP_OK) {
+        mp_raise_OSError_msg_varg(translate("twai_start returned esp-idf error #%d"), (int)result);
+    }
+
+    self->silent = silent;
+    self->loopback = loopback;
+    self->baudrate = baudrate;
+    self->tx_pin = tx;
+    self->rx_pin = rx;
+
+    claim_pin(tx);
+    claim_pin(rx);
+
+    reserved_can = true;
+}
+
+bool common_hal_canio_can_loopback_get(canio_can_obj_t *self)
+{
+    return self->loopback;
+}
+
+int common_hal_canio_can_baudrate_get(canio_can_obj_t *self)
+{
+    return self->baudrate;
+}
+
+int common_hal_canio_can_transmit_error_count_get(canio_can_obj_t *self)
+{
+    twai_status_info_t info;
+    twai_get_status_info(&info);
+    return info.tx_error_counter;
+}
+
+int common_hal_canio_can_receive_error_count_get(canio_can_obj_t *self)
+{
+    twai_status_info_t info;
+    twai_get_status_info(&info);
+    return info.rx_error_counter;
+}
+
+canio_bus_state_t common_hal_canio_can_state_get(canio_can_obj_t *self) {
+    twai_status_info_t info;
+    twai_get_status_info(&info);
+    if (info.state == TWAI_STATE_BUS_OFF || info.state == TWAI_STATE_RECOVERING) {
+        return BUS_STATE_OFF;
+    }
+    if (info.tx_error_counter > 127 || info.rx_error_counter > 127) {
+        return BUS_STATE_ERROR_PASSIVE;
+    }
+    if (info.tx_error_counter > 96 || info.rx_error_counter > 96) {
+        return BUS_STATE_ERROR_WARNING;
+    }
+    return BUS_STATE_ERROR_ACTIVE;
+}
+
+static void can_restart(void) {
+    twai_status_info_t info;
+    twai_get_status_info(&info);
+    if (info.state != TWAI_STATE_BUS_OFF) {
+        return;
+    }
+    twai_initiate_recovery();
+    // wait 100ms (hard coded for now) for bus to recover
+    uint64_t deadline = port_get_raw_ticks(NULL) + 100;
+    do {
+        twai_get_status_info(&info);
+    } while (port_get_raw_ticks(NULL) < deadline && (info.state == TWAI_STATE_BUS_OFF || info.state == TWAI_STATE_RECOVERING));
+}
+
+void canio_maybe_auto_restart(canio_can_obj_t *self) {
+    if (self->auto_restart) can_restart();
+}
+
+void common_hal_canio_can_restart(canio_can_obj_t *self) {
+    if (!common_hal_canio_can_auto_restart_get(self)) {
+        can_restart();
+    }
+}
+
+bool common_hal_canio_can_auto_restart_get(canio_can_obj_t *self) {
+    return self->auto_restart;
+}
+
+void common_hal_canio_can_auto_restart_set(canio_can_obj_t *self, bool value) {
+    self->auto_restart = value;
+    canio_maybe_auto_restart(self);
+}
+
+void common_hal_canio_can_send(canio_can_obj_t *self, mp_obj_t message_in)
+{
+    canio_maybe_auto_restart(self);
+    canio_message_obj_t *message = message_in;
+    bool rtr = message->base.type == &canio_remote_transmission_request_type;
+    twai_message_t message_out = {
+        .extd = message->extended,
+        .rtr = rtr,
+        .self = self->loopback,
+        .identifier = message->id,
+        .data_length_code = message->size,
+    };
+    if (!rtr) {
+        memcpy(message_out.data, message->data, message->size);
+    }
+    // Allow transmission to occur in background
+    twai_transmit(&message_out, 0);
+}
+
+bool common_hal_canio_can_silent_get(canio_can_obj_t *self) {
+    return self->silent;
+}
+
+bool common_hal_canio_can_deinited(canio_can_obj_t *self) {
+    return !self->tx_pin;
+}
+
+void common_hal_canio_can_check_for_deinit(canio_can_obj_t *self) {
+    if (common_hal_canio_can_deinited(self)) {
+        raise_deinited_error();
+    }
+}
+
+void common_hal_canio_can_deinit(canio_can_obj_t *self)
+{
+    if (self->tx_pin) {
+        (void)twai_stop();
+        (void)twai_driver_uninstall();
+        reset_pin_number(self->tx_pin->number);
+        reset_pin_number(self->rx_pin->number);
+        reserved_can = false;
+    }
+    self->tx_pin = NULL;
+    self->rx_pin = NULL;
+}
+
+void common_hal_canio_reset(void) {
+    (void)twai_stop();
+    (void)twai_driver_uninstall();
+    reserved_can = false;
+}
diff --git a/ports/esp32s2/common-hal/canio/CAN.h b/ports/esp32s2/common-hal/canio/CAN.h
new file mode 100644
index 000000000..e15d51590
--- /dev/null
+++ b/ports/esp32s2/common-hal/canio/CAN.h
@@ -0,0 +1,52 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Jeff Epler 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.
+ */
+
+#pragma once
+
+#include "py/obj.h"
+#include "shared-bindings/canio/__init__.h"
+#include "shared-bindings/canio/CAN.h"
+#include "common-hal/microcontroller/Pin.h"
+#include "common-hal/canio/__init__.h"
+#include "shared-module/canio/Message.h"
+
+#include "driver/twai.h"
+
+#define FILTER_BANK_COUNT (28)
+
+typedef struct canio_can_obj {
+    mp_obj_base_t base;
+    int baudrate;
+    const mcu_pin_obj_t *rx_pin;
+    const mcu_pin_obj_t *tx_pin;
+    bool loopback:1;
+    bool silent:1;
+    bool auto_restart:1;
+    bool fifo_in_use:1;
+    twai_filter_config_t f_config;
+    twai_general_config_t g_config;
+    twai_timing_config_t t_config;
+} canio_can_obj_t;
diff --git a/ports/esp32s2/common-hal/canio/Listener.c b/ports/esp32s2/common-hal/canio/Listener.c
new file mode 100644
index 000000000..fddbfeb58
--- /dev/null
+++ b/ports/esp32s2/common-hal/canio/Listener.c
@@ -0,0 +1,182 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Jeff Epler 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 <math.h>
+#include <string.h>
+
+#include "py/obj.h"
+#include "py/runtime.h"
+
+#include "common-hal/canio/__init__.h"
+#include "common-hal/canio/Listener.h"
+#include "shared-bindings/canio/Listener.h"
+#include "shared-bindings/util.h"
+#include "supervisor/shared/tick.h"
+#include "supervisor/shared/safe_mode.h"
+
+#include "hal/twai_ll.h"
+
+// IDE = "extended ID" flag of packet header.  We always add this bit to the
+// mask because a match is always for just one kind of address length
+#define FILTER16_IDE (1<<3)
+#define FILTER32_IDE (1<<2)
+
+// Work around a problem reported at
+// https://github.com/espressif/esp-idf/issues/6020 where
+// twai_ll_set_acc_filter does not work under -Os optimization
+__attribute__((optimize("O0")))
+__attribute__((noinline))
+static void canio_set_acc_filter(twai_dev_t* hw, uint32_t code, uint32_t mask, bool single_filter)
+{
+    uint32_t code_swapped = __builtin_bswap32(code);
+    uint32_t mask_swapped = __builtin_bswap32(mask);
+    for (int i = 0; i < 4; i++) {
+        hw->acceptance_filter.acr[i].val = ((code_swapped >> (i * 8)) & 0xFF);
+        hw->acceptance_filter.amr[i].val = ((mask_swapped >> (i * 8)) & 0xFF);
+    }
+    hw->mode_reg.afm = single_filter;
+}
+
+STATIC void install_standard_filter(canio_listener_obj_t *self, canio_match_obj_t *match) {
+    canio_set_acc_filter(&TWAI, match->id << 21, ~(match->mask << 21), true);
+    self->extended = false;
+    self->standard = true;
+}
+
+STATIC void install_extended_filter(canio_listener_obj_t *self, canio_match_obj_t *match) {
+    canio_set_acc_filter(&TWAI, match->id << 3, ~(match->mask << 3), true);
+    self->extended = true;
+    self->standard = false;
+}
+
+STATIC void install_all_match_filter(canio_listener_obj_t *self) {
+    canio_set_acc_filter(&TWAI, 0u, ~0u, true);
+    self->extended = true;
+    self->standard = true;
+}
+
+__attribute__((noinline,optimize("O0")))
+void set_filters(canio_listener_obj_t *self, size_t nmatch, canio_match_obj_t **matches) {
+    twai_ll_enter_reset_mode(&TWAI);
+
+    if (!nmatch) {
+        install_all_match_filter(self);
+    } else {
+        canio_match_obj_t *match = matches[0];
+        if (match->extended) {
+            install_extended_filter(self, match);
+        } else {
+            install_standard_filter(self, match);
+        }
+    }
+
+    twai_ll_exit_reset_mode(&TWAI);
+}
+
+
+void common_hal_canio_listener_construct(canio_listener_obj_t *self, canio_can_obj_t *can, size_t nmatch, canio_match_obj_t **matches, float timeout) {
+    if (can->fifo_in_use) {
+        mp_raise_ValueError(translate("All RX FIFOs in use"));
+    }
+    if (nmatch > 1) {
+        mp_raise_ValueError(translate("Filters too complex"));
+    }
+
+    // Nothing can fail now so it's safe to assign self->can
+    can->fifo_in_use = 1;
+    self->can = can;
+    self->pending = false;
+
+    set_filters(self, nmatch, matches);
+    self->extended = self->standard = true;
+
+    common_hal_canio_listener_set_timeout(self, timeout);
+}
+
+void common_hal_canio_listener_set_timeout(canio_listener_obj_t *self, float timeout) {
+    self->timeout_ms = (int)MICROPY_FLOAT_C_FUN(ceil)(timeout * 1000);
+}
+
+float common_hal_canio_listener_get_timeout(canio_listener_obj_t *self) {
+    return self->timeout_ms / 1000.0f;
+}
+
+void common_hal_canio_listener_check_for_deinit(canio_listener_obj_t *self) {
+    if (!self->can) {
+        raise_deinited_error();
+    }
+    common_hal_canio_can_check_for_deinit(self->can);
+}
+
+// The API has no peek method so we must receive a packet into a holding area
+// and then we can say that we have 1 message pending
+int common_hal_canio_listener_in_waiting(canio_listener_obj_t *self) {
+    while (!self->pending && twai_receive(&self->message_in, 0) == ESP_OK) {
+        if (self->message_in.extd && self->extended) {
+            self->pending = true;
+        }
+        if (!self->message_in.extd && self->standard) {
+            self->pending = true;
+        }
+    }
+    return self->pending;
+}
+
+mp_obj_t common_hal_canio_listener_receive(canio_listener_obj_t *self) {
+    if (!common_hal_canio_listener_in_waiting(self)) {
+        uint64_t deadline = supervisor_ticks_ms64() + self->timeout_ms;
+        do {
+            if (supervisor_ticks_ms64() > deadline) {
+                return NULL;
+            }
+        } while (!common_hal_canio_listener_in_waiting(self));
+    }
+
+    bool rtr = self->message_in.rtr;
+
+    int dlc = self->message_in.data_length_code;
+    canio_message_obj_t *message = m_new_obj(canio_message_obj_t);
+    message->base.type = rtr ? &canio_remote_transmission_request_type : &canio_message_type;
+    message->extended = self->message_in.extd;
+    message->id = self->message_in.identifier;
+    message->size = dlc;
+
+    if (!rtr) {
+        MP_STATIC_ASSERT(sizeof(self->message_in.data) == sizeof(message->data));
+        memcpy(message->data, self->message_in.data, sizeof(message->data));
+    }
+
+    self->pending = false;
+
+    return message;
+}
+
+void common_hal_canio_listener_deinit(canio_listener_obj_t *self) {
+    if (self->can) {
+        self->can->fifo_in_use = false;
+    }
+    self->can = NULL;
+}
diff --git a/ports/esp32s2/common-hal/canio/Listener.h b/ports/esp32s2/common-hal/canio/Listener.h
new file mode 100644
index 000000000..d24900e43
--- /dev/null
+++ b/ports/esp32s2/common-hal/canio/Listener.h
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Jeff Epler 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.
+ */
+
+#pragma once
+
+#include "common-hal/canio/CAN.h"
+#include "shared-module/canio/Match.h"
+
+typedef struct canio_listener_obj {
+    mp_obj_base_t base;
+    canio_can_obj_t *can;
+    bool extended:1;
+    bool standard:1;
+    bool pending:1;
+    twai_message_t message_in;
+    uint32_t timeout_ms;
+} canio_listener_obj_t;
diff --git a/ports/esp32s2/common-hal/canio/__init__.c b/ports/esp32s2/common-hal/canio/__init__.c
new file mode 100644
index 000000000..7932bfc2d
--- /dev/null
+++ b/ports/esp32s2/common-hal/canio/__init__.c
@@ -0,0 +1,25 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Jeff Epler 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.
+ */
diff --git a/ports/esp32s2/common-hal/canio/__init__.h b/ports/esp32s2/common-hal/canio/__init__.h
new file mode 100644
index 000000000..20b6638cd
--- /dev/null
+++ b/ports/esp32s2/common-hal/canio/__init__.h
@@ -0,0 +1,27 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Jeff Epler 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.
+ */
+
+#pragma once
diff --git a/ports/esp32s2/mpconfigport.mk b/ports/esp32s2/mpconfigport.mk
index 4e8a7bdef..c9863572a 100644
--- a/ports/esp32s2/mpconfigport.mk
+++ b/ports/esp32s2/mpconfigport.mk
@@ -16,6 +16,7 @@ LONGINT_IMPL = MPZ
 CIRCUITPY_FULL_BUILD = 1
 CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_AUDIOIO = 0
+CIRCUITPY_CANIO = 1
 CIRCUITPY_COUNTIO = 0
 CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_I2CPERIPHERAL = 0
-- 
cgit v1.2.3


From 32f2a8d54cf54bb3f9dcba33f4b617d4dcf8b596 Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Mon, 26 Oct 2020 11:03:54 -0400
Subject: Fix readme link

---
 ports/esp32s2/README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/README.md b/ports/esp32s2/README.md
index 8a6dfbd2d..f3e678de8 100644
--- a/ports/esp32s2/README.md
+++ b/ports/esp32s2/README.md
@@ -30,18 +30,20 @@ Connect these pins using a [USB adapter](https://www.adafruit.com/product/4090)
 
 ## Building and flashing ##
 
-Before building or flashing the ESP32-S2, you must [install the esp-idf](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/get-started/index.html). This must be re-done ever time the esp-idf is updated, but not every time you build. Run `cd ports/esp32s2` from `circuitpython/` to move to the esp32s2 port root, and run:
+Before building or flashing the ESP32-S2, you must [install the esp-idf](https://docs.espressif.com/projects/esp-idf/en/latest/esp32s2/get-started/index.html). This must be re-done ever time the esp-idf is updated, but not every time you build. Run `cd ports/esp32s2` from `circuitpython/` to move to the esp32s2 port root, and run:
 
 ```
 ./esp-idf/install.sh
 ```
 
-Additionally, any time you open a new bash environment for building or flashing, you must add the esp-idf tools to your path:
+After this initial installation, you must add the esp-idf tools to your path. You must also do this **any time you open a new bash environment for building or flashing**:
 
 ```
 . esp-idf/export.sh
 ```
 
+When Circuitpython updates the ESP-IDF to a new release, you may need to run this installation process again. The exact commands used may also vary based on your bash environment.
+
 Building boards such as the Saola is typically done through `make flash`. The default port is `tty.SLAB_USBtoUART`, which will only work on certain Mac setups. On most machines, both Mac and Linux, you will need to set the port yourself by running `ls /dev/tty.usb*` and selecting the one that only appears when your development board is plugged in. An example make command with the port setting is as follows:
 
 ```
-- 
cgit v1.2.3


From fc591c8d847ad543ee2e8a368574783e2c230309 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Mon, 19 Oct 2020 18:30:26 -0700
Subject: Add EInk Portal

---
 .../boards/adafruit_esp32s2_eink_portal/board.c    | 47 ++++++++++++++++++++++
 .../adafruit_esp32s2_eink_portal/mpconfigboard.h   | 45 +++++++++++++++++++++
 .../adafruit_esp32s2_eink_portal/mpconfigboard.mk  | 17 ++++++++
 .../boards/adafruit_esp32s2_eink_portal/pins.c     | 39 ++++++++++++++++++
 .../boards/adafruit_esp32s2_eink_portal/sdkconfig  | 33 +++++++++++++++
 5 files changed, 181 insertions(+)
 create mode 100644 ports/esp32s2/boards/adafruit_esp32s2_eink_portal/board.c
 create mode 100644 ports/esp32s2/boards/adafruit_esp32s2_eink_portal/mpconfigboard.h
 create mode 100644 ports/esp32s2/boards/adafruit_esp32s2_eink_portal/mpconfigboard.mk
 create mode 100644 ports/esp32s2/boards/adafruit_esp32s2_eink_portal/pins.c
 create mode 100644 ports/esp32s2/boards/adafruit_esp32s2_eink_portal/sdkconfig

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/boards/adafruit_esp32s2_eink_portal/board.c b/ports/esp32s2/boards/adafruit_esp32s2_eink_portal/board.c
new file mode 100644
index 000000000..9f708874b
--- /dev/null
+++ b/ports/esp32s2/boards/adafruit_esp32s2_eink_portal/board.c
@@ -0,0 +1,47 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 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 "boards/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
+
+void board_init(void) {
+    // USB
+    common_hal_never_reset_pin(&pin_GPIO19);
+    common_hal_never_reset_pin(&pin_GPIO20);
+
+    // Debug UART
+    common_hal_never_reset_pin(&pin_GPIO43);
+    common_hal_never_reset_pin(&pin_GPIO44);
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+
+}
diff --git a/ports/esp32s2/boards/adafruit_esp32s2_eink_portal/mpconfigboard.h b/ports/esp32s2/boards/adafruit_esp32s2_eink_portal/mpconfigboard.h
new file mode 100644
index 000000000..5a17a0cad
--- /dev/null
+++ b/ports/esp32s2/boards/adafruit_esp32s2_eink_portal/mpconfigboard.h
@@ -0,0 +1,45 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 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.
+ */
+
+//Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "EInk Portal"
+#define MICROPY_HW_MCU_NAME         "ESP32S2"
+
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO1)
+
+#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
+
+#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
+
+#define AUTORESET_DELAY_MS 500
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO34)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO33)
+
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO36)
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO35)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO37)
diff --git a/ports/esp32s2/boards/adafruit_esp32s2_eink_portal/mpconfigboard.mk b/ports/esp32s2/boards/adafruit_esp32s2_eink_portal/mpconfigboard.mk
new file mode 100644
index 000000000..31aff57da
--- /dev/null
+++ b/ports/esp32s2/boards/adafruit_esp32s2_eink_portal/mpconfigboard.mk
@@ -0,0 +1,17 @@
+USB_VID = 0x239A
+USB_PID = 0x80E6
+USB_PRODUCT = "EInk Portal"
+USB_MANUFACTURER = "Adafruit"
+
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = MPZ
+
+# The default queue depth of 16 overflows on release builds,
+# so increase it to 32.
+CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
+
+CIRCUITPY_ESP_FLASH_MODE=dio
+CIRCUITPY_ESP_FLASH_FREQ=40m
+CIRCUITPY_ESP_FLASH_SIZE=4MB
+
+CIRCUITPY_MODULE=wrover
diff --git a/ports/esp32s2/boards/adafruit_esp32s2_eink_portal/pins.c b/ports/esp32s2/boards/adafruit_esp32s2_eink_portal/pins.c
new file mode 100644
index 000000000..2cf3d2402
--- /dev/null
+++ b/ports/esp32s2/boards/adafruit_esp32s2_eink_portal/pins.c
@@ -0,0 +1,39 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_AD1), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
+
+    { MP_ROM_QSTR(MP_QSTR_SPEAKER), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_SPEAKER_ENABLE), MP_ROM_PTR(&pin_GPIO16) },
+
+    { MP_ROM_QSTR(MP_QSTR_EPD_BUSY), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_EPD_RESET), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_EPD_DC), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_EPD_CS), MP_ROM_PTR(&pin_GPIO8) },
+
+    { MP_ROM_QSTR(MP_QSTR_BUTTON_A), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_BUTTON_B), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_BUTTON_C), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_BUTTON_D), MP_ROM_PTR(&pin_GPIO11) },
+
+    { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_GPIO2) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO34) },
+
+    { MP_ROM_QSTR(MP_QSTR_CS), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO37) },
+
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL_POWER), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
diff --git a/ports/esp32s2/boards/adafruit_esp32s2_eink_portal/sdkconfig b/ports/esp32s2/boards/adafruit_esp32s2_eink_portal/sdkconfig
new file mode 100644
index 000000000..9d8bbde96
--- /dev/null
+++ b/ports/esp32s2/boards/adafruit_esp32s2_eink_portal/sdkconfig
@@ -0,0 +1,33 @@
+CONFIG_ESP32S2_SPIRAM_SUPPORT=y
+
+#
+# SPI RAM config
+#
+# CONFIG_SPIRAM_TYPE_AUTO is not set
+CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
+CONFIG_SPIRAM_SIZE=2097152
+
+#
+# PSRAM clock and cs IO for ESP32S2
+#
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
+CONFIG_DEFAULT_PSRAM_CS_IO=26
+# end of PSRAM clock and cs IO for ESP32S2
+
+# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
+# CONFIG_SPIRAM_RODATA is not set
+# CONFIG_SPIRAM_SPEED_80M is not set
+CONFIG_SPIRAM_SPEED_40M=y
+# CONFIG_SPIRAM_SPEED_26M is not set
+# CONFIG_SPIRAM_SPEED_20M is not set
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
+CONFIG_SPIRAM_USE_MEMMAP=y
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_MEMTEST=y
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
+# end of SPI RAM config
-- 
cgit v1.2.3


From 95cb5961d26a4e1e048d48266d21547dc9229ba9 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Mon, 26 Oct 2020 16:58:56 -0700
Subject: Fix ESP32-S2 SPI when DMA is sometimes used

---
 ports/esp32s2/common-hal/busio/SPI.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/common-hal/busio/SPI.c b/ports/esp32s2/common-hal/busio/SPI.c
index 1906ca6f0..490419f34 100644
--- a/ports/esp32s2/common-hal/busio/SPI.c
+++ b/ports/esp32s2/common-hal/busio/SPI.c
@@ -357,6 +357,9 @@ bool common_hal_busio_spi_transfer(busio_spi_obj_t *self, const uint8_t *data_ou
     } else {
         hal->dma_enabled = 0;
         burst_length = sizeof(hal->hw->data_buf);
+        // When switching to non-DMA, we need to make sure DMA is off. Otherwise,
+        // the S2 will transmit zeroes instead of our data.
+        spi_ll_txdma_disable(hal->hw);
     }
 
     // This rounds up.
-- 
cgit v1.2.3


From 2ba66599670c0d3d0f5ef5dc8780c34cf9d61231 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Mon, 26 Oct 2020 19:07:37 -0500
Subject: esp32s2: Makefile: restore --no-stub

---
 ports/esp32s2/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/Makefile b/ports/esp32s2/Makefile
index 5d8ccad50..8d891edd0 100644
--- a/ports/esp32s2/Makefile
+++ b/ports/esp32s2/Makefile
@@ -331,10 +331,10 @@ $(BUILD)/firmware.uf2: $(BUILD)/circuitpython-firmware.bin
 	$(Q)$(PYTHON3) $(TOP)/tools/uf2/utils/uf2conv.py -f 0xbfdd4eee -b 0x0000 -c -o $@ $^
 
 flash: $(BUILD)/firmware.bin
-	esptool.py --chip esp32s2 -p $(PORT) -b 460800 --before=default_reset --after=hard_reset write_flash $(FLASH_FLAGS) 0x0000 $^
+	esptool.py --chip esp32s2 -p $(PORT) --no-stub -b 460800 --before=default_reset --after=hard_reset write_flash $(FLASH_FLAGS) 0x0000 $^
 
 flash-circuitpython-only: $(BUILD)/circuitpython-firmware.bin
-	esptool.py --chip esp32s2 -p $(PORT) -b 460800 --before=default_reset --after=hard_reset write_flash $(FLASH_FLAGS) 0x10000 $^
+	esptool.py --chip esp32s2 -p $(PORT) --no-stub -b 460800 --before=default_reset --after=hard_reset write_flash $(FLASH_FLAGS) 0x10000 $^
 
 include $(TOP)/py/mkrules.mk
 
-- 
cgit v1.2.3


From 3a501a04951849ddd83455706fe87a6950d051fe Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Mon, 26 Oct 2020 19:18:37 -0500
Subject: esp32s2: canio: respond to review comments

 * explain the introduction of the temporary variable in get_t_config
 * get rid of unneeded __attribute__
 * get rid of unneeded members of canio_can_obj_t
 * get rid of unneeded header inclusion
---
 ports/esp32s2/common-hal/canio/CAN.c | 14 ++++++--------
 ports/esp32s2/common-hal/canio/CAN.h |  3 ---
 2 files changed, 6 insertions(+), 11 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/common-hal/canio/CAN.c b/ports/esp32s2/common-hal/canio/CAN.c
index f1741969d..768fde243 100644
--- a/ports/esp32s2/common-hal/canio/CAN.c
+++ b/ports/esp32s2/common-hal/canio/CAN.c
@@ -33,7 +33,6 @@
 #include "shared-bindings/microcontroller/Pin.h"
 #include "shared-bindings/util.h"
 #include "supervisor/port.h"
-#include "hal/twai_ll.h"
 
 #include "hal/twai_types.h"
 
@@ -43,6 +42,10 @@ twai_timing_config_t get_t_config(int baudrate) {
     switch(baudrate) {
     case 1000000:
     {
+        // TWAI_TIMING_CONFIG_abc expands to a C designated initializer list
+        // { .brp = 4, ...}.  This is only acceptable to the compiler as an
+        // initializer and 'return TWAI_TIMING_CONFIG_1MBITS()` is not valid.
+        // Instead, introduce a temporary, named variable and return it.
         twai_timing_config_t t_config = TWAI_TIMING_CONFIG_1MBITS();
         return t_config;
     }
@@ -116,7 +119,6 @@ twai_timing_config_t get_t_config(int baudrate) {
     }
 }
 
-__attribute__((optimize("O0")))
 void common_hal_canio_can_construct(canio_can_obj_t *self, mcu_pin_obj_t *tx, mcu_pin_obj_t *rx, int baudrate, bool loopback, bool silent)
 {
 #define DIV_ROUND(a, b) (((a) + (b)/2) / (b))
@@ -129,7 +131,7 @@ void common_hal_canio_can_construct(canio_can_obj_t *self, mcu_pin_obj_t *tx, mc
         mp_raise_ValueError(translate("loopback + silent mode not supported by peripheral"));
     }
 
-    self->t_config = get_t_config(baudrate);;
+    twai_timing_config_t t_config = get_t_config(baudrate);
     twai_general_config_t g_config = TWAI_GENERAL_CONFIG_DEFAULT(-1, -1, TWAI_MODE_NORMAL);
     g_config.tx_io = tx->number;
     g_config.rx_io = rx->number;
@@ -139,14 +141,10 @@ void common_hal_canio_can_construct(canio_can_obj_t *self, mcu_pin_obj_t *tx, mc
     if (silent) {
         g_config.mode = TWAI_MODE_LISTEN_ONLY;
     }
-    self->g_config = g_config;
 
-    {
     twai_filter_config_t f_config = TWAI_FILTER_CONFIG_ACCEPT_ALL();
-    self->f_config = f_config;
-    }
 
-    esp_err_t result = twai_driver_install(&self->g_config, &self->t_config, &self->f_config);
+    esp_err_t result = twai_driver_install(&g_config, &t_config, &f_config);
     if (result == ESP_ERR_NO_MEM) {
         mp_raise_msg(&mp_type_MemoryError, translate("ESP-IDF memory allocation failed"));
     } else if (result == ESP_ERR_INVALID_ARG) {
diff --git a/ports/esp32s2/common-hal/canio/CAN.h b/ports/esp32s2/common-hal/canio/CAN.h
index e15d51590..85fb6972b 100644
--- a/ports/esp32s2/common-hal/canio/CAN.h
+++ b/ports/esp32s2/common-hal/canio/CAN.h
@@ -46,7 +46,4 @@ typedef struct canio_can_obj {
     bool silent:1;
     bool auto_restart:1;
     bool fifo_in_use:1;
-    twai_filter_config_t f_config;
-    twai_general_config_t g_config;
-    twai_timing_config_t t_config;
 } canio_can_obj_t;
-- 
cgit v1.2.3


From 5e3bfa1956ca4d327fcad23ce508ebbdaeac4d69 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Wed, 28 Oct 2020 20:08:25 +0530
Subject: countio implementation for esp32s2

---
 ports/esp32s2/common-hal/countio/Counter.c  | 69 +++++++++++++++++++++++++++++
 ports/esp32s2/common-hal/countio/Counter.h  | 15 +++++++
 ports/esp32s2/common-hal/countio/__init__.c |  1 +
 ports/esp32s2/mpconfigport.mk               |  2 +-
 4 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 ports/esp32s2/common-hal/countio/Counter.c
 create mode 100644 ports/esp32s2/common-hal/countio/Counter.h
 create mode 100644 ports/esp32s2/common-hal/countio/__init__.c

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/common-hal/countio/Counter.c b/ports/esp32s2/common-hal/countio/Counter.c
new file mode 100644
index 000000000..6a76a163d
--- /dev/null
+++ b/ports/esp32s2/common-hal/countio/Counter.c
@@ -0,0 +1,69 @@
+#include "common-hal/countio/Counter.h"
+
+#include "py/runtime.h"
+#include "supervisor/shared/translate.h"
+
+#include "driver/pcnt.h"
+
+static void pcnt_init(countio_counter_obj_t* self) {
+    int unit = PCNT_UNIT_0;
+    // Prepare configuration for the PCNT unit
+    pcnt_config_t pcnt_config = {
+        // Set PCNT input signal and control GPIOs
+        .pulse_gpio_num = self->pin->number,
+        .ctrl_gpio_num = PCNT_PIN_NOT_USED,
+        .channel = PCNT_CHANNEL_0,
+        .unit = unit,
+        // What to do on the positive / negative edge of pulse input?
+        .pos_mode = PCNT_COUNT_INC,   // Count up on the positive edge
+        .neg_mode = PCNT_COUNT_DIS,   // Keep the counter value on the negative edge
+    };
+    // Initialize PCNT unit
+    pcnt_unit_config(&pcnt_config);
+
+    // Configure and enable the input filter
+    pcnt_set_filter_value(unit, 100);
+    pcnt_filter_enable(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);
+}
+
+void common_hal_countio_counter_construct(countio_counter_obj_t* self,
+    const mcu_pin_obj_t* pin) {
+    claim_pin(pin);
+    self->pin = pin;
+    pcnt_init(self);
+}
+
+bool common_hal_countio_counter_deinited(countio_counter_obj_t* self) {
+    return self->pin == NULL;
+}
+
+void common_hal_countio_counter_deinit(countio_counter_obj_t* self) {
+    if (common_hal_countio_counter_deinited(self)) {
+        return;
+    }
+    reset_pin_number(self->pin->number);
+    self->pin = NULL;
+}
+
+mp_int_t common_hal_countio_counter_get_count(countio_counter_obj_t* self) {
+    int16_t count;
+    pcnt_get_counter_value(PCNT_UNIT_0, &count);
+    return count+self->count;
+}
+
+void common_hal_countio_counter_set_count(countio_counter_obj_t* self,
+        mp_int_t new_count) {
+    self->count = new_count;
+    pcnt_counter_clear(PCNT_UNIT_0);
+}
+
+void common_hal_countio_counter_reset(countio_counter_obj_t* self) {
+   common_hal_countio_counter_set_count(self, 0);
+}
diff --git a/ports/esp32s2/common-hal/countio/Counter.h b/ports/esp32s2/common-hal/countio/Counter.h
new file mode 100644
index 000000000..3406f9daa
--- /dev/null
+++ b/ports/esp32s2/common-hal/countio/Counter.h
@@ -0,0 +1,15 @@
+
+#ifndef MICROPY_INCLUDED_ESP32S2_COMMON_HAL_COUNTIO_COUNTER_H
+#define MICROPY_INCLUDED_ESP32S2_COMMON_HAL_COUNTIO_COUNTER_H
+
+#include "common-hal/microcontroller/Pin.h"
+
+#include "py/obj.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    const mcu_pin_obj_t * pin;
+    mp_int_t count;
+} countio_counter_obj_t;
+
+#endif // MICROPY_INCLUDED_ESP32S2_COMMON_HAL_COUNTIO_COUNT_H
diff --git a/ports/esp32s2/common-hal/countio/__init__.c b/ports/esp32s2/common-hal/countio/__init__.c
new file mode 100644
index 000000000..b95b20d15
--- /dev/null
+++ b/ports/esp32s2/common-hal/countio/__init__.c
@@ -0,0 +1 @@
+//No countio module functions
diff --git a/ports/esp32s2/mpconfigport.mk b/ports/esp32s2/mpconfigport.mk
index c06c89c90..bdb25a87b 100644
--- a/ports/esp32s2/mpconfigport.mk
+++ b/ports/esp32s2/mpconfigport.mk
@@ -17,7 +17,7 @@ CIRCUITPY_FULL_BUILD = 1
 CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_AUDIOIO = 0
 CIRCUITPY_CANIO = 1
-CIRCUITPY_COUNTIO = 0
+CIRCUITPY_COUNTIO = 1
 CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_ROTARYIO = 0
-- 
cgit v1.2.3


From 25bad660c6cfc0c697ad02da18d9b9e8c1d9053e Mon Sep 17 00:00:00 2001
From: lady ada <limor@ladyada.net>
Date: Wed, 28 Oct 2020 19:23:18 -0400
Subject: add light sensor, move batt monitor

---
 ports/esp32s2/boards/adafruit_esp32s2_eink_portal/pins.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/boards/adafruit_esp32s2_eink_portal/pins.c b/ports/esp32s2/boards/adafruit_esp32s2_eink_portal/pins.c
index 2cf3d2402..65bc3fb53 100644
--- a/ports/esp32s2/boards/adafruit_esp32s2_eink_portal/pins.c
+++ b/ports/esp32s2/boards/adafruit_esp32s2_eink_portal/pins.c
@@ -18,8 +18,10 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_BUTTON_C), MP_ROM_PTR(&pin_GPIO12) },
     { MP_ROM_QSTR(MP_QSTR_BUTTON_D), MP_ROM_PTR(&pin_GPIO11) },
 
-    { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO2) },
-    { MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_LIGHT), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_GPIO4) },
 
     { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO33) },
     { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO34) },
-- 
cgit v1.2.3


From 4438050f794edea5c6a3f919964908800dd6b522 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Sun, 1 Nov 2020 18:00:07 +0530
Subject: Add pcnt handler

---
 locale/circuitpython.pot                   |  9 +++-
 ports/esp32s2/Makefile                     |  1 +
 ports/esp32s2/common-hal/countio/Counter.c | 70 +++++++++++++++++-------------
 ports/esp32s2/common-hal/countio/Counter.h | 31 +++++++++++--
 ports/esp32s2/pcnt_handler.c               | 67 ++++++++++++++++++++++++++++
 ports/esp32s2/pcnt_handler.h               | 35 +++++++++++++++
 6 files changed, 177 insertions(+), 36 deletions(-)
 create mode 100644 ports/esp32s2/pcnt_handler.c
 create mode 100644 ports/esp32s2/pcnt_handler.h

(limited to 'ports/esp32s2')

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 16c3dd973..1336ab25c 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-10-21 20:13-0500\n"
+"POT-Creation-Date: 2020-11-01 11:11+0530\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1109,7 +1109,8 @@ msgid "Invalid phase"
 msgstr ""
 
 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
-#: ports/atmel-samd/common-hal/touchio/TouchIn.c shared-bindings/pwmio/PWMOut.c
+#: ports/atmel-samd/common-hal/touchio/TouchIn.c
+#: ports/esp32s2/common-hal/touchio/TouchIn.c shared-bindings/pwmio/PWMOut.c
 #: shared-module/rgbmatrix/RGBMatrix.c
 msgid "Invalid pin"
 msgstr ""
@@ -1271,6 +1272,10 @@ msgstr ""
 msgid "No MOSI Pin"
 msgstr ""
 
+#: ports/esp32s2/pcnt_handler.c
+msgid "No PCNT unit free"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/busio/UART.c
 #: ports/esp32s2/common-hal/busio/UART.c
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
diff --git a/ports/esp32s2/Makefile b/ports/esp32s2/Makefile
index 8d891edd0..6dbbf58d4 100644
--- a/ports/esp32s2/Makefile
+++ b/ports/esp32s2/Makefile
@@ -173,6 +173,7 @@ SRC_C += \
 	background.c \
 	fatfs_port.c \
 	mphalport.c \
+	pcnt_handler.c \
 	bindings/espidf/__init__.c \
 	boards/$(BOARD)/board.c \
 	boards/$(BOARD)/pins.c \
diff --git a/ports/esp32s2/common-hal/countio/Counter.c b/ports/esp32s2/common-hal/countio/Counter.c
index 6a76a163d..435762473 100644
--- a/ports/esp32s2/common-hal/countio/Counter.c
+++ b/ports/esp32s2/common-hal/countio/Counter.c
@@ -1,67 +1,75 @@
-#include "common-hal/countio/Counter.h"
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * 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
+ * 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 "py/runtime.h"
-#include "supervisor/shared/translate.h"
+#include "common-hal/countio/Counter.h"
+#include "common-hal/microcontroller/Pin.h"
 
-#include "driver/pcnt.h"
+void common_hal_countio_counter_construct(countio_counter_obj_t* self,
+    const mcu_pin_obj_t* pin) {
+    claim_pin(pin);
 
-static void pcnt_init(countio_counter_obj_t* self) {
-    int unit = PCNT_UNIT_0;
     // Prepare configuration for the PCNT unit
     pcnt_config_t pcnt_config = {
         // Set PCNT input signal and control GPIOs
-        .pulse_gpio_num = self->pin->number,
+        .pulse_gpio_num = pin->number,
         .ctrl_gpio_num = PCNT_PIN_NOT_USED,
         .channel = PCNT_CHANNEL_0,
-        .unit = unit,
         // What to do on the positive / negative edge of pulse input?
         .pos_mode = PCNT_COUNT_INC,   // Count up on the positive edge
         .neg_mode = PCNT_COUNT_DIS,   // Keep the counter value on the negative edge
     };
     // Initialize PCNT unit
-    pcnt_unit_config(&pcnt_config);
-
-    // Configure and enable the input filter
-    pcnt_set_filter_value(unit, 100);
-    pcnt_filter_enable(unit);
+    pcnt_handler_init(&pcnt_config);
 
-    // Initialize PCNT's counter
-    pcnt_counter_pause(unit);
-    pcnt_counter_clear(unit);
-
-    // Everything is set up, now go to counting
-    pcnt_counter_resume(unit);
-}
-
-void common_hal_countio_counter_construct(countio_counter_obj_t* self,
-    const mcu_pin_obj_t* pin) {
-    claim_pin(pin);
-    self->pin = pin;
-    pcnt_init(self);
+    self->pin = pin->number;
+    self->unit = pcnt_config.unit;
 }
 
 bool common_hal_countio_counter_deinited(countio_counter_obj_t* self) {
-    return self->pin == NULL;
+    return self->unit == PCNT_UNIT_MAX;
 }
 
 void common_hal_countio_counter_deinit(countio_counter_obj_t* self) {
     if (common_hal_countio_counter_deinited(self)) {
         return;
     }
-    reset_pin_number(self->pin->number);
-    self->pin = NULL;
+    reset_pin_number(self->pin);
+    pcnt_handler_deinit(&self->unit);
 }
 
 mp_int_t common_hal_countio_counter_get_count(countio_counter_obj_t* self) {
     int16_t count;
-    pcnt_get_counter_value(PCNT_UNIT_0, &count);
+    pcnt_get_counter_value(self->unit, &count);
     return count+self->count;
 }
 
 void common_hal_countio_counter_set_count(countio_counter_obj_t* self,
         mp_int_t new_count) {
     self->count = new_count;
-    pcnt_counter_clear(PCNT_UNIT_0);
+    pcnt_counter_clear(self->unit);
 }
 
 void common_hal_countio_counter_reset(countio_counter_obj_t* self) {
diff --git a/ports/esp32s2/common-hal/countio/Counter.h b/ports/esp32s2/common-hal/countio/Counter.h
index 3406f9daa..63d1eb98b 100644
--- a/ports/esp32s2/common-hal/countio/Counter.h
+++ b/ports/esp32s2/common-hal/countio/Counter.h
@@ -1,15 +1,40 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * 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
+ * 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_COUNTIO_COUNTER_H
 #define MICROPY_INCLUDED_ESP32S2_COMMON_HAL_COUNTIO_COUNTER_H
 
-#include "common-hal/microcontroller/Pin.h"
-
 #include "py/obj.h"
+#include "pcnt_handler.h"
 
 typedef struct {
     mp_obj_base_t base;
-    const mcu_pin_obj_t * pin;
+    uint8_t pin;
     mp_int_t count;
+    pcnt_unit_t unit;
 } countio_counter_obj_t;
 
 #endif // MICROPY_INCLUDED_ESP32S2_COMMON_HAL_COUNTIO_COUNT_H
diff --git a/ports/esp32s2/pcnt_handler.c b/ports/esp32s2/pcnt_handler.c
new file mode 100644
index 000000000..56fb0f21c
--- /dev/null
+++ b/ports/esp32s2/pcnt_handler.c
@@ -0,0 +1,67 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * 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
+ * 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 "pcnt_handler.h"
+
+#include "py/runtime.h"
+#include "supervisor/shared/translate.h"
+
+#define PCNT_UNIT_ACTIVE    1
+#define PCNT_UNIT_INACTIVE  0
+
+static uint8_t pcnt_state[4];
+
+void pcnt_handler_init(pcnt_config_t* pcnt_config) {
+    // Look for available pcnt unit
+    for (uint8_t i = 0; i<=3; i++) {
+        if (pcnt_state[i] == PCNT_UNIT_INACTIVE) {
+            pcnt_config->unit = (pcnt_unit_t)i;
+            pcnt_state[i] = PCNT_UNIT_ACTIVE;
+            break;
+        } else if (i == 3) {
+            mp_raise_RuntimeError(translate("No PCNT unit free"));
+        }
+    }
+
+    // Initialize PCNT unit
+    pcnt_unit_config(pcnt_config);
+
+    // Configure and enable the input filter
+    pcnt_set_filter_value(pcnt_config->unit, 100);
+    pcnt_filter_enable(pcnt_config->unit);
+
+    // Initialize PCNT's counter
+    pcnt_counter_pause(pcnt_config->unit);
+    pcnt_counter_clear(pcnt_config->unit);
+
+    // Everything is set up, now go to counting
+    pcnt_counter_resume(pcnt_config->unit);
+}
+
+void pcnt_handler_deinit(pcnt_unit_t* unit) {
+    pcnt_state[*unit] = PCNT_UNIT_INACTIVE;
+    *unit = PCNT_UNIT_MAX;
+}
diff --git a/ports/esp32s2/pcnt_handler.h b/ports/esp32s2/pcnt_handler.h
new file mode 100644
index 000000000..4bdaee1b8
--- /dev/null
+++ b/ports/esp32s2/pcnt_handler.h
@@ -0,0 +1,35 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * 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
+ * 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_PCNT_HANDLER_H
+#define MICROPY_INCLUDED_ESP32S2_PCNT_HANDLER_H
+
+#include "driver/pcnt.h"
+
+extern void pcnt_handler_init(pcnt_config_t* pcnt_config);
+extern void pcnt_handler_deinit(pcnt_unit_t* unit);
+
+#endif  // MICROPY_INCLUDED_ESP32S2_PCNT_HANDLER_H
-- 
cgit v1.2.3


From 23afe08b6f81b70e2f24c609e6c43b0682aaf30b Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Mon, 2 Nov 2020 17:15:19 -0500
Subject: Add GPIO reset to end of neopixel-write

---
 ports/esp32s2/common-hal/neopixel_write/__init__.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/common-hal/neopixel_write/__init__.c b/ports/esp32s2/common-hal/neopixel_write/__init__.c
index 553cb79f8..63d50bf14 100644
--- a/ports/esp32s2/common-hal/neopixel_write/__init__.c
+++ b/ports/esp32s2/common-hal/neopixel_write/__init__.c
@@ -125,4 +125,6 @@ void common_hal_neopixel_write (const digitalio_digitalinout_obj_t* digitalinout
 
     // Free channel again
     esp32s2_peripherals_free_rmt(config.channel);
+    // Swap pin back to GPIO mode
+    gpio_set_direction(digitalinout->pin->number, GPIO_MODE_OUTPUT);
 }
-- 
cgit v1.2.3


From 6c61a53e0fc7a2b56156551a7da07e8734e00a33 Mon Sep 17 00:00:00 2001
From: lady ada <limor@ladyada.net>
Date: Mon, 2 Nov 2020 18:38:23 -0500
Subject: io naming for gpio (credit to @kattni)

---
 ports/esp32s2/boards/adafruit_metro_esp32s2/pins.c | 60 ++++++++++++++--------
 1 file changed, 40 insertions(+), 20 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/boards/adafruit_metro_esp32s2/pins.c b/ports/esp32s2/boards/adafruit_metro_esp32s2/pins.c
index 08d2b2a1a..a7fc8b2d7 100644
--- a/ports/esp32s2/boards/adafruit_metro_esp32s2/pins.c
+++ b/ports/esp32s2/boards/adafruit_metro_esp32s2/pins.c
@@ -2,41 +2,61 @@
 
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
 
-    { MP_OBJ_NEW_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO5) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO5) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO6) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO6) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO7) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO8) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO9) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO10) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO11) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO12) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO13) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO14) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO15) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO16) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO21) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO42) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
 
     { MP_OBJ_NEW_QSTR(MP_QSTR_SDA),MP_ROM_PTR(&pin_GPIO33) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_IO33),MP_ROM_PTR(&pin_GPIO33) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_SCL),MP_ROM_PTR(&pin_GPIO34) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_IO34),MP_ROM_PTR(&pin_GPIO34) },
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) },
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_MOSI),MP_ROM_PTR(&pin_GPIO35) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_IO35),MP_ROM_PTR(&pin_GPIO35) },
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_MISO),MP_ROM_PTR(&pin_GPIO37) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_IO37),MP_ROM_PTR(&pin_GPIO37) },
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO42) },
 
     { MP_OBJ_NEW_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO45) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_IO45), MP_ROM_PTR(&pin_GPIO45) },
 
     { MP_OBJ_NEW_QSTR(MP_QSTR_DEBUG_RX), MP_ROM_PTR(&pin_GPIO38) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_DEBUG_TX), MP_ROM_PTR(&pin_GPIO37) },
 
-    { MP_OBJ_NEW_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO36) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_MOSI),MP_ROM_PTR(&pin_GPIO35) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_MISO),MP_ROM_PTR(&pin_GPIO37) },
-
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
     { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
     { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
-- 
cgit v1.2.3


From 18838e390a71366ccaa1aaeda8964e65d70fc43f Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Thu, 29 Oct 2020 19:38:25 -0700
Subject: reduce connection footprint and fix recv

---
 ports/esp32s2/common-hal/socketpool/Socket.c    | 22 ++++++++---------
 ports/esp32s2/esp-idf-config/sdkconfig.defaults | 33 ++++++++++++++++---------
 2 files changed, 31 insertions(+), 24 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/common-hal/socketpool/Socket.c b/ports/esp32s2/common-hal/socketpool/Socket.c
index 0a994c604..750415dc7 100644
--- a/ports/esp32s2/common-hal/socketpool/Socket.c
+++ b/ports/esp32s2/common-hal/socketpool/Socket.c
@@ -79,15 +79,15 @@ mp_uint_t common_hal_socketpool_socket_send(socketpool_socket_obj_t* self, const
 
 mp_uint_t common_hal_socketpool_socket_recv_into(socketpool_socket_obj_t* self, const uint8_t* buf, mp_uint_t len) {
     size_t received = 0;
-    ssize_t last_read = 1;
+    int status = 0;
     uint64_t start_ticks = supervisor_ticks_ms64();
     int sockfd;
     esp_err_t err = esp_tls_get_conn_sockfd(self->tcp, &sockfd);
     if (err != ESP_OK) {
         mp_raise_OSError(MP_EBADF);
     }
-    while (received < len &&
-           last_read > 0 &&
+    while (received == 0 &&
+           status >= 0 &&
            (self->timeout_ms == 0 || supervisor_ticks_ms64() - start_ticks <= self->timeout_ms) &&
            !mp_hal_is_interrupted()) {
         RUN_BACKGROUND_TASKS;
@@ -95,27 +95,25 @@ mp_uint_t common_hal_socketpool_socket_recv_into(socketpool_socket_obj_t* self,
         if (available == 0) {
             // This reads the raw socket buffer and is used for non-TLS connections
             // and between encrypted TLS blocks.
-            int status = lwip_ioctl(sockfd, FIONREAD, &available);
-            if (status < 0) {
-                last_read = status;
-                break;
-            }
+            status = lwip_ioctl(sockfd, FIONREAD, &available);
         }
         size_t remaining = len - received;
         if (available > remaining) {
             available = remaining;
         }
         if (available > 0) {
-            last_read = esp_tls_conn_read(self->tcp, (void*) buf + received, available);
-            received += last_read;
+            status = esp_tls_conn_read(self->tcp, (void*) buf + received, available);
+            if (status > 0) {
+                received += status;
+            }
         }
     }
 
-    if (last_read == 0) {
+    if (received == 0) {
         // socket closed
         common_hal_socketpool_socket_close(self);
     }
-    if (last_read < 0) {
+    if (status < 0) {
         mp_raise_BrokenPipeError();
     }
     return received;
diff --git a/ports/esp32s2/esp-idf-config/sdkconfig.defaults b/ports/esp32s2/esp-idf-config/sdkconfig.defaults
index 4094367e0..37b33fc69 100644
--- a/ports/esp32s2/esp-idf-config/sdkconfig.defaults
+++ b/ports/esp32s2/esp-idf-config/sdkconfig.defaults
@@ -135,6 +135,7 @@ CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y
 # CONFIG_COMPILER_STACK_CHECK_MODE_ALL is not set
 # CONFIG_COMPILER_WARN_WRITE_STRINGS is not set
 # CONFIG_COMPILER_DISABLE_GCC8_WARNINGS is not set
+# CONFIG_COMPILER_DUMP_RTL_FILES is not set
 # end of Compiler options
 
 #
@@ -332,12 +333,13 @@ CONFIG_ESP_TIMER_IMPL_SYSTIMER=y
 #
 # Wi-Fi
 #
-CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=10
-CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32
+CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=4
+CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=8
 # CONFIG_ESP32_WIFI_STATIC_TX_BUFFER is not set
 CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y
 CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=1
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=32
+CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=16
+CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=16
 # CONFIG_ESP32_WIFI_CSI_ENABLED is not set
 CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
 CONFIG_ESP32_WIFI_TX_BA_WIN=6
@@ -439,7 +441,7 @@ CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y
 # CONFIG_LWIP_L2_TO_L3_COPY is not set
 # CONFIG_LWIP_IRAM_OPTIMIZATION is not set
 CONFIG_LWIP_TIMERS_ONDEMAND=y
-CONFIG_LWIP_MAX_SOCKETS=10
+CONFIG_LWIP_MAX_SOCKETS=4
 # CONFIG_LWIP_USE_ONLY_LWIP_SELECT is not set
 # CONFIG_LWIP_SO_LINGER is not set
 CONFIG_LWIP_SO_REUSE=y
@@ -459,6 +461,9 @@ CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32
 CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y
 # CONFIG_LWIP_DHCP_RESTORE_LAST_IP is not set
 
+#
+# CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH is not set
+
 #
 # DHCP server
 #
@@ -474,15 +479,15 @@ CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8
 #
 # TCP
 #
-CONFIG_LWIP_MAX_ACTIVE_TCP=16
-CONFIG_LWIP_MAX_LISTENING_TCP=16
+CONFIG_LWIP_MAX_ACTIVE_TCP=4
+CONFIG_LWIP_MAX_LISTENING_TCP=4
 CONFIG_LWIP_TCP_MAXRTX=12
 CONFIG_LWIP_TCP_SYNMAXRTX=6
 CONFIG_LWIP_TCP_MSS=1440
 CONFIG_LWIP_TCP_TMR_INTERVAL=250
 CONFIG_LWIP_TCP_MSL=60000
-CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5744
-CONFIG_LWIP_TCP_WND_DEFAULT=5744
+CONFIG_LWIP_TCP_SND_BUF_DEFAULT=2880
+CONFIG_LWIP_TCP_WND_DEFAULT=2880
 CONFIG_LWIP_TCP_RECVMBOX_SIZE=6
 CONFIG_LWIP_TCP_QUEUE_OOSEQ=y
 # CONFIG_LWIP_TCP_SACK_OUT is not set
@@ -505,6 +510,8 @@ CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y
 # CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0 is not set
 CONFIG_LWIP_TCPIP_TASK_AFFINITY=0x7FFFFFFF
 # CONFIG_LWIP_PPP_SUPPORT is not set
+CONFIG_LWIP_IPV6_MEMP_NUM_ND6_QUEUE=3
+CONFIG_LWIP_IPV6_ND6_NUM_NEIGHBORS=5
 # CONFIG_LWIP_SLIP_SUPPORT is not set
 
 #
@@ -552,8 +559,10 @@ CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=y
 # CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC is not set
 CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y
 CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=16384
-CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=4096
-# CONFIG_MBEDTLS_DYNAMIC_BUFFER is not set
+CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=2048
+CONFIG_MBEDTLS_DYNAMIC_BUFFER=y
+CONFIG_MBEDTLS_DYNAMIC_FREE_PEER_CERT=y
+CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA=y
 # CONFIG_MBEDTLS_DEBUG is not set
 
 #
@@ -824,8 +833,8 @@ CONFIG_TCP_MAXRTX=12
 CONFIG_TCP_SYNMAXRTX=6
 CONFIG_TCP_MSS=1440
 CONFIG_TCP_MSL=60000
-CONFIG_TCP_SND_BUF_DEFAULT=5744
-CONFIG_TCP_WND_DEFAULT=5744
+CONFIG_TCP_SND_BUF_DEFAULT=2880
+CONFIG_TCP_WND_DEFAULT=2880
 CONFIG_TCP_RECVMBOX_SIZE=6
 CONFIG_TCP_QUEUE_OOSEQ=y
 # CONFIG_ESP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES is not set
-- 
cgit v1.2.3


From 7441344c6f29d9dbf7f8cedef55f394c42916963 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Mon, 2 Nov 2020 17:22:24 -0800
Subject: Add new config options to default

---
 ports/esp32s2/esp-idf-config/sdkconfig.defaults | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/esp-idf-config/sdkconfig.defaults b/ports/esp32s2/esp-idf-config/sdkconfig.defaults
index 37b33fc69..025b05caa 100644
--- a/ports/esp32s2/esp-idf-config/sdkconfig.defaults
+++ b/ports/esp32s2/esp-idf-config/sdkconfig.defaults
@@ -264,6 +264,11 @@ CONFIG_ESP32S2_ALLOW_RTC_FAST_MEM_AS_HEAP=y
 # CONFIG_PM_ENABLE is not set
 # end of Power Management
 
+#
+# ADC-Calibration
+#
+# end of ADC-Calibration
+
 #
 # Common ESP-related
 #
@@ -403,6 +408,7 @@ CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0
 # CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS is not set
 CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y
 # CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE is not set
+# CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH is not set
 CONFIG_FREERTOS_DEBUG_OCDAWARE=y
 # end of FreeRTOS
 
@@ -715,6 +721,7 @@ CONFIG_SPI_FLASH_YIELD_DURING_ERASE=y
 CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=20
 CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=1
 CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=8192
+# CONFIG_SPI_FLASH_SIZE_OVERRIDE is not set
 
 #
 # Auto-detect flash chips
-- 
cgit v1.2.3


From c4521287e39abf92f1833a25f950aa5bd8e4857c Mon Sep 17 00:00:00 2001
From: lady ada <limor@ladyada.net>
Date: Mon, 2 Nov 2020 23:22:53 -0500
Subject: add rx/tx default uart names

---
 ports/esp32s2/boards/adafruit_metro_esp32s2/pins.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/boards/adafruit_metro_esp32s2/pins.c b/ports/esp32s2/boards/adafruit_metro_esp32s2/pins.c
index a7fc8b2d7..dbd6cfef8 100644
--- a/ports/esp32s2/boards/adafruit_metro_esp32s2/pins.c
+++ b/ports/esp32s2/boards/adafruit_metro_esp32s2/pins.c
@@ -19,8 +19,12 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO4) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
 
+    { MP_OBJ_NEW_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO5) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO6) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
-- 
cgit v1.2.3


From 4055c5ac61f824f7f2cfd72e670037af2f601427 Mon Sep 17 00:00:00 2001
From: Ed Hagerty <ed@hagerty.net>
Date: Tue, 3 Nov 2020 17:14:58 +0000
Subject: Update README.md

---
 ports/esp32s2/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/README.md b/ports/esp32s2/README.md
index f3e678de8..0738d520e 100644
--- a/ports/esp32s2/README.md
+++ b/ports/esp32s2/README.md
@@ -30,7 +30,7 @@ Connect these pins using a [USB adapter](https://www.adafruit.com/product/4090)
 
 ## Building and flashing ##
 
-Before building or flashing the ESP32-S2, you must [install the esp-idf](https://docs.espressif.com/projects/esp-idf/en/latest/esp32s2/get-started/index.html). This must be re-done ever time the esp-idf is updated, but not every time you build. Run `cd ports/esp32s2` from `circuitpython/` to move to the esp32s2 port root, and run:
+Before building or flashing the ESP32-S2, you must [install the esp-idf](https://docs.espressif.com/projects/esp-idf/en/latest/esp32s2/get-started/index.html). This must be re-done every time the esp-idf is updated, but not every time you build. Run `cd ports/esp32s2` from `circuitpython/` to move to the esp32s2 port root, and run:
 
 ```
 ./esp-idf/install.sh
-- 
cgit v1.2.3


From fe6bfde590fc325c984c679825024241afd23a5f Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Wed, 4 Nov 2020 21:20:24 +0530
Subject: move pcnt handler

---
 locale/circuitpython.pot                 | 10 ++---
 ports/esp32s2/Makefile                   |  2 +-
 ports/esp32s2/pcnt_handler.c             | 67 --------------------------------
 ports/esp32s2/pcnt_handler.h             | 35 -----------------
 ports/esp32s2/peripherals/pcnt_handler.c | 67 ++++++++++++++++++++++++++++++++
 ports/esp32s2/peripherals/pcnt_handler.h | 35 +++++++++++++++++
 6 files changed, 108 insertions(+), 108 deletions(-)
 delete mode 100644 ports/esp32s2/pcnt_handler.c
 delete mode 100644 ports/esp32s2/pcnt_handler.h
 create mode 100644 ports/esp32s2/peripherals/pcnt_handler.c
 create mode 100644 ports/esp32s2/peripherals/pcnt_handler.h

(limited to 'ports/esp32s2')

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 1336ab25c..b4445abfb 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-01 11:11+0530\n"
+"POT-Creation-Date: 2020-11-04 21:18+0530\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -296,6 +296,10 @@ msgstr ""
 msgid "All I2C peripherals are in use"
 msgstr ""
 
+#: ports/esp32s2/peripherals/pcnt_handler.c
+msgid "All PCNT units in use"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/canio/Listener.c
 #: ports/esp32s2/common-hal/canio/Listener.c
 #: ports/stm/common-hal/canio/Listener.c
@@ -1272,10 +1276,6 @@ msgstr ""
 msgid "No MOSI Pin"
 msgstr ""
 
-#: ports/esp32s2/pcnt_handler.c
-msgid "No PCNT unit free"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/busio/UART.c
 #: ports/esp32s2/common-hal/busio/UART.c
 #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
diff --git a/ports/esp32s2/Makefile b/ports/esp32s2/Makefile
index 6dbbf58d4..56f0d46a3 100644
--- a/ports/esp32s2/Makefile
+++ b/ports/esp32s2/Makefile
@@ -173,7 +173,6 @@ SRC_C += \
 	background.c \
 	fatfs_port.c \
 	mphalport.c \
-	pcnt_handler.c \
 	bindings/espidf/__init__.c \
 	boards/$(BOARD)/board.c \
 	boards/$(BOARD)/pins.c \
@@ -189,6 +188,7 @@ SRC_C += \
 	lib/utils/pyexec.c \
 	lib/utils/stdout_helpers.c \
 	lib/utils/sys_stdio_mphal.c \
+	peripherals/pcnt_handler.c \
 	peripherals/pins.c \
 	peripherals/rmt.c \
 	supervisor/shared/memory.c
diff --git a/ports/esp32s2/pcnt_handler.c b/ports/esp32s2/pcnt_handler.c
deleted file mode 100644
index 56fb0f21c..000000000
--- a/ports/esp32s2/pcnt_handler.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * 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
- * 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 "pcnt_handler.h"
-
-#include "py/runtime.h"
-#include "supervisor/shared/translate.h"
-
-#define PCNT_UNIT_ACTIVE    1
-#define PCNT_UNIT_INACTIVE  0
-
-static uint8_t pcnt_state[4];
-
-void pcnt_handler_init(pcnt_config_t* pcnt_config) {
-    // Look for available pcnt unit
-    for (uint8_t i = 0; i<=3; i++) {
-        if (pcnt_state[i] == PCNT_UNIT_INACTIVE) {
-            pcnt_config->unit = (pcnt_unit_t)i;
-            pcnt_state[i] = PCNT_UNIT_ACTIVE;
-            break;
-        } else if (i == 3) {
-            mp_raise_RuntimeError(translate("No PCNT unit free"));
-        }
-    }
-
-    // Initialize PCNT unit
-    pcnt_unit_config(pcnt_config);
-
-    // Configure and enable the input filter
-    pcnt_set_filter_value(pcnt_config->unit, 100);
-    pcnt_filter_enable(pcnt_config->unit);
-
-    // Initialize PCNT's counter
-    pcnt_counter_pause(pcnt_config->unit);
-    pcnt_counter_clear(pcnt_config->unit);
-
-    // Everything is set up, now go to counting
-    pcnt_counter_resume(pcnt_config->unit);
-}
-
-void pcnt_handler_deinit(pcnt_unit_t* unit) {
-    pcnt_state[*unit] = PCNT_UNIT_INACTIVE;
-    *unit = PCNT_UNIT_MAX;
-}
diff --git a/ports/esp32s2/pcnt_handler.h b/ports/esp32s2/pcnt_handler.h
deleted file mode 100644
index 4bdaee1b8..000000000
--- a/ports/esp32s2/pcnt_handler.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * 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
- * 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_PCNT_HANDLER_H
-#define MICROPY_INCLUDED_ESP32S2_PCNT_HANDLER_H
-
-#include "driver/pcnt.h"
-
-extern void pcnt_handler_init(pcnt_config_t* pcnt_config);
-extern void pcnt_handler_deinit(pcnt_unit_t* unit);
-
-#endif  // MICROPY_INCLUDED_ESP32S2_PCNT_HANDLER_H
diff --git a/ports/esp32s2/peripherals/pcnt_handler.c b/ports/esp32s2/peripherals/pcnt_handler.c
new file mode 100644
index 000000000..5a0cc9a7c
--- /dev/null
+++ b/ports/esp32s2/peripherals/pcnt_handler.c
@@ -0,0 +1,67 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * 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
+ * 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 "pcnt_handler.h"
+
+#include "py/runtime.h"
+#include "supervisor/shared/translate.h"
+
+#define PCNT_UNIT_ACTIVE    1
+#define PCNT_UNIT_INACTIVE  0
+
+static uint8_t pcnt_state[4];
+
+void pcnt_handler_init(pcnt_config_t* pcnt_config) {
+    // Look for available pcnt unit
+    for (uint8_t i = 0; i<=3; i++) {
+        if (pcnt_state[i] == PCNT_UNIT_INACTIVE) {
+            pcnt_config->unit = (pcnt_unit_t)i;
+            pcnt_state[i] = PCNT_UNIT_ACTIVE;
+            break;
+        } else if (i == 3) {
+            mp_raise_RuntimeError(translate("All PCNT units in use"));
+        }
+    }
+
+    // Initialize PCNT unit
+    pcnt_unit_config(pcnt_config);
+
+    // Configure and enable the input filter
+    pcnt_set_filter_value(pcnt_config->unit, 100);
+    pcnt_filter_enable(pcnt_config->unit);
+
+    // Initialize PCNT's counter
+    pcnt_counter_pause(pcnt_config->unit);
+    pcnt_counter_clear(pcnt_config->unit);
+
+    // Everything is set up, now go to counting
+    pcnt_counter_resume(pcnt_config->unit);
+}
+
+void pcnt_handler_deinit(pcnt_unit_t* unit) {
+    pcnt_state[*unit] = PCNT_UNIT_INACTIVE;
+    *unit = PCNT_UNIT_MAX;
+}
diff --git a/ports/esp32s2/peripherals/pcnt_handler.h b/ports/esp32s2/peripherals/pcnt_handler.h
new file mode 100644
index 000000000..f44ee1f83
--- /dev/null
+++ b/ports/esp32s2/peripherals/pcnt_handler.h
@@ -0,0 +1,35 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * 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
+ * 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_PERIPHERALS_PCNT_HANDLER_H
+#define MICROPY_INCLUDED_ESP32S2_PERIPHERALS_PCNT_HANDLER_H
+
+#include "driver/pcnt.h"
+
+extern void pcnt_handler_init(pcnt_config_t* pcnt_config);
+extern void pcnt_handler_deinit(pcnt_unit_t* unit);
+
+#endif  // MICROPY_INCLUDED_ESP32S2_PERIPHERALS_PCNT_HANDLER_H
-- 
cgit v1.2.3


From d8ef9a127b4914f7d9b50131c15e653aef94cb8f Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Thu, 5 Nov 2020 10:10:39 +0530
Subject: rename pcnt_handler to pcnt

---
 ports/esp32s2/Makefile                     |  2 +-
 ports/esp32s2/common-hal/countio/Counter.c |  5 ++-
 ports/esp32s2/common-hal/countio/Counter.h |  2 +-
 ports/esp32s2/peripherals/pcnt.c           | 67 ++++++++++++++++++++++++++++++
 ports/esp32s2/peripherals/pcnt.h           | 35 ++++++++++++++++
 ports/esp32s2/peripherals/pcnt_handler.c   | 67 ------------------------------
 ports/esp32s2/peripherals/pcnt_handler.h   | 35 ----------------
 7 files changed, 107 insertions(+), 106 deletions(-)
 create mode 100644 ports/esp32s2/peripherals/pcnt.c
 create mode 100644 ports/esp32s2/peripherals/pcnt.h
 delete mode 100644 ports/esp32s2/peripherals/pcnt_handler.c
 delete mode 100644 ports/esp32s2/peripherals/pcnt_handler.h

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/Makefile b/ports/esp32s2/Makefile
index 56f0d46a3..55d6e91d4 100644
--- a/ports/esp32s2/Makefile
+++ b/ports/esp32s2/Makefile
@@ -188,7 +188,7 @@ SRC_C += \
 	lib/utils/pyexec.c \
 	lib/utils/stdout_helpers.c \
 	lib/utils/sys_stdio_mphal.c \
-	peripherals/pcnt_handler.c \
+	peripherals/pcnt.c \
 	peripherals/pins.c \
 	peripherals/rmt.c \
 	supervisor/shared/memory.c
diff --git a/ports/esp32s2/common-hal/countio/Counter.c b/ports/esp32s2/common-hal/countio/Counter.c
index 435762473..81f9f7ad2 100644
--- a/ports/esp32s2/common-hal/countio/Counter.c
+++ b/ports/esp32s2/common-hal/countio/Counter.c
@@ -42,7 +42,8 @@ void common_hal_countio_counter_construct(countio_counter_obj_t* self,
         .neg_mode = PCNT_COUNT_DIS,   // Keep the counter value on the negative edge
     };
     // Initialize PCNT unit
-    pcnt_handler_init(&pcnt_config);
+    // This also sets pcnt_config.unit
+    peripherals_pcnt_init(&pcnt_config);
 
     self->pin = pin->number;
     self->unit = pcnt_config.unit;
@@ -57,7 +58,7 @@ void common_hal_countio_counter_deinit(countio_counter_obj_t* self) {
         return;
     }
     reset_pin_number(self->pin);
-    pcnt_handler_deinit(&self->unit);
+    peripherals_pcnt_deinit(&self->unit);
 }
 
 mp_int_t common_hal_countio_counter_get_count(countio_counter_obj_t* self) {
diff --git a/ports/esp32s2/common-hal/countio/Counter.h b/ports/esp32s2/common-hal/countio/Counter.h
index 63d1eb98b..20fe5b83e 100644
--- a/ports/esp32s2/common-hal/countio/Counter.h
+++ b/ports/esp32s2/common-hal/countio/Counter.h
@@ -28,7 +28,7 @@
 #define MICROPY_INCLUDED_ESP32S2_COMMON_HAL_COUNTIO_COUNTER_H
 
 #include "py/obj.h"
-#include "pcnt_handler.h"
+#include "peripherals/pcnt.h"
 
 typedef struct {
     mp_obj_base_t base;
diff --git a/ports/esp32s2/peripherals/pcnt.c b/ports/esp32s2/peripherals/pcnt.c
new file mode 100644
index 000000000..e7eb32c1d
--- /dev/null
+++ b/ports/esp32s2/peripherals/pcnt.c
@@ -0,0 +1,67 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * 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
+ * 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 "peripherals/pcnt.h"
+
+#include "py/runtime.h"
+#include "supervisor/shared/translate.h"
+
+#define PCNT_UNIT_ACTIVE    1
+#define PCNT_UNIT_INACTIVE  0
+
+static uint8_t pcnt_state[4];
+
+void peripherals_pcnt_init(pcnt_config_t* pcnt_config) {
+    // Look for available pcnt unit
+    for (uint8_t i = 0; i<=3; i++) {
+        if (pcnt_state[i] == PCNT_UNIT_INACTIVE) {
+            pcnt_config->unit = (pcnt_unit_t)i;
+            pcnt_state[i] = PCNT_UNIT_ACTIVE;
+            break;
+        } else if (i == 3) {
+            mp_raise_RuntimeError(translate("All PCNT units in use"));
+        }
+    }
+
+    // Initialize PCNT unit
+    pcnt_unit_config(pcnt_config);
+
+    // Configure and enable the input filter
+    pcnt_set_filter_value(pcnt_config->unit, 100);
+    pcnt_filter_enable(pcnt_config->unit);
+
+    // Initialize PCNT's counter
+    pcnt_counter_pause(pcnt_config->unit);
+    pcnt_counter_clear(pcnt_config->unit);
+
+    // Everything is set up, now go to counting
+    pcnt_counter_resume(pcnt_config->unit);
+}
+
+void peripherals_pcnt_deinit(pcnt_unit_t* unit) {
+    pcnt_state[*unit] = PCNT_UNIT_INACTIVE;
+    *unit = PCNT_UNIT_MAX;
+}
diff --git a/ports/esp32s2/peripherals/pcnt.h b/ports/esp32s2/peripherals/pcnt.h
new file mode 100644
index 000000000..64072501c
--- /dev/null
+++ b/ports/esp32s2/peripherals/pcnt.h
@@ -0,0 +1,35 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * 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
+ * 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_PERIPHERALS_PCNT_HANDLER_H
+#define MICROPY_INCLUDED_ESP32S2_PERIPHERALS_PCNT_HANDLER_H
+
+#include "driver/pcnt.h"
+
+extern void peripherals_pcnt_init(pcnt_config_t* pcnt_config);
+extern void peripherals_pcnt_deinit(pcnt_unit_t* unit);
+
+#endif  // MICROPY_INCLUDED_ESP32S2_PERIPHERALS_PCNT_HANDLER_H
diff --git a/ports/esp32s2/peripherals/pcnt_handler.c b/ports/esp32s2/peripherals/pcnt_handler.c
deleted file mode 100644
index 5a0cc9a7c..000000000
--- a/ports/esp32s2/peripherals/pcnt_handler.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * 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
- * 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 "pcnt_handler.h"
-
-#include "py/runtime.h"
-#include "supervisor/shared/translate.h"
-
-#define PCNT_UNIT_ACTIVE    1
-#define PCNT_UNIT_INACTIVE  0
-
-static uint8_t pcnt_state[4];
-
-void pcnt_handler_init(pcnt_config_t* pcnt_config) {
-    // Look for available pcnt unit
-    for (uint8_t i = 0; i<=3; i++) {
-        if (pcnt_state[i] == PCNT_UNIT_INACTIVE) {
-            pcnt_config->unit = (pcnt_unit_t)i;
-            pcnt_state[i] = PCNT_UNIT_ACTIVE;
-            break;
-        } else if (i == 3) {
-            mp_raise_RuntimeError(translate("All PCNT units in use"));
-        }
-    }
-
-    // Initialize PCNT unit
-    pcnt_unit_config(pcnt_config);
-
-    // Configure and enable the input filter
-    pcnt_set_filter_value(pcnt_config->unit, 100);
-    pcnt_filter_enable(pcnt_config->unit);
-
-    // Initialize PCNT's counter
-    pcnt_counter_pause(pcnt_config->unit);
-    pcnt_counter_clear(pcnt_config->unit);
-
-    // Everything is set up, now go to counting
-    pcnt_counter_resume(pcnt_config->unit);
-}
-
-void pcnt_handler_deinit(pcnt_unit_t* unit) {
-    pcnt_state[*unit] = PCNT_UNIT_INACTIVE;
-    *unit = PCNT_UNIT_MAX;
-}
diff --git a/ports/esp32s2/peripherals/pcnt_handler.h b/ports/esp32s2/peripherals/pcnt_handler.h
deleted file mode 100644
index f44ee1f83..000000000
--- a/ports/esp32s2/peripherals/pcnt_handler.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * 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
- * 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_PERIPHERALS_PCNT_HANDLER_H
-#define MICROPY_INCLUDED_ESP32S2_PERIPHERALS_PCNT_HANDLER_H
-
-#include "driver/pcnt.h"
-
-extern void pcnt_handler_init(pcnt_config_t* pcnt_config);
-extern void pcnt_handler_deinit(pcnt_unit_t* unit);
-
-#endif  // MICROPY_INCLUDED_ESP32S2_PERIPHERALS_PCNT_HANDLER_H
-- 
cgit v1.2.3


From ac8a0faa0d64fd07af65a798c7e1fc5ce4e39df2 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Fri, 6 Nov 2020 01:42:20 +0530
Subject: update peripherals_pcnt_init()

---
 ports/esp32s2/common-hal/countio/Counter.c | 14 ++++++++++----
 ports/esp32s2/peripherals/pcnt.c           | 23 +++++++++++------------
 ports/esp32s2/peripherals/pcnt.h           |  2 +-
 3 files changed, 22 insertions(+), 17 deletions(-)

(limited to 'ports/esp32s2')

diff --git a/ports/esp32s2/common-hal/countio/Counter.c b/ports/esp32s2/common-hal/countio/Counter.c
index 81f9f7ad2..fe52d93ad 100644
--- a/ports/esp32s2/common-hal/countio/Counter.c
+++ b/ports/esp32s2/common-hal/countio/Counter.c
@@ -27,12 +27,15 @@
 #include "common-hal/countio/Counter.h"
 #include "common-hal/microcontroller/Pin.h"
 
+#include "py/runtime.h"
+#include "supervisor/shared/translate.h"
+
 void common_hal_countio_counter_construct(countio_counter_obj_t* self,
     const mcu_pin_obj_t* pin) {
     claim_pin(pin);
 
     // 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 = pin->number,
         .ctrl_gpio_num = PCNT_PIN_NOT_USED,
@@ -41,12 +44,15 @@ void common_hal_countio_counter_construct(countio_counter_obj_t* self,
         .pos_mode = PCNT_COUNT_INC,   // Count up on the positive edge
         .neg_mode = PCNT_COUNT_DIS,   // Keep the counter value on the negative edge
     };
+
     // Initialize PCNT unit
-    // This also sets pcnt_config.unit
-    peripherals_pcnt_init(&pcnt_config);
+    const int8_t unit = peripherals_pcnt_init(pcnt_config);
+    if (unit == -1) {
+        mp_raise_RuntimeError(translate("All PCNT units in use"));
+    }
 
     self->pin = pin->number;
-    self->unit = pcnt_config.unit;
+    self->unit = (pcnt_unit_t)unit;
 }
 
 bool common_hal_countio_counter_deinited(countio_counter_obj_t* self) {
diff --git a/ports/esp32s2/peripherals/pcnt.c b/ports/esp32s2/peripherals/pcnt.c
index e7eb32c1d..555a0ec1d 100644
--- a/ports/esp32s2/peripherals/pcnt.c
+++ b/ports/esp32s2/peripherals/pcnt.c
@@ -26,39 +26,38 @@
 
 #include "peripherals/pcnt.h"
 
-#include "py/runtime.h"
-#include "supervisor/shared/translate.h"
-
 #define PCNT_UNIT_ACTIVE    1
 #define PCNT_UNIT_INACTIVE  0
 
 static uint8_t pcnt_state[4];
 
-void peripherals_pcnt_init(pcnt_config_t* pcnt_config) {
+int peripherals_pcnt_init(pcnt_config_t pcnt_config) {
     // Look for available pcnt unit
     for (uint8_t i = 0; i<=3; i++) {
         if (pcnt_state[i] == PCNT_UNIT_INACTIVE) {
-            pcnt_config->unit = (pcnt_unit_t)i;
+            pcnt_config.unit = (pcnt_unit_t)i;
             pcnt_state[i] = PCNT_UNIT_ACTIVE;
             break;
         } else if (i == 3) {
-            mp_raise_RuntimeError(translate("All PCNT units in use"));
+            return -1;
         }
     }
 
     // Initialize PCNT unit
-    pcnt_unit_config(pcnt_config);
+    pcnt_unit_config(&pcnt_config);
 
     // Configure and enable the input filter
-    pcnt_set_filter_value(pcnt_config->unit, 100);
-    pcnt_filter_enable(pcnt_config->unit);
+    pcnt_set_filter_value(pcnt_config.unit, 100);
+    pcnt_filter_enable(pcnt_config.unit);
 
     // Initialize PCNT's counter
-    pcnt_counter_pause(pcnt_config->unit);
-    pcnt_counter_clear(pcnt_config->unit);
+    pcnt_counter_pause(pcnt_config.unit);
+    pcnt_counter_clear(pcnt_config.unit);
 
     // Everything is set up, now go to counting
-    pcnt_counter_resume(pcnt_config->unit);
+    pcnt_counter_resume(pcnt_config.unit);
+
+    return pcnt_config.unit;
 }
 
 void peripherals_pcnt_deinit(pcnt_unit_t* unit) {
diff --git a/ports/esp32s2/peripherals/pcnt.h b/ports/esp32s2/peripherals/pcnt.h
index 64072501c..abed80fd0 100644
--- a/ports/esp32s2/peripherals/pcnt.h
+++ b/ports/esp32s2/peripherals/pcnt.h
@@ -29,7 +29,7 @@
 
 #include "driver/pcnt.h"
 
-extern void peripherals_pcnt_init(pcnt_config_t* pcnt_config);
+extern int peripherals_pcnt_init(pcnt_config_t pcnt_config);
 extern void peripherals_pcnt_deinit(pcnt_unit_t* unit);
 
 #endif  // MICROPY_INCLUDED_ESP32S2_PERIPHERALS_PCNT_HANDLER_H
-- 
cgit v1.2.3