Subroutines: improve abort messages, especially 'tool not in carousel'

Author: dpslwk

configs/atc_sim/macros_sim_inch/clamptool.ngc

@@ -4,7 +4,7 @@ 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
+    (abort, Failed to release tool) ; abort if the sensor does not activate in 2 seconds
 o100 endif
 
 o<clamptool> endsub [1]

configs/atc_sim/macros_sim_inch/extendatc.ngc

@@ -20,7 +20,7 @@ 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)
+    (abort, ATC not in position)
 o100 endif
 
 o<extendatc> endsub [1]

configs/atc_sim/macros_sim_inch/m10.ngc

@@ -4,7 +4,7 @@ o<m10> 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)
 ; #<number_of_pockets>: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets>
-(PRINT, o<M10> P#<p>)
+(PRINT, o<m10> P#<p>)
 
 o100 if [#3989 NE 1]
     M13
@@ -17,7 +17,7 @@ o101 if [EXISTS[#<_ini[atc]pockets>]]
 o101 endif
 
 #<steps> = [#3990 - #<p>]
-(PRINT, o<M10> P#<p>, steps=#<steps>)
+(PRINT, o<m10> P#<p>, steps=#<steps>)
 o110 if [#<steps> GT [#<number_of_pockets> / 2]]
     #<steps>=[#<steps> - #<number_of_pockets>]
 o110 endif
@@ -31,6 +31,7 @@ o130 elseif [#<steps> LT 0]
     M11 P[#<steps>]
 o130 endif
 
+(PRINT, o<m10> endsub)
 o<m10> endsub [1]
 
 M2

configs/atc_sim/macros_sim_inch/m11.ngc

@@ -5,7 +5,7 @@ o<m11> 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)
 ; #<number_of_pockets>: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets>
-(PRINT, o<M11> P#<p>)
+(PRINT, o<m11> P#<p>)
 
 o100 if [#3989 NE 1]
     (PRINT, atc not homed, homing)
@@ -34,7 +34,7 @@ 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)
+        (abort, Failed to get rotation index)
     o130 endif
     #3990 = [[[#3990+2] MOD #<number_of_pockets>]-1] ; Pocket is no.1-#<number_of_pockets>
     #<steps_to_move> = [#<steps_to_move>-1]
@@ -44,6 +44,7 @@ M65 P4 ; Stop motor
 
 #<_my_current_pocket> = #3990
 
+(PRINT, o<m11> endsub)
 o<m11> endsub [1]
 
 M2

configs/atc_sim/macros_sim_inch/m12.ngc

@@ -5,7 +5,7 @@ o<m12> 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)
 ; #<number_of_pockets>: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets>
-(PRINT, o<M12> P#<p>)
+(PRINT, o<m12> P#<p>)
 
 o100 if [#3989 NE 1]
     (PRINT, atc not homed, homing)
@@ -34,7 +34,7 @@ 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)
+        (abort, Failed to get rotation index)
     o130 endif
     #3990 = [[[#3990-2] MOD #<number_of_pockets>]+1] ; Pocket is no.1-#<number_of_pockets>
     #<steps_to_move> = [#<steps_to_move>-1]
@@ -44,6 +44,7 @@ M65 P3 ; Stop motor
 
 #<_my_current_pocket> = #3990
 
+(PRINT, o<m12> endsub)
 o<m12> endsub [1]
 
 M2

configs/atc_sim/macros_sim_inch/m13.ngc

@@ -4,15 +4,15 @@ o<m13> 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)
 ; #<number_of_pockets>: The number of pockets in the ATC is automaticity pulled from the INI via #<_ini[atc]pockets>
-(PRINT, o<M13>)
+(PRINT, o<m13>)
 
 (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)
+    (abort, Failed to home carousel)
 o100 endif
 
 #3990 = 1
@@ -36,6 +36,7 @@ o120 endwhile
 
 M61 Q#3991 G43 H#3991 #5210 = 0
 
+(PRINT, o<m13> endsub)
 o<m13> endsub [1]
 
 M2

configs/atc_sim/macros_sim_inch/m21.ngc

@@ -5,7 +5,7 @@ o<m21> sub
 ; Parameter #3991 is used to track the current tool loaded it in the spindle (persistently)
 ; #<atc_z_tool_change_height> 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)
 ; #<atc_z_tool_clearance_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<M21>)
+(PRINT, o<m21>)
 
 #<atc_z_tool_change_height> = -3.9000
 o101 if [EXISTS[#<_ini[atc]z_tool_change_height>]]
@@ -29,7 +29,7 @@ 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)
+    (abort, ATC not in position)
 o100 endif
 
 M24 ; activate drawbar, release the tool
@@ -39,6 +39,7 @@ G0 G53 Z#<atc_z_tool_clearance_height> ; move z to clear height
 
 #3991 = 0; save fact there is now no tool in the spindle
 
+(PRINT, o<m21> endsub)
 o<m21> endsub [1]
 
 M2

configs/atc_sim/macros_sim_inch/m22.ngc

@@ -4,7 +4,7 @@ o<m22> sub
 ; after loading any tool in the current pocket to the spindle
 ; #<atc_z_tool_change_height> 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)
 ; #<atc_z_tool_clearance_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<M22>)
+(PRINT, o<m22>)
 
 #<atc_z_tool_change_height> = -3.9000
 o101 if [EXISTS[#<_ini[atc]z_tool_change_height>]]
@@ -24,18 +24,19 @@ 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)
+    (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
+    (abort, Failed to send carousel home) ; abort if the sensor does not activate in 5 seconds
 o110 endif
 
 ;M65 P1
 
+(PRINT, o<m22> endsub)
 o<m22> endsub [1]
 
 M2

configs/atc_sim/macros_sim_inch/m24.ngc

@@ -8,6 +8,7 @@ o100 if [#5399 LT 0]
     (abort, failed to release tool) ; abort if the sensor does not activate in 3 seconds
 o100 endif
 
+(PRINT, o<m24> endsub)
 o<m24> endsub [1]
 
 M2

configs/atc_sim/macros_sim_inch/m25.ngc

@@ -6,9 +6,10 @@ 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)
+    (abort, ATC not in position)
 o100 endif
 
+(PRINT, o<m25> endsub)
 o<m25> endsub [1]
 
 M2