preventing a from homing
This commit is contained in:
@@ -749,6 +749,7 @@ module.exports = {
|
||||
if (typeof axis == "undefined") {
|
||||
api.put("home");
|
||||
} else if (this[axis].homingMode != "manual") {
|
||||
if(this.state["2an"] == 3 && axis == "a") return;
|
||||
api.put(`home/${axis}`);
|
||||
} else {
|
||||
SvelteComponents.showDialog("ManualHomeAxis", { axis });
|
||||
|
||||
@@ -179,7 +179,7 @@ script#control-view-template(type="text/x-template")
|
||||
@click=`zero('${axis}')`, style="height:60px;width:60px")
|
||||
.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")
|
||||
.fa.fa-home
|
||||
|
||||
|
||||
@@ -245,7 +245,8 @@ class State(object):
|
||||
|
||||
# Loading origin from config after homing
|
||||
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)
|
||||
if offset is not None and self.get('offset_'+ axis) == 0:
|
||||
origin = offset if self.get('metric') == True else offset / 25.4
|
||||
|
||||
Reference in New Issue
Block a user