From 0bf0e2c96fb228c2100ceb587b45093156492709 Mon Sep 17 00:00:00 2001 From: dpslwk Date: Sun, 12 Nov 2023 16:59:35 +0000 Subject: [PATCH] Subroutine merge: 3: move/split subroutine into folders under nc_files --- debian/postinst | 2 + debian/rules | 4 + .../images/atc_carousel_connections.png | Bin 0 -> 47620 bytes .../configs/atc_sim/macros_sim_inch/m22.ngc | 42 --- .../move_head_above_carousel.ngc | 19 - .../macros_sim_inch/toolsetter_wco.ngc | 87 ----- .../atc_sim/macros_sim_metric/clamptool.ngc | 12 - .../atc_sim/macros_sim_metric/extendatc.ngc | 28 -- .../atc_sim/macros_sim_metric/go_to_g30.ngc | 10 - .../atc_sim/macros_sim_metric/go_to_home.ngc | 10 - .../atc_sim/macros_sim_metric/go_to_zero.ngc | 15 - .../macros_sim_metric/load_spindle_safety.ngc | 60 ---- .../load_spindle_safety_2.ngc | 60 ---- .../configs/atc_sim/macros_sim_metric/m10.ngc | 37 -- .../configs/atc_sim/macros_sim_metric/m11.ngc | 50 --- .../configs/atc_sim/macros_sim_metric/m12.ngc | 50 --- .../configs/atc_sim/macros_sim_metric/m13.ngc | 42 --- .../configs/atc_sim/macros_sim_metric/m21.ngc | 45 --- .../configs/atc_sim/macros_sim_metric/m23.ngc | 0 .../configs/atc_sim/macros_sim_metric/m24.ngc | 14 - .../configs/atc_sim/macros_sim_metric/m25.ngc | 15 - .../configs/atc_sim/macros_sim_metric/m26.ngc | 0 .../m6_tool_call_atc_page.ngc | 37 -- .../m6_tool_call_main_panel.ngc | 38 -- .../m6_tool_call_tool_page.ngc | 38 -- .../move_tool_to_carousel_height.ngc | 18 - .../atc_sim/macros_sim_metric/on_abort.ngc | 9 - .../macros_sim_metric/orientspindle.ngc | 11 - .../probe_back_left_inside_corner.ngc | 118 ------- .../probe_back_left_top_corner.ngc | 114 ------ .../probe_back_right_inside_corner.ngc | 118 ------- .../probe_back_right_top_corner.ngc | 113 ------ .../macros_sim_metric/probe_back_top_side.ngc | 88 ----- .../macros_sim_metric/probe_cal_reset.ngc | 8 - .../probe_cal_round_boss.ngc | 325 ------------------ .../probe_cal_round_pocket.ngc | 218 ------------ .../probe_cal_square_boss.ngc | 220 ------------ .../probe_cal_square_pocket.ngc | 172 --------- .../probe_corner_x_minus_edge_angle.ngc | 165 --------- .../probe_corner_x_plus_edge_angle.ngc | 165 --------- .../probe_corner_y_minus_edge_angle.ngc | 165 --------- .../probe_corner_y_plus_edge_angle.ngc | 165 --------- .../probe_front_left_inside_corner.ngc | 118 ------- .../probe_front_left_top_corner.ngc | 114 ------ .../probe_front_right_inside_corner.ngc | 118 ------- .../probe_front_right_top_corner.ngc | 115 ------- .../probe_front_top_side.ngc | 88 ----- .../macros_sim_metric/probe_left_top_side.ngc | 88 ----- .../macros_sim_metric/probe_rect_boss.ngc | 182 ---------- .../macros_sim_metric/probe_rect_pocket.ngc | 134 -------- .../probe_rect_pocket_center_start.ngc | 116 ------- .../macros_sim_metric/probe_ridge_x.ngc | 124 ------- .../macros_sim_metric/probe_ridge_y.ngc | 125 ------- .../probe_right_top_side.ngc | 88 ----- .../macros_sim_metric/probe_round_boss.ngc | 292 ---------------- .../macros_sim_metric/probe_round_pocket.ngc | 182 ---------- .../probe_round_pocket_center_start.ngc | 164 --------- .../probe_top_back_edge_angle.ngc | 124 ------- .../probe_top_front_edge_angle.ngc | 124 ------- .../probe_top_left_edge_angle.ngc | 124 ------- .../probe_top_right_edge_angle.ngc | 124 ------- .../macros_sim_metric/probe_valley_x.ngc | 105 ------ .../probe_valley_x_center_start.ngc | 86 ----- .../macros_sim_metric/probe_valley_y.ngc | 102 ------ .../probe_valley_y_center_start.ngc | 86 ----- .../macros_sim_metric/probe_x_minus.ngc | 84 ----- .../macros_sim_metric/probe_x_minus_wco.ngc | 102 ------ .../macros_sim_metric/probe_x_plus.ngc | 84 ----- .../macros_sim_metric/probe_x_plus_wco.ngc | 102 ------ .../macros_sim_metric/probe_y_minus.ngc | 84 ----- .../macros_sim_metric/probe_y_minus_wco.ngc | 102 ------ .../macros_sim_metric/probe_y_plus.ngc | 84 ----- .../macros_sim_metric/probe_y_plus_wco.ngc | 102 ------ .../macros_sim_metric/probe_z_minus.ngc | 64 ---- .../macros_sim_metric/probe_z_minus_sub.ngc | 83 ----- .../macros_sim_metric/probe_z_minus_wco.ngc | 92 ----- .../macros_sim_metric/program_coolant.ngc | 42 --- .../macros_sim_metric/reset_all_data.ngc | 41 --- .../atc_sim/macros_sim_metric/retractatc.ngc | 15 - .../macros_sim_metric/set_g30_position.ngc | 19 - .../store_tool_in_carousel.ngc | 16 - .../macros_sim_metric/tool_touch_off.ngc | 103 ------ .../tool_touch_off_entire_carousel.ngc | 10 - .../atc_sim/macros_sim_metric/toolchange.ngc | 140 -------- .../macros_sim_metric/toolsetter_wco.ngc | 87 ----- .../atc_sim/macros_sim_metric/unclamptool.ngc | 12 - .../macros_sim_metric/y_data_reset.ngc | 17 - .../configs/atc_sim/vmc_graycode_inch.ini | 2 +- .../configs/atc_sim/vmc_graycode_metric.ini | 2 +- linuxcnc/configs/atc_sim/vmc_index.ini | 2 +- linuxcnc/configs/atc_sim/vmc_index_inch.ini | 4 +- linuxcnc/configs/atc_sim/vmc_index_metric.ini | 4 +- linuxcnc/configs/probe_basic/probe_basic.ini | 4 +- .../probe_basic/subroutines/clamptool.ngc | 12 - .../probe_basic/subroutines/extendatc.ngc | 28 -- .../probe_basic/subroutines/go_to_g30.ngc | 10 - .../probe_basic/subroutines/go_to_home.ngc | 10 - .../probe_basic/subroutines/go_to_zero.ngc | 15 - .../subroutines/load_spindle_safety.ngc | 60 ---- .../subroutines/load_spindle_safety_2.ngc | 60 ---- .../configs/probe_basic/subroutines/m10.ngc | 37 -- .../configs/probe_basic/subroutines/m11.ngc | 50 --- .../configs/probe_basic/subroutines/m12.ngc | 50 --- .../configs/probe_basic/subroutines/m13.ngc | 42 --- .../configs/probe_basic/subroutines/m21.ngc | 45 --- .../configs/probe_basic/subroutines/m22.ngc | 42 --- .../configs/probe_basic/subroutines/m23.ngc | 0 .../configs/probe_basic/subroutines/m24.ngc | 14 - .../configs/probe_basic/subroutines/m25.ngc | 15 - .../configs/probe_basic/subroutines/m26.ngc | 0 .../subroutines/m6_tool_call_atc_page.ngc | 37 -- .../subroutines/m6_tool_call_main_panel.ngc | 38 -- .../subroutines/m6_tool_call_tool_page.ngc | 38 -- .../subroutines/move_head_above_carousel.ngc | 19 - .../move_tool_to_carousel_height.ngc | 18 - .../probe_basic/subroutines/on_abort.ngc | 9 - .../probe_basic/subroutines/orientspindle.ngc | 11 - .../probe_back_left_inside_corner.ngc | 118 ------- .../probe_back_left_top_corner.ngc | 114 ------ .../probe_back_right_inside_corner.ngc | 118 ------- .../probe_back_right_top_corner.ngc | 113 ------ .../subroutines/probe_back_top_side.ngc | 88 ----- .../subroutines/probe_cal_reset.ngc | 8 - .../subroutines/probe_cal_round_boss.ngc | 325 ------------------ .../subroutines/probe_cal_round_pocket.ngc | 218 ------------ .../subroutines/probe_cal_square_boss.ngc | 220 ------------ .../subroutines/probe_cal_square_pocket.ngc | 172 --------- .../probe_corner_x_minus_edge_angle.ngc | 165 --------- .../probe_corner_x_plus_edge_angle.ngc | 165 --------- .../probe_corner_y_minus_edge_angle.ngc | 165 --------- .../probe_corner_y_plus_edge_angle.ngc | 165 --------- .../probe_front_left_inside_corner.ngc | 118 ------- .../probe_front_left_top_corner.ngc | 114 ------ .../probe_front_right_inside_corner.ngc | 118 ------- .../probe_front_right_top_corner.ngc | 115 ------- .../subroutines/probe_front_top_side.ngc | 88 ----- .../subroutines/probe_left_top_side.ngc | 88 ----- .../subroutines/probe_rect_boss.ngc | 182 ---------- .../subroutines/probe_rect_pocket.ngc | 134 -------- .../probe_rect_pocket_center_start.ngc | 116 ------- .../probe_basic/subroutines/probe_ridge_x.ngc | 124 ------- .../probe_basic/subroutines/probe_ridge_y.ngc | 125 ------- .../subroutines/probe_right_top_side.ngc | 88 ----- .../subroutines/probe_round_boss.ngc | 292 ---------------- .../subroutines/probe_round_pocket.ngc | 182 ---------- .../probe_round_pocket_center_start.ngc | 164 --------- .../subroutines/probe_top_back_edge_angle.ngc | 124 ------- .../probe_top_front_edge_angle.ngc | 124 ------- .../subroutines/probe_top_left_edge_angle.ngc | 124 ------- .../probe_top_right_edge_angle.ngc | 124 ------- .../subroutines/probe_valley_x.ngc | 105 ------ .../probe_valley_x_center_start.ngc | 86 ----- .../subroutines/probe_valley_y.ngc | 102 ------ .../probe_valley_y_center_start.ngc | 86 ----- .../probe_basic/subroutines/probe_x_minus.ngc | 84 ----- .../subroutines/probe_x_minus_wco.ngc | 102 ------ .../probe_basic/subroutines/probe_x_plus.ngc | 84 ----- .../subroutines/probe_x_plus_wco.ngc | 102 ------ .../probe_basic/subroutines/probe_y_minus.ngc | 84 ----- .../subroutines/probe_y_minus_wco.ngc | 102 ------ .../probe_basic/subroutines/probe_y_plus.ngc | 84 ----- .../subroutines/probe_y_plus_wco.ngc | 102 ------ .../probe_basic/subroutines/probe_z_minus.ngc | 64 ---- .../subroutines/probe_z_minus_sub.ngc | 83 ----- .../subroutines/probe_z_minus_wco.ngc | 92 ----- .../subroutines/program_coolant.ngc | 42 --- .../subroutines/reset_all_data.ngc | 41 --- .../probe_basic/subroutines/retractatc.ngc | 15 - .../subroutines/set_g30_position.ngc | 19 - .../subroutines/store_tool_in_carousel.ngc | 16 - .../subroutines/tool_touch_off.ngc | 103 ------ .../tool_touch_off_entire_carousel.ngc | 10 - .../probe_basic/subroutines/toolchange.ngc | 140 -------- .../subroutines/toolsetter_wco.ngc | 87 ----- .../probe_basic/subroutines/unclamptool.ngc | 12 - .../probe_basic/subroutines/x_data_reset.ngc | 17 - .../probe_basic/subroutines/y_data_reset.ngc | 17 - .../probe_basic_lathe/probe_basic_lathe.ini | 5 +- .../subroutines/clamptool.ngc | 12 - .../subroutines/extendatc.ngc | 28 -- .../probe_basic_lathe/subroutines/m10.ngc | 37 -- .../probe_basic_lathe/subroutines/m11.ngc | 50 --- .../probe_basic_lathe/subroutines/m12.ngc | 50 --- .../probe_basic_lathe/subroutines/m13.ngc | 42 --- .../probe_basic_lathe/subroutines/m21.ngc | 45 --- .../probe_basic_lathe/subroutines/m22.ngc | 42 --- .../probe_basic_lathe/subroutines/m23.ngc | 0 .../probe_basic_lathe/subroutines/m24.ngc | 14 - .../probe_basic_lathe/subroutines/m25.ngc | 15 - .../probe_basic_lathe/subroutines/m26.ngc | 0 .../subroutines/move_head_above_carousel.ngc | 20 -- .../move_tool_to_carousel_height.ngc | 18 - .../subroutines/on_abort.ngc | 9 - .../probe_back_left_inside_corner.ngc | 118 ------- .../probe_back_left_top_corner.ngc | 114 ------ .../probe_back_right_inside_corner.ngc | 118 ------- .../probe_back_right_top_corner.ngc | 113 ------ .../subroutines/probe_back_top_side.ngc | 88 ----- .../subroutines/probe_cal_reset.ngc | 8 - .../subroutines/probe_cal_round_boss.ngc | 325 ------------------ .../subroutines/probe_cal_round_pocket.ngc | 218 ------------ .../subroutines/probe_cal_square_boss.ngc | 220 ------------ .../subroutines/probe_cal_square_pocket.ngc | 172 --------- .../probe_front_left_inside_corner.ngc | 118 ------- .../probe_front_left_top_corner.ngc | 114 ------ .../probe_front_right_inside_corner.ngc | 118 ------- .../probe_front_right_top_corner.ngc | 115 ------- .../subroutines/probe_front_top_side.ngc | 88 ----- .../subroutines/probe_left_top_side.ngc | 88 ----- .../subroutines/probe_rect_boss.ngc | 182 ---------- .../subroutines/probe_rect_pocket.ngc | 134 -------- .../probe_rect_pocket_center_start.ngc | 116 ------- .../subroutines/probe_ridge_x.ngc | 124 ------- .../subroutines/probe_ridge_y.ngc | 125 ------- .../subroutines/probe_right_top_side.ngc | 88 ----- .../subroutines/probe_round_boss.ngc | 292 ---------------- .../subroutines/probe_round_pocket.ngc | 182 ---------- .../probe_round_pocket_center_start.ngc | 164 --------- .../subroutines/probe_valley_x.ngc | 105 ------ .../probe_valley_x_center_start.ngc | 86 ----- .../subroutines/probe_valley_y.ngc | 102 ------ .../probe_valley_y_center_start.ngc | 86 ----- .../subroutines/probe_x_minus.ngc | 84 ----- .../subroutines/probe_x_minus_wco.ngc | 102 ------ .../subroutines/probe_x_plus.ngc | 84 ----- .../subroutines/probe_x_plus_wco.ngc | 102 ------ .../subroutines/probe_y_minus.ngc | 84 ----- .../subroutines/probe_y_minus_wco.ngc | 102 ------ .../subroutines/probe_y_plus.ngc | 84 ----- .../subroutines/probe_y_plus_wco.ngc | 102 ------ .../subroutines/probe_z_minus.ngc | 64 ---- .../subroutines/probe_z_minus_sub.ngc | 83 ----- .../subroutines/probe_z_minus_wco.ngc | 92 ----- .../subroutines/program_coolant.ngc | 42 --- .../subroutines/reset_all_data.ngc | 41 --- .../subroutines/retractatc.ngc | 15 - .../subroutines/tool_touch_off.ngc | 103 ------ .../subroutines/toolchange.ngc | 140 -------- .../subroutines/unclamptool.ngc | 12 - .../subroutines/x_data_reset.ngc | 17 - linuxcnc/nc_files/probe_basic/README.md | 34 ++ .../probe_basic/atc_carousel/README.md | 64 ++++ .../probe_basic/atc_carousel}/clamptool.ngc | 0 .../probe_basic/atc_carousel}/extendatc.ngc | 2 +- .../probe_basic/atc_carousel}/m10.ngc | 0 .../probe_basic/atc_carousel}/m11.ngc | 0 .../probe_basic/atc_carousel}/m12.ngc | 0 .../probe_basic/atc_carousel}/m13.ngc | 0 .../probe_basic/atc_carousel}/m21.ngc | 4 +- .../probe_basic/atc_carousel}/m22.ngc | 2 +- .../probe_basic/atc_carousel}/m23.ngc | 0 .../probe_basic/atc_carousel}/m24.ngc | 0 .../probe_basic/atc_carousel}/m25.ngc | 0 .../probe_basic/atc_carousel}/m26.ngc | 0 .../move_head_above_carousel.ngc | 2 +- .../move_tool_to_carousel_height.ngc | 2 +- .../probe_basic/atc_carousel}/retractatc.ngc | 0 .../atc_carousel}/store_tool_in_carousel.ngc | 0 .../probe_basic/atc_carousel}/toolchange.ngc | 4 +- .../probe_basic/atc_carousel}/unclamptool.ngc | 0 linuxcnc/nc_files/probe_basic/lathe/README.md | 4 + .../probe_basic/lathe}/backup_restore.ngc | 0 .../probe_basic/lathe}/backup_status.ngc | 0 .../probe_basic/lathe}/chamfer.ngc | 0 .../probe_basic/lathe}/drill.ngc | 0 .../probe_basic/lathe}/facing.ngc | 0 .../probe_basic/lathe}/go_to_g30.ngc | 0 .../probe_basic/lathe}/go_to_home.ngc | 0 .../probe_basic/lathe}/go_to_zero.ngc | 0 .../lathe}/m6_tool_call_main_panel.ngc | 0 .../lathe}/m6_tool_call_touch_panel.ngc | 0 .../probe_corner_x_minus_edge_angle.ngc | 0 .../lathe}/probe_corner_x_plus_edge_angle.ngc | 0 .../probe_corner_y_minus_edge_angle.ngc | 0 .../lathe}/probe_corner_y_plus_edge_angle.ngc | 0 .../lathe}/probe_top_back_edge_angle.ngc | 0 .../lathe}/probe_top_front_edge_angle.ngc | 0 .../lathe}/probe_top_left_edge_angle.ngc | 0 .../lathe}/probe_top_right_edge_angle.ngc | 0 .../probe_basic/lathe}/radius.ngc | 0 .../probe_basic/lathe}/set_g30_position.ngc | 0 .../probe_basic/lathe}/set_mt_x_sub.ngc | 0 .../probe_basic/lathe}/set_mt_z_sub.ngc | 0 .../probe_basic/lathe}/tapping.ngc | 0 .../probe_basic/lathe}/threading.ngc | 0 .../probe_basic/lathe}/touch_off_x.ngc | 0 .../probe_basic/lathe}/touch_off_z.ngc | 0 .../probe_basic/lathe}/touch_x.ngc | 0 .../probe_basic/lathe}/touch_z.ngc | 0 .../probe_basic/lathe}/x_data_reset.ngc | 0 .../probe_basic/lathe}/z_data_reset.ngc | 0 linuxcnc/nc_files/probe_basic/probe/README.md | 4 + .../probe}/probe_back_left_inside_corner.ngc | 0 .../probe}/probe_back_left_top_corner.ngc | 0 .../probe}/probe_back_right_inside_corner.ngc | 0 .../probe}/probe_back_right_top_corner.ngc | 0 .../probe}/probe_back_top_side.ngc | 0 .../probe_basic/probe}/probe_cal_reset.ngc | 0 .../probe}/probe_cal_round_boss.ngc | 0 .../probe}/probe_cal_round_pocket.ngc | 0 .../probe}/probe_cal_square_boss.ngc | 0 .../probe}/probe_cal_square_pocket.ngc | 0 .../probe_corner_x_minus_edge_angle.ngc | 0 .../probe}/probe_corner_x_plus_edge_angle.ngc | 0 .../probe_corner_y_minus_edge_angle.ngc | 0 .../probe}/probe_corner_y_plus_edge_angle.ngc | 0 .../probe}/probe_front_left_inside_corner.ngc | 0 .../probe}/probe_front_left_top_corner.ngc | 0 .../probe_front_right_inside_corner.ngc | 0 .../probe}/probe_front_right_top_corner.ngc | 0 .../probe}/probe_front_top_side.ngc | 0 .../probe}/probe_left_top_side.ngc | 0 .../probe_basic/probe}/probe_rect_boss.ngc | 0 .../probe_basic/probe}/probe_rect_pocket.ngc | 0 .../probe}/probe_rect_pocket_center_start.ngc | 0 .../probe_basic/probe}/probe_ridge_x.ngc | 0 .../probe_basic/probe}/probe_ridge_y.ngc | 0 .../probe}/probe_right_top_side.ngc | 0 .../probe_basic/probe}/probe_round_boss.ngc | 0 .../probe_basic/probe}/probe_round_pocket.ngc | 0 .../probe_round_pocket_center_start.ngc | 0 .../probe}/probe_top_back_edge_angle.ngc | 0 .../probe}/probe_top_front_edge_angle.ngc | 0 .../probe}/probe_top_left_edge_angle.ngc | 0 .../probe}/probe_top_right_edge_angle.ngc | 0 .../probe_basic/probe}/probe_valley_x.ngc | 0 .../probe}/probe_valley_x_center_start.ngc | 0 .../probe_basic/probe}/probe_valley_y.ngc | 0 .../probe}/probe_valley_y_center_start.ngc | 0 .../probe_basic/probe}/probe_x_minus.ngc | 0 .../probe_basic/probe}/probe_x_minus_wco.ngc | 0 .../probe_basic/probe}/probe_x_plus.ngc | 0 .../probe_basic/probe}/probe_x_plus_wco.ngc | 0 .../probe_basic/probe}/probe_y_minus.ngc | 0 .../probe_basic/probe}/probe_y_minus_wco.ngc | 0 .../probe_basic/probe}/probe_y_plus.ngc | 0 .../probe_basic/probe}/probe_y_plus_wco.ngc | 0 .../probe_basic/probe}/probe_z_minus.ngc | 0 .../probe_basic/probe}/probe_z_minus_sub.ngc | 0 .../probe_basic/probe}/probe_z_minus_wco.ngc | 0 .../probe_basic/probe}/reset_all_data.ngc | 0 .../probe_basic/probe}/x_data_reset.ngc | 0 .../probe_basic/probe}/y_data_reset.ngc | 0 .../probe_basic/subroutines/README.md | 3 + .../probe_basic/subroutines}/go_to_g30.ngc | 0 .../probe_basic/subroutines}/go_to_home.ngc | 0 .../probe_basic/subroutines}/go_to_zero.ngc | 0 .../subroutines}/load_spindle_safety.ngc | 0 .../subroutines}/load_spindle_safety_2.ngc | 0 .../subroutines}/m6_tool_call_atc_page.ngc | 0 .../subroutines}/m6_tool_call_main_panel.ngc | 0 .../subroutines}/m6_tool_call_tool_page.ngc | 0 .../probe_basic/subroutines}/on_abort.ngc | 0 .../subroutines}/orientspindle.ngc | 0 .../subroutines}/program_coolant.ngc | 0 .../subroutines}/set_g30_position.ngc | 0 .../subroutines}/tool_touch_off.ngc | 0 .../tool_touch_off_entire_carousel.ngc | 0 358 files changed, 136 insertions(+), 20222 deletions(-) create mode 100644 docs_src/source/images/atc_carousel_connections.png delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_inch/m22.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_inch/move_head_above_carousel.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_inch/toolsetter_wco.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/clamptool.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/extendatc.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/go_to_g30.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/go_to_home.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/go_to_zero.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/load_spindle_safety.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/load_spindle_safety_2.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/m10.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/m11.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/m12.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/m13.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/m21.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/m23.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/m24.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/m25.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/m26.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/m6_tool_call_atc_page.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/m6_tool_call_main_panel.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/m6_tool_call_tool_page.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/move_tool_to_carousel_height.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/on_abort.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/orientspindle.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_back_left_inside_corner.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_back_left_top_corner.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_back_right_inside_corner.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_back_right_top_corner.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_back_top_side.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_cal_reset.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_cal_round_boss.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_cal_round_pocket.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_cal_square_boss.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_cal_square_pocket.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_corner_x_minus_edge_angle.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_corner_x_plus_edge_angle.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_corner_y_minus_edge_angle.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_corner_y_plus_edge_angle.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_front_left_inside_corner.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_front_left_top_corner.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_front_right_inside_corner.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_front_right_top_corner.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_front_top_side.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_left_top_side.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_rect_boss.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_rect_pocket.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_rect_pocket_center_start.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_ridge_x.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_ridge_y.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_right_top_side.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_round_boss.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_round_pocket.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_round_pocket_center_start.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_top_back_edge_angle.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_top_front_edge_angle.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_top_left_edge_angle.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_top_right_edge_angle.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_valley_x.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_valley_x_center_start.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_valley_y.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_valley_y_center_start.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_x_minus.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_x_minus_wco.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_x_plus.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_x_plus_wco.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_y_minus.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_y_minus_wco.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_y_plus.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_y_plus_wco.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_z_minus.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_z_minus_sub.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/probe_z_minus_wco.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/program_coolant.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/reset_all_data.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/retractatc.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/set_g30_position.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/store_tool_in_carousel.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/tool_touch_off.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/tool_touch_off_entire_carousel.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/toolchange.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/toolsetter_wco.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/unclamptool.ngc delete mode 100644 linuxcnc/configs/atc_sim/macros_sim_metric/y_data_reset.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/clamptool.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/extendatc.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/go_to_g30.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/go_to_home.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/go_to_zero.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/load_spindle_safety.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/load_spindle_safety_2.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/m10.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/m11.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/m12.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/m13.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/m21.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/m22.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/m23.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/m24.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/m25.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/m26.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/m6_tool_call_atc_page.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/m6_tool_call_main_panel.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/m6_tool_call_tool_page.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/move_head_above_carousel.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/move_tool_to_carousel_height.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/on_abort.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/orientspindle.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_back_left_inside_corner.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_back_left_top_corner.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_back_right_inside_corner.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_back_right_top_corner.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_back_top_side.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_cal_reset.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_cal_round_boss.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_cal_round_pocket.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_cal_square_boss.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_cal_square_pocket.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_corner_x_minus_edge_angle.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_corner_x_plus_edge_angle.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_corner_y_minus_edge_angle.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_corner_y_plus_edge_angle.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_front_left_inside_corner.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_front_left_top_corner.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_front_right_inside_corner.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_front_right_top_corner.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_front_top_side.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_left_top_side.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_rect_boss.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_rect_pocket.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_rect_pocket_center_start.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_ridge_x.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_ridge_y.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_right_top_side.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_round_boss.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_round_pocket.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_round_pocket_center_start.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_top_back_edge_angle.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_top_front_edge_angle.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_top_left_edge_angle.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_top_right_edge_angle.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_valley_x.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_valley_x_center_start.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_valley_y.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_valley_y_center_start.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_x_minus.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_x_minus_wco.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_x_plus.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_x_plus_wco.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_y_minus.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_y_minus_wco.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_y_plus.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_y_plus_wco.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_z_minus.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_z_minus_sub.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/probe_z_minus_wco.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/program_coolant.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/reset_all_data.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/retractatc.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/set_g30_position.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/store_tool_in_carousel.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/tool_touch_off.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/tool_touch_off_entire_carousel.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/toolchange.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/toolsetter_wco.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/unclamptool.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/x_data_reset.ngc delete mode 100644 linuxcnc/configs/probe_basic/subroutines/y_data_reset.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/clamptool.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/extendatc.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/m10.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/m11.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/m12.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/m13.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/m21.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/m22.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/m23.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/m24.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/m25.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/m26.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/move_head_above_carousel.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/move_tool_to_carousel_height.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/on_abort.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_left_inside_corner.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_left_top_corner.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_right_inside_corner.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_right_top_corner.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_top_side.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_reset.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_round_boss.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_round_pocket.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_square_boss.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_square_pocket.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_left_inside_corner.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_left_top_corner.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_right_inside_corner.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_right_top_corner.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_top_side.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_left_top_side.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_rect_boss.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_rect_pocket.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_rect_pocket_center_start.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_ridge_x.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_ridge_y.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_right_top_side.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_round_boss.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_round_pocket.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_round_pocket_center_start.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_valley_x.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_valley_x_center_start.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_valley_y.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_valley_y_center_start.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_x_minus.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_x_minus_wco.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_x_plus.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_x_plus_wco.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_y_minus.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_y_minus_wco.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_y_plus.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_y_plus_wco.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_z_minus.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_z_minus_sub.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/probe_z_minus_wco.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/program_coolant.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/reset_all_data.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/retractatc.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/tool_touch_off.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/toolchange.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/unclamptool.ngc delete mode 100644 linuxcnc/configs/probe_basic_lathe/subroutines/x_data_reset.ngc create mode 100644 linuxcnc/nc_files/probe_basic/README.md create mode 100644 linuxcnc/nc_files/probe_basic/atc_carousel/README.md rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/atc_carousel}/clamptool.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/atc_carousel}/extendatc.ngc (93%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/atc_carousel}/m10.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/atc_carousel}/m11.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/atc_carousel}/m12.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/atc_carousel}/m13.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/atc_carousel}/m21.ngc (91%) rename linuxcnc/{configs/atc_sim/macros_sim_metric => nc_files/probe_basic/atc_carousel}/m22.ngc (95%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/atc_carousel}/m23.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/atc_carousel}/m24.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/atc_carousel}/m25.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/atc_carousel}/m26.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_metric => nc_files/probe_basic/atc_carousel}/move_head_above_carousel.ngc (92%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/atc_carousel}/move_tool_to_carousel_height.ngc (92%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/atc_carousel}/retractatc.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/atc_carousel}/store_tool_in_carousel.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/atc_carousel}/toolchange.ngc (98%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/atc_carousel}/unclamptool.ngc (100%) create mode 100644 linuxcnc/nc_files/probe_basic/lathe/README.md rename linuxcnc/{configs/probe_basic_lathe/subroutines => nc_files/probe_basic/lathe}/backup_restore.ngc (100%) rename linuxcnc/{configs/probe_basic_lathe/subroutines => nc_files/probe_basic/lathe}/backup_status.ngc (100%) rename linuxcnc/{configs/probe_basic_lathe/subroutines => nc_files/probe_basic/lathe}/chamfer.ngc (100%) rename linuxcnc/{configs/probe_basic_lathe/subroutines => nc_files/probe_basic/lathe}/drill.ngc (100%) rename linuxcnc/{configs/probe_basic_lathe/subroutines => nc_files/probe_basic/lathe}/facing.ngc (100%) rename linuxcnc/{configs/probe_basic_lathe/subroutines => nc_files/probe_basic/lathe}/go_to_g30.ngc (100%) rename linuxcnc/{configs/probe_basic_lathe/subroutines => nc_files/probe_basic/lathe}/go_to_home.ngc (100%) rename linuxcnc/{configs/probe_basic_lathe/subroutines => nc_files/probe_basic/lathe}/go_to_zero.ngc (100%) rename linuxcnc/{configs/probe_basic_lathe/subroutines => nc_files/probe_basic/lathe}/m6_tool_call_main_panel.ngc (100%) rename linuxcnc/{configs/probe_basic_lathe/subroutines => nc_files/probe_basic/lathe}/m6_tool_call_touch_panel.ngc (100%) rename linuxcnc/{configs/probe_basic_lathe/subroutines => nc_files/probe_basic/lathe}/probe_corner_x_minus_edge_angle.ngc (100%) rename linuxcnc/{configs/probe_basic_lathe/subroutines => nc_files/probe_basic/lathe}/probe_corner_x_plus_edge_angle.ngc (100%) rename linuxcnc/{configs/probe_basic_lathe/subroutines => nc_files/probe_basic/lathe}/probe_corner_y_minus_edge_angle.ngc (100%) rename linuxcnc/{configs/probe_basic_lathe/subroutines => nc_files/probe_basic/lathe}/probe_corner_y_plus_edge_angle.ngc (100%) rename linuxcnc/{configs/probe_basic_lathe/subroutines => nc_files/probe_basic/lathe}/probe_top_back_edge_angle.ngc (100%) rename linuxcnc/{configs/probe_basic_lathe/subroutines => nc_files/probe_basic/lathe}/probe_top_front_edge_angle.ngc (100%) rename linuxcnc/{configs/probe_basic_lathe/subroutines => nc_files/probe_basic/lathe}/probe_top_left_edge_angle.ngc (100%) rename linuxcnc/{configs/probe_basic_lathe/subroutines => nc_files/probe_basic/lathe}/probe_top_right_edge_angle.ngc (100%) rename linuxcnc/{configs/probe_basic_lathe/subroutines => nc_files/probe_basic/lathe}/radius.ngc (100%) rename linuxcnc/{configs/probe_basic_lathe/subroutines => nc_files/probe_basic/lathe}/set_g30_position.ngc (100%) rename linuxcnc/{configs/probe_basic_lathe/subroutines => nc_files/probe_basic/lathe}/set_mt_x_sub.ngc (100%) rename linuxcnc/{configs/probe_basic_lathe/subroutines => nc_files/probe_basic/lathe}/set_mt_z_sub.ngc (100%) rename linuxcnc/{configs/probe_basic_lathe/subroutines => nc_files/probe_basic/lathe}/tapping.ngc (100%) rename linuxcnc/{configs/probe_basic_lathe/subroutines => nc_files/probe_basic/lathe}/threading.ngc (100%) rename linuxcnc/{configs/probe_basic_lathe/subroutines => nc_files/probe_basic/lathe}/touch_off_x.ngc (100%) rename linuxcnc/{configs/probe_basic_lathe/subroutines => nc_files/probe_basic/lathe}/touch_off_z.ngc (100%) rename linuxcnc/{configs/probe_basic_lathe/subroutines => nc_files/probe_basic/lathe}/touch_x.ngc (100%) rename linuxcnc/{configs/probe_basic_lathe/subroutines => nc_files/probe_basic/lathe}/touch_z.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/lathe}/x_data_reset.ngc (100%) rename linuxcnc/{configs/probe_basic_lathe/subroutines => nc_files/probe_basic/lathe}/z_data_reset.ngc (100%) create mode 100644 linuxcnc/nc_files/probe_basic/probe/README.md rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_back_left_inside_corner.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_back_left_top_corner.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_back_right_inside_corner.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_back_right_top_corner.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_back_top_side.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_cal_reset.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_cal_round_boss.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_cal_round_pocket.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_cal_square_boss.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_cal_square_pocket.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_corner_x_minus_edge_angle.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_corner_x_plus_edge_angle.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_corner_y_minus_edge_angle.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_corner_y_plus_edge_angle.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_front_left_inside_corner.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_front_left_top_corner.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_front_right_inside_corner.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_front_right_top_corner.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_front_top_side.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_left_top_side.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_rect_boss.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_rect_pocket.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_rect_pocket_center_start.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_ridge_x.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_ridge_y.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_right_top_side.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_round_boss.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_round_pocket.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_round_pocket_center_start.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_top_back_edge_angle.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_top_front_edge_angle.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_top_left_edge_angle.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_top_right_edge_angle.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_valley_x.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_valley_x_center_start.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_valley_y.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_valley_y_center_start.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_x_minus.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_x_minus_wco.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_x_plus.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_x_plus_wco.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_y_minus.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_y_minus_wco.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_y_plus.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_y_plus_wco.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_z_minus.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_z_minus_sub.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/probe_z_minus_wco.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/reset_all_data.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_metric => nc_files/probe_basic/probe}/x_data_reset.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/probe}/y_data_reset.ngc (100%) create mode 100644 linuxcnc/nc_files/probe_basic/subroutines/README.md rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/subroutines}/go_to_g30.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/subroutines}/go_to_home.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/subroutines}/go_to_zero.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/subroutines}/load_spindle_safety.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/subroutines}/load_spindle_safety_2.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/subroutines}/m6_tool_call_atc_page.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/subroutines}/m6_tool_call_main_panel.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/subroutines}/m6_tool_call_tool_page.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/subroutines}/on_abort.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/subroutines}/orientspindle.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/subroutines}/program_coolant.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/subroutines}/set_g30_position.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/subroutines}/tool_touch_off.ngc (100%) rename linuxcnc/{configs/atc_sim/macros_sim_inch => nc_files/probe_basic/subroutines}/tool_touch_off_entire_carousel.ngc (100%) diff --git a/debian/postinst b/debian/postinst index 79892fd1..501b59db 100755 --- 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 index 42a5eee5..fb8a780d 100755 --- 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 new file mode 100644 index 0000000000000000000000000000000000000000..f0a81bbce3e5931ca1b9e286863f847034093639 GIT binary patch literal 47620 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 literal 0 HcmV?d00001 diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/m22.ngc b/linuxcnc/configs/atc_sim/macros_sim_inch/m22.ngc deleted file mode 100644 index 2e87c9a5..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_inch/m22.ngc +++ /dev/null @@ -1,42 +0,0 @@ -o sub - -; Move Carousel to the home position - IN -; after loading any tool in the current pocket to the spindle -; # is the height you spindle needs to be at to clamp/unclamp a tool form the ATC (Set via INI [ATC]Z_TOOL_CHANGE_HEIGHT) -; # is the clearance height you spindle needs to be at to safely clear the ATC (Set via INI [ATC]Z_TOOL_CLEARANCE_HEIGHT) -(PRINT, o) - -# = -3.9000 -o101 if [EXISTS[#<_ini[atc]z_tool_change_height>]] - # = #<_ini[atc]z_tool_change_height> -o101 endif -# = [#<_ini[AXIS_Z]MAX_LIMIT>-0.1] -o102 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]] - # = #<_ini[atc]z_tool_clearance_height> -o102 endif - -;M19 R0 Q2 -M24 -;M19 R0 Q1 -;G90 -G0 G53 Z# ; rapid move to above the tool change height -M65 P2 ; release the drawbar to clamp the tool -M5 -M66 P5 L3 Q1 ; check the tool clamped sensor -o100 if [#5399 LT 0] - (abort, Failed to reclamp tool) -o100 endif - -M65 P0 ; Move Carousel home -M66 P0 L3 Q4 ; check carousel in position sensor -o110 if [#5399 LT 0] - M65 P1 ; turn off the solenoid to send atc home - (abort, Failed to send carousel home) ; abort if the sensor does not activate in 5 seconds -o110 endif - -;M65 P1 - -(PRINT, o endsub) -o endsub [1] - -M2 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 deleted file mode 100644 index 8e3834a1..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_inch/move_head_above_carousel.ngc +++ /dev/null @@ -1,19 +0,0 @@ -o sub - -; # is the height you spindle needs to be at to clamp/unclamp a tool form the ATC (Set via INI [ATC]Z_TOOL_CHANGE_HEIGHT) -; # is the clearance height you spindle needs to be at to safely clear the ATC (Set via INI [ATC]Z_TOOL_CLEARANCE_HEIGHT) - -# = -3.9000 -o101 if [EXISTS[#<_ini[atc]z_tool_change_height>]] - # = #<_ini[atc]z_tool_change_height> -o101 endif -# = [#<_ini[AXIS_Z]MAX_LIMIT>-0.1] -o102 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]] - # = #<_ini[atc]z_tool_clearance_height> -o102 endif - -G0 G53 Z# ; move z to clear height - -o endsub [1] - -M2 diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/toolsetter_wco.ngc b/linuxcnc/configs/atc_sim/macros_sim_inch/toolsetter_wco.ngc deleted file mode 100644 index 61207d8e..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_inch/toolsetter_wco.ngc +++ /dev/null @@ -1,87 +0,0 @@ -(author: Chris Polanski) -(version: 0.1) -(date: 11/5/22) - -(Measure tool and set Z 0.000 in current WCO for new tool) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - - # = 33.2 - # = 4.4 - # = 26 - # = 3 - # = 2.5 - # = 1.8 - # = 0.2500 - # = 0.0 - # = 30.0 - - (start with an m6, do all the standard m6 stuff and then touch off -TMC) - M6 - - (Cancel G92 offsets) - G92.1 - - o100 if [2 EQ 2] - G49 - o100 endif - - G90 (set absolute coordinates) - G53 G0 Z0 (move to z0 home position) - G53 G0 X# Y# - - # = #[5203 + [20 * #5220]] - - (Current Z Position including offsets in current program units) - # = #5422 - - (Initial Fast Z- Probe) - G91 - F[#] - G38.2 Z-[#] - # = #5063 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 Z# - F[#] - (return from sub) - o return - o110 endif - - (Move to z_clearance height for slow probe) - G90 - G0 Z[# + #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow Z- Probe) - G91 - F[#] - G38.2 Z-[# * 2] - # = #5063 - G90 - G0 Z[# + #] - o120 endif - - # = [# + #] - - # = [# - #] - - (Record Z zero in selected WCO) - G10 L2 P#5220 Z[# + #] - - (Move to Toolset location) - G53 G0 X# Y# - - (pause for dust boot) - M0 (replace the dust boot) - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/clamptool.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/clamptool.ngc deleted file mode 100644 index 8b1a7b1b..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/clamptool.ngc +++ /dev/null @@ -1,12 +0,0 @@ -o sub - -M65 P2 ; clamp the tool - -M66 P5 L3 Q2 ; check the clamped tool sensor -o100 if [#5399 LT 0] - (abort, Failed to release tool) ; abort if the sensor does not activate in 2 seconds -o100 endif - -o endsub [1] - -M2 diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/extendatc.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/extendatc.ngc deleted file mode 100644 index 95828367..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/extendatc.ngc +++ /dev/null @@ -1,28 +0,0 @@ -o sub - -; # is the height you spindle needs to be at to clamp/unclamp a tool form the ATC (Set via INI [ATC]Z_TOOL_CHANGE_HEIGHT) -; # is the clearance height you spindle needs to be at to safely clear the ATC (Set via INI [ATC]Z_TOOL_CLEARANCE_HEIGHT) - -# = -3.9000 -o101 if [EXISTS[#<_ini[atc]z_tool_change_height>]] - # = #<_ini[atc]z_tool_change_height> -o101 endif -# = [#<_ini[AXIS_Z]MAX_LIMIT>-0.1] -o102 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]] - # = #<_ini[atc]z_tool_clearance_height> -o102 endif - -G0 G53 Z# ; move z to clear height - -M65 P1 ; Turn off carousel home solenoid -M64 P0 ; Move Carousel OUT - -M66 P1 L3 Q5 ; check for carousel out position sensor -o100 if [#5399 LT 0] - M65 P0 ; switch off atc out solenoid - (abort, ATC not in position) -o100 endif - -o endsub [1] - -M2 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 deleted file mode 100644 index 71956e07..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/go_to_g30.ngc +++ /dev/null @@ -1,10 +0,0 @@ -o sub - -M73 -G90 -G53 G0 Z0 -G30 - -o endsub - -M2 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 deleted file mode 100644 index 62d10af7..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/go_to_home.ngc +++ /dev/null @@ -1,10 +0,0 @@ -o sub - -M73 -G90 -G53 G0 Z0 -G53 G0 X0 Y0 - -o endsub - -M2 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 deleted file mode 100644 index dbb91808..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/go_to_zero.ngc +++ /dev/null @@ -1,15 +0,0 @@ -o sub - -M73 -G90 -o100 if [#5422 LT 0] - G0 Z0 - G0 X0 Y0 -o100 else if [#5422 GE 0] - G0 X0 Y0 - G0 Z0 -o100 endif - -o endsub - -M2 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 deleted file mode 100644 index 7d8ce49d..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/load_spindle_safety.ngc +++ /dev/null @@ -1,60 +0,0 @@ -(author: Chris P, LWK) -(version: 0.4) -(date: 11/11/23) - -(load tool in spindle safety macro) -; This is called form the ATC page -; Parameter #3991 is used to track the current tool loaded it in the spindle (persistently) -; Parameters #4001 to #4024 are used to track which tool is in which pocket (persistently) -; Parameter #4000 is not populated just used in the maths to calculate the above numbers -; #: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets> - -o sub -(PRINT, o) - -# = #1 ; this is the value form the ATC tab -# = #2 -# = #3 -# = #4 -# = #5 -# = #6 - -; default to a 12 pocket ATC (matching DynATC Widget behaviour), then update based on INI settings -# = 12 -o101 if [EXISTS[#<_ini[atc]pockets>]] - # = #<_ini[atc]pockets> -o101 endif - -#10 = 0 -#11 = 0 ; 1 if tool is already stored in carousel - -o110 while [#10 LT #] - #10 = [#10+1] - o120 if [# EQ #[4000 + #10]] - (DEBUG, the tool you are trying to load is already stored in carousel pocket %d#10) - #11 = 1 - o120 endif -o110 endwhile - -o130 if [#11 EQ 0] - M61 Q# G43 H# - #3991 = # -o130 endif - -o140 if [# EQ #] - S0 M5 -o140 endif - -# = #5403 - -(run program_coolant sub if selected to be active in settings page with value 1) -o150 if [# EQ 1] - (run program_coolant.ngc) - o call [#][#][#][#] -o150 else - o return -o150 endif - -o endsub - -M2 (end program) 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 deleted file mode 100644 index 185bc388..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/load_spindle_safety_2.ngc +++ /dev/null @@ -1,60 +0,0 @@ -(author: Chris P, LWK) -(version: 0.4) -(date: 11/11/23) - -(load tool in spindle safety macro) -; This is called form the Tool page -; Parameter #3991 is used to track the current tool loaded it in the spindle (persistently) -; Parameters #4001 to #4024 are used to track which tool is in which pocket (persistently) -; Parameter #4000 is not populated just used in the maths to calculate the above numbers -; #: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets> - -o sub -(PRINT, o) - -# = #1 ; this is the value form the TOOL tab -# = #2 -# = #3 -# = #4 -# = #5 -# = #6 - -; default to a 12 pocket ATC (mtoolhing DynATC Widget behaviour), then update based on INI settings -# = 12 -o101 if [EXISTS[#<_ini[atc]pockets>]] - # = #<_ini[atc]pockets> -o101 endif - -#10 = 0 -#11 = 0 ; 1 if tool is already stored in carousel - -o110 while [#10 LT #] - #10 = [#10+1] - o120 if [# EQ #[4000 + #10]] - (DEBUG, the tool you are trying to load is already stored in carousel pocket %d#10) - #11 = 1 - o120 endif -o110 endwhile - -o130 if [#11 EQ 0] - M61 Q# G43 H# - #3991 = # -o130 endif - -o140 if [# EQ #] - S0 M5 -o140 endif - -# = #5403 - -(run program_coolant sub if selected to be active in settings page with value 1) -o150 if [# EQ 1] - (run program_coolant.ngc) - o call [#][#][#][#] -o150 else - o return -o150 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/m10.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/m10.ngc deleted file mode 100644 index 2562672e..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/m10.ngc +++ /dev/null @@ -1,37 +0,0 @@ -o sub - -; Move tool carousel best direction to pocket P -; Parameter #3989 is used to track if the carousel is homed (M13) (volatile) -; Parameter #3990 is used to track the current tool pocket (persistently) -; #: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets> -(PRINT, o P#

) - -o100 if [#3989 NE 1] - M13 -o100 endif - -; default to a 12 pocket ATC (matching DynATC Widget behaviour), then update based on INI settings -# = 12 -o101 if [EXISTS[#<_ini[atc]pockets>]] - # = #<_ini[atc]pockets> -o101 endif - -# = [#3990 - #

] -(PRINT, o P#

, steps=#) -o110 if [# GT [# / 2]] - #=[# - #] -o110 endif -o120 if [# LT -[# / 2]] - #=[# + #] -o120 endif -o130 if [# GT 0] - M12 P[#] -o130 elseif [# LT 0] - #=[# * -1] - M11 P[#] -o130 endif - -(PRINT, o endsub) -o endsub [1] - -M2 diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/m11.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/m11.ngc deleted file mode 100644 index 3db74563..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/m11.ngc +++ /dev/null @@ -1,50 +0,0 @@ -o sub - -; Move tool carousel CCW Parameter P number of steps -; Without parameter one step CCW. -; Parameter #3989 is used to track if the carousel is homed (M13) (volatile) -; Parameter #3990 is used to track the current tool pocket (persistently) -; #: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets> -(PRINT, o P#

) - -o100 if [#3989 NE 1] - (PRINT, atc not homed, homing) - M13 -o100 endif - -; default to a 12 pocket ATC (matching DynATC Widget behaviour), then update based on INI settings -# = 12 -o101 if [EXISTS[#<_ini[atc]pockets>]] - # = #<_ini[atc]pockets> -o101 endif - -o110 if [EXISTS[#

]] - # = #

-o110 else - # = 1 - (tells the atc widget move 1 step reverse) -o110 endif - -(tells the atc widget how many steps to move and start moving reverse) -(DEBUG, EVAL[vcp.getWidget{"dynatc"}.rotate{#, "cw"}]) - -M64 P4 ; Move atc motor Rev - -o120 do - M66 P4 L1 Q3 ; wait for rising edge on rotation index - o130 if [#5399 LT 0] - M65 P4 ; Stop atc motor - (abort, Failed to get rotation index) - o130 endif - #3990 = [[[#3990+2] MOD #]-1] ; Pocket is no.1-# - # = [#-1] -o120 while [# GT 0] - -M65 P4 ; Stop motor - -#<_my_current_pocket> = #3990 - -(PRINT, o endsub) -o endsub [1] - -M2 diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/m12.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/m12.ngc deleted file mode 100644 index 34f2d6f3..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/m12.ngc +++ /dev/null @@ -1,50 +0,0 @@ -o sub - -; Move tool carousel CW Parameter P number of steps -; Without parameter one step CW. -; Parameter #3989 is used to track if the carousel is homed (M13) (volatile) -; Parameter #3990 is used to track the current tool pocket (persistently) -; #: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets> -(PRINT, o P#

) - -o100 if [#3989 NE 1] - (PRINT, atc not homed, homing) - M13 -o100 endif - -; default to a 12 pocket ATC (matching DynATC Widget behaviour), then update based on INI settings -# = 12 -o101 if [EXISTS[#<_ini[atc]pockets>]] - # = #<_ini[atc]pockets> -o101 endif - -o110 if [EXISTS[#

]] - # = #

-o110 else - #=1 - (tells the atc widget move 1 step forward) -o110 endif - -(tells the atc widget how many steps to move and start moving forward) -(DEBUG, EVAL[vcp.getWidget{"dynatc"}.rotate{#, "ccw"}]) - -M64 P3 ; Move atc motor FWD - -o120 do - M66 P4 L1 Q3 ; wait for rising edge on rotation index - o130 if [#5399 LT 0] - M65 P3 ; Stop atc motor - (abort, Failed to get rotation index) - o130 endif - #3990 = [[[#3990-2] MOD #]+1] ; Pocket is no.1-# - # = [#-1] -o120 while [# GT 0] - -M65 P3 ; Stop motor - -#<_my_current_pocket> = #3990 - -(PRINT, o endsub) -o endsub [1] - -M2 diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/m13.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/m13.ngc deleted file mode 100644 index ede03334..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/m13.ngc +++ /dev/null @@ -1,42 +0,0 @@ -o sub - -; Move tool carousel CW until ATC zero -; Parameter #3989 is used to track if the carousel is homed (M13) (volatile) -; Parameter #3990 is used to track the current tool pocket (persistently) -; #: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets> -(PRINT, o) - -(DEBUG, EVAL[vcp.getWidget{"dynatc"}.atc_message{"REFERENCING"}]) - -M64 P3 ; Move Motor FWD -M66 P3 L1 Q20 ; wait for rising edge on home index -o100 if [#5399 LT 0] - M65 P3 ; stop motor - (abort, Failed to home carousel) -o100 endif - -#3990 = 1 -M65 P3 ; Stop motor -#3989 = 1 - -(DEBUG, EVAL[vcp.getWidget{"dynatc"}.atc_message{}]) - -# = 12 -o110 if [EXISTS[#<_ini[atc]pockets>]] - # = #<_ini[atc]pockets> -o110 endif - -#1 = 0 - -o120 while [#1 LT #] - #1 = [#1+1] - #2 = #[4000+#1] - (DEBUG, EVAL[vcp.getWidget{"dynatc"}.store_tool{#1, #2}]) -o120 endwhile - -M61 Q#3991 G43 H#3991 #5210 = 0 - -(PRINT, o endsub) -o endsub [1] - -M2 diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/m21.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/m21.ngc deleted file mode 100644 index 2ec9daea..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/m21.ngc +++ /dev/null @@ -1,45 +0,0 @@ -o sub - -; Move Carousel to the tool change position - OUT -; then unload any tool in the spindle into the current pocket -; Parameter #3991 is used to track the current tool loaded it in the spindle (persistently) -; # is the height you spindle needs to be at to clamp/unclamp a tool form the ATC (Set via INI [ATC]Z_TOOL_CHANGE_HEIGHT) -; # is the clearance height you spindle needs to be at to safely clear the ATC (Set via INI [ATC]Z_TOOL_CLEARANCE_HEIGHT) -(PRINT, o) - -# = -3.9000 -o101 if [EXISTS[#<_ini[atc]z_tool_change_height>]] - # = #<_ini[atc]z_tool_change_height> -o101 endif -# = [#<_ini[AXIS_Z]MAX_LIMIT>-0.1] -o102 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]] - # = #<_ini[atc]z_tool_clearance_height> -o102 endif - -M65 P1 ; switch off carousel in solenoid -M66 P1 L3 Q1 - -M5 M9 -G90 -G0 G53 Z# ; rapid move to above the tool change height - -;M19 R0 Q3 ; orient spindle - -M64 P0 ; Move Carousel out -M66 P1 L3 Q5 ; check for carousel out sensor -o100 if [#5399 LT 0] - M65 P0 ; switch off atc out solenoid - (abort, ATC not in position) -o100 endif - -M24 ; activate drawbar, release the tool -M5 ; turn off spindle lock - -G0 G53 Z# ; move z to clear height - -#3991 = 0; save fact there is now no tool in the spindle - -(PRINT, o endsub) -o endsub [1] - -M2 diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/m23.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/m23.ngc deleted file mode 100644 index e69de29b..00000000 diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/m24.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/m24.ngc deleted file mode 100644 index 37454968..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/m24.ngc +++ /dev/null @@ -1,14 +0,0 @@ -o sub -(PRINT, o) - -M64 P2 ; unclamp the tool -M66 P2 L3 Q2 ; check the unclamped tool sensor -o100 if [#5399 LT 0] - M65 P2 ; turn off the drawbar - (abort, failed to release tool) ; abort if the sensor does not activate in 3 seconds -o100 endif - -(PRINT, o endsub) -o endsub [1] - -M2 diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/m25.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/m25.ngc deleted file mode 100644 index a1a7ac98..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/m25.ngc +++ /dev/null @@ -1,15 +0,0 @@ -o sub -(PRINT, o) - -M64 P0 ; Move Carousel out - -M66 P1 L3 Q5 ; check for carousel out sensor -o100 if [#5399 LT 0] - M65 P0 ; switch off atc out solenoid - (abort, ATC not in position) -o100 endif - -(PRINT, o endsub) -o endsub [1] - -M2 diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/m26.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/m26.ngc deleted file mode 100644 index e69de29b..00000000 diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/m6_tool_call_atc_page.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/m6_tool_call_atc_page.ngc deleted file mode 100644 index 6481e34d..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/m6_tool_call_atc_page.ngc +++ /dev/null @@ -1,37 +0,0 @@ -(author: Chris P) -(version: 0.2) -(date: 07/18/22) - -(m6 tool call with g43 offset applied) - -o sub - -# = #1 -# = #2 -# = #3 -# = #4 -# = #5 -# = #6 - -T# M6 -o100 if [1 EQ 1] - G43 H# -o100 endif - -o110 if [# EQ #] - S0 M5 -o110 endif - -# = #5403 - -(run program_coolant sub if selected to be active in settings page with value 1) -o120 if [# EQ 1] - (run program_coolant.ngc) - o call [#][#][#][#] -o120 else - o return -o120 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/m6_tool_call_main_panel.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/m6_tool_call_main_panel.ngc deleted file mode 100644 index 901c5649..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/m6_tool_call_main_panel.ngc +++ /dev/null @@ -1,38 +0,0 @@ -(author: Chris P) -(version: 0.3) -(date: 07/22/22) - -(m6 tool call with g43 offset applied) - -o sub - -# = #1 -# = #2 -# = #3 -# = #4 -# = #5 -# = #6 - -T# M6 - -o100 if [1 EQ 1] - G43 H# -o100 endif - -o110 if [# EQ #] - S0 M5 -o110 endif - -# = #5403 - -(run program_coolant sub if selected to be active in settings page with value 1) -o120 if [# EQ 1] - (run program_coolant.ngc) - o call [#][#][#][#] -o120 else - o return -o120 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/m6_tool_call_tool_page.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/m6_tool_call_tool_page.ngc deleted file mode 100644 index fb93fa42..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/m6_tool_call_tool_page.ngc +++ /dev/null @@ -1,38 +0,0 @@ -(author: Chris P) -(version: 0.3) -(date: 07/18/22) - -(m6 tool call with g43 offset applied) - -o sub - -# = #1 -# = #2 -# = #3 -# = #4 -# = #5 -# = #6 - -T# M6 - -o100 if [1 EQ 1] - G43 H# -o100 endif - -o110 if [# EQ #] - S0 M5 -o110 endif - -# = #5403 - -(run program_coolant sub if selected to be active in settings page with value 1) -o120 if [# EQ 1] - (run program_coolant.ngc) - o call [#][#][#][#] -o120 else - o return -o120 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/move_tool_to_carousel_height.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/move_tool_to_carousel_height.ngc deleted file mode 100644 index 77215115..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/move_tool_to_carousel_height.ngc +++ /dev/null @@ -1,18 +0,0 @@ -o sub -; # is the height you spindle needs to be at to clamp/unclamp a tool form the ATC (Set via INI [ATC]Z_TOOL_CHANGE_HEIGHT) -; # is the clearance height you spindle needs to be at to safely clear the ATC (Set via INI [ATC]Z_TOOL_CLEARANCE_HEIGHT) - -# = -3.9000 -o101 if [EXISTS[#<_ini[atc]z_tool_change_height>]] - # = #<_ini[atc]z_tool_change_height> -o101 endif -# = [#<_ini[AXIS_Z]MAX_LIMIT>-0.1] -o102 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]] - # = #<_ini[atc]z_tool_clearance_height> -o102 endif - -G0 G53 Z# ; rapid move to above the tool change height - -o endsub [1] - -M2 diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/on_abort.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/on_abort.ngc deleted file mode 100644 index da9f6901..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/on_abort.ngc +++ /dev/null @@ -1,9 +0,0 @@ -% -o sub - -G90 -G40 -G49 - -o endsub -% diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/orientspindle.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/orientspindle.ngc deleted file mode 100644 index 1776e944..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/orientspindle.ngc +++ /dev/null @@ -1,11 +0,0 @@ -o sub -; Orient the spindle with platter -(PRINT, o) - -M5 M9 ; stop all spindle motion and coolant -M19 R0 Q4 ; orient spindle -M5 ; turn off spindle lock - -o endsub [1] - -M2 diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_back_left_inside_corner.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_back_left_inside_corner.ngc deleted file mode 100644 index efb82dcd..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_back_left_inside_corner.ngc +++ /dev/null @@ -1,118 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/25/19) - -(Probe back left inside corner for x,y,z 0,0,0 position) -(Start probe position is over back left inside corner of stock) -(inside the step off width square and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Traverse Workpiece Top at Z Clearance Height plane) - G91 - F[#] - G38.3 X[#] Y-[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - G90 - (Current X Position including offsets in current program units) - # = #5420 - - (Call sub "probe_x_minus_sub" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (move to X start Position) - G90 - F[#] - G38.3 X[#] - - (Current Y Position including offsets in current program units) - # = #5421 - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o120 endif - - (move to Y start Position) - G90 - F[#] - G38.3 Y[#] - - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] - G10 L2 P#5220 Y[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_back_left_top_corner.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_back_left_top_corner.ngc deleted file mode 100644 index 305b1302..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_back_left_top_corner.ngc +++ /dev/null @@ -1,114 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/25/19) - -(Probe back left top corner for x,y,z 0,0,0 position) -(Start probe position is over back left corner of stock) -(inside the step off width square and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X-[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (Probe Y Positioning Move, up to Z clearance plane) - G91 - F[#] - G38.3 Z[#] - - (Probe Y Positioning Move, Traverse Workpiece at Z Clearance plane) - F[#] - G38.3 X[#] Y[#] - - (Probe Y Positioning Move,to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o120 endif - - (Probe Completion Move to Z Clearance Plane, and XY Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] - G10 L2 P#5220 Y[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_back_right_inside_corner.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_back_right_inside_corner.ngc deleted file mode 100644 index 6cbe538c..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_back_right_inside_corner.ngc +++ /dev/null @@ -1,118 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/25/19) - -(Probe back right inside corner for x,y,z 0,0,0 position) -(Start probe position is over back right inside corner of stock) -(inside the step off width square and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width X and Y) - G91 - F[#] - G38.3 X-[#] Y-[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - G90 - (Current X Position including offsets in current program units) - # = #5420 - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (move to X start Position) - G90 - F[#] - G38.3 X[#] - - (Current Y Position including offsets in current program units) - # = #5421 - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o120 endif - - (move to Y start Position) - G90 - F[#] - G38.3 Y[#] - - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] - G10 L2 P#5220 Y[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_back_right_top_corner.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_back_right_top_corner.ngc deleted file mode 100644 index fd30605d..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_back_right_top_corner.ngc +++ /dev/null @@ -1,113 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/23/19) - -(Probe back right top corner for x,y,z 0,0,0 position) -(Start probe position is over back right corner of stock) -(inside the step off width square and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (Probe Y Positioning Move, up to Z clearance plane) - G91 - F[#] - G38.3 Z[#] - (Probe Y Positioning Move) - F[#] - G38.3 X-[#] Y[#] - - (Probe Y Positioning Move,to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o120 endif - - (Probe Completion Move to Z Clearance Plane, and XY Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] - G10 L2 P#5220 Y[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_back_top_side.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_back_top_side.ngc deleted file mode 100644 index 46e705be..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_back_top_side.ngc +++ /dev/null @@ -1,88 +0,0 @@ -(author: Chris P) -(version: 0.3) -(date: 04/25/19) - -(Probe back top side for y,z 0,0 position) -(Start probe position is over back edge of stock) -(inside the step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe Y Positioning Move, Step Off Width) - G91 - F[#] - G38.3 Y[#] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o110 endif - - (Probe Completion Move to Z Clearance Plane, and Y Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 Y[#] - - (probe mode rules for WCO or probe position measuring only) - o120 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 Y[# + #] - o return - o120 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_cal_reset.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_cal_reset.ngc deleted file mode 100644 index 866e8ef1..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_cal_reset.ngc +++ /dev/null @@ -1,8 +0,0 @@ -o sub - - #1000 = 0 - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_cal_round_boss.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_cal_round_boss.ngc deleted file mode 100644 index e9dcbd00..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_cal_round_boss.ngc +++ /dev/null @@ -1,325 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 05/8/19) - -(Probe calibration offset using defined diam round boss) -(Start probe position is over center of stock in X and Y axis) -(within max z distance, ensure all settings have been) -(set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=1.0000) - # = #17 (=0) - # = #18 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - # = #[5203 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [#] - - (remove probe tip diam and cal offset from probed width calculations) - # = [#] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, X hint/2 + Step Off Width) - G91 - F[#] - G38.3 X-[#/2 + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in X, X Hint + Step Off Width at Rapid Speed) - G91 - F[#] - G38.3 X[# + # + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (probed center calulation) - # = [[# + #] / 2] - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] - - (Probe Y Positioning Move, Y hint/2 + Step Off Width) - G91 - F[#] - G38.3 Y-[#/2 + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed) - G91 - F[#] - G38.3 Y[# + # + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (probed center calulation) - # = [[# + #] / 2] - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - (Move to z clearance plane) - G91 - F[#] - G38.3 Z[#] - - (Move to Y Center) - G90 - F[#] - G38.3 Y[#] - - (Probe X Positioning Move, X hint/2 + Step Off Width) - G91 - F[#] - G38.3 X-[#/2 + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in X, X Hint + Step Off Width at Rapid Speed) - F[#] - G38.3 X[# + # + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (probed center calulation) - # = [[# + #] / 2] - - (calculate X Width Probed) - o110 if [# GT #] - # = [# - #] - o110 else - # = [# - #] - o110 endif - - (Completed probed width calculations) - # = [# - #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] - - (Probe Y Positioning Move, Y hint/2 + Step Off Width) - G91 - F[#] - G38.3 Y-[#/2 + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed) - F[#] - G38.3 Y[# + # + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (probed center calulation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - o120 if [# GT #] - # = [# - #] - o120 else - # = [# - #] - o return - o120 endif - - (Completed probed width calculations) - # = [# - #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - # = [[# + #] / 2] - - #1010 = # - (DEBUG, EVAL[vcp.getWidget{"averaged_diam"}.setValue{#1010}]) - - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - o130 if [# GT #] - (calculate calibration error and adjust calibration offset) - # = [[# - #] / 2] - # = [#] - o130 else - # = [[# - #] / 2] - # = [#] - o130 endif - - o140 if [# GT #] - (calculate calibration error and adjust calibration offset) - # = [[# - #] / 2] - # = [#] - o140 else - # = [[# - #] / 2] - # = [#] - o140 endif - - # = [[# + #] / 2] - - o150 if [# EQ 0] - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o150 else if [# EQ 1] - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o150 else - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o150 endif - - # = [# + #] - - # = [# + #] - - (probe mode rules for WCO or probe position measuring only) - o160 if [# EQ 0] - (Record XY Zero in selected WCO) - G10 L2 P#5220 X[#] Y[#] - o return - o160 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_cal_round_pocket.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_cal_round_pocket.ngc deleted file mode 100644 index fb372418..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_cal_round_pocket.ngc +++ /dev/null @@ -1,218 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 05/8/19) - -(Probe calibration offset using defined diam round pocket) -(Start probe position is over left side edge of pocket wall) -(inside the step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=1.0000) - # = #17 (=0) - # = #18 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (remove probe tip diam and cal offset from probed width calculations) - # = [#] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x-) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - (Probe Completion Move to Z Clearance Plane, and X Zero) - G90 - F[#] - G38.3 X[#] - - (Call sub "probe_y_plus" to Probe Y+) - o call [#1][#3 + #13 / 2][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus" to Probe Y-) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - (Probe Completion Move to Z Clearance Plane, Y Zero) - G90 - F[#] - G38.3 Y[#] - - (Call sub "probe_x_minus" to Probe x-) - o call [#1][#3 + #13 / 2][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - G90 - F[#] - G38.3 X[#] - - (Call sub "probe_y_plus" to Probe Y+) - o call [#1][#3 + #13 / 2][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus" to Probe Y-) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed diameter calculations) - # = [# + #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - # = [[# + #] / 2] - - #1010 = # - (DEBUG, EVAL[vcp.getWidget{"averaged_diam"}.setValue{#1010}]) - - G90 - F[#] - G38.3 Y[#] - G91 - F[#] - G38.3 Z[#] - - o110 if [# GT #] - (calculate calibration error and adjust calibration offset) - # = [[# - #] / 2] - # = [#] - o110 else - # = [[# - #] / 2] - # = [#] - o110 endif - - o120 if [# GT #] - (calculate calibration error and adjust calibration offset) - # = [[# - #] / 2] - # = [#] - o120 else - # = [[# - #] / 2] - # = [#] - o120 endif - - # = [[# + #] / 2] - - o130 if [# EQ 0] - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o130 else if [# EQ 1] - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o130 else - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o130 endif - - # = [# + #] - - # = [# + #] - - (probe mode rules for WCO or probe position measuring only) - o140 if [# EQ 0] - (Record Y Zero in selected WCO) - G10 L2 P#5220 X[#] Y[#] - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - o return - o140 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_cal_square_boss.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_cal_square_boss.ngc deleted file mode 100644 index 60c51131..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_cal_square_boss.ngc +++ /dev/null @@ -1,220 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 05/8/19) - -(Probe calibration offset using defined width square boss) -(Start probe position is over center of stock in X and Y axis) -(within max z distance, ensure all settings have been) -(set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=0) - # = #17 (=0) - # = #18 (=0) - # = #19 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - # = #[5203 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [#] - - (remove probe tip diam and cal offset from probed width calculations) - # = [#] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, X hint/2 + Step Off Width) - G91 - F[#] - G38.3 X-[#/2 + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in X, X Hint + Step Off Width at Rapid Speed) - G91 - F[#] - G38.3 X[# + # + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (probed center calulation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# - #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] - - (Probe Y Positioning Move, Y hint/2 + Step Off Width) - G91 - F[#] - G38.3 Y-[#/2 + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed) - G91 - F[#] - G38.3 Y[# + # + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (probed center calulation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# - #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - o110 if [# GT #] - (calculate calibration error and adjust calibration offset) - # = [[# - #] / 2] - # = [#] - o110 else - # = [[# - #] / 2] - # = [#] - o110 endif - - o120 if [# GT #] - (calculate calibration error and adjust calibration offset) - # = [[# - #] / 2] - # = [#] - o120 else - # = [[# - #] / 2] - # = [#] - o120 endif - - # = [[# + #] / 2] - - o130 if [# EQ 0] - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o130 else if [# EQ 1] - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o130 else - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o130 endif - - # = [# + #] - - # = [# + #] - - (probe mode rules for WCO or probe position measuring only) - o140 if [# EQ 0] - (Record XY Zero in selected WCO) - G10 L2 P#5220 X[#] Y[#] - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - o return - o140 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_cal_square_pocket.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_cal_square_pocket.ngc deleted file mode 100644 index d6834bc5..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_cal_square_pocket.ngc +++ /dev/null @@ -1,172 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 05/8/19) - -(Probe calibration offset using defined width square pocket) -(Start probe position is over left side edge of pocket wall) -(inside the step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=1.0000) - # = #17 (=1.0000) - # = #18 (=0) - # = #19 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (remove probe tip diam and cal offset from probed width calculations) - # = [#] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3 + #11][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - G90 - F[#] - G38.3 X[#] - - (Call sub "probe_y_plus" to Probe Y+ side of Workpiece) - o call [#1][#3 + #12 / 2][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus" to Probe Y- side of Workpiece) - o call [#1][#3 + #12][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - G90 - F[#] - G38.3 Y[#] - G91 - F[#] - G38.3 Z[#] - - o110 if [# GT #] - (calculate calibration error and adjust calibration offset) - # = [[# - #] / 2] - # = [#] - o110 else - # = [[# - #] / 2] - # = [#] - o110 endif - - o120 if [# GT #] - (calculate calibration error and adjust calibration offset) - # = [[# - #] / 2] - # = [#] - o120 else - # = [[# - #] / 2] - # = [#] - o120 endif - - # = [[# + #] / 2] - - o130 if [# EQ 0] - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o130 else if [# EQ 1] - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o130 else - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o130 endif - - # = [# + #] - - # = [# + #] - - (probe mode rules for WCO or probe position measuring only) - o140 if [# EQ 0] - (Record X Zero in selected WCO) - G10 L2 P#5220 X[#] Y[#] - o return - o140 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_corner_x_minus_edge_angle.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_corner_x_minus_edge_angle.ngc deleted file mode 100644 index fbc334f5..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_corner_x_minus_edge_angle.ngc +++ /dev/null @@ -1,165 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 05/7/19) - -(Probe Corner X minus Edge Angle for x,y,z 0,0,0 position) -(Start probe position is over front right corner of stock) -(inside the step off width square and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=0) - # = #17 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - # = #5420 - - # = #5421 - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 y-[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - # = #5420 - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o110 endif - - (Probe Y Positioning Move, up to Z clearance plane) - G91 - F[#] - G38.3 Z[#] - - (Probe Y Positioning Move, Traverse Workpiece at Z Clearance plane) - F[#] - G38.3 X[#] Y[#] - - (Probe Y Positioning Move,to Probing Depth) - F[#] - G38.3 Z-[#] - - # = #5421 - - (Call sub "probe_x_minus" to Probe X- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o120 endif - - (edge width move to edge second probing point) - G91 - F[#] - G38.3 Y[#] - - # = #5421 - - (Call sub "probe_x_minus" to Probe X- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o130 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o130 endif - - # = [# - #] - - # = [ATAN [#] / [#]] - - #1011 = # - (DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}]) - - #1012 = # - (DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}]) - - # = [# + [# - #] * COS[-#] - [# - #] * SIN[-#]] - - # = [# + [# - #] * SIN[-#] + [# - #] * COS[-#]] - - # = [# + [# - #] * COS[#] - [# - #] * SIN[#]] - - # = [# + [# - #] * SIN[#] + [# - #] * COS[#]] - - (Probe Completion Move to Z Clearance Plane, and XY Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO,Rotation and probe position measuring only) - o140 if [# EQ 0 AND # EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] Y[# + #] - o return - o140 endif - - (probe mode rules for WCO,Rotation and probe position measuring only) - o150 if [# EQ 0 AND # EQ 1] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] Y[# + #] R[#] - o return - o150 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_corner_x_plus_edge_angle.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_corner_x_plus_edge_angle.ngc deleted file mode 100644 index ee33cacc..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_corner_x_plus_edge_angle.ngc +++ /dev/null @@ -1,165 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 05/7/19) - -(Probe Corner X plus Edge Angle for x,y,z 0,0,0 position) -(Start probe position is over back left corner of stock) -(inside the step off width square and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=0) - # = #17 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - # = #5420 - - # = #5421 - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 y[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - # = #5420 - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o110 endif - - (Probe Y Positioning Move, up to Z clearance plane) - G91 - F[#] - G38.3 Z[#] - - (Probe Y Positioning Move, Traverse Workpiece at Z Clearance plane) - F[#] - G38.3 X-[#] Y-[#] - - (Probe Y Positioning Move,to Probing Depth) - F[#] - G38.3 Z-[#] - - # = #5421 - - (Call sub "probe_x_plus" to Probe X+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o120 endif - - (edge width move to edge second probing point) - G91 - F[#] - G38.3 Y-[#] - - # = #5421 - - (Call sub "probe_x_plus" to Probe X+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o130 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o130 endif - - # = [# - #] - - # = [ATAN [#] / [#]] - - #1011 = # - (DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}]) - - #1012 = # - (DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}]) - - # = [# + [# - #] * COS[-#] - [# - #] * SIN[-#]] - - # = [# + [# - #] * SIN[-#] + [# - #] * COS[-#]] - - # = [# + [# - #] * COS[#] - [# - #] * SIN[#]] - - # = [# + [# - #] * SIN[#] + [# - #] * COS[#]] - - (Probe Completion Move to Z Clearance Plane, and XY Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO,Rotation and probe position measuring only) - o140 if [# EQ 0 AND # EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] Y[# + #] - o return - o140 endif - - (probe mode rules for WCO,Rotation and probe position measuring only) - o150 if [# EQ 0 AND # EQ 1] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] Y[# + #] R[#] - o return - o150 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_corner_y_minus_edge_angle.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_corner_y_minus_edge_angle.ngc deleted file mode 100644 index 74d08f26..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_corner_y_minus_edge_angle.ngc +++ /dev/null @@ -1,165 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 05/7/19) - -(Probe Corner Y minus Edge Angle for x,y,z 0,0,0 position) -(Start probe position is over back right corner of stock) -(inside the step off width square and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=0) - # = #17 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - # = #5420 - - # = #5421 - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - # = #5421 - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (Probe Y Positioning Move, up to Z clearance plane) - G91 - F[#] - G38.3 Z[#] - - (Probe Y Positioning Move, Traverse Workpiece at Z Clearance plane) - F[#] - G38.3 X-[#] Y[#] - - (Probe Y Positioning Move,to Probing Depth) - F[#] - G38.3 Z-[#] - - # = #5420 - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o120 endif - - (edge width move to edge second probing point) - G91 - F[#] - G38.3 X-[#] - - # = #5420 - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o130 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o130 endif - - # = [# - #] - - # = [ATAN [#] / [#]] - - #1011 = # - (DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}]) - - #1012 = # - (DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}]) - - # = [# + [# - #] * COS[-#] - [# - #] * SIN[-#]] - - # = [# + [# - #] * SIN[-#] + [# - #] * COS[-#]] - - # = [# + [# - #] * COS[#] - [# - #] * SIN[#]] - - # = [# + [# - #] * SIN[#] + [# - #] * COS[#]] - - (Probe Completion Move to Z Clearance Plane, and XY Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO,Rotation and probe position measuring only) - o140 if [# EQ 0 AND # EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] Y[# + #] - o return - o140 endif - - (probe mode rules for WCO,Rotation and probe position measuring only) - o150 if [# EQ 0 AND # EQ 1] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] Y[# + #] R[#] - o return - o150 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_corner_y_plus_edge_angle.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_corner_y_plus_edge_angle.ngc deleted file mode 100644 index ff0c05a9..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_corner_y_plus_edge_angle.ngc +++ /dev/null @@ -1,165 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 05/7/19) - -(Probe Corner Y Plus Edge Angle for x,y,z 0,0,0 position) -(Start probe position is over front left corner of stock) -(inside the step off width square and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=0) - # = #17 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - # = #5420 - - # = #5421 - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X-[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - # = #5421 - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (Probe Y Positioning Move, up to Z clearance plane) - G91 - F[#] - G38.3 Z[#] - - (Probe Y Positioning Move, Traverse Workpiece at Z Clearance plane) - F[#] - G38.3 X[#] Y-[#] - - (Probe Y Positioning Move,to Probing Depth) - F[#] - G38.3 Z-[#] - - # = #5420 - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o120 endif - - (edge width move to edge second probing point) - G91 - F[#] - G38.3 X[#] - - # = #5420 - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o130 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o130 endif - - # = [# - #] - - # = [ATAN [#] / [#]] - - #1011 = # - (DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}]) - - #1012 = # - (DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}]) - - # = [# + [# - #] * COS[-#] - [# - #] * SIN[-#]] - - # = [# + [# - #] * SIN[-#] + [# - #] * COS[-#]] - - # = [# + [# - #] * COS[#] - [# - #] * SIN[#]] - - # = [# + [# - #] * SIN[#] + [# - #] * COS[#]] - - (Probe Completion Move to Z Clearance Plane, and XY Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO,Rotation and probe position measuring only) - o140 if [# EQ 0 AND # EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] Y[# + #] - o return - o140 endif - - (probe mode rules for WCO,Rotation and probe position measuring only) - o150 if [# EQ 0 AND # EQ 1] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] Y[# + #] R[#] - o return - o150 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_front_left_inside_corner.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_front_left_inside_corner.ngc deleted file mode 100644 index a1b02431..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_front_left_inside_corner.ngc +++ /dev/null @@ -1,118 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/25/19) - -(Probe front left inside corner for x,y,z 0,0,0 position) -(Start probe position is over front left inside corner of stock) -(inside the step off width square and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Traverse Workpiece Top at Z Clearance Height plane) - G91 - F[#] - G38.3 X[#] Y[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - G90 - (Current X Position including offsets in current program units) - # = #5420 - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (move to X start Position) - G90 - F[#] - G38.3 X[#] - - (Current Y Position including offsets in current program units) - # = #5421 - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o120 endif - - (move to Y start Position) - G90 - F[#] - G38.3 Y[#] - - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] - G10 L2 P#5220 Y[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_front_left_top_corner.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_front_left_top_corner.ngc deleted file mode 100644 index b523777b..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_front_left_top_corner.ngc +++ /dev/null @@ -1,114 +0,0 @@ -(author: Chris P) -(version: 0.4) -(date: 04/25/19) - -(Probe front left top corner for x,y,z 0,0,0 position) -(Start probe position is over front left corner of stock) -(inside the step off width square and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X-[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (Probe Y Positioning Move, up to Z clearance plane) - G91 - F[#] - G38.3 Z[#] - - (Probe Y Positioning Move, Traverse Workpiece at Z Clearance plane) - F[#] - G38.3 X[#] Y-[#] - - (Probe Y Positioning Move,to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o120 endif - - (Probe Completion Move to Z Clearance Plane, and XY Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] - G10 L2 P#5220 Y[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_front_right_inside_corner.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_front_right_inside_corner.ngc deleted file mode 100644 index bfda031b..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_front_right_inside_corner.ngc +++ /dev/null @@ -1,118 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/23/19) - -(Probe front right inside corner for x,y,z 0,0,0 position) -(Start probe position is over front right inside corner of stock) -(inside the step off width square and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width X and Y) - G91 - F[#] - G38.3 X-[#] Y[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - G90 - (Current X Position including offsets in current program units) - # = #5420 - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (move to X start Position) - G90 - F[#] - G38.3 X[#] - - (Current Y Position including offsets in current program units) - # = #5421 - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o120 endif - - (move to Y start Position) - G90 - F[#] - G38.3 Y[#] - - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] - G10 L2 P#5220 Y[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_front_right_top_corner.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_front_right_top_corner.ngc deleted file mode 100644 index 875808cf..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_front_right_top_corner.ngc +++ /dev/null @@ -1,115 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/23/19) - -(Probe front right top corner for x,y,z 0,0,0 position) -(Start probe position is over front right corner of stock) -(inside the step off width square and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (Probe Y Positioning Move, up to Z clearance plane) - G91 - F[#] - G38.3 Z[#] - - (Probe Y Positioning Move, Traverse Workpiece Top at Z Clearance Height plane) - F[#] - G38.3 X-[#] Y-[#] - - (Probe Y Positioning Move,to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_plus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o120 endif - - (Probe Completion Move to Z Clearance Plane, and XY Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] - G10 L2 P#5220 Y[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_front_top_side.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_front_top_side.ngc deleted file mode 100644 index cb444882..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_front_top_side.ngc +++ /dev/null @@ -1,88 +0,0 @@ -(author: Chris P) -(version: 0.4) -(date: 04/25/19) - -(Probe front top side for y,z 0,0 position) -(Start probe position is over front edge of stock) -(inside the step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe Y Positioning Move, Step Off Width) - G91 - F[#] - G38.3 Y-[#] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o110 endif - - (Probe Completion Move to Z Clearance Plane, and Y Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 Y[#] - - (probe mode rules for WCO or probe position measuring only) - o120 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 Y[# + #] - o return - o120 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_left_top_side.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_left_top_side.ngc deleted file mode 100644 index 7913a715..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_left_top_side.ngc +++ /dev/null @@ -1,88 +0,0 @@ -(author: Chris P) -(version: 0.3) -(date: 04/25/19) - -(Probe left top side for x,z 0,0 position) -(Start probe position is over left side edge of stock) -(inside the step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X-[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - # = #16 (=50) Z-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (Probe Completion Move to Z Clearance Plane, and Y Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] - - (probe mode rules for WCO or probe position measuring only) - o120 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] - o return - o120 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_rect_boss.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_rect_boss.ngc deleted file mode 100644 index bb60abc7..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_rect_boss.ngc +++ /dev/null @@ -1,182 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/27/19) - -(Probe Boss in X and Y Axes, find center and z 0 position) -(Start probe position is over center of stock in X and Y axis) -(within max z distance, ensure all settings have been) -(set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - # = #[5203 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, X hint/2 + Step Off Width) - G91 - F[#] - G38.3 X-[[#/2] + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in X, X Hint + Step Off Width at Rapid Speed) - G91 - F[#] - G38.3 X[# + # + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (probed center calulation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# - #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] - - (Probe Y Positioning Move, Y hint/2 + Step Off Width) - G91 - F[#] - G38.3 Y-[[#/2] + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed) - G91 - F[#] - G38.3 Y[# + # + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (probed center calulation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# - #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record XY Zero in selected WCO) - G10 L2 P#5220 X[# + #] Y[# + #] - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - o return - o110 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_rect_pocket.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_rect_pocket.ngc deleted file mode 100644 index 12ef0e40..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_rect_pocket.ngc +++ /dev/null @@ -1,134 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/26/19) - -(Probe rect pocket center measure x and widths, find xy center position) -(Start probe position is over left side edge of pocket wall) -(inside the step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3 + #11][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - G90 - F[#] - G38.3 X[#] - - (Call sub "probe_y_plus" to Probe Y+ side of Workpiece) - o call [#1][#3 + #12 / 2][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus" to Probe Y- side of Workpiece) - o call [#1][#3 + #12][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - G90 - F[#] - G38.3 Y[#] - G91 - F[#] - G38.3 Z[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record X Zero in selected WCO) - G10 L2 P#5220 X[# + #] Y[# + #] - o return - o110 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_rect_pocket_center_start.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_rect_pocket_center_start.ngc deleted file mode 100644 index 4a87bda7..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_rect_pocket_center_start.ngc +++ /dev/null @@ -1,116 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 01/16/23) - -(Probe rect pocket center measure x and y widths, find xy center position) -(Start probe position is rough center of pocket probe tip below top edge) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3 + #11 / 2][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3 + #11][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - (Probe Completion Move to X Zero, Y Zero) - G90 - F[#] - G38.3 X[#] - - (Call sub "probe_y_plus" to Probe Y+ side of Workpiece) - o call [#1][#3 + #12 / 2][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus" to Probe Y- side of Workpiece) - o call [#1][#3 + #12][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - G90 - F[#] - G38.3 Y[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record X and Y Zero in selected WCO) - G10 L2 P#5220 X[# + #] Y[# + #] - o return - o110 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_ridge_x.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_ridge_x.ngc deleted file mode 100644 index 3372002a..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_ridge_x.ngc +++ /dev/null @@ -1,124 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/25/19) - -(Probe Ridge in X Axis to find center and z 0 position) -(Start probe position is over center of stock in the X axis) -(within max z distance, ensure all settings have been) -(set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=100) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5203 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, X hint/2 + Step Off Width) - G91 - F[#] - G38.3 X-[[#/2] + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in X, X Hint + Step Off Width at Rapid Speed) - F[#] - G38.3 X[# + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (probed center calulation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# - #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - (Probe Completion Move to Z Clearance Plane, and X Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record X Zero in selected WCO) - G10 L2 P#5220 X[# + #] - o return - o110 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_ridge_y.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_ridge_y.ngc deleted file mode 100644 index dfb0518a..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_ridge_y.ngc +++ /dev/null @@ -1,125 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/24/19) - -(Probe Ridge in Y Axis to find center and z 0 position) -(Start probe position is over center of stock in the Y axis) -(within max z distance, ensure all settings have been) -(set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5202 + [20 * #5220]] - # = #[5203 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe Y Positioning Move, Y hint/2 + Step Off Width) - G91 - F[#] - G38.3 Y-[[#/2] + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - # = #16 (=50) Z-[#] - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed) - F[#] - G38.3 Y[# + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - # = #16 (=50) Z-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (probed center calulation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# - #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - (Probe Completion Move to Z Clearance Plane, and X Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 Y[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record Y Zero in selected WCO) - G10 L2 P#5220 Y[# + #] - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - o return - o110 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_right_top_side.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_right_top_side.ngc deleted file mode 100644 index 3902c324..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_right_top_side.ngc +++ /dev/null @@ -1,88 +0,0 @@ -(author: Chris P) -(version: 0.3) -(date: 04/25/19) - -(Probe right top side for x,z 0,0 position) -(Start probe position is over right side edge of stock) -(inside the step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (Probe Completion Move to Z Clearance Plane, and Y Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] - - (probe mode rules for WCO or probe position measuring only) - o120 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] - o return - o120 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_round_boss.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_round_boss.ngc deleted file mode 100644 index 2b9a5b63..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_round_boss.ngc +++ /dev/null @@ -1,292 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/27/19) - -(Probe Boss in X and Y Axes, find center, Diam and z 0 position) -(Start probe position is over center of stock in X and Y axis) -(within max z distance, ensure all settings have been) -(set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - # = #[5203 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, X hint/2 + Step Off Width) - G91 - F[#] - G38.3 X-[[# / 2] + [#]] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in X, X Hint + Step Off Width at Rapid Speed) - G91 - F[#] - G38.3 X[# + # + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (probed center calulation) - # = [[# + #] / 2] - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] - - (Probe Y Positioning Move, Y hint/2 + Step Off Width) - G91 - F[#] - G38.3 Y-[[# / 2] + [#]] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed) - G91 - F[#] - G38.3 Y[# + # + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (probed center calulation) - # = [[# + #] / 2] - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - (Move to z clearance plane) - G91 - F[#] - G38.3 Z[#] - - (Move to Y Center) - G90 - F[#] - G38.3 Y[#] - - (Probe X Positioning Move, X hint/2 + Step Off Width) - G91 - F[#] - G38.3 X-[[# / 2] + [#]] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in X, X Hint + Step Off Width at Rapid Speed) - F[#] - G38.3 X[# + # + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (probed center calulation) - # = [[# + #] / 2] - - (calculate X Width Probed) - o110 if [# GT #] - # = [# - #] - o110 else - # = [# - #] - o110 endif - - (Completed probed width calculations) - # = [# - #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] - - (Probe Y Positioning Move, Y hint/2 + Step Off Width) - G91 - F[#] - G38.3 Y-[[# / 2] + [#]] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed) - F[#] - G38.3 Y[# + # + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (probed center calulation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - o120 if [# GT #] - # = [# - #] - o120 else - # = [# - #] - o120 endif - - (Completed probed width calculations) - # = [# - #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - # = [[# + #] / 2] - - #1010 = # - (DEBUG, EVAL[vcp.getWidget{"averaged_diam"}.setValue{#1010}]) - - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - # = [# + #] - - # = [# + #] - - (probe mode rules for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record XY Zero in selected WCO) - G10 L2 P#5220 X[#] Y[#] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_round_pocket.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_round_pocket.ngc deleted file mode 100644 index 24c4ac0f..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_round_pocket.ngc +++ /dev/null @@ -1,182 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/26/19) - -(Probe round pocket center measure x and y Diam, find xy center position) -(Start probe position is over left side edge of pocket wall) -(inside the step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x-) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - (Probe Completion Move to Z Clearance Plane, and X Zero) - G90 - F[#] - G38.3 X[#] - - (Call sub "probe_y_plus" to Probe Y+) - o call [#1][#3 + #13 / 2][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus" to Probe Y-) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - (Probe Completion Move to Z Clearance Plane, Y Zero) - G90 - F[#] - G38.3 Y[#] - - (Call sub "probe_x_minus" to Probe x-) - o call [#1][#3 + #13 / 2][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - G90 - F[#] - G38.3 X[#] - - (Call sub "probe_y_plus" to Probe Y+) - o call [#1][#3 + #13 / 2][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus" to Probe Y-) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed diameter calculations) - # = [# + #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - # = [[# + #] / 2] - - #1010 = # - (DEBUG, EVAL[vcp.getWidget{"averaged_diam"}.setValue{#1010}]) - - G90 - F[#] - G38.3 Y[#] - G91 - F[#] - G38.3 Z[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record Y Zero in selected WCO) - G10 L2 P#5220 X[# + #] - G10 L2 P#5220 Y[# + #] - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - o return - o110 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_round_pocket_center_start.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_round_pocket_center_start.ngc deleted file mode 100644 index 1a4087aa..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_round_pocket_center_start.ngc +++ /dev/null @@ -1,164 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/26/19) - -(Probe round pocket center start measure x and y Diam, find xy center position) -(Start probe position is rough center of pocket a safe distance below top edge) -(no z move will be initiated in this routine. end position is hole center) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - (Call sub "probe_x_minus" to Probe x-) - o call [#1][#3 +#13 / 2][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - (Probe Completion Move to X Zero) - G90 - F[#] - G38.3 X[#] - - (Call sub "probe_y_plus" to Probe Y+) - o call [#1][#3 + #13 / 2][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus" to Probe Y-) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - (Probe Completion Move to Y Zero) - G90 - F[#] - G38.3 Y[#] - - (Call sub "probe_x_minus" to Probe x-) - o call [#1][#3 + #13 / 2][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - G90 - F[#] - G38.3 X[#] - - (Call sub "probe_y_plus" to Probe Y+) - o call [#1][#3 + #13 / 2][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus" to Probe Y-) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed diameter calculations) - # = [# + #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - # = [[# + #] / 2] - - #1010 = # - (DEBUG, EVAL[vcp.getWidget{"averaged_diam"}.setValue{#1010}]) - - G90 - F[#] - G38.3 Y[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record Y Zero in selected WCO) - G10 L2 P#5220 X[# + #] - G10 L2 P#5220 Y[# + #] - o return - o110 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_top_back_edge_angle.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_top_back_edge_angle.ngc deleted file mode 100644 index 2b956840..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_top_back_edge_angle.ngc +++ /dev/null @@ -1,124 +0,0 @@ -(author: Chris P) -(version: 0.3) -(date: 04/25/19) - -(Probe back top edge angle for y,z 0,0 position and edge angle) -(Start probe position is over back edge of stock, set edge width,) -(step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=0) - # = #17 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - # = #5420 - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe Y Positioning Move, Step Off Width) - G91 - F[#] - G38.3 Y[#] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o110 endif - - (edge width move to edge second probing point) - G91 - F[#] - G38.3 X-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o120 endif - - # = [# - #] - - # = [ATAN [#] / [#]] - - #1011 = # - (DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}]) - - #1012 = # - (DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}]) - - (Probe Completion Move to Z Clearance Plane, and Y Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO, Rotation and probe position measuring only) - o130 if [# EQ 0 AND # EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[#] Y[# + #] - o return - o130 endif - - (probe mode rules for WCO, Rotation and probe position measuring only) - o140 if [# EQ 0 AND # EQ 1] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[#] Y[# + #] R[#] - o return - o140 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_top_front_edge_angle.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_top_front_edge_angle.ngc deleted file mode 100644 index 38dffe0f..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_top_front_edge_angle.ngc +++ /dev/null @@ -1,124 +0,0 @@ -(author: Chris P) -(version: 0.4) -(date: 04/25/19) - -(Probe top front edge angle for y,z 0,0 position and edge angle) -(Start probe position is over front edge of stock, set edge width,) -(step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=0) - # = #17 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - # = #5420 - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe Y Positioning Move, Step Off Width) - G91 - F[#] - G38.3 Y-[#] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o110 endif - - (edge width move to edge second probing point) - G91 - F[#] - G38.3 X[#] - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o120 endif - - # = [# - #] - - # = [ATAN [#] / [#]] - - #1011 = # - (DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}]) - - #1012 = # - (DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}]) - - (Probe Completion Move to Z Clearance Plane, and Y Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO, Rotation and probe position measuring only) - o130 if [# EQ 0 AND # EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[#] Y[# + #] - o return - o130 endif - - (probe mode rules for WCO, Rotation and probe position measuring only) - o140 if [# EQ 0 AND # EQ 1] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[#] Y[# + #] R[#] - o return - o140 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_top_left_edge_angle.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_top_left_edge_angle.ngc deleted file mode 100644 index 8f204c9c..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_top_left_edge_angle.ngc +++ /dev/null @@ -1,124 +0,0 @@ -(author: Chris P) -(version: 0.3) -(date: 04/25/19) - -(Probe top left edge angle for y,z 0,0 position and edge angle) -(Start probe position is over left edge of stock, set edge width,) -(step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=0) - # = #17 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - # = #5421 - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X-[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (edge width move to edge second probing point) - G91 - F[#] - G38.3 Y-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o120 endif - - # = [# - #] - - # = [ATAN [#] / [#]] - - #1011 = # - (DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}]) - - #1012 = # - (DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}]) - - (Probe Completion Move to Z Clearance Plane, and Y Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO, Rotation and probe position measuring only) - o130 if [# EQ 0 AND # EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] Y[#] - o return - o130 endif - - (probe mode rules for WCO, Rotation and probe position measuring only) - o140 if [# EQ 0 AND # EQ 1] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] Y[#] R[#] - o return - o140 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_top_right_edge_angle.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_top_right_edge_angle.ngc deleted file mode 100644 index 4ebbb38c..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_top_right_edge_angle.ngc +++ /dev/null @@ -1,124 +0,0 @@ -(author: Chris P) -(version: 0.3) -(date: 04/25/19) - -(Probe top right edge angle for y,z 0,0 position and edge angle) -(Start probe position is over right edge of stock, set edge width,) -(step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=0) - # = #17 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - # = #5421 - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (edge width move to edge second probing point) - G91 - F[#] - G38.3 Y[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o120 endif - - # = [# - #] - - # = [ATAN [#] / [#]] - - #1011 = # - (DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}]) - - #1012 = # - (DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}]) - - (Probe Completion Move to Z Clearance Plane, and Y Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO, Rotation and probe position measuring only) - o130 if [# EQ 0 AND # EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] Y[#] - o return - o130 endif - - (probe mode rules for WCO, Rotation and probe position measuring only) - o140 if [# EQ 0 AND # EQ 1] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] Y[#] R[#] - o return - o140 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_valley_x.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_valley_x.ngc deleted file mode 100644 index 3976664a..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_valley_x.ngc +++ /dev/null @@ -1,105 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/25/19) - -(Probe valley in x, find Z0, X0 valley center position) -(Start probe position is over left side edge of valley wall) -(inside the step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3 + #11][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - (Probe Completion Move to Z Clearance Plane, and X Zero) - G90 - F[#] - G38.3 X[#] - G91 - F[#] - G38.3 Z[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record X Zero in selected WCO) - G10 L2 P#5220 X[# + #] - o return - o110 endif - - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_valley_x_center_start.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_valley_x_center_start.ngc deleted file mode 100644 index ede6ab52..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_valley_x_center_start.ngc +++ /dev/null @@ -1,86 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 01/16/23) - -(Probe valley in x, find X zero valley center position) -(Start probe position is centered between valley walls) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3 + #11 / 2][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3 + #11][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - (Probe Completion Move to X Zero) - G90 - F[#] - G38.3 X[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record X Zero in selected WCO) - G10 L2 P#5220 X[# + #] - o return - o110 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_valley_y.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_valley_y.ngc deleted file mode 100644 index 50f8e37f..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_valley_y.ngc +++ /dev/null @@ -1,102 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/25/19) - -(Probe valley in Y, find Z0, Y0 valley center position) -(Start probe position is over back side edge of valley wall) -(inside the step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe Y Positioning Move, Step Off Width) - G91 - F[#] - G38.3 Y-[#] - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_plus" to Probe Y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus_sub" to Probe Y- side of Workpiece) - o call [#1][#3 + #12][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - (Probe Completion Move to Z Clearance Plane, and X Zero) - G90 - F[#] - G38.3 Y[#] - G91 - F[#] - G38.3 Z[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record X Zero in selected WCO) - G10 L2 P#5220 Y[# + #] - o return - o110 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_valley_y_center_start.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_valley_y_center_start.ngc deleted file mode 100644 index 3d5b2b12..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_valley_y_center_start.ngc +++ /dev/null @@ -1,86 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 01/16/23) - -(Probe valley in Y find Y0 valley center position) -(Start probe position is rough center between valley walls) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - (Call sub "probe_y_plus" to Probe Y+ side of Workpiece) - o call [#1][#3 + #12 / 2][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus_sub" to Probe Y- side of Workpiece) - o call [#1][#3 + #12][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - (Probe Completion Move to Z Clearance Plane, and X Zero) - G90 - F[#] - G38.3 Y[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record X Zero in selected WCO) - G10 L2 P#5220 Y[# + #] - o return - o110 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_x_minus.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_x_minus.ngc deleted file mode 100644 index ebd5a6cd..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_x_minus.ngc +++ /dev/null @@ -1,84 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe X Minus direction and set X 0 in current WCO) -(Start probe position to the right side edge of stock) -(inside the max xy distance with the probe tip below the stock top edge) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 - # = #2 - # = #3 - # = #4 - # = #5 - # = #6 - - (Cancel G92 offsets) - G92.1 - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (Current X Position including offsets in current program units) - # = #5420 - - (Initiate Fast X- Probe) - G91 - F[#] - G38.2 X-[#] - # = #5061 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 X# - F[#] - (return from sub) - o return - o110 endif - - (Move to xy_clearance distance for slow probe) - G90 - G0 X[# + #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow X- Probe) - G91 - F[#] - G38.2 X-[# * 2] - # = #5061 - G90 - G0 X[# + #] - o120 endif - - # = [# - #] - - (defines the edge as x_probed_position for DRO reporting) - # = # - - (output to gui DRO "X PROBED POSITION") - #1005 = # - (DEBUG, EVAL[vcp.getWidget{"x_minus_probed_position"}.setValue{#1005}]) - -o endsub [#] - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_x_minus_wco.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_x_minus_wco.ngc deleted file mode 100644 index 5bcbb495..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_x_minus_wco.ngc +++ /dev/null @@ -1,102 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe X Minus direction and set X 0 in current WCO) -(Start probe position to the right side edge of stock) -(inside the max xy distance with the probe tip below the stock top edge) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (Current X Position including offsets in current program units) - # = #5420 - - (Initiate Fast X- Probe) - G91 - F[#] - G38.2 X-[#] - # = #5061 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 X# - F[#] - (return from sub) - o return - o110 endif - - (Move to xy_clearance distance for slow probe) - G90 - G0 X[# + #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow X- Probe) - G91 - F[#] - G38.2 X-[# * 2] - # = #5061 - G90 - G0 X[# + #] - o120 endif - - # = [# - #] - - (defines the edge as x_probed_position for DRO reporting) - # = # - - (output to gui DRO "X PROBED POSITION") - #1005 = # - (DEBUG, EVAL[vcp.getWidget{"x_minus_probed_position"}.setValue{#1005}]) - - (probe mode rule for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record X Zero in selected WCO) - G10 L2 P#5220 X[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_x_plus.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_x_plus.ngc deleted file mode 100644 index a9db4f83..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_x_plus.ngc +++ /dev/null @@ -1,84 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe X plus direction and set X 0 in current WCO) -(Start probe position to the left side edge of stock) -(inside the max xy distance with the probe tip below the stock top edge) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 - # = #2 - # = #3 - # = #4 - # = #5 - # = #6 - - (Cancel G92 offsets) - G92.1 - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (Current X Position including offsets in current program units) - # = #5420 - - (Initiate Fast X+ Probe) - G91 - F[#] - G38.2 X[#] - # = #5061 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 X# - F[#] - (return from sub) - o return - o110 endif - - (Move to xy_clearance distance for slow probe) - G90 - G0 X[# - #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow X+ Probe) - G91 - F[#] - G38.2 X[# * 2] - # = #5061 - G90 - G0 X[# - #] - o120 endif - - # = [# + #] - - (defines the edge as x_probed_position for DRO reporting) - # = # - - (output to gui DRO "X PROBED POSITION") - #1006 = # - (DEBUG, EVAL[vcp.getWidget{"x_plus_probed_position"}.setValue{#1006}]) - -o endsub [#] - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_x_plus_wco.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_x_plus_wco.ngc deleted file mode 100644 index 4c50daef..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_x_plus_wco.ngc +++ /dev/null @@ -1,102 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe X plus direction and set X 0 in current WCO) -(Start probe position to the left side edge of stock) -(inside the max xy distance with the probe tip below the stock top edge) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (Current X Position including offsets in current program units) - # = #5420 - - (Initiate Fast X+ Probe) - G91 - F[#] - G38.2 X[#] - # = #5061 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 X# - F[#] - (return from sub) - o return - o110 endif - - (Move to xy_clearance distance for slow probe) - G90 - G0 X[# - #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow X+ Probe) - G91 - F[#] - G38.2 X[# * 2] - # = #5061 - G90 - G0 X[# - #] - o120 endif - - # = [# + #] - - (defines the edge as x_probed_position for DRO reporting) - # = # - - (output to gui DRO "X PROBED POSITION") - #1006 = # - (DEBUG, EVAL[vcp.getWidget{"x_plus_probed_position"}.setValue{#1006}]) - - (probe mode rule for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record X Zero in selected WCO) - G10 L2 P#5220 X[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_y_minus.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_y_minus.ngc deleted file mode 100644 index ee604409..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_y_minus.ngc +++ /dev/null @@ -1,84 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe Y Minus direction to locate edge, end at clearance distance) -(Start probe position to the back side edge of stock) -(inside the max xy distance with the probe tip below the stock top edge) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 - # = #2 - # = #3 - # = #4 - # = #5 - # = #6 - - (Cancel G92 offsets) - G92.1 - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (Current Y Position including offsets in current program units) - # = #5421 - - (Initiate Fast Y- Probe) - G91 - F[#] - G38.2 y-[#] - # = #5062 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 Y# - F[#] - (return from sub) - o return - o110 endif - - (Move to xy_clearance distance for slow probe) - G90 - G0 Y[# + #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow Y- Probe) - G91 - F[#] - G38.2 Y-[# * 2] - # = #5062 - G90 - G0 Y[# + #] - o120 endif - - # = [#5062 - #] - - (defines the edge as y_probed_position for DRO reporting) - # = # - - (output to gui DRO "Y PROBED POSITION") - #1007 = # - (DEBUG, EVAL[vcp.getWidget{"y_minus_probed_position"}.setValue{#1007}]) - -o endsub [#] - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_y_minus_wco.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_y_minus_wco.ngc deleted file mode 100644 index ee98bb70..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_y_minus_wco.ngc +++ /dev/null @@ -1,102 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe Y Minus direction and set Y 0 in current WCO) -(Start probe position to the back side edge of stock) -(inside the max xy distance with the probe tip below the stock top edge) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - - (Cancel G92 offsets) - G92.1 - - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (Current Y Position including offsets in current program units) - # = #5421 - - (Initiate Fast Y- Probe) - G91 - F[#] - G38.2 y-[#] - # = #5062 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 Y# - F[#] - (return from sub) - o return - o110 endif - - (Move to xy_clearance distance for slow probe) - G90 - G0 Y[# + #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow Y- Probe) - G91 - F[#] - G38.2 Y-[# * 2] - # = #5062 - G90 - G0 Y[# + #] - o120 endif - - # = [#5062 - #] - - (defines the edge as y_probed_position for DRO reporting) - # = # - - (output to gui DRO "Y PROBED POSITION") - #1007 = # - (DEBUG, EVAL[vcp.getWidget{"y_minus_probed_position"}.setValue{#1007}]) - - (probe mode rule for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Y Zero in selected WCO) - G10 L2 P#5220 Y[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_y_plus.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_y_plus.ngc deleted file mode 100644 index 874a7b9a..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_y_plus.ngc +++ /dev/null @@ -1,84 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe Y plus direction to locate edge, end at clearance distance) -(Start probe position to the front side edge of stock) -(inside the max xy distance with the probe tip below the stock top edge) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 - # = #2 - # = #3 - # = #4 - # = #5 - # = #6 - - (Cancel G92 offsets) - G92.1 - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (Current Y Position including offsets in current program units) - # = #5421 - - (Initiate Fast y+ Probe) - G91 - F[#] - G38.2 Y[#] - # = #5062 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 Y# - F[#] - (return from sub) - o return - o110 endif - - (Move to xy_clearance distance for slow probe) - G90 - G0 Y[# - #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow Y+ Probe) - G91 - F[#] - G38.2 Y[# * 2] - # = #5062 - G90 - G0 Y[# - #] - o120 endif - - # = [#5062 + #] - - (defines the edge as y_probed_position for DRO reporting) - # = # - - (output to gui DRO "Y PROBED POSITION") - #1008 = # - (DEBUG, EVAL[vcp.getWidget{"y_plus_probed_position"}.setValue{#1008}]) - -o endsub [#] - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_y_plus_wco.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_y_plus_wco.ngc deleted file mode 100644 index 651f03a4..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_y_plus_wco.ngc +++ /dev/null @@ -1,102 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe Y plus direction and set Y 0 in current WCO) -(Start probe position to the front side edge of stock) -(inside the max xy distance with the probe tip below the stock top edge) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - - (Cancel G92 offsets) - G92.1 - - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (Current Y Position including offsets in current program units) - # = #5421 - - (Initiate Fast y+ Probe) - G91 - F[#] - G38.2 Y[#] - # = #5062 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 Y# - F[#] - (return from sub) - o return - o110 endif - - (Move to xy_clearance distance for slow probe) - G90 - G0 Y[# - #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow Y+ Probe) - G91 - F[#] - G38.2 Y[# * 2] - # = #5062 - G90 - G0 Y[# - #] - o120 endif - - # = [#5062 + #] - - (defines the edge as y_probed_position for DRO reporting) - # = # - - (output to gui DRO "Y PROBED POSITION") - #1008 = # - (DEBUG, EVAL[vcp.getWidget{"y_plus_probed_position"}.setValue{#1008}]) - - (probe mode rule for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Y Zero in selected WCO) - G10 L2 P#5220 Y[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_z_minus.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_z_minus.ngc deleted file mode 100644 index 1f2bfa39..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_z_minus.ngc +++ /dev/null @@ -1,64 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe Z Minus direction to locate top, end at clearance distance) -(Start probe position is over stock within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 - # = #2 - # = #3 - # = #4 - # = #5 - - (Current Z Position including offsets in current program units) - # = #5422 - - (Initial Fast Z- Probe) - G91 - F[#] - G38.2 Z-[#] - # = #5063 - - (Probe Error check, #5070 will be 0 if failed) - o100 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 Z# - F[#] - (return from sub) - o return - o100 endif - - (Move to z_clearance height for slow probe) - G90 - G0 Z[# + #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o110 if [# GT 0] - (Initiate Slow Z- Probe) - G91 - F[#] - G38.2 Z-[# * 2] - # = #5063 - G90 - G0 Z[# + #] - o110 endif - - (defines the edge as z_probed_position for DRO reporting) - # = # - - (output to gui DRO "Z PROBED POSITION") - #1009 = # - (DEBUG, EVAL[vcp.getWidget{"z_minus_probed_position"}.setValue{#1009}]) - - # = [# + #] - -o endsub [#] - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_z_minus_sub.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_z_minus_sub.ngc deleted file mode 100644 index b74d1f3b..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_z_minus_sub.ngc +++ /dev/null @@ -1,83 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe Z Minus direction and set Z 0 in current WCO) -(Start probe position is over stock within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 - # = #2 - # = #3 - # = #4 - # = #5 - # = #6 - - (Cancel G92 offsets) - G92.1 - - # = #[5203 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Current Z Position including offsets in current program units) - # = #5422 - - (Initial Fast Z- Probe) - G91 - F[#] - G38.2 Z-[#] - # = #5063 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 Z# - F[#] - (return from sub) - o return - o110 endif - - (Move to z_clearance height for slow probe) - G90 - G0 Z[# + #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow Z- Probe) - G91 - F[#] - G38.2 Z-[# * 2] - # = #5063 - G90 - G0 Z[# + #] - o120 endif - - (defines the edge as z_probed_position for DRO reporting) - # = # - - (output to gui DRO "Z PROBED POSITION") - #1009 = # - (DEBUG, EVAL[vcp.getWidget{"z_minus_probed_position"}.setValue{#1009}]) - - # = [# + #] - - (probe mode rule for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Z zero in selected WCO) - G10 L2 P#5220 Z[# + #] - o return - o130 endif - -o endsub [#] - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_z_minus_wco.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/probe_z_minus_wco.ngc deleted file mode 100644 index d37ece9d..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/probe_z_minus_wco.ngc +++ /dev/null @@ -1,92 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe Z Minus direction and set Z 0 in current WCO) -(Start probe position is over stock within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - - (Cancel G92 offsets) - G92.1 - - # = #[5203 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Current Z Position including offsets in current program units) - # = #5422 - - (Initial Fast Z- Probe) - G91 - F[#] - G38.2 Z-[#] - # = #5063 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 Z# - F[#] - (return from sub) - o return - o110 endif - - (Move to z_clearance height for slow probe) - G90 - G0 Z[# + #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow Z- Probe) - G91 - F[#] - G38.2 Z-[# * 2] - # = #5063 - G90 - G0 Z[# + #] - o120 endif - - (defines the edge as z_probed_position for DRO reporting) - # = # - - (output to gui DRO "Z PROBED POSITION") - #1009 = # - (DEBUG, EVAL[vcp.getWidget{"z_minus_probed_position"}.setValue{#1009}]) - - # = [# + #] - - (probe mode rule for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Z zero in selected WCO) - G10 L2 P#5220 Z[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/program_coolant.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/program_coolant.ngc deleted file mode 100644 index 14e87dce..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/program_coolant.ngc +++ /dev/null @@ -1,42 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 02/13/20) - -(programmable coolant subroutine for aiming the coolant nozzle) -(settings for setup are located on probe basic setting page) -(in the programmable coolant constants container.) -(calculations assume coolant nozzle is on axis b and has been homed) -(to 0 degrees rotation aiming perpendicular to the spindle center line) -(coolant nozzle is located on the right side of the spindle head and) -(rotates counter clockwise from home position with commands) - -o sub -(PRINT, o) - - (uses NGCGUI style arg spec) - (number after equals sign in comment is default value) - # = #1 - # = #2 - # = #3 - # = #4 - - # = #5410 - - # = [# / 2] - - # = [# - #] - - # = [[#] + [#]] - - # = [ATAN[#] / [#]] - - # = [[#] + [#]] - - #1000 = # - (DEBUG, EVAL[vcp.getWidget{"coolant_final_angle"}.setValue{#1000}]) - - M68 E20 Q[#] - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/reset_all_data.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/reset_all_data.ngc deleted file mode 100644 index 9b89dde3..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/reset_all_data.ngc +++ /dev/null @@ -1,41 +0,0 @@ -o sub - -#1001 = 0 -(DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1001}]) - -#1002 = 0 -(DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1002}]) - -#1003 = 0 -(DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1003}]) - -#1004 = 0 -(DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1004}]) - -#1005 = 0 -(DEBUG, EVAL[vcp.getWidget{"x_minus_probed_position"}.setValue{#1005}]) - -#1006 = 0 -(DEBUG, EVAL[vcp.getWidget{"x_plus_probed_position"}.setValue{#1006}]) - -#1007 = 0 -(DEBUG, EVAL[vcp.getWidget{"y_minus_probed_position"}.setValue{#1007}]) - -#1008 = 0 -(DEBUG, EVAL[vcp.getWidget{"y_plus_probed_position"}.setValue{#1008}]) - -#1009 = 0 -(DEBUG, EVAL[vcp.getWidget{"z_minus_probed_position"}.setValue{#1009}]) - -#1010 = 0 -(DEBUG, EVAL[vcp.getWidget{"averaged_diam"}.setValue{#1010}]) - -#1011 = 0 -(DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}]) - -#1012 = 0 -(DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}]) - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/retractatc.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/retractatc.ngc deleted file mode 100644 index f9d400fe..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/retractatc.ngc +++ /dev/null @@ -1,15 +0,0 @@ -o sub - -M65 P0 ; Turn off carousel out solenoid -M64 P1 ; Move Carousel IN - -M66 P0 L3 Q5 ; check carousel in position sensor -o100 if [#5399 LT 0] - M65 P1 ; turn off the solenoid to send atc home - (abort, Failed to send carousel home) ; abort if the sensor does not activate in 5 seconds -o100 endif -M65 P1 - -o endsub [1] - -M2 diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/set_g30_position.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/set_g30_position.ngc deleted file mode 100644 index 036d83be..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/set_g30_position.ngc +++ /dev/null @@ -1,19 +0,0 @@ -o sub - -o100 if [1 EQ 1] - (G30.1 records the tool touch off position in the var file) - G30.1 -o100 endif - -#1000 = #5181 -(DEBUG, EVAL[vcp.getWidget{"x_tool_change_position"}.setValue{#1000}]) - -#1001 = #5182 -(DEBUG, EVAL[vcp.getWidget{"y_tool_change_position"}.setValue{#1001}]) - -#1002 = #5183 -(DEBUG, EVAL[vcp.getWidget{"z_tool_change_position"}.setValue{#1002}]) - -o endsub - -M2 diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/store_tool_in_carousel.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/store_tool_in_carousel.ngc deleted file mode 100644 index d6904b18..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/store_tool_in_carousel.ngc +++ /dev/null @@ -1,16 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 02/8/20) - -(store spindle tool in carousel macro) - -o sub -(PRINT, o) - -G49 - -T0 M6 - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/tool_touch_off.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/tool_touch_off.ngc deleted file mode 100644 index 33f10b14..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/tool_touch_off.ngc +++ /dev/null @@ -1,103 +0,0 @@ -o sub - -; NOTE this routine used G59.3, and this needs to be set to 0,0,0 for everything to work correctly - -# = #1 (set from probe screen fast probe feed rate) -# = #2 (set from probe screen slow probe feedrate) -# = #3 (max z distance the tool travels before erroring out if not contact is made) -# = #4 (max xy distance the tool travels before erroring out if not contact is made) -# = #6 (distance the tool retracts after making contact during fast feed mode) -# = #5 (G53 distance from home to spindle nose triggering point on touch plate) -# = #8 (activates the tool diameter probe subroutine section) -# = #9 (activates the tool diameter offset position for probe subroutine section) -# = #10 (current tool's diameter used for offseting probe position in x axis) - -G92.1 (Cancel G92 offset) - -# = #5220 - -# = #5181 -# = #5182 -# = #5183 - -# = [# / 2] -# = [# - #] - -G59.3 - -o100 if [# EQ 1] - # = # -o100 endif - -o110 if [2 EQ 2] - G49 -o110 endif - -G90 (set absolute coordinates) -G53 G0 Z0 (move to z0 home position) -G53 G0 X# Y# -G53 G0 Z# - -G91 -F # -G38.2 Z-[#] (fast tool probe) -# = #5063 (save probe result of fast probe to parameters) -G0 Z[#] (retract tool retract distance amount) - -(Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) -o120 if [# GT 0] - (Initiate Slow Z- Probe) - G91 - F[#] (set probe slow feedrate) - G38.2 Z-[# * 2] (slow tool probe) - # = #5063 - G90 - G0 Z[# + #] -o120 endif - -o130 if [#5070 EQ 1] (verify probe event was succesful) - # = #5063 (save slow probe result to parameters) -o130 else - (MSG,Tool Length Offset Probe Failed) -o130 endif - -(Tool Diameter Probe Mode Section, User must define this section as needed) -o140 if [# EQ 1] - (MSG, Tool Diameter Probing is Not Defined in Subroutine) -o140 endif - -o150 if [3 EQ 3] - G49 -o150 endif - -G90 (set absolute coordinates) -G53 G0 Z0 (Send Spindle to home zero position) - -(define new tool length offset parameters) -# = [ABS[# + #5063]] - -G10 L1 P #5400 Z [#] (5400 = tool number) - -o160 if [# EQ 1] - G54 -o160 else if [# EQ 2] - G55 -o160 else if [# EQ 3] - G56 -o160 else if [# EQ 4] - G57 -o160 else if [# EQ 5] - G58 -o160 else if [# EQ 6] - G59 -o160 else if [# EQ 7] - G59.1 -o160 else if [# EQ 8] - G59.2 -o160 endif - -T #5400 G43 H #5400 (enable tool length offset) - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/tool_touch_off_entire_carousel.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/tool_touch_off_entire_carousel.ngc deleted file mode 100644 index 27192776..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/tool_touch_off_entire_carousel.ngc +++ /dev/null @@ -1,10 +0,0 @@ -o sub - -; Touch off each tool in the carousel -(PRINT, o) - -(DEBUG, 'TOUCH OFF ENTIRE CAROUSEL' not yet implemented) - -o endsub - -M2 diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/toolchange.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/toolchange.ngc deleted file mode 100644 index 21d39094..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/toolchange.ngc +++ /dev/null @@ -1,140 +0,0 @@ -o sub - -; Parameter #3989 is used to track if the carousel is homed (M13) (volatile) -; Parameter #3990 is used to track the current tool pocket (persistently) -; Parameter #3991 is used to track the current tool loaded it in the spindle (persistently) -; Parameters #4001 to #4024 are used to track which tool is in which pocket (persistently) -; Parameter #4000 is not populated just used in the maths to calculate the above numbers -; #: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets> -; # is the height you spindle needs to be at to clamp/unclamp a tool form the ATC (Set via INI [ATC]Z_TOOL_CHANGE_HEIGHT) -; # is the clearance height you spindle needs to be at to safely clear the ATC (Set via INI [ATC]Z_TOOL_CLEARANCE_HEIGHT) - -(PRINT, o selected_tool: #, tool_in_spindle: #, selected_pocket: #, current_pocket: #, task: #<_task>) - -o100 if [#<_task> EQ 0] - (DEBUG, Task is null) - o return [999] -o100 endif (this code eliminates tool missing error on load for multiple use tools) - -; default to a 12 pocket ATC (matching DynATC Widget behaviour), then update based on INI settings -# = 12 -o101 if [EXISTS[#<_ini[atc]pockets>]] - # = #<_ini[atc]pockets> -o101 endif - -# = -3.9000 -o102 if [EXISTS[#<_ini[atc]z_tool_change_height>]] - # = #<_ini[atc]z_tool_change_height> -o102 endif -# = [#<_ini[AXIS_Z]MAX_LIMIT>-0.1] -o103 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]] - # = #<_ini[atc]z_tool_clearance_height> -o103 endif - -; assign the programmable coolant parameters -# = #1 (=0) -# = #2 (=0) -# = #3 (=0) -# = #4 (=0) - -; assign the variables passed by M6 change_prolog to some parameters -#100 = # -#110 = # -#120 = # -#121 = # -; NOTE: -; The legacy names *selected_pocket* and *current_pocket* actually reference -; a sequential tooldata index for tool items loaded from a tool -; table ([EMCIO]TOOL_TABLE) or via a tooldata database ([EMCIO]DB_PROGRAM) - -o110 if [# EQ #] ; checks if tool in the spindle is same as requested - o endsub [1] - M2 -o110 endif - -o111 if [#3991 NE #] - (PRINT, o tool_in_spindle does not match 3991) -o111 endif - -# = 0 ; assigns 0 to the next pocket for a later check if the tool is found in the carousel -# = 0 -#130 = # ; assign test parameter the number of pockets in the carousel - -o120 do - o121 if [#[4000 + #130] EQ #] ; checks all pockets to see if it contains tool number requested as the new tool - # = #130 ; if tool is found in pocket, assigns the next pocket - o121 endif - o122 if [#[4000 + #130] EQ 0] ; checks if the pocket is empty, last pocket checked will be the lowest empty pocket number, for putting tool in spindle away. - # = #130 - o122 endif - #130 = [#130 - 1] -o120 while [#130 GT 0] -o130 if [# EQ 0] ; if tool is not found, aborts and sends a message - (abort, Tool T%d# not found in carousel) -o130 endif - -; now we know which pocket the next tool is sitting in -; we need to know if we need to put a tool away -; or if there is not tool in the spindle - -o140 if [# GT 0] ; checks if there is a valid tool in the spindle - o141 if [# EQ 0] ; If there is a tool in the spindle, checks if there is an open pocket - (abort, Carousel is full, cant put away tool T# in into carousel) - o141 endif - M10 P[#] ; move carousel to an open pocket - M21 ; puts the tool in spindle away into the open pocket - (DEBUG, EVAL[vcp.getWidget{"dynatc"}.store_tool{#, #}]) - #140 = # - #[4000 + #140] = # ; save tool number in pocket - #3991 = 0 ; empty tool in the spindle - M61 Q0 - G49 -o140 endif - -G90 -G0 G53 Z# ; move z to clear height - -o150 if [# GT 0] ; selected tool is not tool0 - M10 P# ; set the carousel to move to the right pocket for the selected tool - M65 P1 - M64 P0 - M66 P1 L3 Q5 ; check carousel out position sensor - o151 if [#5399 LT 0] - M65 P0 ; turn off the solenoid to send atc to tool change - (abort, Failed to send carousel home) ; abort if the sensor does not activate in 5 seconds - o151 endif - M65 P0 - - (DEBUG, EVAL[vcp.getWidget{"dynatc"}.store_tool{#, 0}]) - M22 ; Carousel out - #150 = # - #[4000 + #150] = 0 ; empty the pocket - #3991 = # ; Set persistent variable to remember tool in spindle after power cycle -o150 else - M65 P2 ; deactive drawbar - M65 P0 ; make sure ATC out solenoid is off - M64 P1 ; move carousel home - M66 P0 L3 Q4 ; check carousel in position sensor - o152 if [#5399 LT 0] - M65 P1 ; turn off the solenoid to send atc home - (abort, Failed to send carousel home) ; abort if the sensor does not activate in 5 seconds - o152 endif - M65 P1 -o150 endif - -M61 Q# - -o160 if [1 EQ 1] - G43 H# -o160 endif - -(run program_coolant sub if selected to be active in settings page with value 1) -o170 if [# EQ 1] - (run program_coolant.ngc) - o call [#][#][#][#] -o170 endif - -(PRINT, o endsub) -o endsub [1] - -M2 diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/toolsetter_wco.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/toolsetter_wco.ngc deleted file mode 100644 index 61207d8e..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/toolsetter_wco.ngc +++ /dev/null @@ -1,87 +0,0 @@ -(author: Chris Polanski) -(version: 0.1) -(date: 11/5/22) - -(Measure tool and set Z 0.000 in current WCO for new tool) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - - # = 33.2 - # = 4.4 - # = 26 - # = 3 - # = 2.5 - # = 1.8 - # = 0.2500 - # = 0.0 - # = 30.0 - - (start with an m6, do all the standard m6 stuff and then touch off -TMC) - M6 - - (Cancel G92 offsets) - G92.1 - - o100 if [2 EQ 2] - G49 - o100 endif - - G90 (set absolute coordinates) - G53 G0 Z0 (move to z0 home position) - G53 G0 X# Y# - - # = #[5203 + [20 * #5220]] - - (Current Z Position including offsets in current program units) - # = #5422 - - (Initial Fast Z- Probe) - G91 - F[#] - G38.2 Z-[#] - # = #5063 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 Z# - F[#] - (return from sub) - o return - o110 endif - - (Move to z_clearance height for slow probe) - G90 - G0 Z[# + #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow Z- Probe) - G91 - F[#] - G38.2 Z-[# * 2] - # = #5063 - G90 - G0 Z[# + #] - o120 endif - - # = [# + #] - - # = [# - #] - - (Record Z zero in selected WCO) - G10 L2 P#5220 Z[# + #] - - (Move to Toolset location) - G53 G0 X# Y# - - (pause for dust boot) - M0 (replace the dust boot) - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/unclamptool.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/unclamptool.ngc deleted file mode 100644 index ac9c3798..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/unclamptool.ngc +++ /dev/null @@ -1,12 +0,0 @@ -o sub - -M64 P2 ; unclamp the tool - -M66 P2 L3 Q2 ; check the unclamped tool sensor -o100 if [#5399 LT 0] - (abort, Failed to release tool) ; abort if the sensor does not activate in 2 seconds -o100 endif - -o endsub [1] - -M2 diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/y_data_reset.ngc b/linuxcnc/configs/atc_sim/macros_sim_metric/y_data_reset.ngc deleted file mode 100644 index 093d30d9..00000000 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/y_data_reset.ngc +++ /dev/null @@ -1,17 +0,0 @@ -o sub - -#1003 = 0 -(DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1003}]) - -#1004 = 0 -(DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1004}]) - -#1007 = 0 -(DEBUG, EVAL[vcp.getWidget{"y_minus_probed_position"}.setValue{#1007}]) - -#1008 = 0 -(DEBUG, EVAL[vcp.getWidget{"y_plus_probed_position"}.setValue{#1008}]) - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/atc_sim/vmc_graycode_inch.ini b/linuxcnc/configs/atc_sim/vmc_graycode_inch.ini index 6029efd8..8fa154d0 100644 --- a/linuxcnc/configs/atc_sim/vmc_graycode_inch.ini +++ b/linuxcnc/configs/atc_sim/vmc_graycode_inch.ini @@ -49,7 +49,7 @@ PATH_APPEND= ./python/ [RS274NGC] RS274NGC_STARTUP_CODE = F10 S300 G20 G17 G40 G49 G54 G64 P0.001 G80 G90 G91.1 G92.1 G94 G97 G98 PARAMETER_FILE = vmc.var -SUBROUTINE_PATH = macros_sim_inch/ +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 index b2330b8e..e835106d 100644 --- a/linuxcnc/configs/atc_sim/vmc_graycode_metric.ini +++ b/linuxcnc/configs/atc_sim/vmc_graycode_metric.ini @@ -26,7 +26,7 @@ MACHINE_LABELS = False [RS274NGC] PARAMETER_FILE = vmc.var -SUBROUTINE_PATH = macros_sim_metric/ +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.ini b/linuxcnc/configs/atc_sim/vmc_index.ini index 3dd71fe2..e3bb7ff3 100644 --- a/linuxcnc/configs/atc_sim/vmc_index.ini +++ b/linuxcnc/configs/atc_sim/vmc_index.ini @@ -48,7 +48,7 @@ Z_TOOL_CLEARANCE_HEIGHT = -0.1 [RS274NGC] PROGRAM_PREFIX = ~/linuxcnc/nc_files PARAMETER_FILE = vmc.var -SUBROUTINE_PATH = macros/ +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 index 78c78f37..8fa4028c 100644 --- a/linuxcnc/configs/atc_sim/vmc_index_inch.ini +++ b/linuxcnc/configs/atc_sim/vmc_index_inch.ini @@ -6,7 +6,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 CONFIG_FILE = custom_config.yml CYCLE_TIME = 0.200 POSITION_OFFSET = RELATIVE @@ -54,7 +54,7 @@ PROGRAM_PREFIX = ~/linuxcnc/nc_files PARAMETER_FILE = vmc.var OWORD_NARGS = 1 NO_DOWNCASE_OWORD = 1 -SUBROUTINE_PATH = macros_sim_inch/ +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 index 6dc858a6..5949a80c 100644 --- a/linuxcnc/configs/atc_sim/vmc_index_metric.ini +++ b/linuxcnc/configs/atc_sim/vmc_index_metric.ini @@ -6,7 +6,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 CONFIG_FILE = custom_config.yml CYCLE_TIME = 0.200 POSITION_OFFSET = RELATIVE @@ -53,7 +53,7 @@ PROGRAM_PREFIX = ~/linuxcnc/nc_files PARAMETER_FILE = vmc.var OWORD_NARGS = 1 NO_DOWNCASE_OWORD = 1 -SUBROUTINE_PATH = macros_sim_metric/ +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 index 004117be..9473025c 100644 --- 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 @@ -63,7 +63,7 @@ PARAMETER_FILE = sim.var RS274NGC_STARTUP_CODE = F10 S300 G20 G17 G40 G49 G54 G64 P0.001 G80 G90 G91.1 G92.1 G94 G97 G98 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 deleted file mode 100644 index abc300bb..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/clamptool.ngc +++ /dev/null @@ -1,12 +0,0 @@ -o sub - -M65 P2 ; clamp the tool - -M66 P5 L3 Q1 ; check the clamped tool sensor -o100 if [#5399 LT 0] - (abort, Failed to release tool) ; abort if the sensor does not activate in 2 seconds -o100 endif - -o endsub [1] - -M2 diff --git a/linuxcnc/configs/probe_basic/subroutines/extendatc.ngc b/linuxcnc/configs/probe_basic/subroutines/extendatc.ngc deleted file mode 100644 index 95828367..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/extendatc.ngc +++ /dev/null @@ -1,28 +0,0 @@ -o sub - -; # is the height you spindle needs to be at to clamp/unclamp a tool form the ATC (Set via INI [ATC]Z_TOOL_CHANGE_HEIGHT) -; # is the clearance height you spindle needs to be at to safely clear the ATC (Set via INI [ATC]Z_TOOL_CLEARANCE_HEIGHT) - -# = -3.9000 -o101 if [EXISTS[#<_ini[atc]z_tool_change_height>]] - # = #<_ini[atc]z_tool_change_height> -o101 endif -# = [#<_ini[AXIS_Z]MAX_LIMIT>-0.1] -o102 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]] - # = #<_ini[atc]z_tool_clearance_height> -o102 endif - -G0 G53 Z# ; move z to clear height - -M65 P1 ; Turn off carousel home solenoid -M64 P0 ; Move Carousel OUT - -M66 P1 L3 Q5 ; check for carousel out position sensor -o100 if [#5399 LT 0] - M65 P0 ; switch off atc out solenoid - (abort, ATC not in position) -o100 endif - -o endsub [1] - -M2 diff --git a/linuxcnc/configs/probe_basic/subroutines/go_to_g30.ngc b/linuxcnc/configs/probe_basic/subroutines/go_to_g30.ngc deleted file mode 100644 index 71956e07..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/go_to_g30.ngc +++ /dev/null @@ -1,10 +0,0 @@ -o sub - -M73 -G90 -G53 G0 Z0 -G30 - -o endsub - -M2 diff --git a/linuxcnc/configs/probe_basic/subroutines/go_to_home.ngc b/linuxcnc/configs/probe_basic/subroutines/go_to_home.ngc deleted file mode 100644 index 62d10af7..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/go_to_home.ngc +++ /dev/null @@ -1,10 +0,0 @@ -o sub - -M73 -G90 -G53 G0 Z0 -G53 G0 X0 Y0 - -o endsub - -M2 diff --git a/linuxcnc/configs/probe_basic/subroutines/go_to_zero.ngc b/linuxcnc/configs/probe_basic/subroutines/go_to_zero.ngc deleted file mode 100644 index dbb91808..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/go_to_zero.ngc +++ /dev/null @@ -1,15 +0,0 @@ -o sub - -M73 -G90 -o100 if [#5422 LT 0] - G0 Z0 - G0 X0 Y0 -o100 else if [#5422 GE 0] - G0 X0 Y0 - G0 Z0 -o100 endif - -o endsub - -M2 diff --git a/linuxcnc/configs/probe_basic/subroutines/load_spindle_safety.ngc b/linuxcnc/configs/probe_basic/subroutines/load_spindle_safety.ngc deleted file mode 100644 index 7d8ce49d..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/load_spindle_safety.ngc +++ /dev/null @@ -1,60 +0,0 @@ -(author: Chris P, LWK) -(version: 0.4) -(date: 11/11/23) - -(load tool in spindle safety macro) -; This is called form the ATC page -; Parameter #3991 is used to track the current tool loaded it in the spindle (persistently) -; Parameters #4001 to #4024 are used to track which tool is in which pocket (persistently) -; Parameter #4000 is not populated just used in the maths to calculate the above numbers -; #: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets> - -o sub -(PRINT, o) - -# = #1 ; this is the value form the ATC tab -# = #2 -# = #3 -# = #4 -# = #5 -# = #6 - -; default to a 12 pocket ATC (matching DynATC Widget behaviour), then update based on INI settings -# = 12 -o101 if [EXISTS[#<_ini[atc]pockets>]] - # = #<_ini[atc]pockets> -o101 endif - -#10 = 0 -#11 = 0 ; 1 if tool is already stored in carousel - -o110 while [#10 LT #] - #10 = [#10+1] - o120 if [# EQ #[4000 + #10]] - (DEBUG, the tool you are trying to load is already stored in carousel pocket %d#10) - #11 = 1 - o120 endif -o110 endwhile - -o130 if [#11 EQ 0] - M61 Q# G43 H# - #3991 = # -o130 endif - -o140 if [# EQ #] - S0 M5 -o140 endif - -# = #5403 - -(run program_coolant sub if selected to be active in settings page with value 1) -o150 if [# EQ 1] - (run program_coolant.ngc) - o call [#][#][#][#] -o150 else - o return -o150 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/load_spindle_safety_2.ngc b/linuxcnc/configs/probe_basic/subroutines/load_spindle_safety_2.ngc deleted file mode 100644 index 185bc388..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/load_spindle_safety_2.ngc +++ /dev/null @@ -1,60 +0,0 @@ -(author: Chris P, LWK) -(version: 0.4) -(date: 11/11/23) - -(load tool in spindle safety macro) -; This is called form the Tool page -; Parameter #3991 is used to track the current tool loaded it in the spindle (persistently) -; Parameters #4001 to #4024 are used to track which tool is in which pocket (persistently) -; Parameter #4000 is not populated just used in the maths to calculate the above numbers -; #: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets> - -o sub -(PRINT, o) - -# = #1 ; this is the value form the TOOL tab -# = #2 -# = #3 -# = #4 -# = #5 -# = #6 - -; default to a 12 pocket ATC (mtoolhing DynATC Widget behaviour), then update based on INI settings -# = 12 -o101 if [EXISTS[#<_ini[atc]pockets>]] - # = #<_ini[atc]pockets> -o101 endif - -#10 = 0 -#11 = 0 ; 1 if tool is already stored in carousel - -o110 while [#10 LT #] - #10 = [#10+1] - o120 if [# EQ #[4000 + #10]] - (DEBUG, the tool you are trying to load is already stored in carousel pocket %d#10) - #11 = 1 - o120 endif -o110 endwhile - -o130 if [#11 EQ 0] - M61 Q# G43 H# - #3991 = # -o130 endif - -o140 if [# EQ #] - S0 M5 -o140 endif - -# = #5403 - -(run program_coolant sub if selected to be active in settings page with value 1) -o150 if [# EQ 1] - (run program_coolant.ngc) - o call [#][#][#][#] -o150 else - o return -o150 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/m10.ngc b/linuxcnc/configs/probe_basic/subroutines/m10.ngc deleted file mode 100644 index 2562672e..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/m10.ngc +++ /dev/null @@ -1,37 +0,0 @@ -o sub - -; Move tool carousel best direction to pocket P -; Parameter #3989 is used to track if the carousel is homed (M13) (volatile) -; Parameter #3990 is used to track the current tool pocket (persistently) -; #: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets> -(PRINT, o P#

) - -o100 if [#3989 NE 1] - M13 -o100 endif - -; default to a 12 pocket ATC (matching DynATC Widget behaviour), then update based on INI settings -# = 12 -o101 if [EXISTS[#<_ini[atc]pockets>]] - # = #<_ini[atc]pockets> -o101 endif - -# = [#3990 - #

] -(PRINT, o P#

, steps=#) -o110 if [# GT [# / 2]] - #=[# - #] -o110 endif -o120 if [# LT -[# / 2]] - #=[# + #] -o120 endif -o130 if [# GT 0] - M12 P[#] -o130 elseif [# LT 0] - #=[# * -1] - M11 P[#] -o130 endif - -(PRINT, o endsub) -o endsub [1] - -M2 diff --git a/linuxcnc/configs/probe_basic/subroutines/m11.ngc b/linuxcnc/configs/probe_basic/subroutines/m11.ngc deleted file mode 100644 index 3db74563..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/m11.ngc +++ /dev/null @@ -1,50 +0,0 @@ -o sub - -; Move tool carousel CCW Parameter P number of steps -; Without parameter one step CCW. -; Parameter #3989 is used to track if the carousel is homed (M13) (volatile) -; Parameter #3990 is used to track the current tool pocket (persistently) -; #: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets> -(PRINT, o P#

) - -o100 if [#3989 NE 1] - (PRINT, atc not homed, homing) - M13 -o100 endif - -; default to a 12 pocket ATC (matching DynATC Widget behaviour), then update based on INI settings -# = 12 -o101 if [EXISTS[#<_ini[atc]pockets>]] - # = #<_ini[atc]pockets> -o101 endif - -o110 if [EXISTS[#

]] - # = #

-o110 else - # = 1 - (tells the atc widget move 1 step reverse) -o110 endif - -(tells the atc widget how many steps to move and start moving reverse) -(DEBUG, EVAL[vcp.getWidget{"dynatc"}.rotate{#, "cw"}]) - -M64 P4 ; Move atc motor Rev - -o120 do - M66 P4 L1 Q3 ; wait for rising edge on rotation index - o130 if [#5399 LT 0] - M65 P4 ; Stop atc motor - (abort, Failed to get rotation index) - o130 endif - #3990 = [[[#3990+2] MOD #]-1] ; Pocket is no.1-# - # = [#-1] -o120 while [# GT 0] - -M65 P4 ; Stop motor - -#<_my_current_pocket> = #3990 - -(PRINT, o endsub) -o endsub [1] - -M2 diff --git a/linuxcnc/configs/probe_basic/subroutines/m12.ngc b/linuxcnc/configs/probe_basic/subroutines/m12.ngc deleted file mode 100644 index 34f2d6f3..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/m12.ngc +++ /dev/null @@ -1,50 +0,0 @@ -o sub - -; Move tool carousel CW Parameter P number of steps -; Without parameter one step CW. -; Parameter #3989 is used to track if the carousel is homed (M13) (volatile) -; Parameter #3990 is used to track the current tool pocket (persistently) -; #: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets> -(PRINT, o P#

) - -o100 if [#3989 NE 1] - (PRINT, atc not homed, homing) - M13 -o100 endif - -; default to a 12 pocket ATC (matching DynATC Widget behaviour), then update based on INI settings -# = 12 -o101 if [EXISTS[#<_ini[atc]pockets>]] - # = #<_ini[atc]pockets> -o101 endif - -o110 if [EXISTS[#

]] - # = #

-o110 else - #=1 - (tells the atc widget move 1 step forward) -o110 endif - -(tells the atc widget how many steps to move and start moving forward) -(DEBUG, EVAL[vcp.getWidget{"dynatc"}.rotate{#, "ccw"}]) - -M64 P3 ; Move atc motor FWD - -o120 do - M66 P4 L1 Q3 ; wait for rising edge on rotation index - o130 if [#5399 LT 0] - M65 P3 ; Stop atc motor - (abort, Failed to get rotation index) - o130 endif - #3990 = [[[#3990-2] MOD #]+1] ; Pocket is no.1-# - # = [#-1] -o120 while [# GT 0] - -M65 P3 ; Stop motor - -#<_my_current_pocket> = #3990 - -(PRINT, o endsub) -o endsub [1] - -M2 diff --git a/linuxcnc/configs/probe_basic/subroutines/m13.ngc b/linuxcnc/configs/probe_basic/subroutines/m13.ngc deleted file mode 100644 index ede03334..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/m13.ngc +++ /dev/null @@ -1,42 +0,0 @@ -o sub - -; Move tool carousel CW until ATC zero -; Parameter #3989 is used to track if the carousel is homed (M13) (volatile) -; Parameter #3990 is used to track the current tool pocket (persistently) -; #: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets> -(PRINT, o) - -(DEBUG, EVAL[vcp.getWidget{"dynatc"}.atc_message{"REFERENCING"}]) - -M64 P3 ; Move Motor FWD -M66 P3 L1 Q20 ; wait for rising edge on home index -o100 if [#5399 LT 0] - M65 P3 ; stop motor - (abort, Failed to home carousel) -o100 endif - -#3990 = 1 -M65 P3 ; Stop motor -#3989 = 1 - -(DEBUG, EVAL[vcp.getWidget{"dynatc"}.atc_message{}]) - -# = 12 -o110 if [EXISTS[#<_ini[atc]pockets>]] - # = #<_ini[atc]pockets> -o110 endif - -#1 = 0 - -o120 while [#1 LT #] - #1 = [#1+1] - #2 = #[4000+#1] - (DEBUG, EVAL[vcp.getWidget{"dynatc"}.store_tool{#1, #2}]) -o120 endwhile - -M61 Q#3991 G43 H#3991 #5210 = 0 - -(PRINT, o endsub) -o endsub [1] - -M2 diff --git a/linuxcnc/configs/probe_basic/subroutines/m21.ngc b/linuxcnc/configs/probe_basic/subroutines/m21.ngc deleted file mode 100644 index 72481562..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/m21.ngc +++ /dev/null @@ -1,45 +0,0 @@ -o sub - -; Move Carousel to the tool change position - OUT -; then unload any tool in the spindle into the current pocket -; Parameter #3991 is used to track the current tool loaded it in the spindle (persistently) -; # is the height you spindle needs to be at to clamp/unclamp a tool form the ATC (Set via INI [ATC]Z_TOOL_CHANGE_HEIGHT) -; # is the clearance height you spindle needs to be at to safely clear the ATC (Set via INI [ATC]Z_TOOL_CLEARANCE_HEIGHT) -(PRINT, o) - -# = -3.1900 -o101 if [EXISTS[#<_ini[atc]z_tool_change_height>]] - # = #<_ini[atc]z_tool_change_height> -o101 endif -# = [#<_ini[AXIS_Z]MAX_LIMIT>-0.1] -o102 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]] - # = #<_ini[atc]z_tool_clearance_height> -o102 endif - -M65 P1 ; switch off carousel in solenoid -M66 P1 L3 Q1 - -M5 M9 -G90 -G0 G53 Z# ; rapid move to above the tool change height - -;M19 R0 Q3 ; orient spindle - -M64 P0 ; Move Carousel out -M66 P1 L3 Q5 ; check for carousel out sensor -o100 if [#5399 LT 0] - M65 P0 ; switch off atc out solenoid - (abort, ATC not in position) -o100 endif - -M24 ; activate drawbar, release the tool -M5 ; turn off spindle lock - -G0 G53 Z# ; move z to clear height - -#3991 = 0; save fact there is now no tool in the spindle - -(PRINT, o endsub) -o endsub [1] - -M2 diff --git a/linuxcnc/configs/probe_basic/subroutines/m22.ngc b/linuxcnc/configs/probe_basic/subroutines/m22.ngc deleted file mode 100644 index 2de79912..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/m22.ngc +++ /dev/null @@ -1,42 +0,0 @@ -o sub - -; Move Carousel to the home position - IN -; after loading any tool in the current pocket to the spindle -; # is the height you spindle needs to be at to clamp/unclamp a tool form the ATC (Set via INI [ATC]Z_TOOL_CHANGE_HEIGHT) -; # is the clearance height you spindle needs to be at to safely clear the ATC (Set via INI [ATC]Z_TOOL_CLEARANCE_HEIGHT) -(PRINT, o) - -# = -3.1900 -o101 if [EXISTS[#<_ini[atc]z_tool_change_height>]] - # = #<_ini[atc]z_tool_change_height> -o101 endif -# = [#<_ini[AXIS_Z]MAX_LIMIT>-0.1] -o102 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]] - # = #<_ini[atc]z_tool_clearance_height> -o102 endif - -;M19 R0 Q2 -M24 -;M19 R0 Q1 -;G90 -G0 G53 Z# ; rapid move to above the tool change height -M65 P2 ; release the drawbar to clamp the tool -M5 -M66 P5 L3 Q1 ; check the tool clamped sensor -o100 if [#5399 LT 0] - (abort, Failed to reclamp tool) -o100 endif - -M65 P0 ; Move Carousel home -M66 P0 L3 Q4 ; check carousel in position sensor -o110 if [#5399 LT 0] - M65 P1 ; turn off the solenoid to send atc home - (abort, Failed to send carousel home) ; abort if the sensor does not activate in 5 seconds -o110 endif - -;M65 P1 - -(PRINT, o endsub) -o endsub [1] - -M2 diff --git a/linuxcnc/configs/probe_basic/subroutines/m23.ngc b/linuxcnc/configs/probe_basic/subroutines/m23.ngc deleted file mode 100644 index e69de29b..00000000 diff --git a/linuxcnc/configs/probe_basic/subroutines/m24.ngc b/linuxcnc/configs/probe_basic/subroutines/m24.ngc deleted file mode 100644 index 37454968..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/m24.ngc +++ /dev/null @@ -1,14 +0,0 @@ -o sub -(PRINT, o) - -M64 P2 ; unclamp the tool -M66 P2 L3 Q2 ; check the unclamped tool sensor -o100 if [#5399 LT 0] - M65 P2 ; turn off the drawbar - (abort, failed to release tool) ; abort if the sensor does not activate in 3 seconds -o100 endif - -(PRINT, o endsub) -o endsub [1] - -M2 diff --git a/linuxcnc/configs/probe_basic/subroutines/m25.ngc b/linuxcnc/configs/probe_basic/subroutines/m25.ngc deleted file mode 100644 index a1a7ac98..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/m25.ngc +++ /dev/null @@ -1,15 +0,0 @@ -o sub -(PRINT, o) - -M64 P0 ; Move Carousel out - -M66 P1 L3 Q5 ; check for carousel out sensor -o100 if [#5399 LT 0] - M65 P0 ; switch off atc out solenoid - (abort, ATC not in position) -o100 endif - -(PRINT, o endsub) -o endsub [1] - -M2 diff --git a/linuxcnc/configs/probe_basic/subroutines/m26.ngc b/linuxcnc/configs/probe_basic/subroutines/m26.ngc deleted file mode 100644 index e69de29b..00000000 diff --git a/linuxcnc/configs/probe_basic/subroutines/m6_tool_call_atc_page.ngc b/linuxcnc/configs/probe_basic/subroutines/m6_tool_call_atc_page.ngc deleted file mode 100644 index 6481e34d..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/m6_tool_call_atc_page.ngc +++ /dev/null @@ -1,37 +0,0 @@ -(author: Chris P) -(version: 0.2) -(date: 07/18/22) - -(m6 tool call with g43 offset applied) - -o sub - -# = #1 -# = #2 -# = #3 -# = #4 -# = #5 -# = #6 - -T# M6 -o100 if [1 EQ 1] - G43 H# -o100 endif - -o110 if [# EQ #] - S0 M5 -o110 endif - -# = #5403 - -(run program_coolant sub if selected to be active in settings page with value 1) -o120 if [# EQ 1] - (run program_coolant.ngc) - o call [#][#][#][#] -o120 else - o return -o120 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/m6_tool_call_main_panel.ngc b/linuxcnc/configs/probe_basic/subroutines/m6_tool_call_main_panel.ngc deleted file mode 100644 index 901c5649..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/m6_tool_call_main_panel.ngc +++ /dev/null @@ -1,38 +0,0 @@ -(author: Chris P) -(version: 0.3) -(date: 07/22/22) - -(m6 tool call with g43 offset applied) - -o sub - -# = #1 -# = #2 -# = #3 -# = #4 -# = #5 -# = #6 - -T# M6 - -o100 if [1 EQ 1] - G43 H# -o100 endif - -o110 if [# EQ #] - S0 M5 -o110 endif - -# = #5403 - -(run program_coolant sub if selected to be active in settings page with value 1) -o120 if [# EQ 1] - (run program_coolant.ngc) - o call [#][#][#][#] -o120 else - o return -o120 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/m6_tool_call_tool_page.ngc b/linuxcnc/configs/probe_basic/subroutines/m6_tool_call_tool_page.ngc deleted file mode 100644 index fb93fa42..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/m6_tool_call_tool_page.ngc +++ /dev/null @@ -1,38 +0,0 @@ -(author: Chris P) -(version: 0.3) -(date: 07/18/22) - -(m6 tool call with g43 offset applied) - -o sub - -# = #1 -# = #2 -# = #3 -# = #4 -# = #5 -# = #6 - -T# M6 - -o100 if [1 EQ 1] - G43 H# -o100 endif - -o110 if [# EQ #] - S0 M5 -o110 endif - -# = #5403 - -(run program_coolant sub if selected to be active in settings page with value 1) -o120 if [# EQ 1] - (run program_coolant.ngc) - o call [#][#][#][#] -o120 else - o return -o120 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/move_head_above_carousel.ngc b/linuxcnc/configs/probe_basic/subroutines/move_head_above_carousel.ngc deleted file mode 100644 index 5c2fd1cd..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/move_head_above_carousel.ngc +++ /dev/null @@ -1,19 +0,0 @@ -o sub - -; # is the height you spindle needs to be at to clamp/unclamp a tool form the ATC (Set via INI [ATC]Z_TOOL_CHANGE_HEIGHT) -; # is the clearance height you spindle needs to be at to safely clear the ATC (Set via INI [ATC]Z_TOOL_CLEARANCE_HEIGHT) - -# = -3.1900 -o101 if [EXISTS[#<_ini[atc]z_tool_change_height>]] - # = #<_ini[atc]z_tool_change_height> -o101 endif -# = [#<_ini[AXIS_Z]MAX_LIMIT>-0.1] -o102 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]] - # = #<_ini[atc]z_tool_clearance_height> -o102 endif - -G0 G53 Z# ; move z to clear height - -o endsub [1] - -M2 diff --git a/linuxcnc/configs/probe_basic/subroutines/move_tool_to_carousel_height.ngc b/linuxcnc/configs/probe_basic/subroutines/move_tool_to_carousel_height.ngc deleted file mode 100644 index c07eb35b..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/move_tool_to_carousel_height.ngc +++ /dev/null @@ -1,18 +0,0 @@ -o sub -; # is the height you spindle needs to be at to clamp/unclamp a tool form the ATC (Set via INI [ATC]Z_TOOL_CHANGE_HEIGHT) -; # is the clearance height you spindle needs to be at to safely clear the ATC (Set via INI [ATC]Z_TOOL_CLEARANCE_HEIGHT) - -# = -3.1900 -o101 if [EXISTS[#<_ini[atc]z_tool_change_height>]] - # = #<_ini[atc]z_tool_change_height> -o101 endif -# = [#<_ini[AXIS_Z]MAX_LIMIT>-0.1] -o102 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]] - # = #<_ini[atc]z_tool_clearance_height> -o102 endif - -G0 G53 Z# ; rapid move to above the tool change height - -o endsub [1] - -M2 diff --git a/linuxcnc/configs/probe_basic/subroutines/on_abort.ngc b/linuxcnc/configs/probe_basic/subroutines/on_abort.ngc deleted file mode 100644 index da9f6901..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/on_abort.ngc +++ /dev/null @@ -1,9 +0,0 @@ -% -o sub - -G90 -G40 -G49 - -o endsub -% diff --git a/linuxcnc/configs/probe_basic/subroutines/orientspindle.ngc b/linuxcnc/configs/probe_basic/subroutines/orientspindle.ngc deleted file mode 100644 index 1776e944..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/orientspindle.ngc +++ /dev/null @@ -1,11 +0,0 @@ -o sub -; Orient the spindle with platter -(PRINT, o) - -M5 M9 ; stop all spindle motion and coolant -M19 R0 Q4 ; orient spindle -M5 ; turn off spindle lock - -o endsub [1] - -M2 diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_back_left_inside_corner.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_back_left_inside_corner.ngc deleted file mode 100644 index efb82dcd..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_back_left_inside_corner.ngc +++ /dev/null @@ -1,118 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/25/19) - -(Probe back left inside corner for x,y,z 0,0,0 position) -(Start probe position is over back left inside corner of stock) -(inside the step off width square and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Traverse Workpiece Top at Z Clearance Height plane) - G91 - F[#] - G38.3 X[#] Y-[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - G90 - (Current X Position including offsets in current program units) - # = #5420 - - (Call sub "probe_x_minus_sub" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (move to X start Position) - G90 - F[#] - G38.3 X[#] - - (Current Y Position including offsets in current program units) - # = #5421 - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o120 endif - - (move to Y start Position) - G90 - F[#] - G38.3 Y[#] - - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] - G10 L2 P#5220 Y[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_back_left_top_corner.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_back_left_top_corner.ngc deleted file mode 100644 index 305b1302..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_back_left_top_corner.ngc +++ /dev/null @@ -1,114 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/25/19) - -(Probe back left top corner for x,y,z 0,0,0 position) -(Start probe position is over back left corner of stock) -(inside the step off width square and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X-[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (Probe Y Positioning Move, up to Z clearance plane) - G91 - F[#] - G38.3 Z[#] - - (Probe Y Positioning Move, Traverse Workpiece at Z Clearance plane) - F[#] - G38.3 X[#] Y[#] - - (Probe Y Positioning Move,to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o120 endif - - (Probe Completion Move to Z Clearance Plane, and XY Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] - G10 L2 P#5220 Y[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_back_right_inside_corner.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_back_right_inside_corner.ngc deleted file mode 100644 index 6cbe538c..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_back_right_inside_corner.ngc +++ /dev/null @@ -1,118 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/25/19) - -(Probe back right inside corner for x,y,z 0,0,0 position) -(Start probe position is over back right inside corner of stock) -(inside the step off width square and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width X and Y) - G91 - F[#] - G38.3 X-[#] Y-[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - G90 - (Current X Position including offsets in current program units) - # = #5420 - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (move to X start Position) - G90 - F[#] - G38.3 X[#] - - (Current Y Position including offsets in current program units) - # = #5421 - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o120 endif - - (move to Y start Position) - G90 - F[#] - G38.3 Y[#] - - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] - G10 L2 P#5220 Y[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_back_right_top_corner.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_back_right_top_corner.ngc deleted file mode 100644 index fd30605d..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_back_right_top_corner.ngc +++ /dev/null @@ -1,113 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/23/19) - -(Probe back right top corner for x,y,z 0,0,0 position) -(Start probe position is over back right corner of stock) -(inside the step off width square and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (Probe Y Positioning Move, up to Z clearance plane) - G91 - F[#] - G38.3 Z[#] - (Probe Y Positioning Move) - F[#] - G38.3 X-[#] Y[#] - - (Probe Y Positioning Move,to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o120 endif - - (Probe Completion Move to Z Clearance Plane, and XY Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] - G10 L2 P#5220 Y[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_back_top_side.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_back_top_side.ngc deleted file mode 100644 index 46e705be..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_back_top_side.ngc +++ /dev/null @@ -1,88 +0,0 @@ -(author: Chris P) -(version: 0.3) -(date: 04/25/19) - -(Probe back top side for y,z 0,0 position) -(Start probe position is over back edge of stock) -(inside the step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe Y Positioning Move, Step Off Width) - G91 - F[#] - G38.3 Y[#] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o110 endif - - (Probe Completion Move to Z Clearance Plane, and Y Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 Y[#] - - (probe mode rules for WCO or probe position measuring only) - o120 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 Y[# + #] - o return - o120 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_cal_reset.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_cal_reset.ngc deleted file mode 100644 index 866e8ef1..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_cal_reset.ngc +++ /dev/null @@ -1,8 +0,0 @@ -o sub - - #1000 = 0 - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_cal_round_boss.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_cal_round_boss.ngc deleted file mode 100644 index e9dcbd00..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_cal_round_boss.ngc +++ /dev/null @@ -1,325 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 05/8/19) - -(Probe calibration offset using defined diam round boss) -(Start probe position is over center of stock in X and Y axis) -(within max z distance, ensure all settings have been) -(set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=1.0000) - # = #17 (=0) - # = #18 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - # = #[5203 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [#] - - (remove probe tip diam and cal offset from probed width calculations) - # = [#] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, X hint/2 + Step Off Width) - G91 - F[#] - G38.3 X-[#/2 + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in X, X Hint + Step Off Width at Rapid Speed) - G91 - F[#] - G38.3 X[# + # + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (probed center calulation) - # = [[# + #] / 2] - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] - - (Probe Y Positioning Move, Y hint/2 + Step Off Width) - G91 - F[#] - G38.3 Y-[#/2 + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed) - G91 - F[#] - G38.3 Y[# + # + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (probed center calulation) - # = [[# + #] / 2] - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - (Move to z clearance plane) - G91 - F[#] - G38.3 Z[#] - - (Move to Y Center) - G90 - F[#] - G38.3 Y[#] - - (Probe X Positioning Move, X hint/2 + Step Off Width) - G91 - F[#] - G38.3 X-[#/2 + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in X, X Hint + Step Off Width at Rapid Speed) - F[#] - G38.3 X[# + # + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (probed center calulation) - # = [[# + #] / 2] - - (calculate X Width Probed) - o110 if [# GT #] - # = [# - #] - o110 else - # = [# - #] - o110 endif - - (Completed probed width calculations) - # = [# - #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] - - (Probe Y Positioning Move, Y hint/2 + Step Off Width) - G91 - F[#] - G38.3 Y-[#/2 + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed) - F[#] - G38.3 Y[# + # + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (probed center calulation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - o120 if [# GT #] - # = [# - #] - o120 else - # = [# - #] - o return - o120 endif - - (Completed probed width calculations) - # = [# - #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - # = [[# + #] / 2] - - #1010 = # - (DEBUG, EVAL[vcp.getWidget{"averaged_diam"}.setValue{#1010}]) - - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - o130 if [# GT #] - (calculate calibration error and adjust calibration offset) - # = [[# - #] / 2] - # = [#] - o130 else - # = [[# - #] / 2] - # = [#] - o130 endif - - o140 if [# GT #] - (calculate calibration error and adjust calibration offset) - # = [[# - #] / 2] - # = [#] - o140 else - # = [[# - #] / 2] - # = [#] - o140 endif - - # = [[# + #] / 2] - - o150 if [# EQ 0] - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o150 else if [# EQ 1] - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o150 else - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o150 endif - - # = [# + #] - - # = [# + #] - - (probe mode rules for WCO or probe position measuring only) - o160 if [# EQ 0] - (Record XY Zero in selected WCO) - G10 L2 P#5220 X[#] Y[#] - o return - o160 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_cal_round_pocket.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_cal_round_pocket.ngc deleted file mode 100644 index fb372418..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_cal_round_pocket.ngc +++ /dev/null @@ -1,218 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 05/8/19) - -(Probe calibration offset using defined diam round pocket) -(Start probe position is over left side edge of pocket wall) -(inside the step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=1.0000) - # = #17 (=0) - # = #18 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (remove probe tip diam and cal offset from probed width calculations) - # = [#] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x-) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - (Probe Completion Move to Z Clearance Plane, and X Zero) - G90 - F[#] - G38.3 X[#] - - (Call sub "probe_y_plus" to Probe Y+) - o call [#1][#3 + #13 / 2][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus" to Probe Y-) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - (Probe Completion Move to Z Clearance Plane, Y Zero) - G90 - F[#] - G38.3 Y[#] - - (Call sub "probe_x_minus" to Probe x-) - o call [#1][#3 + #13 / 2][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - G90 - F[#] - G38.3 X[#] - - (Call sub "probe_y_plus" to Probe Y+) - o call [#1][#3 + #13 / 2][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus" to Probe Y-) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed diameter calculations) - # = [# + #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - # = [[# + #] / 2] - - #1010 = # - (DEBUG, EVAL[vcp.getWidget{"averaged_diam"}.setValue{#1010}]) - - G90 - F[#] - G38.3 Y[#] - G91 - F[#] - G38.3 Z[#] - - o110 if [# GT #] - (calculate calibration error and adjust calibration offset) - # = [[# - #] / 2] - # = [#] - o110 else - # = [[# - #] / 2] - # = [#] - o110 endif - - o120 if [# GT #] - (calculate calibration error and adjust calibration offset) - # = [[# - #] / 2] - # = [#] - o120 else - # = [[# - #] / 2] - # = [#] - o120 endif - - # = [[# + #] / 2] - - o130 if [# EQ 0] - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o130 else if [# EQ 1] - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o130 else - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o130 endif - - # = [# + #] - - # = [# + #] - - (probe mode rules for WCO or probe position measuring only) - o140 if [# EQ 0] - (Record Y Zero in selected WCO) - G10 L2 P#5220 X[#] Y[#] - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - o return - o140 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_cal_square_boss.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_cal_square_boss.ngc deleted file mode 100644 index 60c51131..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_cal_square_boss.ngc +++ /dev/null @@ -1,220 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 05/8/19) - -(Probe calibration offset using defined width square boss) -(Start probe position is over center of stock in X and Y axis) -(within max z distance, ensure all settings have been) -(set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=0) - # = #17 (=0) - # = #18 (=0) - # = #19 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - # = #[5203 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [#] - - (remove probe tip diam and cal offset from probed width calculations) - # = [#] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, X hint/2 + Step Off Width) - G91 - F[#] - G38.3 X-[#/2 + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in X, X Hint + Step Off Width at Rapid Speed) - G91 - F[#] - G38.3 X[# + # + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (probed center calulation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# - #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] - - (Probe Y Positioning Move, Y hint/2 + Step Off Width) - G91 - F[#] - G38.3 Y-[#/2 + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed) - G91 - F[#] - G38.3 Y[# + # + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (probed center calulation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# - #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - o110 if [# GT #] - (calculate calibration error and adjust calibration offset) - # = [[# - #] / 2] - # = [#] - o110 else - # = [[# - #] / 2] - # = [#] - o110 endif - - o120 if [# GT #] - (calculate calibration error and adjust calibration offset) - # = [[# - #] / 2] - # = [#] - o120 else - # = [[# - #] / 2] - # = [#] - o120 endif - - # = [[# + #] / 2] - - o130 if [# EQ 0] - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o130 else if [# EQ 1] - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o130 else - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o130 endif - - # = [# + #] - - # = [# + #] - - (probe mode rules for WCO or probe position measuring only) - o140 if [# EQ 0] - (Record XY Zero in selected WCO) - G10 L2 P#5220 X[#] Y[#] - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - o return - o140 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_cal_square_pocket.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_cal_square_pocket.ngc deleted file mode 100644 index d6834bc5..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_cal_square_pocket.ngc +++ /dev/null @@ -1,172 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 05/8/19) - -(Probe calibration offset using defined width square pocket) -(Start probe position is over left side edge of pocket wall) -(inside the step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=1.0000) - # = #17 (=1.0000) - # = #18 (=0) - # = #19 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (remove probe tip diam and cal offset from probed width calculations) - # = [#] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3 + #11][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - G90 - F[#] - G38.3 X[#] - - (Call sub "probe_y_plus" to Probe Y+ side of Workpiece) - o call [#1][#3 + #12 / 2][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus" to Probe Y- side of Workpiece) - o call [#1][#3 + #12][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - G90 - F[#] - G38.3 Y[#] - G91 - F[#] - G38.3 Z[#] - - o110 if [# GT #] - (calculate calibration error and adjust calibration offset) - # = [[# - #] / 2] - # = [#] - o110 else - # = [[# - #] / 2] - # = [#] - o110 endif - - o120 if [# GT #] - (calculate calibration error and adjust calibration offset) - # = [[# - #] / 2] - # = [#] - o120 else - # = [[# - #] / 2] - # = [#] - o120 endif - - # = [[# + #] / 2] - - o130 if [# EQ 0] - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o130 else if [# EQ 1] - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o130 else - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o130 endif - - # = [# + #] - - # = [# + #] - - (probe mode rules for WCO or probe position measuring only) - o140 if [# EQ 0] - (Record X Zero in selected WCO) - G10 L2 P#5220 X[#] Y[#] - o return - o140 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_corner_x_minus_edge_angle.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_corner_x_minus_edge_angle.ngc deleted file mode 100644 index fbc334f5..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_corner_x_minus_edge_angle.ngc +++ /dev/null @@ -1,165 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 05/7/19) - -(Probe Corner X minus Edge Angle for x,y,z 0,0,0 position) -(Start probe position is over front right corner of stock) -(inside the step off width square and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=0) - # = #17 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - # = #5420 - - # = #5421 - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 y-[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - # = #5420 - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o110 endif - - (Probe Y Positioning Move, up to Z clearance plane) - G91 - F[#] - G38.3 Z[#] - - (Probe Y Positioning Move, Traverse Workpiece at Z Clearance plane) - F[#] - G38.3 X[#] Y[#] - - (Probe Y Positioning Move,to Probing Depth) - F[#] - G38.3 Z-[#] - - # = #5421 - - (Call sub "probe_x_minus" to Probe X- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o120 endif - - (edge width move to edge second probing point) - G91 - F[#] - G38.3 Y[#] - - # = #5421 - - (Call sub "probe_x_minus" to Probe X- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o130 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o130 endif - - # = [# - #] - - # = [ATAN [#] / [#]] - - #1011 = # - (DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}]) - - #1012 = # - (DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}]) - - # = [# + [# - #] * COS[-#] - [# - #] * SIN[-#]] - - # = [# + [# - #] * SIN[-#] + [# - #] * COS[-#]] - - # = [# + [# - #] * COS[#] - [# - #] * SIN[#]] - - # = [# + [# - #] * SIN[#] + [# - #] * COS[#]] - - (Probe Completion Move to Z Clearance Plane, and XY Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO,Rotation and probe position measuring only) - o140 if [# EQ 0 AND # EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] Y[# + #] - o return - o140 endif - - (probe mode rules for WCO,Rotation and probe position measuring only) - o150 if [# EQ 0 AND # EQ 1] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] Y[# + #] R[#] - o return - o150 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_corner_x_plus_edge_angle.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_corner_x_plus_edge_angle.ngc deleted file mode 100644 index ee33cacc..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_corner_x_plus_edge_angle.ngc +++ /dev/null @@ -1,165 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 05/7/19) - -(Probe Corner X plus Edge Angle for x,y,z 0,0,0 position) -(Start probe position is over back left corner of stock) -(inside the step off width square and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=0) - # = #17 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - # = #5420 - - # = #5421 - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 y[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - # = #5420 - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o110 endif - - (Probe Y Positioning Move, up to Z clearance plane) - G91 - F[#] - G38.3 Z[#] - - (Probe Y Positioning Move, Traverse Workpiece at Z Clearance plane) - F[#] - G38.3 X-[#] Y-[#] - - (Probe Y Positioning Move,to Probing Depth) - F[#] - G38.3 Z-[#] - - # = #5421 - - (Call sub "probe_x_plus" to Probe X+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o120 endif - - (edge width move to edge second probing point) - G91 - F[#] - G38.3 Y-[#] - - # = #5421 - - (Call sub "probe_x_plus" to Probe X+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o130 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o130 endif - - # = [# - #] - - # = [ATAN [#] / [#]] - - #1011 = # - (DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}]) - - #1012 = # - (DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}]) - - # = [# + [# - #] * COS[-#] - [# - #] * SIN[-#]] - - # = [# + [# - #] * SIN[-#] + [# - #] * COS[-#]] - - # = [# + [# - #] * COS[#] - [# - #] * SIN[#]] - - # = [# + [# - #] * SIN[#] + [# - #] * COS[#]] - - (Probe Completion Move to Z Clearance Plane, and XY Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO,Rotation and probe position measuring only) - o140 if [# EQ 0 AND # EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] Y[# + #] - o return - o140 endif - - (probe mode rules for WCO,Rotation and probe position measuring only) - o150 if [# EQ 0 AND # EQ 1] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] Y[# + #] R[#] - o return - o150 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_corner_y_minus_edge_angle.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_corner_y_minus_edge_angle.ngc deleted file mode 100644 index 74d08f26..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_corner_y_minus_edge_angle.ngc +++ /dev/null @@ -1,165 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 05/7/19) - -(Probe Corner Y minus Edge Angle for x,y,z 0,0,0 position) -(Start probe position is over back right corner of stock) -(inside the step off width square and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=0) - # = #17 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - # = #5420 - - # = #5421 - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - # = #5421 - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (Probe Y Positioning Move, up to Z clearance plane) - G91 - F[#] - G38.3 Z[#] - - (Probe Y Positioning Move, Traverse Workpiece at Z Clearance plane) - F[#] - G38.3 X-[#] Y[#] - - (Probe Y Positioning Move,to Probing Depth) - F[#] - G38.3 Z-[#] - - # = #5420 - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o120 endif - - (edge width move to edge second probing point) - G91 - F[#] - G38.3 X-[#] - - # = #5420 - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o130 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o130 endif - - # = [# - #] - - # = [ATAN [#] / [#]] - - #1011 = # - (DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}]) - - #1012 = # - (DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}]) - - # = [# + [# - #] * COS[-#] - [# - #] * SIN[-#]] - - # = [# + [# - #] * SIN[-#] + [# - #] * COS[-#]] - - # = [# + [# - #] * COS[#] - [# - #] * SIN[#]] - - # = [# + [# - #] * SIN[#] + [# - #] * COS[#]] - - (Probe Completion Move to Z Clearance Plane, and XY Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO,Rotation and probe position measuring only) - o140 if [# EQ 0 AND # EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] Y[# + #] - o return - o140 endif - - (probe mode rules for WCO,Rotation and probe position measuring only) - o150 if [# EQ 0 AND # EQ 1] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] Y[# + #] R[#] - o return - o150 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_corner_y_plus_edge_angle.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_corner_y_plus_edge_angle.ngc deleted file mode 100644 index ff0c05a9..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_corner_y_plus_edge_angle.ngc +++ /dev/null @@ -1,165 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 05/7/19) - -(Probe Corner Y Plus Edge Angle for x,y,z 0,0,0 position) -(Start probe position is over front left corner of stock) -(inside the step off width square and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=0) - # = #17 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - # = #5420 - - # = #5421 - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X-[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - # = #5421 - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (Probe Y Positioning Move, up to Z clearance plane) - G91 - F[#] - G38.3 Z[#] - - (Probe Y Positioning Move, Traverse Workpiece at Z Clearance plane) - F[#] - G38.3 X[#] Y-[#] - - (Probe Y Positioning Move,to Probing Depth) - F[#] - G38.3 Z-[#] - - # = #5420 - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o120 endif - - (edge width move to edge second probing point) - G91 - F[#] - G38.3 X[#] - - # = #5420 - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o130 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o130 endif - - # = [# - #] - - # = [ATAN [#] / [#]] - - #1011 = # - (DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}]) - - #1012 = # - (DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}]) - - # = [# + [# - #] * COS[-#] - [# - #] * SIN[-#]] - - # = [# + [# - #] * SIN[-#] + [# - #] * COS[-#]] - - # = [# + [# - #] * COS[#] - [# - #] * SIN[#]] - - # = [# + [# - #] * SIN[#] + [# - #] * COS[#]] - - (Probe Completion Move to Z Clearance Plane, and XY Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO,Rotation and probe position measuring only) - o140 if [# EQ 0 AND # EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] Y[# + #] - o return - o140 endif - - (probe mode rules for WCO,Rotation and probe position measuring only) - o150 if [# EQ 0 AND # EQ 1] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] Y[# + #] R[#] - o return - o150 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_front_left_inside_corner.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_front_left_inside_corner.ngc deleted file mode 100644 index a1b02431..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_front_left_inside_corner.ngc +++ /dev/null @@ -1,118 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/25/19) - -(Probe front left inside corner for x,y,z 0,0,0 position) -(Start probe position is over front left inside corner of stock) -(inside the step off width square and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Traverse Workpiece Top at Z Clearance Height plane) - G91 - F[#] - G38.3 X[#] Y[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - G90 - (Current X Position including offsets in current program units) - # = #5420 - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (move to X start Position) - G90 - F[#] - G38.3 X[#] - - (Current Y Position including offsets in current program units) - # = #5421 - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o120 endif - - (move to Y start Position) - G90 - F[#] - G38.3 Y[#] - - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] - G10 L2 P#5220 Y[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_front_left_top_corner.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_front_left_top_corner.ngc deleted file mode 100644 index b523777b..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_front_left_top_corner.ngc +++ /dev/null @@ -1,114 +0,0 @@ -(author: Chris P) -(version: 0.4) -(date: 04/25/19) - -(Probe front left top corner for x,y,z 0,0,0 position) -(Start probe position is over front left corner of stock) -(inside the step off width square and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X-[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (Probe Y Positioning Move, up to Z clearance plane) - G91 - F[#] - G38.3 Z[#] - - (Probe Y Positioning Move, Traverse Workpiece at Z Clearance plane) - F[#] - G38.3 X[#] Y-[#] - - (Probe Y Positioning Move,to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o120 endif - - (Probe Completion Move to Z Clearance Plane, and XY Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] - G10 L2 P#5220 Y[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_front_right_inside_corner.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_front_right_inside_corner.ngc deleted file mode 100644 index bfda031b..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_front_right_inside_corner.ngc +++ /dev/null @@ -1,118 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/23/19) - -(Probe front right inside corner for x,y,z 0,0,0 position) -(Start probe position is over front right inside corner of stock) -(inside the step off width square and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width X and Y) - G91 - F[#] - G38.3 X-[#] Y[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - G90 - (Current X Position including offsets in current program units) - # = #5420 - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (move to X start Position) - G90 - F[#] - G38.3 X[#] - - (Current Y Position including offsets in current program units) - # = #5421 - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o120 endif - - (move to Y start Position) - G90 - F[#] - G38.3 Y[#] - - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] - G10 L2 P#5220 Y[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_front_right_top_corner.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_front_right_top_corner.ngc deleted file mode 100644 index 875808cf..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_front_right_top_corner.ngc +++ /dev/null @@ -1,115 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/23/19) - -(Probe front right top corner for x,y,z 0,0,0 position) -(Start probe position is over front right corner of stock) -(inside the step off width square and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (Probe Y Positioning Move, up to Z clearance plane) - G91 - F[#] - G38.3 Z[#] - - (Probe Y Positioning Move, Traverse Workpiece Top at Z Clearance Height plane) - F[#] - G38.3 X-[#] Y-[#] - - (Probe Y Positioning Move,to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_plus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o120 endif - - (Probe Completion Move to Z Clearance Plane, and XY Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] - G10 L2 P#5220 Y[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_front_top_side.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_front_top_side.ngc deleted file mode 100644 index cb444882..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_front_top_side.ngc +++ /dev/null @@ -1,88 +0,0 @@ -(author: Chris P) -(version: 0.4) -(date: 04/25/19) - -(Probe front top side for y,z 0,0 position) -(Start probe position is over front edge of stock) -(inside the step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe Y Positioning Move, Step Off Width) - G91 - F[#] - G38.3 Y-[#] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o110 endif - - (Probe Completion Move to Z Clearance Plane, and Y Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 Y[#] - - (probe mode rules for WCO or probe position measuring only) - o120 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 Y[# + #] - o return - o120 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_left_top_side.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_left_top_side.ngc deleted file mode 100644 index 7913a715..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_left_top_side.ngc +++ /dev/null @@ -1,88 +0,0 @@ -(author: Chris P) -(version: 0.3) -(date: 04/25/19) - -(Probe left top side for x,z 0,0 position) -(Start probe position is over left side edge of stock) -(inside the step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X-[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - # = #16 (=50) Z-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (Probe Completion Move to Z Clearance Plane, and Y Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] - - (probe mode rules for WCO or probe position measuring only) - o120 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] - o return - o120 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_rect_boss.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_rect_boss.ngc deleted file mode 100644 index bb60abc7..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_rect_boss.ngc +++ /dev/null @@ -1,182 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/27/19) - -(Probe Boss in X and Y Axes, find center and z 0 position) -(Start probe position is over center of stock in X and Y axis) -(within max z distance, ensure all settings have been) -(set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - # = #[5203 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, X hint/2 + Step Off Width) - G91 - F[#] - G38.3 X-[[#/2] + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in X, X Hint + Step Off Width at Rapid Speed) - G91 - F[#] - G38.3 X[# + # + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (probed center calulation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# - #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] - - (Probe Y Positioning Move, Y hint/2 + Step Off Width) - G91 - F[#] - G38.3 Y-[[#/2] + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed) - G91 - F[#] - G38.3 Y[# + # + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (probed center calulation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# - #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record XY Zero in selected WCO) - G10 L2 P#5220 X[# + #] Y[# + #] - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - o return - o110 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_rect_pocket.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_rect_pocket.ngc deleted file mode 100644 index 12ef0e40..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_rect_pocket.ngc +++ /dev/null @@ -1,134 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/26/19) - -(Probe rect pocket center measure x and widths, find xy center position) -(Start probe position is over left side edge of pocket wall) -(inside the step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3 + #11][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - G90 - F[#] - G38.3 X[#] - - (Call sub "probe_y_plus" to Probe Y+ side of Workpiece) - o call [#1][#3 + #12 / 2][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus" to Probe Y- side of Workpiece) - o call [#1][#3 + #12][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - G90 - F[#] - G38.3 Y[#] - G91 - F[#] - G38.3 Z[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record X Zero in selected WCO) - G10 L2 P#5220 X[# + #] Y[# + #] - o return - o110 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_rect_pocket_center_start.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_rect_pocket_center_start.ngc deleted file mode 100644 index 4a87bda7..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_rect_pocket_center_start.ngc +++ /dev/null @@ -1,116 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 01/16/23) - -(Probe rect pocket center measure x and y widths, find xy center position) -(Start probe position is rough center of pocket probe tip below top edge) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3 + #11 / 2][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3 + #11][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - (Probe Completion Move to X Zero, Y Zero) - G90 - F[#] - G38.3 X[#] - - (Call sub "probe_y_plus" to Probe Y+ side of Workpiece) - o call [#1][#3 + #12 / 2][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus" to Probe Y- side of Workpiece) - o call [#1][#3 + #12][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - G90 - F[#] - G38.3 Y[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record X and Y Zero in selected WCO) - G10 L2 P#5220 X[# + #] Y[# + #] - o return - o110 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_ridge_x.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_ridge_x.ngc deleted file mode 100644 index 3372002a..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_ridge_x.ngc +++ /dev/null @@ -1,124 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/25/19) - -(Probe Ridge in X Axis to find center and z 0 position) -(Start probe position is over center of stock in the X axis) -(within max z distance, ensure all settings have been) -(set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=100) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5203 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, X hint/2 + Step Off Width) - G91 - F[#] - G38.3 X-[[#/2] + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in X, X Hint + Step Off Width at Rapid Speed) - F[#] - G38.3 X[# + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (probed center calulation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# - #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - (Probe Completion Move to Z Clearance Plane, and X Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record X Zero in selected WCO) - G10 L2 P#5220 X[# + #] - o return - o110 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_ridge_y.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_ridge_y.ngc deleted file mode 100644 index dfb0518a..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_ridge_y.ngc +++ /dev/null @@ -1,125 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/24/19) - -(Probe Ridge in Y Axis to find center and z 0 position) -(Start probe position is over center of stock in the Y axis) -(within max z distance, ensure all settings have been) -(set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5202 + [20 * #5220]] - # = #[5203 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe Y Positioning Move, Y hint/2 + Step Off Width) - G91 - F[#] - G38.3 Y-[[#/2] + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - # = #16 (=50) Z-[#] - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed) - F[#] - G38.3 Y[# + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - # = #16 (=50) Z-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (probed center calulation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# - #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - (Probe Completion Move to Z Clearance Plane, and X Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 Y[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record Y Zero in selected WCO) - G10 L2 P#5220 Y[# + #] - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - o return - o110 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_right_top_side.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_right_top_side.ngc deleted file mode 100644 index 3902c324..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_right_top_side.ngc +++ /dev/null @@ -1,88 +0,0 @@ -(author: Chris P) -(version: 0.3) -(date: 04/25/19) - -(Probe right top side for x,z 0,0 position) -(Start probe position is over right side edge of stock) -(inside the step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (Probe Completion Move to Z Clearance Plane, and Y Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] - - (probe mode rules for WCO or probe position measuring only) - o120 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] - o return - o120 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_round_boss.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_round_boss.ngc deleted file mode 100644 index 2b9a5b63..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_round_boss.ngc +++ /dev/null @@ -1,292 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/27/19) - -(Probe Boss in X and Y Axes, find center, Diam and z 0 position) -(Start probe position is over center of stock in X and Y axis) -(within max z distance, ensure all settings have been) -(set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - # = #[5203 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, X hint/2 + Step Off Width) - G91 - F[#] - G38.3 X-[[# / 2] + [#]] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in X, X Hint + Step Off Width at Rapid Speed) - G91 - F[#] - G38.3 X[# + # + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (probed center calulation) - # = [[# + #] / 2] - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] - - (Probe Y Positioning Move, Y hint/2 + Step Off Width) - G91 - F[#] - G38.3 Y-[[# / 2] + [#]] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed) - G91 - F[#] - G38.3 Y[# + # + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (probed center calulation) - # = [[# + #] / 2] - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - (Move to z clearance plane) - G91 - F[#] - G38.3 Z[#] - - (Move to Y Center) - G90 - F[#] - G38.3 Y[#] - - (Probe X Positioning Move, X hint/2 + Step Off Width) - G91 - F[#] - G38.3 X-[[# / 2] + [#]] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in X, X Hint + Step Off Width at Rapid Speed) - F[#] - G38.3 X[# + # + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (probed center calulation) - # = [[# + #] / 2] - - (calculate X Width Probed) - o110 if [# GT #] - # = [# - #] - o110 else - # = [# - #] - o110 endif - - (Completed probed width calculations) - # = [# - #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] - - (Probe Y Positioning Move, Y hint/2 + Step Off Width) - G91 - F[#] - G38.3 Y-[[# / 2] + [#]] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed) - F[#] - G38.3 Y[# + # + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (probed center calulation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - o120 if [# GT #] - # = [# - #] - o120 else - # = [# - #] - o120 endif - - (Completed probed width calculations) - # = [# - #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - # = [[# + #] / 2] - - #1010 = # - (DEBUG, EVAL[vcp.getWidget{"averaged_diam"}.setValue{#1010}]) - - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - # = [# + #] - - # = [# + #] - - (probe mode rules for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record XY Zero in selected WCO) - G10 L2 P#5220 X[#] Y[#] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_round_pocket.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_round_pocket.ngc deleted file mode 100644 index 24c4ac0f..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_round_pocket.ngc +++ /dev/null @@ -1,182 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/26/19) - -(Probe round pocket center measure x and y Diam, find xy center position) -(Start probe position is over left side edge of pocket wall) -(inside the step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x-) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - (Probe Completion Move to Z Clearance Plane, and X Zero) - G90 - F[#] - G38.3 X[#] - - (Call sub "probe_y_plus" to Probe Y+) - o call [#1][#3 + #13 / 2][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus" to Probe Y-) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - (Probe Completion Move to Z Clearance Plane, Y Zero) - G90 - F[#] - G38.3 Y[#] - - (Call sub "probe_x_minus" to Probe x-) - o call [#1][#3 + #13 / 2][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - G90 - F[#] - G38.3 X[#] - - (Call sub "probe_y_plus" to Probe Y+) - o call [#1][#3 + #13 / 2][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus" to Probe Y-) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed diameter calculations) - # = [# + #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - # = [[# + #] / 2] - - #1010 = # - (DEBUG, EVAL[vcp.getWidget{"averaged_diam"}.setValue{#1010}]) - - G90 - F[#] - G38.3 Y[#] - G91 - F[#] - G38.3 Z[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record Y Zero in selected WCO) - G10 L2 P#5220 X[# + #] - G10 L2 P#5220 Y[# + #] - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - o return - o110 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_round_pocket_center_start.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_round_pocket_center_start.ngc deleted file mode 100644 index 1a4087aa..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_round_pocket_center_start.ngc +++ /dev/null @@ -1,164 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/26/19) - -(Probe round pocket center start measure x and y Diam, find xy center position) -(Start probe position is rough center of pocket a safe distance below top edge) -(no z move will be initiated in this routine. end position is hole center) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - (Call sub "probe_x_minus" to Probe x-) - o call [#1][#3 +#13 / 2][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - (Probe Completion Move to X Zero) - G90 - F[#] - G38.3 X[#] - - (Call sub "probe_y_plus" to Probe Y+) - o call [#1][#3 + #13 / 2][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus" to Probe Y-) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - (Probe Completion Move to Y Zero) - G90 - F[#] - G38.3 Y[#] - - (Call sub "probe_x_minus" to Probe x-) - o call [#1][#3 + #13 / 2][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - G90 - F[#] - G38.3 X[#] - - (Call sub "probe_y_plus" to Probe Y+) - o call [#1][#3 + #13 / 2][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus" to Probe Y-) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed diameter calculations) - # = [# + #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - # = [[# + #] / 2] - - #1010 = # - (DEBUG, EVAL[vcp.getWidget{"averaged_diam"}.setValue{#1010}]) - - G90 - F[#] - G38.3 Y[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record Y Zero in selected WCO) - G10 L2 P#5220 X[# + #] - G10 L2 P#5220 Y[# + #] - o return - o110 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_top_back_edge_angle.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_top_back_edge_angle.ngc deleted file mode 100644 index 2b956840..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_top_back_edge_angle.ngc +++ /dev/null @@ -1,124 +0,0 @@ -(author: Chris P) -(version: 0.3) -(date: 04/25/19) - -(Probe back top edge angle for y,z 0,0 position and edge angle) -(Start probe position is over back edge of stock, set edge width,) -(step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=0) - # = #17 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - # = #5420 - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe Y Positioning Move, Step Off Width) - G91 - F[#] - G38.3 Y[#] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o110 endif - - (edge width move to edge second probing point) - G91 - F[#] - G38.3 X-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o120 endif - - # = [# - #] - - # = [ATAN [#] / [#]] - - #1011 = # - (DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}]) - - #1012 = # - (DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}]) - - (Probe Completion Move to Z Clearance Plane, and Y Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO, Rotation and probe position measuring only) - o130 if [# EQ 0 AND # EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[#] Y[# + #] - o return - o130 endif - - (probe mode rules for WCO, Rotation and probe position measuring only) - o140 if [# EQ 0 AND # EQ 1] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[#] Y[# + #] R[#] - o return - o140 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_top_front_edge_angle.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_top_front_edge_angle.ngc deleted file mode 100644 index 38dffe0f..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_top_front_edge_angle.ngc +++ /dev/null @@ -1,124 +0,0 @@ -(author: Chris P) -(version: 0.4) -(date: 04/25/19) - -(Probe top front edge angle for y,z 0,0 position and edge angle) -(Start probe position is over front edge of stock, set edge width,) -(step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=0) - # = #17 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - # = #5420 - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe Y Positioning Move, Step Off Width) - G91 - F[#] - G38.3 Y-[#] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o110 endif - - (edge width move to edge second probing point) - G91 - F[#] - G38.3 X[#] - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o120 endif - - # = [# - #] - - # = [ATAN [#] / [#]] - - #1011 = # - (DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}]) - - #1012 = # - (DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}]) - - (Probe Completion Move to Z Clearance Plane, and Y Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO, Rotation and probe position measuring only) - o130 if [# EQ 0 AND # EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[#] Y[# + #] - o return - o130 endif - - (probe mode rules for WCO, Rotation and probe position measuring only) - o140 if [# EQ 0 AND # EQ 1] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[#] Y[# + #] R[#] - o return - o140 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_top_left_edge_angle.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_top_left_edge_angle.ngc deleted file mode 100644 index 8f204c9c..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_top_left_edge_angle.ngc +++ /dev/null @@ -1,124 +0,0 @@ -(author: Chris P) -(version: 0.3) -(date: 04/25/19) - -(Probe top left edge angle for y,z 0,0 position and edge angle) -(Start probe position is over left edge of stock, set edge width,) -(step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=0) - # = #17 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - # = #5421 - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X-[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (edge width move to edge second probing point) - G91 - F[#] - G38.3 Y-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o120 endif - - # = [# - #] - - # = [ATAN [#] / [#]] - - #1011 = # - (DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}]) - - #1012 = # - (DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}]) - - (Probe Completion Move to Z Clearance Plane, and Y Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO, Rotation and probe position measuring only) - o130 if [# EQ 0 AND # EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] Y[#] - o return - o130 endif - - (probe mode rules for WCO, Rotation and probe position measuring only) - o140 if [# EQ 0 AND # EQ 1] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] Y[#] R[#] - o return - o140 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_top_right_edge_angle.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_top_right_edge_angle.ngc deleted file mode 100644 index 4ebbb38c..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_top_right_edge_angle.ngc +++ /dev/null @@ -1,124 +0,0 @@ -(author: Chris P) -(version: 0.3) -(date: 04/25/19) - -(Probe top right edge angle for y,z 0,0 position and edge angle) -(Start probe position is over right edge of stock, set edge width,) -(step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=0) - # = #17 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - # = #5421 - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (edge width move to edge second probing point) - G91 - F[#] - G38.3 Y[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o120 endif - - # = [# - #] - - # = [ATAN [#] / [#]] - - #1011 = # - (DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}]) - - #1012 = # - (DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}]) - - (Probe Completion Move to Z Clearance Plane, and Y Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO, Rotation and probe position measuring only) - o130 if [# EQ 0 AND # EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] Y[#] - o return - o130 endif - - (probe mode rules for WCO, Rotation and probe position measuring only) - o140 if [# EQ 0 AND # EQ 1] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] Y[#] R[#] - o return - o140 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_valley_x.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_valley_x.ngc deleted file mode 100644 index 3976664a..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_valley_x.ngc +++ /dev/null @@ -1,105 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/25/19) - -(Probe valley in x, find Z0, X0 valley center position) -(Start probe position is over left side edge of valley wall) -(inside the step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3 + #11][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - (Probe Completion Move to Z Clearance Plane, and X Zero) - G90 - F[#] - G38.3 X[#] - G91 - F[#] - G38.3 Z[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record X Zero in selected WCO) - G10 L2 P#5220 X[# + #] - o return - o110 endif - - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_valley_x_center_start.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_valley_x_center_start.ngc deleted file mode 100644 index ede6ab52..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_valley_x_center_start.ngc +++ /dev/null @@ -1,86 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 01/16/23) - -(Probe valley in x, find X zero valley center position) -(Start probe position is centered between valley walls) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3 + #11 / 2][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3 + #11][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - (Probe Completion Move to X Zero) - G90 - F[#] - G38.3 X[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record X Zero in selected WCO) - G10 L2 P#5220 X[# + #] - o return - o110 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_valley_y.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_valley_y.ngc deleted file mode 100644 index 50f8e37f..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_valley_y.ngc +++ /dev/null @@ -1,102 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/25/19) - -(Probe valley in Y, find Z0, Y0 valley center position) -(Start probe position is over back side edge of valley wall) -(inside the step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe Y Positioning Move, Step Off Width) - G91 - F[#] - G38.3 Y-[#] - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_plus" to Probe Y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus_sub" to Probe Y- side of Workpiece) - o call [#1][#3 + #12][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - (Probe Completion Move to Z Clearance Plane, and X Zero) - G90 - F[#] - G38.3 Y[#] - G91 - F[#] - G38.3 Z[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record X Zero in selected WCO) - G10 L2 P#5220 Y[# + #] - o return - o110 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_valley_y_center_start.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_valley_y_center_start.ngc deleted file mode 100644 index 3d5b2b12..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_valley_y_center_start.ngc +++ /dev/null @@ -1,86 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 01/16/23) - -(Probe valley in Y find Y0 valley center position) -(Start probe position is rough center between valley walls) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - (Call sub "probe_y_plus" to Probe Y+ side of Workpiece) - o call [#1][#3 + #12 / 2][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus_sub" to Probe Y- side of Workpiece) - o call [#1][#3 + #12][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - (Probe Completion Move to Z Clearance Plane, and X Zero) - G90 - F[#] - G38.3 Y[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record X Zero in selected WCO) - G10 L2 P#5220 Y[# + #] - o return - o110 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_x_minus.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_x_minus.ngc deleted file mode 100644 index ebd5a6cd..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_x_minus.ngc +++ /dev/null @@ -1,84 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe X Minus direction and set X 0 in current WCO) -(Start probe position to the right side edge of stock) -(inside the max xy distance with the probe tip below the stock top edge) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 - # = #2 - # = #3 - # = #4 - # = #5 - # = #6 - - (Cancel G92 offsets) - G92.1 - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (Current X Position including offsets in current program units) - # = #5420 - - (Initiate Fast X- Probe) - G91 - F[#] - G38.2 X-[#] - # = #5061 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 X# - F[#] - (return from sub) - o return - o110 endif - - (Move to xy_clearance distance for slow probe) - G90 - G0 X[# + #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow X- Probe) - G91 - F[#] - G38.2 X-[# * 2] - # = #5061 - G90 - G0 X[# + #] - o120 endif - - # = [# - #] - - (defines the edge as x_probed_position for DRO reporting) - # = # - - (output to gui DRO "X PROBED POSITION") - #1005 = # - (DEBUG, EVAL[vcp.getWidget{"x_minus_probed_position"}.setValue{#1005}]) - -o endsub [#] - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_x_minus_wco.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_x_minus_wco.ngc deleted file mode 100644 index 5bcbb495..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_x_minus_wco.ngc +++ /dev/null @@ -1,102 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe X Minus direction and set X 0 in current WCO) -(Start probe position to the right side edge of stock) -(inside the max xy distance with the probe tip below the stock top edge) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (Current X Position including offsets in current program units) - # = #5420 - - (Initiate Fast X- Probe) - G91 - F[#] - G38.2 X-[#] - # = #5061 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 X# - F[#] - (return from sub) - o return - o110 endif - - (Move to xy_clearance distance for slow probe) - G90 - G0 X[# + #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow X- Probe) - G91 - F[#] - G38.2 X-[# * 2] - # = #5061 - G90 - G0 X[# + #] - o120 endif - - # = [# - #] - - (defines the edge as x_probed_position for DRO reporting) - # = # - - (output to gui DRO "X PROBED POSITION") - #1005 = # - (DEBUG, EVAL[vcp.getWidget{"x_minus_probed_position"}.setValue{#1005}]) - - (probe mode rule for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record X Zero in selected WCO) - G10 L2 P#5220 X[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_x_plus.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_x_plus.ngc deleted file mode 100644 index a9db4f83..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_x_plus.ngc +++ /dev/null @@ -1,84 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe X plus direction and set X 0 in current WCO) -(Start probe position to the left side edge of stock) -(inside the max xy distance with the probe tip below the stock top edge) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 - # = #2 - # = #3 - # = #4 - # = #5 - # = #6 - - (Cancel G92 offsets) - G92.1 - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (Current X Position including offsets in current program units) - # = #5420 - - (Initiate Fast X+ Probe) - G91 - F[#] - G38.2 X[#] - # = #5061 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 X# - F[#] - (return from sub) - o return - o110 endif - - (Move to xy_clearance distance for slow probe) - G90 - G0 X[# - #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow X+ Probe) - G91 - F[#] - G38.2 X[# * 2] - # = #5061 - G90 - G0 X[# - #] - o120 endif - - # = [# + #] - - (defines the edge as x_probed_position for DRO reporting) - # = # - - (output to gui DRO "X PROBED POSITION") - #1006 = # - (DEBUG, EVAL[vcp.getWidget{"x_plus_probed_position"}.setValue{#1006}]) - -o endsub [#] - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_x_plus_wco.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_x_plus_wco.ngc deleted file mode 100644 index 4c50daef..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_x_plus_wco.ngc +++ /dev/null @@ -1,102 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe X plus direction and set X 0 in current WCO) -(Start probe position to the left side edge of stock) -(inside the max xy distance with the probe tip below the stock top edge) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (Current X Position including offsets in current program units) - # = #5420 - - (Initiate Fast X+ Probe) - G91 - F[#] - G38.2 X[#] - # = #5061 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 X# - F[#] - (return from sub) - o return - o110 endif - - (Move to xy_clearance distance for slow probe) - G90 - G0 X[# - #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow X+ Probe) - G91 - F[#] - G38.2 X[# * 2] - # = #5061 - G90 - G0 X[# - #] - o120 endif - - # = [# + #] - - (defines the edge as x_probed_position for DRO reporting) - # = # - - (output to gui DRO "X PROBED POSITION") - #1006 = # - (DEBUG, EVAL[vcp.getWidget{"x_plus_probed_position"}.setValue{#1006}]) - - (probe mode rule for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record X Zero in selected WCO) - G10 L2 P#5220 X[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_y_minus.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_y_minus.ngc deleted file mode 100644 index ee604409..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_y_minus.ngc +++ /dev/null @@ -1,84 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe Y Minus direction to locate edge, end at clearance distance) -(Start probe position to the back side edge of stock) -(inside the max xy distance with the probe tip below the stock top edge) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 - # = #2 - # = #3 - # = #4 - # = #5 - # = #6 - - (Cancel G92 offsets) - G92.1 - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (Current Y Position including offsets in current program units) - # = #5421 - - (Initiate Fast Y- Probe) - G91 - F[#] - G38.2 y-[#] - # = #5062 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 Y# - F[#] - (return from sub) - o return - o110 endif - - (Move to xy_clearance distance for slow probe) - G90 - G0 Y[# + #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow Y- Probe) - G91 - F[#] - G38.2 Y-[# * 2] - # = #5062 - G90 - G0 Y[# + #] - o120 endif - - # = [#5062 - #] - - (defines the edge as y_probed_position for DRO reporting) - # = # - - (output to gui DRO "Y PROBED POSITION") - #1007 = # - (DEBUG, EVAL[vcp.getWidget{"y_minus_probed_position"}.setValue{#1007}]) - -o endsub [#] - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_y_minus_wco.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_y_minus_wco.ngc deleted file mode 100644 index ee98bb70..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_y_minus_wco.ngc +++ /dev/null @@ -1,102 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe Y Minus direction and set Y 0 in current WCO) -(Start probe position to the back side edge of stock) -(inside the max xy distance with the probe tip below the stock top edge) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - - (Cancel G92 offsets) - G92.1 - - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (Current Y Position including offsets in current program units) - # = #5421 - - (Initiate Fast Y- Probe) - G91 - F[#] - G38.2 y-[#] - # = #5062 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 Y# - F[#] - (return from sub) - o return - o110 endif - - (Move to xy_clearance distance for slow probe) - G90 - G0 Y[# + #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow Y- Probe) - G91 - F[#] - G38.2 Y-[# * 2] - # = #5062 - G90 - G0 Y[# + #] - o120 endif - - # = [#5062 - #] - - (defines the edge as y_probed_position for DRO reporting) - # = # - - (output to gui DRO "Y PROBED POSITION") - #1007 = # - (DEBUG, EVAL[vcp.getWidget{"y_minus_probed_position"}.setValue{#1007}]) - - (probe mode rule for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Y Zero in selected WCO) - G10 L2 P#5220 Y[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_y_plus.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_y_plus.ngc deleted file mode 100644 index 874a7b9a..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_y_plus.ngc +++ /dev/null @@ -1,84 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe Y plus direction to locate edge, end at clearance distance) -(Start probe position to the front side edge of stock) -(inside the max xy distance with the probe tip below the stock top edge) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 - # = #2 - # = #3 - # = #4 - # = #5 - # = #6 - - (Cancel G92 offsets) - G92.1 - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (Current Y Position including offsets in current program units) - # = #5421 - - (Initiate Fast y+ Probe) - G91 - F[#] - G38.2 Y[#] - # = #5062 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 Y# - F[#] - (return from sub) - o return - o110 endif - - (Move to xy_clearance distance for slow probe) - G90 - G0 Y[# - #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow Y+ Probe) - G91 - F[#] - G38.2 Y[# * 2] - # = #5062 - G90 - G0 Y[# - #] - o120 endif - - # = [#5062 + #] - - (defines the edge as y_probed_position for DRO reporting) - # = # - - (output to gui DRO "Y PROBED POSITION") - #1008 = # - (DEBUG, EVAL[vcp.getWidget{"y_plus_probed_position"}.setValue{#1008}]) - -o endsub [#] - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_y_plus_wco.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_y_plus_wco.ngc deleted file mode 100644 index 651f03a4..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_y_plus_wco.ngc +++ /dev/null @@ -1,102 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe Y plus direction and set Y 0 in current WCO) -(Start probe position to the front side edge of stock) -(inside the max xy distance with the probe tip below the stock top edge) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - - (Cancel G92 offsets) - G92.1 - - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (Current Y Position including offsets in current program units) - # = #5421 - - (Initiate Fast y+ Probe) - G91 - F[#] - G38.2 Y[#] - # = #5062 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 Y# - F[#] - (return from sub) - o return - o110 endif - - (Move to xy_clearance distance for slow probe) - G90 - G0 Y[# - #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow Y+ Probe) - G91 - F[#] - G38.2 Y[# * 2] - # = #5062 - G90 - G0 Y[# - #] - o120 endif - - # = [#5062 + #] - - (defines the edge as y_probed_position for DRO reporting) - # = # - - (output to gui DRO "Y PROBED POSITION") - #1008 = # - (DEBUG, EVAL[vcp.getWidget{"y_plus_probed_position"}.setValue{#1008}]) - - (probe mode rule for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Y Zero in selected WCO) - G10 L2 P#5220 Y[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_z_minus.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_z_minus.ngc deleted file mode 100644 index 1f2bfa39..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_z_minus.ngc +++ /dev/null @@ -1,64 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe Z Minus direction to locate top, end at clearance distance) -(Start probe position is over stock within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 - # = #2 - # = #3 - # = #4 - # = #5 - - (Current Z Position including offsets in current program units) - # = #5422 - - (Initial Fast Z- Probe) - G91 - F[#] - G38.2 Z-[#] - # = #5063 - - (Probe Error check, #5070 will be 0 if failed) - o100 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 Z# - F[#] - (return from sub) - o return - o100 endif - - (Move to z_clearance height for slow probe) - G90 - G0 Z[# + #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o110 if [# GT 0] - (Initiate Slow Z- Probe) - G91 - F[#] - G38.2 Z-[# * 2] - # = #5063 - G90 - G0 Z[# + #] - o110 endif - - (defines the edge as z_probed_position for DRO reporting) - # = # - - (output to gui DRO "Z PROBED POSITION") - #1009 = # - (DEBUG, EVAL[vcp.getWidget{"z_minus_probed_position"}.setValue{#1009}]) - - # = [# + #] - -o endsub [#] - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_z_minus_sub.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_z_minus_sub.ngc deleted file mode 100644 index b74d1f3b..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_z_minus_sub.ngc +++ /dev/null @@ -1,83 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe Z Minus direction and set Z 0 in current WCO) -(Start probe position is over stock within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 - # = #2 - # = #3 - # = #4 - # = #5 - # = #6 - - (Cancel G92 offsets) - G92.1 - - # = #[5203 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Current Z Position including offsets in current program units) - # = #5422 - - (Initial Fast Z- Probe) - G91 - F[#] - G38.2 Z-[#] - # = #5063 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 Z# - F[#] - (return from sub) - o return - o110 endif - - (Move to z_clearance height for slow probe) - G90 - G0 Z[# + #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow Z- Probe) - G91 - F[#] - G38.2 Z-[# * 2] - # = #5063 - G90 - G0 Z[# + #] - o120 endif - - (defines the edge as z_probed_position for DRO reporting) - # = # - - (output to gui DRO "Z PROBED POSITION") - #1009 = # - (DEBUG, EVAL[vcp.getWidget{"z_minus_probed_position"}.setValue{#1009}]) - - # = [# + #] - - (probe mode rule for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Z zero in selected WCO) - G10 L2 P#5220 Z[# + #] - o return - o130 endif - -o endsub [#] - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/probe_z_minus_wco.ngc b/linuxcnc/configs/probe_basic/subroutines/probe_z_minus_wco.ngc deleted file mode 100644 index d37ece9d..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/probe_z_minus_wco.ngc +++ /dev/null @@ -1,92 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe Z Minus direction and set Z 0 in current WCO) -(Start probe position is over stock within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - - (Cancel G92 offsets) - G92.1 - - # = #[5203 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Current Z Position including offsets in current program units) - # = #5422 - - (Initial Fast Z- Probe) - G91 - F[#] - G38.2 Z-[#] - # = #5063 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 Z# - F[#] - (return from sub) - o return - o110 endif - - (Move to z_clearance height for slow probe) - G90 - G0 Z[# + #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow Z- Probe) - G91 - F[#] - G38.2 Z-[# * 2] - # = #5063 - G90 - G0 Z[# + #] - o120 endif - - (defines the edge as z_probed_position for DRO reporting) - # = # - - (output to gui DRO "Z PROBED POSITION") - #1009 = # - (DEBUG, EVAL[vcp.getWidget{"z_minus_probed_position"}.setValue{#1009}]) - - # = [# + #] - - (probe mode rule for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Z zero in selected WCO) - G10 L2 P#5220 Z[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/program_coolant.ngc b/linuxcnc/configs/probe_basic/subroutines/program_coolant.ngc deleted file mode 100644 index 14e87dce..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/program_coolant.ngc +++ /dev/null @@ -1,42 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 02/13/20) - -(programmable coolant subroutine for aiming the coolant nozzle) -(settings for setup are located on probe basic setting page) -(in the programmable coolant constants container.) -(calculations assume coolant nozzle is on axis b and has been homed) -(to 0 degrees rotation aiming perpendicular to the spindle center line) -(coolant nozzle is located on the right side of the spindle head and) -(rotates counter clockwise from home position with commands) - -o sub -(PRINT, o) - - (uses NGCGUI style arg spec) - (number after equals sign in comment is default value) - # = #1 - # = #2 - # = #3 - # = #4 - - # = #5410 - - # = [# / 2] - - # = [# - #] - - # = [[#] + [#]] - - # = [ATAN[#] / [#]] - - # = [[#] + [#]] - - #1000 = # - (DEBUG, EVAL[vcp.getWidget{"coolant_final_angle"}.setValue{#1000}]) - - M68 E20 Q[#] - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/reset_all_data.ngc b/linuxcnc/configs/probe_basic/subroutines/reset_all_data.ngc deleted file mode 100644 index 9b89dde3..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/reset_all_data.ngc +++ /dev/null @@ -1,41 +0,0 @@ -o sub - -#1001 = 0 -(DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1001}]) - -#1002 = 0 -(DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1002}]) - -#1003 = 0 -(DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1003}]) - -#1004 = 0 -(DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1004}]) - -#1005 = 0 -(DEBUG, EVAL[vcp.getWidget{"x_minus_probed_position"}.setValue{#1005}]) - -#1006 = 0 -(DEBUG, EVAL[vcp.getWidget{"x_plus_probed_position"}.setValue{#1006}]) - -#1007 = 0 -(DEBUG, EVAL[vcp.getWidget{"y_minus_probed_position"}.setValue{#1007}]) - -#1008 = 0 -(DEBUG, EVAL[vcp.getWidget{"y_plus_probed_position"}.setValue{#1008}]) - -#1009 = 0 -(DEBUG, EVAL[vcp.getWidget{"z_minus_probed_position"}.setValue{#1009}]) - -#1010 = 0 -(DEBUG, EVAL[vcp.getWidget{"averaged_diam"}.setValue{#1010}]) - -#1011 = 0 -(DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}]) - -#1012 = 0 -(DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}]) - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/retractatc.ngc b/linuxcnc/configs/probe_basic/subroutines/retractatc.ngc deleted file mode 100644 index 4219ca38..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/retractatc.ngc +++ /dev/null @@ -1,15 +0,0 @@ -o sub - -M65 P0 ; Turn off carousel out solenoid -M64 P1 ; Move Carousel IN - -M66 P0 L3 Q4 ; check carousel in position sensor -o100 if [#5399 LT 0] - M65 P1 ; turn off the solenoid to send atc home - (abort, Failed to send carousel home) ; abort if the sensor does not activate in 5 seconds -o100 endif -M65 P1 - -o endsub [1] - -M2 diff --git a/linuxcnc/configs/probe_basic/subroutines/set_g30_position.ngc b/linuxcnc/configs/probe_basic/subroutines/set_g30_position.ngc deleted file mode 100644 index 036d83be..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/set_g30_position.ngc +++ /dev/null @@ -1,19 +0,0 @@ -o sub - -o100 if [1 EQ 1] - (G30.1 records the tool touch off position in the var file) - G30.1 -o100 endif - -#1000 = #5181 -(DEBUG, EVAL[vcp.getWidget{"x_tool_change_position"}.setValue{#1000}]) - -#1001 = #5182 -(DEBUG, EVAL[vcp.getWidget{"y_tool_change_position"}.setValue{#1001}]) - -#1002 = #5183 -(DEBUG, EVAL[vcp.getWidget{"z_tool_change_position"}.setValue{#1002}]) - -o endsub - -M2 diff --git a/linuxcnc/configs/probe_basic/subroutines/store_tool_in_carousel.ngc b/linuxcnc/configs/probe_basic/subroutines/store_tool_in_carousel.ngc deleted file mode 100644 index d6904b18..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/store_tool_in_carousel.ngc +++ /dev/null @@ -1,16 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 02/8/20) - -(store spindle tool in carousel macro) - -o sub -(PRINT, o) - -G49 - -T0 M6 - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/tool_touch_off.ngc b/linuxcnc/configs/probe_basic/subroutines/tool_touch_off.ngc deleted file mode 100644 index 33f10b14..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/tool_touch_off.ngc +++ /dev/null @@ -1,103 +0,0 @@ -o sub - -; NOTE this routine used G59.3, and this needs to be set to 0,0,0 for everything to work correctly - -# = #1 (set from probe screen fast probe feed rate) -# = #2 (set from probe screen slow probe feedrate) -# = #3 (max z distance the tool travels before erroring out if not contact is made) -# = #4 (max xy distance the tool travels before erroring out if not contact is made) -# = #6 (distance the tool retracts after making contact during fast feed mode) -# = #5 (G53 distance from home to spindle nose triggering point on touch plate) -# = #8 (activates the tool diameter probe subroutine section) -# = #9 (activates the tool diameter offset position for probe subroutine section) -# = #10 (current tool's diameter used for offseting probe position in x axis) - -G92.1 (Cancel G92 offset) - -# = #5220 - -# = #5181 -# = #5182 -# = #5183 - -# = [# / 2] -# = [# - #] - -G59.3 - -o100 if [# EQ 1] - # = # -o100 endif - -o110 if [2 EQ 2] - G49 -o110 endif - -G90 (set absolute coordinates) -G53 G0 Z0 (move to z0 home position) -G53 G0 X# Y# -G53 G0 Z# - -G91 -F # -G38.2 Z-[#] (fast tool probe) -# = #5063 (save probe result of fast probe to parameters) -G0 Z[#] (retract tool retract distance amount) - -(Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) -o120 if [# GT 0] - (Initiate Slow Z- Probe) - G91 - F[#] (set probe slow feedrate) - G38.2 Z-[# * 2] (slow tool probe) - # = #5063 - G90 - G0 Z[# + #] -o120 endif - -o130 if [#5070 EQ 1] (verify probe event was succesful) - # = #5063 (save slow probe result to parameters) -o130 else - (MSG,Tool Length Offset Probe Failed) -o130 endif - -(Tool Diameter Probe Mode Section, User must define this section as needed) -o140 if [# EQ 1] - (MSG, Tool Diameter Probing is Not Defined in Subroutine) -o140 endif - -o150 if [3 EQ 3] - G49 -o150 endif - -G90 (set absolute coordinates) -G53 G0 Z0 (Send Spindle to home zero position) - -(define new tool length offset parameters) -# = [ABS[# + #5063]] - -G10 L1 P #5400 Z [#] (5400 = tool number) - -o160 if [# EQ 1] - G54 -o160 else if [# EQ 2] - G55 -o160 else if [# EQ 3] - G56 -o160 else if [# EQ 4] - G57 -o160 else if [# EQ 5] - G58 -o160 else if [# EQ 6] - G59 -o160 else if [# EQ 7] - G59.1 -o160 else if [# EQ 8] - G59.2 -o160 endif - -T #5400 G43 H #5400 (enable tool length offset) - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/tool_touch_off_entire_carousel.ngc b/linuxcnc/configs/probe_basic/subroutines/tool_touch_off_entire_carousel.ngc deleted file mode 100644 index 27192776..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/tool_touch_off_entire_carousel.ngc +++ /dev/null @@ -1,10 +0,0 @@ -o sub - -; Touch off each tool in the carousel -(PRINT, o) - -(DEBUG, 'TOUCH OFF ENTIRE CAROUSEL' not yet implemented) - -o endsub - -M2 diff --git a/linuxcnc/configs/probe_basic/subroutines/toolchange.ngc b/linuxcnc/configs/probe_basic/subroutines/toolchange.ngc deleted file mode 100644 index b8cfb5ef..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/toolchange.ngc +++ /dev/null @@ -1,140 +0,0 @@ -o sub - -; Parameter #3989 is used to track if the carousel is homed (M13) (volatile) -; Parameter #3990 is used to track the current tool pocket (persistently) -; Parameter #3991 is used to track the current tool loaded it in the spindle (persistently) -; Parameters #4001 to #4024 are used to track which tool is in which pocket (persistently) -; Parameter #4000 is not populated just used in the maths to calculate the above numbers -; #: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets> -; # is the height you spindle needs to be at to clamp/unclamp a tool form the ATC (Set via INI [ATC]Z_TOOL_CHANGE_HEIGHT) -; # is the clearance height you spindle needs to be at to safely clear the ATC (Set via INI [ATC]Z_TOOL_CLEARANCE_HEIGHT) - -(PRINT, o selected_tool: #, tool_in_spindle: #, selected_pocket: #, current_pocket: #, task: #<_task>) - -o100 if [#<_task> EQ 0] - (DEBUG, Task is null) - o return [999] -o100 endif (this code eliminates tool missing error on load for multiple use tools) - -; default to a 12 pocket ATC (matching DynATC Widget behaviour), then update based on INI settings -# = 12 -o101 if [EXISTS[#<_ini[atc]pockets>]] - # = #<_ini[atc]pockets> -o101 endif - -# = -3.1900 -o102 if [EXISTS[#<_ini[atc]z_tool_change_height>]] - # = #<_ini[atc]z_tool_change_height> -o102 endif -# = [#<_ini[AXIS_Z]MAX_LIMIT>-0.1] -o103 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]] - # = #<_ini[atc]z_tool_clearance_height> -o103 endif - -; assign the programmable coolant parameters -# = #1 (=0) -# = #2 (=0) -# = #3 (=0) -# = #4 (=0) - -; assign the variables passed by M6 change_prolog to some parameters -#100 = # -#110 = # -#120 = # -#121 = # -; NOTE: -; The legacy names *selected_pocket* and *current_pocket* actually reference -; a sequential tooldata index for tool items loaded from a tool -; table ([EMCIO]TOOL_TABLE) or via a tooldata database ([EMCIO]DB_PROGRAM) - -o110 if [# EQ #] ; checks if tool in the spindle is same as requested - o endsub [1] - M2 -o110 endif - -o111 if [#3991 NE #] - (PRINT, o tool_in_spindle does not match 3991) -o111 endif - -# = 0 ; assigns 0 to the next pocket for a later check if the tool is found in the carousel -# = 0 -#130 = # ; assign test parameter the number of pockets in the carousel - -o120 do - o121 if [#[4000 + #130] EQ #] ; checks all pockets to see if it contains tool number requested as the new tool - # = #130 ; if tool is found in pocket, assigns the next pocket - o121 endif - o122 if [#[4000 + #130] EQ 0] ; checks if the pocket is empty, last pocket checked will be the lowest empty pocket number, for putting tool in spindle away. - # = #130 - o122 endif - #130 = [#130 - 1] -o120 while [#130 GT 0] -o130 if [# EQ 0] ; if tool is not found, aborts and sends a message - (abort, Tool T%d# not found in carousel) -o130 endif - -; now we know which pocket the next tool is sitting in -; we need to know if we need to put a tool away -; or if there is not tool in the spindle - -o140 if [# GT 0] ; checks if there is a valid tool in the spindle - o141 if [# EQ 0] ; If there is a tool in the spindle, checks if there is an open pocket - (abort, Carousel is full, cant put away tool T# in into carousel) - o141 endif - M10 P[#] ; move carousel to an open pocket - M21 ; puts the tool in spindle away into the open pocket - (DEBUG, EVAL[vcp.getWidget{"dynatc"}.store_tool{#, #}]) - #140 = # - #[4000 + #140] = # ; save tool number in pocket - #3991 = 0 ; empty tool in the spindle - M61 Q0 - G49 -o140 endif - -G90 -G0 G53 Z# ; move z to clear height - -o150 if [# GT 0] ; selected tool is not tool0 - M10 P# ; set the carousel to move to the right pocket for the selected tool - M65 P1 - M64 P0 - M66 P1 L3 Q5 ; check carousel out position sensor - o151 if [#5399 LT 0] - M65 P0 ; turn off the solenoid to send atc to tool change - (abort, Failed to send carousel home) ; abort if the sensor does not activate in 5 seconds - o151 endif - M65 P0 - - (DEBUG, EVAL[vcp.getWidget{"dynatc"}.store_tool{#, 0}]) - M22 ; Carousel out - #150 = # - #[4000 + #150] = 0 ; empty the pocket - #3991 = # ; Set persistent variable to remember tool in spindle after power cycle -o150 else - M65 P2 ; deactive drawbar - M65 P0 ; make sure ATC out solenoid is off - M64 P1 ; move carousel home - M66 P0 L3 Q4 ; check carousel in position sensor - o152 if [#5399 LT 0] - M65 P1 ; turn off the solenoid to send atc home - (abort, Failed to send carousel home) ; abort if the sensor does not activate in 5 seconds - o152 endif - M65 P1 -o150 endif - -M61 Q# - -o160 if [1 EQ 1] - G43 H# -o160 endif - -(run program_coolant sub if selected to be active in settings page with value 1) -o170 if [# EQ 1] - (run program_coolant.ngc) - o call [#][#][#][#] -o170 endif - -(PRINT, o endsub) -o endsub [1] - -M2 diff --git a/linuxcnc/configs/probe_basic/subroutines/toolsetter_wco.ngc b/linuxcnc/configs/probe_basic/subroutines/toolsetter_wco.ngc deleted file mode 100644 index 61207d8e..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/toolsetter_wco.ngc +++ /dev/null @@ -1,87 +0,0 @@ -(author: Chris Polanski) -(version: 0.1) -(date: 11/5/22) - -(Measure tool and set Z 0.000 in current WCO for new tool) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - - # = 33.2 - # = 4.4 - # = 26 - # = 3 - # = 2.5 - # = 1.8 - # = 0.2500 - # = 0.0 - # = 30.0 - - (start with an m6, do all the standard m6 stuff and then touch off -TMC) - M6 - - (Cancel G92 offsets) - G92.1 - - o100 if [2 EQ 2] - G49 - o100 endif - - G90 (set absolute coordinates) - G53 G0 Z0 (move to z0 home position) - G53 G0 X# Y# - - # = #[5203 + [20 * #5220]] - - (Current Z Position including offsets in current program units) - # = #5422 - - (Initial Fast Z- Probe) - G91 - F[#] - G38.2 Z-[#] - # = #5063 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 Z# - F[#] - (return from sub) - o return - o110 endif - - (Move to z_clearance height for slow probe) - G90 - G0 Z[# + #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow Z- Probe) - G91 - F[#] - G38.2 Z-[# * 2] - # = #5063 - G90 - G0 Z[# + #] - o120 endif - - # = [# + #] - - # = [# - #] - - (Record Z zero in selected WCO) - G10 L2 P#5220 Z[# + #] - - (Move to Toolset location) - G53 G0 X# Y# - - (pause for dust boot) - M0 (replace the dust boot) - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/unclamptool.ngc b/linuxcnc/configs/probe_basic/subroutines/unclamptool.ngc deleted file mode 100644 index ac9c3798..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/unclamptool.ngc +++ /dev/null @@ -1,12 +0,0 @@ -o sub - -M64 P2 ; unclamp the tool - -M66 P2 L3 Q2 ; check the unclamped tool sensor -o100 if [#5399 LT 0] - (abort, Failed to release tool) ; abort if the sensor does not activate in 2 seconds -o100 endif - -o endsub [1] - -M2 diff --git a/linuxcnc/configs/probe_basic/subroutines/x_data_reset.ngc b/linuxcnc/configs/probe_basic/subroutines/x_data_reset.ngc deleted file mode 100644 index 39bec9be..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/x_data_reset.ngc +++ /dev/null @@ -1,17 +0,0 @@ -o sub - -#1001 = 0 -(DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1001}]) - -#1002 = 0 -(DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1002}]) - -#1005 = 0 -(DEBUG, EVAL[vcp.getWidget{"x_minus_probed_position"}.setValue{#1005}]) - -#1006 = 0 -(DEBUG, EVAL[vcp.getWidget{"x_plus_probed_position"}.setValue{#1006}]) - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic/subroutines/y_data_reset.ngc b/linuxcnc/configs/probe_basic/subroutines/y_data_reset.ngc deleted file mode 100644 index 093d30d9..00000000 --- a/linuxcnc/configs/probe_basic/subroutines/y_data_reset.ngc +++ /dev/null @@ -1,17 +0,0 @@ -o sub - -#1003 = 0 -(DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1003}]) - -#1004 = 0 -(DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1004}]) - -#1007 = 0 -(DEBUG, EVAL[vcp.getWidget{"y_minus_probed_position"}.setValue{#1007}]) - -#1008 = 0 -(DEBUG, EVAL[vcp.getWidget{"y_plus_probed_position"}.setValue{#1008}]) - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/probe_basic_lathe.ini b/linuxcnc/configs/probe_basic_lathe/probe_basic_lathe.ini index 96641200..a75ad8d6 100644 --- a/linuxcnc/configs/probe_basic_lathe/probe_basic_lathe.ini +++ b/linuxcnc/configs/probe_basic_lathe/probe_basic_lathe.ini @@ -52,7 +52,7 @@ MAX_FEED_OVERRIDE = 2.000000 # Prefix to be used PROGRAM_PREFIX = ~/linuxcnc/nc_files -OPEN_FILE = ~/linuxcnc/nc_files/pb_examples/blank.ngc +OPEN_FILE = ~/linuxcnc/nc_files/probe_basic/examples/blank.ngc # Introductory graphic INTRO_GRAPHIC = linuxcnc.gif @@ -67,7 +67,8 @@ PROGRAM_EXTENSION = .nc,.txt,.tap Other NC files [RS274NGC] RS274NGC_STARTUP_CODE = G90 G7 G18 PARAMETER_FILE = sim-lathe.var -SUBROUTINE_PATH = subroutines +# IMPORT: `../../nc_files/probe_basic/lathe` must come first to override some mill based subroutines +SUBROUTINE_PATH = ../../nc_files/probe_basic/lathe:../../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_lathe/subroutines/clamptool.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/clamptool.ngc deleted file mode 100644 index 8b1a7b1b..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/clamptool.ngc +++ /dev/null @@ -1,12 +0,0 @@ -o sub - -M65 P2 ; clamp the tool - -M66 P5 L3 Q2 ; check the clamped tool sensor -o100 if [#5399 LT 0] - (abort, Failed to release tool) ; abort if the sensor does not activate in 2 seconds -o100 endif - -o endsub [1] - -M2 diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/extendatc.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/extendatc.ngc deleted file mode 100644 index 95828367..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/extendatc.ngc +++ /dev/null @@ -1,28 +0,0 @@ -o sub - -; # is the height you spindle needs to be at to clamp/unclamp a tool form the ATC (Set via INI [ATC]Z_TOOL_CHANGE_HEIGHT) -; # is the clearance height you spindle needs to be at to safely clear the ATC (Set via INI [ATC]Z_TOOL_CLEARANCE_HEIGHT) - -# = -3.9000 -o101 if [EXISTS[#<_ini[atc]z_tool_change_height>]] - # = #<_ini[atc]z_tool_change_height> -o101 endif -# = [#<_ini[AXIS_Z]MAX_LIMIT>-0.1] -o102 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]] - # = #<_ini[atc]z_tool_clearance_height> -o102 endif - -G0 G53 Z# ; move z to clear height - -M65 P1 ; Turn off carousel home solenoid -M64 P0 ; Move Carousel OUT - -M66 P1 L3 Q5 ; check for carousel out position sensor -o100 if [#5399 LT 0] - M65 P0 ; switch off atc out solenoid - (abort, ATC not in position) -o100 endif - -o endsub [1] - -M2 diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/m10.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/m10.ngc deleted file mode 100644 index 2562672e..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/m10.ngc +++ /dev/null @@ -1,37 +0,0 @@ -o sub - -; Move tool carousel best direction to pocket P -; Parameter #3989 is used to track if the carousel is homed (M13) (volatile) -; Parameter #3990 is used to track the current tool pocket (persistently) -; #: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets> -(PRINT, o P#

) - -o100 if [#3989 NE 1] - M13 -o100 endif - -; default to a 12 pocket ATC (matching DynATC Widget behaviour), then update based on INI settings -# = 12 -o101 if [EXISTS[#<_ini[atc]pockets>]] - # = #<_ini[atc]pockets> -o101 endif - -# = [#3990 - #

] -(PRINT, o P#

, steps=#) -o110 if [# GT [# / 2]] - #=[# - #] -o110 endif -o120 if [# LT -[# / 2]] - #=[# + #] -o120 endif -o130 if [# GT 0] - M12 P[#] -o130 elseif [# LT 0] - #=[# * -1] - M11 P[#] -o130 endif - -(PRINT, o endsub) -o endsub [1] - -M2 diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/m11.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/m11.ngc deleted file mode 100644 index 3db74563..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/m11.ngc +++ /dev/null @@ -1,50 +0,0 @@ -o sub - -; Move tool carousel CCW Parameter P number of steps -; Without parameter one step CCW. -; Parameter #3989 is used to track if the carousel is homed (M13) (volatile) -; Parameter #3990 is used to track the current tool pocket (persistently) -; #: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets> -(PRINT, o P#

) - -o100 if [#3989 NE 1] - (PRINT, atc not homed, homing) - M13 -o100 endif - -; default to a 12 pocket ATC (matching DynATC Widget behaviour), then update based on INI settings -# = 12 -o101 if [EXISTS[#<_ini[atc]pockets>]] - # = #<_ini[atc]pockets> -o101 endif - -o110 if [EXISTS[#

]] - # = #

-o110 else - # = 1 - (tells the atc widget move 1 step reverse) -o110 endif - -(tells the atc widget how many steps to move and start moving reverse) -(DEBUG, EVAL[vcp.getWidget{"dynatc"}.rotate{#, "cw"}]) - -M64 P4 ; Move atc motor Rev - -o120 do - M66 P4 L1 Q3 ; wait for rising edge on rotation index - o130 if [#5399 LT 0] - M65 P4 ; Stop atc motor - (abort, Failed to get rotation index) - o130 endif - #3990 = [[[#3990+2] MOD #]-1] ; Pocket is no.1-# - # = [#-1] -o120 while [# GT 0] - -M65 P4 ; Stop motor - -#<_my_current_pocket> = #3990 - -(PRINT, o endsub) -o endsub [1] - -M2 diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/m12.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/m12.ngc deleted file mode 100644 index 34f2d6f3..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/m12.ngc +++ /dev/null @@ -1,50 +0,0 @@ -o sub - -; Move tool carousel CW Parameter P number of steps -; Without parameter one step CW. -; Parameter #3989 is used to track if the carousel is homed (M13) (volatile) -; Parameter #3990 is used to track the current tool pocket (persistently) -; #: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets> -(PRINT, o P#

) - -o100 if [#3989 NE 1] - (PRINT, atc not homed, homing) - M13 -o100 endif - -; default to a 12 pocket ATC (matching DynATC Widget behaviour), then update based on INI settings -# = 12 -o101 if [EXISTS[#<_ini[atc]pockets>]] - # = #<_ini[atc]pockets> -o101 endif - -o110 if [EXISTS[#

]] - # = #

-o110 else - #=1 - (tells the atc widget move 1 step forward) -o110 endif - -(tells the atc widget how many steps to move and start moving forward) -(DEBUG, EVAL[vcp.getWidget{"dynatc"}.rotate{#, "ccw"}]) - -M64 P3 ; Move atc motor FWD - -o120 do - M66 P4 L1 Q3 ; wait for rising edge on rotation index - o130 if [#5399 LT 0] - M65 P3 ; Stop atc motor - (abort, Failed to get rotation index) - o130 endif - #3990 = [[[#3990-2] MOD #]+1] ; Pocket is no.1-# - # = [#-1] -o120 while [# GT 0] - -M65 P3 ; Stop motor - -#<_my_current_pocket> = #3990 - -(PRINT, o endsub) -o endsub [1] - -M2 diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/m13.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/m13.ngc deleted file mode 100644 index ede03334..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/m13.ngc +++ /dev/null @@ -1,42 +0,0 @@ -o sub - -; Move tool carousel CW until ATC zero -; Parameter #3989 is used to track if the carousel is homed (M13) (volatile) -; Parameter #3990 is used to track the current tool pocket (persistently) -; #: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets> -(PRINT, o) - -(DEBUG, EVAL[vcp.getWidget{"dynatc"}.atc_message{"REFERENCING"}]) - -M64 P3 ; Move Motor FWD -M66 P3 L1 Q20 ; wait for rising edge on home index -o100 if [#5399 LT 0] - M65 P3 ; stop motor - (abort, Failed to home carousel) -o100 endif - -#3990 = 1 -M65 P3 ; Stop motor -#3989 = 1 - -(DEBUG, EVAL[vcp.getWidget{"dynatc"}.atc_message{}]) - -# = 12 -o110 if [EXISTS[#<_ini[atc]pockets>]] - # = #<_ini[atc]pockets> -o110 endif - -#1 = 0 - -o120 while [#1 LT #] - #1 = [#1+1] - #2 = #[4000+#1] - (DEBUG, EVAL[vcp.getWidget{"dynatc"}.store_tool{#1, #2}]) -o120 endwhile - -M61 Q#3991 G43 H#3991 #5210 = 0 - -(PRINT, o endsub) -o endsub [1] - -M2 diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/m21.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/m21.ngc deleted file mode 100644 index 2ec9daea..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/m21.ngc +++ /dev/null @@ -1,45 +0,0 @@ -o sub - -; Move Carousel to the tool change position - OUT -; then unload any tool in the spindle into the current pocket -; Parameter #3991 is used to track the current tool loaded it in the spindle (persistently) -; # is the height you spindle needs to be at to clamp/unclamp a tool form the ATC (Set via INI [ATC]Z_TOOL_CHANGE_HEIGHT) -; # is the clearance height you spindle needs to be at to safely clear the ATC (Set via INI [ATC]Z_TOOL_CLEARANCE_HEIGHT) -(PRINT, o) - -# = -3.9000 -o101 if [EXISTS[#<_ini[atc]z_tool_change_height>]] - # = #<_ini[atc]z_tool_change_height> -o101 endif -# = [#<_ini[AXIS_Z]MAX_LIMIT>-0.1] -o102 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]] - # = #<_ini[atc]z_tool_clearance_height> -o102 endif - -M65 P1 ; switch off carousel in solenoid -M66 P1 L3 Q1 - -M5 M9 -G90 -G0 G53 Z# ; rapid move to above the tool change height - -;M19 R0 Q3 ; orient spindle - -M64 P0 ; Move Carousel out -M66 P1 L3 Q5 ; check for carousel out sensor -o100 if [#5399 LT 0] - M65 P0 ; switch off atc out solenoid - (abort, ATC not in position) -o100 endif - -M24 ; activate drawbar, release the tool -M5 ; turn off spindle lock - -G0 G53 Z# ; move z to clear height - -#3991 = 0; save fact there is now no tool in the spindle - -(PRINT, o endsub) -o endsub [1] - -M2 diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/m22.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/m22.ngc deleted file mode 100644 index 2e87c9a5..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/m22.ngc +++ /dev/null @@ -1,42 +0,0 @@ -o sub - -; Move Carousel to the home position - IN -; after loading any tool in the current pocket to the spindle -; # is the height you spindle needs to be at to clamp/unclamp a tool form the ATC (Set via INI [ATC]Z_TOOL_CHANGE_HEIGHT) -; # is the clearance height you spindle needs to be at to safely clear the ATC (Set via INI [ATC]Z_TOOL_CLEARANCE_HEIGHT) -(PRINT, o) - -# = -3.9000 -o101 if [EXISTS[#<_ini[atc]z_tool_change_height>]] - # = #<_ini[atc]z_tool_change_height> -o101 endif -# = [#<_ini[AXIS_Z]MAX_LIMIT>-0.1] -o102 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]] - # = #<_ini[atc]z_tool_clearance_height> -o102 endif - -;M19 R0 Q2 -M24 -;M19 R0 Q1 -;G90 -G0 G53 Z# ; rapid move to above the tool change height -M65 P2 ; release the drawbar to clamp the tool -M5 -M66 P5 L3 Q1 ; check the tool clamped sensor -o100 if [#5399 LT 0] - (abort, Failed to reclamp tool) -o100 endif - -M65 P0 ; Move Carousel home -M66 P0 L3 Q4 ; check carousel in position sensor -o110 if [#5399 LT 0] - M65 P1 ; turn off the solenoid to send atc home - (abort, Failed to send carousel home) ; abort if the sensor does not activate in 5 seconds -o110 endif - -;M65 P1 - -(PRINT, o endsub) -o endsub [1] - -M2 diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/m23.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/m23.ngc deleted file mode 100644 index e69de29b..00000000 diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/m24.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/m24.ngc deleted file mode 100644 index 37454968..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/m24.ngc +++ /dev/null @@ -1,14 +0,0 @@ -o sub -(PRINT, o) - -M64 P2 ; unclamp the tool -M66 P2 L3 Q2 ; check the unclamped tool sensor -o100 if [#5399 LT 0] - M65 P2 ; turn off the drawbar - (abort, failed to release tool) ; abort if the sensor does not activate in 3 seconds -o100 endif - -(PRINT, o endsub) -o endsub [1] - -M2 diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/m25.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/m25.ngc deleted file mode 100644 index a1a7ac98..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/m25.ngc +++ /dev/null @@ -1,15 +0,0 @@ -o sub -(PRINT, o) - -M64 P0 ; Move Carousel out - -M66 P1 L3 Q5 ; check for carousel out sensor -o100 if [#5399 LT 0] - M65 P0 ; switch off atc out solenoid - (abort, ATC not in position) -o100 endif - -(PRINT, o endsub) -o endsub [1] - -M2 diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/m26.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/m26.ngc deleted file mode 100644 index e69de29b..00000000 diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/move_head_above_carousel.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/move_head_above_carousel.ngc deleted file mode 100644 index 65e68cdf..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/move_head_above_carousel.ngc +++ /dev/null @@ -1,20 +0,0 @@ -o sub - -; # is the height you spindle needs to be at to clamp/unclamp a tool form the ATC (Set via INI [ATC]Z_TOOL_CHANGE_HEIGHT) -; # is the clearance height you spindle needs to be at to safely clear the ATC (Set via INI [ATC]Z_TOOL_CLEARANCE_HEIGHT) - -# = -3.9000 -o101 if [EXISTS[#<_ini[atc]z_tool_change_height>]] - # = #<_ini[atc]z_tool_change_height> -o101 endif -# = [#<_ini[AXIS_Z]MAX_LIMIT>-0.1] -o102 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]] - # = #<_ini[atc]z_tool_clearance_height> -o102 endif - - -G0 G53 Z# ; move z to clear height - -o endsub [1] - -M2 diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/move_tool_to_carousel_height.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/move_tool_to_carousel_height.ngc deleted file mode 100644 index 77215115..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/move_tool_to_carousel_height.ngc +++ /dev/null @@ -1,18 +0,0 @@ -o sub -; # is the height you spindle needs to be at to clamp/unclamp a tool form the ATC (Set via INI [ATC]Z_TOOL_CHANGE_HEIGHT) -; # is the clearance height you spindle needs to be at to safely clear the ATC (Set via INI [ATC]Z_TOOL_CLEARANCE_HEIGHT) - -# = -3.9000 -o101 if [EXISTS[#<_ini[atc]z_tool_change_height>]] - # = #<_ini[atc]z_tool_change_height> -o101 endif -# = [#<_ini[AXIS_Z]MAX_LIMIT>-0.1] -o102 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]] - # = #<_ini[atc]z_tool_clearance_height> -o102 endif - -G0 G53 Z# ; rapid move to above the tool change height - -o endsub [1] - -M2 diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/on_abort.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/on_abort.ngc deleted file mode 100644 index da9f6901..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/on_abort.ngc +++ /dev/null @@ -1,9 +0,0 @@ -% -o sub - -G90 -G40 -G49 - -o endsub -% diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_left_inside_corner.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_left_inside_corner.ngc deleted file mode 100644 index efb82dcd..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_left_inside_corner.ngc +++ /dev/null @@ -1,118 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/25/19) - -(Probe back left inside corner for x,y,z 0,0,0 position) -(Start probe position is over back left inside corner of stock) -(inside the step off width square and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Traverse Workpiece Top at Z Clearance Height plane) - G91 - F[#] - G38.3 X[#] Y-[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - G90 - (Current X Position including offsets in current program units) - # = #5420 - - (Call sub "probe_x_minus_sub" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (move to X start Position) - G90 - F[#] - G38.3 X[#] - - (Current Y Position including offsets in current program units) - # = #5421 - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o120 endif - - (move to Y start Position) - G90 - F[#] - G38.3 Y[#] - - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] - G10 L2 P#5220 Y[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_left_top_corner.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_left_top_corner.ngc deleted file mode 100644 index 305b1302..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_left_top_corner.ngc +++ /dev/null @@ -1,114 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/25/19) - -(Probe back left top corner for x,y,z 0,0,0 position) -(Start probe position is over back left corner of stock) -(inside the step off width square and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X-[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (Probe Y Positioning Move, up to Z clearance plane) - G91 - F[#] - G38.3 Z[#] - - (Probe Y Positioning Move, Traverse Workpiece at Z Clearance plane) - F[#] - G38.3 X[#] Y[#] - - (Probe Y Positioning Move,to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o120 endif - - (Probe Completion Move to Z Clearance Plane, and XY Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] - G10 L2 P#5220 Y[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_right_inside_corner.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_right_inside_corner.ngc deleted file mode 100644 index 6cbe538c..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_right_inside_corner.ngc +++ /dev/null @@ -1,118 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/25/19) - -(Probe back right inside corner for x,y,z 0,0,0 position) -(Start probe position is over back right inside corner of stock) -(inside the step off width square and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width X and Y) - G91 - F[#] - G38.3 X-[#] Y-[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - G90 - (Current X Position including offsets in current program units) - # = #5420 - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (move to X start Position) - G90 - F[#] - G38.3 X[#] - - (Current Y Position including offsets in current program units) - # = #5421 - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o120 endif - - (move to Y start Position) - G90 - F[#] - G38.3 Y[#] - - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] - G10 L2 P#5220 Y[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_right_top_corner.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_right_top_corner.ngc deleted file mode 100644 index fd30605d..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_right_top_corner.ngc +++ /dev/null @@ -1,113 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/23/19) - -(Probe back right top corner for x,y,z 0,0,0 position) -(Start probe position is over back right corner of stock) -(inside the step off width square and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (Probe Y Positioning Move, up to Z clearance plane) - G91 - F[#] - G38.3 Z[#] - (Probe Y Positioning Move) - F[#] - G38.3 X-[#] Y[#] - - (Probe Y Positioning Move,to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o120 endif - - (Probe Completion Move to Z Clearance Plane, and XY Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] - G10 L2 P#5220 Y[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_top_side.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_top_side.ngc deleted file mode 100644 index 46e705be..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_back_top_side.ngc +++ /dev/null @@ -1,88 +0,0 @@ -(author: Chris P) -(version: 0.3) -(date: 04/25/19) - -(Probe back top side for y,z 0,0 position) -(Start probe position is over back edge of stock) -(inside the step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe Y Positioning Move, Step Off Width) - G91 - F[#] - G38.3 Y[#] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o110 endif - - (Probe Completion Move to Z Clearance Plane, and Y Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 Y[#] - - (probe mode rules for WCO or probe position measuring only) - o120 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 Y[# + #] - o return - o120 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_reset.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_reset.ngc deleted file mode 100644 index 866e8ef1..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_reset.ngc +++ /dev/null @@ -1,8 +0,0 @@ -o sub - - #1000 = 0 - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_round_boss.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_round_boss.ngc deleted file mode 100644 index e9dcbd00..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_round_boss.ngc +++ /dev/null @@ -1,325 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 05/8/19) - -(Probe calibration offset using defined diam round boss) -(Start probe position is over center of stock in X and Y axis) -(within max z distance, ensure all settings have been) -(set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=1.0000) - # = #17 (=0) - # = #18 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - # = #[5203 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [#] - - (remove probe tip diam and cal offset from probed width calculations) - # = [#] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, X hint/2 + Step Off Width) - G91 - F[#] - G38.3 X-[#/2 + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in X, X Hint + Step Off Width at Rapid Speed) - G91 - F[#] - G38.3 X[# + # + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (probed center calulation) - # = [[# + #] / 2] - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] - - (Probe Y Positioning Move, Y hint/2 + Step Off Width) - G91 - F[#] - G38.3 Y-[#/2 + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed) - G91 - F[#] - G38.3 Y[# + # + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (probed center calulation) - # = [[# + #] / 2] - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - (Move to z clearance plane) - G91 - F[#] - G38.3 Z[#] - - (Move to Y Center) - G90 - F[#] - G38.3 Y[#] - - (Probe X Positioning Move, X hint/2 + Step Off Width) - G91 - F[#] - G38.3 X-[#/2 + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in X, X Hint + Step Off Width at Rapid Speed) - F[#] - G38.3 X[# + # + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (probed center calulation) - # = [[# + #] / 2] - - (calculate X Width Probed) - o110 if [# GT #] - # = [# - #] - o110 else - # = [# - #] - o110 endif - - (Completed probed width calculations) - # = [# - #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] - - (Probe Y Positioning Move, Y hint/2 + Step Off Width) - G91 - F[#] - G38.3 Y-[#/2 + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed) - F[#] - G38.3 Y[# + # + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (probed center calulation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - o120 if [# GT #] - # = [# - #] - o120 else - # = [# - #] - o return - o120 endif - - (Completed probed width calculations) - # = [# - #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - # = [[# + #] / 2] - - #1010 = # - (DEBUG, EVAL[vcp.getWidget{"averaged_diam"}.setValue{#1010}]) - - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - o130 if [# GT #] - (calculate calibration error and adjust calibration offset) - # = [[# - #] / 2] - # = [#] - o130 else - # = [[# - #] / 2] - # = [#] - o130 endif - - o140 if [# GT #] - (calculate calibration error and adjust calibration offset) - # = [[# - #] / 2] - # = [#] - o140 else - # = [[# - #] / 2] - # = [#] - o140 endif - - # = [[# + #] / 2] - - o150 if [# EQ 0] - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o150 else if [# EQ 1] - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o150 else - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o150 endif - - # = [# + #] - - # = [# + #] - - (probe mode rules for WCO or probe position measuring only) - o160 if [# EQ 0] - (Record XY Zero in selected WCO) - G10 L2 P#5220 X[#] Y[#] - o return - o160 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_round_pocket.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_round_pocket.ngc deleted file mode 100644 index fb372418..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_round_pocket.ngc +++ /dev/null @@ -1,218 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 05/8/19) - -(Probe calibration offset using defined diam round pocket) -(Start probe position is over left side edge of pocket wall) -(inside the step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=1.0000) - # = #17 (=0) - # = #18 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (remove probe tip diam and cal offset from probed width calculations) - # = [#] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x-) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - (Probe Completion Move to Z Clearance Plane, and X Zero) - G90 - F[#] - G38.3 X[#] - - (Call sub "probe_y_plus" to Probe Y+) - o call [#1][#3 + #13 / 2][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus" to Probe Y-) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - (Probe Completion Move to Z Clearance Plane, Y Zero) - G90 - F[#] - G38.3 Y[#] - - (Call sub "probe_x_minus" to Probe x-) - o call [#1][#3 + #13 / 2][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - G90 - F[#] - G38.3 X[#] - - (Call sub "probe_y_plus" to Probe Y+) - o call [#1][#3 + #13 / 2][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus" to Probe Y-) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed diameter calculations) - # = [# + #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - # = [[# + #] / 2] - - #1010 = # - (DEBUG, EVAL[vcp.getWidget{"averaged_diam"}.setValue{#1010}]) - - G90 - F[#] - G38.3 Y[#] - G91 - F[#] - G38.3 Z[#] - - o110 if [# GT #] - (calculate calibration error and adjust calibration offset) - # = [[# - #] / 2] - # = [#] - o110 else - # = [[# - #] / 2] - # = [#] - o110 endif - - o120 if [# GT #] - (calculate calibration error and adjust calibration offset) - # = [[# - #] / 2] - # = [#] - o120 else - # = [[# - #] / 2] - # = [#] - o120 endif - - # = [[# + #] / 2] - - o130 if [# EQ 0] - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o130 else if [# EQ 1] - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o130 else - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o130 endif - - # = [# + #] - - # = [# + #] - - (probe mode rules for WCO or probe position measuring only) - o140 if [# EQ 0] - (Record Y Zero in selected WCO) - G10 L2 P#5220 X[#] Y[#] - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - o return - o140 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_square_boss.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_square_boss.ngc deleted file mode 100644 index 60c51131..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_square_boss.ngc +++ /dev/null @@ -1,220 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 05/8/19) - -(Probe calibration offset using defined width square boss) -(Start probe position is over center of stock in X and Y axis) -(within max z distance, ensure all settings have been) -(set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=0) - # = #17 (=0) - # = #18 (=0) - # = #19 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - # = #[5203 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [#] - - (remove probe tip diam and cal offset from probed width calculations) - # = [#] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, X hint/2 + Step Off Width) - G91 - F[#] - G38.3 X-[#/2 + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in X, X Hint + Step Off Width at Rapid Speed) - G91 - F[#] - G38.3 X[# + # + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (probed center calulation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# - #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] - - (Probe Y Positioning Move, Y hint/2 + Step Off Width) - G91 - F[#] - G38.3 Y-[#/2 + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed) - G91 - F[#] - G38.3 Y[# + # + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (probed center calulation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# - #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - o110 if [# GT #] - (calculate calibration error and adjust calibration offset) - # = [[# - #] / 2] - # = [#] - o110 else - # = [[# - #] / 2] - # = [#] - o110 endif - - o120 if [# GT #] - (calculate calibration error and adjust calibration offset) - # = [[# - #] / 2] - # = [#] - o120 else - # = [[# - #] / 2] - # = [#] - o120 endif - - # = [[# + #] / 2] - - o130 if [# EQ 0] - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o130 else if [# EQ 1] - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o130 else - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o130 endif - - # = [# + #] - - # = [# + #] - - (probe mode rules for WCO or probe position measuring only) - o140 if [# EQ 0] - (Record XY Zero in selected WCO) - G10 L2 P#5220 X[#] Y[#] - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - o return - o140 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_square_pocket.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_square_pocket.ngc deleted file mode 100644 index d6834bc5..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_cal_square_pocket.ngc +++ /dev/null @@ -1,172 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 05/8/19) - -(Probe calibration offset using defined width square pocket) -(Start probe position is over left side edge of pocket wall) -(inside the step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=1.0000) - # = #17 (=1.0000) - # = #18 (=0) - # = #19 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (remove probe tip diam and cal offset from probed width calculations) - # = [#] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3 + #11][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - G90 - F[#] - G38.3 X[#] - - (Call sub "probe_y_plus" to Probe Y+ side of Workpiece) - o call [#1][#3 + #12 / 2][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus" to Probe Y- side of Workpiece) - o call [#1][#3 + #12][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - G90 - F[#] - G38.3 Y[#] - G91 - F[#] - G38.3 Z[#] - - o110 if [# GT #] - (calculate calibration error and adjust calibration offset) - # = [[# - #] / 2] - # = [#] - o110 else - # = [[# - #] / 2] - # = [#] - o110 endif - - o120 if [# GT #] - (calculate calibration error and adjust calibration offset) - # = [[# - #] / 2] - # = [#] - o120 else - # = [[# - #] / 2] - # = [#] - o120 endif - - # = [[# + #] / 2] - - o130 if [# EQ 0] - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o130 else if [# EQ 1] - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o130 else - #1000 = [ABS[#]] - (DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}]) - o130 endif - - # = [# + #] - - # = [# + #] - - (probe mode rules for WCO or probe position measuring only) - o140 if [# EQ 0] - (Record X Zero in selected WCO) - G10 L2 P#5220 X[#] Y[#] - o return - o140 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_left_inside_corner.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_left_inside_corner.ngc deleted file mode 100644 index a1b02431..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_left_inside_corner.ngc +++ /dev/null @@ -1,118 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/25/19) - -(Probe front left inside corner for x,y,z 0,0,0 position) -(Start probe position is over front left inside corner of stock) -(inside the step off width square and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Traverse Workpiece Top at Z Clearance Height plane) - G91 - F[#] - G38.3 X[#] Y[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - G90 - (Current X Position including offsets in current program units) - # = #5420 - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (move to X start Position) - G90 - F[#] - G38.3 X[#] - - (Current Y Position including offsets in current program units) - # = #5421 - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o120 endif - - (move to Y start Position) - G90 - F[#] - G38.3 Y[#] - - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] - G10 L2 P#5220 Y[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_left_top_corner.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_left_top_corner.ngc deleted file mode 100644 index b523777b..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_left_top_corner.ngc +++ /dev/null @@ -1,114 +0,0 @@ -(author: Chris P) -(version: 0.4) -(date: 04/25/19) - -(Probe front left top corner for x,y,z 0,0,0 position) -(Start probe position is over front left corner of stock) -(inside the step off width square and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X-[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (Probe Y Positioning Move, up to Z clearance plane) - G91 - F[#] - G38.3 Z[#] - - (Probe Y Positioning Move, Traverse Workpiece at Z Clearance plane) - F[#] - G38.3 X[#] Y-[#] - - (Probe Y Positioning Move,to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o120 endif - - (Probe Completion Move to Z Clearance Plane, and XY Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] - G10 L2 P#5220 Y[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_right_inside_corner.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_right_inside_corner.ngc deleted file mode 100644 index bfda031b..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_right_inside_corner.ngc +++ /dev/null @@ -1,118 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/23/19) - -(Probe front right inside corner for x,y,z 0,0,0 position) -(Start probe position is over front right inside corner of stock) -(inside the step off width square and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width X and Y) - G91 - F[#] - G38.3 X-[#] Y[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - G90 - (Current X Position including offsets in current program units) - # = #5420 - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (move to X start Position) - G90 - F[#] - G38.3 X[#] - - (Current Y Position including offsets in current program units) - # = #5421 - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o120 endif - - (move to Y start Position) - G90 - F[#] - G38.3 Y[#] - - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] - G10 L2 P#5220 Y[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_right_top_corner.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_right_top_corner.ngc deleted file mode 100644 index 875808cf..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_right_top_corner.ngc +++ /dev/null @@ -1,115 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/23/19) - -(Probe front right top corner for x,y,z 0,0,0 position) -(Start probe position is over front right corner of stock) -(inside the step off width square and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (Probe Y Positioning Move, up to Z clearance plane) - G91 - F[#] - G38.3 Z[#] - - (Probe Y Positioning Move, Traverse Workpiece Top at Z Clearance Height plane) - F[#] - G38.3 X-[#] Y-[#] - - (Probe Y Positioning Move,to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_plus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o120 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o120 endif - - (Probe Completion Move to Z Clearance Plane, and XY Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] - G10 L2 P#5220 Y[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_top_side.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_top_side.ngc deleted file mode 100644 index cb444882..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_front_top_side.ngc +++ /dev/null @@ -1,88 +0,0 @@ -(author: Chris P) -(version: 0.4) -(date: 04/25/19) - -(Probe front top side for y,z 0,0 position) -(Start probe position is over front edge of stock) -(inside the step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe Y Positioning Move, Step Off Width) - G91 - F[#] - G38.3 Y-[#] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing Y Sub returned edge parameter, aborting) - o return - o110 endif - - (Probe Completion Move to Z Clearance Plane, and Y Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 Y[#] - - (probe mode rules for WCO or probe position measuring only) - o120 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 Y[# + #] - o return - o120 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_left_top_side.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_left_top_side.ngc deleted file mode 100644 index 7913a715..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_left_top_side.ngc +++ /dev/null @@ -1,88 +0,0 @@ -(author: Chris P) -(version: 0.3) -(date: 04/25/19) - -(Probe left top side for x,z 0,0 position) -(Start probe position is over left side edge of stock) -(inside the step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X-[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - # = #16 (=50) Z-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (Probe Completion Move to Z Clearance Plane, and Y Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] - - (probe mode rules for WCO or probe position measuring only) - o120 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] - o return - o120 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_rect_boss.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_rect_boss.ngc deleted file mode 100644 index bb60abc7..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_rect_boss.ngc +++ /dev/null @@ -1,182 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/27/19) - -(Probe Boss in X and Y Axes, find center and z 0 position) -(Start probe position is over center of stock in X and Y axis) -(within max z distance, ensure all settings have been) -(set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - # = #[5203 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, X hint/2 + Step Off Width) - G91 - F[#] - G38.3 X-[[#/2] + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in X, X Hint + Step Off Width at Rapid Speed) - G91 - F[#] - G38.3 X[# + # + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (probed center calulation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# - #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] - - (Probe Y Positioning Move, Y hint/2 + Step Off Width) - G91 - F[#] - G38.3 Y-[[#/2] + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed) - G91 - F[#] - G38.3 Y[# + # + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (probed center calulation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# - #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record XY Zero in selected WCO) - G10 L2 P#5220 X[# + #] Y[# + #] - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - o return - o110 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_rect_pocket.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_rect_pocket.ngc deleted file mode 100644 index 12ef0e40..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_rect_pocket.ngc +++ /dev/null @@ -1,134 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/26/19) - -(Probe rect pocket center measure x and widths, find xy center position) -(Start probe position is over left side edge of pocket wall) -(inside the step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3 + #11][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - G90 - F[#] - G38.3 X[#] - - (Call sub "probe_y_plus" to Probe Y+ side of Workpiece) - o call [#1][#3 + #12 / 2][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus" to Probe Y- side of Workpiece) - o call [#1][#3 + #12][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - G90 - F[#] - G38.3 Y[#] - G91 - F[#] - G38.3 Z[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record X Zero in selected WCO) - G10 L2 P#5220 X[# + #] Y[# + #] - o return - o110 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_rect_pocket_center_start.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_rect_pocket_center_start.ngc deleted file mode 100644 index 4a87bda7..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_rect_pocket_center_start.ngc +++ /dev/null @@ -1,116 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 01/16/23) - -(Probe rect pocket center measure x and y widths, find xy center position) -(Start probe position is rough center of pocket probe tip below top edge) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3 + #11 / 2][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3 + #11][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - (Probe Completion Move to X Zero, Y Zero) - G90 - F[#] - G38.3 X[#] - - (Call sub "probe_y_plus" to Probe Y+ side of Workpiece) - o call [#1][#3 + #12 / 2][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus" to Probe Y- side of Workpiece) - o call [#1][#3 + #12][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - G90 - F[#] - G38.3 Y[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record X and Y Zero in selected WCO) - G10 L2 P#5220 X[# + #] Y[# + #] - o return - o110 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_ridge_x.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_ridge_x.ngc deleted file mode 100644 index 3372002a..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_ridge_x.ngc +++ /dev/null @@ -1,124 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/25/19) - -(Probe Ridge in X Axis to find center and z 0 position) -(Start probe position is over center of stock in the X axis) -(within max z distance, ensure all settings have been) -(set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=100) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5203 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, X hint/2 + Step Off Width) - G91 - F[#] - G38.3 X-[[#/2] + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in X, X Hint + Step Off Width at Rapid Speed) - F[#] - G38.3 X[# + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (probed center calulation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# - #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - (Probe Completion Move to Z Clearance Plane, and X Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record X Zero in selected WCO) - G10 L2 P#5220 X[# + #] - o return - o110 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_ridge_y.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_ridge_y.ngc deleted file mode 100644 index dfb0518a..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_ridge_y.ngc +++ /dev/null @@ -1,125 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/24/19) - -(Probe Ridge in Y Axis to find center and z 0 position) -(Start probe position is over center of stock in the Y axis) -(within max z distance, ensure all settings have been) -(set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5202 + [20 * #5220]] - # = #[5203 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe Y Positioning Move, Y hint/2 + Step Off Width) - G91 - F[#] - G38.3 Y-[[#/2] + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - # = #16 (=50) Z-[#] - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed) - F[#] - G38.3 Y[# + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - # = #16 (=50) Z-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (probed center calulation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# - #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - (Probe Completion Move to Z Clearance Plane, and X Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 Y[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record Y Zero in selected WCO) - G10 L2 P#5220 Y[# + #] - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - o return - o110 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_right_top_side.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_right_top_side.ngc deleted file mode 100644 index 3902c324..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_right_top_side.ngc +++ /dev/null @@ -1,88 +0,0 @@ -(author: Chris P) -(version: 0.3) -(date: 04/25/19) - -(Probe right top side for x,z 0,0 position) -(Start probe position is over right side edge of stock) -(inside the step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probing depth from the z probed clearance height, used for z moves) - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #<_value> - - (value returned safety check, aborts if no value returned) - o110 if [# EQ 1 AND #<_value_returned> NE 1] - (MSG, Missing X Sub returned edge parameter, aborting) - o return - o110 endif - - (Probe Completion Move to Z Clearance Plane, and Y Zero) - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] - - (probe mode rules for WCO or probe position measuring only) - o120 if [# EQ 0] - (Record Zero in selected axes and WCO) - G10 L2 P#5220 X[# + #] - o return - o120 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_round_boss.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_round_boss.ngc deleted file mode 100644 index 2b9a5b63..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_round_boss.ngc +++ /dev/null @@ -1,292 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/27/19) - -(Probe Boss in X and Y Axes, find center, Diam and z 0 position) -(Start probe position is over center of stock in X and Y axis) -(within max z distance, ensure all settings have been) -(set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - # = #[5203 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, X hint/2 + Step Off Width) - G91 - F[#] - G38.3 X-[[# / 2] + [#]] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in X, X Hint + Step Off Width at Rapid Speed) - G91 - F[#] - G38.3 X[# + # + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (probed center calulation) - # = [[# + #] / 2] - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] - - (Probe Y Positioning Move, Y hint/2 + Step Off Width) - G91 - F[#] - G38.3 Y-[[# / 2] + [#]] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed) - G91 - F[#] - G38.3 Y[# + # + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (probed center calulation) - # = [[# + #] / 2] - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - (Move to z clearance plane) - G91 - F[#] - G38.3 Z[#] - - (Move to Y Center) - G90 - F[#] - G38.3 Y[#] - - (Probe X Positioning Move, X hint/2 + Step Off Width) - G91 - F[#] - G38.3 X-[[# / 2] + [#]] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in X, X Hint + Step Off Width at Rapid Speed) - F[#] - G38.3 X[# + # + #] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (probed center calulation) - # = [[# + #] / 2] - - (calculate X Width Probed) - o110 if [# GT #] - # = [# - #] - o110 else - # = [# - #] - o110 endif - - (Completed probed width calculations) - # = [# - #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] - - (Probe Y Positioning Move, Y hint/2 + Step Off Width) - G91 - F[#] - G38.3 Y-[[# / 2] + [#]] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_plus" to Probe y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (first side Probe Completion Move to Z Clearance Plane) - G91 - F[#] - G38.3 Z[#] - - (Positioning move in Y, Y Hint + Step Off Width at Rapid Speed) - F[#] - G38.3 Y[# + # + #] - - (Probe Y Positioning Move, to Probing Depth) - F[#] - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_minus" to Probe y- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (probed center calulation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - o120 if [# GT #] - # = [# - #] - o120 else - # = [# - #] - o120 endif - - (Completed probed width calculations) - # = [# - #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - # = [[# + #] / 2] - - #1010 = # - (DEBUG, EVAL[vcp.getWidget{"averaged_diam"}.setValue{#1010}]) - - G91 - F[#] - G38.3 Z[#] - G90 - F[#] - G38.3 X[#] Y[#] - - # = [# + #] - - # = [# + #] - - (probe mode rules for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record XY Zero in selected WCO) - G10 L2 P#5220 X[#] Y[#] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_round_pocket.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_round_pocket.ngc deleted file mode 100644 index 24c4ac0f..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_round_pocket.ngc +++ /dev/null @@ -1,182 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/26/19) - -(Probe round pocket center measure x and y Diam, find xy center position) -(Start probe position is over left side edge of pocket wall) -(inside the step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x-) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - (Probe Completion Move to Z Clearance Plane, and X Zero) - G90 - F[#] - G38.3 X[#] - - (Call sub "probe_y_plus" to Probe Y+) - o call [#1][#3 + #13 / 2][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus" to Probe Y-) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - (Probe Completion Move to Z Clearance Plane, Y Zero) - G90 - F[#] - G38.3 Y[#] - - (Call sub "probe_x_minus" to Probe x-) - o call [#1][#3 + #13 / 2][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - G90 - F[#] - G38.3 X[#] - - (Call sub "probe_y_plus" to Probe Y+) - o call [#1][#3 + #13 / 2][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus" to Probe Y-) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed diameter calculations) - # = [# + #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - # = [[# + #] / 2] - - #1010 = # - (DEBUG, EVAL[vcp.getWidget{"averaged_diam"}.setValue{#1010}]) - - G90 - F[#] - G38.3 Y[#] - G91 - F[#] - G38.3 Z[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record Y Zero in selected WCO) - G10 L2 P#5220 X[# + #] - G10 L2 P#5220 Y[# + #] - (Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero) - o return - o110 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_round_pocket_center_start.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_round_pocket_center_start.ngc deleted file mode 100644 index 1a4087aa..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_round_pocket_center_start.ngc +++ /dev/null @@ -1,164 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/26/19) - -(Probe round pocket center start measure x and y Diam, find xy center position) -(Start probe position is rough center of pocket a safe distance below top edge) -(no z move will be initiated in this routine. end position is hole center) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - (Call sub "probe_x_minus" to Probe x-) - o call [#1][#3 +#13 / 2][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - (Probe Completion Move to X Zero) - G90 - F[#] - G38.3 X[#] - - (Call sub "probe_y_plus" to Probe Y+) - o call [#1][#3 + #13 / 2][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus" to Probe Y-) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - (Probe Completion Move to Y Zero) - G90 - F[#] - G38.3 Y[#] - - (Call sub "probe_x_minus" to Probe x-) - o call [#1][#3 + #13 / 2][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - G90 - F[#] - G38.3 X[#] - - (Call sub "probe_y_plus" to Probe Y+) - o call [#1][#3 + #13 / 2][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus" to Probe Y-) - o call [#1][#3 + #13][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed diameter calculations) - # = [# + #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - # = [[# + #] / 2] - - #1010 = # - (DEBUG, EVAL[vcp.getWidget{"averaged_diam"}.setValue{#1010}]) - - G90 - F[#] - G38.3 Y[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record Y Zero in selected WCO) - G10 L2 P#5220 X[# + #] - G10 L2 P#5220 Y[# + #] - o return - o110 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_valley_x.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_valley_x.ngc deleted file mode 100644 index 3976664a..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_valley_x.ngc +++ /dev/null @@ -1,105 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/25/19) - -(Probe valley in x, find Z0, X0 valley center position) -(Start probe position is over left side edge of valley wall) -(inside the step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe X Positioning Move, Step Off Width) - G91 - F[#] - G38.3 X[#] - - (Probe X Positioning Move, to Probing Depth) - F[#] - G38.3 Z-[#] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3 + #11][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - (Probe Completion Move to Z Clearance Plane, and X Zero) - G90 - F[#] - G38.3 X[#] - G91 - F[#] - G38.3 Z[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record X Zero in selected WCO) - G10 L2 P#5220 X[# + #] - o return - o110 endif - - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_valley_x_center_start.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_valley_x_center_start.ngc deleted file mode 100644 index ede6ab52..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_valley_x_center_start.ngc +++ /dev/null @@ -1,86 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 01/16/23) - -(Probe valley in x, find X zero valley center position) -(Start probe position is centered between valley walls) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - (Call sub "probe_x_minus" to Probe x- side of Workpiece) - o call [#1][#3 + #11 / 2][#4][#8][#9][#10] - - # = #5061 - - (Call sub "probe_x_plus" to Probe x+ side of Workpiece) - o call [#1][#3 + #11][#4][#8][#9][#10] - - # = #5061 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate X Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1001 = # - (DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}]) - - #1002 = # - (DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}]) - - (Probe Completion Move to X Zero) - G90 - F[#] - G38.3 X[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record X Zero in selected WCO) - G10 L2 P#5220 X[# + #] - o return - o110 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_valley_y.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_valley_y.ngc deleted file mode 100644 index 50f8e37f..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_valley_y.ngc +++ /dev/null @@ -1,102 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 04/25/19) - -(Probe valley in Y, find Z0, Y0 valley center position) -(Start probe position is over back side edge of valley wall) -(inside the step off width distance and within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - # = [# + # + #] - - (Call sub "probe_z_minus_sub" to Probe top of Workpiece) - o call [#1][#2][#5][#8][#9][#15] - - (Probe Y Positioning Move, Step Off Width) - G91 - F[#] - G38.3 Y-[#] - F[#] - G38.3 Z-[#] - - (Call sub "probe_y_plus" to Probe Y+ side of Workpiece) - o call [#1][#3][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus_sub" to Probe Y- side of Workpiece) - o call [#1][#3 + #12][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - (Probe Completion Move to Z Clearance Plane, and X Zero) - G90 - F[#] - G38.3 Y[#] - G91 - F[#] - G38.3 Z[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record X Zero in selected WCO) - G10 L2 P#5220 Y[# + #] - o return - o110 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_valley_y_center_start.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_valley_y_center_start.ngc deleted file mode 100644 index 3d5b2b12..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_valley_y_center_start.ngc +++ /dev/null @@ -1,86 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 01/16/23) - -(Probe valley in Y find Y0 valley center position) -(Start probe position is rough center between valley walls) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - # = #16 (=50) - - (Cancel G92 offsets) - G92.1 - - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (remove probe tip diam and cal offset from probed width calculations) - # = [# - [# * 2]] - - (Call sub "probe_y_plus" to Probe Y+ side of Workpiece) - o call [#1][#3 + #12 / 2][#4][#8][#9][#10] - - # = #5062 - - (Call sub "probe_y_minus_sub" to Probe Y- side of Workpiece) - o call [#1][#3 + #12][#4][#8][#9][#10] - - # = #5062 - - (probed center calculation) - # = [[# + #] / 2] - - (calculate Y Width Probed) - # = [# - #] - - (Completed probed width calculations) - # = [# + #] - - #1003 = # - (DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}]) - - #1004 = # - (DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}]) - - (Probe Completion Move to Z Clearance Plane, and X Zero) - G90 - F[#] - G38.3 Y[#] - - (probe mode rules for WCO or probe position measuring only) - o110 if [# EQ 0] - (Record X Zero in selected WCO) - G10 L2 P#5220 Y[# + #] - o return - o110 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_x_minus.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_x_minus.ngc deleted file mode 100644 index ebd5a6cd..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_x_minus.ngc +++ /dev/null @@ -1,84 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe X Minus direction and set X 0 in current WCO) -(Start probe position to the right side edge of stock) -(inside the max xy distance with the probe tip below the stock top edge) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 - # = #2 - # = #3 - # = #4 - # = #5 - # = #6 - - (Cancel G92 offsets) - G92.1 - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (Current X Position including offsets in current program units) - # = #5420 - - (Initiate Fast X- Probe) - G91 - F[#] - G38.2 X-[#] - # = #5061 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 X# - F[#] - (return from sub) - o return - o110 endif - - (Move to xy_clearance distance for slow probe) - G90 - G0 X[# + #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow X- Probe) - G91 - F[#] - G38.2 X-[# * 2] - # = #5061 - G90 - G0 X[# + #] - o120 endif - - # = [# - #] - - (defines the edge as x_probed_position for DRO reporting) - # = # - - (output to gui DRO "X PROBED POSITION") - #1005 = # - (DEBUG, EVAL[vcp.getWidget{"x_minus_probed_position"}.setValue{#1005}]) - -o endsub [#] - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_x_minus_wco.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_x_minus_wco.ngc deleted file mode 100644 index 5bcbb495..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_x_minus_wco.ngc +++ /dev/null @@ -1,102 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe X Minus direction and set X 0 in current WCO) -(Start probe position to the right side edge of stock) -(inside the max xy distance with the probe tip below the stock top edge) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (Current X Position including offsets in current program units) - # = #5420 - - (Initiate Fast X- Probe) - G91 - F[#] - G38.2 X-[#] - # = #5061 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 X# - F[#] - (return from sub) - o return - o110 endif - - (Move to xy_clearance distance for slow probe) - G90 - G0 X[# + #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow X- Probe) - G91 - F[#] - G38.2 X-[# * 2] - # = #5061 - G90 - G0 X[# + #] - o120 endif - - # = [# - #] - - (defines the edge as x_probed_position for DRO reporting) - # = # - - (output to gui DRO "X PROBED POSITION") - #1005 = # - (DEBUG, EVAL[vcp.getWidget{"x_minus_probed_position"}.setValue{#1005}]) - - (probe mode rule for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record X Zero in selected WCO) - G10 L2 P#5220 X[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_x_plus.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_x_plus.ngc deleted file mode 100644 index a9db4f83..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_x_plus.ngc +++ /dev/null @@ -1,84 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe X plus direction and set X 0 in current WCO) -(Start probe position to the left side edge of stock) -(inside the max xy distance with the probe tip below the stock top edge) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 - # = #2 - # = #3 - # = #4 - # = #5 - # = #6 - - (Cancel G92 offsets) - G92.1 - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (Current X Position including offsets in current program units) - # = #5420 - - (Initiate Fast X+ Probe) - G91 - F[#] - G38.2 X[#] - # = #5061 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 X# - F[#] - (return from sub) - o return - o110 endif - - (Move to xy_clearance distance for slow probe) - G90 - G0 X[# - #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow X+ Probe) - G91 - F[#] - G38.2 X[# * 2] - # = #5061 - G90 - G0 X[# - #] - o120 endif - - # = [# + #] - - (defines the edge as x_probed_position for DRO reporting) - # = # - - (output to gui DRO "X PROBED POSITION") - #1006 = # - (DEBUG, EVAL[vcp.getWidget{"x_plus_probed_position"}.setValue{#1006}]) - -o endsub [#] - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_x_plus_wco.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_x_plus_wco.ngc deleted file mode 100644 index 4c50daef..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_x_plus_wco.ngc +++ /dev/null @@ -1,102 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe X plus direction and set X 0 in current WCO) -(Start probe position to the left side edge of stock) -(inside the max xy distance with the probe tip below the stock top edge) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - - (Cancel G92 offsets) - G92.1 - - # = #[5201 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (Current X Position including offsets in current program units) - # = #5420 - - (Initiate Fast X+ Probe) - G91 - F[#] - G38.2 X[#] - # = #5061 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 X# - F[#] - (return from sub) - o return - o110 endif - - (Move to xy_clearance distance for slow probe) - G90 - G0 X[# - #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow X+ Probe) - G91 - F[#] - G38.2 X[# * 2] - # = #5061 - G90 - G0 X[# - #] - o120 endif - - # = [# + #] - - (defines the edge as x_probed_position for DRO reporting) - # = # - - (output to gui DRO "X PROBED POSITION") - #1006 = # - (DEBUG, EVAL[vcp.getWidget{"x_plus_probed_position"}.setValue{#1006}]) - - (probe mode rule for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record X Zero in selected WCO) - G10 L2 P#5220 X[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_y_minus.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_y_minus.ngc deleted file mode 100644 index ee604409..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_y_minus.ngc +++ /dev/null @@ -1,84 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe Y Minus direction to locate edge, end at clearance distance) -(Start probe position to the back side edge of stock) -(inside the max xy distance with the probe tip below the stock top edge) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 - # = #2 - # = #3 - # = #4 - # = #5 - # = #6 - - (Cancel G92 offsets) - G92.1 - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (Current Y Position including offsets in current program units) - # = #5421 - - (Initiate Fast Y- Probe) - G91 - F[#] - G38.2 y-[#] - # = #5062 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 Y# - F[#] - (return from sub) - o return - o110 endif - - (Move to xy_clearance distance for slow probe) - G90 - G0 Y[# + #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow Y- Probe) - G91 - F[#] - G38.2 Y-[# * 2] - # = #5062 - G90 - G0 Y[# + #] - o120 endif - - # = [#5062 - #] - - (defines the edge as y_probed_position for DRO reporting) - # = # - - (output to gui DRO "Y PROBED POSITION") - #1007 = # - (DEBUG, EVAL[vcp.getWidget{"y_minus_probed_position"}.setValue{#1007}]) - -o endsub [#] - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_y_minus_wco.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_y_minus_wco.ngc deleted file mode 100644 index ee98bb70..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_y_minus_wco.ngc +++ /dev/null @@ -1,102 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe Y Minus direction and set Y 0 in current WCO) -(Start probe position to the back side edge of stock) -(inside the max xy distance with the probe tip below the stock top edge) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - - (Cancel G92 offsets) - G92.1 - - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (Current Y Position including offsets in current program units) - # = #5421 - - (Initiate Fast Y- Probe) - G91 - F[#] - G38.2 y-[#] - # = #5062 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 Y# - F[#] - (return from sub) - o return - o110 endif - - (Move to xy_clearance distance for slow probe) - G90 - G0 Y[# + #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow Y- Probe) - G91 - F[#] - G38.2 Y-[# * 2] - # = #5062 - G90 - G0 Y[# + #] - o120 endif - - # = [#5062 - #] - - (defines the edge as y_probed_position for DRO reporting) - # = # - - (output to gui DRO "Y PROBED POSITION") - #1007 = # - (DEBUG, EVAL[vcp.getWidget{"y_minus_probed_position"}.setValue{#1007}]) - - (probe mode rule for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Y Zero in selected WCO) - G10 L2 P#5220 Y[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_y_plus.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_y_plus.ngc deleted file mode 100644 index 874a7b9a..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_y_plus.ngc +++ /dev/null @@ -1,84 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe Y plus direction to locate edge, end at clearance distance) -(Start probe position to the front side edge of stock) -(inside the max xy distance with the probe tip below the stock top edge) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 - # = #2 - # = #3 - # = #4 - # = #5 - # = #6 - - (Cancel G92 offsets) - G92.1 - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (Current Y Position including offsets in current program units) - # = #5421 - - (Initiate Fast y+ Probe) - G91 - F[#] - G38.2 Y[#] - # = #5062 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 Y# - F[#] - (return from sub) - o return - o110 endif - - (Move to xy_clearance distance for slow probe) - G90 - G0 Y[# - #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow Y+ Probe) - G91 - F[#] - G38.2 Y[# * 2] - # = #5062 - G90 - G0 Y[# - #] - o120 endif - - # = [#5062 + #] - - (defines the edge as y_probed_position for DRO reporting) - # = # - - (output to gui DRO "Y PROBED POSITION") - #1008 = # - (DEBUG, EVAL[vcp.getWidget{"y_plus_probed_position"}.setValue{#1008}]) - -o endsub [#] - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_y_plus_wco.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_y_plus_wco.ngc deleted file mode 100644 index 651f03a4..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_y_plus_wco.ngc +++ /dev/null @@ -1,102 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe Y plus direction and set Y 0 in current WCO) -(Start probe position to the front side edge of stock) -(inside the max xy distance with the probe tip below the stock top edge) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - - (Cancel G92 offsets) - G92.1 - - # = #[5202 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Probe Diameter) - # = #5410 - - (Probe Radius) - # = [# / 2] - - (Probe Centerline Offset) - # = [# - #] - - (Current Y Position including offsets in current program units) - # = #5421 - - (Initiate Fast y+ Probe) - G91 - F[#] - G38.2 Y[#] - # = #5062 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 Y# - F[#] - (return from sub) - o return - o110 endif - - (Move to xy_clearance distance for slow probe) - G90 - G0 Y[# - #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow Y+ Probe) - G91 - F[#] - G38.2 Y[# * 2] - # = #5062 - G90 - G0 Y[# - #] - o120 endif - - # = [#5062 + #] - - (defines the edge as y_probed_position for DRO reporting) - # = # - - (output to gui DRO "Y PROBED POSITION") - #1008 = # - (DEBUG, EVAL[vcp.getWidget{"y_plus_probed_position"}.setValue{#1008}]) - - (probe mode rule for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Y Zero in selected WCO) - G10 L2 P#5220 Y[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_z_minus.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_z_minus.ngc deleted file mode 100644 index 1f2bfa39..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_z_minus.ngc +++ /dev/null @@ -1,64 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe Z Minus direction to locate top, end at clearance distance) -(Start probe position is over stock within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 - # = #2 - # = #3 - # = #4 - # = #5 - - (Current Z Position including offsets in current program units) - # = #5422 - - (Initial Fast Z- Probe) - G91 - F[#] - G38.2 Z-[#] - # = #5063 - - (Probe Error check, #5070 will be 0 if failed) - o100 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 Z# - F[#] - (return from sub) - o return - o100 endif - - (Move to z_clearance height for slow probe) - G90 - G0 Z[# + #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o110 if [# GT 0] - (Initiate Slow Z- Probe) - G91 - F[#] - G38.2 Z-[# * 2] - # = #5063 - G90 - G0 Z[# + #] - o110 endif - - (defines the edge as z_probed_position for DRO reporting) - # = # - - (output to gui DRO "Z PROBED POSITION") - #1009 = # - (DEBUG, EVAL[vcp.getWidget{"z_minus_probed_position"}.setValue{#1009}]) - - # = [# + #] - -o endsub [#] - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_z_minus_sub.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_z_minus_sub.ngc deleted file mode 100644 index b74d1f3b..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_z_minus_sub.ngc +++ /dev/null @@ -1,83 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe Z Minus direction and set Z 0 in current WCO) -(Start probe position is over stock within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 - # = #2 - # = #3 - # = #4 - # = #5 - # = #6 - - (Cancel G92 offsets) - G92.1 - - # = #[5203 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Current Z Position including offsets in current program units) - # = #5422 - - (Initial Fast Z- Probe) - G91 - F[#] - G38.2 Z-[#] - # = #5063 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 Z# - F[#] - (return from sub) - o return - o110 endif - - (Move to z_clearance height for slow probe) - G90 - G0 Z[# + #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow Z- Probe) - G91 - F[#] - G38.2 Z-[# * 2] - # = #5063 - G90 - G0 Z[# + #] - o120 endif - - (defines the edge as z_probed_position for DRO reporting) - # = # - - (output to gui DRO "Z PROBED POSITION") - #1009 = # - (DEBUG, EVAL[vcp.getWidget{"z_minus_probed_position"}.setValue{#1009}]) - - # = [# + #] - - (probe mode rule for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Z zero in selected WCO) - G10 L2 P#5220 Z[# + #] - o return - o130 endif - -o endsub [#] - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_z_minus_wco.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/probe_z_minus_wco.ngc deleted file mode 100644 index d37ece9d..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_z_minus_wco.ngc +++ /dev/null @@ -1,92 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 08/13/2023) - -(Probe Z Minus direction and set Z 0 in current WCO) -(Start probe position is over stock within max z distance) -(ensure all settings have been set properly according to help diagrams) - -o sub - - (uses NGCGUI style arg spec) - (number after "=" in comment is default value) - # = #1 (=99) - # = #2 (=0.5000) - # = #3 (=0.5000) - # = #4 (=0.1000) - # = #5 (=0.1000) - # = #6 (=0.5000) - # = #7 (=0.0000) - # = #8 (=0.0) - # = #9 (=10.0) - # = #10 (=0.0000) - # = #11 (=1.0000) - # = #12 (=1.0000) - # = #13 (=1.0000) - # = #14 (=0.5000) - # = #15 (=0) - - (Cancel G92 offsets) - G92.1 - - # = #[5203 + [20 * #5220]] - - (Probe Tool Safety Check) - o100 if [#5400 NE #] - (MSG, Specified probe tool # not in spindle, aborting) - o return - o100 endif - - (Current Z Position including offsets in current program units) - # = #5422 - - (Initial Fast Z- Probe) - G91 - F[#] - G38.2 Z-[#] - # = #5063 - - (Probe Error check, #5070 will be 0 if failed) - o110 if [#5070 EQ 0] - (back to start point and feed) - G90 - G0 Z# - F[#] - (return from sub) - o return - o110 endif - - (Move to z_clearance height for slow probe) - G90 - G0 Z[# + #] - - (Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) - o120 if [# GT 0] - (Initiate Slow Z- Probe) - G91 - F[#] - G38.2 Z-[# * 2] - # = #5063 - G90 - G0 Z[# + #] - o120 endif - - (defines the edge as z_probed_position for DRO reporting) - # = # - - (output to gui DRO "Z PROBED POSITION") - #1009 = # - (DEBUG, EVAL[vcp.getWidget{"z_minus_probed_position"}.setValue{#1009}]) - - # = [# + #] - - (probe mode rule for WCO or probe position measuring only) - o130 if [# EQ 0] - (Record Z zero in selected WCO) - G10 L2 P#5220 Z[# + #] - o return - o130 endif - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/program_coolant.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/program_coolant.ngc deleted file mode 100644 index 14e87dce..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/program_coolant.ngc +++ /dev/null @@ -1,42 +0,0 @@ -(author: Chris P) -(version: 0.1) -(date: 02/13/20) - -(programmable coolant subroutine for aiming the coolant nozzle) -(settings for setup are located on probe basic setting page) -(in the programmable coolant constants container.) -(calculations assume coolant nozzle is on axis b and has been homed) -(to 0 degrees rotation aiming perpendicular to the spindle center line) -(coolant nozzle is located on the right side of the spindle head and) -(rotates counter clockwise from home position with commands) - -o sub -(PRINT, o) - - (uses NGCGUI style arg spec) - (number after equals sign in comment is default value) - # = #1 - # = #2 - # = #3 - # = #4 - - # = #5410 - - # = [# / 2] - - # = [# - #] - - # = [[#] + [#]] - - # = [ATAN[#] / [#]] - - # = [[#] + [#]] - - #1000 = # - (DEBUG, EVAL[vcp.getWidget{"coolant_final_angle"}.setValue{#1000}]) - - M68 E20 Q[#] - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/reset_all_data.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/reset_all_data.ngc deleted file mode 100644 index 9b89dde3..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/reset_all_data.ngc +++ /dev/null @@ -1,41 +0,0 @@ -o sub - -#1001 = 0 -(DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1001}]) - -#1002 = 0 -(DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1002}]) - -#1003 = 0 -(DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1003}]) - -#1004 = 0 -(DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1004}]) - -#1005 = 0 -(DEBUG, EVAL[vcp.getWidget{"x_minus_probed_position"}.setValue{#1005}]) - -#1006 = 0 -(DEBUG, EVAL[vcp.getWidget{"x_plus_probed_position"}.setValue{#1006}]) - -#1007 = 0 -(DEBUG, EVAL[vcp.getWidget{"y_minus_probed_position"}.setValue{#1007}]) - -#1008 = 0 -(DEBUG, EVAL[vcp.getWidget{"y_plus_probed_position"}.setValue{#1008}]) - -#1009 = 0 -(DEBUG, EVAL[vcp.getWidget{"z_minus_probed_position"}.setValue{#1009}]) - -#1010 = 0 -(DEBUG, EVAL[vcp.getWidget{"averaged_diam"}.setValue{#1010}]) - -#1011 = 0 -(DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}]) - -#1012 = 0 -(DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}]) - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/retractatc.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/retractatc.ngc deleted file mode 100644 index f9d400fe..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/retractatc.ngc +++ /dev/null @@ -1,15 +0,0 @@ -o sub - -M65 P0 ; Turn off carousel out solenoid -M64 P1 ; Move Carousel IN - -M66 P0 L3 Q5 ; check carousel in position sensor -o100 if [#5399 LT 0] - M65 P1 ; turn off the solenoid to send atc home - (abort, Failed to send carousel home) ; abort if the sensor does not activate in 5 seconds -o100 endif -M65 P1 - -o endsub [1] - -M2 diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/tool_touch_off.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/tool_touch_off.ngc deleted file mode 100644 index 33f10b14..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/tool_touch_off.ngc +++ /dev/null @@ -1,103 +0,0 @@ -o sub - -; NOTE this routine used G59.3, and this needs to be set to 0,0,0 for everything to work correctly - -# = #1 (set from probe screen fast probe feed rate) -# = #2 (set from probe screen slow probe feedrate) -# = #3 (max z distance the tool travels before erroring out if not contact is made) -# = #4 (max xy distance the tool travels before erroring out if not contact is made) -# = #6 (distance the tool retracts after making contact during fast feed mode) -# = #5 (G53 distance from home to spindle nose triggering point on touch plate) -# = #8 (activates the tool diameter probe subroutine section) -# = #9 (activates the tool diameter offset position for probe subroutine section) -# = #10 (current tool's diameter used for offseting probe position in x axis) - -G92.1 (Cancel G92 offset) - -# = #5220 - -# = #5181 -# = #5182 -# = #5183 - -# = [# / 2] -# = [# - #] - -G59.3 - -o100 if [# EQ 1] - # = # -o100 endif - -o110 if [2 EQ 2] - G49 -o110 endif - -G90 (set absolute coordinates) -G53 G0 Z0 (move to z0 home position) -G53 G0 X# Y# -G53 G0 Z# - -G91 -F # -G38.2 Z-[#] (fast tool probe) -# = #5063 (save probe result of fast probe to parameters) -G0 Z[#] (retract tool retract distance amount) - -(Slow Probe Rule, if Slow Probe FR is set to 0, Slow Probe is Bypassed) -o120 if [# GT 0] - (Initiate Slow Z- Probe) - G91 - F[#] (set probe slow feedrate) - G38.2 Z-[# * 2] (slow tool probe) - # = #5063 - G90 - G0 Z[# + #] -o120 endif - -o130 if [#5070 EQ 1] (verify probe event was succesful) - # = #5063 (save slow probe result to parameters) -o130 else - (MSG,Tool Length Offset Probe Failed) -o130 endif - -(Tool Diameter Probe Mode Section, User must define this section as needed) -o140 if [# EQ 1] - (MSG, Tool Diameter Probing is Not Defined in Subroutine) -o140 endif - -o150 if [3 EQ 3] - G49 -o150 endif - -G90 (set absolute coordinates) -G53 G0 Z0 (Send Spindle to home zero position) - -(define new tool length offset parameters) -# = [ABS[# + #5063]] - -G10 L1 P #5400 Z [#] (5400 = tool number) - -o160 if [# EQ 1] - G54 -o160 else if [# EQ 2] - G55 -o160 else if [# EQ 3] - G56 -o160 else if [# EQ 4] - G57 -o160 else if [# EQ 5] - G58 -o160 else if [# EQ 6] - G59 -o160 else if [# EQ 7] - G59.1 -o160 else if [# EQ 8] - G59.2 -o160 endif - -T #5400 G43 H #5400 (enable tool length offset) - -o endsub - -M2 (end program) diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/toolchange.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/toolchange.ngc deleted file mode 100644 index 21d39094..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/toolchange.ngc +++ /dev/null @@ -1,140 +0,0 @@ -o sub - -; Parameter #3989 is used to track if the carousel is homed (M13) (volatile) -; Parameter #3990 is used to track the current tool pocket (persistently) -; Parameter #3991 is used to track the current tool loaded it in the spindle (persistently) -; Parameters #4001 to #4024 are used to track which tool is in which pocket (persistently) -; Parameter #4000 is not populated just used in the maths to calculate the above numbers -; #: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets> -; # is the height you spindle needs to be at to clamp/unclamp a tool form the ATC (Set via INI [ATC]Z_TOOL_CHANGE_HEIGHT) -; # is the clearance height you spindle needs to be at to safely clear the ATC (Set via INI [ATC]Z_TOOL_CLEARANCE_HEIGHT) - -(PRINT, o selected_tool: #, tool_in_spindle: #, selected_pocket: #, current_pocket: #, task: #<_task>) - -o100 if [#<_task> EQ 0] - (DEBUG, Task is null) - o return [999] -o100 endif (this code eliminates tool missing error on load for multiple use tools) - -; default to a 12 pocket ATC (matching DynATC Widget behaviour), then update based on INI settings -# = 12 -o101 if [EXISTS[#<_ini[atc]pockets>]] - # = #<_ini[atc]pockets> -o101 endif - -# = -3.9000 -o102 if [EXISTS[#<_ini[atc]z_tool_change_height>]] - # = #<_ini[atc]z_tool_change_height> -o102 endif -# = [#<_ini[AXIS_Z]MAX_LIMIT>-0.1] -o103 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]] - # = #<_ini[atc]z_tool_clearance_height> -o103 endif - -; assign the programmable coolant parameters -# = #1 (=0) -# = #2 (=0) -# = #3 (=0) -# = #4 (=0) - -; assign the variables passed by M6 change_prolog to some parameters -#100 = # -#110 = # -#120 = # -#121 = # -; NOTE: -; The legacy names *selected_pocket* and *current_pocket* actually reference -; a sequential tooldata index for tool items loaded from a tool -; table ([EMCIO]TOOL_TABLE) or via a tooldata database ([EMCIO]DB_PROGRAM) - -o110 if [# EQ #] ; checks if tool in the spindle is same as requested - o endsub [1] - M2 -o110 endif - -o111 if [#3991 NE #] - (PRINT, o tool_in_spindle does not match 3991) -o111 endif - -# = 0 ; assigns 0 to the next pocket for a later check if the tool is found in the carousel -# = 0 -#130 = # ; assign test parameter the number of pockets in the carousel - -o120 do - o121 if [#[4000 + #130] EQ #] ; checks all pockets to see if it contains tool number requested as the new tool - # = #130 ; if tool is found in pocket, assigns the next pocket - o121 endif - o122 if [#[4000 + #130] EQ 0] ; checks if the pocket is empty, last pocket checked will be the lowest empty pocket number, for putting tool in spindle away. - # = #130 - o122 endif - #130 = [#130 - 1] -o120 while [#130 GT 0] -o130 if [# EQ 0] ; if tool is not found, aborts and sends a message - (abort, Tool T%d# not found in carousel) -o130 endif - -; now we know which pocket the next tool is sitting in -; we need to know if we need to put a tool away -; or if there is not tool in the spindle - -o140 if [# GT 0] ; checks if there is a valid tool in the spindle - o141 if [# EQ 0] ; If there is a tool in the spindle, checks if there is an open pocket - (abort, Carousel is full, cant put away tool T# in into carousel) - o141 endif - M10 P[#] ; move carousel to an open pocket - M21 ; puts the tool in spindle away into the open pocket - (DEBUG, EVAL[vcp.getWidget{"dynatc"}.store_tool{#, #}]) - #140 = # - #[4000 + #140] = # ; save tool number in pocket - #3991 = 0 ; empty tool in the spindle - M61 Q0 - G49 -o140 endif - -G90 -G0 G53 Z# ; move z to clear height - -o150 if [# GT 0] ; selected tool is not tool0 - M10 P# ; set the carousel to move to the right pocket for the selected tool - M65 P1 - M64 P0 - M66 P1 L3 Q5 ; check carousel out position sensor - o151 if [#5399 LT 0] - M65 P0 ; turn off the solenoid to send atc to tool change - (abort, Failed to send carousel home) ; abort if the sensor does not activate in 5 seconds - o151 endif - M65 P0 - - (DEBUG, EVAL[vcp.getWidget{"dynatc"}.store_tool{#, 0}]) - M22 ; Carousel out - #150 = # - #[4000 + #150] = 0 ; empty the pocket - #3991 = # ; Set persistent variable to remember tool in spindle after power cycle -o150 else - M65 P2 ; deactive drawbar - M65 P0 ; make sure ATC out solenoid is off - M64 P1 ; move carousel home - M66 P0 L3 Q4 ; check carousel in position sensor - o152 if [#5399 LT 0] - M65 P1 ; turn off the solenoid to send atc home - (abort, Failed to send carousel home) ; abort if the sensor does not activate in 5 seconds - o152 endif - M65 P1 -o150 endif - -M61 Q# - -o160 if [1 EQ 1] - G43 H# -o160 endif - -(run program_coolant sub if selected to be active in settings page with value 1) -o170 if [# EQ 1] - (run program_coolant.ngc) - o call [#][#][#][#] -o170 endif - -(PRINT, o endsub) -o endsub [1] - -M2 diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/unclamptool.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/unclamptool.ngc deleted file mode 100644 index ac9c3798..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/unclamptool.ngc +++ /dev/null @@ -1,12 +0,0 @@ -o sub - -M64 P2 ; unclamp the tool - -M66 P2 L3 Q2 ; check the unclamped tool sensor -o100 if [#5399 LT 0] - (abort, Failed to release tool) ; abort if the sensor does not activate in 2 seconds -o100 endif - -o endsub [1] - -M2 diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/x_data_reset.ngc b/linuxcnc/configs/probe_basic_lathe/subroutines/x_data_reset.ngc deleted file mode 100644 index 39bec9be..00000000 --- a/linuxcnc/configs/probe_basic_lathe/subroutines/x_data_reset.ngc +++ /dev/null @@ -1,17 +0,0 @@ -o sub - -#1001 = 0 -(DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1001}]) - -#1002 = 0 -(DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1002}]) - -#1005 = 0 -(DEBUG, EVAL[vcp.getWidget{"x_minus_probed_position"}.setValue{#1005}]) - -#1006 = 0 -(DEBUG, EVAL[vcp.getWidget{"x_plus_probed_position"}.setValue{#1006}]) - -o endsub - -M2 (end program) diff --git a/linuxcnc/nc_files/probe_basic/README.md b/linuxcnc/nc_files/probe_basic/README.md new file mode 100644 index 00000000..75e22ffa --- /dev/null +++ b/linuxcnc/nc_files/probe_basic/README.md @@ -0,0 +1,34 @@ +# Probe Basic subroutines + +This folder contains 4 sub directories with the various subroutines used by Probe Basic, details about each are further below or in the README.md in each. + +When installed/updated via apt Probe Basic will install the latests version of the of its subroutines to `/usr/share/probe_basic/nc_files` + +These files are also copied to `~/linuxcnc/nc_files`. How ever it will not overwrite existing files but will add any new files. +This ensures that any changes you make to the files at `~/linuxcnc/nc_files` are preserved during updates but new routines will be added. After updates you may wish to compare the difference between the routines at `/usr/share/probe_basic/nc_files` and `~/linuxcnc/nc_files` to see if any change have been made to existing routines. +One quick way to view a summary of changes is with `diff` and `diffstat` (this may require `sudo apt-get install -Y diff diffstat`) +`diff -u ~/linuxcnc/nc_files/probe_basic /usr/share/probe_basic/nc_files/probe_basic | diffstat` + +For a mill your INI `[RS274NGC]SUBROUTINE_PATH` should include `subroutines`, `probe` and `atc_carousel` +`SUBROUTINE_PATH = ../../nc_files/probe_basic/subroutines:../../nc_files/probe_basic/probe:../../nc_files/probe_basic/atc_carousel` + +For a lathe you should include the `lathe` folder as-well at the start +`SUBROUTINE_PATH = ../../nc_files/probe_basic/lathe:../../nc_files/probe_basic/subroutines:../../nc_files/probe_basic/probe:../../nc_files/probe_basic/atc_carousel` + +## subroutines +This folder contains some basic subroutines called from various parts of the UI +It does include the tool_touch_off routine that is used with a tool setter + +## probe +This folder contains the probing subroutines that are called form the PROBING tab + +## atc_carousel +This folder contains carousel style ATC subroutines +These routines are all called form the ATC tab in the main UI or as part of M6 remap. +They automatically support any of the of the sizes currently available (8, 10, 12, 14, 16, 18, 20, 21, 24) based on your INI's `\[ATC\]POCKETS` setting + +If you have an ATC these are the files that you most likely will need to adjust to your needs, see the README.md in the directory for more details + +## lathe +This folder contains lathe subroutines for probe_basic_lathe +Some of these are unique to the lathe UI and some are tweaked versions of routines in the other folders that override there normal behaviour diff --git a/linuxcnc/nc_files/probe_basic/atc_carousel/README.md b/linuxcnc/nc_files/probe_basic/atc_carousel/README.md new file mode 100644 index 00000000..188f5693 --- /dev/null +++ b/linuxcnc/nc_files/probe_basic/atc_carousel/README.md @@ -0,0 +1,64 @@ +# atc_carousel - Probe Basic Subroutines + +https://kcjengr.github.io/probe_basic/atc_setup.html + +This folder contains carousel ATC subroutines for `probe_basic` +These routines are all called form the ATC tab in the main UI or as part of M6 remap + +| File | Purpose | +|------------------------------------|----------------------------------------------------| +| `clamptool.ngc` | Clamp the spindle drawbar | +| `extendatc.ngc` | Move the ATC carousel under the spindle | +| `m10.ngc` | Move tool carousel best direction to pocket P | +| `m11.ngc` | Move tool carousel CCW P number of pockets | +| `m12.ngc` | Move tool carousel CW P number of pockets | +| `m13.ngc` | Move tool carousel CW until homed | +| `m21.ngc` | Move Carousel to the tool change position (OUT) then unload any tool in the spindle into the current pocket | +| `m22.ngc` | Move Carousel to the home position (IN) after loading any tool in the current pocket to the spindle | +| `m23.ngc` | Not currently used | +| `m24.ngc` | Unclamp the spindle drawbar | +| `m25.ngc` | Move the ATC carousel under the spindle | +| `m26.ngc` | Not currently used | +| `move_head_above_carousel.ngc` | Move Z to atc_z_tool_clearance_height | +| `move_tool_to_carousel_height.ngc` | Move Z to atc_z_tool_change_height | +| `retractatc.ngc` | Move the ATC carousel to the home position | +| `store_tool_in_carousel.ngc` | Store spindle tool in carousel | +| `toolchange.ngc` | Main M6 toolchange routine | +| `unclamptool.ngc` | Unclamp the spindle drawbar | + + +Three settings in your INI file set basic configuration of the carousel ATC + +``` +[ATC] +# Carousel image available for 8, 10, 12, 14, 16, 18, 20, 21, 24 +POCKETS = 12 +# The Z height you spindle needs to be at to clamp/unclamp a tool form the ATC +Z_TOOL_CHANGE_HEIGHT = -3.9000 +# The Z clearance height you spindle needs to be at to safely clear the ATC +Z_TOOL_CLEARANCE_HEIGHT = -0.1 + +``` + +`POCKETS` (defaults to 12) sets `#` +This is used in most files + + +`Z_TOOL_CHANGE_HEIGHT` (defaults to -3.9000) +`Z_TOOL_CLEARANCE_HEIGHT` (defaults to [AXIS_Z]MAX_LIMIT>-0.1) +These two set the heights used in the following files + +* m21 +* m22 +* move_head_above_carousel +* move_head_above_carousel +* extendatc + +## Hal Connections + +![HAL Connections need for ATC](/docs_src/source/images/atc_carousel_connections.png) + +## TODO: +* add `atc_z_tool_change_height` and `atc_z_tool_clearance_height` to settings UI +* m21 and m22: call move_tool_to_carousel_height instead of `G53 G0 Z#` +* extendatc, m21: call move_head_above_carousel instead of `G53 G0 Z#`` diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/clamptool.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/clamptool.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/clamptool.ngc rename to linuxcnc/nc_files/probe_basic/atc_carousel/clamptool.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/extendatc.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/extendatc.ngc similarity index 93% rename from linuxcnc/configs/atc_sim/macros_sim_inch/extendatc.ngc rename to linuxcnc/nc_files/probe_basic/atc_carousel/extendatc.ngc index 95828367..bb632203 100644 --- a/linuxcnc/configs/atc_sim/macros_sim_inch/extendatc.ngc +++ b/linuxcnc/nc_files/probe_basic/atc_carousel/extendatc.ngc @@ -12,7 +12,7 @@ o102 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]] # = #<_ini[atc]z_tool_clearance_height> o102 endif -G0 G53 Z# ; move z to clear height +G53 G0 Z# ; move z to clear height M65 P1 ; Turn off carousel home solenoid M64 P0 ; Move Carousel OUT diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/m10.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/m10.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/m10.ngc rename to linuxcnc/nc_files/probe_basic/atc_carousel/m10.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/m11.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/m11.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/m11.ngc rename to linuxcnc/nc_files/probe_basic/atc_carousel/m11.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/m12.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/m12.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/m12.ngc rename to linuxcnc/nc_files/probe_basic/atc_carousel/m12.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/m13.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/m13.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/m13.ngc rename to linuxcnc/nc_files/probe_basic/atc_carousel/m13.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/m21.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/m21.ngc similarity index 91% rename from linuxcnc/configs/atc_sim/macros_sim_inch/m21.ngc rename to linuxcnc/nc_files/probe_basic/atc_carousel/m21.ngc index 2ec9daea..2320f8bc 100644 --- a/linuxcnc/configs/atc_sim/macros_sim_inch/m21.ngc +++ b/linuxcnc/nc_files/probe_basic/atc_carousel/m21.ngc @@ -21,7 +21,7 @@ M66 P1 L3 Q1 M5 M9 G90 -G0 G53 Z# ; rapid move to above the tool change height +G53 G0 Z# ; rapid move to above the tool change height ;M19 R0 Q3 ; orient spindle @@ -35,7 +35,7 @@ o100 endif M24 ; activate drawbar, release the tool M5 ; turn off spindle lock -G0 G53 Z# ; move z to clear height +G53 G0 Z# ; move z to clear height #3991 = 0; save fact there is now no tool in the spindle diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/m22.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/m22.ngc similarity index 95% rename from linuxcnc/configs/atc_sim/macros_sim_metric/m22.ngc rename to linuxcnc/nc_files/probe_basic/atc_carousel/m22.ngc index 2e87c9a5..779ee886 100644 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/m22.ngc +++ b/linuxcnc/nc_files/probe_basic/atc_carousel/m22.ngc @@ -19,7 +19,7 @@ o102 endif M24 ;M19 R0 Q1 ;G90 -G0 G53 Z# ; rapid move to above the tool change height +G53 G0 Z# ; rapid move to above the tool change height M65 P2 ; release the drawbar to clamp the tool M5 M66 P5 L3 Q1 ; check the tool clamped sensor diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/m23.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/m23.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/m23.ngc rename to linuxcnc/nc_files/probe_basic/atc_carousel/m23.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/m24.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/m24.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/m24.ngc rename to linuxcnc/nc_files/probe_basic/atc_carousel/m24.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/m25.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/m25.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/m25.ngc rename to linuxcnc/nc_files/probe_basic/atc_carousel/m25.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/m26.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/m26.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/m26.ngc rename to linuxcnc/nc_files/probe_basic/atc_carousel/m26.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/move_head_above_carousel.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/move_head_above_carousel.ngc similarity index 92% rename from linuxcnc/configs/atc_sim/macros_sim_metric/move_head_above_carousel.ngc rename to linuxcnc/nc_files/probe_basic/atc_carousel/move_head_above_carousel.ngc index 8e3834a1..e53a44bb 100644 --- a/linuxcnc/configs/atc_sim/macros_sim_metric/move_head_above_carousel.ngc +++ b/linuxcnc/nc_files/probe_basic/atc_carousel/move_head_above_carousel.ngc @@ -12,7 +12,7 @@ o102 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]] # = #<_ini[atc]z_tool_clearance_height> o102 endif -G0 G53 Z# ; move z to clear height +G53 G0 Z# ; move z to clear height o endsub [1] diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/move_tool_to_carousel_height.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/move_tool_to_carousel_height.ngc similarity index 92% rename from linuxcnc/configs/atc_sim/macros_sim_inch/move_tool_to_carousel_height.ngc rename to linuxcnc/nc_files/probe_basic/atc_carousel/move_tool_to_carousel_height.ngc index 77215115..b2c7f441 100644 --- a/linuxcnc/configs/atc_sim/macros_sim_inch/move_tool_to_carousel_height.ngc +++ b/linuxcnc/nc_files/probe_basic/atc_carousel/move_tool_to_carousel_height.ngc @@ -11,7 +11,7 @@ o102 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]] # = #<_ini[atc]z_tool_clearance_height> o102 endif -G0 G53 Z# ; rapid move to above the tool change height +G53 G0 Z# ; rapid move to above the tool change height o endsub [1] diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/retractatc.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/retractatc.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/retractatc.ngc rename to linuxcnc/nc_files/probe_basic/atc_carousel/retractatc.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/store_tool_in_carousel.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/store_tool_in_carousel.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/store_tool_in_carousel.ngc rename to linuxcnc/nc_files/probe_basic/atc_carousel/store_tool_in_carousel.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/toolchange.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/toolchange.ngc similarity index 98% rename from linuxcnc/configs/atc_sim/macros_sim_inch/toolchange.ngc rename to linuxcnc/nc_files/probe_basic/atc_carousel/toolchange.ngc index 21d39094..d689c745 100644 --- a/linuxcnc/configs/atc_sim/macros_sim_inch/toolchange.ngc +++ b/linuxcnc/nc_files/probe_basic/atc_carousel/toolchange.ngc @@ -92,7 +92,7 @@ o140 if [# GT 0] ; checks if there is a valid tool in the spind o140 endif G90 -G0 G53 Z# ; move z to clear height +G53 G0 Z# ; move z to clear height o150 if [# GT 0] ; selected tool is not tool0 M10 P# ; set the carousel to move to the right pocket for the selected tool @@ -128,6 +128,8 @@ o160 if [1 EQ 1] G43 H# o160 endif +# = #5403 + (run program_coolant sub if selected to be active in settings page with value 1) o170 if [# EQ 1] (run program_coolant.ngc) diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/unclamptool.ngc b/linuxcnc/nc_files/probe_basic/atc_carousel/unclamptool.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/unclamptool.ngc rename to linuxcnc/nc_files/probe_basic/atc_carousel/unclamptool.ngc diff --git a/linuxcnc/nc_files/probe_basic/lathe/README.md b/linuxcnc/nc_files/probe_basic/lathe/README.md new file mode 100644 index 00000000..1d583ae1 --- /dev/null +++ b/linuxcnc/nc_files/probe_basic/lathe/README.md @@ -0,0 +1,4 @@ +# lathe - Probe Basic Subroutines + +This folder contains lathe subroutines for `probe_basic_lathe` +Some are unique to the lathe ui and some are tweaked version to override existing routines diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/backup_restore.ngc b/linuxcnc/nc_files/probe_basic/lathe/backup_restore.ngc similarity index 100% rename from linuxcnc/configs/probe_basic_lathe/subroutines/backup_restore.ngc rename to linuxcnc/nc_files/probe_basic/lathe/backup_restore.ngc diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/backup_status.ngc b/linuxcnc/nc_files/probe_basic/lathe/backup_status.ngc similarity index 100% rename from linuxcnc/configs/probe_basic_lathe/subroutines/backup_status.ngc rename to linuxcnc/nc_files/probe_basic/lathe/backup_status.ngc diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/chamfer.ngc b/linuxcnc/nc_files/probe_basic/lathe/chamfer.ngc similarity index 100% rename from linuxcnc/configs/probe_basic_lathe/subroutines/chamfer.ngc rename to linuxcnc/nc_files/probe_basic/lathe/chamfer.ngc diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/drill.ngc b/linuxcnc/nc_files/probe_basic/lathe/drill.ngc similarity index 100% rename from linuxcnc/configs/probe_basic_lathe/subroutines/drill.ngc rename to linuxcnc/nc_files/probe_basic/lathe/drill.ngc diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/facing.ngc b/linuxcnc/nc_files/probe_basic/lathe/facing.ngc similarity index 100% rename from linuxcnc/configs/probe_basic_lathe/subroutines/facing.ngc rename to linuxcnc/nc_files/probe_basic/lathe/facing.ngc diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/go_to_g30.ngc b/linuxcnc/nc_files/probe_basic/lathe/go_to_g30.ngc similarity index 100% rename from linuxcnc/configs/probe_basic_lathe/subroutines/go_to_g30.ngc rename to linuxcnc/nc_files/probe_basic/lathe/go_to_g30.ngc diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/go_to_home.ngc b/linuxcnc/nc_files/probe_basic/lathe/go_to_home.ngc similarity index 100% rename from linuxcnc/configs/probe_basic_lathe/subroutines/go_to_home.ngc rename to linuxcnc/nc_files/probe_basic/lathe/go_to_home.ngc diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/go_to_zero.ngc b/linuxcnc/nc_files/probe_basic/lathe/go_to_zero.ngc similarity index 100% rename from linuxcnc/configs/probe_basic_lathe/subroutines/go_to_zero.ngc rename to linuxcnc/nc_files/probe_basic/lathe/go_to_zero.ngc diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/m6_tool_call_main_panel.ngc b/linuxcnc/nc_files/probe_basic/lathe/m6_tool_call_main_panel.ngc similarity index 100% rename from linuxcnc/configs/probe_basic_lathe/subroutines/m6_tool_call_main_panel.ngc rename to linuxcnc/nc_files/probe_basic/lathe/m6_tool_call_main_panel.ngc diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/m6_tool_call_touch_panel.ngc b/linuxcnc/nc_files/probe_basic/lathe/m6_tool_call_touch_panel.ngc similarity index 100% rename from linuxcnc/configs/probe_basic_lathe/subroutines/m6_tool_call_touch_panel.ngc rename to linuxcnc/nc_files/probe_basic/lathe/m6_tool_call_touch_panel.ngc diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_corner_x_minus_edge_angle.ngc b/linuxcnc/nc_files/probe_basic/lathe/probe_corner_x_minus_edge_angle.ngc similarity index 100% rename from linuxcnc/configs/probe_basic_lathe/subroutines/probe_corner_x_minus_edge_angle.ngc rename to linuxcnc/nc_files/probe_basic/lathe/probe_corner_x_minus_edge_angle.ngc diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_corner_x_plus_edge_angle.ngc b/linuxcnc/nc_files/probe_basic/lathe/probe_corner_x_plus_edge_angle.ngc similarity index 100% rename from linuxcnc/configs/probe_basic_lathe/subroutines/probe_corner_x_plus_edge_angle.ngc rename to linuxcnc/nc_files/probe_basic/lathe/probe_corner_x_plus_edge_angle.ngc diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_corner_y_minus_edge_angle.ngc b/linuxcnc/nc_files/probe_basic/lathe/probe_corner_y_minus_edge_angle.ngc similarity index 100% rename from linuxcnc/configs/probe_basic_lathe/subroutines/probe_corner_y_minus_edge_angle.ngc rename to linuxcnc/nc_files/probe_basic/lathe/probe_corner_y_minus_edge_angle.ngc diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_corner_y_plus_edge_angle.ngc b/linuxcnc/nc_files/probe_basic/lathe/probe_corner_y_plus_edge_angle.ngc similarity index 100% rename from linuxcnc/configs/probe_basic_lathe/subroutines/probe_corner_y_plus_edge_angle.ngc rename to linuxcnc/nc_files/probe_basic/lathe/probe_corner_y_plus_edge_angle.ngc diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_top_back_edge_angle.ngc b/linuxcnc/nc_files/probe_basic/lathe/probe_top_back_edge_angle.ngc similarity index 100% rename from linuxcnc/configs/probe_basic_lathe/subroutines/probe_top_back_edge_angle.ngc rename to linuxcnc/nc_files/probe_basic/lathe/probe_top_back_edge_angle.ngc diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_top_front_edge_angle.ngc b/linuxcnc/nc_files/probe_basic/lathe/probe_top_front_edge_angle.ngc similarity index 100% rename from linuxcnc/configs/probe_basic_lathe/subroutines/probe_top_front_edge_angle.ngc rename to linuxcnc/nc_files/probe_basic/lathe/probe_top_front_edge_angle.ngc diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_top_left_edge_angle.ngc b/linuxcnc/nc_files/probe_basic/lathe/probe_top_left_edge_angle.ngc similarity index 100% rename from linuxcnc/configs/probe_basic_lathe/subroutines/probe_top_left_edge_angle.ngc rename to linuxcnc/nc_files/probe_basic/lathe/probe_top_left_edge_angle.ngc diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/probe_top_right_edge_angle.ngc b/linuxcnc/nc_files/probe_basic/lathe/probe_top_right_edge_angle.ngc similarity index 100% rename from linuxcnc/configs/probe_basic_lathe/subroutines/probe_top_right_edge_angle.ngc rename to linuxcnc/nc_files/probe_basic/lathe/probe_top_right_edge_angle.ngc diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/radius.ngc b/linuxcnc/nc_files/probe_basic/lathe/radius.ngc similarity index 100% rename from linuxcnc/configs/probe_basic_lathe/subroutines/radius.ngc rename to linuxcnc/nc_files/probe_basic/lathe/radius.ngc diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/set_g30_position.ngc b/linuxcnc/nc_files/probe_basic/lathe/set_g30_position.ngc similarity index 100% rename from linuxcnc/configs/probe_basic_lathe/subroutines/set_g30_position.ngc rename to linuxcnc/nc_files/probe_basic/lathe/set_g30_position.ngc diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/set_mt_x_sub.ngc b/linuxcnc/nc_files/probe_basic/lathe/set_mt_x_sub.ngc similarity index 100% rename from linuxcnc/configs/probe_basic_lathe/subroutines/set_mt_x_sub.ngc rename to linuxcnc/nc_files/probe_basic/lathe/set_mt_x_sub.ngc diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/set_mt_z_sub.ngc b/linuxcnc/nc_files/probe_basic/lathe/set_mt_z_sub.ngc similarity index 100% rename from linuxcnc/configs/probe_basic_lathe/subroutines/set_mt_z_sub.ngc rename to linuxcnc/nc_files/probe_basic/lathe/set_mt_z_sub.ngc diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/tapping.ngc b/linuxcnc/nc_files/probe_basic/lathe/tapping.ngc similarity index 100% rename from linuxcnc/configs/probe_basic_lathe/subroutines/tapping.ngc rename to linuxcnc/nc_files/probe_basic/lathe/tapping.ngc diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/threading.ngc b/linuxcnc/nc_files/probe_basic/lathe/threading.ngc similarity index 100% rename from linuxcnc/configs/probe_basic_lathe/subroutines/threading.ngc rename to linuxcnc/nc_files/probe_basic/lathe/threading.ngc diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/touch_off_x.ngc b/linuxcnc/nc_files/probe_basic/lathe/touch_off_x.ngc similarity index 100% rename from linuxcnc/configs/probe_basic_lathe/subroutines/touch_off_x.ngc rename to linuxcnc/nc_files/probe_basic/lathe/touch_off_x.ngc diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/touch_off_z.ngc b/linuxcnc/nc_files/probe_basic/lathe/touch_off_z.ngc similarity index 100% rename from linuxcnc/configs/probe_basic_lathe/subroutines/touch_off_z.ngc rename to linuxcnc/nc_files/probe_basic/lathe/touch_off_z.ngc diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/touch_x.ngc b/linuxcnc/nc_files/probe_basic/lathe/touch_x.ngc similarity index 100% rename from linuxcnc/configs/probe_basic_lathe/subroutines/touch_x.ngc rename to linuxcnc/nc_files/probe_basic/lathe/touch_x.ngc diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/touch_z.ngc b/linuxcnc/nc_files/probe_basic/lathe/touch_z.ngc similarity index 100% rename from linuxcnc/configs/probe_basic_lathe/subroutines/touch_z.ngc rename to linuxcnc/nc_files/probe_basic/lathe/touch_z.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/x_data_reset.ngc b/linuxcnc/nc_files/probe_basic/lathe/x_data_reset.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/x_data_reset.ngc rename to linuxcnc/nc_files/probe_basic/lathe/x_data_reset.ngc diff --git a/linuxcnc/configs/probe_basic_lathe/subroutines/z_data_reset.ngc b/linuxcnc/nc_files/probe_basic/lathe/z_data_reset.ngc similarity index 100% rename from linuxcnc/configs/probe_basic_lathe/subroutines/z_data_reset.ngc rename to linuxcnc/nc_files/probe_basic/lathe/z_data_reset.ngc diff --git a/linuxcnc/nc_files/probe_basic/probe/README.md b/linuxcnc/nc_files/probe_basic/probe/README.md new file mode 100644 index 00000000..c3e4db6c --- /dev/null +++ b/linuxcnc/nc_files/probe_basic/probe/README.md @@ -0,0 +1,4 @@ +# probe - Probe Basic Subroutines + +This folder contains probing subroutines for `probe_basic` +These routines are all called form the PROBE tab in the main UI diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_back_left_inside_corner.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_back_left_inside_corner.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_back_left_inside_corner.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_back_left_inside_corner.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_back_left_top_corner.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_back_left_top_corner.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_back_left_top_corner.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_back_left_top_corner.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_back_right_inside_corner.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_back_right_inside_corner.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_back_right_inside_corner.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_back_right_inside_corner.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_back_right_top_corner.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_back_right_top_corner.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_back_right_top_corner.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_back_right_top_corner.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_back_top_side.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_back_top_side.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_back_top_side.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_back_top_side.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_cal_reset.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_cal_reset.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_cal_reset.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_cal_reset.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_cal_round_boss.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_cal_round_boss.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_cal_round_boss.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_cal_round_boss.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_cal_round_pocket.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_cal_round_pocket.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_cal_round_pocket.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_cal_round_pocket.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_cal_square_boss.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_cal_square_boss.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_cal_square_boss.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_cal_square_boss.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_cal_square_pocket.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_cal_square_pocket.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_cal_square_pocket.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_cal_square_pocket.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_corner_x_minus_edge_angle.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_corner_x_minus_edge_angle.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_corner_x_minus_edge_angle.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_corner_x_minus_edge_angle.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_corner_x_plus_edge_angle.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_corner_x_plus_edge_angle.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_corner_x_plus_edge_angle.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_corner_x_plus_edge_angle.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_corner_y_minus_edge_angle.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_corner_y_minus_edge_angle.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_corner_y_minus_edge_angle.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_corner_y_minus_edge_angle.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_corner_y_plus_edge_angle.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_corner_y_plus_edge_angle.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_corner_y_plus_edge_angle.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_corner_y_plus_edge_angle.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_front_left_inside_corner.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_front_left_inside_corner.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_front_left_inside_corner.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_front_left_inside_corner.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_front_left_top_corner.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_front_left_top_corner.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_front_left_top_corner.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_front_left_top_corner.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_front_right_inside_corner.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_front_right_inside_corner.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_front_right_inside_corner.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_front_right_inside_corner.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_front_right_top_corner.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_front_right_top_corner.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_front_right_top_corner.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_front_right_top_corner.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_front_top_side.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_front_top_side.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_front_top_side.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_front_top_side.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_left_top_side.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_left_top_side.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_left_top_side.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_left_top_side.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_rect_boss.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_rect_boss.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_rect_boss.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_rect_boss.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_rect_pocket.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_rect_pocket.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_rect_pocket.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_rect_pocket.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_rect_pocket_center_start.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_rect_pocket_center_start.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_rect_pocket_center_start.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_rect_pocket_center_start.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_ridge_x.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_ridge_x.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_ridge_x.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_ridge_x.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_ridge_y.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_ridge_y.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_ridge_y.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_ridge_y.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_right_top_side.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_right_top_side.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_right_top_side.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_right_top_side.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_round_boss.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_round_boss.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_round_boss.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_round_boss.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_round_pocket.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_round_pocket.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_round_pocket.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_round_pocket.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_round_pocket_center_start.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_round_pocket_center_start.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_round_pocket_center_start.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_round_pocket_center_start.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_top_back_edge_angle.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_top_back_edge_angle.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_top_back_edge_angle.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_top_back_edge_angle.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_top_front_edge_angle.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_top_front_edge_angle.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_top_front_edge_angle.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_top_front_edge_angle.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_top_left_edge_angle.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_top_left_edge_angle.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_top_left_edge_angle.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_top_left_edge_angle.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_top_right_edge_angle.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_top_right_edge_angle.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_top_right_edge_angle.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_top_right_edge_angle.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_valley_x.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_valley_x.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_valley_x.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_valley_x.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_valley_x_center_start.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_valley_x_center_start.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_valley_x_center_start.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_valley_x_center_start.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_valley_y.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_valley_y.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_valley_y.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_valley_y.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_valley_y_center_start.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_valley_y_center_start.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_valley_y_center_start.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_valley_y_center_start.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_x_minus.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_x_minus.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_x_minus.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_x_minus.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_x_minus_wco.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_x_minus_wco.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_x_minus_wco.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_x_minus_wco.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_x_plus.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_x_plus.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_x_plus.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_x_plus.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_x_plus_wco.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_x_plus_wco.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_x_plus_wco.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_x_plus_wco.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_y_minus.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_y_minus.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_y_minus.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_y_minus.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_y_minus_wco.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_y_minus_wco.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_y_minus_wco.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_y_minus_wco.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_y_plus.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_y_plus.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_y_plus.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_y_plus.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_y_plus_wco.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_y_plus_wco.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_y_plus_wco.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_y_plus_wco.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_z_minus.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_z_minus.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_z_minus.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_z_minus.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_z_minus_sub.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_z_minus_sub.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_z_minus_sub.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_z_minus_sub.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/probe_z_minus_wco.ngc b/linuxcnc/nc_files/probe_basic/probe/probe_z_minus_wco.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/probe_z_minus_wco.ngc rename to linuxcnc/nc_files/probe_basic/probe/probe_z_minus_wco.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/reset_all_data.ngc b/linuxcnc/nc_files/probe_basic/probe/reset_all_data.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/reset_all_data.ngc rename to linuxcnc/nc_files/probe_basic/probe/reset_all_data.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_metric/x_data_reset.ngc b/linuxcnc/nc_files/probe_basic/probe/x_data_reset.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_metric/x_data_reset.ngc rename to linuxcnc/nc_files/probe_basic/probe/x_data_reset.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/y_data_reset.ngc b/linuxcnc/nc_files/probe_basic/probe/y_data_reset.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/y_data_reset.ngc rename to linuxcnc/nc_files/probe_basic/probe/y_data_reset.ngc diff --git a/linuxcnc/nc_files/probe_basic/subroutines/README.md b/linuxcnc/nc_files/probe_basic/subroutines/README.md new file mode 100644 index 00000000..20c638e4 --- /dev/null +++ b/linuxcnc/nc_files/probe_basic/subroutines/README.md @@ -0,0 +1,3 @@ +# subroutines - Probe Basic Subroutines + +This folder contains basic subroutines for `probe_basic` diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/go_to_g30.ngc b/linuxcnc/nc_files/probe_basic/subroutines/go_to_g30.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/go_to_g30.ngc rename to linuxcnc/nc_files/probe_basic/subroutines/go_to_g30.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/go_to_home.ngc b/linuxcnc/nc_files/probe_basic/subroutines/go_to_home.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/go_to_home.ngc rename to linuxcnc/nc_files/probe_basic/subroutines/go_to_home.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/go_to_zero.ngc b/linuxcnc/nc_files/probe_basic/subroutines/go_to_zero.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/go_to_zero.ngc rename to linuxcnc/nc_files/probe_basic/subroutines/go_to_zero.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/load_spindle_safety.ngc b/linuxcnc/nc_files/probe_basic/subroutines/load_spindle_safety.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/load_spindle_safety.ngc rename to linuxcnc/nc_files/probe_basic/subroutines/load_spindle_safety.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/load_spindle_safety_2.ngc b/linuxcnc/nc_files/probe_basic/subroutines/load_spindle_safety_2.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/load_spindle_safety_2.ngc rename to linuxcnc/nc_files/probe_basic/subroutines/load_spindle_safety_2.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/m6_tool_call_atc_page.ngc b/linuxcnc/nc_files/probe_basic/subroutines/m6_tool_call_atc_page.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/m6_tool_call_atc_page.ngc rename to linuxcnc/nc_files/probe_basic/subroutines/m6_tool_call_atc_page.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/m6_tool_call_main_panel.ngc b/linuxcnc/nc_files/probe_basic/subroutines/m6_tool_call_main_panel.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/m6_tool_call_main_panel.ngc rename to linuxcnc/nc_files/probe_basic/subroutines/m6_tool_call_main_panel.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/m6_tool_call_tool_page.ngc b/linuxcnc/nc_files/probe_basic/subroutines/m6_tool_call_tool_page.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/m6_tool_call_tool_page.ngc rename to linuxcnc/nc_files/probe_basic/subroutines/m6_tool_call_tool_page.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/on_abort.ngc b/linuxcnc/nc_files/probe_basic/subroutines/on_abort.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/on_abort.ngc rename to linuxcnc/nc_files/probe_basic/subroutines/on_abort.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/orientspindle.ngc b/linuxcnc/nc_files/probe_basic/subroutines/orientspindle.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/orientspindle.ngc rename to linuxcnc/nc_files/probe_basic/subroutines/orientspindle.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/program_coolant.ngc b/linuxcnc/nc_files/probe_basic/subroutines/program_coolant.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/program_coolant.ngc rename to linuxcnc/nc_files/probe_basic/subroutines/program_coolant.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/set_g30_position.ngc b/linuxcnc/nc_files/probe_basic/subroutines/set_g30_position.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/set_g30_position.ngc rename to linuxcnc/nc_files/probe_basic/subroutines/set_g30_position.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/tool_touch_off.ngc b/linuxcnc/nc_files/probe_basic/subroutines/tool_touch_off.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/tool_touch_off.ngc rename to linuxcnc/nc_files/probe_basic/subroutines/tool_touch_off.ngc diff --git a/linuxcnc/configs/atc_sim/macros_sim_inch/tool_touch_off_entire_carousel.ngc b/linuxcnc/nc_files/probe_basic/subroutines/tool_touch_off_entire_carousel.ngc similarity index 100% rename from linuxcnc/configs/atc_sim/macros_sim_inch/tool_touch_off_entire_carousel.ngc rename to linuxcnc/nc_files/probe_basic/subroutines/tool_touch_off_entire_carousel.ngc