From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 20 Feb 2020 15:03:36 +0000 (+0000)
Subject: quacks-ingredients: gcode manipulation - better EH
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=aa9c8462ca6b0bac53de8acbddf1e44779c5278d;p=reprap-play.git

quacks-ingredients: gcode manipulation - better EH

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 742d924..4f0ddd3 100755
--- a/quacks-ingredients-make-copy-gcodes
+++ b/quacks-ingredients-make-copy-gcodes
@@ -51,13 +51,13 @@ for l in 2 4 5; do
 					(?: ; .* \s*\n )?
 					^G1 \ Z([0-9.]+) \s*\n	)
 				}{
-					die unless $1 > $4;
-					die unless $3 > 9000;
+					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 $l==0 or die $i;
+				}gmxe or $i==0 or die "$l[$i] $i";
 		}
 		print or die $! foreach @l;
 	' $g