Skip to content

Commit 4aa7ddc

Browse files
hlovdaladiazulay
authored andcommitted
Add buildMode argument to verify
1 parent e4a70b0 commit 4aa7ddc

File tree

3 files changed

+15
-12
lines changed

3 files changed

+15
-12
lines changed

src/arduino/arduino.ts

+12-9
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import { makeCompilerParserContext } from "./intellisense";
2626
import { ProgrammerManager } from "./programmerManager";
2727

2828
export enum BuildMode {
29+
Verify = "Verifying",
2930
Upload = "Uploading",
3031
UploadProgrammer = "Uploading (programmer)",
3132
};
@@ -271,7 +272,7 @@ export class ArduinoApp {
271272
});
272273
}
273274

274-
public async verify(output: string = "") {
275+
public async verify(buildMode: BuildMode, output: string = "") {
275276
const dc = DeviceContext.getInstance();
276277
const args: string[] = [];
277278
const boardDescriptor = this.getBoardBuildString();
@@ -291,10 +292,12 @@ export class ArduinoApp {
291292
await this.getMainSketch(dc);
292293
}
293294

294-
if (!this.useArduinoCli()) {
295-
args.push("--verify");
296-
} else {
297-
args.push("compile", "-b", boardDescriptor);
295+
if (buildMode === BuildMode.Verify) {
296+
if (!this.useArduinoCli()) {
297+
args.push("--verify");
298+
} else {
299+
args.push("compile", "-b", boardDescriptor);
300+
}
298301
}
299302

300303
const verbose = VscodeSettings.getInstance().logLevel === "verbose";
@@ -305,7 +308,7 @@ export class ArduinoApp {
305308
await vscode.workspace.saveAll(false);
306309

307310
arduinoChannel.show();
308-
arduinoChannel.start(`Verify sketch - ${dc.sketch}`);
311+
arduinoChannel.start(`${buildMode} sketch '${dc.sketch}'`);
309312

310313
if (!await this.runPreBuildCommand(dc)) {
311314
return false;
@@ -350,16 +353,16 @@ export class ArduinoApp {
350353
compilerParserContext.callback,
351354
).then(async () => {
352355
await cleanup();
353-
arduinoChannel.end(`Finished verifying sketch - ${dc.sketch}${os.EOL}`);
356+
arduinoChannel.end(`${buildMode} sketch '${dc.sketch}'${os.EOL}`);
354357
success = true;
355358
}, async (reason) => {
356359
await cleanup();
357360
const msg = reason.code ?
358-
`Exit with code=${reason.code}${os.EOL}` :
361+
`Exit with code=${reason.code}` :
359362
reason.message ?
360363
reason.message :
361364
JSON.stringify(reason);
362-
arduinoChannel.error(msg);
365+
arduinoChannel.error(`${buildMode} sketch '${dc.sketch}': ${msg}${os.EOL}`);
363366
});
364367

365368
if (compilerParserContext.conclude) {

src/debug/configurationProvider.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import * as path from "path";
55
import * as vscode from "vscode";
66

7-
import { ArduinoApp } from "../arduino/arduino";
7+
import { ArduinoApp, BuildMode } from "../arduino/arduino";
88
import ArduinoActivator from "../arduinoActivator";
99
import ArduinoContext from "../arduinoContext";
1010

@@ -136,7 +136,7 @@ export class ArduinoDebugConfigurationProvider implements vscode.DebugConfigurat
136136
config.program = path.join(ArduinoWorkspace.rootPath, outputFolder, `${path.basename(dc.sketch)}.elf`);
137137

138138
// always compile elf to make sure debug the right elf
139-
if (!await ArduinoContext.arduinoApp.verify(outputFolder)) {
139+
if (!await ArduinoContext.arduinoApp.verify(BuildMode.Verify, outputFolder)) {
140140
vscode.window.showErrorMessage("Failure to verify the program, please check output for details.");
141141
return false;
142142
}

src/extension.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ export async function activate(context: vscode.ExtensionContext) {
124124
location: vscode.ProgressLocation.Window,
125125
title: "Arduino: Verifying...",
126126
}, async () => {
127-
await arduinoContextModule.default.arduinoApp.verify();
127+
await arduinoContextModule.default.arduinoApp.verify(BuildMode.Verify);
128128
});
129129
} catch (ex) {
130130
}

0 commit comments

Comments
 (0)