summaryrefslogtreecommitdiff
path: root/src/emc/usr_intf/gmoccapy
diff options
context:
space:
mode:
authorNorbert Schechner <nieson@web.de>2014-03-02 15:39:35 +0100
committerNorbert Schechner <nieson@web.de>2014-03-02 15:39:35 +0100
commit0a70d3f0601eed7d54cf2bc847fc93dc7bc9d9e0 (patch)
tree4f936bad3350a19a190ba24cdd9de71214087ed0 /src/emc/usr_intf/gmoccapy
parent90eb342ac91ba793f842fbe40703ac4a746ed3e7 (diff)
downloadlinuxcnc-0a70d3f0601eed7d54cf2bc847fc93dc7bc9d9e0.tar.gz
linuxcnc-0a70d3f0601eed7d54cf2bc847fc93dc7bc9d9e0.zip
gmoccapy_1_0_3 - pressing OFF button returns to manual mode
ver. 1.0.3 - pressing the OFF button will bring you back to manual mode, because there is the "EXIT" button
Diffstat (limited to 'src/emc/usr_intf/gmoccapy')
-rwxr-xr-xsrc/emc/usr_intf/gmoccapy/gmoccapy.py3
-rwxr-xr-xsrc/emc/usr_intf/gmoccapy/release_notes.txt4
2 files changed, 6 insertions, 1 deletions
diff --git a/src/emc/usr_intf/gmoccapy/gmoccapy.py b/src/emc/usr_intf/gmoccapy/gmoccapy.py
index e0d43de85..33d6cabf0 100755
--- a/src/emc/usr_intf/gmoccapy/gmoccapy.py
+++ b/src/emc/usr_intf/gmoccapy/gmoccapy.py
@@ -84,7 +84,7 @@ if debug:
pass
# constants
-_RELEASE = "1.0.2"
+_RELEASE = "1.0.3"
_INCH = 0 # imperial units are active
_MM = 1 # metric units are active
_MANUAL = 1 # Check for the mode Manual
@@ -1190,6 +1190,7 @@ class gmoccapy(object):
self.widgets.tbtn_on.set_image(self.widgets.img_machine_off)
self.command.state(linuxcnc.STATE_OFF)
self._update_widgets(False)
+ self.on_hal_status_mode_manual(None)
# The mode buttons
def on_rbt_manual_pressed(self, widget, data = None):
diff --git a/src/emc/usr_intf/gmoccapy/release_notes.txt b/src/emc/usr_intf/gmoccapy/release_notes.txt
index 357dc2f8f..2b6df50c5 100755
--- a/src/emc/usr_intf/gmoccapy/release_notes.txt
+++ b/src/emc/usr_intf/gmoccapy/release_notes.txt
@@ -1,3 +1,7 @@
+ver. 1.0.3
+- pressing the OFF button will bring you back to manual
+ mode, because there is the "EXIT" button
+
ver. 1.0.2
- solved a spindle button issue and included a check so it
is no possible to exceed the limits of the spindle with