X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=quacks-ingredients-make-copy-gcodes;h=fd34367e8f117f310690253f54dea69164113210;hb=2132efba59634024b51ec9c19eb40a490081cfc9;hp=512d5fe83798cbb8e2bbfe57f95dda06d71a8607;hpb=87165c8c9a4c8ecd534a224fa26b4f039a667ec0;p=reprap-play.git

diff --git a/quacks-ingredients-make-copy-gcodes b/quacks-ingredients-make-copy-gcodes
index 512d5fe..fd34367 100755
--- a/quacks-ingredients-make-copy-gcodes
+++ b/quacks-ingredients-make-copy-gcodes
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # usage:
 #    ./quacks-ingredients-make-copy-gcodes Tests_L
@@ -23,7 +23,19 @@ gh () {
 
 for l in 1 2 3 4 5; do
 	gh
-	cura -i quacks.ini -s $lhs$l,$f.auto.stl -o $g
+	qi=quacks-L$l.auto.ini
+
+	cp quacks.ini $qi
+
+	case $l in
+	2|4|5)
+		perl -i~ -pe '
+			s/^(retraction_hop *= *.*)/retraction_hop = 0.6/m
+		' $qi
+		;;
+	esac
+
+	cura -i $qi -s $lhs$l,$f.auto.stl -o $g
 	case $l in
 	1|2|3|4)
 		perl -i~ -pe 's/^/;/ if m/^M140 S0\b.*\n/' $g
@@ -41,19 +53,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
 
@@ -67,19 +101,31 @@ for l in 4; do
 	cat $g >&3
 done
 
+copies="3:5 2:234 1:1"
+copyls=""
+for copy in $copies; do
+	l=-P-${copy%:*}
+	ci=$lhs${copy#*:}.auto.gcode
+	copyls+=" $l"
+	gh
+	rm -f $g
+	ln -vs $ci $g
+done
+
 umount /media/sd >/dev/null 2>&1 ||:
 mount /media/sd
 
-for l in 1 2 3 4 5 234; do
+for l in 1 2 3 4 5 234 $copyls; do
 	gh
 	cp $g $h
 done
+
 sleep 0.5
 
 umount /media/sd
 mount /media/sd
 
-for l in 1 2 3 4 5 234; do
+for l in 1 2 3 4 5 234 $copyls; do
 	gh
 	cmp $g $h
 	ls -l $h