Skip to content

Commit

Permalink
BUG: Allow jog on limit when limit override is true
Browse files Browse the repository at this point in the history
Problem:
- The _jog_axis_ok method disallows jogging if the joint has hit a limit even
  if override limits is active.

Solution:
- If the axis has hit a limit, check if override_limits has been enabled for
  the corresponding joint. If so, jogging is ok.
  • Loading branch information
adargel committed Jul 16, 2020
1 parent 939ad3f commit 5212040
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion qtpyvcp/actions/machine_actions.py
Original file line number Diff line number Diff line change
Expand Up @@ -1070,9 +1070,10 @@ def _jog_speed_slider_bindOk(widget):

def _jog_axis_ok(axis, direction=0, widget=None):
axisnum = getAxisNumber(axis)
jnum = INFO.COORDINATES.index(axis)
if STAT.task_state == linuxcnc.STATE_ON \
and STAT.interp_state == linuxcnc.INTERP_IDLE \
and STAT.limit[axisnum] == 0:
and (STAT.limit[axisnum] == 0 or STAT.joint[jnum]['override_limits']):
# and STAT.homed[axisnum] == 1 \
ok = True
msg = ""
Expand Down

0 comments on commit 5212040

Please sign in to comment.