From fd4695d0f20dbc5995fa7bd43c1af75b18ff2237 Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Wed, 6 Apr 2022 14:20:28 -0700
Subject: [PATCH 01/19] Gettting started with pin mapping.

---
 ports/espressif/boards/lolin_c3_mini/board.c  | 48 ++++++++++
 .../boards/lolin_c3_mini/mpconfigboard.h      | 37 ++++++++
 .../boards/lolin_c3_mini/mpconfigboard.mk     | 21 +++++
 ports/espressif/boards/lolin_c3_mini/pins.c   | 91 +++++++++++++++++++
 .../espressif/boards/lolin_c3_mini/sdkconfig  | 37 ++++++++
 5 files changed, 234 insertions(+)
 create mode 100644 ports/espressif/boards/lolin_c3_mini/board.c
 create mode 100644 ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 create mode 100644 ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
 create mode 100644 ports/espressif/boards/lolin_c3_mini/pins.c
 create mode 100644 ports/espressif/boards/lolin_c3_mini/sdkconfig

diff --git a/ports/espressif/boards/lolin_c3_mini/board.c b/ports/espressif/boards/lolin_c3_mini/board.c
new file mode 100644
index 0000000000..0432485111
--- /dev/null
+++ b/ports/espressif/boards/lolin_c3_mini/board.c
@@ -0,0 +1,48 @@
+/*
+ * 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 "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
+
+void board_init(void) {
+    // Debug UART
+    #ifdef DEBUG
+    common_hal_never_reset_pin(&pin_GPIO43);
+    common_hal_never_reset_pin(&pin_GPIO44);
+    #endif /* DEBUG */
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+
+}
+
+void board_deinit(void) {
+}
diff --git a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
new file mode 100644
index 0000000000..12b0826e5c
--- /dev/null
+++ b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
@@ -0,0 +1,37 @@
+/*
+ * 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       "LOLIN_C3_MINI" // from Wemos MP
+#define MICROPY_HW_MCU_NAME         "ESP32-C3FH4" // from Wemos MP
+
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO10) // no I2C labels on S2 Mini, def from Wemos MP
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO8) // no I2C labels on S2 Mini, def from Wemos MP
+
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO2)   // no SPI labels on S2 Mini, def from Wemos MP
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO4) // no SPI labels on S2 Mini, def from Wemos MP
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO3)  // no SPI labels on S2 Mini, def from Wemos MP
diff --git a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
new file mode 100644
index 0000000000..d41a67a305
--- /dev/null
+++ b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
@@ -0,0 +1,21 @@
+USB_VID = 0x303A
+USB_PID = 0x80C3
+USB_PRODUCT = "C3 Mini"
+USB_MANUFACTURER = "Lolin"
+
+IDF_TARGET = esp32c3
+
+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=80m
+CIRCUITPY_ESP_FLASH_SIZE=4MB
+
+
+# Include these Python libraries in firmware.
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
diff --git a/ports/espressif/boards/lolin_c3_mini/pins.c b/ports/espressif/boards/lolin_c3_mini/pins.c
new file mode 100644
index 0000000000..a4b18c4e9b
--- /dev/null
+++ b/ports/espressif/boards/lolin_c3_mini/pins.c
@@ -0,0 +1,91 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    // S2 Mini Board bottom, right, top-bottom
+    // GPIO0-GPIO14: broken out as a bloc on ESP32-S2FN4R2 SoC
+    // mpconfigboard.h: GPIO0: CIRCUITPY_BOOT_BUTTON
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },  // RTC_GPIO0,GPIO0
+    { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },  // RTC_GPIO1,GPIO1,TOUCH1,ADC1_CH0
+
+    { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },  // RTC_GPIO2,GPIO2,TOUCH2,ADC1_CH1
+    { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },  // RTC_GPIO3,GPIO3,TOUCH3,ADC1_CH2
+    { MP_ROM_QSTR(MP_QSTR_A0),  MP_ROM_PTR(&pin_GPIO3) },  // D1 mini pin A0
+
+    { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },  // RTC_GPIO4,GPIO4,TOUCH4,ADC1_CH3
+    { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },  // RTC_GPIO5,GPIO5,TOUCH5,ADC1_CH4
+    { MP_ROM_QSTR(MP_QSTR_D0),  MP_ROM_PTR(&pin_GPIO5) },  // D1 mini pin D0 GPIO16
+
+    { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },  // RTC_GPIO6,GPIO6,TOUCH6,ADC1_CH5
+    { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },  // RTC_GPIO7,GPIO7,TOUCH7,ADC1_CH6
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO7) },  // def from Wemos MP
+    { MP_ROM_QSTR(MP_QSTR_D5),  MP_ROM_PTR(&pin_GPIO7) },  // D1 mini pin D5 GPIO14
+
+    // mpconfigboard.h: GPIO8/GPIO9: SCL/SDA I2C0
+    { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },  // RTC_GPIO8,GPIO8,TOUCH8,ADC1_CH7
+    { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },  // RTC_GPIO9,GPIO9,TOUCH9,ADC1_CH8,FSPIHD
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO9) }, // def from Wemos MP
+    { MP_ROM_QSTR(MP_QSTR_D6),  MP_ROM_PTR(&pin_GPIO9) },  // D1 mini pin D6 GPIO12
+
+    { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },// RTC_GPIO10,GPIO10,TOUCH10,ADC1_CH9,FSPICS0,FSPIIO4
+    { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },// RTC_GPIO11,GPIO11,TOUCH11,ADC2_CH0,FSPID,FSPIIO5
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO11) },// def from Wemos MP
+    { MP_ROM_QSTR(MP_QSTR_D7),   MP_ROM_PTR(&pin_GPIO11) },// D1 mini pin D7 GPIO13
+
+    { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },// RTC_GPIO12,GPIO12,TOUCH12,ADC2_CH1,FSPICLK,FSPIIO6
+    { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },// RTC_GPIO13,GPIO13,TOUCH13,ADC2_CH2,FSPIQ,FSPIIO7
+    { MP_ROM_QSTR(MP_QSTR_D8),   MP_ROM_PTR(&pin_GPIO13) },// D1 mini pin D8 GPIO15
+
+    { MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },// RTC_GPIO14,GPIO14,TOUCH14,ADC2_CH3,FSPIWP,FSPIDQS
+
+    // S2 Mini Board bottom, left, bottom-top
+    // mpconfigboard.h: GPIO15: CIRCUITPY_STATUS_LED_POWER
+    { MP_ROM_QSTR(MP_QSTR_LED),  MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },// XTAL_32K_P: RTC_GPIO15,GPIO15,U0RTS,ADC2_CH4,XTAL_32K_P
+
+    { MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) },// XTAL_32K_N: RTC_GPIO16,GPIO16,U0CTS,ADC2_CH5,XTAL_32K_N
+    { MP_ROM_QSTR(MP_QSTR_D4),   MP_ROM_PTR(&pin_GPIO16) },// D1 mini pin D4 GPIO2 LED
+    { MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) },// DAC_1: RTC_GPIO17,GPIO17,U1TXD,ADC2_CH6,DAC_1
+
+    { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },// DAC_2: RTC_GPIO18,GPIO18,U1RXD,ADC2_CH7,DAC_2,CLK_OUT3
+    { MP_ROM_QSTR(MP_QSTR_D3),   MP_ROM_PTR(&pin_GPIO18) },// D1 mini pin D3 GPIO0
+    // skip GPIO19-GPIO20: USB_D-/USB_D+
+    { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },// RTC_GPIO21,GPIO21
+
+    // skip GPIO22-GPIO25: not broken out on ESP32-S2FN4R2 SoC
+    // skip GPIO26-GPIO32: SPI Flash & RAM, not broken out on S2 Mini (internal to ESP32-S2FN4R2 SoC?)
+
+    // GPIO33-GPIO40: broken out as a bloc on ESP32-S2FN4R2 SoC, last 2 half of JTAG
+    { MP_ROM_QSTR(MP_QSTR_IO33), MP_ROM_PTR(&pin_GPIO33) },// SPIIO4,GPIO33,FSPIHD
+    { MP_ROM_QSTR(MP_QSTR_SDA),  MP_ROM_PTR(&pin_GPIO33) },// def from Wemos MP
+    { MP_ROM_QSTR(MP_QSTR_D2),   MP_ROM_PTR(&pin_GPIO33) },// D1 mini pin D2 GPIO4
+    { MP_ROM_QSTR(MP_QSTR_IO34), MP_ROM_PTR(&pin_GPIO34) },// SPIIO5,GPIO34,FSPICS0
+
+    // mpconfigboard.h: GPIO35/GPIO36/GPIO37: MOSI/MESO/SCK SPI
+    { MP_ROM_QSTR(MP_QSTR_IO35), MP_ROM_PTR(&pin_GPIO35) },// SPIIO6,GPIO35,FSPID
+    { MP_ROM_QSTR(MP_QSTR_SCL),  MP_ROM_PTR(&pin_GPIO35) },// def from Wemos MP
+    { MP_ROM_QSTR(MP_QSTR_D1),   MP_ROM_PTR(&pin_GPIO35) },// D1 mini pin D1 GPIO5
+    { MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) },// SPIIO7,GPIO36,FSPICLK
+
+    { MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) },// SPIDQS,GPIO37,FSPIQ
+    { MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) },//        GPIO38,FSPIWP
+
+    { MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) },// MTCK,GPIO39,CLK_OUT3
+    { MP_ROM_QSTR(MP_QSTR_IO40), MP_ROM_PTR(&pin_GPIO40) },// MTDO,GPIO40,CLK_OUT2
+
+    // S2 Mini - not broken out on board
+    /*
+    { MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41) },// MTDI,GPIO41,CLK_OUT1
+    { MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) },// MTMS,GPIO42
+    { MP_ROM_QSTR(MP_QSTR_TX),   MP_ROM_PTR(&pin_GPIO43) },  // U0TXD,GPIO43,CLK_OUT1
+    { MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) },//
+    { MP_ROM_QSTR(MP_QSTR_RX),   MP_ROM_PTR(&pin_GPIO44) },  // U0RXD,GPIO44,CLK_OUT2
+    { MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44) },
+    { MP_ROM_QSTR(MP_QSTR_IO45), MP_ROM_PTR(&pin_GPIO45) },// GPIO45
+    { MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46) },// GPIO46
+    */
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, // board singleton implicit from schematic/shield standard
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/lolin_c3_mini/sdkconfig b/ports/espressif/boards/lolin_c3_mini/sdkconfig
new file mode 100644
index 0000000000..007cca768e
--- /dev/null
+++ b/ports/espressif/boards/lolin_c3_mini/sdkconfig
@@ -0,0 +1,37 @@
+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
+# end of SPI RAM config
+
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
+#
+# PSRAM clock and cs IO for ESP32S2
+#
+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
+#
+# LWIP
+#
+CONFIG_LWIP_LOCAL_HOSTNAME="LC3Mini"
+# end of LWIP

From dc1c86738a213bb08279899104636fbf39dfc1c8 Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Fri, 8 Apr 2022 13:52:22 -0700
Subject: [PATCH 02/19] Initial pin mapping pass

---
 .../boards/lolin_c3_mini/mpconfigboard.h      |  14 +-
 .../boards/lolin_c3_mini/mpconfigboard.mk     |   4 +-
 ports/espressif/boards/lolin_c3_mini/pins.c   | 129 +++++++-----------
 3 files changed, 57 insertions(+), 90 deletions(-)

diff --git a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
index 12b0826e5c..b45cc706a0 100644
--- a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
+++ b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
@@ -29,9 +29,13 @@
 #define MICROPY_HW_BOARD_NAME       "LOLIN_C3_MINI" // from Wemos MP
 #define MICROPY_HW_MCU_NAME         "ESP32-C3FH4" // from Wemos MP
 
-#define DEFAULT_I2C_BUS_SCL (&pin_GPIO10) // no I2C labels on S2 Mini, def from Wemos MP
-#define DEFAULT_I2C_BUS_SDA (&pin_GPIO8) // no I2C labels on S2 Mini, def from Wemos MP
+// From Wemos C3 Mini Schematic
+// https://www.wemos.cc/en/latest/_static/files/sch_c3_mini_v1.0.0.pdf
+// And MP Config
+// https://github.com/micropython/micropython/blob/master/ports/esp32/boards/LOLIN_C3_MINI
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO10)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO8)
 
-#define DEFAULT_SPI_BUS_SCK (&pin_GPIO2)   // no SPI labels on S2 Mini, def from Wemos MP
-#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO4) // no SPI labels on S2 Mini, def from Wemos MP
-#define DEFAULT_SPI_BUS_MISO (&pin_GPIO3)  // no SPI labels on S2 Mini, def from Wemos MP
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO4)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO3)
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO2)
diff --git a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
index d41a67a305..d353ff4497 100644
--- a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
+++ b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
@@ -1,5 +1,5 @@
-USB_VID = 0x303A
-USB_PID = 0x80C3
+USB_VID = 0x303A # TODO: I Assume this is Wemos, need to check
+USB_PID = 0x80C3 # TODO: Does this board have a new PID?
 USB_PRODUCT = "C3 Mini"
 USB_MANUFACTURER = "Lolin"
 
diff --git a/ports/espressif/boards/lolin_c3_mini/pins.c b/ports/espressif/boards/lolin_c3_mini/pins.c
index a4b18c4e9b..1406ae19bc 100644
--- a/ports/espressif/boards/lolin_c3_mini/pins.c
+++ b/ports/espressif/boards/lolin_c3_mini/pins.c
@@ -3,89 +3,52 @@
 STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
 
-    // S2 Mini Board bottom, right, top-bottom
-    // GPIO0-GPIO14: broken out as a bloc on ESP32-S2FN4R2 SoC
-    // mpconfigboard.h: GPIO0: CIRCUITPY_BOOT_BUTTON
-    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },
-    { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },  // RTC_GPIO0,GPIO0
-    { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },  // RTC_GPIO1,GPIO1,TOUCH1,ADC1_CH0
+    // C3 Mini Board
+    // From Wemos C3 Mini Schematic
+    // https://www.wemos.cc/en/latest/_static/files/sch_c3_mini_v1.0.0.pdf
+    // Starting on Left side going counterclockwise
+    // And MP Config
+    // https://github.com/micropython/micropython/blob/master/ports/esp32/boards/LOLIN_C3_MINI
 
-    { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },  // RTC_GPIO2,GPIO2,TOUCH2,ADC1_CH1
-    { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },  // RTC_GPIO3,GPIO3,TOUCH3,ADC1_CH2
-    { MP_ROM_QSTR(MP_QSTR_A0),  MP_ROM_PTR(&pin_GPIO3) },  // D1 mini pin A0
-
-    { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },  // RTC_GPIO4,GPIO4,TOUCH4,ADC1_CH3
-    { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },  // RTC_GPIO5,GPIO5,TOUCH5,ADC1_CH4
-    { MP_ROM_QSTR(MP_QSTR_D0),  MP_ROM_PTR(&pin_GPIO5) },  // D1 mini pin D0 GPIO16
-
-    { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },  // RTC_GPIO6,GPIO6,TOUCH6,ADC1_CH5
-    { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },  // RTC_GPIO7,GPIO7,TOUCH7,ADC1_CH6
-    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO7) },  // def from Wemos MP
-    { MP_ROM_QSTR(MP_QSTR_D5),  MP_ROM_PTR(&pin_GPIO7) },  // D1 mini pin D5 GPIO14
-
-    // mpconfigboard.h: GPIO8/GPIO9: SCL/SDA I2C0
-    { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },  // RTC_GPIO8,GPIO8,TOUCH8,ADC1_CH7
-    { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },  // RTC_GPIO9,GPIO9,TOUCH9,ADC1_CH8,FSPIHD
-    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO9) }, // def from Wemos MP
-    { MP_ROM_QSTR(MP_QSTR_D6),  MP_ROM_PTR(&pin_GPIO9) },  // D1 mini pin D6 GPIO12
-
-    { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },// RTC_GPIO10,GPIO10,TOUCH10,ADC1_CH9,FSPICS0,FSPIIO4
-    { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },// RTC_GPIO11,GPIO11,TOUCH11,ADC2_CH0,FSPID,FSPIIO5
-    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO11) },// def from Wemos MP
-    { MP_ROM_QSTR(MP_QSTR_D7),   MP_ROM_PTR(&pin_GPIO11) },// D1 mini pin D7 GPIO13
-
-    { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },// RTC_GPIO12,GPIO12,TOUCH12,ADC2_CH1,FSPICLK,FSPIIO6
-    { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },// RTC_GPIO13,GPIO13,TOUCH13,ADC2_CH2,FSPIQ,FSPIIO7
-    { MP_ROM_QSTR(MP_QSTR_D8),   MP_ROM_PTR(&pin_GPIO13) },// D1 mini pin D8 GPIO15
-
-    { MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },// RTC_GPIO14,GPIO14,TOUCH14,ADC2_CH3,FSPIWP,FSPIDQS
-
-    // S2 Mini Board bottom, left, bottom-top
-    // mpconfigboard.h: GPIO15: CIRCUITPY_STATUS_LED_POWER
-    { MP_ROM_QSTR(MP_QSTR_LED),  MP_ROM_PTR(&pin_GPIO15) },
-    { MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },// XTAL_32K_P: RTC_GPIO15,GPIO15,U0RTS,ADC2_CH4,XTAL_32K_P
-
-    { MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) },// XTAL_32K_N: RTC_GPIO16,GPIO16,U0CTS,ADC2_CH5,XTAL_32K_N
-    { MP_ROM_QSTR(MP_QSTR_D4),   MP_ROM_PTR(&pin_GPIO16) },// D1 mini pin D4 GPIO2 LED
-    { MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) },// DAC_1: RTC_GPIO17,GPIO17,U1TXD,ADC2_CH6,DAC_1
-
-    { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },// DAC_2: RTC_GPIO18,GPIO18,U1RXD,ADC2_CH7,DAC_2,CLK_OUT3
-    { MP_ROM_QSTR(MP_QSTR_D3),   MP_ROM_PTR(&pin_GPIO18) },// D1 mini pin D3 GPIO0
-    // skip GPIO19-GPIO20: USB_D-/USB_D+
-    { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },// RTC_GPIO21,GPIO21
-
-    // skip GPIO22-GPIO25: not broken out on ESP32-S2FN4R2 SoC
-    // skip GPIO26-GPIO32: SPI Flash & RAM, not broken out on S2 Mini (internal to ESP32-S2FN4R2 SoC?)
-
-    // GPIO33-GPIO40: broken out as a bloc on ESP32-S2FN4R2 SoC, last 2 half of JTAG
-    { MP_ROM_QSTR(MP_QSTR_IO33), MP_ROM_PTR(&pin_GPIO33) },// SPIIO4,GPIO33,FSPIHD
-    { MP_ROM_QSTR(MP_QSTR_SDA),  MP_ROM_PTR(&pin_GPIO33) },// def from Wemos MP
-    { MP_ROM_QSTR(MP_QSTR_D2),   MP_ROM_PTR(&pin_GPIO33) },// D1 mini pin D2 GPIO4
-    { MP_ROM_QSTR(MP_QSTR_IO34), MP_ROM_PTR(&pin_GPIO34) },// SPIIO5,GPIO34,FSPICS0
-
-    // mpconfigboard.h: GPIO35/GPIO36/GPIO37: MOSI/MESO/SCK SPI
-    { MP_ROM_QSTR(MP_QSTR_IO35), MP_ROM_PTR(&pin_GPIO35) },// SPIIO6,GPIO35,FSPID
-    { MP_ROM_QSTR(MP_QSTR_SCL),  MP_ROM_PTR(&pin_GPIO35) },// def from Wemos MP
-    { MP_ROM_QSTR(MP_QSTR_D1),   MP_ROM_PTR(&pin_GPIO35) },// D1 mini pin D1 GPIO5
-    { MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) },// SPIIO7,GPIO36,FSPICLK
-
-    { MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) },// SPIDQS,GPIO37,FSPIQ
-    { MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) },//        GPIO38,FSPIWP
-
-    { MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) },// MTCK,GPIO39,CLK_OUT3
-    { MP_ROM_QSTR(MP_QSTR_IO40), MP_ROM_PTR(&pin_GPIO40) },// MTDO,GPIO40,CLK_OUT2
-
-    // S2 Mini - not broken out on board
-    /*
-    { MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41) },// MTDI,GPIO41,CLK_OUT1
-    { MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) },// MTMS,GPIO42
-    { MP_ROM_QSTR(MP_QSTR_TX),   MP_ROM_PTR(&pin_GPIO43) },  // U0TXD,GPIO43,CLK_OUT1
-    { MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) },//
-    { MP_ROM_QSTR(MP_QSTR_RX),   MP_ROM_PTR(&pin_GPIO44) },  // U0RXD,GPIO44,CLK_OUT2
-    { MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44) },
-    { MP_ROM_QSTR(MP_QSTR_IO45), MP_ROM_PTR(&pin_GPIO45) },// GPIO45
-    { MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46) },// GPIO46
-    */
-    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, // board singleton implicit from schematic/shield standard
+    // 1: LAN_IN
+    // 2: VDD3P3
+    // 3: VDD3P3
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },// Reset Button
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO0) },    // 4: GPIO0/32K_P/A0
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO1) },    // 5: GPIO1/32K_N/A1
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO2) },    // 6: GPIO2/A2/FSPIQ
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO2) },   // mpboardconfig.h
+    // 7: CHIP_EN
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO3) },    // 8: GPIO3/A3
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO3) },  // mpboardconfig.h
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO4) },    // 9: GPIO4/A4/FSPIHD/MTMS
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO4) },  // mpboardconfig.h
+    { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },   // 10: GPIO5/A2_0/FSPIWP/MTDI
+    // 11: VDD3P3_RTC
+    { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },   // 12: GPIO6/FSPICLK/MTCK
+    { MP_ROM_QSTR(MP_QSTR_LED),  MP_ROM_PTR(&pin_GPIO7) },  // mpboardconfig.h
+    { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },   // 13: GPIO7/FSPID/MTD0
+    { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },   // 14: GPIO8
+    { MP_ROM_QSTR(MP_QSTR_SDA),  MP_ROM_PTR(&pin_GPIO8) },  // mpboardconfig.h
+    { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },   // 15: GPIO9
+    { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) }, // 16: GPIO10/FSPICS0
+    { MP_ROM_QSTR(MP_QSTR_SCL),  MP_ROM_PTR(&pin_GPIO10) }, // mpboardconfig.h
+    // 17: VDD3P3_SPI
+    // 18: VDD_SPI
+    // 19: SPIHD
+    // 20: SPIWP
+    // 21: SPICSO
+    // 22: SPICLK
+    // 23: SPID
+    // 24: SPIQ
+    // Used for USB 25: GPIO18/D-
+    // Used for USB 26: GPIO19/D+
+    { MP_ROM_QSTR(MP_QSTR_RX),   MP_ROM_PTR(&pin_GPIO20) }, // 27: GPIO20/U0RXD
+    { MP_ROM_QSTR(MP_QSTR_RX),   MP_ROM_PTR(&pin_GPIO22) }, // 28: FPIO22/U0TXD
+    // 29: XTAL_N
+    // 30: XTAL_P
+    // 31: VDDA
+    // 32: VDDA
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },// board singleton implicit from schematic/shield standard
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From bcf27e146be86f2c2dde6cdf249b068915072351 Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Fri, 8 Apr 2022 14:16:15 -0700
Subject: [PATCH 03/19] fix build break and add io 20/21

---
 ports/espressif/boards/lolin_c3_mini/pins.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ports/espressif/boards/lolin_c3_mini/pins.c b/ports/espressif/boards/lolin_c3_mini/pins.c
index 1406ae19bc..82c0499ab5 100644
--- a/ports/espressif/boards/lolin_c3_mini/pins.c
+++ b/ports/espressif/boards/lolin_c3_mini/pins.c
@@ -31,9 +31,9 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },   // 14: GPIO8
     { MP_ROM_QSTR(MP_QSTR_SDA),  MP_ROM_PTR(&pin_GPIO8) },  // mpboardconfig.h
     { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },   // 15: GPIO9
-    { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) }, // 16: GPIO10/FSPICS0
+    { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) }, // 16: GPIO10/FSPICS0
     { MP_ROM_QSTR(MP_QSTR_SCL),  MP_ROM_PTR(&pin_GPIO10) }, // mpboardconfig.h
-    // 17: VDD3P3_SPI
+    // 17: VDD3P3_CPJ
     // 18: VDD_SPI
     // 19: SPIHD
     // 20: SPIWP
@@ -44,7 +44,9 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     // Used for USB 25: GPIO18/D-
     // Used for USB 26: GPIO19/D+
     { MP_ROM_QSTR(MP_QSTR_RX),   MP_ROM_PTR(&pin_GPIO20) }, // 27: GPIO20/U0RXD
-    { MP_ROM_QSTR(MP_QSTR_RX),   MP_ROM_PTR(&pin_GPIO22) }, // 28: FPIO22/U0TXD
+    { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_TX),   MP_ROM_PTR(&pin_GPIO21) }, // 28: GPIO21/U0TXD
+    { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
     // 29: XTAL_N
     // 30: XTAL_P
     // 31: VDDA

From 6763b7b968bcea6e156522cc600646864babd667 Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Fri, 8 Apr 2022 14:32:58 -0700
Subject: [PATCH 04/19] add A5

---
 ports/espressif/boards/lolin_c3_mini/pins.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/espressif/boards/lolin_c3_mini/pins.c b/ports/espressif/boards/lolin_c3_mini/pins.c
index 82c0499ab5..fcbb97232c 100644
--- a/ports/espressif/boards/lolin_c3_mini/pins.c
+++ b/ports/espressif/boards/lolin_c3_mini/pins.c
@@ -24,6 +24,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO4) },    // 9: GPIO4/A4/FSPIHD/MTMS
     { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO4) },  // mpboardconfig.h
     { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },   // 10: GPIO5/A2_0/FSPIWP/MTDI
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO5) },    // Board screen has A5, Schematic has A2_0 (huh?)
     // 11: VDD3P3_RTC
     { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },   // 12: GPIO6/FSPICLK/MTCK
     { MP_ROM_QSTR(MP_QSTR_LED),  MP_ROM_PTR(&pin_GPIO7) },  // mpboardconfig.h

From 9bae8549c517cb6bb78148d56d76eca74e47b81d Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Fri, 8 Apr 2022 14:40:10 -0700
Subject: [PATCH 05/19] add UART RX TX to mpconfigboard

---
 ports/espressif/boards/lolin_c3_mini/mpconfigboard.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
index b45cc706a0..5c253a4d33 100644
--- a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
+++ b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
@@ -39,3 +39,6 @@
 #define DEFAULT_SPI_BUS_MOSI (&pin_GPIO4)
 #define DEFAULT_SPI_BUS_MISO (&pin_GPIO3)
 #define DEFAULT_SPI_BUS_SCK (&pin_GPIO2)
+
+#define DEFAULT_UART_BUS_RX (&pin_GPIO20)
+#define DEFAULT_UART_BUS_TX (&pin_GPIO21)

From c1e6003d2676e564bf9863e979992d35bda72460 Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Fri, 8 Apr 2022 14:56:41 -0700
Subject: [PATCH 06/19] remove comment that breaks {ID Checker

---
 ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
index d353ff4497..d41a67a305 100644
--- a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
+++ b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
@@ -1,5 +1,5 @@
-USB_VID = 0x303A # TODO: I Assume this is Wemos, need to check
-USB_PID = 0x80C3 # TODO: Does this board have a new PID?
+USB_VID = 0x303A
+USB_PID = 0x80C3
 USB_PRODUCT = "C3 Mini"
 USB_MANUFACTURER = "Lolin"
 

From af629ab180dbcb44a9f605c8ad533d810dedcc02 Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Fri, 8 Apr 2022 15:50:07 -0700
Subject: [PATCH 07/19] Add assumed PID value

---
 ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
index d41a67a305..b745b2d29e 100644
--- a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
+++ b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x303A
-USB_PID = 0x80C3
+USB_PID = 0x80F5
 USB_PRODUCT = "C3 Mini"
 USB_MANUFACTURER = "Lolin"
 

From f95edd93a0fd090c89748b13ab7a04f55c504e84 Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Fri, 8 Apr 2022 16:09:33 -0700
Subject: [PATCH 08/19] C3 boards are Bin only

---
 tools/build_board_info.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/build_board_info.py b/tools/build_board_info.py
index 72ccb98551..79d9bf7b46 100755
--- a/tools/build_board_info.py
+++ b/tools/build_board_info.py
@@ -77,6 +77,7 @@ extension_by_board = {
     "ai_thinker_esp32-c3s-2m": BIN,
     "espressif_esp32c3_devkitm_1_n4": BIN,
     "lilygo_ttgo_t-01c3": BIN,
+    "lolin-c3-mini": BIN,
     "microdev_micro_c3": BIN,
     "lilygo_ttgo_t-oi-plus": BIN,
     # broadcom

From 03c1871d6b2972cecdbbc562db9cf3a927234d69 Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Fri, 8 Apr 2022 16:19:56 -0700
Subject: [PATCH 09/19] Folders have underscores not dashes

---
 tools/build_board_info.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/build_board_info.py b/tools/build_board_info.py
index 79d9bf7b46..d73f0e3f1c 100755
--- a/tools/build_board_info.py
+++ b/tools/build_board_info.py
@@ -77,7 +77,7 @@ extension_by_board = {
     "ai_thinker_esp32-c3s-2m": BIN,
     "espressif_esp32c3_devkitm_1_n4": BIN,
     "lilygo_ttgo_t-01c3": BIN,
-    "lolin-c3-mini": BIN,
+    "lolin_c3_mini": BIN,
     "microdev_micro_c3": BIN,
     "lilygo_ttgo_t-oi-plus": BIN,
     # broadcom

From b37236f83f45692bab0933d9443ca36ff77e77d6 Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Fri, 8 Apr 2022 16:44:49 -0700
Subject: [PATCH 10/19] C3 does not have PSRAM

---
 .../espressif/boards/lolin_c3_mini/sdkconfig  | 33 +------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/ports/espressif/boards/lolin_c3_mini/sdkconfig b/ports/espressif/boards/lolin_c3_mini/sdkconfig
index 007cca768e..b96cda80a6 100644
--- a/ports/espressif/boards/lolin_c3_mini/sdkconfig
+++ b/ports/espressif/boards/lolin_c3_mini/sdkconfig
@@ -1,35 +1,4 @@
-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
-# end of SPI RAM config
-
-CONFIG_DEFAULT_PSRAM_CLK_IO=30
-#
-# PSRAM clock and cs IO for ESP32S2
-#
-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
+# CONFIG_ESP32S2_SPIRAM_SUPPORT is not set
 #
 # LWIP
 #

From a3070f6c2a6057182a8972d3980cd47eb95df669 Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Tue, 12 Apr 2022 20:05:41 -0700
Subject: [PATCH 11/19] Changes to Pin Mappings

---
 ports/espressif/boards/lolin_c3_mini/board.c  |  4 +--
 .../boards/lolin_c3_mini/mpconfigboard.h      |  4 +++
 .../boards/lolin_c3_mini/mpconfigboard.mk     |  4 +--
 ports/espressif/boards/lolin_c3_mini/pins.c   | 26 ++++++++++++++-----
 .../espressif/boards/lolin_c3_mini/sdkconfig  |  3 +--
 5 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/ports/espressif/boards/lolin_c3_mini/board.c b/ports/espressif/boards/lolin_c3_mini/board.c
index 0432485111..d77b968d3e 100644
--- a/ports/espressif/boards/lolin_c3_mini/board.c
+++ b/ports/espressif/boards/lolin_c3_mini/board.c
@@ -31,8 +31,8 @@
 void board_init(void) {
     // Debug UART
     #ifdef DEBUG
-    common_hal_never_reset_pin(&pin_GPIO43);
-    common_hal_never_reset_pin(&pin_GPIO44);
+    common_hal_never_reset_pin(&pin_GPIO20);
+    common_hal_never_reset_pin(&pin_GPIO21);
     #endif /* DEBUG */
 }
 
diff --git a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
index 5c253a4d33..3956d2c5b0 100644
--- a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
+++ b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
@@ -42,3 +42,7 @@
 
 #define DEFAULT_UART_BUS_RX (&pin_GPIO20)
 #define DEFAULT_UART_BUS_TX (&pin_GPIO21)
+
+// // Serial over UART
+#define CIRCUITPY_DEBUG_UART_RX     DEFAULT_UART_BUS_RX
+#define CIRCUITPY_DEBUG_UART_TX     DEFAULT_UART_BUS_TX
diff --git a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
index b745b2d29e..60c8639232 100644
--- a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
+++ b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
@@ -1,7 +1,7 @@
 USB_VID = 0x303A
 USB_PID = 0x80F5
-USB_PRODUCT = "C3 Mini"
-USB_MANUFACTURER = "Lolin"
+USB_PRODUCT = "Lolin C3 Mini"
+USB_MANUFACTURER = "Wemos"
 
 IDF_TARGET = esp32c3
 
diff --git a/ports/espressif/boards/lolin_c3_mini/pins.c b/ports/espressif/boards/lolin_c3_mini/pins.c
index fcbb97232c..230ed31b9f 100644
--- a/ports/espressif/boards/lolin_c3_mini/pins.c
+++ b/ports/espressif/boards/lolin_c3_mini/pins.c
@@ -7,25 +7,32 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     // From Wemos C3 Mini Schematic
     // https://www.wemos.cc/en/latest/_static/files/sch_c3_mini_v1.0.0.pdf
     // Starting on Left side going counterclockwise
-    // And MP Config
+    // MP Config
     // https://github.com/micropython/micropython/blob/master/ports/esp32/boards/LOLIN_C3_MINI
+    // C3 Data Sheet
+    // https://www.espressif.com/sites/default/files/documentation/esp32-c3_datasheet_en.pdf
 
     // 1: LAN_IN
     // 2: VDD3P3
     // 3: VDD3P3
+
     { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },// Reset Button
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO0) },    // 4: GPIO0/32K_P/A0
     { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO1) },    // 5: GPIO1/32K_N/A1
     { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO2) },    // 6: GPIO2/A2/FSPIQ
     { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO2) },   // mpboardconfig.h
+
     // 7: CHIP_EN
+
     { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO3) },    // 8: GPIO3/A3
     { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO3) },  // mpboardconfig.h
     { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO4) },    // 9: GPIO4/A4/FSPIHD/MTMS
     { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO4) },  // mpboardconfig.h
     { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },   // 10: GPIO5/A2_0/FSPIWP/MTDI
     { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO5) },    // Board screen has A5, Schematic has A2_0 (huh?)
-    // 11: VDD3P3_RTC
+
+    // 11: VDD3P3_RTC: Input power supply for RTC
+
     { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },   // 12: GPIO6/FSPICLK/MTCK
     { MP_ROM_QSTR(MP_QSTR_LED),  MP_ROM_PTR(&pin_GPIO7) },  // mpboardconfig.h
     { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },   // 13: GPIO7/FSPID/MTD0
@@ -34,24 +41,29 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },   // 15: GPIO9
     { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) }, // 16: GPIO10/FSPICS0
     { MP_ROM_QSTR(MP_QSTR_SCL),  MP_ROM_PTR(&pin_GPIO10) }, // mpboardconfig.h
-    // 17: VDD3P3_CPJ
+
+    // 17: VDD3P3_CPU: Input power supply for CPU IO
     // 18: VDD_SPI
+
+    // Ports of embedded flash for ESP32-C3FH4
     // 19: SPIHD
     // 20: SPIWP
     // 21: SPICSO
     // 22: SPICLK
     // 23: SPID
     // 24: SPIQ
-    // Used for USB 25: GPIO18/D-
-    // Used for USB 26: GPIO19/D+
+
+    // 25: GPIO18/D-: Used for USB
+    // 26: GPIO19/D+: Used for USB
+
     { MP_ROM_QSTR(MP_QSTR_RX),   MP_ROM_PTR(&pin_GPIO20) }, // 27: GPIO20/U0RXD
-    { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) },
     { MP_ROM_QSTR(MP_QSTR_TX),   MP_ROM_PTR(&pin_GPIO21) }, // 28: GPIO21/U0TXD
-    { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
+
     // 29: XTAL_N
     // 30: XTAL_P
     // 31: VDDA
     // 32: VDDA
+
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },// board singleton implicit from schematic/shield standard
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/lolin_c3_mini/sdkconfig b/ports/espressif/boards/lolin_c3_mini/sdkconfig
index b96cda80a6..833f8368fa 100644
--- a/ports/espressif/boards/lolin_c3_mini/sdkconfig
+++ b/ports/espressif/boards/lolin_c3_mini/sdkconfig
@@ -1,6 +1,5 @@
-# CONFIG_ESP32S2_SPIRAM_SUPPORT is not set
 #
 # LWIP
 #
-CONFIG_LWIP_LOCAL_HOSTNAME="LC3Mini"
+CONFIG_LWIP_LOCAL_HOSTNAME="lolin-c3-mini"
 # end of LWIP

From f10fa566aacc9d4fc67fbd3b77a9c3f8f598bb34 Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Wed, 13 Apr 2022 00:21:29 -0700
Subject: [PATCH 12/19] REPL works. Based on QTPYC3.

---
 ports/espressif/boards/lolin_c3_mini/board.c  | 15 ++-
 .../boards/lolin_c3_mini/mpconfigboard.h      | 27 ++---
 .../boards/lolin_c3_mini/mpconfigboard.mk     |  9 --
 ports/espressif/boards/lolin_c3_mini/pins.c   | 99 +++++++++----------
 4 files changed, 68 insertions(+), 82 deletions(-)

diff --git a/ports/espressif/boards/lolin_c3_mini/board.c b/ports/espressif/boards/lolin_c3_mini/board.c
index d77b968d3e..8bca964dc7 100644
--- a/ports/espressif/boards/lolin_c3_mini/board.c
+++ b/ports/espressif/boards/lolin_c3_mini/board.c
@@ -24,24 +24,23 @@
  * THE SOFTWARE.
  */
 
-#include "supervisor/board.h"
-#include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
+#include "supervisor/board.h"
+
+#include "components/driver/include/driver/gpio.h"
 
 void board_init(void) {
-    // Debug UART
-    #ifdef DEBUG
-    common_hal_never_reset_pin(&pin_GPIO20);
-    common_hal_never_reset_pin(&pin_GPIO21);
-    #endif /* DEBUG */
 }
 
 bool board_requests_safe_mode(void) {
     return false;
 }
 
-void reset_board(void) {
+bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
+    return false;
+}
 
+void reset_board(void) {
 }
 
 void board_deinit(void) {
diff --git a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
index 3956d2c5b0..03e4d5d436 100644
--- a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
+++ b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
@@ -24,25 +24,28 @@
  * THE SOFTWARE.
  */
 
-// Micropython setup
+// Board setup
 
-#define MICROPY_HW_BOARD_NAME       "LOLIN_C3_MINI" // from Wemos MP
+#define MICROPY_HW_BOARD_NAME       "Wemos Lolin C3 Mini" // from Wemos MP
 #define MICROPY_HW_MCU_NAME         "ESP32-C3FH4" // from Wemos MP
 
 // From Wemos C3 Mini Schematic
 // https://www.wemos.cc/en/latest/_static/files/sch_c3_mini_v1.0.0.pdf
 // And MP Config
 // https://github.com/micropython/micropython/blob/master/ports/esp32/boards/LOLIN_C3_MINI
-#define DEFAULT_I2C_BUS_SCL (&pin_GPIO10)
-#define DEFAULT_I2C_BUS_SDA (&pin_GPIO8)
+// Status LED
+#define MICROPY_HW_NEOPIXEL         (&pin_GPIO7)
 
-#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO4)
-#define DEFAULT_SPI_BUS_MISO (&pin_GPIO3)
-#define DEFAULT_SPI_BUS_SCK (&pin_GPIO2)
+#define CIRCUITPY_BOARD_I2C         (1)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO6, .sda = &pin_GPIO5}}
 
-#define DEFAULT_UART_BUS_RX (&pin_GPIO20)
-#define DEFAULT_UART_BUS_TX (&pin_GPIO21)
+#define CIRCUITPY_BOARD_SPI         (1)
+#define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO10, .mosi = &pin_GPIO7, .miso = &pin_GPIO8}}
 
-// // Serial over UART
-#define CIRCUITPY_DEBUG_UART_RX     DEFAULT_UART_BUS_RX
-#define CIRCUITPY_DEBUG_UART_TX     DEFAULT_UART_BUS_TX
+#define CIRCUITPY_BOARD_UART        (1)
+#define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO21, .rx = &pin_GPIO20}}
+
+// Explanation of how a user got into safe mode
+#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
+
+#define CIRCUITPY_ESP_USB_SERIAL_JTAG (1)
diff --git a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
index 60c8639232..793730f025 100644
--- a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
+++ b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
@@ -6,16 +6,7 @@ USB_MANUFACTURER = "Wemos"
 IDF_TARGET = esp32c3
 
 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=80m
 CIRCUITPY_ESP_FLASH_SIZE=4MB
-
-
-# Include these Python libraries in firmware.
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
diff --git a/ports/espressif/boards/lolin_c3_mini/pins.c b/ports/espressif/boards/lolin_c3_mini/pins.c
index 230ed31b9f..d3828311ed 100644
--- a/ports/espressif/boards/lolin_c3_mini/pins.c
+++ b/ports/espressif/boards/lolin_c3_mini/pins.c
@@ -4,7 +4,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
 
     // C3 Mini Board
-    // From Wemos C3 Mini Schematic
+    // Wemos Lolin C3 Mini Schematic
     // https://www.wemos.cc/en/latest/_static/files/sch_c3_mini_v1.0.0.pdf
     // Starting on Left side going counterclockwise
     // MP Config
@@ -12,58 +12,51 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     // C3 Data Sheet
     // https://www.espressif.com/sites/default/files/documentation/esp32-c3_datasheet_en.pdf
 
-    // 1: LAN_IN
-    // 2: VDD3P3
-    // 3: VDD3P3
-
-    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },// Reset Button
-    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO0) },    // 4: GPIO0/32K_P/A0
-    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO1) },    // 5: GPIO1/32K_N/A1
-    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO2) },    // 6: GPIO2/A2/FSPIQ
-    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO2) },   // mpboardconfig.h
-
-    // 7: CHIP_EN
-
-    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO3) },    // 8: GPIO3/A3
-    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO3) },  // mpboardconfig.h
-    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO4) },    // 9: GPIO4/A4/FSPIHD/MTMS
-    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO4) },  // mpboardconfig.h
-    { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },   // 10: GPIO5/A2_0/FSPIWP/MTDI
-    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO5) },    // Board screen has A5, Schematic has A2_0 (huh?)
-
-    // 11: VDD3P3_RTC: Input power supply for RTC
-
-    { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },   // 12: GPIO6/FSPICLK/MTCK
-    { MP_ROM_QSTR(MP_QSTR_LED),  MP_ROM_PTR(&pin_GPIO7) },  // mpboardconfig.h
-    { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },   // 13: GPIO7/FSPID/MTD0
-    { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },   // 14: GPIO8
-    { MP_ROM_QSTR(MP_QSTR_SDA),  MP_ROM_PTR(&pin_GPIO8) },  // mpboardconfig.h
-    { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },   // 15: GPIO9
-    { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) }, // 16: GPIO10/FSPICS0
-    { MP_ROM_QSTR(MP_QSTR_SCL),  MP_ROM_PTR(&pin_GPIO10) }, // mpboardconfig.h
-
-    // 17: VDD3P3_CPU: Input power supply for CPU IO
-    // 18: VDD_SPI
-
-    // Ports of embedded flash for ESP32-C3FH4
-    // 19: SPIHD
-    // 20: SPIWP
-    // 21: SPICSO
-    // 22: SPICLK
-    // 23: SPID
-    // 24: SPIQ
-
-    // 25: GPIO18/D-: Used for USB
-    // 26: GPIO19/D+: Used for USB
-
-    { MP_ROM_QSTR(MP_QSTR_RX),   MP_ROM_PTR(&pin_GPIO20) }, // 27: GPIO20/U0RXD
-    { MP_ROM_QSTR(MP_QSTR_TX),   MP_ROM_PTR(&pin_GPIO21) }, // 28: GPIO21/U0TXD
-
-    // 29: XTAL_N
-    // 30: XTAL_P
-    // 31: VDDA
-    // 32: VDDA
-
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },// board singleton implicit from schematic/shield standard
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO9) },
+
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO4) },
+
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO5) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO6) },
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO20) },
+
+    { MP_ROM_QSTR(MP_QSTR_LED),  MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO7) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO10) },
+
+    { MP_ROM_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO8) },
+
+    { 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_module_globals_table);

From 3253ae250312a57e0c542452c93c945bee7137f6 Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Tue, 19 Apr 2022 17:34:36 -0700
Subject: [PATCH 13/19] tested and corrected several pins

---
 ports/espressif/boards/lolin_c3_mini/pins.c | 62 ++++++++++-----------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/ports/espressif/boards/lolin_c3_mini/pins.c b/ports/espressif/boards/lolin_c3_mini/pins.c
index d3828311ed..8078ffad48 100644
--- a/ports/espressif/boards/lolin_c3_mini/pins.c
+++ b/ports/espressif/boards/lolin_c3_mini/pins.c
@@ -12,49 +12,49 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     // C3 Data Sheet
     // https://www.espressif.com/sites/default/files/documentation/esp32-c3_datasheet_en.pdf
 
-    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },// board singleton implicit from schematic/shield standard
-    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO9) },
-    { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO9) },
-    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO0) },
 
-    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO1) },
+
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO2) },
+
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO4) },
     { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO4) },
     { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO4) },
 
-    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO3) },
-    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO3) },
-    { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO3) },
-
-    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO1) },
-    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO1) },
-
-    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO0) },
-    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO0) },
-
-    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO5) },
     { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO5) },
-    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO5) },
 
-    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO6) },
     { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
-    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO6) },
 
-    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO21) },
-    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO21) },
-    { MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO21) },
-
-    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO20) },
-    { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO20) },
-    { MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO20) },
-
-    { MP_ROM_QSTR(MP_QSTR_LED),  MP_ROM_PTR(&pin_GPIO7) },
     { MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO7) },
-
-    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO10) },
-    { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_LED),  MP_ROM_PTR(&pin_GPIO7) },
 
     { MP_ROM_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO8) },
 
+    { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO9) },
+
+    { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO10) },
+
+    { MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO20) },
+
+    { MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO21) },
+
     { 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) },

From 6c7faf0eba6dbdd3119b0b4af97e363c88f0beba Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Fri, 10 Jun 2022 23:54:59 -0700
Subject: [PATCH 14/19] Change USB VID & PID to Creator and Creation IDs

---
 ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
index 793730f025..bdb569f430 100644
--- a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
+++ b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
@@ -1,7 +1,5 @@
-USB_VID = 0x303A
-USB_PID = 0x80F5
-USB_PRODUCT = "Lolin C3 Mini"
-USB_MANUFACTURER = "Wemos"
+CIRCUITPY_CREATOR_ID =  0x1988_1988
+CIRCUITPY_CREATION_ID = 0x00C3_0001
 
 IDF_TARGET = esp32c3
 

From d4b26daf1be096367e73b467ad626bb556f23dc8 Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Sat, 11 Jun 2022 23:41:35 -0700
Subject: [PATCH 15/19] correct creator and creation IDs

---
 ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
index bdb569f430..28e4190adf 100644
--- a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
+++ b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
@@ -1,5 +1,5 @@
-CIRCUITPY_CREATOR_ID =  0x1988_1988
-CIRCUITPY_CREATION_ID = 0x00C3_0001
+CIRCUITPY_CREATOR_ID =  0x19881988
+CIRCUITPY_CREATION_ID = 0x00C30001
 
 IDF_TARGET = esp32c3
 

From 7e367eeb584ff1dbc2e15c8ee0f91a9297a4c13d Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Thu, 16 Jun 2022 00:09:26 -0700
Subject: [PATCH 16/19] Update "D" mappings

---
 ports/espressif/boards/lolin_c3_mini/pins.c | 34 ++++++++++++++-------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/ports/espressif/boards/lolin_c3_mini/pins.c b/ports/espressif/boards/lolin_c3_mini/pins.c
index 8078ffad48..ccc70f6043 100644
--- a/ports/espressif/boards/lolin_c3_mini/pins.c
+++ b/ports/espressif/boards/lolin_c3_mini/pins.c
@@ -12,47 +12,59 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     // C3 Data Sheet
     // https://www.espressif.com/sites/default/files/documentation/esp32-c3_datasheet_en.pdf
 
+    { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO0) },
-    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },
     { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO1) },
-    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO1) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },
     { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO2) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },
     { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO3) },
-    { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO3) },
     { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO3) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
     { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO4) },
-    { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
     { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO4) },
 
+    { 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_D7), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
     { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO5) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },
     { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
     { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO6) },
 
-    { MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) },
     { MP_ROM_QSTR(MP_QSTR_LED),  MP_ROM_PTR(&pin_GPIO7) },
 
-    { MP_ROM_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
     { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO9) },
     { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO9) },
-    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO9) },
 
-    { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO10) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) },
     { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO10) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) },
     { MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO20) },
-    { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO20) },
     { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO20) },
 
+    { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
     { MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO21) },
-    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO21) },
     { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO21) },
 
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },

From aa53d3693428590c09a461fe20b130717634708f Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Thu, 23 Jun 2022 14:54:23 -0700
Subject: [PATCH 17/19] setting CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER to 8.5

---
 ports/espressif/boards/lolin_c3_mini/sdkconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/espressif/boards/lolin_c3_mini/sdkconfig b/ports/espressif/boards/lolin_c3_mini/sdkconfig
index 833f8368fa..b511505909 100644
--- a/ports/espressif/boards/lolin_c3_mini/sdkconfig
+++ b/ports/espressif/boards/lolin_c3_mini/sdkconfig
@@ -1,5 +1,6 @@
 #
 # LWIP
 #
+CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=8.5
 CONFIG_LWIP_LOCAL_HOSTNAME="lolin-c3-mini"
 # end of LWIP

From aaeda978184006a7ce9271e778ce93a63adf89fd Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Mon, 27 Jun 2022 21:57:32 -0700
Subject: [PATCH 18/19] update PHY section, correct name

---
 ports/espressif/boards/lolin_c3_mini/sdkconfig | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ports/espressif/boards/lolin_c3_mini/sdkconfig b/ports/espressif/boards/lolin_c3_mini/sdkconfig
index b511505909..d997c9aa57 100644
--- a/ports/espressif/boards/lolin_c3_mini/sdkconfig
+++ b/ports/espressif/boards/lolin_c3_mini/sdkconfig
@@ -1,6 +1,13 @@
+#
+# PHY
+#
+CONFIG_ESP_PHY_MAX_WIFI_TX_POWER=15
+# end of PHY
+
 #
 # LWIP
 #
-CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=8.5
 CONFIG_LWIP_LOCAL_HOSTNAME="lolin-c3-mini"
 # end of LWIP
+
+

From c3cf9ba9cea944ff5783a530b68121a7e8f7d266 Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Fri, 1 Jul 2022 14:47:58 -0700
Subject: [PATCH 19/19] remove wifi max from sdkconfig

---
 ports/espressif/boards/lolin_c3_mini/sdkconfig | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/ports/espressif/boards/lolin_c3_mini/sdkconfig b/ports/espressif/boards/lolin_c3_mini/sdkconfig
index d997c9aa57..2cb6b06589 100644
--- a/ports/espressif/boards/lolin_c3_mini/sdkconfig
+++ b/ports/espressif/boards/lolin_c3_mini/sdkconfig
@@ -1,9 +1,3 @@
-#
-# PHY
-#
-CONFIG_ESP_PHY_MAX_WIFI_TX_POWER=15
-# end of PHY
-
 #
 # LWIP
 #