Skip to content

Commit a895cc1

Browse files
authored
Refactor build_mcu and chip_variant assignment logic
1 parent 2131f93 commit a895cc1

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

tools/pioarduino-build.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@
3131
env = DefaultEnvironment()
3232
platform = env.PioPlatform()
3333
board_config = env.BoardConfig()
34+
build_mcu = board_config.get("build.mcu", "").lower()
3435
chip_variant = board_config.get("build.chip_variant").lower()
35-
build_mcu = chip_variant if chip_variant else board_config.get("build.mcu", "").lower()
36+
chip_variant = chip_variant if chip_variant else build_mcu
3637
partitions_name = board_config.get("build.partitions", board_config.get("build.arduino.partitions", ""))
3738

3839
FRAMEWORK_DIR = platform.get_package_dir("framework-arduinoespressif32")
@@ -81,7 +82,7 @@ def get_bootloader_image(variants_dir):
8182
else generate_bootloader_image(
8283
join(
8384
FRAMEWORK_LIBS_DIR,
84-
build_mcu,
85+
chip_variant,
8586
"bin",
8687
"bootloader_${__get_board_boot_mode(__env__)}_${__get_board_f_boot(__env__)}.elf",
8788
)
@@ -160,7 +161,7 @@ def add_tinyuf2_extra_image():
160161
SConscript(
161162
join(
162163
FRAMEWORK_LIBS_DIR,
163-
build_mcu,
164+
chip_variant,
164165
"pioarduino-build.py",
165166
)
166167
)

0 commit comments

Comments
 (0)