jepler/linuxcnc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

axis.py don't set_motion_teleop() unless needed #95

Browse source 
update() only needs to call set_motion_teleop() in manual
mode when something has switched to COORD

this guard was added to improve behavior with multiple
guis changing modes but may no longer be required

also: remove unused function set_teleop_mode()

Signed-off-by: Dewey Garrett <dgarrett@panix.com>
This commit is contained in:
Dewey Garrett 2016-06-29 05:58:29 -07:00
parent b97a1cae6b
commit 3e93bfa14e
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/emc/usr_intf/axis/scripts/axis.py
View file

@ -744,7 +744,7 @@ class LivePlotter:
del self.stat del self.stat
return return
if ( (self.stat.motion_mode != linuxcnc.TRAJ_MODE_FREE) if ( (self.stat.motion_mode == linuxcnc.TRAJ_MODE_COORD)
and (self.stat.task_mode == linuxcnc.MODE_MANUAL) and (self.stat.task_mode == linuxcnc.MODE_MANUAL)
): ):
set_motion_teleop(1) set_motion_teleop(1)
@ -2721,10 +2721,6 @@ class TclCommands(nf.TclCommands):
comp['jog.v'] = vars.ja_rbutton.get() == "v" comp['jog.v'] = vars.ja_rbutton.get() == "v"
comp['jog.w'] = vars.ja_rbutton.get() == "w" comp['jog.w'] = vars.ja_rbutton.get() == "w"
def set_teleop_mode():
set_motion_teleop(vars.teleop_mode.get())
s.poll()
def save_gcode(*args): def save_gcode(*args):
if not loaded_file: return if not loaded_file: return
initialfile = '' initialfile = ''