Skip to content

Commit 8e304b1

Browse files
authored
refactor IDF 5.x minor version check
1 parent f3ec0c3 commit 8e304b1

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

builder/frameworks/espidf.py

+9-5
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,11 @@
5858
mcu = board.get("build.mcu", "esp32")
5959
idf_variant = mcu.lower()
6060

61-
IDF_version = platform.get_package_version("framework-espidf")
62-
IDF5 = IDF_version.split(".")[1].startswith("5") # bool; Major IDF5 ?
63-
IDF_minor = int(("".join(IDF_version.split(".")[1]))[1:3]) # Minor version as int
61+
IDF5 = (
62+
platform.get_package_version("framework-espidf")
63+
.split(".")[1]
64+
.startswith("5")
65+
)
6466
IDF_ENV_VERSION = "1.0.0"
6567
FRAMEWORK_DIR = platform.get_package_dir("framework-espidf")
6668
TOOLCHAIN_DIR = platform.get_package_dir(
@@ -650,7 +652,8 @@ def generate_project_ld_script(sdk_config, ignore_targets=None):
650652
"sections.ld.in",
651653
)
652654

653-
if IDF5 and IDF_minor > 2:
655+
framework_version = [int(v) for v in get_framework_version().split(".")]
656+
if framework_version[:2] > [5, 2]:
654657
initial_ld_script = preprocess_linker_file(
655658
initial_ld_script,
656659
os.path.join(
@@ -1409,7 +1412,8 @@ def get_python_exe():
14091412
"memory.ld.in",
14101413
))
14111414

1412-
if IDF5 and IDF_minor > 2:
1415+
framework_version = [int(v) for v in get_framework_version().split(".")]
1416+
if framework_version[:2] > [5, 2]:
14131417
initial_ld_script = preprocess_linker_file(
14141418
initial_ld_script,
14151419
os.path.join(

0 commit comments

Comments
 (0)