From 0778131952232808e8c3efc9208bb14a9c834038 Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 09:21:55 +0200 Subject: [PATCH 01/42] Remove automatic G43 Gmoccapy had automatic activation of tool offsets using the G43 command after a tool change. The automatic G43 caused "race condition problems" in some configurations. That's why it was removed. Automatic G43 should be implemented by LCNC remap functionality not GUI. --- src/emc/usr_intf/gmoccapy/gmoccapy.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/emc/usr_intf/gmoccapy/gmoccapy.py b/src/emc/usr_intf/gmoccapy/gmoccapy.py index fe48973ecbf..d66877e81e3 100644 --- a/src/emc/usr_intf/gmoccapy/gmoccapy.py +++ b/src/emc/usr_intf/gmoccapy/gmoccapy.py @@ -3542,12 +3542,6 @@ def _update_toolinfo(self, tool): self.on_hal_status_interp_idle(None) return - if "G43" in self.active_gcodes and self.stat.task_mode != linuxcnc.MODE_AUTO: - self.command.mode(linuxcnc.MODE_MDI) - self.command.wait_complete() - self.command.mdi("G43") - self.command.wait_complete() - def _set_enable_tooltips(self, value): LOG.debug("_set_enable_tooltips = {0}".format(value)) # this will hide the tooltips from the glade file widgets, From e64cf7926248f52c428410711e01740e232c9e22 Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 08:34:37 +0100 Subject: [PATCH 02/42] ngc files for automatic_G43 by remap M6/61 --- configs/sim/gmoccapy/macros/change_g43.ngc | 21 +++++++++++++++++++++ configs/sim/gmoccapy/macros/settool_g43.ngc | 20 ++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 configs/sim/gmoccapy/macros/change_g43.ngc create mode 100644 configs/sim/gmoccapy/macros/settool_g43.ngc diff --git a/configs/sim/gmoccapy/macros/change_g43.ngc b/configs/sim/gmoccapy/macros/change_g43.ngc new file mode 100644 index 00000000000..480abb2e57d --- /dev/null +++ b/configs/sim/gmoccapy/macros/change_g43.ngc @@ -0,0 +1,21 @@ +o sub +;(debug, in change tool_in_spindle=# current_pocket=#) +;(debug, selected_tool=# selected_pocket=#) + +; we must execute this only in the milltask interpreter +; or preview will break, so test for '#<_task>' which is 1 for +; the milltask interpreter and 0 in the UI's +O100 if [#<_task> EQ 0] + (debug, Task ist Null) +O100 return [999] +O100 endif + +; using the code being remapped here means 'use builtin behaviour' +M6 + +; set tool offset +G43 + +; signal success be returning a value > 0: +o endsub [1] +M2 \ No newline at end of file diff --git a/configs/sim/gmoccapy/macros/settool_g43.ngc b/configs/sim/gmoccapy/macros/settool_g43.ngc new file mode 100644 index 00000000000..2b81f31f949 --- /dev/null +++ b/configs/sim/gmoccapy/macros/settool_g43.ngc @@ -0,0 +1,20 @@ +o sub +;(debug, tool=# pocket=#) + +; we must execute this only in the milltask interpreter +; or preview will break, so test for '#<_task>' which is 1 for +; the milltask interpreter and 0 in the UI's +O100 if [#<_task> EQ 0] + (debug, Task ist Null) +O100 return [999] +O100 endif + +; using the code being remapped here means 'use builtin behaviour' +m61 q# + +; set tool offset +G43 + +; signal success be returning a value > 0: +o endsub [1] +M2 \ No newline at end of file From 8d021efe49755e560c85848e52a51f04bd3cb361 Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 09:44:27 +0200 Subject: [PATCH 03/42] Added code for M61 in stdglue.py Added python code for M61 in /configs/sim/gmoccapy/python/stdglue.py --- configs/sim/gmoccapy/python/stdglue.py | 52 ++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/configs/sim/gmoccapy/python/stdglue.py b/configs/sim/gmoccapy/python/stdglue.py index 3fc8f039b3e..2d5be364e4e 100644 --- a/configs/sim/gmoccapy/python/stdglue.py +++ b/configs/sim/gmoccapy/python/stdglue.py @@ -47,6 +47,58 @@ emccanon.MESSAGE( "no pydevd module found" ) pass + +# REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool epilog=settool_epilog +# exposed parameters: # # + +def settool_prolog(self,**words): + try: + c = self.blocks[self.remap_level] + if not c.q_flag: + self.set_errormsg("M61 requires a Q parameter") + return INTERP_ERROR + tool = int(c.q_number) + if tool < -TOLERANCE_EQUAL: # 'less than 0 within interp's precision' + self.set_errormsg("M61: Q value < 0") + return INTERP_ERROR + (status,pocket) = self.find_tool_pocket(tool) + if status != INTERP_OK: + self.set_errormsg("M61 failed: requested tool %d not in table" % (tool)) + return status + self.params["tool"] = tool + self.params["pocket"] = pocket + return INTERP_OK + except Exception as e: + self.set_errormsg("M61/settool_prolog: %s)" % (e)) + return INTERP_ERROR + +def settool_epilog(self,**words): + try: + if not self.value_returned: + r = self.blocks[self.remap_level].executing_remap + self.set_errormsg("the %s remap procedure %s did not return a value" + % (r.name,r.remap_ngc if r.remap_ngc else r.remap_py)) + return INTERP_ERROR + + if self.blocks[self.remap_level].builtin_used: + #print "---------- M61 builtin recursion, nothing to do" + return INTERP_OK + else: + if self.return_value > 0.0: + self.current_tool = int(self.params["tool"]) + self.current_pocket = int(self.params["pocket"]) + emccanon.CHANGE_TOOL_NUMBER(self.current_pocket) + # cause a sync() + self.tool_change_flag = True + self.set_tool_parameters() + else: + self.set_errormsg("M61 aborted (return code %.1f)" % (self.return_value)) + return INTERP_ERROR + except Exception as e: + self.set_errormsg("M61/settool_epilog: %s)" % (e)) + return INTERP_ERROR + + # REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change epilog=change_epilog # exposed parameters: # # From 14302e2f18618c1b8916d431ba9df10d9d0b835b Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 10:07:43 +0200 Subject: [PATCH 04/42] lathe.ini - added remap M6/M61 with automatic G43 --- configs/sim/gmoccapy/lathe_configs/lathe.ini | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/configs/sim/gmoccapy/lathe_configs/lathe.ini b/configs/sim/gmoccapy/lathe_configs/lathe.ini index 979852e5ae2..2cfd32504b9 100644 --- a/configs/sim/gmoccapy/lathe_configs/lathe.ini +++ b/configs/sim/gmoccapy/lathe_configs/lathe.ini @@ -46,6 +46,15 @@ py = python3 RS274NGC_STARTUP_CODE = G18 G21 G40 G49 G54 G80 G90 G94 G8 M9 M5 G64 P0.005 PARAMETER_FILE = sim.var SUBROUTINE_PATH = macros +SUBROUTINE_PATH = ../macros +REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog +REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog + +# the Python plugins serves interpreter and task------------------------------ +[PYTHON] +PATH_PREPEND = ../python +TOPLEVEL = ../python/toplevel.py +LOG_LEVEL = 0 # Motion control section ------------------------------------------------------ [EMCMOT] From 4bfd0e31431173c5b2816986b9280522141a787d Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 10:11:22 +0200 Subject: [PATCH 05/42] lathe_C.ini - added remap M6/M61 with automatic G43 --- configs/sim/gmoccapy/lathe_configs/lathe_C.ini | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configs/sim/gmoccapy/lathe_configs/lathe_C.ini b/configs/sim/gmoccapy/lathe_configs/lathe_C.ini index f3d27e2d8eb..cdbc912fc2e 100644 --- a/configs/sim/gmoccapy/lathe_configs/lathe_C.ini +++ b/configs/sim/gmoccapy/lathe_configs/lathe_C.ini @@ -46,7 +46,15 @@ py = python3 [RS274NGC] RS274NGC_STARTUP_CODE = G18 G21 G40 G49 G54 G80 G90 G94 G8 M9 M5 G64 P0.005 PARAMETER_FILE = sim.var -SUBROUTINE_PATH = macros +SUBROUTINE_PATH = ../macros +REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog +REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog + +# the Python plugins serves interpreter and task +[PYTHON] +PATH_PREPEND = ../python +TOPLEVEL = ../python/toplevel.py +LOG_LEVEL = 0 # Motion control section ------------------------------------------------------ [EMCMOT] From 1e92c84382c2b338a62bda910a0faa3ac1d8a591 Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 10:25:09 +0200 Subject: [PATCH 06/42] lathe.ini - delete double SUBROUTINE_PATH My fault - i cannot remove commit from Github --- configs/sim/gmoccapy/lathe_configs/lathe.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/sim/gmoccapy/lathe_configs/lathe.ini b/configs/sim/gmoccapy/lathe_configs/lathe.ini index 2cfd32504b9..a5d34e3d5c4 100644 --- a/configs/sim/gmoccapy/lathe_configs/lathe.ini +++ b/configs/sim/gmoccapy/lathe_configs/lathe.ini @@ -45,7 +45,6 @@ py = python3 [RS274NGC] RS274NGC_STARTUP_CODE = G18 G21 G40 G49 G54 G80 G90 G94 G8 M9 M5 G64 P0.005 PARAMETER_FILE = sim.var -SUBROUTINE_PATH = macros SUBROUTINE_PATH = ../macros REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog From f70970aa3a9811b995320ab6359828977361e633 Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 10:30:56 +0200 Subject: [PATCH 07/42] lathe_CW.ini - added remap M6/M61 with automatic G43 --- configs/sim/gmoccapy/lathe_configs/lathe_CW.ini | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configs/sim/gmoccapy/lathe_configs/lathe_CW.ini b/configs/sim/gmoccapy/lathe_configs/lathe_CW.ini index 8c950dc8c2b..2c61ab5f80d 100644 --- a/configs/sim/gmoccapy/lathe_configs/lathe_CW.ini +++ b/configs/sim/gmoccapy/lathe_configs/lathe_CW.ini @@ -46,7 +46,15 @@ py = python3 [RS274NGC] RS274NGC_STARTUP_CODE = G18 G21 G40 G49 G54 G80 G90 G94 G8 M9 M5 G64 P0.005 PARAMETER_FILE = sim.var -SUBROUTINE_PATH = macros +SUBROUTINE_PATH = ../macros +REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog +REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog + +# the Python plugins serves interpreter and task------------------------------- +[PYTHON] +PATH_PREPEND = ../python +TOPLEVEL = ../python/toplevel.py +LOG_LEVEL = 0 # Motion control section ------------------------------------------------------ [EMCMOT] From ab2b7619176986dd1b98961bc3f2b3fca0f22b9b Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 10:33:48 +0200 Subject: [PATCH 08/42] lathe_backtool.ini - added remap M6/M61 with automatic G43 --- configs/sim/gmoccapy/lathe_configs/lathe_backtool.ini | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configs/sim/gmoccapy/lathe_configs/lathe_backtool.ini b/configs/sim/gmoccapy/lathe_configs/lathe_backtool.ini index 6897ee2c509..9626396c707 100644 --- a/configs/sim/gmoccapy/lathe_configs/lathe_backtool.ini +++ b/configs/sim/gmoccapy/lathe_configs/lathe_backtool.ini @@ -46,7 +46,15 @@ py = python3 [RS274NGC] RS274NGC_STARTUP_CODE = G18 G21 G40 G49 G54 G80 G90 G94 G8 M9 M5 G64 P0.005 PARAMETER_FILE = sim.var -SUBROUTINE_PATH = macros +SUBROUTINE_PATH = ../macros +REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog +REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog + +# the Python plugins serves interpreter and task------------------------------- +[PYTHON] +PATH_PREPEND = ../python +TOPLEVEL = ../python/toplevel.py +LOG_LEVEL = 0 # Motion control section ------------------------------------------------------ [EMCMOT] From 2364ebb7e4d9e02fd5b08dea2d8c71f1423ec708 Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 10:37:29 +0200 Subject: [PATCH 09/42] lathe_imperial.ini - added remap M6/M61 with automatic G43 --- configs/sim/gmoccapy/lathe_configs/lathe_imperial.ini | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configs/sim/gmoccapy/lathe_configs/lathe_imperial.ini b/configs/sim/gmoccapy/lathe_configs/lathe_imperial.ini index f38d8b815c1..8f54db3877f 100644 --- a/configs/sim/gmoccapy/lathe_configs/lathe_imperial.ini +++ b/configs/sim/gmoccapy/lathe_configs/lathe_imperial.ini @@ -46,7 +46,15 @@ py = python3 [RS274NGC] RS274NGC_STARTUP_CODE = G18 G20 G40 G49 G54 G80 G90 G94 G8 M9 M5 G64 P0.001 PARAMETER_FILE = sim.var -SUBROUTINE_PATH = macros +SUBROUTINE_PATH = ../macros +REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog +REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog + +# the Python plugins serves interpreter and task------------------------------- +[PYTHON] +PATH_PREPEND = ../python +TOPLEVEL = ../python/toplevel.py +LOG_LEVEL = 0 # Motion control section ------------------------------------------------------ [EMCMOT] From ac26a6412804b16e88866fb872da3b933461084f Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 10:43:31 +0200 Subject: [PATCH 10/42] lathe_macros.ini - added remap M6/M61 with automatic G43 --- configs/sim/gmoccapy/lathe_configs/lathe_macros.ini | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configs/sim/gmoccapy/lathe_configs/lathe_macros.ini b/configs/sim/gmoccapy/lathe_configs/lathe_macros.ini index b9dfe5a429d..063f9aa2966 100644 --- a/configs/sim/gmoccapy/lathe_configs/lathe_macros.ini +++ b/configs/sim/gmoccapy/lathe_configs/lathe_macros.ini @@ -51,7 +51,15 @@ py = python3 [RS274NGC] RS274NGC_STARTUP_CODE = G18 G21 G40 G49 G54 G80 G90 G94 G8 M9 M5 G64 P0.005 PARAMETER_FILE = sim.var -SUBROUTINE_PATH = macros:./ +SUBROUTINE_PATH = ../macros +REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog +REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog + +# the Python plugins serves interpreter and task------------------------------- +[PYTHON] +PATH_PREPEND = ../python +TOPLEVEL = ../python/toplevel.py +LOG_LEVEL = 0 # Motion control section ------------------------------------------------------ [EMCMOT] From 7909c918fd271c080cffe8a425f8fa2d3866df53 Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 10:47:46 +0200 Subject: [PATCH 11/42] 6_axis.ini - added remap M6/M61 with automatic G43 --- configs/sim/gmoccapy/6_axis.ini | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configs/sim/gmoccapy/6_axis.ini b/configs/sim/gmoccapy/6_axis.ini index 8c446d40cb5..39f740b4fb5 100644 --- a/configs/sim/gmoccapy/6_axis.ini +++ b/configs/sim/gmoccapy/6_axis.ini @@ -39,7 +39,15 @@ CYCLE_TIME = 0.001 [RS274NGC] RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9 PARAMETER_FILE = sim.var -SUBROUTINE_PATH = macros +SUBROUTINE_PATH = ./macros +REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog +REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog + +# the Python plugins serves interpreter and task +[PYTHON] +PATH_PREPEND = ./python +TOPLEVEL = ./python/toplevel.py +LOG_LEVEL = 0 [EMCMOT] EMCMOT = motmod From ceaf4ea1f65d16ee4c646fc5cbaf994f6c09c421 Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 10:49:29 +0200 Subject: [PATCH 12/42] Update 7_axis.ini - added remap M6/M61 with automatic G43 --- configs/sim/gmoccapy/7_axis.ini | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configs/sim/gmoccapy/7_axis.ini b/configs/sim/gmoccapy/7_axis.ini index 1655f9d68bf..62e80b0885b 100644 --- a/configs/sim/gmoccapy/7_axis.ini +++ b/configs/sim/gmoccapy/7_axis.ini @@ -39,7 +39,15 @@ CYCLE_TIME = 0.001 [RS274NGC] RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9 PARAMETER_FILE = sim.var -SUBROUTINE_PATH = macros +SUBROUTINE_PATH = ./macros +REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog +REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog + +# the Python plugins serves interpreter and task +[PYTHON] +PATH_PREPEND = ./python +TOPLEVEL = ./python/toplevel.py +LOG_LEVEL = 0 [EMCMOT] EMCMOT = motmod From 2d78790a2ba0a55197772d3911469381a317068a Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 10:54:57 +0200 Subject: [PATCH 13/42] 7_axis_tool.ini - added remap M6/M61 with automatic G43 --- configs/sim/gmoccapy/7_axis_tool.ini | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configs/sim/gmoccapy/7_axis_tool.ini b/configs/sim/gmoccapy/7_axis_tool.ini index 96ad3360d94..e651ef43f0c 100644 --- a/configs/sim/gmoccapy/7_axis_tool.ini +++ b/configs/sim/gmoccapy/7_axis_tool.ini @@ -39,7 +39,15 @@ CYCLE_TIME = 0.001 [RS274NGC] RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9 PARAMETER_FILE = sim.var -SUBROUTINE_PATH = macros +SUBROUTINE_PATH = ./macros +REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog +REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog + +# the Python plugins serves interpreter and task +[PYTHON] +PATH_PREPEND = ./python +TOPLEVEL = ./python/toplevel.py +LOG_LEVEL = 0 [EMCMOT] EMCMOT = motmod From e56f5998aefa610e1f2730173bc762a51b20c000 Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 10:56:41 +0200 Subject: [PATCH 14/42] 8_axis.ini - added remap M6/M61 with automatic G43 --- configs/sim/gmoccapy/8_axis.ini | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configs/sim/gmoccapy/8_axis.ini b/configs/sim/gmoccapy/8_axis.ini index 7df628a15a2..e4381fbf1fc 100644 --- a/configs/sim/gmoccapy/8_axis.ini +++ b/configs/sim/gmoccapy/8_axis.ini @@ -39,7 +39,15 @@ CYCLE_TIME = 0.001 [RS274NGC] RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9 PARAMETER_FILE = sim.var -SUBROUTINE_PATH = macros +SUBROUTINE_PATH = ./macros +REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog +REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog + +# the Python plugins serves interpreter and task +[PYTHON] +PATH_PREPEND = ./python +TOPLEVEL = ./python/toplevel.py +LOG_LEVEL = 0 [EMCMOT] EMCMOT = motmod From 63486b5a020f6330e05d7360798599e549ca33ea Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 10:58:00 +0200 Subject: [PATCH 15/42] 9_axis.ini - added remap M6/M61 with automatic G43 --- configs/sim/gmoccapy/9_axis.ini | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configs/sim/gmoccapy/9_axis.ini b/configs/sim/gmoccapy/9_axis.ini index 1527517a667..73396db9c41 100644 --- a/configs/sim/gmoccapy/9_axis.ini +++ b/configs/sim/gmoccapy/9_axis.ini @@ -39,7 +39,15 @@ CYCLE_TIME = 0.001 [RS274NGC] RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9 PARAMETER_FILE = sim.var -SUBROUTINE_PATH = macros +SUBROUTINE_PATH = ./macros +REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog +REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog + +# the Python plugins serves interpreter and task +[PYTHON] +PATH_PREPEND = ./python +TOPLEVEL = ./python/toplevel.py +LOG_LEVEL = 0 [EMCMOT] EMCMOT = motmod From f02e0e755a69361704967842f1fbb0705fce9f66 Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 11:01:49 +0200 Subject: [PATCH 16/42] gmoccapy.ini - added remap M6/M61 with automatic G43 --- configs/sim/gmoccapy/gmoccapy.ini | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configs/sim/gmoccapy/gmoccapy.ini b/configs/sim/gmoccapy/gmoccapy.ini index e0dc3bb97d3..bcef6079347 100644 --- a/configs/sim/gmoccapy/gmoccapy.ini +++ b/configs/sim/gmoccapy/gmoccapy.ini @@ -54,7 +54,15 @@ py = python3 [RS274NGC] RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9 PARAMETER_FILE = sim.var -SUBROUTINE_PATH = macros +SUBROUTINE_PATH = ./macros +REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog +REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog + +# the Python plugins serves interpreter and task +[PYTHON] +PATH_PREPEND = ./python +TOPLEVEL = ./python/toplevel.py +LOG_LEVEL = 0 # Motion control section ------------------------------------------------------ [EMCMOT] From f9689f656b163c8950e45f1754379b3f8e44c36e Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 11:04:52 +0200 Subject: [PATCH 17/42] gmoccapy_4_axis.ini - added remap M6/M61 with automatic G43 --- configs/sim/gmoccapy/gmoccapy_4_axis.ini | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configs/sim/gmoccapy/gmoccapy_4_axis.ini b/configs/sim/gmoccapy/gmoccapy_4_axis.ini index 84ab39a6669..5fb38f2a668 100644 --- a/configs/sim/gmoccapy/gmoccapy_4_axis.ini +++ b/configs/sim/gmoccapy/gmoccapy_4_axis.ini @@ -38,7 +38,15 @@ py = python3 [RS274NGC] RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9 PARAMETER_FILE = sim.var -SUBROUTINE_PATH = macros +SUBROUTINE_PATH = ./macros +REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog +REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog + +# the Python plugins serves interpreter and task +[PYTHON] +PATH_PREPEND = ./python +TOPLEVEL = ./python/toplevel.py +LOG_LEVEL = 0 # Motion control section ------------------------------------------------------ [EMCMOT] From 9c4886f820995ab7fc22e4179d71b33fef6e9495 Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 11:06:37 +0200 Subject: [PATCH 18/42] gmoccapy_800x600.ini - added remap M6/M61 with automatic G43 --- configs/sim/gmoccapy/gmoccapy_800x600.ini | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configs/sim/gmoccapy/gmoccapy_800x600.ini b/configs/sim/gmoccapy/gmoccapy_800x600.ini index 18cfcec66a9..5af6728bf66 100644 --- a/configs/sim/gmoccapy/gmoccapy_800x600.ini +++ b/configs/sim/gmoccapy/gmoccapy_800x600.ini @@ -56,7 +56,15 @@ py = python3 [RS274NGC] RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9 PARAMETER_FILE = sim.var -SUBROUTINE_PATH = macros +SUBROUTINE_PATH = ./macros +REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog +REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog + +# the Python plugins serves interpreter and task +[PYTHON] +PATH_PREPEND = ./python +TOPLEVEL = ./python/toplevel.py +LOG_LEVEL = 0 # Motion control section ------------------------------------------------------ [EMCMOT] From 13112299f3881c85c2a56dbf2db5dc7f481920b7 Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 11:09:09 +0200 Subject: [PATCH 19/42] gmoccapy_XYZAB.ini - added remap M6/M61 with automatic G43 --- configs/sim/gmoccapy/gmoccapy_XYZAB.ini | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configs/sim/gmoccapy/gmoccapy_XYZAB.ini b/configs/sim/gmoccapy/gmoccapy_XYZAB.ini index 34d02db78e0..a2fe233e3ac 100644 --- a/configs/sim/gmoccapy/gmoccapy_XYZAB.ini +++ b/configs/sim/gmoccapy/gmoccapy_XYZAB.ini @@ -68,7 +68,15 @@ py = python3 [RS274NGC] RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9 PARAMETER_FILE = sim.var -SUBROUTINE_PATH = macros +SUBROUTINE_PATH = ./macros +REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog +REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog + +# the Python plugins serves interpreter and task +[PYTHON] +PATH_PREPEND = ./python +TOPLEVEL = ./python/toplevel.py +LOG_LEVEL = 0 # Motion control section ------------------------------------------------------ [EMCMOT] From 0ac37b31a7b546c39177a3de05ac02f11b338c87 Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 11:11:20 +0200 Subject: [PATCH 20/42] gmoccapy_XYZAC.ini - added remap M6/M61 with automatic G43 --- configs/sim/gmoccapy/gmoccapy_XYZAC.ini | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configs/sim/gmoccapy/gmoccapy_XYZAC.ini b/configs/sim/gmoccapy/gmoccapy_XYZAC.ini index 83dbe3d6290..a9f633a899c 100644 --- a/configs/sim/gmoccapy/gmoccapy_XYZAC.ini +++ b/configs/sim/gmoccapy/gmoccapy_XYZAC.ini @@ -57,7 +57,15 @@ py = python3 [RS274NGC] RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9 PARAMETER_FILE = sim.var -SUBROUTINE_PATH = macros +SUBROUTINE_PATH = ./macros +REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog +REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog + +# the Python plugins serves interpreter and task +[PYTHON] +PATH_PREPEND = ./python +TOPLEVEL = ./python/toplevel.py +LOG_LEVEL = 0 # Motion control section ------------------------------------------------------ [EMCMOT] From df23d408000f5c362420eab4ffc527f90df612ac Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 11:41:44 +0200 Subject: [PATCH 21/42] gmoccapy_XYZCW.ini - added remap M6/M61 with automatic G43 --- configs/sim/gmoccapy/gmoccapy_XYZCW.ini | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configs/sim/gmoccapy/gmoccapy_XYZCW.ini b/configs/sim/gmoccapy/gmoccapy_XYZCW.ini index c0581784871..b66e77f06ae 100644 --- a/configs/sim/gmoccapy/gmoccapy_XYZCW.ini +++ b/configs/sim/gmoccapy/gmoccapy_XYZCW.ini @@ -53,7 +53,15 @@ py = python3 [RS274NGC] RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9 PARAMETER_FILE = sim.var -SUBROUTINE_PATH = macros +SUBROUTINE_PATH = ./macros +REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog +REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog + +# the Python plugins serves interpreter and task +[PYTHON] +PATH_PREPEND = ./python +TOPLEVEL = ./python/toplevel.py +LOG_LEVEL = 0 # Motion control section ------------------------------------------------------ [EMCMOT] From 67be2b07aba120ae15c95028853322f5735abf45 Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 11:45:11 +0200 Subject: [PATCH 22/42] gmoccapy_blockdelete.ini - added remap M6/M61 with automatic G43 --- configs/sim/gmoccapy/gmoccapy_blockdelete.ini | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configs/sim/gmoccapy/gmoccapy_blockdelete.ini b/configs/sim/gmoccapy/gmoccapy_blockdelete.ini index 3d523748d6d..467abfd83f8 100644 --- a/configs/sim/gmoccapy/gmoccapy_blockdelete.ini +++ b/configs/sim/gmoccapy/gmoccapy_blockdelete.ini @@ -54,7 +54,15 @@ py = python3 [RS274NGC] RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9 PARAMETER_FILE = sim.var -SUBROUTINE_PATH = macros +SUBROUTINE_PATH = ./macros +REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog +REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog + +# the Python plugins serves interpreter and task +[PYTHON] +PATH_PREPEND = ./python +TOPLEVEL = ./python/toplevel.py +LOG_LEVEL = 0 # Motion control section ------------------------------------------------------ [EMCMOT] From 6d89f37e61c254e7bacdbb24182b4797c00bef46 Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 11:47:14 +0200 Subject: [PATCH 23/42] gmoccapy_left_panel.ini - added remap M6/M61 with automatic G43 --- configs/sim/gmoccapy/gmoccapy_left_panel.ini | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configs/sim/gmoccapy/gmoccapy_left_panel.ini b/configs/sim/gmoccapy/gmoccapy_left_panel.ini index 3ab04d5cc89..6c41391e2e6 100644 --- a/configs/sim/gmoccapy/gmoccapy_left_panel.ini +++ b/configs/sim/gmoccapy/gmoccapy_left_panel.ini @@ -47,7 +47,15 @@ py = python3 [RS274NGC] RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9 PARAMETER_FILE = sim.var -SUBROUTINE_PATH = macros +SUBROUTINE_PATH = ./macros +REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog +REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog + +# the Python plugins serves interpreter and task +[PYTHON] +PATH_PREPEND = ./python +TOPLEVEL = ./python/toplevel.py +LOG_LEVEL = 0 # Motion control section ------------------------------------------------------ [EMCMOT] From a17e6e8230bdc5988c81f0bcbf0fc60ef8807813 Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 11:50:19 +0200 Subject: [PATCH 24/42] gmoccapy_messages.ini - added remap M6/M61 with automatic G43 --- configs/sim/gmoccapy/gmoccapy_messages.ini | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/configs/sim/gmoccapy/gmoccapy_messages.ini b/configs/sim/gmoccapy/gmoccapy_messages.ini index ad97c93d397..2de9bed0a6e 100644 --- a/configs/sim/gmoccapy/gmoccapy_messages.ini +++ b/configs/sim/gmoccapy/gmoccapy_messages.ini @@ -79,7 +79,16 @@ py = python3 [RS274NGC] RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9 PARAMETER_FILE = sim.var -SUBROUTINE_PATH = macros +SUBROUTINE_PATH = ./macros +REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog +REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog + +# the Python plugins serves interpreter and task +[PYTHON] +PATH_PREPEND = ./python +TOPLEVEL = ./python/toplevel.py +LOG_LEVEL = 0 + # Motion control section ------------------------------------------------------ [EMCMOT] From 42a41dffd6130b4ce4b5af398e0d9fe4da44f99b Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 11:51:56 +0200 Subject: [PATCH 25/42] gmoccapy_pedant.ini - added remap M6/M61 with automatic G43 --- configs/sim/gmoccapy/gmoccapy_pedant.ini | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/configs/sim/gmoccapy/gmoccapy_pedant.ini b/configs/sim/gmoccapy/gmoccapy_pedant.ini index 80007b8f918..a55e2a6f67c 100644 --- a/configs/sim/gmoccapy/gmoccapy_pedant.ini +++ b/configs/sim/gmoccapy/gmoccapy_pedant.ini @@ -47,7 +47,16 @@ py = python3 [RS274NGC] RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9 PARAMETER_FILE = sim.var -SUBROUTINE_PATH = macros +SUBROUTINE_PATH = ./macros +REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog +REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog + +# the Python plugins serves interpreter and task +[PYTHON] +PATH_PREPEND = ./python +TOPLEVEL = ./python/toplevel.py +LOG_LEVEL = 0 + # Motion control section ------------------------------------------------------ [EMCMOT] From c58898b0995547318a1d17c961ed3bd2c44baba3 Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 11:57:55 +0200 Subject: [PATCH 26/42] gmoccapy_right_panel.ini - added remap M6/M61 with automatic G43 --- configs/sim/gmoccapy/gmoccapy_right_panel.ini | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configs/sim/gmoccapy/gmoccapy_right_panel.ini b/configs/sim/gmoccapy/gmoccapy_right_panel.ini index a0bbf8e85a6..6a364e728a0 100644 --- a/configs/sim/gmoccapy/gmoccapy_right_panel.ini +++ b/configs/sim/gmoccapy/gmoccapy_right_panel.ini @@ -43,7 +43,15 @@ py = python3 [RS274NGC] RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9 PARAMETER_FILE = sim.var -SUBROUTINE_PATH = macros +SUBROUTINE_PATH = ./macros +REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog +REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog + +# the Python plugins serves interpreter and task +[PYTHON] +PATH_PREPEND = ./python +TOPLEVEL = ./python/toplevel.py +LOG_LEVEL = 0 # Motion control section ------------------------------------------------------ [EMCMOT] From 1592d1ca0f49caaf342ff41866ebc1d05c313758 Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 12:00:40 +0200 Subject: [PATCH 27/42] gmoccapy_sim_hardware_button.ini - added remap M6/M61 with automatic G43 --- configs/sim/gmoccapy/gmoccapy_sim_hardware_button.ini | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configs/sim/gmoccapy/gmoccapy_sim_hardware_button.ini b/configs/sim/gmoccapy/gmoccapy_sim_hardware_button.ini index 24cfc938cb4..c98a9a1c2b5 100644 --- a/configs/sim/gmoccapy/gmoccapy_sim_hardware_button.ini +++ b/configs/sim/gmoccapy/gmoccapy_sim_hardware_button.ini @@ -51,7 +51,15 @@ py = python3 [RS274NGC] RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9 PARAMETER_FILE = sim.var -SUBROUTINE_PATH = macros +SUBROUTINE_PATH = ./macros +REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog +REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog + +# the Python plugins serves interpreter and task +[PYTHON] +PATH_PREPEND = ./python +TOPLEVEL = ./python/toplevel.py +LOG_LEVEL = 0 # Motion control section ------------------------------------------------------ [EMCMOT] From 8de6481c7e8eeacfc63ee7cae5bed4d1305c7c0c Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 12:06:15 +0200 Subject: [PATCH 28/42] gmoccapy_tool_sensor.ini - added remap M61 with automatic G43 --- configs/sim/gmoccapy/gmoccapy_tool_sensor.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/sim/gmoccapy/gmoccapy_tool_sensor.ini b/configs/sim/gmoccapy/gmoccapy_tool_sensor.ini index 524e27ae03c..f00cf2a2850 100644 --- a/configs/sim/gmoccapy/gmoccapy_tool_sensor.ini +++ b/configs/sim/gmoccapy/gmoccapy_tool_sensor.ini @@ -80,6 +80,8 @@ ON_ABORT_COMMAND=O call # # REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change epilog=change_epilog +REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog + # accessible in interp as #<_[section]name> # start of tool length touchoff probe [EMCMOT] From b796eaf87b94a30b51e94da071288cac566071cb Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 12:09:24 +0200 Subject: [PATCH 29/42] gmoccapy_with_user_tabs.ini - added remap M6/M61 with automatic G43 --- configs/sim/gmoccapy/gmoccapy_with_user_tabs.ini | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configs/sim/gmoccapy/gmoccapy_with_user_tabs.ini b/configs/sim/gmoccapy/gmoccapy_with_user_tabs.ini index b97902ed56b..93e9838955a 100644 --- a/configs/sim/gmoccapy/gmoccapy_with_user_tabs.ini +++ b/configs/sim/gmoccapy/gmoccapy_with_user_tabs.ini @@ -68,7 +68,15 @@ py = python3 [RS274NGC] RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9 PARAMETER_FILE = sim.var -SUBROUTINE_PATH = macros +SUBROUTINE_PATH = ./macros +REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog +REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog + +# the Python plugins serves interpreter and task +[PYTHON] +PATH_PREPEND = ./python +TOPLEVEL = ./python/toplevel.py +LOG_LEVEL = 0 # Motion control section ------------------------------------------------------ [EMCMOT] From 722fe06e2dd1a4f2086d0f8b8fa96a05f13c721a Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 12:29:29 +0200 Subject: [PATCH 30/42] lathe_macros.ini - fix SUBROUTINE_PATH = macros:./ --- configs/sim/gmoccapy/lathe_configs/lathe_macros.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/sim/gmoccapy/lathe_configs/lathe_macros.ini b/configs/sim/gmoccapy/lathe_configs/lathe_macros.ini index 063f9aa2966..982f6047e75 100644 --- a/configs/sim/gmoccapy/lathe_configs/lathe_macros.ini +++ b/configs/sim/gmoccapy/lathe_configs/lathe_macros.ini @@ -51,7 +51,7 @@ py = python3 [RS274NGC] RS274NGC_STARTUP_CODE = G18 G21 G40 G49 G54 G80 G90 G94 G8 M9 M5 G64 P0.005 PARAMETER_FILE = sim.var -SUBROUTINE_PATH = ../macros +SUBROUTINE_PATH = macros:./ REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog From 159b65e6226ed6edfc6e7e90a6417ad79f8d4541 Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 12:36:21 +0200 Subject: [PATCH 31/42] gmoccapy_pyngcgui.ini - added remap M6/M61 with automatic G43 --- configs/sim/gmoccapy/gmoccapy_pyngcgui.ini | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/configs/sim/gmoccapy/gmoccapy_pyngcgui.ini b/configs/sim/gmoccapy/gmoccapy_pyngcgui.ini index 9ffdf310f66..3940b72965f 100644 --- a/configs/sim/gmoccapy/gmoccapy_pyngcgui.ini +++ b/configs/sim/gmoccapy/gmoccapy_pyngcgui.ini @@ -84,6 +84,14 @@ RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9 SUBROUTINE_PATH = macros:../nc_files/ngcgui_lib:../nc_files/ngcgui_lib/utilitysubs USER_M_PATH = ../nc_files/ngcgui_lib/mfiles PARAMETER_FILE = sim.var +REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog +REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog + +# the Python plugins serves interpreter and task +[PYTHON] +PATH_PREPEND = ./python +TOPLEVEL = ./python/toplevel.py +LOG_LEVEL = 0 # Motion control section ------------------------------------------------------ [EMCMOT] From 4e337cbb73e2969b082fcaf81afd312751481736 Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 12:47:36 +0200 Subject: [PATCH 32/42] gantry_mm.ini - added remap M6/M61 with automatic G43 --- .../gmoccapy/non_trivial_kinematics/Gantry/gantry_mm.ini | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/configs/sim/gmoccapy/non_trivial_kinematics/Gantry/gantry_mm.ini b/configs/sim/gmoccapy/non_trivial_kinematics/Gantry/gantry_mm.ini index 5b4d0f3c817..741dfcdbe42 100644 --- a/configs/sim/gmoccapy/non_trivial_kinematics/Gantry/gantry_mm.ini +++ b/configs/sim/gmoccapy/non_trivial_kinematics/Gantry/gantry_mm.ini @@ -38,6 +38,14 @@ CYCLE_TIME = 0.001 RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9 PARAMETER_FILE = sim.var SUBROUTINE_PATH = ../../macros +REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog +REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog + +# the Python plugins serves interpreter and task +[PYTHON] +PATH_PREPEND = ../../python +TOPLEVEL = ../../python/toplevel.py +LOG_LEVEL = 0 [EMCMOT] EMCMOT = motmod From 2887d5fa9298a167d2d69374e749d10f045a8586 Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 12:53:14 +0200 Subject: [PATCH 33/42] xyzac-trt.ini - added remap M6/M61 with automatic G43 --- .../table-rotary-tilting/xyzac-trt.ini | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/configs/sim/gmoccapy/non_trivial_kinematics/table-rotary-tilting/xyzac-trt.ini b/configs/sim/gmoccapy/non_trivial_kinematics/table-rotary-tilting/xyzac-trt.ini index 9362b1ba400..eb4043b1a34 100644 --- a/configs/sim/gmoccapy/non_trivial_kinematics/table-rotary-tilting/xyzac-trt.ini +++ b/configs/sim/gmoccapy/non_trivial_kinematics/table-rotary-tilting/xyzac-trt.ini @@ -21,6 +21,15 @@ NGCGUI_SUBFILE = test-xyzac.ngc [RS274NGC] SUBROUTINE_PATH = ./examples PARAMETER_FILE = xyzac.var +SUBROUTINE_PATH = ../../macros +REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog +REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog + +# the Python plugins serves interpreter and task +[PYTHON] +PATH_PREPEND = ../../python +TOPLEVEL = ../../python/toplevel.py +LOG_LEVEL = 0 [HAL] HALUI = halui From d979c9b58d99b78178f73fad1e28f8a19e7a8f0a Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 13:22:46 +0200 Subject: [PATCH 34/42] 6_axis.ini - added postgui --- configs/sim/gmoccapy/6_axis.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/sim/gmoccapy/6_axis.ini b/configs/sim/gmoccapy/6_axis.ini index 39f740b4fb5..e3b084dddd0 100644 --- a/configs/sim/gmoccapy/6_axis.ini +++ b/configs/sim/gmoccapy/6_axis.ini @@ -65,6 +65,9 @@ HALUI = halui HALFILE = core_sim_6.hal #HALFILE = simulated_home_9.hal +# Single file that is executed after the GUI has started. +POSTGUI_HALFILE = gmoccapy_postgui.hal + [TRAJ] COORDINATES = X Y Z A B C LINEAR_UNITS = mm From 9a2ad0b5f70da691342260ed12055cdbefd714a5 Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 13:25:42 +0200 Subject: [PATCH 35/42] 7_axis.ini - added postgui --- configs/sim/gmoccapy/7_axis.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/sim/gmoccapy/7_axis.ini b/configs/sim/gmoccapy/7_axis.ini index 62e80b0885b..cbca953f32b 100644 --- a/configs/sim/gmoccapy/7_axis.ini +++ b/configs/sim/gmoccapy/7_axis.ini @@ -65,6 +65,9 @@ HALUI = halui HALFILE = core_sim_7.hal #HALFILE = simulated_home_9.hal +# Single file that is executed after the GUI has started. +POSTGUI_HALFILE = gmoccapy_postgui.hal + [TRAJ] COORDINATES = X Y Z A B C U LINEAR_UNITS = mm From c847b5b176b870e0aeae9713f850cd4996613e3b Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 13:26:34 +0200 Subject: [PATCH 36/42] 7_axis_tool.ini - added postgui --- configs/sim/gmoccapy/7_axis_tool.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/sim/gmoccapy/7_axis_tool.ini b/configs/sim/gmoccapy/7_axis_tool.ini index e651ef43f0c..f0b16d5cf51 100644 --- a/configs/sim/gmoccapy/7_axis_tool.ini +++ b/configs/sim/gmoccapy/7_axis_tool.ini @@ -65,6 +65,9 @@ HALUI = halui HALFILE = core_sim_7.hal #HALFILE = simulated_home_9.hal +# Single file that is executed after the GUI has started. +POSTGUI_HALFILE = gmoccapy_postgui.hal + [TRAJ] COORDINATES = X Y Z A B C U LINEAR_UNITS = mm From daa271dda6dad9c95bfcecfc6e48dea21334f342 Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 13:27:27 +0200 Subject: [PATCH 37/42] 8_axis.ini - added postgui --- configs/sim/gmoccapy/8_axis.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/sim/gmoccapy/8_axis.ini b/configs/sim/gmoccapy/8_axis.ini index e4381fbf1fc..a47a36fc9d5 100644 --- a/configs/sim/gmoccapy/8_axis.ini +++ b/configs/sim/gmoccapy/8_axis.ini @@ -49,6 +49,9 @@ PATH_PREPEND = ./python TOPLEVEL = ./python/toplevel.py LOG_LEVEL = 0 +# Single file that is executed after the GUI has started. +POSTGUI_HALFILE = gmoccapy_postgui.hal + [EMCMOT] EMCMOT = motmod COMM_TIMEOUT = 1.0 From ec20393e4eae1c248fc65e7eae858d4df3c7f41c Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 13:28:20 +0200 Subject: [PATCH 38/42] 8_axis.ini - added postgui --- configs/sim/gmoccapy/8_axis.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/sim/gmoccapy/8_axis.ini b/configs/sim/gmoccapy/8_axis.ini index a47a36fc9d5..e47a36d8f9f 100644 --- a/configs/sim/gmoccapy/8_axis.ini +++ b/configs/sim/gmoccapy/8_axis.ini @@ -67,6 +67,9 @@ TOOL_CHANGE_POSITION = 0 0 2 HALUI = halui HALFILE = core_sim_8.hal +# Single file that is executed after the GUI has started. +POSTGUI_HALFILE = gmoccapy_postgui.hal + [TRAJ] COORDINATES = X Y Z A B C U V LINEAR_UNITS = mm From bcd8b56a222b66af038d69a31e85b4e972255088 Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sat, 14 Sep 2024 13:29:21 +0200 Subject: [PATCH 39/42] Update 9_axis.ini - added postgui --- configs/sim/gmoccapy/9_axis.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/sim/gmoccapy/9_axis.ini b/configs/sim/gmoccapy/9_axis.ini index 73396db9c41..35b07384c05 100644 --- a/configs/sim/gmoccapy/9_axis.ini +++ b/configs/sim/gmoccapy/9_axis.ini @@ -65,6 +65,9 @@ HALUI = halui HALFILE = core_sim_9.hal #HALFILE = simulated_home_9.hal +# Single file that is executed after the GUI has started. +POSTGUI_HALFILE = gmoccapy_postgui.hal + [TRAJ] COORDINATES = X Y Z A B C U V W LINEAR_UNITS = mm From 2f9909fb913c85f0e5df0288fa1e4e8515e1034c Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Mon, 16 Sep 2024 18:21:44 +0200 Subject: [PATCH 40/42] xyzac-trt.ini - subroutine repaired SUBROUTINE_PATH = ./examples:../../macros --- .../non_trivial_kinematics/table-rotary-tilting/xyzac-trt.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/sim/gmoccapy/non_trivial_kinematics/table-rotary-tilting/xyzac-trt.ini b/configs/sim/gmoccapy/non_trivial_kinematics/table-rotary-tilting/xyzac-trt.ini index eb4043b1a34..fc9fe18df16 100644 --- a/configs/sim/gmoccapy/non_trivial_kinematics/table-rotary-tilting/xyzac-trt.ini +++ b/configs/sim/gmoccapy/non_trivial_kinematics/table-rotary-tilting/xyzac-trt.ini @@ -19,9 +19,8 @@ NGCGUI_FONT = Helvetica -12 normal NGCGUI_SUBFILE = test-xyzac.ngc [RS274NGC] -SUBROUTINE_PATH = ./examples PARAMETER_FILE = xyzac.var -SUBROUTINE_PATH = ../../macros +SUBROUTINE_PATH = ./examples:../../macros REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog From bdaa66df450a289e5db429e754e19616319a3324 Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Mon, 16 Sep 2024 19:08:56 +0200 Subject: [PATCH 41/42] lathe_macros.ini - fix --- configs/sim/gmoccapy/lathe_configs/lathe_macros.ini | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/configs/sim/gmoccapy/lathe_configs/lathe_macros.ini b/configs/sim/gmoccapy/lathe_configs/lathe_macros.ini index 982f6047e75..3454c713eac 100644 --- a/configs/sim/gmoccapy/lathe_configs/lathe_macros.ini +++ b/configs/sim/gmoccapy/lathe_configs/lathe_macros.ini @@ -51,7 +51,7 @@ py = python3 [RS274NGC] RS274NGC_STARTUP_CODE = G18 G21 G40 G49 G54 G80 G90 G94 G8 M9 M5 G64 P0.005 PARAMETER_FILE = sim.var -SUBROUTINE_PATH = macros:./ +SUBROUTINE_PATH = ../macros:./ REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog @@ -80,7 +80,7 @@ HALFILE = spindle_sim.hal HALFILE = simulated_home_lathe.hal # Single file that is executed after the GUI has started. -#POSTGUI_HALFILE = gmoccapy_postgui.hal +POSTGUI_HALFILE = ./gmoccapy_postgui.hal HALUI = halui @@ -164,10 +164,5 @@ HOME_IS_SHARED = 1 # section for main IO controller parameters ----------------------------------- [MACROS] -MACRO = i_am_lost -MACRO = halo_world -MACRO = jog_around -MACRO = increment xinc yinc -MACRO = go_to_position X-pos Y-pos Z-pos From f0a695d615245bc15eda7c28ae45104e6aa2f62d Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Sun, 22 Sep 2024 16:13:12 +0200 Subject: [PATCH 42/42] Gmoccapy release_notes ver 3.5.0 --- src/emc/usr_intf/gmoccapy/release_notes.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/emc/usr_intf/gmoccapy/release_notes.txt b/src/emc/usr_intf/gmoccapy/release_notes.txt index 4ac7feec822..4ed29ee338b 100644 --- a/src/emc/usr_intf/gmoccapy/release_notes.txt +++ b/src/emc/usr_intf/gmoccapy/release_notes.txt @@ -1,3 +1,9 @@ +ver 3.5.0 + - version for 2.10 (master) branche + - removed internal AUTOMATIC_G43 function, it is recommended to add + the M6/M61 remap with the G43 command to the INI configuration. + Internal AUTOMATIC_G43 caused bugs in some configurations and situations. + ver 3.4.8 - re-ordered settings pages to have all appearance-related on one page - add configuration for 800x600 screens