Skip to content

Expand path to tinuf2 image when checking existence in platformio-build.py #7631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 6, 2023
Merged

Expand path to tinuf2 image when checking existence in platformio-build.py #7631

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
806bb3f
Expand path to tinuf2 image when checking existence
scheffield Dec 27, 2022
b213d0c
More isFiles fixed
scheffield Dec 31, 2022
58f4fef
Merge branch 'master' into master
scheffield Jan 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions tools/platformio-build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
)

Expand All @@ -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,
Expand Down Expand Up @@ -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(
Expand Down