quacks-ingredients: gcode manipulation

extra Z for moves from dinge to dinge

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/quacks-ingredients-make-copy-gcodes b/quacks-ingredients-make-copy-gcodes
index 512d5fe83798cbb8e2bbfe57f95dda06d71a8607..df1c3e9c1e16a9f40cf73e4ed672020d79ffd481 100755 (executable)
--- a/quacks-ingredients-make-copy-gcodes
+++ b/quacks-ingredients-make-copy-gcodes
@@ -43,17 +43,17 @@ for l in 2 4 5; do
        gh
        perl -i~ -0777 -pe '
                s{
-                       ^G1 \ Z([0-9.]+) \n
-               (       ^G0 \ F(\d+) \ X\S+ \ Y\S+ \n
-                       (?: ; .* )?
-                       ^G1 \ Z([0-9.]+) \n     )
+                       ^G1 \ Z([0-9.]+) \s*\n
+               (       ^G0 \ F(\d+) \ X\S+ \ Y\S+ \s*\n
+                       (?: ; .* \s*\n )?
+                       ^G1 \ Z([0-9.]+) \s*\n  )
                }{
                        die unless $1 > $4;
                        die unless $3 > 9000;
-                       "G0 F$2\n".
-                       "G1 Z".($3 + 0.5)."\n" .
+                       "G0 F$3\n".
+                       "G1 Z".($4 + 0.5)."\n" .
                        $2
-               }mxe
+               }gmxe or die;
        ' $g
 done