From a2486882c95375285c1a68d409b57ea368dc2717 Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower, III" Date: Sat, 7 May 2022 18:32:06 -0700 Subject: [PATCH] Fix picoprobe and pico-debug upload recipes Need to munge the platform.txt on release. Fixes #576 --- package/build_boards_manager_package.sh | 2 ++ platform.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/build_boards_manager_package.sh b/package/build_boards_manager_package.sh index 61273ed9..271cab40 100755 --- a/package/build_boards_manager_package.sh +++ b/package/build_boards_manager_package.sh @@ -110,6 +110,8 @@ sed 's/^tools.uf2conv.cmd=.*//g' | \ sed 's/^#tools.uf2conv.cmd=/tools.uf2conv.cmd=/g' | \ sed 's/^tools.picoprobe.cmd=.*//g' | \ sed 's/^#tools.picoprobe.cmd=/tools.picoprobe.cmd=/g' | \ +sed 's/^tools.picodebug.cmd=.*//g' | \ +sed 's/^#tools.picodebug.cmd=/tools.picodebug.cmd=/g' | \ sed "s/version=.*/version=$ver/g" |\ sed -E "s/name=([a-zA-Z0-9\ -]+).*/name=\1($ver)/g"\ > $outdir/platform.txt diff --git a/platform.txt b/platform.txt index 7484598f..bffefbc9 100644 --- a/platform.txt +++ b/platform.txt @@ -146,7 +146,6 @@ tools.uf2conv.upload.params.verbose= tools.uf2conv.upload.params.quiet= tools.uf2conv.upload.pattern="{cmd}" -I "{runtime.platform.path}/tools/uf2conv.py" --serial "{serial.port}" --family RP2040 --deploy "{build.path}/{build.project_name}.uf2" - #tools.picoprobe.cmd={runtime.tools.pqt-openocd.path} tools.picoprobe.cmd={runtime.platform.path}/system/openocd tools.picoprobe.upload.protocol=picoprobe @@ -154,6 +153,7 @@ tools.picoprobe.upload.params.verbose= tools.picoprobe.upload.params.quiet= tools.picoprobe.upload.pattern="{cmd}/bin/openocd" -f "interface/picoprobe.cfg" -f "target/rp2040.cfg" -s "{cmd}/share/openocd/scripts" -c "program {{build.path}/{build.project_name}.elf} verify reset exit" +#tools.picodebug.cmd={runtime.tools.pqt-openocd.path} tools.picodebug.cmd={runtime.platform.path}/system/openocd tools.picodebug.upload.protocol=pico-debug tools.picodebug.upload.params.verbose= -- 2.54.0