From 5f0468f780dd8b25a03c9e6d8df4a8549a53f261 Mon Sep 17 00:00:00 2001
From: openbuilds-engineer <p.walt@openbuilds.com>
Date: Tue, 2 Feb 2021 21:27:49 +0200
Subject: [PATCH] v1.0.282

---
 CHANGELOG.txt       |  3 ++-
 app/js/websocket.js | 19 +++++++++++++++++++
 index.js            |  6 +++---
 package.json        |  2 +-
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 7b4f4bf..f15a4c4 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -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)
diff --git a/app/js/websocket.js b/app/js/websocket.js
index 2910566..3c1496b 100644
--- a/app/js/websocket.js
+++ b/app/js/websocket.js
@@ -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)
+      }
+
     }
   });
 
diff --git a/index.js b/index.js
index 2968f82..1e178e8 100644
--- a/index.js
+++ b/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);
diff --git a/package.json b/package.json
index ab7bde8..d4449ac 100644
--- a/package.json
+++ b/package.json
@@ -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>",