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

kcjengr · Dec 2, 2023 · 0bf0e2c · 0bf0e2c
1 parent e074e0a
commit 0bf0e2c
Show file tree

Hide file tree

Showing 358 changed files with 136 additions and 20,222 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_inch/m22.ngc b/linuxcnc/configs/atc_sim/macros_sim_inch/m22.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/move_head_above_carousel.ngc b/linuxcnc/configs/atc_sim/macros_sim_inch/move_head_above_carousel.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/toolsetter_wco.ngc b/linuxcnc/configs/atc_sim/macros_sim_inch/toolsetter_wco.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/clamptool.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/clamptool.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/extendatc.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/extendatc.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/go_to_g30.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/go_to_g30.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/go_to_home.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/go_to_home.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/go_to_zero.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/go_to_zero.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/load_spindle_safety.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/load_spindle_safety.ngc
diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/load_spindle_safety_2.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/load_spindle_safety_2.ngc