Updated EULA

CHANGELOG.txt

@@ -1,4 +1,8 @@
-v1.0.373:
+v1.0.376 (unreleased):
+- Updated EULA
+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

build/licence.txt

@@ -1,8 +1,6 @@
-Disclaimer
-This hardware/software is provided "as is", and you use the hardware/software at your own risk. Under no circumstances shall any author be liable for direct, indirect, special, incidental, or consequential damages resulting from the use, misuse, or inability to use this hardware/software, even if the authors have been advised of the possibility of such damages.
+Terms and Conditions
 
-By downloading and using this software you agree to the following terms and conditions:
-The following legal disclaimer governs your use of our machine control software that includes beta features. By using this software, you acknowledge and agree to the terms and conditions set forth in this disclaimer.
+By downloading and using this software you agree to the following terms and conditions: The following legal disclaimer governs your use of our machine control software that includes beta features. By using this software, you acknowledge and agree to the terms and conditions set forth in this disclaimer.
 
 Beta Features:
 The machine control software may contain beta features that are still under development and testing. You acknowledge that such features may not be fully functional or may be subject to bugs, errors, or other issues. As such, the use of such features may result in unexpected and undesirable results.
@@ -14,7 +12,7 @@ Limitation of Liability:
 In no event shall we be liable for any damages arising out of or in connection with the use or inability to use the software, including any beta features. This includes but is not limited to direct, indirect, incidental, special, or consequential damages, such as loss of profits, data, or use of the software.
 
 Indemnification:
-You agree to indemnify, defend, and hold us harmless from any claims, damages, and expenses, including reasonable attorney's fees, arising out of your use of the software, including any beta features.
+You agree to indemnify, defend, and hold us harmless from any claims, damages, and expenses, including reasonable attorney's fees, arising out of your use of the software, including any beta features, except to the extent prohibited under applicable law.
 
 No Support:
 We are not obliged to provide any technical support or assistance with the use of the software, including any beta features. Any support or assistance provided by us is entirely at our discretion.

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.

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);
   }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "OpenBuildsCONTROL",
-  "version": "1.0.374",
+  "version": "1.0.376",
   "license": "AGPL-3.0",
   "description": "OpenBuildsCONTROL CNC Machine Host Software",
   "author": "github.com/openbuilds <support@openbuilds.com>",