From 806bb3f067cbfd04ab2c5c0f6f498c95aacf0beb Mon Sep 17 00:00:00 2001 From: Max Scheffler Date: Tue, 27 Dec 2022 16:22:23 +1100 Subject: [PATCH 1/2] Expand path to tinuf2 image when checking existence --- tools/platformio-build.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/platformio-build.py b/tools/platformio-build.py index b3fa396a489..7cf86bbb814 100644 --- a/tools/platformio-build.py +++ b/tools/platformio-build.py @@ -126,8 +126,8 @@ def add_tinyuf2_extra_image(): ) # Add the UF2 image only if it exists and it's not already added - if not isfile(tinuf2_image): - print("Warning! The `%s` UF2 bootloader image doesn't exist" % tinuf2_image) + if not isfile(env.subst(tinuf2_image)): + print("Warning! The `%s` UF2 bootloader image doesn't exist" % env.subst(tinuf2_image)) return if any( From b213d0c6e46dff1c8c49b077e7838dffac08c21b Mon Sep 17 00:00:00 2001 From: Max Scheffler Date: Sat, 31 Dec 2022 15:38:58 +1100 Subject: [PATCH 2/2] More isFiles fixed --- tools/platformio-build.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/platformio-build.py b/tools/platformio-build.py index 7cf86bbb814..e3c7b50dbb8 100644 --- a/tools/platformio-build.py +++ b/tools/platformio-build.py @@ -51,19 +51,19 @@ def get_partition_table_csv(variants_dir): if partitions_name: # A custom partitions file is selected - if isfile(join(variant_partitions_dir, partitions_name)): + if isfile(env.subst(join(variant_partitions_dir, partitions_name))): return join(variant_partitions_dir, partitions_name) return abspath( join(fwpartitions_dir, partitions_name) - if isfile(join(fwpartitions_dir, partitions_name)) + if isfile(env.subst(join(fwpartitions_dir, partitions_name))) else partitions_name ) variant_partitions = join(variant_partitions_dir, "partitions.csv") return ( variant_partitions - if isfile(variant_partitions) + if isfile(env.subst(variant_partitions)) else join(fwpartitions_dir, "default.csv") ) @@ -81,7 +81,7 @@ def get_bootloader_image(variants_dir): return ( variant_bootloader - if isfile(variant_bootloader) + if isfile(env.subst(variant_bootloader)) else generate_bootloader_image( join( FRAMEWORK_DIR,