v1.0.373

Select all text in droInput on click

.github/workflows/build.yml

@@ -8,7 +8,6 @@ jobs:
 
     strategy:
       matrix:
-        # os: [macos-latest, windows-latest, ubuntu-20.04]
         os: [macos-latest, windows-latest, ubuntu-latest]
 
     steps:
@@ -33,7 +32,7 @@ jobs:
         if: startsWith(matrix.os, 'windows')
         id: variables
         run: |
-          echo "::set-output name=version::${GITHUB_REF#refs/tags/v}"
+          echo "version=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
           echo "SM_CODE_SIGNING_CERT_SHA1_HASH=${{ secrets.SM_CODE_SIGNING_CERT_SHA1_HASH }}" >> "$GITHUB_ENV"
           echo "SM_HOST=${{ secrets.SM_HOST }}" >> "$GITHUB_ENV"
           echo "SM_API_KEY=${{ secrets.SM_API_KEY }}" >> "$GITHUB_ENV"
@@ -81,25 +80,17 @@ jobs:
           github_token: ${{ secrets.github_token }}
           release: true
           debugElectron: true
+          # Used to Sign before notarizing with Notarize.js
+          mac_certs: ${{ secrets.mac_certs }}
+          mac_certs_password: ${{ secrets.mac_certs_password }}
         env:
-          # new MacOS notarize secrets (2024)
-          npm_config_verbose: true
-          npm_config_loglevel: verbose
+          #npm_config_verbose: true
+          #npm_config_loglevel: verbose
+          # new MacOS notarize.js secrets (2024)
           DEBUG: electron-builder # To debug electron-builder
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
           APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-
-      # # new Windows Signing (2024)
-      # - name: Signing using Signtool
-      #   if: startsWith(matrix.os, 'windows')
-      #   run: |
-      #     signtool.exe sign /sha1 ${{ secrets.SM_CODE_SIGNING_CERT_SHA1_HASH }} /tr http://timestamp.digicert.com /td SHA256 /fd SHA256 "D:\a\OpenBuilds-CONTROL\OpenBuilds-CONTROL\dist\*.exe"
-      #     signtool.exe verify /v /pa "D:\a\OpenBuilds-CONTROL\OpenBuilds-CONTROL\dist\*.exe"
-      #
-      # - name: Upload artifacts
-      #   uses: actions/upload-artifact@v2
-      #   with:
-      #     name: ${{ matrix.os }}
-      #     path: |
-      #       dist/*.exe
+          # Required to authenticate Signing certs
+          API_KEY_ID: ${{ secrets.api_key_id }}
+          API_KEY_ISSUER_ID: ${{ secrets.api_key_issuer_id }}

CHANGELOG.txt

@@ -1,12 +1,17 @@
-v1.0.372: (Upcoming release, not available yet)
+v1.0.373:
+ - 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
+v1.0.372:
  - Updated Max Rate for LEAD1010 Plasma Add On profile
  - Added electron's app.setAppUserModelId(id) to clean up Windows notications (to be tested)
  - Fixed Issue #126 Support Inch measurements in Probe > Endmill Diameter
  - Fixed Issue #306 In grblHAL 4th axes build, let fixGrblHALSettings force $376=1 to designate A axis as Rotary
  - Fixed Issue #335 Keyboard shortcuts - handle Metro naming of keys in Macro's Keyboard Shortcuts
- - Fixed Issue #347 Added Interface's Wifi Config to Interface USB Prep Wizard (Pending Interface Firmware update work)
  - Fixed Issue #353 Jog buttons no longer accidentally change override sliders if sliders was in focus
- - Fixed Issue #354 Updated LEAD1010 Plasma Profiles for Interface (Pending Interface Firmware update work)
+ - (Interface) Fixed Issue #347 Added Interface's Wifi Config to Interface USB Prep Wizard (Requires Interface Firmware update to V1.58 to work)
+ - (Interface) Fixed Issue #354 Updated LEAD1010 Plasma Profiles for Interface (Requires Interface Firmware update to V1.58 to work)
+ - (Interface) Updated include Interface firmware binary to V1.58 (please flash your Interface from Wizards and Tools > Firmware flashing tool)
 v1.0.371:
  - Fixed Issue #257 Changed Arc drawing behavior for G2 full circles in 3D viewer
  - Fixed Issue #285 Updated ACRO with Pen servo default Grbl profile PWM parameters

app/js/jog.js

@@ -175,6 +175,7 @@ $(document).ready(function() {
     } else if (unit == "in") {
       $("#xPosInput").show().focus().val((laststatus.machine.position.work.x / 25.4).toFixed(3))
     }
+    document.getElementById("xPosInput").select();
   });
 
   $("#xPosInput").blur(function() {
@@ -217,6 +218,7 @@ $(document).ready(function() {
     } else if (unit == "in") {
       $("#yPosInput").show().focus().val((laststatus.machine.position.work.y / 25.4).toFixed(3))
     }
+    document.getElementById("yPosInput").select();
   });
 
   $("#yPosInput").blur(function() {
@@ -257,6 +259,7 @@ $(document).ready(function() {
     } else if (unit == "in") {
       $("#zPosInput").show().focus().val((laststatus.machine.position.work.z / 25.4).toFixed(3))
     }
+    document.getElementById("zPosInput").select();
   });
 
   $("#zPosInput").blur(function() {
@@ -401,7 +404,7 @@ $(document).ready(function() {
 
 
   $('.xM').on('touchstart mousedown', function(ev) {
-    console.log(ev)
+    //console.log(ev)
     if (ev.which > 1) {
       return
     }

index.js

@@ -185,6 +185,9 @@ var lastsentuploadprogress = 0;
 // Electron app
 const electron = require('electron');
 const electronApp = electron.app;
+
+electronApp.setAppUserModelId("openbuilds.control")
+
 const {
   dialog
 } = require('electron')
@@ -1128,12 +1131,24 @@ io.on("connection", function(socket) {
 
     if (status.comms.connectionStatus < 1) {
 
+
+
       if (data.type == "usb") {
         console.log("connect", "Connecting to " + data.port + " via " + data.type);
+
+        // Fix for autoreset getting stuck on MacOS with Silabs Chip
+        var allowRtsCts = false
+        var allowHupcl = false
+        if (process.platform == 'darwin') {
+          allowRtsCts = true
+          allowHupcl = true
+        }
+
         port = new SerialPort({
           path: data.port,
           baudRate: parseInt(data.baud),
-          hupcl: false // Don't set DTR - useful for X32 Reset
+          rtscts: allowRtsCts,
+          hupcl: allowHupcl // Don't set DTR - useful for X32 Reset
         });
       } else if (data.type == "telnet") {
         console.log("connect", "Connecting to " + data.ip + " via " + data.type);
@@ -1240,6 +1255,7 @@ io.on("connection", function(socket) {
         }, config.grblWaitTime * 2000);
 
         setTimeout(function() {
+
           if (status.machine.firmware.type.length > 1) {
             if (status.machine.firmware.type === "grbl") {
               debug_log("GRBL detected");
@@ -1248,6 +1264,7 @@ io.on("connection", function(socket) {
                 'response': "Detecting Firmware: Detected Grbl Succesfully",
                 'type': 'info'
               }
+
               setTimeout(function() {
                 io.sockets.emit('grbl', status.machine.firmware)
                 //v1.0.318 - commented out as a test - too many normal alarms clear prematurely
@@ -3088,7 +3105,6 @@ if (isElectron()) {
     }
 
     function createJogWindow() {
-      electronApp.setAppUserModelId("com.openbuilds.control")
       // Create the browser window.
       jogWindow = new BrowserWindow({
         // 1366 * 768 == minimum to cater for
@@ -3357,6 +3373,7 @@ https.get("https://raw.githubusercontent.com/OpenBuilds/firmware/main/interface/
             'type': 'info'
           }
           io.sockets.emit('data', output);
+          debug_log(JSON.stringify(output));
 
         })
       })
@@ -3675,4 +3692,5 @@ function scanForTelnetDevices(range) {
 }
 // end LAN Scanner
 
+
 process.on('exit', () => debug_log('exit'))

package.json

@@ -1,6 +1,6 @@
 {
   "name": "OpenBuildsCONTROL",
-  "version": "1.0.372",
+  "version": "1.0.374",
   "license": "AGPL-3.0",
   "description": "OpenBuildsCONTROL CNC Machine Host Software",
   "author": "github.com/openbuilds <support@openbuilds.com>",
@@ -55,7 +55,16 @@
       "category": "public.app-category.graphics-design",
       "entitlements": "build/entitlements.mac.plist",
       "entitlementsInherit": "build/entitlements.mac.plist",
-      "notarize": false
+      "hardenedRuntime":true,
+      "gatekeeperAssess": false,
+      "notarize": false,
+      "target": {
+        "target": "default",
+        "arch": [
+          "x64",
+          "arm64"
+        ]
+      }
     },
     "icon": "build/icon.icns",
     "appId": "openbuilds.control",
@@ -145,6 +154,7 @@
       ]
     },
     "dmg": {
+      "sign": false,
       "icon": "build/icon.icns",
       "contents": [
         {