From 2131f93b97d7fde3fbce3799d8c20b10be2ff958 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 17 Nov 2025 11:41:07 +0100 Subject: [PATCH 1/4] add `chip_variant` to pioarduino-build.py to support different variants of an MCU (p4 prev3 and postv3) --- tools/pioarduino-build.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/pioarduino-build.py b/tools/pioarduino-build.py index 2bacd9fcaef..12d0c9e9d60 100644 --- a/tools/pioarduino-build.py +++ b/tools/pioarduino-build.py @@ -31,7 +31,8 @@ env = DefaultEnvironment() platform = env.PioPlatform() board_config = env.BoardConfig() -build_mcu = board_config.get("build.mcu", "").lower() +chip_variant = board_config.get("build.chip_variant").lower() +build_mcu = chip_variant if chip_variant else board_config.get("build.mcu", "").lower() partitions_name = board_config.get("build.partitions", board_config.get("build.arduino.partitions", "")) FRAMEWORK_DIR = platform.get_package_dir("framework-arduinoespressif32") From a895cc1fd7d506f5d8420a5348748b4c14f76454 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 17 Nov 2025 12:01:43 +0100 Subject: [PATCH 2/4] Refactor build_mcu and chip_variant assignment logic --- tools/pioarduino-build.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/pioarduino-build.py b/tools/pioarduino-build.py index 12d0c9e9d60..35b312ed357 100644 --- a/tools/pioarduino-build.py +++ b/tools/pioarduino-build.py @@ -31,8 +31,9 @@ env = DefaultEnvironment() platform = env.PioPlatform() board_config = env.BoardConfig() +build_mcu = board_config.get("build.mcu", "").lower() chip_variant = board_config.get("build.chip_variant").lower() -build_mcu = chip_variant if chip_variant else board_config.get("build.mcu", "").lower() +chip_variant = chip_variant if chip_variant else build_mcu partitions_name = board_config.get("build.partitions", board_config.get("build.arduino.partitions", "")) FRAMEWORK_DIR = platform.get_package_dir("framework-arduinoespressif32") @@ -81,7 +82,7 @@ def get_bootloader_image(variants_dir): else generate_bootloader_image( join( FRAMEWORK_LIBS_DIR, - build_mcu, + chip_variant, "bin", "bootloader_${__get_board_boot_mode(__env__)}_${__get_board_f_boot(__env__)}.elf", ) @@ -160,7 +161,7 @@ def add_tinyuf2_extra_image(): SConscript( join( FRAMEWORK_LIBS_DIR, - build_mcu, + chip_variant, "pioarduino-build.py", ) ) From b4c03a6b3f02005b088e02e644110e79c7627627 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci-lite[bot]" <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com> Date: Mon, 17 Nov 2025 11:09:40 +0000 Subject: [PATCH 3/4] ci(pre-commit): Apply automatic fixes --- tools/pioarduino-build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/pioarduino-build.py b/tools/pioarduino-build.py index 35b312ed357..53cfc7aa31d 100644 --- a/tools/pioarduino-build.py +++ b/tools/pioarduino-build.py @@ -33,7 +33,7 @@ board_config = env.BoardConfig() build_mcu = board_config.get("build.mcu", "").lower() chip_variant = board_config.get("build.chip_variant").lower() -chip_variant = chip_variant if chip_variant else build_mcu +chip_variant = chip_variant if chip_variant else build_mcu partitions_name = board_config.get("build.partitions", board_config.get("build.arduino.partitions", "")) FRAMEWORK_DIR = platform.get_package_dir("framework-arduinoespressif32") From 2a2179d69dfc3a1ec9cdf63c39eb215c411723c8 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 17 Nov 2025 12:22:26 +0100 Subject: [PATCH 4/4] Fix chip_variant retrieval with default value --- tools/pioarduino-build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/pioarduino-build.py b/tools/pioarduino-build.py index 53cfc7aa31d..ac0a743610e 100644 --- a/tools/pioarduino-build.py +++ b/tools/pioarduino-build.py @@ -32,7 +32,7 @@ platform = env.PioPlatform() board_config = env.BoardConfig() build_mcu = board_config.get("build.mcu", "").lower() -chip_variant = board_config.get("build.chip_variant").lower() +chip_variant = board_config.get("build.chip_variant", "").lower() chip_variant = chip_variant if chip_variant else build_mcu partitions_name = board_config.get("build.partitions", board_config.get("build.arduino.partitions", ""))