Merge upload and uploadUsingProgrammer into one build function

microsoft · Jan 19, 2021 · e4a70b0 · e4a70b0
1 parent a14f777
commit e4a70b0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
@@ -107,7 +107,7 @@ export class ArduinoApp {
      *     selectable programmer
      * @param {bool} [compile=true] - Indicates whether to compile the code when using the CLI to upload
      */
-    public async upload(buildMode: BuildMode, compile: boolean = true) {
+    public async build(buildMode: BuildMode, compile: boolean = true) {
         const dc = DeviceContext.getInstance();
         const args: string[] = [];
         let restoreSerialMonitor: boolean = false;

diff --git a/src/extension.ts b/src/extension.ts
@@ -145,7 +145,7 @@ export async function activate(context: vscode.ExtensionContext) {
                     location: vscode.ProgressLocation.Window,
                     title: "Arduino: Uploading...",
                 }, async () => {
-                    await arduinoContextModule.default.arduinoApp.upload(BuildMode.Upload);
+                    await arduinoContextModule.default.arduinoApp.build(BuildMode.Upload);
                 });
             } catch (ex) {
             }
@@ -163,7 +163,7 @@ export async function activate(context: vscode.ExtensionContext) {
                     location: vscode.ProgressLocation.Window,
                     title: "Arduino: Using CLI to upload...",
                 }, async () => {
-                    await arduinoContextModule.default.arduinoApp.upload(BuildMode.Upload, false);
+                    await arduinoContextModule.default.arduinoApp.build(BuildMode.Upload, false);
                 });
             } catch (ex) {
             }
@@ -198,7 +198,7 @@ export async function activate(context: vscode.ExtensionContext) {
         if (!status.compile) {
             status.compile = "upload";
             try {
-                await arduinoContextModule.default.arduinoApp.upload(BuildMode.UploadProgrammer, true);
+                await arduinoContextModule.default.arduinoApp.build(BuildMode.UploadProgrammer, true);
             } catch (ex) {
             }
             delete status.compile;
@@ -211,7 +211,7 @@ export async function activate(context: vscode.ExtensionContext) {
         if (!status.compile) {
             status.compile = "cliUpload";
             try {
-                await arduinoContextModule.default.arduinoApp.upload(BuildMode.UploadProgrammer, false);
+                await arduinoContextModule.default.arduinoApp.build(BuildMode.UploadProgrammer, false);
             } catch (ex) {
             }
             delete status.compile;