Skip to content

axis.py: restore mdi queuing provision #2460 #3642

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andypugh merged 1 commit into from
Nov 23, 2025
Merged

axis.py: restore mdi queuing provision #2460 #3642

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/emc/usr_intf/axis/scripts/axis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -979,7 +979,6 @@ def manual_ok(do_poll=True):
This means this function returns True when the mdi tab is visible."""
if do_poll: s.poll()
if s.task_state != linuxcnc.STATE_ON: return False
if running(): return 0
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())

# If LinuxCNC is not already in one of the modes given, switch it to the
Expand Down Expand Up @@ -3231,8 +3230,7 @@ def get_jog_mode():
jog_cont = [False] * linuxcnc.MAX_JOINTS
jogging = [0] * linuxcnc.MAX_JOINTS
def jog_on(a, b):
if not manual_ok(): return
if not manual_tab_visible(): return
if not manual_ok() or not manual_tab_visible() or running(): return
if a < 3 or a > 5:
if vars.metric.get(): b = b / 25.4
b = from_internal_linear_unit(b)
Expand Down
Loading