Skip to content

Commit 2233026

Browse files
tannewttannewt
authored
Merge pull request #5848 from prplz/esp32s3-devkits
Esp32s3 devkits
2 parents 936c9b2 + 1cd98fe commit 2233026

File tree

16 files changed

+212
-6
lines changed

16 files changed

+212
-6
lines changed

‎ports/espressif/boards/espressif_esp32s3_devkitc_1/board.c renamed to ‎ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/board.c

File renamed without changes.

‎ports/espressif/boards/espressif_esp32s3_devkitc_1/mpconfigboard.h renamed to ‎ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
// Micropython setup
2828

29-
#define MICROPY_HW_BOARD_NAME "ESP32-S3-DevKitC-1"
29+
#define MICROPY_HW_BOARD_NAME "ESP32-S3-DevKitC-1-N8"
3030
#define MICROPY_HW_MCU_NAME "ESP32S3"
3131

3232
#define MICROPY_HW_NEOPIXEL (&pin_GPIO48)

‎ports/espressif/boards/espressif_esp32s3_devkitc_1/mpconfigboard.mk renamed to ‎ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
USB_VID = 0x303A
22
USB_PID = 0x7003
3-
USB_PRODUCT = "ESP32-S3-DevKitC-1"
3+
USB_PRODUCT = "ESP32-S3-DevKitC-1-N8"
44
USB_MANUFACTURER = "Espressif"
55

66
IDF_TARGET = esp32s3

‎ports/espressif/boards/espressif_esp32s3_devkitc_1/pins.c renamed to ‎ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/pins.c

File renamed without changes.

‎ports/espressif/boards/espressif_esp32s3_devkitc_1_nopsram/sdkconfig renamed to ‎ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/sdkconfig

File renamed without changes.

‎ports/espressif/boards/espressif_esp32s3_devkitc_1_nopsram/board.c renamed to ‎ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/board.c

File renamed without changes.

‎ports/espressif/boards/espressif_esp32s3_devkitc_1_nopsram/mpconfigboard.h renamed to ‎ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
// Micropython setup
2828

29-
#define MICROPY_HW_BOARD_NAME "ESP32-S3-DevKitC-1-nopsram"
29+
#define MICROPY_HW_BOARD_NAME "ESP32-S3-DevKitC-1-N8R2"
3030
#define MICROPY_HW_MCU_NAME "ESP32S3"
3131

3232
#define MICROPY_HW_NEOPIXEL (&pin_GPIO48)

‎ports/espressif/boards/espressif_esp32s3_devkitc_1_nopsram/mpconfigboard.mk renamed to ‎ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
USB_VID = 0x303A
22
USB_PID = 0x7003
3-
USB_PRODUCT = "ESP32-S3-DevKitC-1-nopsram"
3+
USB_PRODUCT = "ESP32-S3-DevKitC-1-N8R2"
44
USB_MANUFACTURER = "Espressif"
55

66
IDF_TARGET = esp32s3

‎ports/espressif/boards/espressif_esp32s3_devkitc_1_nopsram/pins.c renamed to ‎ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/pins.c

File renamed without changes.

‎ports/espressif/boards/espressif_esp32s3_devkitc_1/sdkconfig renamed to ‎ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/sdkconfig

File renamed without changes.

‎ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/board.c

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
7+
*
8+
* Permission is hereby granted, free of charge, to any person obtaining a copy
9+
* of this software and associated documentation files (the "Software"), to deal
10+
* in the Software without restriction, including without limitation the rights
11+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12+
* copies of the Software, and to permit persons to whom the Software is
13+
* furnished to do so, subject to the following conditions:
14+
*
15+
* The above copyright notice and this permission notice shall be included in
16+
* all copies or substantial portions of the Software.
17+
*
18+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24+
* THE SOFTWARE.
25+
*/
26+
27+
#include "supervisor/board.h"
28+
#include "mpconfigboard.h"
29+
#include "shared-bindings/microcontroller/Pin.h"
30+
31+
void board_init(void) {
32+
// USB
33+
common_hal_never_reset_pin(&pin_GPIO19);
34+
common_hal_never_reset_pin(&pin_GPIO20);
35+
36+
// Debug UART
37+
#ifdef DEBUG
38+
common_hal_never_reset_pin(&pin_GPIO43);
39+
common_hal_never_reset_pin(&pin_GPIO44);
40+
#endif
41+
42+
43+
// SPI Flash and RAM
44+
common_hal_never_reset_pin(&pin_GPIO26);
45+
common_hal_never_reset_pin(&pin_GPIO27);
46+
common_hal_never_reset_pin(&pin_GPIO28);
47+
common_hal_never_reset_pin(&pin_GPIO29);
48+
common_hal_never_reset_pin(&pin_GPIO30);
49+
common_hal_never_reset_pin(&pin_GPIO31);
50+
common_hal_never_reset_pin(&pin_GPIO32);
51+
common_hal_never_reset_pin(&pin_GPIO33);
52+
common_hal_never_reset_pin(&pin_GPIO34);
53+
common_hal_never_reset_pin(&pin_GPIO35);
54+
common_hal_never_reset_pin(&pin_GPIO36);
55+
common_hal_never_reset_pin(&pin_GPIO37);
56+
}
57+
58+
bool board_requests_safe_mode(void) {
59+
return false;
60+
}
61+
62+
void reset_board(void) {
63+
64+
}
65+
66+
void board_deinit(void) {
67+
}

‎ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.h

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2019 Scott Shawcroft for Adafruit Industries
7+
*
8+
* Permission is hereby granted, free of charge, to any person obtaining a copy
9+
* of this software and associated documentation files (the "Software"), to deal
10+
* in the Software without restriction, including without limitation the rights
11+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12+
* copies of the Software, and to permit persons to whom the Software is
13+
* furnished to do so, subject to the following conditions:
14+
*
15+
* The above copyright notice and this permission notice shall be included in
16+
* all copies or substantial portions of the Software.
17+
*
18+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24+
* THE SOFTWARE.
25+
*/
26+
27+
// Micropython setup
28+
29+
#define MICROPY_HW_BOARD_NAME "ESP32-S3-DevKitC-1-N8R8"
30+
#define MICROPY_HW_MCU_NAME "ESP32S3"
31+
32+
#define MICROPY_HW_NEOPIXEL (&pin_GPIO48)
33+
34+
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
35+
36+
#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
37+
38+
#define AUTORESET_DELAY_MS 500

‎ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.mk

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
USB_VID = 0x303A
2+
USB_PID = 0x7003
3+
USB_PRODUCT = "ESP32-S3-DevKitC-1-N8R8"
4+
USB_MANUFACTURER = "Espressif"
5+
6+
IDF_TARGET = esp32s3
7+
8+
INTERNAL_FLASH_FILESYSTEM = 1
9+
LONGINT_IMPL = MPZ
10+
11+
# The default queue depth of 16 overflows on release builds,
12+
# so increase it to 32.
13+
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
14+
15+
CIRCUITPY_ESP_FLASH_MODE=dio
16+
CIRCUITPY_ESP_FLASH_FREQ=80m
17+
CIRCUITPY_ESP_FLASH_SIZE=8MB

‎ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/pins.c

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
#include "shared-bindings/board/__init__.h"
2+
3+
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
4+
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
5+
6+
{ MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },
7+
{ MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },
8+
{ MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },
9+
{ MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },
10+
{ MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
11+
{ MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
12+
{ MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },
13+
{ MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
14+
{ MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
15+
{ MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
16+
{ MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
17+
{ MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },
18+
{ MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
19+
{ MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
20+
{ MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },
21+
{ MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },
22+
{ MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) },
23+
{ MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) },
24+
{ MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },
25+
{ MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) },
26+
{ MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) },
27+
{ MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
28+
{ MP_ROM_QSTR(MP_QSTR_IO35), MP_ROM_PTR(&pin_GPIO35) },
29+
{ MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) },
30+
{ MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) },
31+
{ MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) },
32+
{ MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) },
33+
{ MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41) },
34+
{ MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) },
35+
{ MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) },
36+
{ MP_ROM_QSTR(MP_QSTR_TXD0), MP_ROM_PTR(&pin_GPIO43) },
37+
{ MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44) },
38+
{ MP_ROM_QSTR(MP_QSTR_TXD1), MP_ROM_PTR(&pin_GPIO44) },
39+
{ MP_ROM_QSTR(MP_QSTR_IO45), MP_ROM_PTR(&pin_GPIO45) },
40+
{ MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46) },
41+
{ MP_ROM_QSTR(MP_QSTR_IO47), MP_ROM_PTR(&pin_GPIO47) },
42+
{ MP_ROM_QSTR(MP_QSTR_IO48), MP_ROM_PTR(&pin_GPIO48) },
43+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO48) },
44+
};
45+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

‎ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/sdkconfig

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
CONFIG_ESP32S3_SPIRAM_SUPPORT=y
2+
3+
#
4+
# SPI RAM config
5+
#
6+
CONFIG_SPIRAM_MODE_OCT=y
7+
CONFIG_SPIRAM_TYPE_ESPPSRAM64=y
8+
CONFIG_SPIRAM_SIZE=8388608
9+
10+
#
11+
# PSRAM clock and cs IO for ESP32S3
12+
#
13+
CONFIG_DEFAULT_PSRAM_CLK_IO=30
14+
CONFIG_DEFAULT_PSRAM_CS_IO=26
15+
# end of PSRAM clock and cs IO for ESP32S3
16+
17+
# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
18+
# CONFIG_SPIRAM_RODATA is not set
19+
CONFIG_SPIRAM_SPEED_80M=y
20+
# CONFIG_SPIRAM_SPEED_40M is not set
21+
# CONFIG_SPIRAM_SPEED_26M is not set
22+
# CONFIG_SPIRAM_SPEED_20M is not set
23+
CONFIG_SPIRAM=y
24+
CONFIG_SPIRAM_BOOT_INIT=y
25+
# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
26+
CONFIG_SPIRAM_USE_MEMMAP=y
27+
# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
28+
# CONFIG_SPIRAM_USE_MALLOC is not set
29+
CONFIG_SPIRAM_MEMTEST=y
30+
# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
31+
# end of SPI RAM config
32+
33+
#
34+
# LWIP
35+
#
36+
CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3"
37+
# end of LWIP
38+

‎tools/ci_check_duplicate_usb_vid_pid.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,9 @@
5151
"unexpectedmaker_feathers2_prerelease",
5252
"espressif_kaluga_1",
5353
"espressif_kaluga_1.3",
54-
"espressif_esp32s3_devkitc_1",
55-
"espressif_esp32s3_devkitc_1_nopsram",
54+
"espressif_esp32s3_devkitc_1_n8",
55+
"espressif_esp32s3_devkitc_1_n8r2",
56+
"espressif_esp32s3_devkitc_1_n8r8",
5657
"jpconstantineau_pykey18",
5758
"jpconstantineau_pykey44",
5859
"jpconstantineau_pykey60",

0 commit comments

Comments
 (0)