quacks-ingredients: gcode manipulation - use retraction_hop instead

[reprap-play.git] / quacks-ingredients-make-copy-gcodes

diff --git a/quacks-ingredients-make-copy-gcodes b/quacks-ingredients-make-copy-gcodes
index 512d5fe83798cbb8e2bbfe57f95dda06d71a8607..5bb12499677387f3126487b932834297679f17b4 100755 (executable)
--- a/quacks-ingredients-make-copy-gcodes
+++ b/quacks-ingredients-make-copy-gcodes
@@ -41,19 +41,41 @@ done
 
 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     )
-               }{
-                       die unless $1 > $4;
-                       die unless $3 > 9000;
-                       "G0 F$2\n".
-                       "G1 Z".($3 + 0.5)."\n" .
-                       $2
-               }mxe
+       : perl -i~ -0777 -ne '
+               @l = split m{^(?=;LAYER:\d+\n)}m, $_;
+               foreach my $i (0..$#l) {
+                       $l[$i] =~
+                               s{
+                               (       ^G1 \ Z\S+ \s*\n        
+                                 |     ^\;LAYER:\d+ \s*\n
+                                   (?: ^M10[67].* \s*\n )?
+                               )
+                                       ^G0 \ F(\d+) \ ( X\S+ \ Y\S+ )
+                                                        \ Z(\S+) \s*\n
+                               }{
+                                       die "$& $2" unless $2 > 9000;
+                                       $1 .
+                                       "G1 Z$4\n".
+                                       "G0 F$2 $3\n".
+                                       "G1 Z$4\n"
+                               }mxe    or $i==0
+                                       or die "$l[$i] $i";
+                       $l[$i] =~
+                               s{
+                                       ^G1 \ Z([0-9.]+) \s*\n
+                               (       ^G0 \ F(\d+) \ X\S+ \ Y\S+ \s*\n
+                                       (?: ; .* \s*\n )?
+                                       ^G1 \ Z([0-9.]+) \s*\n  )
+                               }{
+                                       die "$& $3" unless $1 >= $4;
+                                       die "$& $3" unless $3 > 9000;
+                                       my $z = $i == $#l ? $1 : $4 + 0.5;
+                                       "G0 F$3\n".
+                                       "G1 Z$z\n" .
+                                       $2
+                               }gmxe or $i==0 or die "$l[$i] $i";
+               }
+               print or die $! foreach @l;
        ' $g
 done