From ffeedaf4b2d45fae92aa7d696bf0eda58d8601ea Mon Sep 17 00:00:00 2001 From: David Carley Date: Wed, 3 Nov 2021 18:21:40 -0700 Subject: [PATCH 1/2] Had to bring back estop on a failed probe --- package.json | 2 +- src/py/bbctrl/Mach.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 5ec9fc8..2c6901b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bbctrl", - "version": "1.0.9b2", + "version": "1.0.9b3", "homepage": "https://onefinitycnc.com/", "repository": "https://github.com/OneFinityCNC/onefinity", "license": "GPL-3.0+", diff --git a/src/py/bbctrl/Mach.py b/src/py/bbctrl/Mach.py index e5f7541..677c160 100644 --- a/src/py/bbctrl/Mach.py +++ b/src/py/bbctrl/Mach.py @@ -134,9 +134,10 @@ class Mach(Comm): def process_log(self, log): - # Detect when a probe has failed, and reset the planner + # When a probe has failed, we have to e-stop or things + # end up in a bad state, where positions and offsets are incorrect if log['msg'] == 'Switch not found': - self.planner.reset(stop = False, resetState = False) + self.estop() def _update(self, update): From 01e860af9f7ebacb2f71fdf8c3a6da64af6847e2 Mon Sep 17 00:00:00 2001 From: David Carley Date: Wed, 3 Nov 2021 18:31:36 -0700 Subject: [PATCH 2/2] Adjusted the "probe failed" message for generality --- src/pug/templates/control-view.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pug/templates/control-view.pug b/src/pug/templates/control-view.pug index 7fae77a..7c08bf5 100644 --- a/src/pug/templates/control-view.pug +++ b/src/pug/templates/control-view.pug @@ -134,7 +134,7 @@ script#control-view-template(type="text/x-template") div(slot="body") .pure-form p Could not find the probe block during probing! - p Make sure the bit is within 1" / 25.4mm of the probe block, and try again. + p Make sure the tip of the bit is about 1/4" (~6mm) above the probe block, and try again. div(slot="footer") button.pure-button.button-success(@click=`hide_probe_failed_modal()`)