diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 454eeea5..02911652 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,4 +1,6 @@ -v1.0.373: +v1.0.375: +- Beta test of a fix for Python not found error for MacOS during firmware flash +v1.0.373-4: - Fixed issue #356 Merged fix for Select all text in droInput on click - Experimental fix for MacOS / Silicon Labs USB driver (Forced RTS / CTS handshake) - Re-enabled MacOS Code Signing and Notarization diff --git a/esptool.py b/esptool.py index 50077e3d..eeec52fc 100644 --- a/esptool.py +++ b/esptool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # ESP8266 & ESP32 family ROM Bootloader Utility # Copyright (C) 2014-2016 Fredrik Ahlberg, Angus Gratton, Espressif Systems (Shanghai) PTE LTD, other contributors as noted. diff --git a/index.js b/index.js index ea9879fe..5d13bdc0 100644 --- a/index.js +++ b/index.js @@ -2132,6 +2132,12 @@ io.on("connection", function(socket) { break; } debug_log('Resuming Queue Lockout'); + var output = { + 'command': '[clear alarm]', + 'response': "Operator clicked Clear Alarm: Cleared Lockout", + 'type': 'info' + } + io.sockets.emit('data', output); break; case 2: debug_log('Emptying Queue'); @@ -2156,6 +2162,12 @@ io.on("connection", function(socket) { status.comms.paused = false; break; } + var output = { + 'command': '[clear alarm]', + 'response': "Operator clicked Clear Alarm: Cleared Lockout and Emptied Queue", + 'type': 'info' + } + io.sockets.emit('data', output); break; } status.comms.runStatus = 'Stopped' @@ -3519,7 +3531,6 @@ function flashGrblHal(data) { } console.log("Flashing BlackBoxX32 on " + port + " with file: " + path.resolve(firmwarePath).replace('app.asar', 'app.asar.unpacked')) - var data = { 'port': port, 'string': "[Starting...]" @@ -3546,12 +3557,12 @@ function flashGrblHal(data) { } if (process.platform == 'linux') { - //path.join(__dirname, "..", "lib", "resources", "vad.onnx"), fs.chmodSync(path.join(__dirname, "./esptool.py").replace('app.asar', 'app.asar.unpacked'), 0o755); var child = spawn(path.join(__dirname, "./esptool.py").replace('app.asar', 'app.asar.unpacked'), esptool_opts); } else if (process.platform == 'win32') { var child = spawn(path.join(__dirname, "./esptool.exe").replace('app.asar', 'app.asar.unpacked'), esptool_opts); } else if (process.platform == 'darwin') { + console.log("Running on MacOS") fs.chmodSync(path.join(__dirname, "./esptool.py").replace('app.asar', 'app.asar.unpacked'), 0o755); var child = spawn(path.join(__dirname, "./esptool.py").replace('app.asar', 'app.asar.unpacked'), esptool_opts); } diff --git a/package.json b/package.json index 03cf7657..b85cf518 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "OpenBuildsCONTROL", - "version": "1.0.374", + "version": "1.0.375", "license": "AGPL-3.0", "description": "OpenBuildsCONTROL CNC Machine Host Software", "author": "github.com/openbuilds ",