File tree Expand file tree Collapse file tree 3 files changed +15
-5
lines changed Expand file tree Collapse file tree 3 files changed +15
-5
lines changed Original file line number Diff line number Diff line change @@ -89,7 +89,7 @@ export default class LaunchTargetPathCommand extends CommandWithResult<string> {
89
89
chip === "rp2040"
90
90
? "thumbv6m-none-eabi"
91
91
: chip === "rp2350"
92
- ? "thumbv8m.main-none-eabi "
92
+ ? "thumbv8m.main-none-eabihf "
93
93
: "riscv32imac-unknown-none-elf" ;
94
94
95
95
return joinPosix (
@@ -179,10 +179,20 @@ export class LaunchTargetPathReleaseCommand extends CommandWithResult<string> {
179
179
| undefined ;
180
180
181
181
if ( cargoToml ?. package ?. name ) {
182
+ const chip = rustProjectGetSelectedChip (
183
+ workspace . workspaceFolders [ 0 ] . uri . fsPath
184
+ ) ;
185
+ const toolchain =
186
+ chip === "rp2040"
187
+ ? "thumbv6m-none-eabi"
188
+ : chip === "rp2350"
189
+ ? "thumbv8m.main-none-eabihf"
190
+ : "riscv32imac-unknown-none-elf" ;
191
+
182
192
return joinPosix (
183
193
workspace . workspaceFolders [ 0 ] . uri . fsPath . replaceAll ( "\\" , "/" ) ,
184
194
"target" ,
185
- "thumbv6m-none-eabi" ,
195
+ toolchain ,
186
196
"release" ,
187
197
cargoToml . package . name
188
198
) ;
Original file line number Diff line number Diff line change @@ -135,7 +135,7 @@ export default class SwitchBoardCommand extends Command {
135
135
board === "RP2040"
136
136
? "thumbv6m-none-eabi"
137
137
: board === "RP2350"
138
- ? "thumbv8m.main-none-eabi "
138
+ ? "thumbv8m.main-none-eabihf "
139
139
: "riscv32imac-unknown-none-elf" ;
140
140
141
141
await workspace
Original file line number Diff line number Diff line change @@ -147,13 +147,13 @@ async function generateVSCodeConfig(projectRoot: string): Promise<boolean> {
147
147
} ,
148
148
{
149
149
label : "Run Project" ,
150
- type : "process " ,
150
+ type : "shell " ,
151
151
dependsOn : "Compile Project" ,
152
152
command : `\${command:${ extensionName } .${ GetPicotoolPathCommand . id } }` ,
153
153
args : [
154
154
"load" ,
155
155
"-x" ,
156
- "${command:raspberry-pi-pico.launchTargetPath }" ,
156
+ "${command:raspberry-pi-pico.launchTargetPathRelease }" ,
157
157
"-t" ,
158
158
"elf" ,
159
159
"-f" ,
You can’t perform that action at this time.
0 commit comments