diff --git a/README.md b/README.md index 8545220..86d3bb1 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # SW-Machine-Drivers -OpenBuilds Machine Driver - Interface Driver for all CNC style machines (Grbl, Smoothieware) +OpenBuilds CONTROL - Interface Driver for all CNC style machines (Grbl, Smoothieware) ## Download Download from [Github releases](https://github.com/OpenBuilds/SW-Machine-Drivers/releases) diff --git a/app/index.html b/app/index.html index e7717b2..2515874 100644 --- a/app/index.html +++ b/app/index.html @@ -2,7 +2,7 @@ - OpenBuilds Machine Driver + OpenBuilds CONTROL @@ -19,7 +19,7 @@
-
Starting OpenBuilds Machine Driver... +
Starting OpenBuilds CONTROL...
@@ -27,7 +27,7 @@
- OpenBuilds Machine Driver + OpenBuilds CONTROL
@@ -673,7 +673,7 @@ - Driver + Version NOCOMM @@ -689,7 +689,7 @@ NOCOMM - Driver Queue + Serial Queue NOCOMM @@ -759,7 +759,7 @@ Version 1.0.100 update ready to be installed!
Note that proceeding will: You may want to wait until your machine is idle before continuing diff --git a/app/jog.html b/app/jog.html index 779ca8c..4a1c8f8 100644 --- a/app/jog.html +++ b/app/jog.html @@ -2,7 +2,7 @@ - OpenBuilds Machine Driver + OpenBuilds CONTROL @@ -22,7 +22,7 @@
- OpenBuilds Machine Driver + OpenBuilds CONTROL
diff --git a/app/jog/index.html b/app/jog/index.html index 2e0381c..3acb16d 100644 --- a/app/jog/index.html +++ b/app/jog/index.html @@ -2,7 +2,7 @@ - OpenBuilds Machine Driver + OpenBuilds CONTROL @@ -46,7 +46,7 @@
- OpenBuilds Machine Driver + OpenBuilds CONTROL
diff --git a/app/jog/manifest.json b/app/jog/manifest.json index dd8f238..fd5ae43 100644 --- a/app/jog/manifest.json +++ b/app/jog/manifest.json @@ -1,7 +1,7 @@ { - "name": "OpenBuilds Machine Driver Jog", - "short_name": "OpenBuilds Machine Driver Jog", - "description": "OpenBuilds Machine Driver Jog", + "name": "OpenBuilds CONTROL Jog", + "short_name": "OpenBuilds CONTROL Jog", + "description": "OpenBuilds CONTROL Jog", "scope": ".", "start_url": "/jog", "display": "standalone", diff --git a/app/js/metroactions.js b/app/js/metroactions.js index d6c4190..d01714b 100644 --- a/app/js/metroactions.js +++ b/app/js/metroactions.js @@ -5,7 +5,7 @@ $(document).ready(function() { function confirmQuit() { Metro.dialog.create({ title: "Are you sure you want to Quit?", - content: "
This will will close the connection to the machine, abort any running jobs, and shutdown the OpenBuilds Machine Driver
", + content: "
This will will close the connection to the machine, abort any running jobs, and shutdown OpenBuilds CONTROL
", actions: [{ caption: "Yes, Quit!", cls: "js-dialog-close alert", diff --git a/app/js/updates.js b/app/js/updates.js index 9c62a83..3a9c6a4 100644 --- a/app/js/updates.js +++ b/app/js/updates.js @@ -15,14 +15,14 @@ function checkUpdate() { if (versionCompare(availVersion, currentVersion) == 1) { console.log('outdated') time = 10 - printLog("[ Update Available! ] OpenBuilds Machine Driver " + availVersion + ". is available now.") + printLog("[ Update Available! ] OpenBuilds CONTROL " + availVersion + ". is available now.") printLog("[ Update Available! ] Download will start in 10 seconds (cancel) ") printLog("[ Update Available! ] You will be prompted when its ready to be installed ") setTimeout(function() { updateTime(); }, 1000); } else { - printLog("[ update ] You are already running OpenBuilds Machine Driver " + currentVersion + "") + printLog("[ update ] You are already running OpenBuilds CONTROL " + currentVersion + "") setTimeout(function() { checkUpdate() }, 15 * 60 * 1000) // 15 mins diff --git a/app/js/websocket.js b/app/js/websocket.js index dc5b238..ce7ce24 100644 --- a/app/js/websocket.js +++ b/app/js/websocket.js @@ -75,7 +75,7 @@ function initSocket() { socket.on('disconnect', function() { console.log("WEBSOCKET DISCONNECTED") - printLog("[ Websocket ] Disconnected. Driver probably quit or crashed") + printLog("[ Websocket ] Disconnected. OpenBuilds CONTROL probably quit or crashed") $("#websocketstatus").html("Disconnected") }); @@ -196,7 +196,7 @@ function initSocket() { socket.on('status', function(status) { if (nostatusyet) { - $('#windowtitle').html("OpenBuilds Machine Driver v" + status.driver.version) + $('#windowtitle').html("OpenBuilds CONTROL v" + status.driver.version) } nostatusyet = false; diff --git a/index-backup.js b/index-backup.js index e9e6997..7e82805 100644 --- a/index-backup.js +++ b/index-backup.js @@ -1,4 +1,4 @@ -console.log("Starting OpenBuilds Machine Driver v" + require('./package').version) +console.log("Starting OpenBuilds CONTROL v" + require('./package').version) var config = {}; config.webPort = process.env.WEB_PORT || 3000; @@ -81,7 +81,7 @@ autoUpdater.on('checking-for-update', () => { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "OpenBuilds Machine Driver", + title: "OpenBuilds CONTROL", content: string }) } @@ -97,7 +97,7 @@ autoUpdater.on('update-available', (ev, info) => { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "OpenBuilds Machine Driver", + title: "OpenBuilds CONTROL", content: string }) } @@ -116,7 +116,7 @@ autoUpdater.on('update-not-available', (ev, info) => { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "OpenBuilds Machine Driver", + title: "OpenBuilds CONTROL", content: string }) } @@ -131,7 +131,7 @@ autoUpdater.on('error', (ev, err) => { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "OpenBuilds Machine Driver", + title: "OpenBuilds CONTROL", content: string }) } @@ -149,7 +149,7 @@ autoUpdater.on('download-progress', (ev, progressObj) => { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "OpenBuilds Machine Driver", + title: "OpenBuilds CONTROL", content: string }) } @@ -157,7 +157,7 @@ autoUpdater.on('download-progress', (ev, progressObj) => { }) autoUpdater.on('update-downloaded', (info) => { - var string = "New update ready. Click INSTALL UPDATE once you are ready. NB Note that this closes the running instance of the OpenBuilds Machine Driver, and aborts any running jobs. Only run the Update before beginning a job / once you are done working with your machine. "; + var string = "New update ready. Click INSTALL UPDATE once you are ready. NB Note that this closes the running instance of the OpenBuilds CONTROL, and aborts any running jobs. Only run the Update before beginning a job / once you are done working with your machine. "; var output = { 'command': 'autoupdate', 'response': string @@ -167,7 +167,7 @@ autoUpdater.on('update-downloaded', (info) => { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "OpenBuilds Machine Driver", + title: "OpenBuilds CONTROL", content: string }) } @@ -459,8 +459,8 @@ var PortCheckinterval = setInterval(function() { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "Driver Detected a new Port", - content: "OpenBuilds Machine Driver detected a new port: " + newPorts[0].comName + title: "Detected a new Port", + content: "OpenBuilds CONTROL detected a new port: " + newPorts[0].comName }) } } @@ -470,8 +470,8 @@ var PortCheckinterval = setInterval(function() { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "Driver Detected a disconnected Port", - content: "OpenBuilds Machine Driver detected that port: " + removedPorts[0].comName + " was removed" + title: "Detected a disconnected Port", + content: "OpenBuilds CONTROL detected that port: " + removedPorts[0].comName + " was removed" }) } } @@ -500,7 +500,7 @@ app.get('/activate', (req, res) => { console.log(req.hostname) res.header("Access-Control-Allow-Origin", "*"); res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept"); - res.send('Host: ' + req.hostname + ' asked to activate OpenBuildsMachineDriver v' + require('./package').version); + res.send('Host: ' + req.hostname + ' asked to activate OpenBuilds CONTROL v' + require('./package').version); if (jogWindow === null) { createJogWindow(); jogWindow.show() @@ -579,7 +579,7 @@ app.post('/upload', function(req, res) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), title: "ERROR: File Upload Failed", - content: "OpenBuilds Machine Driver ERROR: File Upload Failed" + content: "OpenBuilds CONTROL ERROR: File Upload Failed" }) } } @@ -589,7 +589,7 @@ app.post('/upload', function(req, res) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), title: "GCODE Received", - content: "OpenBuilds Machine Driver received new GCODE" + content: "OpenBuilds CONTROL received new GCODE" }) } } @@ -693,8 +693,8 @@ io.on("connection", function(socket) { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "Driver encountered a Port error", - content: "OpenBuilds Machine Driver received the following error: " + err.message + title: "OpenBuilds CONTROL encountered a Port error", + content: "OpenBuilds CONTROL received the following error: " + err.message }) } if (status.comms.connectionStatus > 0) { @@ -817,8 +817,8 @@ io.on("connection", function(socket) { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "Driver has established a Connection", - content: "OpenBuilds Machine Driver is now connected to " + status.comms.interfaces.activePort + " running " + status.machine.firmware.type + " " + status.machine.firmware.version + title: "OpenBuilds CONTROL has established a Connection", + content: "OpenBuilds CONTROL is now connected to " + status.comms.interfaces.activePort + " running " + status.machine.firmware.type + " " + status.machine.firmware.version }) } // Start interval for status queries @@ -835,8 +835,8 @@ io.on("connection", function(socket) { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "Driver has established a Connection", - content: "OpenBuilds Machine Driver is now connected to " + status.comms.interfaces.activePort + " running " + status.machine.firmware.type + " " + status.machine.firmware.version + title: "OpenBuilds CONTROL has established a Connection", + content: "OpenBuilds CONTROL is now connected to " + status.comms.interfaces.activePort + " running " + status.machine.firmware.type + " " + status.machine.firmware.version }) } status.machine.firmware.type = "smoothie"; @@ -1133,8 +1133,8 @@ io.on("connection", function(socket) { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "Driver: Job Started", - content: "OpenBuilds Machine Driver started a job: Job Size: " + data.length + " lines of GCODE" + title: "OpenBuilds CONTROL: Job Started", + content: "OpenBuilds CONTROL started a job: Job Size: " + data.length + " lines of GCODE" }) } } else { @@ -1266,8 +1266,8 @@ io.on("connection", function(socket) { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "Driver: Work Coordinate System Reset", - content: "OpenBuilds Machine Driver has reset the WCS on the " + data + " axes." + title: "OpenBuilds CONTROL: Work Coordinate System Reset", + content: "OpenBuilds CONTROL has reset the WCS on the " + data + " axes." }) } } else { @@ -1506,8 +1506,8 @@ io.on("connection", function(socket) { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "Driver: Job Paused", - content: "OpenBuilds Machine Driver paused the job" + title: "OpenBuilds CONTROL: Job Paused", + content: "OpenBuilds CONTROL paused the job" }) } } else { @@ -1539,8 +1539,8 @@ io.on("connection", function(socket) { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "Driver: Job Resumed", - content: "OpenBuilds Machine Driver resumed the job" + title: "OpenBuilds CONTROL: Job Resumed", + content: "OpenBuilds CONTROL resumed the job" }) } } else { @@ -1589,8 +1589,8 @@ io.on("connection", function(socket) { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "Driver: Job Aborted", - content: "OpenBuilds Machine Driver was asked to abort the running job." + title: "OpenBuilds CONTROL: Job Aborted", + content: "OpenBuilds CONTROL was asked to abort the running job." }) } // status.comms.connectionStatus = 2; @@ -1651,8 +1651,8 @@ io.on("connection", function(socket) { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "Driver: Alarm Cleared", - content: "OpenBuilds Machine Driver has cleared the Alarm Condition, you may continue" + title: "OpenBuilds CONTROL: Alarm Cleared", + content: "OpenBuilds CONTROL has cleared the Alarm Condition, you may continue" }) } } else { @@ -1794,8 +1794,8 @@ function send1Q() { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "Driver: Job Completed!", - content: "OpenBuilds Machine Driver completed a Job in " + elapsedTime + " seconds. We processed " + speed + " gcode lines/second on average." + title: "OpenBuilds CONTROL: Job Completed!", + content: "OpenBuilds CONTROL completed a Job in " + elapsedTime + " seconds. We processed " + speed + " gcode lines/second on average." }) } } @@ -2196,7 +2196,7 @@ if (electronApp) { nativeImage.createFromPath(iconPath) ) const contextMenu = Menu.buildFromTemplate([{ - label: 'Quit Machine Driver (Disables all integration until started again)', + label: 'Quit OpenBuilds CONTROL (Disables all integration until started again)', click() { appIcon.destroy(); electronApp.exit(0); @@ -2239,8 +2239,8 @@ if (electronApp) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "Driver Started", - content: "OpenBuilds Machine Driver has started successfully: Active on " + ip.address() + ":" + config.webPort + title: "OpenBuilds CONTROL Started", + content: "OpenBuilds CONTROL has started successfully: Active on " + ip.address() + ":" + config.webPort }) } @@ -2253,7 +2253,7 @@ if (electronApp) { fullscreen: false, center: true, resizable: true, - title: "OpenBuilds Machine Driver ", + title: "OpenBuilds CONTROL ", frame: false, autoHideMenuBar: true, icon: '/app/favicon.png' @@ -2296,7 +2296,7 @@ if (electronApp) { fullscreen: false, center: true, resizable: true, - title: "OpenBuilds Machine Driver ", + title: "OpenBuilds CONTROL ", frame: true, autoHideMenuBar: true, icon: '/app/favicon.png' diff --git a/index.js b/index.js index d410799..eeb0a29 100644 --- a/index.js +++ b/index.js @@ -1,4 +1,4 @@ -console.log("Starting OpenBuilds Machine Driver v" + require('./package').version) +console.log("Starting OpenBuilds CONTROL v" + require('./package').version) var config = {}; config.webPort = process.env.WEB_PORT || 3000; @@ -77,7 +77,7 @@ if (isElectron()) { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "OpenBuilds Machine Driver", + title: "OpenBuilds CONTROL", content: string }) } @@ -94,7 +94,7 @@ if (isElectron()) { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "OpenBuilds Machine Driver", + title: "OpenBuilds CONTROL", content: string }) } @@ -113,7 +113,7 @@ if (isElectron()) { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "OpenBuilds Machine Driver", + title: "OpenBuilds CONTROL", content: string }) } @@ -132,7 +132,7 @@ if (isElectron()) { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "OpenBuilds Machine Driver", + title: "OpenBuilds CONTROL", content: string }) } @@ -150,7 +150,7 @@ if (isElectron()) { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "OpenBuilds Machine Driver", + title: "OpenBuilds CONTROL", content: string }) } @@ -172,7 +172,7 @@ if (isElectron()) { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "OpenBuilds Machine Driver", + title: "OpenBuilds CONTROL", content: string }) // Launch Gui to run Update @@ -444,7 +444,7 @@ var PortCheckinterval = setInterval(function() { // appIcon.displayBalloon({ // icon: nativeImage.createFromPath(iconPath), // title: "Driver Detected a new Port", - // content: "OpenBuilds Machine Driver detected a new port: " + newPorts[0].comName + // content: "OpenBuilds CONTROL detected a new port: " + newPorts[0].comName // }) // } } @@ -454,8 +454,8 @@ var PortCheckinterval = setInterval(function() { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "Driver Detected a disconnected Port", - content: "OpenBuilds Machine Driver detected that port: " + removedPorts[0].comName + " was removed" + title: "OpenBuilds CONTROL Detected a disconnected Port", + content: "OpenBuilds CONTROL detected that port: " + removedPorts[0].comName + " was removed" }) } } @@ -482,7 +482,7 @@ app.get('/activate', (req, res) => { console.log(req.hostname) res.header("Access-Control-Allow-Origin", "*"); res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept"); - res.send('Host: ' + req.hostname + ' asked to activate OpenBuildsMachineDriver v' + require('./package').version); + res.send('Host: ' + req.hostname + ' asked to activate OpenBuilds CONTROL v' + require('./package').version); if (jogWindow === null) { createJogWindow(); jogWindow.show() @@ -654,8 +654,8 @@ io.on("connection", function(socket) { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "Driver encountered a Port error", - content: "OpenBuilds Machine Driver received the following error: " + err.message + title: "OpenBuilds CONTROL encountered a Port error", + content: "OpenBuilds CONTROL received the following error: " + err.message }) } if (status.comms.connectionStatus > 0) { @@ -778,8 +778,8 @@ io.on("connection", function(socket) { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "Driver has established a Connection", - content: "OpenBuilds Machine Driver is now connected to " + status.comms.interfaces.activePort + " running " + status.machine.firmware.type + " " + status.machine.firmware.version + title: "OpenBuilds CONTROL has established a Connection", + content: "OpenBuilds CONTROL is now connected to " + status.comms.interfaces.activePort + " running " + status.machine.firmware.type + " " + status.machine.firmware.version }) } // Start interval for status queries @@ -794,8 +794,8 @@ io.on("connection", function(socket) { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "Driver has established a Connection", - content: "OpenBuilds Machine Driver is now connected to " + status.comms.interfaces.activePort + " running " + status.machine.firmware.type + " " + status.machine.firmware.version + title: "OpenBuilds CONTROL has established a Connection", + content: "OpenBuilds CONTROL is now connected to " + status.comms.interfaces.activePort + " running " + status.machine.firmware.type + " " + status.machine.firmware.version }) } status.machine.firmware.type = "smoothie"; @@ -962,8 +962,8 @@ io.on("connection", function(socket) { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "Driver: Job Started", - content: "OpenBuilds Machine Driver started a job: Job Size: " + data.length + " lines of GCODE" + title: "OpenBuilds CONTROL: Job Started", + content: "OpenBuilds CONTROL started a job: Job Size: " + data.length + " lines of GCODE" }) } } else { @@ -1136,8 +1136,8 @@ io.on("connection", function(socket) { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "Driver: Work Coordinate System Reset", - content: "OpenBuilds Machine Driver has reset the WCS on the " + data + " axes." + title: "OpenBuilds CONTROL: Work Coordinate System Reset", + content: "OpenBuilds CONTROL has reset the WCS on the " + data + " axes." }) } } else { @@ -1380,8 +1380,8 @@ io.on("connection", function(socket) { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "Driver: Job Paused", - content: "OpenBuilds Machine Driver paused the job" + title: "OpenBuilds CONTROL: Job Paused", + content: "OpenBuilds CONTROL paused the job" }) } } else { @@ -1413,8 +1413,8 @@ io.on("connection", function(socket) { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "Driver: Job Resumed", - content: "OpenBuilds Machine Driver resumed the job" + title: "OpenBuilds CONTROL: Job Resumed", + content: "OpenBuilds CONTROL resumed the job" }) } } else { @@ -1463,8 +1463,8 @@ io.on("connection", function(socket) { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "Driver: Job Aborted", - content: "OpenBuilds Machine Driver was asked to abort the running job." + title: "OpenBuilds CONTROL: Job Aborted", + content: "OpenBuilds CONTROL was asked to abort the running job." }) } // status.comms.connectionStatus = 2; @@ -1523,8 +1523,8 @@ io.on("connection", function(socket) { if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "Driver: Alarm Cleared", - content: "OpenBuilds Machine Driver has cleared the Alarm Condition, you may continue" + title: "OpenBuilds CONTROL: Alarm Cleared", + content: "OpenBuilds CONTROL has cleared the Alarm Condition, you may continue" }) } } else { @@ -1974,8 +1974,8 @@ function send1Q() { // if (jogWindow && !jogWindow.isFocused()) { // appIcon.displayBalloon({ // icon: nativeImage.createFromPath(iconPath), - // title: "Driver: Job Completed!", - // content: "OpenBuilds Machine Driver completed a Job" + // title: "OpenBuilds CONTROL: Job Completed!", + // content: "OpenBuilds CONTROL completed a Job" // }) // } gcodeQueue.length = 0; // Dump the Queye @@ -2082,22 +2082,22 @@ if (isElectron()) { const contextMenu = Menu.buildFromTemplate([{ label: 'Open User Interface (GUI)', click() { - // console.log("Clicked Systray") - if (jogWindow === null) { - createJogWindow(); - jogWindow.show() - jogWindow.setAlwaysOnTop(true); - jogWindow.focus(); - jogWindow.setAlwaysOnTop(false); - } else { - jogWindow.show() - jogWindow.setAlwaysOnTop(true); - jogWindow.focus(); - jogWindow.setAlwaysOnTop(false); - } + // console.log("Clicked Systray") + if (jogWindow === null) { + createJogWindow(); + jogWindow.show() + jogWindow.setAlwaysOnTop(true); + jogWindow.focus(); + jogWindow.setAlwaysOnTop(false); + } else { + jogWindow.show() + jogWindow.setAlwaysOnTop(true); + jogWindow.focus(); + jogWindow.setAlwaysOnTop(false); + } } - },{ - label: 'Quit Machine Driver (Disables all integration until started again)', + }, { + label: 'Quit OpenBuilds CONTROL (Disables all integration until started again)', click() { appIcon.destroy(); electronApp.exit(0); @@ -2140,12 +2140,12 @@ if (isElectron()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), - title: "Driver Started", - content: "OpenBuilds Machine Driver has started successfully: Active on " + ip.address() + ":" + config.webPort + title: "OpenBuilds CONTROL Started", + content: "OpenBuilds CONTROL has started successfully: Active on " + ip.address() + ":" + config.webPort }) } else { const dockMenu = Menu.buildFromTemplate([{ - label: 'Quit Machine Driver (Disables all integration until started again)', + label: 'Quit OpenBuilds CONTROL (Disables all integration until started again)', click() { // appIcon.destroy(); electronApp.exit(0); @@ -2165,7 +2165,7 @@ if (isElectron()) { fullscreen: false, center: true, resizable: true, - title: "OpenBuilds Machine Driver ", + title: "OpenBuilds CONTROL ", frame: false, autoHideMenuBar: true, icon: '/app/favicon.png', @@ -2249,4 +2249,4 @@ if (isElectron()) { -process.on('exit', () => console.log('exit')) +process.on('exit', () => console.log('exit')) \ No newline at end of file diff --git a/package.json b/package.json index 2040b45..0885d7c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "OpenBuildsMachineDriver", - "version": "1.0.115", + "name": "OpenBuildsCONTROL", + "version": "1.0.116", "license": "AGPL-3.0", "description": "Machine Interface Driver for OpenBuilds", "author": "github.com/openbuilds ", @@ -37,7 +37,7 @@ "build": { "icon": "build/icon.icns", "appId": "openbuilds.projectmakr", - "productName": "OpenBuildsMachineDriver", + "productName": "OpenBuildsCONTROL", "asar": true, "nsis": { "oneClick": false,