From b315d1e6d046ab66fcf9182c548a0f3462cd9651 Mon Sep 17 00:00:00 2001 From: david mueller Date: Thu, 22 Jan 2026 10:00:08 +0100 Subject: [PATCH 1/2] Gmoccapy: Remove obsolete dict entry and fix halpin order for bottom buttons in offsetpage --- src/emc/usr_intf/gmoccapy/gmoccapy.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/emc/usr_intf/gmoccapy/gmoccapy.py b/src/emc/usr_intf/gmoccapy/gmoccapy.py index a0164be8526..905e2a51c06 100644 --- a/src/emc/usr_intf/gmoccapy/gmoccapy.py +++ b/src/emc/usr_intf/gmoccapy/gmoccapy.py @@ -1002,7 +1002,7 @@ def _make_touch_button(self): dic = self.axis_list num_elements = len(dic) - end = 8 + end = 9 if self.tool_measure_OK: end -= 1 @@ -4742,7 +4742,7 @@ def on_tbtn_edit_offsets_toggled(self, widget, data=None): widgetlist.append("tbtn_user_tabs") self._sensitize_widgets( widgetlist, not state ) for element in self.touch_button_dic: - if self.touch_button_dic[element].get_property("name") in ["edit_offsets", "touch_back"]: + if self.touch_button_dic[element].get_property("name") in ["touch_back"]: continue self.touch_button_dic[element].set_sensitive(not state) From c391e6746889ba6fccbb334286e19b9a1dbe9866 Mon Sep 17 00:00:00 2001 From: david mueller Date: Thu, 22 Jan 2026 10:09:55 +0100 Subject: [PATCH 2/2] Gmoccapy Docs: Update bottom button functions for 'Touch Off Mode' Reflect changes after moving buttons to the tooltable frame --- docs/src/gui/gmoccapy.adoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/src/gui/gmoccapy.adoc b/docs/src/gui/gmoccapy.adoc index 04b55058d73..10e9e9c7b36 100644 --- a/docs/src/gui/gmoccapy.adoc +++ b/docs/src/gui/gmoccapy.adoc @@ -602,15 +602,15 @@ m| gmoccapy.h-button.button-9 | exit if machine is off, otherwise nothing | open [cols="10,10,10,10", options="header"] |=== | Pin | Settings Mode | Homing Mode | Touch off Mode -m|gmoccapy.h-button.button-0 | delete MDI history | | edit offsets -m|gmoccapy.h-button.button-1 | | home all | touch X -m|gmoccapy.h-button.button-2 | | | touch Y -m|gmoccapy.h-button.button-3 | | home x | touch Z +m|gmoccapy.h-button.button-0 | delete MDI history | | touch X +m|gmoccapy.h-button.button-1 | | home all | touch Y +m|gmoccapy.h-button.button-2 | | | touch Z +m|gmoccapy.h-button.button-3 | | home x | m|gmoccapy.h-button.button-4 | open classic ladder | home y | m|gmoccapy.h-button.button-5 | open HAL scope | home z | -m|gmoccapy.h-button.button-6 | open HAL status | | zero G92 +m|gmoccapy.h-button.button-6 | open HAL status | | m|gmoccapy.h-button.button-7 | open HAL meter | | -m|gmoccapy.h-button.button-8 | open HAL calibration | unhome all | set selected +m|gmoccapy.h-button.button-8 | open HAL calibration | unhome all | m|gmoccapy.h-button.button-9 | open HAL show | back | back |===