Skip to content

Commit 42b2b63

Browse files
tannewttannewt
authored
Merge pull request #8352 from tirtharajsinha/main
added new board - esp32 s3 pico
2 parents e776f38 + da3dfd7 commit 42b2b63

File tree

6 files changed

+191
-6
lines changed

6 files changed

+191
-6
lines changed

‎locale/circuitpython.pot

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,17 @@ msgid ""
8989
msgstr ""
9090

9191
#: ports/atmel-samd/common-hal/alarm/__init__.c
92+
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
9293
#: ports/cxd56/common-hal/analogio/AnalogOut.c ports/cxd56/common-hal/rtc/RTC.c
94+
#: ports/espressif/common-hal/audiobusio/I2SOut.c
9395
#: ports/espressif/common-hal/rtc/RTC.c
9496
#: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c
9597
#: ports/mimxrt10xx/common-hal/rtc/RTC.c ports/nrf/common-hal/alarm/__init__.c
96-
#: ports/nrf/common-hal/analogio/AnalogOut.c ports/nrf/common-hal/rtc/RTC.c
98+
#: ports/nrf/common-hal/analogio/AnalogOut.c
99+
#: ports/nrf/common-hal/audiobusio/I2SOut.c ports/nrf/common-hal/rtc/RTC.c
97100
#: ports/raspberrypi/common-hal/alarm/__init__.c
98101
#: ports/raspberrypi/common-hal/analogio/AnalogOut.c
102+
#: ports/raspberrypi/common-hal/audiobusio/I2SOut.c
99103
#: ports/raspberrypi/common-hal/rtc/RTC.c ports/stm/common-hal/alarm/__init__.c
100104
#: ports/stm/common-hal/canio/Listener.c ports/stm/common-hal/rtc/RTC.c
101105
#: shared-bindings/audiobusio/I2SOut.c shared-bindings/audiobusio/PDMIn.c
@@ -2948,7 +2952,7 @@ msgstr ""
29482952
msgid "empty file"
29492953
msgstr ""
29502954

2951-
#: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
2955+
#: extmod/moduasyncio.c extmod/moduheapq.c
29522956
msgid "empty heap"
29532957
msgstr ""
29542958

@@ -3899,10 +3903,6 @@ msgstr ""
38993903
msgid "pull masks conflict with direction masks"
39003904
msgstr ""
39013905

3902-
#: extmod/modutimeq.c
3903-
msgid "queue overflow"
3904-
msgstr ""
3905-
39063906
#: py/parse.c
39073907
msgid "raw f-strings are not supported"
39083908
msgstr ""

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

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
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+
// Debug UART
33+
#ifdef DEBUG
34+
common_hal_never_reset_pin(&pin_GPIO43);
35+
common_hal_never_reset_pin(&pin_GPIO44);
36+
#endif
37+
}
38+
39+
40+
// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
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 "Waveshare ESP32-S3-Pico"
30+
#define MICROPY_HW_MCU_NAME "ESP32S3"
31+
32+
#define MICROPY_HW_NEOPIXEL (&pin_GPIO21)
33+
34+
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
35+
36+
#define DEFAULT_UART_BUS_RX (&pin_GPIO12)
37+
#define DEFAULT_UART_BUS_TX (&pin_GPIO11)

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
USB_VID = 0x303a
2+
USB_PID = 0x81A3
3+
USB_PRODUCT = "ESP32-S3-Pico"
4+
USB_MANUFACTURER = "Waveshare Electronics"
5+
6+
IDF_TARGET = esp32s3
7+
8+
CIRCUITPY_ESP_FLASH_MODE = dio
9+
CIRCUITPY_ESP_FLASH_FREQ = 80m
10+
CIRCUITPY_ESP_FLASH_SIZE = 16MB

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

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
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_IO40), MP_ROM_PTR(&pin_GPIO40) },
34+
{ MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41) },
35+
{ MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) },
36+
37+
38+
39+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO21) },
40+
41+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO11) },
42+
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO12) },
43+
44+
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
45+
46+
47+
48+
49+
50+
};
51+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

‎ports/espressif/boards/waveshare_esp32_s3_pico/sdkconfig

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
#
2+
# Component config
3+
#
4+
#
5+
# ESP32S3-Specific
6+
#
7+
CONFIG_ESP32S3_SPIRAM_SUPPORT=y
8+
#
9+
# SPI RAM config
10+
#
11+
CONFIG_SPIRAM_MODE_QUAD=y
12+
# CONFIG_SPIRAM_MODE_OCT is not set
13+
# CONFIG_SPIRAM_TYPE_AUTO is not set
14+
CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
15+
# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
16+
# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
17+
CONFIG_SPIRAM_SIZE=2097152
18+
#
19+
# PSRAM Clock and CS IO for ESP32S3
20+
#
21+
CONFIG_DEFAULT_PSRAM_CLK_IO=30
22+
CONFIG_DEFAULT_PSRAM_CS_IO=26
23+
# end of PSRAM Clock and CS IO for ESP32S3
24+
25+
# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
26+
# CONFIG_SPIRAM_RODATA is not set
27+
# CONFIG_SPIRAM_SPEED_120M is not set
28+
CONFIG_SPIRAM_SPEED_80M=y
29+
# CONFIG_SPIRAM_SPEED_40M is not set
30+
CONFIG_SPIRAM=y
31+
CONFIG_SPIRAM_BOOT_INIT=y
32+
# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
33+
CONFIG_SPIRAM_USE_MEMMAP=y
34+
# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
35+
# CONFIG_SPIRAM_USE_MALLOC is not set
36+
CONFIG_SPIRAM_MEMTEST=y
37+
# end of SPI RAM config
38+
39+
# end of ESP32S3-Specific
40+
41+
#
42+
# LWIP
43+
#
44+
CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3"
45+
# end of LWIP
46+
47+
# end of Component config

0 commit comments

Comments
 (0)