Skip to content

Gmoccapy offsetpage fix halpins and docs #3728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hansu merged 2 commits into from
Jan 22, 2026
+8 −8
Merged

Gmoccapy offsetpage fix halpins and docs #3728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b315d1e
Gmoccapy: Remove obsolete dict entry and fix halpin order for bottom …
Sigma1912 Jan 22, 2026
c391e67
Gmoccapy Docs: Update bottom button functions for 'Touch Off Mode'
Sigma1912 Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions docs/src/gui/gmoccapy.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
|===

Expand Down
4 changes: 2 additions & 2 deletions src/emc/usr_intf/gmoccapy/gmoccapy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)

Expand Down
Loading