From: Joseph Coffland <joseph@cauldrondevelopment.com>
Date: Sat, 19 Jan 2019 04:20:25 +0000 (-0800)
Subject: Fix zeroing homed axis after jog.
X-Git-Url: https://git.buildbotics.com/?a=commitdiff_plain;h=164b948f1e6b1a96217479cc53863e9a16142b58;p=bbctrl-firmware

Fix zeroing homed axis after jog.
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5566365..fb3d192 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ Buildbotics CNC Controller Firmware Changelog
 ## v0.4.5
  - Fix for random errors while running VFD.
  - Fix bug where planner would not continue after optional pause (M1).
+ - Fix lockup on invalid no move probe G38.x. #183
+ - Fix zeroing homed axis after jog.
 
 ## v0.4.4
  - Write version to log file.
diff --git a/src/py/bbctrl/Mach.py b/src/py/bbctrl/Mach.py
index 7a701aa..1533955 100644
--- a/src/py/bbctrl/Mach.py
+++ b/src/py/bbctrl/Mach.py
@@ -130,6 +130,7 @@ class Mach(Comm):
     def _update_cycle(self):
         if (self._get_cycle() != 'idle' and self._is_ready() and
             not self.planner.is_busy() and not super().is_active()):
+            self.planner.update_position()
             self.ctrl.state.set('cycle', 'idle')
 
 
@@ -157,6 +158,7 @@ class Mach(Comm):
 
             # Return from jogging cycle
             if self._get_cycle() == 'jogging':
+                self.planner.update_position()
                 self.ctrl.state.set('cycle', self.last_cycle)
 
         # Automatically unpause after seek or stop hold