Skip to content

Commit 0b55e08

Browse files
committed
core 3.1.0 devel / IDF 5.3.1
1 parent bfb1730 commit 0b55e08

File tree

4 files changed

+40
-33
lines changed

4 files changed

+40
-33
lines changed

builder/frameworks/espidf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
IDF_ENV_VERSION = "1.0.0"
7070
FRAMEWORK_DIR = platform.get_package_dir("framework-espidf")
7171
TOOLCHAIN_DIR = platform.get_package_dir(
72-
"toolchain-%s" % ("riscv32-esp" if mcu in ("esp32c2", "esp32c3", "esp32c6", "esp32h2") else ("xtensa-%s" % mcu))
72+
"%s" % ("riscv32-esp-elf" if mcu in ("esp32c2", "esp32c3", "esp32c6", "esp32h2") else ("xtensa-esp-elf"))
7373
)
7474

7575

@@ -252,7 +252,7 @@ def populate_idf_env_vars(idf_env):
252252

253253
if mcu not in ("esp32c2", "esp32c3", "esp32c6", "esp32h2", "esp32p4"):
254254
additional_packages.append(
255-
os.path.join(platform.get_package_dir("toolchain-esp32ulp"), "bin"),
255+
os.path.join(platform.get_package_dir("esp32ulp-elf"), "bin"),
256256
)
257257

258258
idf_env["PATH"] = os.pathsep.join(additional_packages + [idf_env["PATH"]])

builder/frameworks/ulp.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ def prepare_ulp_env_vars(env):
3636
ulp_env.PrependENVPath("IDF_PATH", FRAMEWORK_DIR)
3737

3838
toolchain_path = platform.get_package_dir(
39-
"toolchain-xtensa-%s" % idf_variant
39+
"xtensa-esp-elf"
4040
)
4141

4242
additional_packages = [
4343
toolchain_path,
4444
os.path.join(
45-
platform.get_package_dir("toolchain-esp32ulp"),
45+
platform.get_package_dir("esp32ulp-elf"),
4646
"bin",
4747
),
4848
platform.get_package_dir("tool-ninja"),

platform.json

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"type": "git",
1919
"url": "https://github.com/pioarduino/platform-espressif32.git"
2020
},
21-
"version": "51.03.04",
21+
"version": "53.03.10+develop",
2222
"frameworks": {
2323
"arduino": {
2424
"script": "builder/frameworks/arduino.py"
@@ -33,45 +33,33 @@
3333
"type": "framework",
3434
"optional": true,
3535
"owner": "espressif",
36-
"version": "https://github.com/espressif/arduino-esp32/releases/download/3.0.4/esp32-3.0.4.zip"
36+
"version": "https://github.com/espressif/arduino-esp32/archive/refs/heads/release/v3.1.x.zip"
3737
},
3838
"framework-arduinoespressif32-libs": {
3939
"type": "framework",
4040
"optional": true,
4141
"owner": "espressif",
42-
"version": "https://github.com/espressif/arduino-esp32/releases/download/3.0.4/esp32-arduino-libs-3.0.4.zip"
42+
"version": ""
4343
},
4444
"framework-espidf": {
4545
"type": "framework",
4646
"optional": true,
4747
"owner": "pioarduino",
48-
"version": "https://github.com/pioarduino/esp-idf/releases/download/v5.1.4.240805/esp-idf-v5.1.4.zip"
49-
},
50-
"toolchain-xtensa-esp32": {
51-
"type": "toolchain",
52-
"optional": true,
53-
"owner": "",
54-
"version": ""
55-
},
56-
"toolchain-xtensa-esp32s2": {
57-
"type": "toolchain",
58-
"optional": true,
59-
"owner": "",
60-
"version": ""
48+
"version": "https://github.com/pioarduino/esp-idf/releases/download/v5.3.1.ulp/esp-idf-v5.3.1.zip"
6149
},
62-
"toolchain-xtensa-esp32s3": {
50+
"xtensa-esp-elf": {
6351
"type": "toolchain",
6452
"optional": true,
6553
"owner": "",
6654
"version": ""
6755
},
68-
"toolchain-riscv32-esp": {
56+
"riscv32-esp-elf": {
6957
"type": "toolchain",
7058
"optional": true,
7159
"owner": "",
7260
"version": ""
7361
},
74-
"toolchain-esp32ulp": {
62+
"esp32ulp-elf": {
7563
"type": "toolchain",
7664
"optional": true,
7765
"owner": "",
@@ -98,7 +86,12 @@
9886
"tl-install": {
9987
"optional": false,
10088
"owner": "pioarduino",
101-
"version": "https://github.com/pioarduino/esp_install/releases/download/v1.7.0/esp_install-v1.7.0.zip"
89+
"version": "https://github.com/pioarduino/esp_install/releases/download/v2.0.0/esp_install-v2.0.0.zip"
90+
},
91+
"tool-scons": {
92+
"optional": true,
93+
"owner": "",
94+
"version": "https://github.com/pioarduino/scons/releases/download/4.8.1/scons-local-4.8.1.tar.gz"
10295
},
10396
"tool-cmake": {
10497
"optional": true,

platform.py

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import os
1616
import subprocess
1717
import sys
18+
import requests
1819
import shutil
1920
from os.path import isfile, join
2021

@@ -49,7 +50,7 @@
4950
sys.stderr.write("Error: Couldn't execute 'idf_tools.py install'\n")
5051
else:
5152
shutil.copytree(join(IDF_TOOLS_PATH_DEFAULT, "tools", "tool-packages"), join(IDF_TOOLS_PATH_DEFAULT, "tools"), symlinks=False, ignore=None, ignore_dangling_symlinks=False, dirs_exist_ok=True)
52-
for p in ("tool-mklittlefs", "tool-mkfatfs", "tool-mkspiffs", "tool-dfuutil", "tool-openocd", "tool-cmake", "tool-ninja", "tool-cppcheck", "tool-clangtidy", "tool-pvs-studio", "tc-xt-esp32", "tc-xt-esp32s2", "tc-xt-esp32s3", "tc-ulp", "tc-rv32", "tl-xt-gdb", "tl-rv-gdb", "contrib-piohome", "contrib-pioremote"):
53+
for p in ("tool-mklittlefs", "tool-mkfatfs", "tool-mkspiffs", "tool-dfuutil", "tool-openocd", "tool-cmake", "tool-ninja", "tool-cppcheck", "tool-clangtidy", "tool-pvs-studio", "tc-xt-esp32", "tc-ulp", "tc-rv32", "tl-xt-gdb", "tl-rv-gdb", "contrib-piohome", "contrib-pioremote"):
5354
tl_path = "file://" + join(IDF_TOOLS_PATH_DEFAULT, "tools", p)
5455
pm.install(tl_path)
5556

@@ -72,15 +73,28 @@ def configure_default_packages(self, variables, targets):
7273
self.packages["riscv32-esp-elf-gdb"]["optional"] = True
7374
self.packages["xtensa-esp-elf-gdb"]["optional"] = True
7475

75-
# Enable check tools only when "check_tool" is enabled
7676
if tl_flag:
77+
# Install tool is not needed anymore
78+
del self.packages["tl-install"]
79+
# Enable check tools only when "check_tool" is enabled
7780
for p in self.packages:
7881
if p in ("tool-cppcheck", "tool-clangtidy", "tool-pvs-studio"):
7982
self.packages[p]["optional"] = False if str(variables.get("check_tool")).strip("['']") in p else True
8083

8184
if "arduino" in frameworks:
8285
self.packages["framework-arduinoespressif32"]["optional"] = False
8386
self.packages["framework-arduinoespressif32-libs"]["optional"] = False
87+
# use latest espressif Arduino libs
88+
URL = "https://raw.githubusercontent.com/espressif/arduino-esp32/release/v3.1.x/package/package_esp32_index.template.json"
89+
packjdata = requests.get(URL).json()
90+
dyn_lib_url = packjdata['packages'][0]['tools'][0]['systems'][0]['url']
91+
self.packages["framework-arduinoespressif32-libs"]["version"] = dyn_lib_url
92+
93+
# packages for IDF and mixed Arduino+IDF projects
94+
if tl_flag and "espidf" in frameworks:
95+
for p in self.packages:
96+
if p in ("tool-scons", "tool-cmake", "tool-ninja"):
97+
self.packages[p]["optional"] = False
8498

8599
if "".join(targets) in ("upload", "buildfs", "uploadfs"):
86100
filesystem = variables.get("board_build.filesystem", "littlefs")
@@ -128,20 +142,20 @@ def configure_default_packages(self, variables, targets):
128142
# Enable needed toolchains
129143
for available_mcu in ("esp32", "esp32s2", "esp32s3"):
130144
if available_mcu == mcu and tl_flag:
131-
tc_path = "file://" + join(IDF_TOOLS_PATH_DEFAULT, "tools", "tc-xt-%s" % mcu)
132-
self.packages["toolchain-xtensa-%s" % mcu]["optional"] = False
133-
self.packages["toolchain-xtensa-%s" % mcu]["version"] = tc_path
145+
tc_path = "file://" + join(IDF_TOOLS_PATH_DEFAULT, "tools", "tc-xt-esp32")
146+
self.packages["xtensa-esp-elf"]["optional"] = False
147+
self.packages["xtensa-esp-elf"]["version"] = tc_path
134148
if available_mcu == "esp32":
135-
del self.packages["toolchain-riscv32-esp"]
149+
del self.packages["riscv32-esp-elf"]
136150
# Enable riscv and ULP toolchains
137151
if mcu in ("esp32s2", "esp32s3", "esp32c2", "esp32c3", "esp32c6", "esp32h2"):
138152
if mcu in ("esp32c2", "esp32c3", "esp32c6", "esp32h2"):
139-
del self.packages["toolchain-esp32ulp"]
153+
del self.packages["esp32ulp-elf"]
140154
# RISC-V based toolchain for ESP32C3, ESP32C6 ESP32S2, ESP32S3 ULP
141155
if tl_flag:
142156
tc_path = "file://" + join(IDF_TOOLS_PATH_DEFAULT, "tools", "tc-rv32")
143-
self.packages["toolchain-riscv32-esp"]["optional"] = False
144-
self.packages["toolchain-riscv32-esp"]["version"] = tc_path
157+
self.packages["riscv32-esp-elf"]["optional"] = False
158+
self.packages["riscv32-esp-elf"]["version"] = tc_path
145159

146160
return super().configure_default_packages(variables, targets)
147161

0 commit comments

Comments
 (0)