kopia lustrzana https://github.com/OpenBuilds/OpenBuilds-CONTROL
rodzic
55a0c07775
commit
5f0468f780
|
@ -1,4 +1,5 @@
|
|||
v1.0.281: Added "Restore Backup" button for Grbl Settings, Fixed jog increment for mm
|
||||
v1.0.282: Improved logging messages for Interface Firmware flashing tool, Fixed bug with non-standard Grbl Firmwares that have Variable Speed disabled
|
||||
v1.0.281: Added "Restore Backup" button for Grbl Settings, Fixed jog increment for mm after switching between in/mm
|
||||
v1.0.280: Socket.IO Bug fixed
|
||||
v1.0.279: Autorun macros: added error toast to keyboard shortcut, Fixed CSS on Serial Console tab
|
||||
v1.0.278: Fixed bug #179 (Electron upload path for Interface Firmware)
|
||||
|
|
|
@ -426,11 +426,30 @@ function initSocket() {
|
|||
string = "<span class='fg-red'><i class='fas fa-times fa-fw fg-red fa-fw'></i>" + string + "</span>"
|
||||
}
|
||||
|
||||
if (string.indexOf("A fatal error occurred: Failed to connect to ESP32: Timed out waiting for packet header") != -1) {
|
||||
string = "<span class='fg-red'>" + string + ": Make sure the Interface is in BOOTLOADER MODE. See https://docs.openbuilds.com/doku.php?id=docs:interface:firmware-update-control"
|
||||
}
|
||||
|
||||
|
||||
var icon = ''
|
||||
var source = " Firmware Upgrade"
|
||||
//var string = string
|
||||
var printLogCls = "fg-darkGray"
|
||||
printLogModern(icon, source, string, printLogCls)
|
||||
|
||||
if (data.code != undefined) {
|
||||
var icon = ''
|
||||
var source = " Firmware Upgrade"
|
||||
if (data.code == 0) {
|
||||
var string = "<i class='fas fa-check fa-fw fg-green fa-fw'></i> <b>Firmware Update COMPLETED!</b> Please click the Reset button on the Interface now, to reboot it with the new firmware. "
|
||||
var printLogCls = "fg-green"
|
||||
} else {
|
||||
var string = "<i class='fas fa-times fa-fw fg-red fa-fw'></i> <b>Firmware Update FAILED!</b> Please review the logs above, or try again"
|
||||
var printLogCls = "fg-darkRed"
|
||||
}
|
||||
printLogModern(icon, source, string, printLogCls)
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
|
|
6
index.js
6
index.js
|
@ -2094,8 +2094,8 @@ function parseFeedback(data) {
|
|||
if (startF > 2) {
|
||||
var f = data.replace(">", "").substr(startF).split(/,|\|/);
|
||||
if (Array.isArray(f)) {
|
||||
if (fs[0]) {
|
||||
status.machine.overrides.realFeed = parseInt(fs[0]);
|
||||
if (f[0]) {
|
||||
status.machine.overrides.realFeed = parseInt(f[0]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -2876,7 +2876,7 @@ function flashInterface(data) {
|
|||
child.on('close', (code) => {
|
||||
var data = {
|
||||
'port': port,
|
||||
'string': `[exit]`,
|
||||
'string': `[exit:` + code + `]`,
|
||||
'code': code
|
||||
}
|
||||
io.sockets.emit("progStatus", data);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "OpenBuildsCONTROL",
|
||||
"version": "1.0.281",
|
||||
"version": "1.0.282",
|
||||
"license": "AGPL-3.0",
|
||||
"description": "OpenBuildsCONTROL CNC Machine Interface Software",
|
||||
"author": "github.com/openbuilds <webmaster@openbuilds.com>",
|
||||
|
|
Ładowanie…
Reference in New Issue