mirror
/
OpenBuilds-CONTROL
kopia lustrzana https://github.com/OpenBuilds/OpenBuilds-CONTROL
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Renamed to OpenBuilds CONTROL - Fix #29

pull/110/head
openbuilds-engineer 2018-11-23 18:13:16 +02:00
rodzic 90f94b57f8
commit 9ac5d5e1fe
11 zmienionych plików z 113 dodań i 113 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
README.md
Wyświetl plik

@ -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)

12
app/index.html
Wyświetl plik

@ -2,7 +2,7 @@
<html lang="en">
<head>
<title>OpenBuilds Machine Driver</title>
<title>OpenBuilds CONTROL</title>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="author" content="">
@ -19,7 +19,7 @@
<div class="pos-fixed pos-center" id="splash">
<img src="splashicon.png" style="display:block; margin:auto;">
<br>Starting&nbsp;OpenBuilds&nbsp;Machine&nbsp;Driver...
<br>Starting&nbsp;OpenBuilds&nbsp;CONTROL...
</div>
@ -27,7 +27,7 @@
<div class="window-caption bg-openbuilds" style="-webkit-app-region: drag;">
<!-- <span class="icon mif-cog"></span> -->
<span class="icon"><img src="icon-transparent.png"/></span>
<span class="title" id="windowtitle">OpenBuilds Machine Driver</span>
<span class="title" id="windowtitle">OpenBuilds CONTROL</span>
<div class="buttons" style="-webkit-app-region: no-drag">
<span class="btn-min" onclick="socket.emit('minimize')"></span>
<span data-cls-hint="bg-light fg-dark drop-shadow" class="btn-close" onclick="socket.emit('minimisetotray')"></span>
@ -673,7 +673,7 @@
</thead>
<tbody>
<tr>
<td>Driver</td>
<td>Version</td>
<td><span class="tally bg-openbuilds fg-white" id="driverver">NOCOMM</span></td>
</tr>
<tr>
@ -689,7 +689,7 @@
<td><span class="tally bg-openbuilds fg-white" id="activeportstatus">NOCOMM</span></td>
</tr>
<tr>
<td>Driver Queue</td>
<td>Serial Queue</td>
<td><span class="tally bg-openbuilds fg-white" id="drvqueue">NOCOMM</span></td>
</tr>
<tr>
@ -759,7 +759,7 @@
Version <code><span id="availVersion">1.0.100</span></code> update ready to be installed!<br> Note that proceeding will:
<ul>
<li>Stops any running jobs</li>
<li>Shuts down this instance of the driver</li>
<li>Shuts down this instance of OpenBuilds CONTROL</li>
<li>Launches the installer for the new version</li>
</ul>
<small>You may want to wait until your machine is idle before continuing</small>

4
app/jog.html
Wyświetl plik

@ -2,7 +2,7 @@
<html lang="en">
<head>
<title>OpenBuilds Machine Driver</title>
<title>OpenBuilds CONTROL</title>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="author" content="">
@ -22,7 +22,7 @@
<div class="window-caption bg-openbuilds" style="-webkit-app-region: drag;">
<!-- <span class="icon mif-cog"></span> -->
<span class="icon"><img src="icon-transparent.png"/></span>
<span class="title" id="windowtitle">OpenBuilds Machine Driver</span>
<span class="title" id="windowtitle">OpenBuilds CONTROL</span>
<div class="buttons" style="-webkit-app-region: no-drag">
<!-- <span class="btn-min" onclick="socket.emit('minimize')"></span>
<span data-cls-hint="bg-light fg-dark drop-shadow" class="btn-close" onclick="socket.emit('minimisetotray')"></span> -->

4
app/jog/index.html
Wyświetl plik

@ -2,7 +2,7 @@
<html lang="en">
<head>
<title>OpenBuilds Machine Driver</title>
<title>OpenBuilds CONTROL</title>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="author" content="openbuilds.com">
@ -46,7 +46,7 @@
<div class="window-caption bg-openbuilds" style="-webkit-app-region: drag;">
<!-- <span class="icon mif-cog"></span> -->
<span class="icon"><img src="../icon-transparent.png"/></span>
<span class="title" id="windowtitle">OpenBuilds Machine Driver</span>
<span class="title" id="windowtitle">OpenBuilds CONTROL</span>
<div class="buttons" style="-webkit-app-region: no-drag">
<!-- <span class="btn-min" onclick="socket.emit('minimize')"></span>
<span data-cls-hint="bg-light fg-dark drop-shadow" class="btn-close" onclick="socket.emit('minimisetotray')"></span> -->

6
app/jog/manifest.json
Wyświetl plik

@ -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",

2
app/js/metroactions.js
Wyświetl plik

@ -5,7 +5,7 @@ $(document).ready(function() {
function confirmQuit() {
Metro.dialog.create({
title: "Are you sure you want to Quit?",
content: "<div>This will will close the connection to the machine, abort any running jobs, and shutdown the OpenBuilds Machine Driver</div>",
content: "<div>This will will close the connection to the machine, abort any running jobs, and shutdown OpenBuilds CONTROL</div>",
actions: [{
caption: "Yes, Quit!",
cls: "js-dialog-close alert",

4
app/js/updates.js
Wyświetl plik

@ -15,14 +15,14 @@ function checkUpdate() {
if (versionCompare(availVersion, currentVersion) == 1) {
console.log('outdated')
time = 10
printLog("<span class='fg-red'>[ Update Available! ] </span><span class='fg-green'>OpenBuilds Machine Driver <code>" + availVersion + "</code>. is available now.</span>")
printLog("<span class='fg-red'>[ Update Available! ] </span><span class='fg-green'>OpenBuilds CONTROL <code>" + availVersion + "</code>. is available now.</span>")
printLog("<span class='fg-red'>[ Update Available! ] </span><span class='fg-green'>Download will start in <span class='tally' id='countdown'>10</span> seconds (<a href='#' onclick='cancelTimer();'>cancel</a>) </span>")
printLog("<span class='fg-red'>[ Update Available! ] </span><span class='fg-green'>You will be prompted when its ready to be installed </span>")
setTimeout(function() {
updateTime();
}, 1000);
} else {
printLog("<span class='fg-red'>[ update ] </span><span class='fg-green'>You are already running OpenBuilds Machine Driver " + currentVersion + "</span>")
printLog("<span class='fg-red'>[ update ] </span><span class='fg-green'>You are already running OpenBuilds CONTROL " + currentVersion + "</span>")
setTimeout(function() {
checkUpdate()
}, 15 * 60 * 1000) // 15 mins

4
app/js/websocket.js
Wyświetl plik

@ -75,7 +75,7 @@ function initSocket() {
socket.on('disconnect', function() {
console.log("WEBSOCKET DISCONNECTED")
printLog("<span class='fg-red'>[ Websocket ] </span><span class='fg-brown'> Disconnected. Driver probably quit or crashed</span>")
printLog("<span class='fg-red'>[ Websocket ] </span><span class='fg-brown'> Disconnected. OpenBuilds CONTROL probably quit or crashed</span>")
$("#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;

80
index-backup.js
Wyświetl plik

@ -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'

102
index.js
Wyświetl plik

@ -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'))

6
package.json
Wyświetl plik

@ -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 <webmaster@openbuilds.com>",
@ -37,7 +37,7 @@
"build": {
"icon": "build/icon.icns",
"appId": "openbuilds.projectmakr",
"productName": "OpenBuildsMachineDriver",
"productName": "OpenBuildsCONTROL",
"asar": true,
"nsis": {
"oneClick": false,