Skip to content

Commit df497fb

Browse files
dngarrettandypugh
authored andcommitted
axis.py: restore mdi queuing provision #2460
Needs user testing 301e3a1 fix for forum bug broke mdi queueing as noted by #2460 Notes: 1) function manual_ok() must include tests for queued mdi commands in order to allow their queuing. (See also code note re "deceptive function name") 2) The manual_tab can be raised (by click or F3) when function running() is true. 3) New: jog initiation (function jog_on) not allowed if running().
1 parent 70b4827 commit df497fb

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

  • src/emc/usr_intf/axis/scripts

src/emc/usr_intf/axis/scripts/axis.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -981,7 +981,6 @@ def manual_ok(do_poll=True):
981981
This means this function returns True when the mdi tab is visible."""
982982
if do_poll: s.poll()
983983
if s.task_state != linuxcnc.STATE_ON: return False
984-
if running(): return 0
985984
return s.interp_state == linuxcnc.INTERP_IDLE or (s.task_mode == linuxcnc.MODE_MDI and s.queued_mdi_commands < vars.max_queued_mdi_commands.get())
986985

987986
# If LinuxCNC is not already in one of the modes given, switch it to the
@@ -3260,8 +3259,7 @@ def get_jog_mode():
32603259
jog_cont = [False] * linuxcnc.MAX_JOINTS
32613260
jogging = [0] * linuxcnc.MAX_JOINTS
32623261
def jog_on(a, b):
3263-
if not manual_ok(): return
3264-
if not manual_tab_visible(): return
3262+
if not manual_ok() or not manual_tab_visible() or running(): return
32653263
if a < 3 or a > 5:
32663264
if vars.metric.get(): b = b / 25.4
32673265
b = from_internal_linear_unit(b)

0 commit comments

Comments
 (0)