Skip to content

Commit feb6533

Browse files
tannewttannewt
authored
Merge pull request #6032 from prplz/esp32-c3s-2m
Add AI thinker esp32c3s 2M
2 parents 5a063c1 + 11bbe48 commit feb6533

File tree

11 files changed

+243
-4
lines changed

11 files changed

+243
-4
lines changed

‎ports/espressif/Makefile

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,14 @@ $(BUILD)/esp-idf:
307307
$(Q)$(MKDIR) -p $@
308308

309309
TARGET_SDKCONFIG = esp-idf-config/sdkconfig-$(IDF_TARGET).defaults
310-
FLASH_SDKCONFIG = esp-idf-config/sdkconfig-$(CIRCUITPY_ESP_FLASH_SIZE).defaults
310+
311+
UF2_BOOTLOADER ?= $(if $(filter $(IDF_TARGET),esp32s2 esp32s3),1)
312+
ifeq ($(UF2_BOOTLOADER), 1)
313+
FLASH_SDKCONFIG = esp-idf-config/sdkconfig-$(CIRCUITPY_ESP_FLASH_SIZE).defaults
314+
else
315+
FLASH_SDKCONFIG = esp-idf-config/sdkconfig-$(CIRCUITPY_ESP_FLASH_SIZE)-no-uf2.defaults
316+
endif
317+
311318
ifeq ($(DEBUG), 1)
312319
DEBUG_SDKCONFIG = esp-idf-config/sdkconfig-debug.defaults
313320
else
@@ -388,10 +395,10 @@ FLASH_FLAGS = --flash_mode $(CIRCUITPY_ESP_FLASH_MODE) --flash_freq $(CIRCUITPY_
388395

389396
ESPTOOL_FLAGS ?= --before=default_reset --after=no_reset
390397

391-
ifeq ($(IDF_TARGET),esp32c3)
392-
all: $(BUILD)/firmware.bin
393-
else
398+
ifeq ($(UF2_BOOTLOADER),1)
394399
all: $(BUILD)/firmware.bin $(BUILD)/firmware.uf2
400+
else
401+
all: $(BUILD)/firmware.bin
395402
endif
396403

397404
.PHONY: esp-idf-stamp

‎ports/espressif/boards/ai_thinker_esp32-c3s-2m/board.c

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2021 microDev
7+
* Copyright (c) 2021 skieast/Bruce Segal
8+
*
9+
* Permission is hereby granted, free of charge, to any person obtaining a copy
10+
* of this software and associated documentation files (the "Software"), to deal
11+
* in the Software without restriction, including without limitation the rights
12+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
13+
* copies of the Software, and to permit persons to whom the Software is
14+
* furnished to do so, subject to the following conditions:
15+
*
16+
* The above copyright notice and this permission notice shall be included in
17+
* all copies or substantial portions of the Software.
18+
*
19+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
20+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
21+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
22+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
23+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
24+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
25+
* THE SOFTWARE.
26+
*/
27+
28+
#include "shared-bindings/microcontroller/Pin.h"
29+
#include "supervisor/board.h"
30+
31+
void board_init(void) {
32+
// Debug UART
33+
#ifdef DEBUG
34+
common_hal_never_reset_pin(&pin_GPIO20);
35+
common_hal_never_reset_pin(&pin_GPIO21);
36+
#endif
37+
}
38+
39+
bool board_requests_safe_mode(void) {
40+
return false;
41+
}
42+
43+
void reset_board(void) {
44+
}
45+
46+
void board_deinit(void) {
47+
}

‎ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2021 microDev
7+
* Copyright (c) 2021 skieast/Bruce Segal
8+
*
9+
* Permission is hereby granted, free of charge, to any person obtaining a copy
10+
* of this software and associated documentation files (the "Software"), to deal
11+
* in the Software without restriction, including without limitation the rights
12+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
13+
* copies of the Software, and to permit persons to whom the Software is
14+
* furnished to do so, subject to the following conditions:
15+
*
16+
* The above copyright notice and this permission notice shall be included in
17+
* all copies or substantial portions of the Software.
18+
*
19+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
20+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
21+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
22+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
23+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
24+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
25+
* THE SOFTWARE.
26+
*/
27+
28+
// Board setup
29+
#define MICROPY_HW_BOARD_NAME "AITHinker ESP32-C3S_Kit_2M"
30+
#define MICROPY_HW_MCU_NAME "ESP32-C3"
31+
32+
// Status LED
33+
#define MICROPY_HW_LED_STATUS (&pin_GPIO19)
34+
35+
// Default bus pins
36+
#define DEFAULT_UART_BUS_RX (&pin_GPIO20)
37+
#define DEFAULT_UART_BUS_TX (&pin_GPIO21)
38+
39+
// Serial over UART
40+
#define DEBUG_UART_RX DEFAULT_UART_BUS_RX
41+
#define DEBUG_UART_TX DEFAULT_UART_BUS_TX
42+
43+
// For entering safe mode
44+
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO9)
45+
46+
// Explanation of how a user got into safe mode
47+
#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")

‎ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
CIRCUITPY_CREATOR_ID = 0x70010001
2+
CIRCUITPY_CREATION_ID = 0x00100001
3+
4+
IDF_TARGET = esp32c3
5+
6+
INTERNAL_FLASH_FILESYSTEM = 1
7+
8+
CIRCUITPY_ESP_FLASH_MODE=dio
9+
CIRCUITPY_ESP_FLASH_FREQ=80m
10+
CIRCUITPY_ESP_FLASH_SIZE=2MB

‎ports/espressif/boards/ai_thinker_esp32-c3s-2m/pins.c

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2021 microDev
7+
* Copyright (c) 2021 skieast/Bruce Segal
8+
*
9+
* Permission is hereby granted, free of charge, to any person obtaining a copy
10+
* of this software and associated documentation files (the "Software"), to deal
11+
* in the Software without restriction, including without limitation the rights
12+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
13+
* copies of the Software, and to permit persons to whom the Software is
14+
* furnished to do so, subject to the following conditions:
15+
*
16+
* The above copyright notice and this permission notice shall be included in
17+
* all copies or substantial portions of the Software.
18+
*
19+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
20+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
21+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
22+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
23+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
24+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
25+
* THE SOFTWARE.
26+
*/
27+
28+
#include "shared-bindings/board/__init__.h"
29+
30+
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
31+
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
32+
33+
{ MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },
34+
{ MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },
35+
{ MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },
36+
{ MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },
37+
{ MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
38+
{ MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
39+
{ MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },
40+
{ MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
41+
{ MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
42+
{ MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
43+
{ MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
44+
{ MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },
45+
{ MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
46+
{ MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
47+
{ MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },
48+
{ MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },
49+
{ MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) },
50+
{ MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) },
51+
{ MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },
52+
{ MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) },
53+
{ MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) },
54+
{ MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
55+
56+
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO20) },
57+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO21) },
58+
59+
{ MP_ROM_QSTR(MP_QSTR_ADC), MP_ROM_PTR(&pin_GPIO0) },
60+
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO18) },
61+
{ MP_ROM_QSTR(MP_QSTR_LED_YELLOW), MP_ROM_PTR(&pin_GPIO18) },
62+
{ MP_ROM_QSTR(MP_QSTR_LED_WHITE), MP_ROM_PTR(&pin_GPIO19) },
63+
{ MP_ROM_QSTR(MP_QSTR_LED_RED), MP_ROM_PTR(&pin_GPIO3) },
64+
{ MP_ROM_QSTR(MP_QSTR_LED_GREEN), MP_ROM_PTR(&pin_GPIO4) },
65+
{ MP_ROM_QSTR(MP_QSTR_LED_BLUE), MP_ROM_PTR(&pin_GPIO5) },
66+
{ MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO9) },
67+
68+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
69+
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
70+
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
71+
};
72+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

‎ports/espressif/boards/ai_thinker_esp32-c3s-2m/sdkconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#
2+
# LWIP
3+
#
4+
CONFIG_LWIP_LOCAL_HOSTNAME="AIThinker-ESP32C3S-2M"
5+
# end of LWIP

‎ports/espressif/esp-idf-config/partitions-2MB-no-uf2.csv

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# ESP-IDF Partition Table
2+
# Name, Type, SubType, Offset, Size, Flags
3+
# bootloader.bin,, 0x1000, 32K
4+
# partition table,, 0x8000, 4K
5+
nvs, data, nvs, 0x9000, 20K,
6+
app, app, factory, 0x10000, 1408K,
7+
user_fs, data, fat, 0x170000, 576K,

‎ports/espressif/esp-idf-config/partitions-4MB-no-uf2.csv

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# ESP-IDF Partition Table
2+
# Name, Type, SubType, Offset, Size, Flags
3+
# bootloader.bin,, 0x1000, 32K
4+
# partition table,, 0x8000, 4K
5+
nvs, data, nvs, 0x9000, 20K,
6+
app, app, factory, 0x10000, 2048K,
7+
user_fs, data, fat, 0x210000, 1984K,

‎ports/espressif/esp-idf-config/sdkconfig-2MB-no-uf2.defaults

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#
2+
# Serial flasher config
3+
#
4+
# CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
5+
CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y
6+
# CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set
7+
# CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
8+
# CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set
9+
CONFIG_ESPTOOLPY_FLASHSIZE="2MB"
10+
CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
11+
# end of Serial flasher config
12+
13+
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-2MB-no-uf2.csv"
14+
#
15+
# Partition Table
16+
#
17+
CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-2MB-no-uf2.csv"
18+
# end of Partition Table

‎ports/espressif/esp-idf-config/sdkconfig-4MB-no-uf2.defaults

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#
2+
# Serial flasher config
3+
#
4+
# CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
5+
# CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set
6+
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
7+
# CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
8+
# CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set
9+
CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
10+
CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
11+
# end of Serial flasher config
12+
13+
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-4MB-no-uf2.csv"
14+
#
15+
# Partition Table
16+
#
17+
CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-4MB-no-uf2.csv"
18+
# end of Partition Table

‎tools/build_board_info.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
"meowbit_v121": UF2,
7171
# esp32c3
7272
"ai_thinker_esp32-c3s": BIN,
73+
"ai_thinker_esp32-c3s-2m": BIN,
7374
"espressif_esp32c3_devkitm_1_n4": BIN,
7475
"microdev_micro_c3": BIN,
7576
# broadcom

0 commit comments

Comments
 (0)