Skip to content

Commit c7e0e37

Browse files
valerosvaleros
committed
Merge branch 'release/v5.3.0'
2 parents 8565a82 + ee09e8b commit c7e0e37

12 files changed

+314
-31
lines changed

‎boards/bpi_leaf_s3.json

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"ldscript": "esp32s3_out.ld",
5+
"partitions": "default_8MB.csv",
6+
"memory_type": "qio_qspi"
7+
},
8+
"core": "esp32",
9+
"extra_flags": [
10+
"-DBOARD_HAS_PSRAM",
11+
"-DARDUINO_BPI_LEAF_S3",
12+
"-DARDUINO_USB_CDC_ON_BOOT=1"
13+
],
14+
"f_cpu": "240000000L",
15+
"f_flash": "80000000L",
16+
"flash_mode": "qio",
17+
"hwids": [
18+
[
19+
"0x303A",
20+
"0x80DF"
21+
]
22+
],
23+
"mcu": "esp32s3",
24+
"variant": "bpi_leaf_s3"
25+
},
26+
"connectivity": [
27+
"wifi"
28+
],
29+
"debug": {
30+
"openocd_target": "esp32s3.cfg"
31+
},
32+
"frameworks": [
33+
"arduino",
34+
"espidf"
35+
],
36+
"name": "BPI-Leaf-S3",
37+
"upload": {
38+
"flash_size": "8MB",
39+
"maximum_ram_size": 327680,
40+
"maximum_size": 8388608,
41+
"use_1200bps_touch": true,
42+
"wait_for_upload_port": true,
43+
"require_upload_port": true,
44+
"speed": 460800
45+
},
46+
"url": "https://wiki.banana-pi.org/BPI-Leaf-S3",
47+
"vendor": "BPI Tech"
48+
}

‎boards/cytron_maker_feather_aiot_s3.json

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"ldscript": "esp32s3_out.ld",
5+
"memory_type": "qio_opi",
6+
"partitions": "partitions-8MB-tinyuf2.csv"
7+
},
8+
"core": "esp32",
9+
"extra_flags": [
10+
"-DARDUINO_CYTRON_MAKER_FEATHER_AIOT_S3",
11+
"-DARDUINO_USB_CDC_ON_BOOT=1",
12+
"-DBOARD_HAS_PSRAM",
13+
"-DARDUINO_RUNNING_CORE=1",
14+
"-DARDUINO_EVENT_RUNNING_CORE=1"
15+
],
16+
"f_cpu": "240000000L",
17+
"f_flash": "80000000L",
18+
"flash_mode": "qio",
19+
"hwids": [
20+
[
21+
"0x303A",
22+
"0x80F8"
23+
]
24+
],
25+
"mcu": "esp32s3",
26+
"variant": "cytron_maker_feather_aiot_s3"
27+
},
28+
"connectivity": [
29+
"wifi"
30+
],
31+
"debug": {
32+
"openocd_target": "esp32s3.cfg"
33+
},
34+
"frameworks": [
35+
"arduino",
36+
"espidf"
37+
],
38+
"name": "Cytron Maker Feather AIoT S3",
39+
"upload": {
40+
"arduino": {
41+
"flash_extra_images": [
42+
[
43+
"0x410000",
44+
"variants/cytron_maker_feather_aiot_s3/tinyuf2.bin"
45+
]
46+
]
47+
},
48+
"flash_size": "8MB",
49+
"maximum_ram_size": 327680,
50+
"maximum_size": 8388608,
51+
"require_upload_port": true,
52+
"speed": 460800
53+
},
54+
"url": "https://sg.cytron.io/c-development-tools/c-maker-series/p-v-maker-feather-aiot-s3-simplifying-aiot-with-esp32",
55+
"vendor": "Cytron Technologies"
56+
}

‎boards/deneyapkart1Av2.json

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"ldscript": "esp32s3_out.ld",
5+
"memory_type": "qio_qspi"
6+
},
7+
"core": "esp32",
8+
"extra_flags": [
9+
"-DARDUINO_DYDK1Av2",
10+
"-DARDUINO_USB_CDC_ON_BOOT=1"
11+
],
12+
"f_cpu": "240000000L",
13+
"f_flash": "80000000L",
14+
"flash_mode": "qio",
15+
"hwids": [
16+
[
17+
"0x303A",
18+
"0x8147"
19+
]
20+
],
21+
"mcu": "esp32s3",
22+
"variant": "deneyapkart1Av2"
23+
},
24+
"connectivity": [
25+
"wifi"
26+
],
27+
"debug": {
28+
"openocd_target": "esp32s3.cfg"
29+
},
30+
"frameworks": [
31+
"arduino",
32+
"espidf"
33+
],
34+
"name": "Deneyap Kart 1A v2",
35+
"upload": {
36+
"flash_size": "4MB",
37+
"maximum_ram_size": 327680,
38+
"maximum_size": 4194304,
39+
"use_1200bps_touch": true,
40+
"wait_for_upload_port": true,
41+
"require_upload_port": true,
42+
"speed": 460800
43+
},
44+
"url": "https://wiki.banana-pi.org/BPI-Leaf-S3",
45+
"vendor": "Deneyap"
46+
}

‎boards/deneyapmini.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,17 @@
44
"ldscript": "esp32s2_out.ld"
55
},
66
"core": "esp32",
7-
"extra_flags": "-DARDUINO_DYM",
7+
"extra_flags": [
8+
"-DARDUINO_DYM",
9+
"-DARDUINO_USB_CDC_ON_BOOT=1"
10+
],
811
"f_cpu": "240000000L",
912
"f_flash": "80000000L",
1013
"flash_mode": "qio",
1114
"hwids": [
1215
[
1316
"0x303A",
14-
"0x0002"
17+
"0x8141"
1518
]
1619
],
1720
"mcu": "esp32s2",

‎boards/deneyapminiv2.json

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"ldscript": "esp32s2_out.ld"
5+
},
6+
"core": "esp32",
7+
"extra_flags": "-",
8+
"extra_flags": [
9+
"-DBOARD_HAS_PSRAM",
10+
"-DARDUINO_DYMv2",
11+
"-DARDUINO_USB_CDC_ON_BOOT=1"
12+
],
13+
"f_cpu": "240000000L",
14+
"f_flash": "80000000L",
15+
"flash_mode": "qio",
16+
"hwids": [
17+
[
18+
"0x303A",
19+
"0x8144"
20+
]
21+
],
22+
"mcu": "esp32s2",
23+
"variant": "deneyapminiv2"
24+
},
25+
"connectivity": [
26+
"wifi",
27+
"bluetooth",
28+
"ethernet"
29+
],
30+
"debug": {
31+
"openocd_target": "esp32s2.cfg"
32+
},
33+
"frameworks": [
34+
"arduino",
35+
"espidf"
36+
],
37+
"name": "Deneyap Mini v2",
38+
"upload": {
39+
"flash_size": "4MB",
40+
"maximum_ram_size": 327680,
41+
"maximum_size": 4194304,
42+
"use_1200bps_touch": true,
43+
"wait_for_upload_port": true,
44+
"require_upload_port": true,
45+
"speed": 460800
46+
},
47+
"url": "https://deneyapkart.org/magaza/urun-deneyap-kart-mini.html",
48+
"vendor": "Deneyap"
49+
}

‎boards/esp32-c3-m1i-kit.json

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"ldscript": "esp32c3_out.ld"
5+
},
6+
"core": "esp32",
7+
"f_cpu": "160000000L",
8+
"f_flash": "80000000L",
9+
"flash_mode": "qio",
10+
"extra_flags": [
11+
"-DARDUINO_ESP32C3_M1_I_KIT",
12+
"-DARDUINO_USB_MODE=1"
13+
],
14+
"mcu": "esp32c3",
15+
"variant": "esp_c3_m1_i_kit"
16+
},
17+
"connectivity": [
18+
"wifi"
19+
],
20+
"debug": {
21+
"openocd_target": "esp32c3.cfg"
22+
},
23+
"frameworks": [
24+
"arduino",
25+
"espidf"
26+
],
27+
"name": "Ai-Thinker ESP-C3-M1-I-Kit",
28+
"upload": {
29+
"flash_size": "4MB",
30+
"maximum_ram_size": 327680,
31+
"maximum_size": 4194304,
32+
"require_upload_port": true,
33+
"speed": 460800
34+
},
35+
"url": "https://docs.ai-thinker.com/en/esp32c3",
36+
"vendor": "Ai-Thinker"
37+
}

‎boards/redpill_esp32s3.json

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"ldscript": "esp32s3_out.ld",
5+
"memory_type": "qio_qspi"
6+
},
7+
"core": "esp32",
8+
"extra_flags": [
9+
"-DARDUINO_REDPILL_ESP32S3",
10+
"-DARDUINO_USB_CDC_ON_BOOT=1",
11+
"-DBOARD_HAS_PSRAM",
12+
"-DARDUINO_RUNNING_CORE=1",
13+
"-DARDUINO_EVENT_RUNNING_CORE=1"
14+
],
15+
"f_cpu": "240000000L",
16+
"f_flash": "80000000L",
17+
"flash_mode": "qio",
18+
"hwids": [
19+
[
20+
"0x303A",
21+
"0x80F8"
22+
]
23+
],
24+
"mcu": "esp32s3",
25+
"variant": "redpill_esp32s3"
26+
},
27+
"connectivity": [
28+
"wifi"
29+
],
30+
"debug": {
31+
"openocd_target": "esp32s3.cfg"
32+
},
33+
"frameworks": [
34+
"arduino",
35+
"espidf"
36+
],
37+
"name": "Munich Labs RedPill ESP32-S3",
38+
"upload": {
39+
"arduino": {
40+
"flash_extra_images": [
41+
[
42+
"0x410000",
43+
"variants/redpill_esp32s3/tinyuf2.bin"
44+
]
45+
]
46+
},
47+
"flash_size": "8MB",
48+
"maximum_ram_size": 327680,
49+
"maximum_size": 8388608,
50+
"require_upload_port": true,
51+
"speed": 460800
52+
},
53+
"url": "https://munich-labs.com/index.php/redpill-esp32-s3/",
54+
"vendor": "Munich Labs"
55+
}

‎boards/um_pros3.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"flash_mode": "qio",
1919
"hwids": [
2020
[
21-
"0X303A",
22-
"0x80D0"
21+
"0x303A",
22+
"0x1001"
2323
]
2424
],
2525
"mcu": "esp32s3",

‎builder/frameworks/espidf.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,17 +215,17 @@ def get_cmake_code_model(src_dir, build_dir, extra_args=None):
215215

216216

217217
def populate_idf_env_vars(idf_env):
218-
idf_env["IDF_PATH"] = FRAMEWORK_DIR
218+
idf_env["IDF_PATH"] = fs.to_unix_path(FRAMEWORK_DIR)
219219
additional_packages = [
220220
os.path.join(TOOLCHAIN_DIR, "bin"),
221221
platform.get_package_dir("tool-ninja"),
222222
os.path.join(platform.get_package_dir("tool-cmake"), "bin"),
223223
os.path.dirname(env.subst("$PYTHONEXE")),
224224
]
225225

226-
if mcu not in ("esp32c3", "esp32s3"):
226+
if mcu != "esp32c3":
227227
additional_packages.append(
228-
os.path.join(platform.get_package_dir("toolchain-%sulp" % mcu), "bin"),
228+
os.path.join(platform.get_package_dir("toolchain-esp32ulp"), "bin"),
229229
)
230230

231231
if "windows" in get_systype():

‎builder/frameworks/ulp.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,11 @@ def prepare_ulp_env_vars(env):
3636

3737
additional_packages = [
3838
os.path.join(
39-
platform.get_package_dir(
40-
"toolchain-xtensa-esp%s"
41-
% ("32s2" if idf_variant == "esp32s2" else "32")
42-
),
39+
platform.get_package_dir("toolchain-xtensa-%s" % idf_variant),
4340
"bin",
4441
),
4542
os.path.join(
46-
platform.get_package_dir("toolchain-%sulp" % idf_variant),
43+
platform.get_package_dir("toolchain-esp32ulp"),
4744
"bin",
4845
),
4946
platform.get_package_dir("tool-ninja"),
@@ -99,6 +96,7 @@ def generate_ulp_config(target_config):
9996
"-DULP_APP_NAME=ulp_main",
10097
"-DCOMPONENT_DIR=" + os.path.join(ulp_env.subst("$PROJECT_DIR"), "ulp"),
10198
'-DCOMPONENT_INCLUDES="%s"' % ";".join(get_component_includes(target_config)),
99+
"-DIDF_TARGET=%s" % idf_variant,
102100
"-DIDF_PATH=" + fs.to_unix_path(FRAMEWORK_DIR),
103101
"-DSDKCONFIG_HEADER=" + os.path.join(BUILD_DIR, "config", "sdkconfig.h"),
104102
"-DPYTHON=" + env.subst("$PYTHONEXE"),

0 commit comments

Comments
 (0)