Subroutine merge: 3: move/split subroutine into folders under nc_files

kcjengr · Dec 7, 2023 · bdb98a8 · bdb98a8
1 parent 5b94f53
commit bdb98a8
Show file tree

Hide file tree

Showing 273 changed files with 146 additions and 12,972 deletions.
diff --git a/debian/postinst b/debian/postinst
@@ -14,6 +14,8 @@ sudo -u ${SUDO_USER:-$USER} mkdir -p "${TARGET_HOME}.local/usr/share/icons"
 
 # Copy the probe_basic_sims directory to the target directory
 sudo -u ${SUDO_USER:-$USER} cp -r /usr/share/probe_basic/configs "${TARGET_HOME}linuxcnc/"
+# Copy only new subroutines to the target nc_files directory
+sudo -u ${SUDO_USER:-$USER} cp -r -n /usr/share/probe_basic/nc_files "${TARGET_HOME}linuxcnc/"
 
 # Copy the probe_basic icons directory to the target directory
 sudo -u ${SUDO_USER:-$USER} cp -r /usr/share/icons/probe_basic_icon.png "${TARGET_HOME}.local/usr/share/icons/"

diff --git a/debian/rules b/debian/rules
@@ -23,6 +23,10 @@ override_dh_auto_install:
 	mkdir -p debian/python3-probe-basic/usr/share/probe_basic/configs/
 	# Install the config file contents
 	cp -r linuxcnc/configs debian/python3-probe-basic/usr/share/probe_basic/
+	# create nc_files directory if it doesn't exist
+	mkdir -p debian/python3-probe-basic/usr/share/probe_basic/nc_files/
+	# Install the nc_file file contents
+	cp -r linuxcnc/nc_files debian/python3-probe-basic/usr/share/probe_basic/
 
 
 override_dh_install:

diff --git a/docs_src/source/images/atc_carousel_connections.png b/docs_src/source/images/atc_carousel_connections.png
diff --git a/linuxcnc/configs/atc_sim/macros_sim/m13.ngc b/linuxcnc/configs/atc_sim/macros_sim/m13.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/m21.ngc b/linuxcnc/configs/atc_sim/macros_sim/m21.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim/toolsetter_wco.ngc b/linuxcnc/configs/atc_sim/macros_sim/toolsetter_wco.ngc
diff --git a/linuxcnc/configs/atc_sim/vmc_graycode_inch.ini b/linuxcnc/configs/atc_sim/vmc_graycode_inch.ini
@@ -66,7 +66,7 @@ RS274NGC_STARTUP_CODE = F10 S300 G20 G17 G40 G49 G54 G64 P0.001 G80 G90 G91.1 G9
 PARAMETER_FILE = vmc.var
 OWORD_NARGS = 1
 NO_DOWNCASE_OWORD = 1
-SUBROUTINE_PATH = macros_sim
+SUBROUTINE_PATH = ../../nc_files/probe_basic/subroutines:../../nc_files/probe_basic/probe:../../nc_files/probe_basic/atc_carousel
 #BELOW ARE MY REMAPPED M CODES FOR TOOLCHANGES
 REMAP=M6  modalgroup=6 prolog=change_prolog ngc=toolchange epilog=change_epilog
 REMAP=M10 modalgroup=6 argspec=P ngc=m10

diff --git a/linuxcnc/configs/atc_sim/vmc_graycode_metric.ini b/linuxcnc/configs/atc_sim/vmc_graycode_metric.ini
@@ -66,7 +66,7 @@ RS274NGC_STARTUP_CODE = F10 S300 G21 G17 G40 G49 G54 G64 P0.001 G80 G90 G91.1 G9
 PARAMETER_FILE = vmc.var
 OWORD_NARGS = 1
 NO_DOWNCASE_OWORD = 1
-SUBROUTINE_PATH = macros_sim
+SUBROUTINE_PATH = ../../nc_files/probe_basic/subroutines:../../nc_files/probe_basic/probe:../../nc_files/probe_basic/atc_carousel
 #BELOW ARE MY REMAPPED M CODES FOR TOOLCHANGES
 REMAP=M6  modalgroup=6 prolog=change_prolog ngc=toolchange epilog=change_epilog
 REMAP=M10 modalgroup=6 argspec=P ngc=m10

diff --git a/linuxcnc/configs/atc_sim/vmc_index_inch.ini b/linuxcnc/configs/atc_sim/vmc_index_inch.ini
@@ -66,7 +66,7 @@ RS274NGC_STARTUP_CODE = F10 S300 G20 G17 G40 G49 G54 G64 P0.001 G80 G90 G91.1 G9
 PARAMETER_FILE = vmc.var
 OWORD_NARGS = 1
 NO_DOWNCASE_OWORD = 1
-SUBROUTINE_PATH = macros_sim
+SUBROUTINE_PATH = ../../nc_files/probe_basic/subroutines:../../nc_files/probe_basic/probe:../../nc_files/probe_basic/atc_carousel
 #BELOW ARE MY REMAPPED M CODES FOR TOOLCHANGES
 REMAP=M6  modalgroup=6 prolog=change_prolog ngc=toolchange epilog=change_epilog
 REMAP=M10 modalgroup=6 argspec=P ngc=m10

diff --git a/linuxcnc/configs/atc_sim/vmc_index_metric.ini b/linuxcnc/configs/atc_sim/vmc_index_metric.ini
@@ -66,7 +66,7 @@ RS274NGC_STARTUP_CODE = F10 S300 G21 G17 G40 G49 G54 G64 P0.001 G80 G90 G91.1 G9
 PARAMETER_FILE = vmc.var
 OWORD_NARGS = 1
 NO_DOWNCASE_OWORD = 1
-SUBROUTINE_PATH = macros_sim
+SUBROUTINE_PATH = ../../nc_files/probe_basic/subroutines:../../nc_files/probe_basic/probe:../../nc_files/probe_basic/atc_carousel
 #BELOW ARE MY REMAPPED M CODES FOR TOOLCHANGES
 REMAP=M6  modalgroup=6 prolog=change_prolog ngc=toolchange epilog=change_epilog
 REMAP=M10 modalgroup=6 argspec=P ngc=m10

diff --git a/linuxcnc/configs/probe_basic/probe_basic.ini b/linuxcnc/configs/probe_basic/probe_basic.ini
@@ -5,7 +5,7 @@ DEBUG = 0
 
 [DISPLAY]
 DISPLAY = probe_basic
-OPEN_FILE = ~/linuxcnc/nc_files/pb_examples/blank.ngc
+OPEN_FILE = ~/linuxcnc/nc_files/probe_basic/examples/blank.ngc
 CONFIRM_EXIT = False
 LOG_FILE = sim.log
 LOG_LEVEL = DEBUG
@@ -76,7 +76,7 @@ RS274NGC_STARTUP_CODE = F10 S300 G20 G17 G40 G49 G54 G64 P0.001 G80 G90 G91.1 G9
 PARAMETER_FILE = sim.var
 OWORD_NARGS = 1
 NO_DOWNCASE_OWORD = 1
-SUBROUTINE_PATH = subroutines
+SUBROUTINE_PATH = ../../nc_files/probe_basic/subroutines:../../nc_files/probe_basic/probe:../../nc_files/probe_basic/atc_carousel
 
 [EMCMOT]
 EMCMOT = motmod

diff --git a/linuxcnc/configs/probe_basic/subroutines/clamptool.ngc b/linuxcnc/configs/probe_basic/subroutines/clamptool.ngc
diff --git a/linuxcnc/configs/probe_basic/subroutines/extendatc.ngc b/linuxcnc/configs/probe_basic/subroutines/extendatc.ngc
diff --git a/linuxcnc/configs/probe_basic/subroutines/go_to_g30.ngc b/linuxcnc/configs/probe_basic/subroutines/go_to_g30.ngc
diff --git a/linuxcnc/configs/probe_basic/subroutines/go_to_home.ngc b/linuxcnc/configs/probe_basic/subroutines/go_to_home.ngc
diff --git a/linuxcnc/configs/probe_basic/subroutines/go_to_zero.ngc b/linuxcnc/configs/probe_basic/subroutines/go_to_zero.ngc
diff --git a/linuxcnc/configs/probe_basic/subroutines/load_spindle_safety.ngc b/linuxcnc/configs/probe_basic/subroutines/load_spindle_safety.ngc