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

Author: dpslwk

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/"

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:

docs_src/source/images/atc_carousel_connections.png

@@ -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

linuxcnc/configs/atc_sim/macros_sim/m13.ngc

@@ -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

linuxcnc/configs/atc_sim/macros_sim/m21.ngc

@@ -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

linuxcnc/configs/atc_sim/macros_sim/toolsetter_wco.ngc

@@ -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