Skip to content

Commit 92e1fd2

Browse files
authored
Merge pull request #3728 from Sigma1912/Gmoccapy_Offsetpage-fix-halpins-and-docs
Gmoccapy offsetpage fix halpins and docs
2 parents 0861a97 + c391e67 commit 92e1fd2

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

docs/src/gui/gmoccapy.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -602,15 +602,15 @@ m| gmoccapy.h-button.button-9 | exit if machine is off, otherwise nothing | open
602602
[cols="10,10,10,10", options="header"]
603603
|===
604604
| Pin | Settings Mode | Homing Mode | Touch off Mode
605-
m|gmoccapy.h-button.button-0 | delete MDI history | | edit offsets
606-
m|gmoccapy.h-button.button-1 | | home all | touch X
607-
m|gmoccapy.h-button.button-2 | | | touch Y
608-
m|gmoccapy.h-button.button-3 | | home x | touch Z
605+
m|gmoccapy.h-button.button-0 | delete MDI history | | touch X
606+
m|gmoccapy.h-button.button-1 | | home all | touch Y
607+
m|gmoccapy.h-button.button-2 | | | touch Z
608+
m|gmoccapy.h-button.button-3 | | home x |
609609
m|gmoccapy.h-button.button-4 | open classic ladder | home y |
610610
m|gmoccapy.h-button.button-5 | open HAL scope | home z |
611-
m|gmoccapy.h-button.button-6 | open HAL status | | zero G92
611+
m|gmoccapy.h-button.button-6 | open HAL status | |
612612
m|gmoccapy.h-button.button-7 | open HAL meter | |
613-
m|gmoccapy.h-button.button-8 | open HAL calibration | unhome all | set selected
613+
m|gmoccapy.h-button.button-8 | open HAL calibration | unhome all |
614614
m|gmoccapy.h-button.button-9 | open HAL show | back | back
615615
|===
616616

src/emc/usr_intf/gmoccapy/gmoccapy.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1002,7 +1002,7 @@ def _make_touch_button(self):
10021002

10031003
dic = self.axis_list
10041004
num_elements = len(dic)
1005-
end = 8
1005+
end = 9
10061006

10071007
if self.tool_measure_OK:
10081008
end -= 1
@@ -4742,7 +4742,7 @@ def on_tbtn_edit_offsets_toggled(self, widget, data=None):
47424742
widgetlist.append("tbtn_user_tabs")
47434743
self._sensitize_widgets( widgetlist, not state )
47444744
for element in self.touch_button_dic:
4745-
if self.touch_button_dic[element].get_property("name") in ["edit_offsets", "touch_back"]:
4745+
if self.touch_button_dic[element].get_property("name") in ["touch_back"]:
47464746
continue
47474747
self.touch_button_dic[element].set_sensitive(not state)
47484748

0 commit comments

Comments
 (0)