r5798 - trunk/gta02-core/bom

werner at docs.openmoko.org werner at docs.openmoko.org
Tue Jan 26 22:56:39 CET 2010


Author: werner
Date: 2010-01-26 22:56:39 +0100 (Tue, 26 Jan 2010)
New Revision: 5798

Modified:
   trunk/gta02-core/bom/Makefile
   trunk/gta02-core/bom/bom2part
   trunk/gta02-core/bom/workflow.fig
Log:
- bom/workflow.fig: added more items, updated workflow
- bom/Makefile: fixed building of files under bom/fic/
- bom/Makefile: write order list to .ord file instead of standard output
- bom/bom2part: final diagnostic was missing a newline



Modified: trunk/gta02-core/bom/Makefile
===================================================================
--- trunk/gta02-core/bom/Makefile	2010-01-26 20:42:25 UTC (rev 5797)
+++ trunk/gta02-core/bom/Makefile	2010-01-26 21:56:39 UTC (rev 5798)
@@ -1,21 +1,34 @@
-.PHONY:		all spotless
+UPLOAD=werner at sita.openmoko.org:public_html/gta02-core/
+COPY=rsync -e ssh --progress
 
+KITS=20
+
+.PHONY:		all spotless upload
+
+
 all:		gta02-core.ord
 
 gta02-core.ord:	part2order gta02-core.par fic/fic.inv gta02-core.inv
-		perl part2order 20 fic/fic.inv gta02-core.inv gta02-core.par
-# \ >$@ || { rm -rf $@; exit 1; }
+		perl part2order $(KITS) \
+		  fic/fic.inv gta02-core.inv gta02-core.par >$@ || \
+		  { rm -rf $@; exit 1; }
 	
 gta02-core.par:	bom2part fic/fic.equ ../gta02-core.lst gta02-core.inv
 		perl bom2part fic/fic.equ ../gta02-core.lst  gta02-core.inv \
 		    >$@ || { rm -rf $@; exit 1; }
 
 fic/fic.equ:
-		$(MAKE) -C fic/fic.equ
+		$(MAKE) -C fic fic.equ
 
 fic/fic.inv:
-		$(MAKE) -C fic/fic.inv
+		$(MAKE) -C fic fic.inv
 
+workflow.pdf:	workflow.fig
+		fig2dev -L pdf $< >$@ || { rm -f $@; exit 1; }
+
+upload:		workflow.pdf
+		$(COPY) workflow.pdf $(UPLOAD)/bom-workflow.pdf
+
 spotless:
 		$(MAKE) -C fic spotless
 		rm -f gta02-core.par gta02-core.ord

Modified: trunk/gta02-core/bom/bom2part
===================================================================
--- trunk/gta02-core/bom/bom2part	2010-01-26 20:42:25 UTC (rev 5797)
+++ trunk/gta02-core/bom/bom2part	2010-01-26 21:56:39 UTC (rev 5798)
@@ -43,4 +43,4 @@
     $bad++;
 #    print join("#", ($ref, @f)), " -> $id{$f[0]}\n";
 }
-print STDERR "$bad/$total unmatched" if $bad;
+print STDERR "$bad/$total unmatched\n" if $bad;

Modified: trunk/gta02-core/bom/workflow.fig
===================================================================
--- trunk/gta02-core/bom/workflow.fig	2010-01-26 20:42:25 UTC (rev 5797)
+++ trunk/gta02-core/bom/workflow.fig	2010-01-26 21:56:39 UTC (rev 5798)
@@ -7,52 +7,82 @@
 Single
 -2
 1200 2
+6 450 7200 6480 8775
+4 0 0 50 -1 12 12 0.0000 4 150 540 450 7380 .sch\001
+4 0 0 50 -1 12 12 0.0000 4 150 540 450 7605 .lst\001
+4 0 0 50 -1 12 12 0.0000 4 105 540 450 7830 .csv\001
+4 0 0 50 -1 12 12 0.0000 4 150 540 450 8055 .inv\001
+4 0 0 50 -1 12 12 0.0000 4 150 540 450 8280 .equ\001
+4 0 0 50 -1 12 12 0.0000 4 150 540 450 8505 .par\001
+4 0 0 50 -1 12 12 0.0000 4 150 540 450 8730 .ord\001
+4 0 0 50 -1 1 12 0.0000 4 195 2010 1350 7380 schematics (for KiCad)\001
+4 0 0 50 -1 1 12 0.0000 4 195 2220 1350 7605 BOM generated by KiCad\001
+4 0 0 50 -1 1 12 0.0000 4 195 2520 1350 8055 inventory with stock and cost\001
+4 0 0 50 -1 1 12 0.0000 4 195 3045 1350 7830 GTA02 EE component stock at FIC\001
+4 0 0 50 -1 1 12 0.0000 4 195 5130 1350 8280 part number equivalences, e.g., manufacturer vs. distributor\001
+4 0 0 50 -1 1 12 0.0000 4 195 2910 1350 8505 component to part number(s) map\001
+4 0 0 50 -1 1 12 0.0000 4 195 5025 1350 8730 list of parts to order, with price and component references\001
+-6
+6 450 6075 3150 6750
+4 0 0 50 -1 14 12 0.0000 4 180 2700 450 6255 Source file (in SVN)\001
+4 0 0 50 -1 12 12 0.0000 4 150 1890 450 6480 Generated file\001
+4 0 0 50 -1 18 12 0.0000 4 210 1830 450 6705 Program (in SVN)\001
+-6
+6 4005 1575 11025 6075
+2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 4
+	1 1 2.00 60.00 60.00
+	 9000 3150 9000 3375 7425 3375 7425 3825
 2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
 	1 1 2.00 60.00 60.00
-	 5400 2250 5400 2700
+	 7200 4050 7200 4500
+2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 4
+	1 1 2.00 60.00 60.00
+	 10350 3150 10350 4950 7425 4950 7425 5175
 2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
 	1 1 2.00 60.00 60.00
-	 6750 2250 6750 2700
+	 7200 4725 7200 5175
+2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 4
+	1 1 2.00 60.00 60.00
+	 4950 3375 4950 4950 6975 4950 6975 5175
 2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
 	1 1 2.00 60.00 60.00
-	 6750 2925 6750 3375
+	 7200 5400 7200 5850
 2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
 	1 1 2.00 60.00 60.00
-	 5400 2925 5400 3375
-2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 4
+	 7200 3150 7200 3825
+2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
 	1 1 2.00 60.00 60.00
-	 3150 3600 3150 3825 4275 3825 4275 4275
-2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 4
+	 10350 2475 10350 2925
+2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
 	1 1 2.00 60.00 60.00
-	 5400 3600 5400 3825 4500 3825 4500 4275
-2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 4
+	 9000 2475 9000 2925
+2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
 	1 1 2.00 60.00 60.00
-	 6750 3600 6750 4050 4725 4050 4725 4275
+	 7200 2475 7200 2925
 2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
 	1 1 2.00 60.00 60.00
-	 4500 4500 4500 4950
+	 7200 1800 7200 2250
 2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 4
 	1 1 2.00 60.00 60.00
-	 6750 4050 6750 5400 4725 5400 4725 5625
-2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	 9675 1800 9675 2025 9000 2025 9000 2250
+2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 3
 	1 1 2.00 60.00 60.00
-	 4500 5175 4500 5625
+	 9675 2025 10350 2025 10350 2250
 2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 4
 	1 1 2.00 60.00 60.00
-	 3150 3825 3150 5400 4275 5400 4275 5625
-2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
-	1 1 2.00 60.00 60.00
-	 4500 5850 4500 6300
-4 1 0 50 -1 14 12 0.0000 4 195 2700 6075 2205 inventory-fic-ee.csv\001
-4 1 0 50 -1 18 12 0.0000 4 165 1095 5400 2880 fic2vendor\001
-4 1 0 50 -1 18 12 0.0000 4 165 675 6750 2880 fic2inv\001
-4 1 0 50 -1 12 12 0.0000 4 150 945 6750 3555 fic.inv\001
-4 1 0 50 -1 12 12 0.0000 4 195 945 5400 3555 fic.equ\001
-4 1 0 50 -1 14 12 0.0000 4 195 1890 3375 3555 gta02-core.inv\001
-4 1 0 50 -1 18 12 0.0000 4 210 990 4500 4455 bom2part\001
-4 1 0 50 -1 12 12 0.0000 4 195 1890 4500 5130 gta02-core.par\001
-4 0 0 50 -1 14 12 0.0000 4 195 1755 1350 8280 Original file\001
-4 0 0 50 -1 12 12 0.0000 4 150 1890 1350 8505 Generated file\001
-4 0 0 50 -1 18 12 0.0000 4 210 900 1350 8730 Program\001
-4 1 0 50 -1 18 12 0.0000 4 210 1110 4500 5805 part2order\001
-4 1 0 50 -1 12 12 0.0000 4 195 1890 4500 6480 gta02-core.ord\001
+	 4950 1800 4950 3375 6975 3375 6975 3825
+4 1 0 50 -1 18 12 0.0000 4 210 990 7200 4005 bom2part\001
+4 1 0 50 -1 18 12 0.0000 4 210 1110 7200 5355 part2order\001
+4 1 0 50 -1 12 12 0.0000 4 195 1890 7200 6030 gta02-core.ord\001
+4 1 0 50 -1 12 12 0.0000 4 195 1890 7200 3105 gta02-core.lst\001
+4 1 0 50 -1 12 12 0.0000 4 195 945 9000 3105 fic.equ\001
+4 1 0 50 -1 12 12 0.0000 4 150 945 10350 3105 fic.inv\001
+4 1 0 50 -1 14 12 0.0000 4 195 2700 9675 1755 inventory-fic-ee.csv\001
+4 1 0 50 -1 18 12 0.0000 4 165 675 10350 2430 fic2inv\001
+4 1 0 50 -1 18 12 0.0000 4 165 1095 9000 2430 fic2vendor\001
+4 1 0 50 -1 18 12 0.0000 4 165 1035 7200 2430 eeschema\001
+4 1 0 50 -1 14 12 0.0000 4 150 675 7200 1755 *.sch\001
+4 1 0 50 -1 14 12 0.0000 4 195 1890 4950 1755 gta02-core.inv\001
+4 1 0 50 -1 12 12 0.0000 4 195 1890 7200 4680 gta02-core.par\001
+-6
+4 0 0 50 -1 2 16 0.0000 4 255 3345 450 675 BOM Processing - Workflow\001




More information about the commitlog mailing list