kopia lustrzana https://github.com/OpenBuilds/OpenBuilds-CONTROL
Update to fail elegantly for Port Error
rodzic
20fd625a1a
commit
e82fe4891b
|
@ -531,7 +531,7 @@
|
|||
<div id="grblPanel" style="display: none;">
|
||||
<div id="grblconfig"></div>
|
||||
</div>
|
||||
<div id="updatePanel">
|
||||
<div id="updatePanel" style="display: none;">
|
||||
<div id="updateconsole">Click "Check for Updates" above</div>
|
||||
</div>
|
||||
|
||||
|
@ -581,6 +581,7 @@
|
|||
|
||||
<script type="text/javascript" src="/lib/lodash.core.js"></script>
|
||||
<script type="text/javascript" src="/socket.io/socket.io.js"></script>
|
||||
|
||||
<script type="text/javascript" src="js/main.js"></script>
|
||||
<script type="text/javascript" src="js/ui.js"></script>
|
||||
<script type="text/javascript" src="js/websocket.js"></script>
|
||||
|
|
|
@ -72,7 +72,7 @@ function loadFile(f) {
|
|||
// cleanupThree();
|
||||
// gcode = this.result;
|
||||
editor.session.setValue(this.result);
|
||||
printLog('GCODE Opened');
|
||||
printLog('GCODE Opened: ');
|
||||
};
|
||||
// }
|
||||
}
|
||||
|
|
17
index.js
17
index.js
|
@ -91,6 +91,7 @@ autoUpdater.on('update-available', (ev, info) => {
|
|||
'response': string
|
||||
}
|
||||
io.sockets.emit('updatedata', output);
|
||||
console.log(JSON.stringify(ev))
|
||||
appIcon.displayBalloon({
|
||||
icon: nativeImage.createFromPath(iconPath),
|
||||
title: "OpenBuilds Machine Driver",
|
||||
|
@ -107,6 +108,7 @@ autoUpdater.on('update-not-available', (ev, info) => {
|
|||
'response': string
|
||||
}
|
||||
io.sockets.emit('updatedata', output);
|
||||
console.log(JSON.stringify(ev))
|
||||
appIcon.displayBalloon({
|
||||
icon: nativeImage.createFromPath(iconPath),
|
||||
title: "OpenBuilds Machine Driver",
|
||||
|
@ -686,13 +688,22 @@ io.on("connection", function(socket) {
|
|||
|
||||
port.on("error", function(err) {
|
||||
console.log("Error: ", err.message);
|
||||
var output = {
|
||||
'command': '',
|
||||
'response': "PORT ERROR: " + err.message
|
||||
}
|
||||
io.sockets.emit('data', output);
|
||||
appIcon.displayBalloon({
|
||||
icon: nativeImage.createFromPath(iconPath),
|
||||
title: "Driver encountered a Port error",
|
||||
content: "OpenBuilds Machine Driver received the following error: " + err.message
|
||||
})
|
||||
// stopPort();
|
||||
// status.comms.connectionStatus = 0;
|
||||
if (status.comms.connectionStatus > 0) {
|
||||
console.log('WARN: Closing Port ' + port.path);
|
||||
stopPort();
|
||||
} else {
|
||||
console.log('ERROR: Machine connection not open!');
|
||||
}
|
||||
});
|
||||
port.on("open", function() {
|
||||
var output = {
|
||||
|
@ -1376,8 +1387,8 @@ io.on("connection", function(socket) {
|
|||
// break;
|
||||
// }
|
||||
// console.log("Code:" + code)
|
||||
// if (code) {
|
||||
// //jumpQ(String.fromCharCode(parseInt(code)));
|
||||
// if (code) {
|
||||
// machineSend(String.fromCharCode(parseInt(code)));
|
||||
// console.log('Sent: Code(' + code + ')');
|
||||
// console.log('Feed Override ' + data + '%');
|
||||
|
|
Plik diff jest za duży
Load Diff
|
@ -3,7 +3,7 @@
|
|||
"version": "1.0.26",
|
||||
"license": "AGPL-3.0",
|
||||
"description": "Machine Interface Driver for OpenBuilds",
|
||||
"author": "github.com/openbuilds",
|
||||
"author": "github.com/openbuilds <webmaster@openbuilds.com>",
|
||||
"devDependencies": {
|
||||
"copyfiles": "^1.2.0",
|
||||
"electron": "^1.6.x",
|
||||
|
@ -26,7 +26,8 @@
|
|||
"scripts": {
|
||||
"start": "echo \"Please run 'npm run dist' to create a local installer\" ",
|
||||
"test": "echo \"Error: no test specified\" && exit 0",
|
||||
"dist": "build"
|
||||
"dist": "build",
|
||||
"distpi": "build --linux deb --armv7l"
|
||||
},
|
||||
"keywords": [
|
||||
"usb"
|
||||
|
|
Ładowanie…
Reference in New Issue