Improve formating of touchoff-z-to-bead.ngc

3040T.hal

@@ -26,7 +26,6 @@ addf stepgen.update-freq servo-thread
 addf dsmono.0 servo-thread
 
 #Pin Assignments
-
 net estop-out       => parport.0.pin-01-out
 net xstep           => parport.0.pin-02-out
 setp parport.0.pin-02-out-reset 1

M100

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-cd ~/linuxcnc/scannout/default
-
-LAST=$(find . -maxdepth 1 -name "*.jpg" -type f -printf "%p\n" | sed -e s/.\\/out-//g -e s/.jpg//g | sort -g | tail -1)
-cnccapture -D /dev/v4l/by-id/usb-Etron_Technology__Inc._XWJ200-video-index0 out-$(($LAST + 1)).jpg

M101

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-rm ~/linuxcnc/scannout/default/* 2> /dev/null
-exit 0

M102

@@ -1,32 +0,0 @@
-#!/bin/bash
-
-cd ~/linuxcnc/scannout/multiscan
-
-if [ -p /tmp/CNCCaptureCtl ]
-then 
-    echo exit > /tmp/CNCCaptureCtl
-    sleep 2
-fi
-
-LAST=$(find . -maxdepth 1 -type d -printf "%p\n" | sed -e s/.\\///g | sort -g | tail -1)
-
-re='^[0-9]+$'
-if ! [[ $LAST =~ $re ]] ; then
-  LAST=0
-fi
-
-mkdir $(($LAST+1))
-
-cnccapture -d -D /dev/v4l/by-id/usb-Etron_Technology__Inc._XWJ200-video-index0 ~/linuxcnc/scannout/multiscan/$(($LAST+1))/ &
-
-sleep 3
-
-for i in {1..600}
-do
-    if [ -f /tmp/CNCCaptureRdy ]; then 
-        break
-    else 
-        sleep 0.1
-    fi
-done
-

M103

@@ -1,24 +0,0 @@
-#!/bin/bash
-
-ctlPipe=/tmp/CNCCaptureCtl
-
-if [[ -p $ctlPipe  ]]
-then
-    echo snap > "$ctlPipe"
-    sleep 0.5
-    
-    for i in {1..600}
-    do
-        sleep 0.1
-        if [ -f /tmp/CNCCaptureRdy ]; then 
-            echo "redy"
-            break 
-        fi
-    done
-    
-    exit 0
-else
-    echo "no ctlPipe"
-    exit 1
-fi
-

M104

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-if [ -p /tmp/CNCCaptureCtl ]
-then
-    echo exit > /tmp/CNCCaptureCtl
-    sleep 1
-    exit 0
-else
-    exit 1
-fi
-
-

custom_postgui.hal

@@ -16,7 +16,7 @@ net sigIoctlAir iocontrol.0.coolant-mist => xor2.1.in1
 net air <= xor2.1.out
 net air => cncextension.wr2
 
-#alcohol
+# alcohol
 net alcohol pyvcp.alcohol-scale-i => cncextension.pwm
 net alcoholPrime pyvcp.prime-chkbtn => cncextension.pwmPrime
 
@@ -36,17 +36,17 @@ net g10l20x20y20 halui.mdi-command-06 <= pyvcp.microscope-btn
 net g53g10l20pin halui.mdi-command-07 <= pyvcp.touchoffpin-btn
 net touchofzpin halui.mdi-command-08 <= pyvcp.touchofz-btn
 
-#Collisionavoid
+# Collisionavoid
 
 net collision-stop => pyvcp.collision-led
 net chuck pyvcp.chuck-chkbtn => collisionavoid.chuck
 setp pyvcp.chuck-chkbtn.changepin 1
 
-#Autolevel
+# Autolevel
 net levelpin pyvcp.level-chkbtn => compensation.enable-in
 net runalprobe halui.mdi-command-09 <= pyvcp.alprobe-btn
 
-#Autolevel spinbox display
+# Autolevel spinbox display
 net alprsx pyvcp.alprsx => pyvcp.alprsxDisp
 net alprsy pyvcp.alprsy => pyvcp.alprsyDisp
 net alintervl pyvcp.alintervl => pyvcp.alintervlDisp

touchoff-z-to-bead.ngc

@@ -1,37 +1,37 @@
 o<touchoff-z-to-Bead> sub
-#<_TravelZ> =          0     ( machine Z coordinate for travelling, typically near max Z to avoid ever hitting the work )
-#<_ProbeX> =          9.5     ( machine X coordinate of switch/touch-off plate )
-#<_ProbeY> =            24.5     ( machine Y coordinate of switch/touch-off plate )
-#<_ProbeFastZ> =        -20    ( machine Z coord to move to before starting probe, longest tool should not touch switch at this Z )
-#<_ProbeMinZ> =       -70     ( machine Z coord to stop probe, shortest tool must touch switch at this Z, must be > min Z )
-#<_ProbeRetract> =      0.5     ( small distance to retract before approaching switch/touch-off plate second time )
-#<_ProbeFastFeed> =   3000     ( feed rate for moving to _ProbeFastZ )
-#<_ProbeFeed1> =       750    ( feed rate for touching switch/touch-off plate first time )
-#<_ProbeFeed2> =       3     ( feed rate for touching switch/touch-off plate second time )
+#<_TravelZ> = 0 ( machine Z coordinate for travelling, typically near max Z to avoid ever hitting the work )
+#<_ProbeX> = 9.5 ( machine X coordinate of switch/touch-off plate )
+#<_ProbeY> = 24.5 ( machine Y coordinate of switch/touch-off plate )
+#<_ProbeFastZ> = -20 ( machine Z coord to move to before starting probe, longest tool should not touch switch at this Z )
+#<_ProbeMinZ> = -70 ( machine Z coord to stop probe, shortest tool must touch switch at this Z, must be > min Z )
+#<_ProbeRetract> = 0.5 ( small distance to retract before approaching switch/touch-off plate second time )
+#<_ProbeFastFeed> = 3000 ( feed rate for moving to _ProbeFastZ )
+#<_ProbeFeed1> = 750 ( feed rate for touching switch/touch-off plate first time )
+#<_ProbeFeed2> = 3 ( feed rate for touching switch/touch-off plate second time )
 
-#<_ProbeToBeadZ>     = 13.1
+#<_ProbeToBeadZ> = 13.1
 
 m73 
-G30.1                                          ( save current position in #5181-#5183... )
-G49                                            ( clear tool length compensation )
-G90                                            ( use absolute positioning here )
-G94                                            ( use feedrate in units/min )
-G40                                            ( turn cutter radius compensation off here )
-G54												(use coordinate system 1)
+G30.1 ( save current position in #5181-#5183... )
+G49 ( clear tool length compensation )
+G90 ( use absolute positioning here )
+G94 ( use feedrate in units/min )
+G40 ( turn cutter radius compensation off here )
+G54 (use coordinate system 1)
 M49 (disable spindle speed and feed rate override controls)
-G53 G0 Z[#<_TravelZ>]     					 	( go to high travel level on Z )
-G53 G0 X[#<_ProbeX>] Y[#<_ProbeY>]           		( to probe switch )
-G53 G1 F[#<_ProbeFastFeed>] Z[#<_ProbeFastZ>]		( move tool closer to switch -- we shouldn't hit it )
-G54 G1 F[#<_ProbeFeed1>] G91                 		( use relative positioning )
+G53 G0 Z[#<_TravelZ>] ( go to high travel level on Z )
+G53 G0 X[#<_ProbeX>] Y[#<_ProbeY>] ( to probe switch )
+G53 G1 F[#<_ProbeFastFeed>] Z[#<_ProbeFastZ>] ( move tool closer to switch -- we shouldn't hit it )
+G54 G1 F[#<_ProbeFeed1>] G91 ( use relative positioning )
 
 G38.2 Z[#<_ProbeMinZ> - #<_ProbeFastZ>] F[#<_ProbeFeed1>]    ( trip switch slowly )
 G4 P0.1
-G0 Z[#<_ProbeRetract>]      	     	            ( go up slightly )
+G0 Z[#<_ProbeRetract>] ( go up slightly )
 G38.2 Z[#<_ProbeRetract>*-1.25] F[#<_ProbeFeed2>]   ( trip switch very slowly )
-G90                      	            	        ( use absolute positioning )
+G90 ( use absolute positioning )
 G10 L20 p0 z[#<_ProbeToBeadZ>]
 (DEBUG, #5063)
-G53 G0 Z[#<_TravelZ>]      					 		( return to safe level )
+G53 G0 Z[#<_TravelZ>] ( return to safe level )
 G53 G0 X[#5181] Y[#5182]
 G53 G0 Z[#5183]
 M48 (enable spindle speed and feed rate override controls)