From 5ace47352b745fafa19bd5545ddf5c88a83804d2 Mon Sep 17 00:00:00 2001 From: Joseph Coffland Date: Tue, 27 Nov 2018 15:06:55 -0800 Subject: [PATCH] Handle GCode errors with out losing state --- src/py/bbctrl/Mach.py | 4 +--- src/py/bbctrl/Planner.py | 8 +++----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/py/bbctrl/Mach.py b/src/py/bbctrl/Mach.py index 0247d10..ac38a79 100644 --- a/src/py/bbctrl/Mach.py +++ b/src/py/bbctrl/Mach.py @@ -175,9 +175,7 @@ class Mach(Comm): self.unpausing = True - def _reset(self): - self.planner.reset() - self.ctrl.state.reset() + def _reset(self): self.planner.reset() def _i2c_block(self, block): diff --git a/src/py/bbctrl/Planner.py b/src/py/bbctrl/Planner.py index a0e0f71..e1f892e 100644 --- a/src/py/bbctrl/Planner.py +++ b/src/py/bbctrl/Planner.py @@ -331,6 +331,7 @@ class Planner(): self.planner.set_logger(self._log_cb, 1, 'LinePlanner:3') self.cmdq.clear() self.reset_times() + self.ctrl.state.reset() def mdi(self, cmd, with_limits = True): @@ -377,7 +378,7 @@ class Planner(): except Exception as e: log.exception(e) - self.reset() + self.stop() def next(self): @@ -389,7 +390,4 @@ class Planner(): except Exception as e: log.exception(e) - self.reset() - - log.info('running: %s active %s' % (self.is_running(), - self.cmdq.is_active())) + self.stop() -- 2.27.0