Skip to content

Commit 7071beb

Browse files
zz912andypugh
zz912
and
andypugh
authored
Gmoccapy - remove AUTOMATIC_G43 (#3113)
* 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. * ngc files for automatic_G43 by remap M6/61 * Added code for M61 in stdglue.py Added python code for M61 in /configs/sim/gmoccapy/python/stdglue.py * lathe.ini - added remap M6/M61 with automatic G43 * lathe_C.ini - added remap M6/M61 with automatic G43 * lathe.ini - delete double SUBROUTINE_PATH My fault - i cannot remove commit from Github * lathe_CW.ini - added remap M6/M61 with automatic G43 * lathe_backtool.ini - added remap M6/M61 with automatic G43 * lathe_imperial.ini - added remap M6/M61 with automatic G43 * lathe_macros.ini - added remap M6/M61 with automatic G43 * 6_axis.ini - added remap M6/M61 with automatic G43 * Update 7_axis.ini - added remap M6/M61 with automatic G43 * 7_axis_tool.ini - added remap M6/M61 with automatic G43 * 8_axis.ini - added remap M6/M61 with automatic G43 * 9_axis.ini - added remap M6/M61 with automatic G43 * gmoccapy.ini - added remap M6/M61 with automatic G43 * gmoccapy_4_axis.ini - added remap M6/M61 with automatic G43 * gmoccapy_800x600.ini - added remap M6/M61 with automatic G43 * gmoccapy_XYZAB.ini - added remap M6/M61 with automatic G43 * gmoccapy_XYZAC.ini - added remap M6/M61 with automatic G43 * gmoccapy_XYZCW.ini - added remap M6/M61 with automatic G43 * gmoccapy_blockdelete.ini - added remap M6/M61 with automatic G43 * gmoccapy_left_panel.ini - added remap M6/M61 with automatic G43 * gmoccapy_messages.ini - added remap M6/M61 with automatic G43 * gmoccapy_pedant.ini - added remap M6/M61 with automatic G43 * gmoccapy_right_panel.ini - added remap M6/M61 with automatic G43 * gmoccapy_sim_hardware_button.ini - added remap M6/M61 with automatic G43 * gmoccapy_tool_sensor.ini - added remap M61 with automatic G43 * gmoccapy_with_user_tabs.ini - added remap M6/M61 with automatic G43 * lathe_macros.ini - fix SUBROUTINE_PATH = macros:./ * gmoccapy_pyngcgui.ini - added remap M6/M61 with automatic G43 * gantry_mm.ini - added remap M6/M61 with automatic G43 * xyzac-trt.ini - added remap M6/M61 with automatic G43 * 6_axis.ini - added postgui * 7_axis.ini - added postgui * 7_axis_tool.ini - added postgui * 8_axis.ini - added postgui * 8_axis.ini - added postgui * Update 9_axis.ini - added postgui * xyzac-trt.ini - subroutine repaired SUBROUTINE_PATH = ./examples:../../macros * lathe_macros.ini - fix * Gmoccapy release_notes ver 3.5.0 --------- Co-authored-by: andypugh <andy@bodgesoc.org>
1 parent 927bd3c commit 7071beb

33 files changed

+363
-37
lines changed

‎configs/sim/gmoccapy/6_axis.ini‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,15 @@ CYCLE_TIME = 0.001
3939
[RS274NGC]
4040
RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
4141
PARAMETER_FILE = sim.var
42-
SUBROUTINE_PATH = macros
42+
SUBROUTINE_PATH = ./macros
43+
REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
44+
REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
45+
46+
# the Python plugins serves interpreter and task
47+
[PYTHON]
48+
PATH_PREPEND = ./python
49+
TOPLEVEL = ./python/toplevel.py
50+
LOG_LEVEL = 0
4351

4452
[EMCMOT]
4553
EMCMOT = motmod
@@ -55,6 +63,9 @@ HALUI = halui
5563
HALFILE = core_sim_6.hal
5664
#HALFILE = simulated_home_9.hal
5765

66+
# Single file that is executed after the GUI has started.
67+
POSTGUI_HALFILE = gmoccapy_postgui.hal
68+
5869
[TRAJ]
5970
COORDINATES = X Y Z A B C
6071
LINEAR_UNITS = mm

‎configs/sim/gmoccapy/7_axis.ini‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,15 @@ CYCLE_TIME = 0.001
3939
[RS274NGC]
4040
RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
4141
PARAMETER_FILE = sim.var
42-
SUBROUTINE_PATH = macros
42+
SUBROUTINE_PATH = ./macros
43+
REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
44+
REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
45+
46+
# the Python plugins serves interpreter and task
47+
[PYTHON]
48+
PATH_PREPEND = ./python
49+
TOPLEVEL = ./python/toplevel.py
50+
LOG_LEVEL = 0
4351

4452
[EMCMOT]
4553
EMCMOT = motmod
@@ -55,6 +63,9 @@ HALUI = halui
5563
HALFILE = core_sim_7.hal
5664
#HALFILE = simulated_home_9.hal
5765

66+
# Single file that is executed after the GUI has started.
67+
POSTGUI_HALFILE = gmoccapy_postgui.hal
68+
5869
[TRAJ]
5970
COORDINATES = X Y Z A B C U
6071
LINEAR_UNITS = mm

‎configs/sim/gmoccapy/7_axis_tool.ini‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,15 @@ CYCLE_TIME = 0.001
3939
[RS274NGC]
4040
RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
4141
PARAMETER_FILE = sim.var
42-
SUBROUTINE_PATH = macros
42+
SUBROUTINE_PATH = ./macros
43+
REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
44+
REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
45+
46+
# the Python plugins serves interpreter and task
47+
[PYTHON]
48+
PATH_PREPEND = ./python
49+
TOPLEVEL = ./python/toplevel.py
50+
LOG_LEVEL = 0
4351

4452
[EMCMOT]
4553
EMCMOT = motmod
@@ -55,6 +63,9 @@ HALUI = halui
5563
HALFILE = core_sim_7.hal
5664
#HALFILE = simulated_home_9.hal
5765

66+
# Single file that is executed after the GUI has started.
67+
POSTGUI_HALFILE = gmoccapy_postgui.hal
68+
5869
[TRAJ]
5970
COORDINATES = X Y Z A B C U
6071
LINEAR_UNITS = mm

‎configs/sim/gmoccapy/8_axis.ini‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,18 @@ CYCLE_TIME = 0.001
3939
[RS274NGC]
4040
RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
4141
PARAMETER_FILE = sim.var
42-
SUBROUTINE_PATH = macros
42+
SUBROUTINE_PATH = ./macros
43+
REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
44+
REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
45+
46+
# the Python plugins serves interpreter and task
47+
[PYTHON]
48+
PATH_PREPEND = ./python
49+
TOPLEVEL = ./python/toplevel.py
50+
LOG_LEVEL = 0
51+
52+
# Single file that is executed after the GUI has started.
53+
POSTGUI_HALFILE = gmoccapy_postgui.hal
4354

4455
[EMCMOT]
4556
EMCMOT = motmod
@@ -54,6 +65,9 @@ TOOL_CHANGE_POSITION = 0 0 2
5465
HALUI = halui
5566
HALFILE = core_sim_8.hal
5667

68+
# Single file that is executed after the GUI has started.
69+
POSTGUI_HALFILE = gmoccapy_postgui.hal
70+
5771
[TRAJ]
5872
COORDINATES = X Y Z A B C U V
5973
LINEAR_UNITS = mm

‎configs/sim/gmoccapy/9_axis.ini‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,15 @@ CYCLE_TIME = 0.001
3939
[RS274NGC]
4040
RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
4141
PARAMETER_FILE = sim.var
42-
SUBROUTINE_PATH = macros
42+
SUBROUTINE_PATH = ./macros
43+
REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
44+
REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
45+
46+
# the Python plugins serves interpreter and task
47+
[PYTHON]
48+
PATH_PREPEND = ./python
49+
TOPLEVEL = ./python/toplevel.py
50+
LOG_LEVEL = 0
4351

4452
[EMCMOT]
4553
EMCMOT = motmod
@@ -55,6 +63,9 @@ HALUI = halui
5563
HALFILE = core_sim_9.hal
5664
#HALFILE = simulated_home_9.hal
5765

66+
# Single file that is executed after the GUI has started.
67+
POSTGUI_HALFILE = gmoccapy_postgui.hal
68+
5869
[TRAJ]
5970
COORDINATES = X Y Z A B C U V W
6071
LINEAR_UNITS = mm

‎configs/sim/gmoccapy/gmoccapy.ini‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,15 @@ py = python3
6666
[RS274NGC]
6767
RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
6868
PARAMETER_FILE = sim.var
69-
SUBROUTINE_PATH = macros
69+
SUBROUTINE_PATH = ./macros
70+
REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
71+
REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
72+
73+
# the Python plugins serves interpreter and task
74+
[PYTHON]
75+
PATH_PREPEND = ./python
76+
TOPLEVEL = ./python/toplevel.py
77+
LOG_LEVEL = 0
7078

7179
# Motion control section ------------------------------------------------------
7280
[EMCMOT]

‎configs/sim/gmoccapy/gmoccapy_4_axis.ini‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,15 @@ py = python3
3838
[RS274NGC]
3939
RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
4040
PARAMETER_FILE = sim.var
41-
SUBROUTINE_PATH = macros
41+
SUBROUTINE_PATH = ./macros
42+
REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
43+
REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
44+
45+
# the Python plugins serves interpreter and task
46+
[PYTHON]
47+
PATH_PREPEND = ./python
48+
TOPLEVEL = ./python/toplevel.py
49+
LOG_LEVEL = 0
4250

4351
# Motion control section ------------------------------------------------------
4452
[EMCMOT]

‎configs/sim/gmoccapy/gmoccapy_800x600.ini‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,15 @@ py = python3
5656
[RS274NGC]
5757
RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
5858
PARAMETER_FILE = sim.var
59-
SUBROUTINE_PATH = macros
59+
SUBROUTINE_PATH = ./macros
60+
REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
61+
REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
62+
63+
# the Python plugins serves interpreter and task
64+
[PYTHON]
65+
PATH_PREPEND = ./python
66+
TOPLEVEL = ./python/toplevel.py
67+
LOG_LEVEL = 0
6068

6169
# Motion control section ------------------------------------------------------
6270
[EMCMOT]

‎configs/sim/gmoccapy/gmoccapy_XYZAB.ini‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,15 @@ py = python3
6868
[RS274NGC]
6969
RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
7070
PARAMETER_FILE = sim.var
71-
SUBROUTINE_PATH = macros
71+
SUBROUTINE_PATH = ./macros
72+
REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
73+
REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
74+
75+
# the Python plugins serves interpreter and task
76+
[PYTHON]
77+
PATH_PREPEND = ./python
78+
TOPLEVEL = ./python/toplevel.py
79+
LOG_LEVEL = 0
7280

7381
# Motion control section ------------------------------------------------------
7482
[EMCMOT]

‎configs/sim/gmoccapy/gmoccapy_XYZAC.ini‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,15 @@ py = python3
5757
[RS274NGC]
5858
RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
5959
PARAMETER_FILE = sim.var
60-
SUBROUTINE_PATH = macros
60+
SUBROUTINE_PATH = ./macros
61+
REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
62+
REMAP=M61 modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
63+
64+
# the Python plugins serves interpreter and task
65+
[PYTHON]
66+
PATH_PREPEND = ./python
67+
TOPLEVEL = ./python/toplevel.py
68+
LOG_LEVEL = 0
6169

6270
# Motion control section ------------------------------------------------------
6371
[EMCMOT]

0 commit comments

Comments
 (0)