From e28077597efd2afe3ecce7f3fe5d7bc6ee4f38ef Mon Sep 17 00:00:00 2001 From: mrmabulous Date: Tue, 4 Mar 2025 15:03:08 +0100 Subject: [PATCH 1/3] Changed esp32 OTA upload command to use "espota" instead of "espota.py" under windows and macOS. --- src/extension.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/extension.ts b/src/extension.ts index 19ad749..b9cdd87 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -500,7 +500,7 @@ export function activate(context: vscode.ExtensionContext) { } } else if (esp32) { if (network) { - let espota = "tools" + path.sep + "espota.py"; + let espota = "tools" + path.sep + "espota"; let espotaPath = findTool(arduinoContext, "runtime.platform.path"); if (espotaPath) { espota = espotaPath + path.sep + espota; @@ -511,7 +511,7 @@ export function activate(context: vscode.ExtensionContext) { cmdApp = espota; // Have binary EXE on Mac/Windows } else { cmdApp = "python3"; // Not shipped, assumed installed on Linux - uploadOpts.unshift(espota); // Need to call Python3 + uploadOpts.unshift(espota + ".py"); // Need to call Python3 } } else { let flashMode = arduinoContext.boardDetails.buildProperties["build.flash_mode"]; From f3797fc3936ee4c42fea715b255a427c3b385f21 Mon Sep 17 00:00:00 2001 From: mrmabulous Date: Tue, 4 Mar 2025 17:31:43 +0100 Subject: [PATCH 2/3] Changed OTA upload under macOS to use python script. --- src/extension.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extension.ts b/src/extension.ts index b9cdd87..1668c64 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -507,7 +507,7 @@ export function activate(context: vscode.ExtensionContext) { } uploadOpts = ["-r", "-i", serialPort, "-p", String(networkPort), "-f", imageFile, "-s"]; - if ((platform() === 'win32') || (platform() === 'darwin')) { + if (platform() === 'win32') { cmdApp = espota; // Have binary EXE on Mac/Windows } else { cmdApp = "python3"; // Not shipped, assumed installed on Linux From 9e00192bff0b05382b0c9d2fbed3c5a19555136e Mon Sep 17 00:00:00 2001 From: mrmabulous Date: Tue, 4 Mar 2025 17:34:48 +0100 Subject: [PATCH 3/3] Updated comments in code to reflect previous changes. --- src/extension.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/extension.ts b/src/extension.ts index 1668c64..149b597 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -508,9 +508,9 @@ export function activate(context: vscode.ExtensionContext) { uploadOpts = ["-r", "-i", serialPort, "-p", String(networkPort), "-f", imageFile, "-s"]; if (platform() === 'win32') { - cmdApp = espota; // Have binary EXE on Mac/Windows + cmdApp = espota; // Have binary EXE on Windows } else { - cmdApp = "python3"; // Not shipped, assumed installed on Linux + cmdApp = "python3"; // Not shipped, assumed installed on Linux and MacOS uploadOpts.unshift(espota + ".py"); // Need to call Python3 } } else {