From 278af0a6473e37e7983ff4b5d4953e9a0875ac3f Mon Sep 17 00:00:00 2001 From: openbuilds-engineer Date: Tue, 2 Aug 2022 08:14:21 +0200 Subject: [PATCH] v1.0.330 --- CHANGELOG.txt | 1 + app/js/websocket.js | 6 ++++-- build/installerSidebarBackup.bmp | Bin 0 -> 206038 bytes esptool.py | 2 +- package.json | 2 +- pi-install.sh | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 build/installerSidebarBackup.bmp diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 0bba430..991b1a8 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,4 @@ +v1.0.330: Fixed bug in Mobile Jog wizard, updated Pi install script v1.0.329: Testing version for random start bug v1.0.327/8: Updated GHA compile environment dependencies v1.0.326: Reverted to classic Grbl Settings layout, added more Grbl settings parameters, fixed bug in Firmware upload tool, diff --git a/app/js/websocket.js b/app/js/websocket.js index 3a56615..331f750 100644 --- a/app/js/websocket.js +++ b/app/js/websocket.js @@ -513,8 +513,10 @@ function initSocket() { // if (!_.isEqual(status, laststatus)) { if (laststatus !== undefined) { - if (!_.isEqual(status.machine.position.offset, laststatus.machine.position.offset) || machineCoordinateSpace == false) { - drawMachineCoordinates(status); + if (!isJogWidget) { + if (!_.isEqual(status.machine.position.offset, laststatus.machine.position.offset) || machineCoordinateSpace == false) { + drawMachineCoordinates(status); + } } if (!_.isEqual(status.comms.interfaces.ports, laststatus.comms.interfaces.ports)) { diff --git a/build/installerSidebarBackup.bmp b/build/installerSidebarBackup.bmp new file mode 100644 index 0000000000000000000000000000000000000000..83f6e8a88ca6b93f105b541b76a70519ebb76dc9 GIT binary patch literal 206038 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", diff --git a/pi-install.sh b/pi-install.sh index e87290f..76dd108 100644 --- a/pi-install.sh +++ b/pi-install.sh @@ -12,7 +12,7 @@ sudo apt install -y xrdp echo "(4/10) Installing GIT..." sudo apt-get install -y git echo "(5/10) Installing NodeJS 12.x..." -curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash - +curl -sL https://deb.nodesource.com/setup_14.x | sudo -E bash - sudo apt-get install -y nodejs echo "(6/10) Updating npm..." sudo npm install -g npm@latest