Update to fail elegantly for Port Error

pull/110/head
openbuilds-engineer 2018-07-24 14:58:26 +02:00
rodzic 20fd625a1a
commit e82fe4891b
5 zmienionych plików z 4507 dodań i 7 usunięć

Wyświetl plik

@ -531,7 +531,7 @@
<div id="grblPanel" style="display: none;"> <div id="grblPanel" style="display: none;">
<div id="grblconfig"></div> <div id="grblconfig"></div>
</div> </div>
<div id="updatePanel"> <div id="updatePanel" style="display: none;">
<div id="updateconsole">Click "Check for Updates" above</div> <div id="updateconsole">Click "Check for Updates" above</div>
</div> </div>
@ -581,6 +581,7 @@
<script type="text/javascript" src="/lib/lodash.core.js"></script> <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="/socket.io/socket.io.js"></script>
<script type="text/javascript" src="js/main.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/ui.js"></script>
<script type="text/javascript" src="js/websocket.js"></script> <script type="text/javascript" src="js/websocket.js"></script>

Wyświetl plik

@ -72,7 +72,7 @@ function loadFile(f) {
// cleanupThree(); // cleanupThree();
// gcode = this.result; // gcode = this.result;
editor.session.setValue(this.result); editor.session.setValue(this.result);
printLog('GCODE Opened'); printLog('GCODE Opened: ');
}; };
// } // }
} }

Wyświetl plik

@ -91,6 +91,7 @@ autoUpdater.on('update-available', (ev, info) => {
'response': string 'response': string
} }
io.sockets.emit('updatedata', output); io.sockets.emit('updatedata', output);
console.log(JSON.stringify(ev))
appIcon.displayBalloon({ appIcon.displayBalloon({
icon: nativeImage.createFromPath(iconPath), icon: nativeImage.createFromPath(iconPath),
title: "OpenBuilds Machine Driver", title: "OpenBuilds Machine Driver",
@ -107,6 +108,7 @@ autoUpdater.on('update-not-available', (ev, info) => {
'response': string 'response': string
} }
io.sockets.emit('updatedata', output); io.sockets.emit('updatedata', output);
console.log(JSON.stringify(ev))
appIcon.displayBalloon({ appIcon.displayBalloon({
icon: nativeImage.createFromPath(iconPath), icon: nativeImage.createFromPath(iconPath),
title: "OpenBuilds Machine Driver", title: "OpenBuilds Machine Driver",
@ -686,13 +688,22 @@ io.on("connection", function(socket) {
port.on("error", function(err) { port.on("error", function(err) {
console.log("Error: ", err.message); console.log("Error: ", err.message);
var output = {
'command': '',
'response': "PORT ERROR: " + err.message
}
io.sockets.emit('data', output);
appIcon.displayBalloon({ appIcon.displayBalloon({
icon: nativeImage.createFromPath(iconPath), icon: nativeImage.createFromPath(iconPath),
title: "Driver encountered a Port error", title: "Driver encountered a Port error",
content: "OpenBuilds Machine Driver received the following error: " + err.message content: "OpenBuilds Machine Driver received the following error: " + err.message
}) })
// stopPort(); if (status.comms.connectionStatus > 0) {
// status.comms.connectionStatus = 0; console.log('WARN: Closing Port ' + port.path);
stopPort();
} else {
console.log('ERROR: Machine connection not open!');
}
}); });
port.on("open", function() { port.on("open", function() {
var output = { var output = {
@ -1376,8 +1387,8 @@ io.on("connection", function(socket) {
// break; // break;
// } // }
// console.log("Code:" + code) // console.log("Code:" + code)
// if (code) {
// //jumpQ(String.fromCharCode(parseInt(code))); // //jumpQ(String.fromCharCode(parseInt(code)));
// if (code) {
// machineSend(String.fromCharCode(parseInt(code))); // machineSend(String.fromCharCode(parseInt(code)));
// console.log('Sent: Code(' + code + ')'); // console.log('Sent: Code(' + code + ')');
// console.log('Feed Override ' + data + '%'); // console.log('Feed Override ' + data + '%');

4487
package-lock.json wygenerowano 100644

Plik diff jest za duży Load Diff

Wyświetl plik

@ -3,7 +3,7 @@
"version": "1.0.26", "version": "1.0.26",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"description": "Machine Interface Driver for OpenBuilds", "description": "Machine Interface Driver for OpenBuilds",
"author": "github.com/openbuilds", "author": "github.com/openbuilds <webmaster@openbuilds.com>",
"devDependencies": { "devDependencies": {
"copyfiles": "^1.2.0", "copyfiles": "^1.2.0",
"electron": "^1.6.x", "electron": "^1.6.x",
@ -26,7 +26,8 @@
"scripts": { "scripts": {
"start": "echo \"Please run 'npm run dist' to create a local installer\" ", "start": "echo \"Please run 'npm run dist' to create a local installer\" ",
"test": "echo \"Error: no test specified\" && exit 0", "test": "echo \"Error: no test specified\" && exit 0",
"dist": "build" "dist": "build",
"distpi": "build --linux deb --armv7l"
}, },
"keywords": [ "keywords": [
"usb" "usb"