Skip to content
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

[VSC-1629] fix openocd args order #1482

Merged
merged 1 commit into from
Mar 27, 2025
Merged

[VSC-1629] fix openocd args order #1482

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
20 changes: 13 additions & 7 deletions src/espIdf/openOcd/openOcdManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,18 +182,13 @@ export class OpenOCDManager extends EventEmitter {
);
}

const openOcdArgs = [];
const openOcdArgs: string[] = [];
const openOcdDebugLevel = idfConf.readParameter(
"idf.openOcdDebugLevel",
this.workspace
) as string;
openOcdArgs.push(`-d${openOcdDebugLevel}`);

openOcdConfigFilesList.forEach((configFile) => {
openOcdArgs.push("-f");
openOcdArgs.push(configFile);
});

const addLaunchArgs = idfConf.readParameter(
"idf.openOcdLaunchArgs",
this.workspace
Expand All @@ -205,6 +200,16 @@ export class OpenOCDManager extends EventEmitter {
});
}

openOcdConfigFilesList.forEach((configFile) => {
const isFileAlreadyInArgs = openOcdArgs.some((arg) =>
arg.includes(configFile)
);
if (!isFileAlreadyInArgs) {
openOcdArgs.push("-f");
openOcdArgs.push(configFile);
}
});

this.server = spawn("openocd", openOcdArgs, {
cwd: this.workspace.fsPath,
env: modifiedEnv,
Expand Down Expand Up @@ -250,7 +255,8 @@ export class OpenOCDManager extends EventEmitter {
if (!signal && code && code !== 0) {
Logger.error(
`OpenOCD Exit with non-zero error code ${code}`,
new Error("Spawn exit with non-zero" + code), "OpenOCDManager close"
new Error("Spawn exit with non-zero" + code),
"OpenOCDManager close"
);
OutputChannel.appendLine(
`OpenOCD Exit with non-zero error code ${code}`,
Expand Down