From cd20e3d398b61ddf9b63a41776a7c64440d97a5b Mon Sep 17 00:00:00 2001 From: codetyphon Date: Sat, 14 Aug 2021 20:26:20 +0800 Subject: [PATCH 1/8] add ai_thinker_esp_12k --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6d6d752756..dc708840d1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -528,6 +528,7 @@ jobs: - "unexpectedmaker_feathers2" - "unexpectedmaker_feathers2_prerelease" - "unexpectedmaker_tinys2" + - "ai_thinker_esp_12k" steps: - name: Set up Python 3.8 From 221d66c60389cd4b23d2c55103f6f5e530f5d6c9 Mon Sep 17 00:00:00 2001 From: codetyphon Date: Sat, 14 Aug 2021 20:27:51 +0800 Subject: [PATCH 2/8] Create board.c --- ports/esp32s2/ai_thinker_esp_12k/board.c | 52 ++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 ports/esp32s2/ai_thinker_esp_12k/board.c diff --git a/ports/esp32s2/ai_thinker_esp_12k/board.c b/ports/esp32s2/ai_thinker_esp_12k/board.c new file mode 100644 index 0000000000..e40b6335bc --- /dev/null +++ b/ports/esp32s2/ai_thinker_esp_12k/board.c @@ -0,0 +1,52 @@ +/* + * 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) { + // USB + common_hal_never_reset_pin(&pin_GPIO19); + common_hal_never_reset_pin(&pin_GPIO20); + + // 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) { +} From c577d3b6a492eccc5ec8b2555cfb496960bccc0f Mon Sep 17 00:00:00 2001 From: codetyphon Date: Sat, 14 Aug 2021 20:29:33 +0800 Subject: [PATCH 3/8] add ai_thinker_esp_12k --- .../ai_thinker_esp_12k/mpconfigboard.h | 40 ++++++++++++++++ .../ai_thinker_esp_12k/mpconfigboard.mk | 17 +++++++ ports/esp32s2/ai_thinker_esp_12k/pins.c | 48 +++++++++++++++++++ ports/esp32s2/ai_thinker_esp_12k/sdkconfig | 33 +++++++++++++ 4 files changed, 138 insertions(+) create mode 100644 ports/esp32s2/ai_thinker_esp_12k/mpconfigboard.h create mode 100644 ports/esp32s2/ai_thinker_esp_12k/mpconfigboard.mk create mode 100644 ports/esp32s2/ai_thinker_esp_12k/pins.c create mode 100644 ports/esp32s2/ai_thinker_esp_12k/sdkconfig diff --git a/ports/esp32s2/ai_thinker_esp_12k/mpconfigboard.h b/ports/esp32s2/ai_thinker_esp_12k/mpconfigboard.h new file mode 100644 index 0000000000..cb2e3d2bc1 --- /dev/null +++ b/ports/esp32s2/ai_thinker_esp_12k/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 + +// Same setup as the Saola board but with no Neopixel on board + +#define MICROPY_HW_BOARD_NAME "NodeMCU-32-S2 w/ESP-12K 08" +#define MICROPY_HW_MCU_NAME "ESP-12K 08" + +// #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/ai_thinker_esp_12k/mpconfigboard.mk b/ports/esp32s2/ai_thinker_esp_12k/mpconfigboard.mk new file mode 100644 index 0000000000..a333fe477f --- /dev/null +++ b/ports/esp32s2/ai_thinker_esp_12k/mpconfigboard.mk @@ -0,0 +1,17 @@ +USB_VID = 0x612B +USB_PID = 0x80A7 +USB_PRODUCT = "NodeMCU-32-S2 w/ESP-12K 08" +USB_MANUFACTURER = "Ai-Thinker" + +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 \ No newline at end of file diff --git a/ports/esp32s2/ai_thinker_esp_12k/pins.c b/ports/esp32s2/ai_thinker_esp_12k/pins.c new file mode 100644 index 0000000000..a8ca8ba3ed --- /dev/null +++ b/ports/esp32s2/ai_thinker_esp_12k/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/ai_thinker_esp_12k/sdkconfig b/ports/esp32s2/ai_thinker_esp_12k/sdkconfig new file mode 100644 index 0000000000..1a86435efc --- /dev/null +++ b/ports/esp32s2/ai_thinker_esp_12k/sdkconfig @@ -0,0 +1,33 @@ +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=4194304 + +# +# 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 From 605236505a058b931324b8e3cc557b6bd469a64a Mon Sep 17 00:00:00 2001 From: codetyphon Date: Sat, 14 Aug 2021 23:27:58 +0800 Subject: [PATCH 4/8] alphabetical order --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dc708840d1..3d9bfb925b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -506,6 +506,7 @@ jobs: - "adafruit_metro_esp32s2" - "artisense_rd00" - "atmegazero_esp32s2" + - "ai_thinker_esp_12k" - "crumpspace_crumps2" - "electroniccats_bastwifi" - "espressif_kaluga_1" @@ -528,7 +529,6 @@ jobs: - "unexpectedmaker_feathers2" - "unexpectedmaker_feathers2_prerelease" - "unexpectedmaker_tinys2" - - "ai_thinker_esp_12k" steps: - name: Set up Python 3.8 From 8945d17aa2dbadd4251ef138cee85f3bc04b2847 Mon Sep 17 00:00:00 2001 From: codetyphon Date: Sat, 14 Aug 2021 23:32:40 +0800 Subject: [PATCH 5/8] Update mpconfigboard.mk --- ports/esp32s2/ai_thinker_esp_12k/mpconfigboard.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/esp32s2/ai_thinker_esp_12k/mpconfigboard.mk b/ports/esp32s2/ai_thinker_esp_12k/mpconfigboard.mk index a333fe477f..997e9ebe76 100644 --- a/ports/esp32s2/ai_thinker_esp_12k/mpconfigboard.mk +++ b/ports/esp32s2/ai_thinker_esp_12k/mpconfigboard.mk @@ -14,4 +14,4 @@ CIRCUITPY_ESP_FLASH_MODE=dio CIRCUITPY_ESP_FLASH_FREQ=40m CIRCUITPY_ESP_FLASH_SIZE=4MB -CIRCUITPY_MODULE=wrover \ No newline at end of file +CIRCUITPY_MODULE=wrover From e29346b79afd181a610ff94e8c1bd75b51f277fe Mon Sep 17 00:00:00 2001 From: codetyphon Date: Sun, 15 Aug 2021 10:18:40 +0800 Subject: [PATCH 6/8] ai_thinker_esp_12k_nodemcu --- .github/workflows/build.yml | 2 +- .../board.c | 0 .../mpconfigboard.h | 4 ++-- .../mpconfigboard.mk | 2 +- .../{ai_thinker_esp_12k => ai_thinker_esp_12k_nodemcu}/pins.c | 0 .../sdkconfig | 0 6 files changed, 4 insertions(+), 4 deletions(-) rename ports/esp32s2/{ai_thinker_esp_12k => ai_thinker_esp_12k_nodemcu}/board.c (100%) rename ports/esp32s2/{ai_thinker_esp_12k => ai_thinker_esp_12k_nodemcu}/mpconfigboard.h (93%) rename ports/esp32s2/{ai_thinker_esp_12k => ai_thinker_esp_12k_nodemcu}/mpconfigboard.mk (89%) rename ports/esp32s2/{ai_thinker_esp_12k => ai_thinker_esp_12k_nodemcu}/pins.c (100%) rename ports/esp32s2/{ai_thinker_esp_12k => ai_thinker_esp_12k_nodemcu}/sdkconfig (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3d9bfb925b..2777e2e24a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -504,9 +504,9 @@ jobs: - "adafruit_funhouse" - "adafruit_magtag_2.9_grayscale" - "adafruit_metro_esp32s2" + - "ai_thinker_esp_12k_nodemcu" - "artisense_rd00" - "atmegazero_esp32s2" - - "ai_thinker_esp_12k" - "crumpspace_crumps2" - "electroniccats_bastwifi" - "espressif_kaluga_1" diff --git a/ports/esp32s2/ai_thinker_esp_12k/board.c b/ports/esp32s2/ai_thinker_esp_12k_nodemcu/board.c similarity index 100% rename from ports/esp32s2/ai_thinker_esp_12k/board.c rename to ports/esp32s2/ai_thinker_esp_12k_nodemcu/board.c diff --git a/ports/esp32s2/ai_thinker_esp_12k/mpconfigboard.h b/ports/esp32s2/ai_thinker_esp_12k_nodemcu/mpconfigboard.h similarity index 93% rename from ports/esp32s2/ai_thinker_esp_12k/mpconfigboard.h rename to ports/esp32s2/ai_thinker_esp_12k_nodemcu/mpconfigboard.h index cb2e3d2bc1..90029273c4 100644 --- a/ports/esp32s2/ai_thinker_esp_12k/mpconfigboard.h +++ b/ports/esp32s2/ai_thinker_esp_12k_nodemcu/mpconfigboard.h @@ -28,8 +28,8 @@ // Same setup as the Saola board but with no Neopixel on board -#define MICROPY_HW_BOARD_NAME "NodeMCU-32-S2 w/ESP-12K 08" -#define MICROPY_HW_MCU_NAME "ESP-12K 08" +#define MICROPY_HW_BOARD_NAME "ESP 12k NodeMCU" +#define MICROPY_HW_MCU_NAME "ESP-12K" // #define MICROPY_HW_NEOPIXEL (&pin_GPIO18) diff --git a/ports/esp32s2/ai_thinker_esp_12k/mpconfigboard.mk b/ports/esp32s2/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk similarity index 89% rename from ports/esp32s2/ai_thinker_esp_12k/mpconfigboard.mk rename to ports/esp32s2/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk index 997e9ebe76..08baf474ee 100644 --- a/ports/esp32s2/ai_thinker_esp_12k/mpconfigboard.mk +++ b/ports/esp32s2/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk @@ -1,6 +1,6 @@ USB_VID = 0x612B USB_PID = 0x80A7 -USB_PRODUCT = "NodeMCU-32-S2 w/ESP-12K 08" +USB_PRODUCT = "ESP 12k NodeMCU" USB_MANUFACTURER = "Ai-Thinker" INTERNAL_FLASH_FILESYSTEM = 1 diff --git a/ports/esp32s2/ai_thinker_esp_12k/pins.c b/ports/esp32s2/ai_thinker_esp_12k_nodemcu/pins.c similarity index 100% rename from ports/esp32s2/ai_thinker_esp_12k/pins.c rename to ports/esp32s2/ai_thinker_esp_12k_nodemcu/pins.c diff --git a/ports/esp32s2/ai_thinker_esp_12k/sdkconfig b/ports/esp32s2/ai_thinker_esp_12k_nodemcu/sdkconfig similarity index 100% rename from ports/esp32s2/ai_thinker_esp_12k/sdkconfig rename to ports/esp32s2/ai_thinker_esp_12k_nodemcu/sdkconfig From 7a48fc05b407f0046d2b17c0471a5152cf0d1575 Mon Sep 17 00:00:00 2001 From: codetyphon Date: Sun, 15 Aug 2021 13:29:42 +0800 Subject: [PATCH 7/8] fix ai-tinker-esp-12k path --- ports/esp32s2/{ => boards}/ai_thinker_esp_12k_nodemcu/board.c | 0 .../{ => boards}/ai_thinker_esp_12k_nodemcu/mpconfigboard.h | 0 .../{ => boards}/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk | 0 ports/esp32s2/{ => boards}/ai_thinker_esp_12k_nodemcu/pins.c | 0 ports/esp32s2/{ => boards}/ai_thinker_esp_12k_nodemcu/sdkconfig | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename ports/esp32s2/{ => boards}/ai_thinker_esp_12k_nodemcu/board.c (100%) rename ports/esp32s2/{ => boards}/ai_thinker_esp_12k_nodemcu/mpconfigboard.h (100%) rename ports/esp32s2/{ => boards}/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk (100%) rename ports/esp32s2/{ => boards}/ai_thinker_esp_12k_nodemcu/pins.c (100%) rename ports/esp32s2/{ => boards}/ai_thinker_esp_12k_nodemcu/sdkconfig (100%) diff --git a/ports/esp32s2/ai_thinker_esp_12k_nodemcu/board.c b/ports/esp32s2/boards/ai_thinker_esp_12k_nodemcu/board.c similarity index 100% rename from ports/esp32s2/ai_thinker_esp_12k_nodemcu/board.c rename to ports/esp32s2/boards/ai_thinker_esp_12k_nodemcu/board.c diff --git a/ports/esp32s2/ai_thinker_esp_12k_nodemcu/mpconfigboard.h b/ports/esp32s2/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h similarity index 100% rename from ports/esp32s2/ai_thinker_esp_12k_nodemcu/mpconfigboard.h rename to ports/esp32s2/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h diff --git a/ports/esp32s2/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk b/ports/esp32s2/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk similarity index 100% rename from ports/esp32s2/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk rename to ports/esp32s2/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk diff --git a/ports/esp32s2/ai_thinker_esp_12k_nodemcu/pins.c b/ports/esp32s2/boards/ai_thinker_esp_12k_nodemcu/pins.c similarity index 100% rename from ports/esp32s2/ai_thinker_esp_12k_nodemcu/pins.c rename to ports/esp32s2/boards/ai_thinker_esp_12k_nodemcu/pins.c diff --git a/ports/esp32s2/ai_thinker_esp_12k_nodemcu/sdkconfig b/ports/esp32s2/boards/ai_thinker_esp_12k_nodemcu/sdkconfig similarity index 100% rename from ports/esp32s2/ai_thinker_esp_12k_nodemcu/sdkconfig rename to ports/esp32s2/boards/ai_thinker_esp_12k_nodemcu/sdkconfig From fd8fe6f013823b862f86ed5f0205826c61f91382 Mon Sep 17 00:00:00 2001 From: codetyphon Date: Sun, 15 Aug 2021 20:39:53 +0800 Subject: [PATCH 8/8] Update ports/esp32s2/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h Co-authored-by: Dan Halbert --- ports/esp32s2/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/esp32s2/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h b/ports/esp32s2/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h index 90029273c4..1af2d2420c 100644 --- a/ports/esp32s2/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h +++ b/ports/esp32s2/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h @@ -29,7 +29,7 @@ // Same setup as the Saola board but with no Neopixel on board #define MICROPY_HW_BOARD_NAME "ESP 12k NodeMCU" -#define MICROPY_HW_MCU_NAME "ESP-12K" +#define MICROPY_HW_MCU_NAME "ESP32S2" // #define MICROPY_HW_NEOPIXEL (&pin_GPIO18)