From f2a14c539240d4da78977e1a9f5c1900ccd51b6b Mon Sep 17 00:00:00 2001 From: Glodigit Date: Tue, 11 Feb 2025 21:48:20 +0000 Subject: [PATCH 1/5] set up red s2-wroom --- .../boards/esp32-s2-wroom_red/board.c | 9 +++ .../boards/esp32-s2-wroom_red/mpconfigboard.h | 12 ++++ .../esp32-s2-wroom_red/mpconfigboard.mk | 11 ++++ .../boards/esp32-s2-wroom_red/pins.c | 55 +++++++++++++++++++ .../boards/esp32-s2-wroom_red/sdkconfig | 0 5 files changed, 87 insertions(+) create mode 100644 ports/espressif/boards/esp32-s2-wroom_red/board.c create mode 100644 ports/espressif/boards/esp32-s2-wroom_red/mpconfigboard.h create mode 100644 ports/espressif/boards/esp32-s2-wroom_red/mpconfigboard.mk create mode 100644 ports/espressif/boards/esp32-s2-wroom_red/pins.c create mode 100644 ports/espressif/boards/esp32-s2-wroom_red/sdkconfig diff --git a/ports/espressif/boards/esp32-s2-wroom_red/board.c b/ports/espressif/boards/esp32-s2-wroom_red/board.c new file mode 100644 index 0000000000000..a3a9eec047145 --- /dev/null +++ b/ports/espressif/boards/esp32-s2-wroom_red/board.c @@ -0,0 +1,9 @@ +// This file is part of the CircuitPython project: https://circuitpython.org +// +// SPDX-FileCopyrightText: Copyright (c) 2020 Scott Shawcroft for Adafruit Industries +// +// SPDX-License-Identifier: MIT + +#include "supervisor/board.h" + +// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here. diff --git a/ports/espressif/boards/esp32-s2-wroom_red/mpconfigboard.h b/ports/espressif/boards/esp32-s2-wroom_red/mpconfigboard.h new file mode 100644 index 0000000000000..24a5948e0c1a0 --- /dev/null +++ b/ports/espressif/boards/esp32-s2-wroom_red/mpconfigboard.h @@ -0,0 +1,12 @@ +// This file is part of the CircuitPython project: https://circuitpython.org +// +// SPDX-FileCopyrightText: Copyright (c) 2019 Scott Shawcroft for Adafruit Industries +// +// SPDX-License-Identifier: MIT + +#pragma once + +// Micropython setup + +#define MICROPY_HW_BOARD_NAME "Red S2-WROOM" +#define MICROPY_HW_MCU_NAME "ESP32S2" diff --git a/ports/espressif/boards/esp32-s2-wroom_red/mpconfigboard.mk b/ports/espressif/boards/esp32-s2-wroom_red/mpconfigboard.mk new file mode 100644 index 0000000000000..cd3519fd89dd2 --- /dev/null +++ b/ports/espressif/boards/esp32-s2-wroom_red/mpconfigboard.mk @@ -0,0 +1,11 @@ +USB_VID = 0x303A +USB_PID = 0x0002 +USB_PRODUCT = "ESP32-S2" +USB_MANUFACTURER = "Espressif" + +IDF_TARGET = esp32s2 + +CIRCUITPY_ESP_FLASH_MODE = qio +CIRCUITPY_ESP_FLASH_FREQ = 80m +CIRCUITPY_ESP_FLASH_SIZE = 4MB +CIRCUITPY_ESPCAMERA = 0 diff --git a/ports/espressif/boards/esp32-s2-wroom_red/pins.c b/ports/espressif/boards/esp32-s2-wroom_red/pins.c new file mode 100644 index 0000000000000..fde0b9d6f489e --- /dev/null +++ b/ports/espressif/boards/esp32-s2-wroom_red/pins.c @@ -0,0 +1,55 @@ +// This file is part of the CircuitPython project: https://circuitpython.org +// +// SPDX-FileCopyrightText: Copyright (c) 2020 Scott Shawcroft for Adafruit Industries +// +// SPDX-License-Identifier: MIT + +#include "shared-bindings/board/__init__.h" + +static const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { 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_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); diff --git a/ports/espressif/boards/esp32-s2-wroom_red/sdkconfig b/ports/espressif/boards/esp32-s2-wroom_red/sdkconfig new file mode 100644 index 0000000000000..e69de29bb2d1d From b3ebef86e9c8c6c446029046aefa35b646f86962 Mon Sep 17 00:00:00 2001 From: Glodigit Date: Tue, 11 Feb 2025 22:38:16 +0000 Subject: [PATCH 2/5] swap order --- ports/espressif/boards/esp32-s2-wroom_red/pins.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/espressif/boards/esp32-s2-wroom_red/pins.c b/ports/espressif/boards/esp32-s2-wroom_red/pins.c index fde0b9d6f489e..1e0be2b4e8a09 100644 --- a/ports/espressif/boards/esp32-s2-wroom_red/pins.c +++ b/ports/espressif/boards/esp32-s2-wroom_red/pins.c @@ -44,10 +44,10 @@ static const mp_rom_map_elem_t board_module_globals_table[] = { { 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_TX), MP_ROM_PTR(&pin_GPIO43) }, { MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44) }, + { MP_ROM_QSTR(MP_QSTR_RX), 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) }, From 91947e2ff8b36f0a7baea0c2c3008e7e15816e46 Mon Sep 17 00:00:00 2001 From: Glodigit Date: Tue, 11 Feb 2025 23:03:42 +0000 Subject: [PATCH 3/5] rename folder to red-s2-wroom --- .../espressif/boards/{esp32-s2-wroom_red => red-s2-wroom}/board.c | 0 .../boards/{esp32-s2-wroom_red => red-s2-wroom}/mpconfigboard.h | 0 .../boards/{esp32-s2-wroom_red => red-s2-wroom}/mpconfigboard.mk | 0 .../espressif/boards/{esp32-s2-wroom_red => red-s2-wroom}/pins.c | 0 .../boards/{esp32-s2-wroom_red => red-s2-wroom}/sdkconfig | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename ports/espressif/boards/{esp32-s2-wroom_red => red-s2-wroom}/board.c (100%) rename ports/espressif/boards/{esp32-s2-wroom_red => red-s2-wroom}/mpconfigboard.h (100%) rename ports/espressif/boards/{esp32-s2-wroom_red => red-s2-wroom}/mpconfigboard.mk (100%) rename ports/espressif/boards/{esp32-s2-wroom_red => red-s2-wroom}/pins.c (100%) rename ports/espressif/boards/{esp32-s2-wroom_red => red-s2-wroom}/sdkconfig (100%) diff --git a/ports/espressif/boards/esp32-s2-wroom_red/board.c b/ports/espressif/boards/red-s2-wroom/board.c similarity index 100% rename from ports/espressif/boards/esp32-s2-wroom_red/board.c rename to ports/espressif/boards/red-s2-wroom/board.c diff --git a/ports/espressif/boards/esp32-s2-wroom_red/mpconfigboard.h b/ports/espressif/boards/red-s2-wroom/mpconfigboard.h similarity index 100% rename from ports/espressif/boards/esp32-s2-wroom_red/mpconfigboard.h rename to ports/espressif/boards/red-s2-wroom/mpconfigboard.h diff --git a/ports/espressif/boards/esp32-s2-wroom_red/mpconfigboard.mk b/ports/espressif/boards/red-s2-wroom/mpconfigboard.mk similarity index 100% rename from ports/espressif/boards/esp32-s2-wroom_red/mpconfigboard.mk rename to ports/espressif/boards/red-s2-wroom/mpconfigboard.mk diff --git a/ports/espressif/boards/esp32-s2-wroom_red/pins.c b/ports/espressif/boards/red-s2-wroom/pins.c similarity index 100% rename from ports/espressif/boards/esp32-s2-wroom_red/pins.c rename to ports/espressif/boards/red-s2-wroom/pins.c diff --git a/ports/espressif/boards/esp32-s2-wroom_red/sdkconfig b/ports/espressif/boards/red-s2-wroom/sdkconfig similarity index 100% rename from ports/espressif/boards/esp32-s2-wroom_red/sdkconfig rename to ports/espressif/boards/red-s2-wroom/sdkconfig From 6ef28ae040e29a7a84c5389b650a0bee0441cf4b Mon Sep 17 00:00:00 2001 From: Glodigit Date: Thu, 20 Feb 2025 15:35:10 +0000 Subject: [PATCH 4/5] PID from espressif/usb-pids/pull/221 --- ports/espressif/boards/red-s2-wroom/mpconfigboard.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/espressif/boards/red-s2-wroom/mpconfigboard.mk b/ports/espressif/boards/red-s2-wroom/mpconfigboard.mk index cd3519fd89dd2..baafa601e74b9 100644 --- a/ports/espressif/boards/red-s2-wroom/mpconfigboard.mk +++ b/ports/espressif/boards/red-s2-wroom/mpconfigboard.mk @@ -1,5 +1,5 @@ USB_VID = 0x303A -USB_PID = 0x0002 +USB_PID = 0x82C4 USB_PRODUCT = "ESP32-S2" USB_MANUFACTURER = "Espressif" From ac5014acddd0144600d255dad4480b91554b7b74 Mon Sep 17 00:00:00 2001 From: Glodigit Date: Thu, 20 Feb 2025 20:26:09 +0000 Subject: [PATCH 5/5] Update product/manufacturer to describe the board. --- ports/espressif/boards/red-s2-wroom/mpconfigboard.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/espressif/boards/red-s2-wroom/mpconfigboard.mk b/ports/espressif/boards/red-s2-wroom/mpconfigboard.mk index baafa601e74b9..e12fb443f6d1b 100644 --- a/ports/espressif/boards/red-s2-wroom/mpconfigboard.mk +++ b/ports/espressif/boards/red-s2-wroom/mpconfigboard.mk @@ -1,7 +1,7 @@ USB_VID = 0x303A USB_PID = 0x82C4 -USB_PRODUCT = "ESP32-S2" -USB_MANUFACTURER = "Espressif" +USB_PRODUCT = "ESP32-S2-WROOM" +USB_MANUFACTURER = "Unknown" IDF_TARGET = esp32s2