Merge 'origin/dgarr/285,361'

LinuxCNC · Dec 11, 2017 · b7a13a8 · b7a13a8
2 parents bf2db97 + 3de8778
commit b7a13a8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/share/axis/tcl/axis.tcl b/share/axis/tcl/axis.tcl
@@ -816,7 +816,7 @@ set _tabs_mdi [${pane_top}.tabs insert end mdi -text [_ "MDI \[F5\]"]]
 $_tabs_manual configure -borderwidth 2
 $_tabs_mdi configure -borderwidth 2
 
-${pane_top}.tabs itemconfigure mdi -raisecmd "[list focus ${_tabs_mdi}.command]; ensure_mdi"
+${pane_top}.tabs itemconfigure mdi -raisecmd "[list focus ${_tabs_mdi}.command];"
 #${pane_top}.tabs raise manual
 after idle {
     ${pane_top}.tabs raise manual
@@ -1850,7 +1850,8 @@ proc update_state {args} {
     }
 
     if {$::task_state == $::STATE_ON && $::interp_state == $::INTERP_IDLE} {
-        if {$::last_interp_state != $::INTERP_IDLE || $::last_task_state != $::task_state} {
+        if {   ($::last_interp_state != $::INTERP_IDLE || $::last_task_state != $::task_state) \
+            && $::task_mode == $::TASK_MODE_AUTO} {
             set_mode_from_tab
         }
         enable_group $::manualgroup

diff --git a/src/emc/usr_intf/axis/scripts/axis.py b/src/emc/usr_intf/axis/scripts/axis.py
@@ -132,6 +132,9 @@ def putpref(self, option, value, type=bool):
     root_window.tk.call("set","::STATE_ESTOP_RESET"  ,linuxcnc.STATE_ESTOP_RESET)
     root_window.tk.call("set","::STATE_OFF"          ,linuxcnc.STATE_OFF)
     root_window.tk.call("set","::STATE_ON"           ,linuxcnc.STATE_ON)
+    root_window.tk.call("set","::TASK_MODE_MANUAL"   ,linuxcnc.MODE_MANUAL)
+    root_window.tk.call("set","::TASK_MODE_MDI"      ,linuxcnc.MODE_MDI)
+    root_window.tk.call("set","::TASK_MODE_AUTO"     ,linuxcnc.MODE_AUTO)
     root_window.tk.call("set","::INTERP_IDLE"        ,linuxcnc.INTERP_IDLE)
     root_window.tk.call("set","::INTERP_READING"     ,linuxcnc.INTERP_READING)
     root_window.tk.call("set","::INTERP_PAUSED"      ,linuxcnc.INTERP_PAUSED)