Skip to content

Commit e776072

Browse files
authored
Merge pull request #2838 from hansu/issue-2820
pncconf: generate connections to display tooloffset in gmoccapy
2 parents bc56a86 + f741edd commit e776072

1 file changed

Lines changed: 26 additions & 8 deletions

File tree

src/emc/usr_intf/pncconf/build_HAL.py

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -796,15 +796,33 @@ def writebackup(origname):
796796
print(file=file)
797797

798798
if self.d.frontend == _PD._GMOCCAPY:
799+
print(_("# ---signals to show tool offset in the GUI---"), file=file)
800+
print(file=file)
801+
print("net tooloffset-x <= motion.tooloffset.x", file=file)
802+
print("net tooloffset-z <= motion.tooloffset.z", file=file)
803+
print(file=file)
799804
gm = os.path.join(base, "gmoccapy_postgui.hal")
800-
if not os.path.exists(gm):
801-
f1 = open(gm, "w")
802-
print(_("# ---manual tool change signals to gmoccapy's dialog---"), file=f1)
803-
print(file=f1)
804-
print("net tool-change-request => gmoccapy.toolchange-change", file=f1)
805-
print("net tool-change-confirmed <= gmoccapy.toolchange-changed", file=f1)
806-
print("net tool-number => gmoccapy.toolchange-number", file=f1)
807-
f1.close()
805+
f1 = open(gm, "w")
806+
print(_("# Generated by PNCconf at %s") % time.asctime(), file=f1)
807+
print(_("# Using LinuxCNC version: %s") % self.d.linuxcnc_version, file=f1)
808+
print(_("# If you make changes to this file, they will be"), file=f1)
809+
print(_("# overwritten when you run PNCconf again"), file=f1)
810+
print(file=f1)
811+
print(_("# ---manual tool change signals to gmoccapy's dialog---"), file=f1)
812+
print(file=f1)
813+
print("net tool-change-request => gmoccapy.toolchange-change", file=f1)
814+
print("net tool-change-confirmed <= gmoccapy.toolchange-changed", file=f1)
815+
print("net tool-number => gmoccapy.toolchange-number", file=f1)
816+
print(file=f1)
817+
print(_("# ---signals to show tool offset in the GUI---"), file=f1)
818+
print(file=f1)
819+
print("net tooloffset-x => gmoccapy.tooloffset-x", file=f1)
820+
print("net tooloffset-z => gmoccapy.tooloffset-z", file=f1)
821+
print(file=f1)
822+
print(_("# ---spindle-at-speed indicator---"), file=f1)
823+
print(file=f1)
824+
print(_("net spindle-at-speed => gmoccapy.spindle_at_speed_led"), file=f1)
825+
f1.close()
808826
elif self.d.frontend == _PD._QTDRAGON:
809827
qt = os.path.join(base, "qtvcp_postgui.hal")
810828
if not os.path.exists(qt):

0 commit comments

Comments
 (0)