Skip to content

Commit

Permalink
axis: remove axisui.set-manual-mode pin
Browse files Browse the repository at this point in the history
reverts 5de7d64 which is not needed anymore since
27dd777 allows axis tabs to synchronize with task_mode

users of axisui.set-manual-mode pin should use:
  halui.mode.manual pin ( and similarly, halui.mode.mdi pin)
  • Loading branch information
dngarrett authored and SebKuzminsky committed Nov 29, 2013
1 parent c389b69 commit b22f83b
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions src/emc/usr_intf/axis/scripts/axis.py
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,6 @@ def __init__(self, window):
self.last_limit = None
self.last_motion_mode = None
self.last_joint_position = None
self.set_manual_mode = False
self.notifications_clear = False
self.notifications_clear_info = False
self.notifications_clear_error = False
Expand Down Expand Up @@ -767,11 +766,6 @@ def update(self):
vupdate(vars.interp_state, self.stat.interp_state)
vupdate(vars.queued_mdi_commands, self.stat.queued_mdi_commands)
if hal_present == 1 :
set_manual_mode = comp["set-manual-mode"]
if self.set_manual_mode != set_manual_mode:
self.set_manual_mode = set_manual_mode
if self.set_manual_mode:
root_window.tk.eval(pane_top + ".tabs raise manual")
notifications_clear = comp["notifications-clear"]
if self.notifications_clear != notifications_clear:
self.notifications_clear = notifications_clear
Expand Down Expand Up @@ -3104,7 +3098,6 @@ def select_run_from(e):
comp.newpin("jog.v", hal.HAL_BIT, hal.HAL_OUT)
comp.newpin("jog.w", hal.HAL_BIT, hal.HAL_OUT)
comp.newpin("jog.increment", hal.HAL_FLOAT, hal.HAL_OUT)
comp.newpin("set-manual-mode",hal.HAL_BIT,hal.HAL_IN)
comp.newpin("notifications-clear",hal.HAL_BIT,hal.HAL_IN)
comp.newpin("notifications-clear-info",hal.HAL_BIT,hal.HAL_IN)
comp.newpin("notifications-clear-error",hal.HAL_BIT,hal.HAL_IN)
Expand Down

0 comments on commit b22f83b

Please sign in to comment.