From f6720c767f2772d105ed1af6eddd8e3d140d6a52 Mon Sep 17 00:00:00 2001
From: Werner Almesberger <werner@almesberger.net>
Date: Tue, 10 Jul 2012 12:25:34 -0300
Subject: [PATCH] fab/m1/: update path name and drill file offset for M1r4

---
 fab/m1/Makefile   | 8 ++++++--
 fab/m1/README     | 6 ++++++
 fab/m1/drl2gerber | 6 ++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/fab/m1/Makefile b/fab/m1/Makefile
index 1f11cd0..44298bb 100644
--- a/fab/m1/Makefile
+++ b/fab/m1/Makefile
@@ -1,9 +1,13 @@
-D=rc3_gerber
+ifndef REV
+REV = rc3
+endif
+
+D=$(REV)_gerber
 
 all:		front.png back.png
 
 drill.pho:
-		tr -d '\015' <$(D)/drl00.drl | ./drl2gerber >$@
+		tr -d '\015' <$(D)/drl00.drl | REV=$(REV) ./drl2gerber >$@
 
 front.png:	drill.pho
 		cd $(D) && ../prettygerbv -d ../drill.pho foo front ../$@
diff --git a/fab/m1/README b/fab/m1/README
index c97f3a3..b1f9745 100644
--- a/fab/m1/README
+++ b/fab/m1/README
@@ -1,3 +1,9 @@
 wget http://downloads.qi-hardware.com/hardware/milkymist_one/gerber/rc3/rc3_gerber.tar.bz2
 tar xfj rc3_gerber.tar.bz2
 make
+
+------------------------------------------------------------------------------
+
+wget http://downloads.qi-hardware.com/hardware/milkymist_one/gerber/r4/r4_gerber.tar.bz2
+tar xfj r4_gerber.tar.bz2
+make REV=r4
diff --git a/fab/m1/drl2gerber b/fab/m1/drl2gerber
index 6fc2ddc..ced2deb 100755
--- a/fab/m1/drl2gerber
+++ b/fab/m1/drl2gerber
@@ -19,8 +19,14 @@ print "G90*\n" || die;		# absolute Mode
 print "%MOIN*%*\n" || die;	# inches, RS274X-style
 print "%FSLAX34Y34*%\n" || die;	# format
 
+# M1rc3
 $x0 = 7300;
 $y0 = 268910;
+# M1r4
+if ($ENV{"REV"} eq "r4") {
+	$x0 = 34022;
+	$y0 = 293540;
+}
 
 
 sub u()