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

Merge pull request #43 from dacarley/fix-imperial-probing

Browse Source 
Fixed imperial probing
This commit is contained in:
OneFinityCNC
2021-03-17 00:38:15 -04:00
committed by GitHub
parent d247bc6994 a5474f7086
commit 1e1cb608be
3 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,8 +100,7 @@ script#control-view-template(type="text/x-template")
.pure-form
.pure-control-group
label="{{metric ? 'Diameter (mm)' : 'Diameter (inches)'}}"
input(v-model="tool_diameter",size="8",
@keyup.enter=`set_tool_diameter(tool_diameter)`)
input(v-model="tool_diameter_for_prompt", size="8")
p
div(slot="footer")
@@ -109,7 +108,7 @@ script#control-view-template(type="text/x-template")
| Cancel
button.pure-button.button-success(
@click=`set_tool_diameter(tool_diameter)`)
@click=`set_tool_diameter`)
| Set
message(:show.sync=`state.show_probe_complete_modal`)
@@ -177,7 +176,7 @@ script#control-view-template(type="text/x-template")
td(style="height:100px", align="center", colspan="2")
button(:class="state['pw'] ? '' : 'load-on'",
style="height:100px;width:200px",
@click=`start_probe_test(() => { show_tool_diameter_modal = true })`)
@click=`start_probe_test(prep_and_show_tool_diameter_modal)`)
| Probe XYZ
td(style="height:100px", align="center", colspan="2")
button(:class="state['pw'] ? '' : 'load-on'",