Skip to content

Dynamic task executable paths via commands #221

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Dynamic task executable paths via commands #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 13 additions & 13 deletions scripts/pico_project.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1182,10 +1182,10 @@ def generateProjectFiles(
{{
"label": "Run Project",
"type": "process",
"command": "{propertiesPicotoolPath(picotoolVersion, force_non_windows=True)}/picotool/picotool",
"command": "${{command:raspberry-pi-pico.getPicotoolPath}}",
"args": [
"load",
"${{command:raspberry-pi-pico.launchTargetPath}}",
"\\"${{command:raspberry-pi-pico.launchTargetPath}}\\"",
"-fx"
],
"presentation": {{
Expand All @@ -1194,16 +1194,16 @@ def generateProjectFiles(
}},
"problemMatcher": [],
"windows": {{
"command": "{propertiesPicotoolPath(picotoolVersion, force_windows=True)}/picotool/picotool.exe"
"command": "\\\\\\\\?\\\\${{command:raspberry-pi-pico.getPicotoolPath}}"
}}
}},
{{
"label": "Flash",
"type": "process",
"command": "{openocd_path if openocd_path else "openocd"}",
"command": "${{command:raspberry-pi-pico.getOpenOCDRoot}}/openocd.exe",
"args": [
"-s",
"{codeOpenOCDPath(openOCDVersion)}/scripts",
"${{command:raspberry-pi-pico.getOpenOCDRoot}}/scripts",
"-f",
"{debugger}",
"-f",
Expand All @@ -1213,16 +1213,16 @@ def generateProjectFiles(
],
"problemMatcher": [],
"windows": {{
"command": "{openocd_path.replace("${userHome}", "${env:USERPROFILE}") if openocd_path else "openocd"}",
"command": "\\\\\\\\?\\\\${{command:raspberry-pi-pico.getOpenOCDRoot}}/openocd.exe",
}}
}},
{{
"label": "Rescue Reset",
"type": "process",
"command": "{openocd_path if openocd_path else "openocd"}",
"command": "${{command:raspberry-pi-pico.getOpenOCDRoot}}/openocd.exe",
"args": [
"-s",
"{codeOpenOCDPath(openOCDVersion)}/scripts",
"${{command:raspberry-pi-pico.getOpenOCDRoot}}/scripts",
"-f",
"{debugger}",
"-f",
Expand All @@ -1232,16 +1232,16 @@ def generateProjectFiles(
],
"problemMatcher": [],
"windows": {{
"command": "{openocd_path.replace("${userHome}", "${env:USERPROFILE}") if openocd_path else "openocd"}",
"command": "\\\\\\\\?\\\\${{command:raspberry-pi-pico.getOpenOCDRoot}}/openocd.exe",
}}
}},
{{
"label": "Risc-V Reset (RP2350)",
"label": "RISC-V Reset (RP2350)",
"type": "process",
"command": "{openocd_path if openocd_path else "openocd"}",
"command": "${{command:raspberry-pi-pico.getOpenOCDRoot}}/openocd.exe",
"args": [
"-s",
"{codeOpenOCDPath(openOCDVersion)}/scripts",
"${{command:raspberry-pi-pico.getOpenOCDRoot}}/scripts",
"-c",
"set USE_CORE {{ rv0 rv1 cm0 cm1 }}",
"-f",
Expand All @@ -1257,7 +1257,7 @@ def generateProjectFiles(
],
"problemMatcher": [],
"windows": {{
"command": "{openocd_path.replace("${userHome}", "${env:USERPROFILE}") if openocd_path else "openocd"}",
"command": "\\\\\\\\?\\\\${{command:raspberry-pi-pico.getOpenOCDRoot}}/openocd.exe",
}}
}}
]
Expand Down
2 changes: 1 addition & 1 deletion src/commands/getPaths.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ export class GetPicotoolPathCommand extends CommandWithResult<

// TODO: maybe move "picotool" into buildPath or install it so the files
// are in root of buildPath
return join(
return joinPosix(
buildPicotoolPath(picotoolVersion),
"picotool",
process.platform === "win32" ? "picotool.exe" : "picotool"
Expand Down
Loading