From 7b48a72f89cd843a30c3d73987c5be116833bfab Mon Sep 17 00:00:00 2001 From: valeros Date: Fri, 6 Aug 2021 21:07:53 +0300 Subject: [PATCH] Simplify paths to platform tools to handle whitespaces Resolve #16 --- builder/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builder/main.py b/builder/main.py index 4576448..6ac6086 100644 --- a/builder/main.py +++ b/builder/main.py @@ -43,7 +43,7 @@ def generate_uf2(target, source, env): env.Execute( " ".join( [ - join(platform.get_package_dir("tool-rp2040tools") or "", "elf2uf2"), + "elf2uf2", '"%s"' % elf_file, '"%s"' % elf_file.replace(".elf", ".uf2"), ] @@ -154,7 +154,7 @@ if upload_protocol == "mbed": ] elif upload_protocol == "picotool": env.Replace( - UPLOADER=join(platform.get_package_dir("tool-rp2040tools") or "", "rp2040load"), + UPLOADER="rp2040load", UPLOADERFLAGS=["-v", "-D"], UPLOADCMD="$UPLOADER $UPLOADERFLAGS $SOURCES" )