Skip to content

Commit

Permalink
v1.0.330
Browse files Browse the repository at this point in the history
  • Loading branch information
petervanderwalt committed Aug 2, 2022
1 parent 81528e1 commit 278af0a
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
6 changes: 4 additions & 2 deletions app/js/websocket.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
Binary file added build/installerSidebarBackup.bmp
Binary file not shown.
2 changes: 1 addition & 1 deletion esptool.py
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,7 @@ def change_baud(self, baud):
# stub takes the new baud rate and the old one
second_arg = self._port.baudrate if self.IS_STUB else 0
self.command(self.ESP_CHANGE_BAUDRATE, struct.pack('<II', baud, second_arg))
print("Changed.")
print("Changed baud rate to %d successfully" % baud)
self._set_port_baudrate(baud)
time.sleep(0.05) # get rid of crap sent during baud rate change
self.flush_input()
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "OpenBuildsCONTROL",
"version": "1.0.329",
"version": "1.0.330",
"license": "AGPL-3.0",
"description": "OpenBuildsCONTROL CNC Machine Host Software",
"author": "github.com/openbuilds <support@openbuilds.com>",
Expand Down
2 changes: 1 addition & 1 deletion pi-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 278af0a

Please sign in to comment.