diff --git a/builder/frameworks/espidf.py b/builder/frameworks/espidf.py index b3ccdde..d0783b3 100644 --- a/builder/frameworks/espidf.py +++ b/builder/frameworks/espidf.py @@ -58,9 +58,11 @@ board = env.BoardConfig() mcu = board.get("build.mcu", "esp32") idf_variant = mcu.lower() -IDF_version = platform.get_package_version("framework-espidf") -IDF5 = IDF_version.split(".")[1].startswith("5") # bool; Major IDF5 ? -IDF_minor = int(("".join(IDF_version.split(".")[1]))[1:3]) # Minor version as int +IDF5 = ( + platform.get_package_version("framework-espidf") + .split(".")[1] + .startswith("5") +) IDF_ENV_VERSION = "1.0.0" FRAMEWORK_DIR = platform.get_package_dir("framework-espidf") TOOLCHAIN_DIR = platform.get_package_dir( @@ -650,7 +652,8 @@ def generate_project_ld_script(sdk_config, ignore_targets=None): "sections.ld.in", ) - if IDF5 and IDF_minor > 2: + framework_version = [int(v) for v in get_framework_version().split(".")] + if framework_version[:2] > [5, 2]: initial_ld_script = preprocess_linker_file( initial_ld_script, os.path.join( @@ -1409,7 +1412,8 @@ if not board.get("build.ldscript", ""): "memory.ld.in", )) - if IDF5 and IDF_minor > 2: + framework_version = [int(v) for v in get_framework_version().split(".")] + if framework_version[:2] > [5, 2]: initial_ld_script = preprocess_linker_file( initial_ld_script, os.path.join(