muehe/onefinity-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #61 from dacarley/back-to-estop

Browse Source 
Had to bring back estop on a failed probe
This commit is contained in:
OneFinityCNC
2021-11-05 11:36:35 -04:00
committed by GitHub
parent 3babab17f2 01e860af9f
commit 9a0e90576f
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "bbctrl", "name": "bbctrl",
"version": "1.0.9b2", "version": "1.0.9b3",
"homepage": "https://onefinitycnc.com/", "homepage": "https://onefinitycnc.com/",
"repository": "https://github.com/OneFinityCNC/onefinity", "repository": "https://github.com/OneFinityCNC/onefinity",
"license": "GPL-3.0+", "license": "GPL-3.0+",

2
src/pug/templates/control-view.pug
View File

@@ -134,7 +134,7 @@ script#control-view-template(type="text/x-template")
div(slot="body") div(slot="body")
.pure-form .pure-form
p Could not find the probe block during probing! 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") div(slot="footer")
button.pure-button.button-success(@click=`hide_probe_failed_modal()`) button.pure-button.button-success(@click=`hide_probe_failed_modal()`)

5
src/py/bbctrl/Mach.py
View File

@@ -134,9 +134,10 @@ class Mach(Comm):
def process_log(self, log): 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': if log['msg'] == 'Switch not found':
self.planner.reset(stop = False, resetState = False) self.estop()
def _update(self, update): def _update(self, update):