diff --git a/arduino-littlefs-upload-1.1.3.vsix b/arduino-littlefs-upload-1.1.4.vsix similarity index 94% rename from arduino-littlefs-upload-1.1.3.vsix rename to arduino-littlefs-upload-1.1.4.vsix index cad8e97..2c425e9 100644 Binary files a/arduino-littlefs-upload-1.1.3.vsix and b/arduino-littlefs-upload-1.1.4.vsix differ diff --git a/package.json b/package.json index 83e76d6..c68fbcc 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "arduino-littlefs-upload", "displayName": "arduino-littlefs-upload", "description": "Build and uploads LittleFS filesystems for the Arduino-Pico RP2040 core, ESP8266 core or ESP32 core under Arduino IDE 2.2.1 or higher", - "version": "1.1.3", + "version": "1.1.4", "engines": { "vscode": "^1.82.0" }, diff --git a/src/extension.ts b/src/extension.ts index b922d34..897ed35 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -203,7 +203,7 @@ export function activate(context: vscode.ExtensionContext) { // Windows exes need ".exe" suffix let ext = (platform() === 'win32') ? ".exe" : ""; - let extEspTool = (platform() === 'win32') ? ".exe" : ".py"; + let extEspTool = (platform() === 'win32') ? ".exe" : ((platform() === 'darwin') ? "" : ".py"); let mklittlefs = "mklittlefs" + ext; let tool = undefined; @@ -284,10 +284,10 @@ export function activate(context: vscode.ExtensionContext) { uploadOpts = ["--chip", esp32variant, "--port", serialPort, "--baud", String(uploadSpeed), "--before", "default_reset", "--after", "hard_reset", "write_flash", "-z", "--flash_mode", flashMode, "--flash_freq", flashFreq, "--flash_size", "detect", String(fsStart), imageFile]; - if (platform() === 'win32') { - cmdApp = espTool; // Have binary EXE on Win32 + if ((platform() === 'win32') || (platform() === 'darwin')) { + cmdApp = espTool; // Have binary EXE on Mac/Windows } else { - cmdApp = "python3"; // Not shipped, assumed installed + cmdApp = "python3"; // Not shipped, assumed installed on Linux uploadOpts.unshift(espTool); // Need to call Python3 } } else { // esp8266