Skip to content

Commit 71c41cd

Browse files
dhalbertdhalbert
authored
Merge pull request #5661 from jepler/esp32s3-box
Add support for esp32s3-box
2 parents 1f430cf + 2ad877a commit 71c41cd

File tree

6 files changed

+201
-2
lines changed

6 files changed

+201
-2
lines changed

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

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
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+
// SPI Flash and RAM
43+
common_hal_never_reset_pin(&pin_GPIO26);
44+
common_hal_never_reset_pin(&pin_GPIO27);
45+
common_hal_never_reset_pin(&pin_GPIO28);
46+
common_hal_never_reset_pin(&pin_GPIO29);
47+
common_hal_never_reset_pin(&pin_GPIO30);
48+
common_hal_never_reset_pin(&pin_GPIO31);
49+
common_hal_never_reset_pin(&pin_GPIO32);
50+
common_hal_never_reset_pin(&pin_GPIO33);
51+
common_hal_never_reset_pin(&pin_GPIO34);
52+
common_hal_never_reset_pin(&pin_GPIO35);
53+
common_hal_never_reset_pin(&pin_GPIO36);
54+
common_hal_never_reset_pin(&pin_GPIO37);
55+
}
56+
57+
bool board_requests_safe_mode(void) {
58+
return false;
59+
}
60+
61+
void reset_board(void) {
62+
63+
}
64+
65+
void board_deinit(void) {
66+
}

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
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-Box-2.5"
30+
#define MICROPY_HW_MCU_NAME "ESP32S3"
31+
32+
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
33+
34+
#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
35+
36+
#define AUTORESET_DELAY_MS 500

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
USB_VID = 0x303A
2+
USB_PID = 0x7007
3+
USB_PRODUCT = "ESP32-S3-Box-2.5"
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=16MB

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

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
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+
// First PMOD connector
7+
{ MP_ROM_QSTR(MP_QSTR_G9), MP_ROM_PTR(&pin_GPIO9) },
8+
9+
{ MP_ROM_QSTR(MP_QSTR_U0TXD), MP_ROM_PTR(&pin_GPIO43) },
10+
{ MP_ROM_QSTR(MP_QSTR_G43), MP_ROM_PTR(&pin_GPIO43) },
11+
12+
{ MP_ROM_QSTR(MP_QSTR_U0RXD), MP_ROM_PTR(&pin_GPIO44) },
13+
{ MP_ROM_QSTR(MP_QSTR_G44), MP_ROM_PTR(&pin_GPIO44) },
14+
15+
{ MP_ROM_QSTR(MP_QSTR_CS), MP_ROM_PTR(&pin_GPIO10) },
16+
{ MP_ROM_QSTR(MP_QSTR_G10), MP_ROM_PTR(&pin_GPIO10) },
17+
18+
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO11) },
19+
{ MP_ROM_QSTR(MP_QSTR_G11), MP_ROM_PTR(&pin_GPIO11) },
20+
21+
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO13) },
22+
{ MP_ROM_QSTR(MP_QSTR_G13), MP_ROM_PTR(&pin_GPIO13) },
23+
24+
{ MP_ROM_QSTR(MP_QSTR_CLK), MP_ROM_PTR(&pin_GPIO12) },
25+
{ MP_ROM_QSTR(MP_QSTR_G12), MP_ROM_PTR(&pin_GPIO12) },
26+
27+
{ MP_ROM_QSTR(MP_QSTR_G14), MP_ROM_PTR(&pin_GPIO14) },
28+
29+
// Second PMOD connector
30+
{ MP_ROM_QSTR(MP_QSTR_G38), MP_ROM_PTR(&pin_GPIO38) },
31+
{ MP_ROM_QSTR(MP_QSTR_G39), MP_ROM_PTR(&pin_GPIO39) },
32+
{ MP_ROM_QSTR(MP_QSTR_SCL2), MP_ROM_PTR(&pin_GPIO40) },
33+
{ MP_ROM_QSTR(MP_QSTR_G40), MP_ROM_PTR(&pin_GPIO40) },
34+
{ MP_ROM_QSTR(MP_QSTR_SDA2), MP_ROM_PTR(&pin_GPIO41) },
35+
{ MP_ROM_QSTR(MP_QSTR_G41), MP_ROM_PTR(&pin_GPIO41) },
36+
{ MP_ROM_QSTR(MP_QSTR_G42), MP_ROM_PTR(&pin_GPIO42) },
37+
{ MP_ROM_QSTR(MP_QSTR_G21), MP_ROM_PTR(&pin_GPIO21) },
38+
39+
// LCD & touchscreen
40+
{ MP_ROM_QSTR(MP_QSTR_LCD_DC), MP_ROM_PTR(&pin_GPIO4) },
41+
{ MP_ROM_QSTR(MP_QSTR_LCD_CS), MP_ROM_PTR(&pin_GPIO5) },
42+
{ MP_ROM_QSTR(MP_QSTR_LCD_MOSI), MP_ROM_PTR(&pin_GPIO6) },
43+
{ MP_ROM_QSTR(MP_QSTR_LCD_SCK), MP_ROM_PTR(&pin_GPIO7) },
44+
{ MP_ROM_QSTR(MP_QSTR_LCD_RST), MP_ROM_PTR(&pin_GPIO48) },
45+
{ MP_ROM_QSTR(MP_QSTR_LCD_CTRL), MP_ROM_PTR(&pin_GPIO45) },
46+
{ MP_ROM_QSTR(MP_QSTR_CTP_INT), MP_ROM_PTR(&pin_GPIO3) },
47+
48+
// Audio
49+
{ MP_ROM_QSTR(MP_QSTR_I2S_ADC_SDOUT), MP_ROM_PTR(&pin_GPIO16) },
50+
{ MP_ROM_QSTR(MP_QSTR_I2S_MCLK), MP_ROM_PTR(&pin_GPIO2) },
51+
{ MP_ROM_QSTR(MP_QSTR_I2S_SCLK), MP_ROM_PTR(&pin_GPIO17) },
52+
{ MP_ROM_QSTR(MP_QSTR_I2S_LRCK), MP_ROM_PTR(&pin_GPIO47) },
53+
{ MP_ROM_QSTR(MP_QSTR_I2S_CODEC_DSDIN), MP_ROM_PTR(&pin_GPIO15) },
54+
{ MP_ROM_QSTR(MP_QSTR_PA_CTRL), MP_ROM_PTR(&pin_GPIO46) },
55+
{ MP_ROM_QSTR(MP_QSTR_MUTE_STATUS), MP_ROM_PTR(&pin_GPIO1) },
56+
57+
// Internal I2C bus
58+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO8) },
59+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO18) },
60+
61+
// boot button, also usable as a software button
62+
{ MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO0) },
63+
};
64+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

‎ports/espressif/boards/espressif_esp32s3_box/sdkconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
CONFIG_ESP32S3_SPIRAM_SUPPORT=y
2+
CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3"
3+
CONFIG_SPIRAM_BOOT_INIT=y
4+
CONFIG_SPIRAM_MEMTEST=y
5+
CONFIG_SPIRAM_MODE_OCT=y
6+
CONFIG_SPIRAM_SPEED_80M=y
7+
CONFIG_SPIRAM_TYPE_AUTO=y
8+
CONFIG_SPIRAM_USE_MALLOC=n
9+
CONFIG_SPIRAM=y

‎ports/espressif/supervisor/port.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@
7777

7878
#include "esp_debug_helpers.h"
7979

80+
#ifdef CONFIG_SPIRAM
81+
#include "esp32/spiram.h"
82+
#endif
83+
8084
#define HEAP_SIZE (48 * 1024)
8185

8286
uint32_t *heap;
@@ -158,8 +162,11 @@ safe_mode_t port_init(void) {
158162
#endif
159163

160164
#ifdef CONFIG_SPIRAM
161-
heap = (uint32_t *)(DRAM0_CACHE_ADDRESS_HIGH - CONFIG_SPIRAM_SIZE);
162-
heap_size = CONFIG_SPIRAM_SIZE / sizeof(uint32_t);
165+
if (esp_spiram_is_initialized()) {
166+
size_t spiram_size = esp_spiram_get_size();
167+
heap = (uint32_t *)(SOC_EXTRAM_DATA_HIGH - spiram_size);
168+
heap_size = spiram_size / sizeof(uint32_t);
169+
}
163170
#endif
164171

165172
if (heap == NULL) {

0 commit comments

Comments
 (0)