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

preventing a from homing

Browse Source
This commit is contained in:
sanjayk03-dev
2024-12-12 01:21:10 +05:30
parent 0787574db9
commit e6c9d1c46f
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/js/control-view.js
View File

@@ -749,6 +749,7 @@ module.exports = {
if (typeof axis == "undefined") { if (typeof axis == "undefined") {
api.put("home"); api.put("home");
} else if (this[axis].homingMode != "manual") { } else if (this[axis].homingMode != "manual") {
if(this.state["2an"] == 3 && axis == "a") return;
api.put(`home/${axis}`); api.put(`home/${axis}`);
} else { } else {
SvelteComponents.showDialog("ManualHomeAxis", { axis }); SvelteComponents.showDialog("ManualHomeAxis", { axis });

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

@@ -179,7 +179,7 @@ script#control-view-template(type="text/x-template")
@click=`zero('${axis}')`, style="height:60px;width:60px") @click=`zero('${axis}')`, style="height:60px;width:60px")
.fa.fa-map-marker .fa.fa-map-marker
button.pure-button(:disabled="!is_idle && axis == 'a'", @click=`home('${axis}')`, button.pure-button(:disabled="!is_idle", @click=`home('${axis}')`,
title=`Home {{'${axis}' | upper}} axis.`, style="height:60px;width:60px") title=`Home {{'${axis}' | upper}} axis.`, style="height:60px;width:60px")
.fa.fa-home .fa.fa-home

3
src/py/bbctrl/State.py
View File

@@ -245,7 +245,8 @@ class State(object):
# Loading origin from config after homing # Loading origin from config after homing
if load_position and self.vars.get('cycle') == 'idle': if load_position and self.vars.get('cycle') == 'idle':
for axis in 'xyzabc': axes = 'xyzbc' if self.vars.get('2an') == 3 else 'xyzabc'
for axis in axes:
offset = self.ctrl.config.get('offset_' + axis) offset = self.ctrl.config.get('offset_' + axis)
if offset is not None and self.get('offset_'+ axis) == 0: if offset is not None and self.get('offset_'+ axis) == 0:
origin = offset if self.get('metric') == True else offset / 25.4 origin = offset if self.get('metric') == True else offset / 25.4