X moving before W axis retracts

M6 T1 (6mm dia end mill)

#<offset> = 10
#<numholes> = 2
#<feedrate> = 1500

;G52 X100 Y100 (Local Coordinate System Offset)

G0 X0 Y0 W2
o<holes_5mm> call [0] [#<numholes>] [10] [#<offset>] [#<feedrate>]
G0 X0 Y0 W2
o<holes_5mm> call [45] [#<numholes>] [10] [#<offset>] [#<feedrate>]
G0 X0 Y0 W2
o<holes_5mm> call [90] [#<numholes>] [10] [#<offset>] [#<feedrate>]
G0 X0 Y0 W2
o<holes_5mm> call [135] [#<numholes>] [10] [#<offset>] [#<feedrate>]
G0 X0 Y0 W2
o<holes_5mm> call [180] [#<numholes>] [10] [#<offset>] [#<feedrate>]
G0 X0 Y0 W2
o<holes_5mm> call [225] [#<numholes>] [10] [#<offset>] [#<feedrate>]
G0 X0 Y0 W2
o<holes_5mm> call [270] [#<numholes>] [10] [#<offset>] [#<feedrate>]
G0 X0 Y0 W2
o<holes_5mm> call [315] [#<numholes>] [10] [#<offset>] [#<feedrate>]

;G52 X0 Y0

M2

(filename holes_6mm.ngc)
(Row of holes from current position going at an angle - 0 East, 90 North etc)
(Hafele 013.15.715 screws need about 8mm deep holes @ 5mm dia)
(Hafele 329.71.523 hinge dowel cam need ~11mm deep holes @ 5mm dia @ 32mm centres)
(Hafele 329.74.513 hinge mount plate 3mm steel euro screw needs ~11.3mm deep holes @ 5mm dia @ 32mm centres)
(Bunnings shelf panels - predrilled 12mm deep holes @ 32mm centres)

o<holes_5mm> sub

#<angle> = #1
#<numHoles> = #2
#<holeSpacing> = #3
#<offset> = #4
#<feedrate> = #5

#<ox> = #5420
#<oy> = #5421
#<ow> = #5428

;(DEBUG,Test debug!!)

#10=0
O1 while [#10 lt #<numHoles>]
    #<distance> = [#<offset> + #10 * #<holeSpacing>]
    #<xx> = [cos[#<angle>] * #<distance>] (adj = COS a * hyp)
    #<yy> = [sin[#<angle>] * #<distance>] (opp = SIN a * hyp)

    G0 X[#<ox> + #<xx>] Y[#<oy> + #<yy>]

    G1 W-12 F[#<feedrate>] (Drill hole)
    G00 W[#<ow>] (retract to rapid height)
    #10 = [#10 + 1]
O1 endwhile

o<holes_5mm> endsub
M2

O1 while [#10 lt #<numHoles>]
    M66 E0 L0
    #<distance> = [#<offset> + #10 * #<holeSpacing>]
    #<xx> = [cos[#<angle>] * #<distance>] (adj = COS a * hyp)
    #<yy> = [sin[#<angle>] * #<distance>] (opp = SIN a * hyp)

    G0 X[#<ox> + #<xx>] Y[#<oy> + #<yy>]

    G1 W-12 F[#<feedrate>] (Drill hole)
    G00 W[#<ow>] (retract to rapid height)
    #10 = [#10 + 1]
    M66 E0 L0
O1 endwhile