[prev in list] [next in list] [prev in thread] [next in thread]
List: openmoko-commitlog
Subject: commitlog Digest, Vol 933, Issue 1
From: commitlog-request () lists ! openmoko ! org
Date: 2010-02-06 6:11:57
Message-ID: mailman.4209.1265436717.14033.commitlog () lists ! openmoko ! org
[Download RAW message or body]
Send commitlog mailing list submissions to
commitlog@lists.openmoko.org
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
commitlog-request@lists.openmoko.org
You can reach the person managing the list at
commitlog-owner@lists.openmoko.org
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r5816 - in trunk/gta02-core/bom: . fic (werner@docs.openmoko.org)
2. r5817 - trunk/gta02-core/bom (werner@docs.openmoko.org)
3. r5818 - trunk/gta02-core/bom (werner@docs.openmoko.org)
4. r5819 - in trunk/gta02-core/bom: . fic (werner@docs.openmoko.org)
[Attachment #4 (multipart/digest)]
Content-Transfer-Encoding: 8bit
From: werner@docs.openmoko.org
Precedence: list
To: commitlog@lists.openmoko.org
Date: Fri, 05 Feb 2010 15:53:07 +0100
Message-ID: <E1NdPYR-00064Z-JT@docs>
Content-Type: text/plain; charset=UTF-8
Subject: r5816 - in trunk/gta02-core/bom: . fic
Message: 1
Author: werner
Date: 2010-02-05 15:53:07 +0100 (Fri, 05 Feb 2010)
New Revision: 5816
Added:
trunk/gta02-core/bom/fic/equ2equ
trunk/gta02-core/bom/fic/missing.inv
Modified:
trunk/gta02-core/bom/dummy.inv
trunk/gta02-core/bom/fic/Makefile
trunk/gta02-core/bom/parser.pl
trunk/gta02-core/bom/part2order
trunk/gta02-core/bom/prettyord
trunk/gta02-core/bom/workflow.fig
Log:
Damage assessment ...
- bom/prettyord: complain if a part doesn't have a description
- bom/prettyord: didn't print the last record
- bom/workflow.fig: updated workflow for .dsc
- bom/parser.pl (inv): use default values for virtual inventories
- bom/dummy.inv: converted to virtual inventory
- bom/fic/missing.inv: parts with zero inventory at FIC
- bom/fic/equ2equ: generator of an equivalence list for missing.inv
Modified: trunk/gta02-core/bom/dummy.inv
===================================================================
--- trunk/gta02-core/bom/dummy.inv 2010-02-02 22:22:38 UTC (rev 5815)
+++ trunk/gta02-core/bom/dummy.inv 2010-02-05 14:53:07 UTC (rev 5816)
@@ -3,17 +3,17 @@
# dummy inventory, to suppress complains about components we haven't sourced
# yet
-DUMMY NTGD1100L 0 USD 1 0
-DUMMY GE865 0 USD 1 0
-DUMMY R1562 0 USD 1 0
-DUMMY C4110 0 USD 1 0
-DUMMY C8103 0 USD 1 0
+DUMMY NTGD1100L
+DUMMY GE865
+DUMMY R1562
+DUMMY C4110
+DUMMY C8103
# not listed in FIC's inventory
-DUMMY LIS302DL 0 USD 1 0
+DUMMY LIS302DL
# not really part of the PCB - check ME inventory
-DUMMY SPEAKER 0 USD 1 0 # speaker, needs land pattern
-DUMMY P0408B-13-P2H 0 USD 1 0 # vibrator, land pattern
+DUMMY SPEAKER # speaker, needs land pattern
+DUMMY P0408B-13-P2H # vibrator, land pattern
Modified: trunk/gta02-core/bom/fic/Makefile
===================================================================
--- trunk/gta02-core/bom/fic/Makefile 2010-02-02 22:22:38 UTC (rev 5815)
+++ trunk/gta02-core/bom/fic/Makefile 2010-02-05 14:53:07 UTC (rev 5816)
@@ -2,7 +2,7 @@
.PHONY: all spotless
-all: fic.equ fic.inv
+all: fic.equ fic.inv fic.dsc present.inv
fic.equ: fic2vendor $(INV)
perl fic2vendor $(INV) >$@ || { rm -f $@; exit 1; }
@@ -13,5 +13,11 @@
fic.dsc: fic2dsc $(INV)
perl fic2dsc $(INV) >$@ || { rm -f $@; exit 1; }
+present.inv: fic.inv
+ grep -v ' 0 USD' fic.inv >present.inv || { rm -f $@; exit 1; }
+
+missing.equ: equ2equ missing.inv fic.equ
+ perl equ2equ missing.inv fic.equ >$@ || { rm -f $@; exit 1; }
+
spotless:
- rm -f fic.equ fic.inv fic.dsc
+ rm -f fic.equ fic.inv fic.dsc present.inv missing.equ
Added: trunk/gta02-core/bom/fic/equ2equ
===================================================================
--- trunk/gta02-core/bom/fic/equ2equ (rev 0)
+++ trunk/gta02-core/bom/fic/equ2equ 2010-02-05 14:53:07 UTC (rev 5816)
@@ -0,0 +1,13 @@
+#!/usr/bin/perl
+
+require '../parser.pl';
+
+&parse;
+
+print "#EQU\n";
+for my $id (keys %inv) {
+print STDERR "--> $id\n";
+ my @f = split(" ", $id);
+ die "can't find $f[1]" unless defined $id{$f[1]};
+ print "$id $id{$f[1]}\n";
+}
Property changes on: trunk/gta02-core/bom/fic/equ2equ
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/gta02-core/bom/fic/missing.inv
===================================================================
--- trunk/gta02-core/bom/fic/missing.inv (rev 0)
+++ trunk/gta02-core/bom/fic/missing.inv 2010-02-05 14:53:07 UTC (rev 5816)
@@ -0,0 +1,69 @@
+#INV
+MISSING K4M51323PC-DG75
+MISSING SN74LVC1G08DCKR(G4)
+MISSING SN74LVC2G125DCUR
+MISSING SN74AUP1G00DCKR
+MISSING WM8753LGEFL
+MISSING PCF50633HN/04/N3,5
+MISSING ATR0635-7KQY
+MISSING RF3166
+MISSING ZXCT1009FTA
+MISSING UPG2012TB-E3
+MISSING ADG3304BCBZ-REEL
+MISSING R3113D241A-TR-F
+MISSING ATR0610-PQQ
+MISSING AAT1275IRN-5.0-T1
+MISSING RT9711BPB
+MISSING RT9702APB
+MISSING HVC375BTRF-E
+MISSING EMB9T2R
+MISSING GSM9105
+MISSING ISC5804AT2
+MISSING SI1040X-T1-E3
+MISSING RT3N77U-T111-1
+MISSING TLJT107M010R0900
+MISSING C1005NPO101JGT
+MISSING CM105X5R225K10AT
+MISSING CM105X5R475K06AT
+MISSING C1608NP0208CGT
+MISSING CL05A475MQ5NRNC
+MISSING C1005X7R821KGT
+MISSING CM21Y5V106Z10AT
+MISSING C1005X7R333KET
+MISSING C1005NPO4R7CGT
+MISSING C1005NPO150JGT
+MISSING AVXCM21X5R475K10AT
+MISSING CM05X5R105K06AH
+MISSING C1005X7R104KDT
+MISSING C1005NP0220JGT
+MISSING C1005NP0221JGT
+MISSING C1005NP0829DGT
+MISSING KEV040205331A
+MISSING RTT02000JTH
+MISSING RTT02222JTH
+MISSING RTT0275R0FTH
+MISSING RTT023902FTH
+MISSING RTT022002FTH
+MISSING RTT02104JTH
+MISSING RTT02221JTH
+MISSING RTT02473JTH
+MISSING RTT021242FTH
+MISSING EXC24CB102U
+MISSING HI1608-1C3N9SNT
+MISSING LQP15MN6N2B02
+MISSING HCI-1005F-27NJ-M
+MISSING PLL201212F2R2K
+MISSING PLL201212F4R7K
+MISSING MM8430-2610RB3
+MISSING FH23-39S-0.3SHW(05)
+MISSING U.FL-R-SMT-1(10)
+MISSING PPR06-023104
+MISSING JAR02-062101
+MISSING BTP-03JA4G
+MISSING SMSN16-J0-2214
+MISSING EVQPUD02K
+MISSING IMP-413TN
+MISSING B7820
+MISSING B7821
+MISSING B7825
+MISSING TD028TTEC1
Modified: trunk/gta02-core/bom/parser.pl
===================================================================
--- trunk/gta02-core/bom/parser.pl 2010-02-02 22:22:38 UTC (rev 5815)
+++ trunk/gta02-core/bom/parser.pl 2010-02-05 14:53:07 UTC (rev 5816)
@@ -78,6 +78,10 @@
die "duplicate inventory entry for \"$id\"" if defined $inv{$id};
$id{$ref} = $id;
$inv{$id} = [ @f ];
+ $inv{$id}[0] = 999999 unless defined $inv{$id}[0];
+ $inv{$id}[1] = "N/A" unless defined $inv{$id}[1];
+ $inv{$id}[2] = 1 unless defined $inv{$id}[2];
+ $inv{$id}[3] = 999999 unless defined $inv{$id}[3];
}
Modified: trunk/gta02-core/bom/part2order
===================================================================
--- trunk/gta02-core/bom/part2order 2010-02-02 22:22:38 UTC (rev 5815)
+++ trunk/gta02-core/bom/part2order 2010-02-05 14:53:07 UTC (rev 5816)
@@ -118,6 +118,6 @@
}
# experimental
-#for (sort { &rank($b, $a) } keys %want) {
-# print STDERR "$_: $want{$_}\n" if $want{$_};
-#}
+for (sort { &rank($b, $a) } keys %want) {
+ print STDERR "$_: $want{$_}\n" if $want{$_};
+}
Modified: trunk/gta02-core/bom/prettyord
===================================================================
--- trunk/gta02-core/bom/prettyord 2010-02-02 22:22:38 UTC (rev 5815)
+++ trunk/gta02-core/bom/prettyord 2010-02-05 14:53:07 UTC (rev 5816)
@@ -16,7 +16,8 @@
push(@{ $out[1] }, $order{$_}[0]);
@f = split(/\s+/, $_);
push(@{ $out[2] }, $f[1]);
- push(@{ $out[3] }, $dsc{$_});
+ print STDERR "$_: no description\n" unless defined $dsc{$_};
+ push(@{ $out[3] }, defined $dsc{$_} ? $dsc{$_} : "???");
push(@{ $out[4] }, $order{$_}[1]);
push(@{ $out[5] }, sprintf("%.2f", $order{$_}[2]));
}
@@ -28,7 +29,7 @@
}
}
-for ($i = 0; $i < $#{ $out[0] }; $i++) {
+for ($i = 0; $i <= $#{ $out[0] }; $i++) {
for ($j = 0; $j != 6; $j++) {
my $s = $out[$j][$i];;
print $s if $j == 2 || $j == 3 || $j == 4;
Modified: trunk/gta02-core/bom/workflow.fig
===================================================================
--- trunk/gta02-core/bom/workflow.fig 2010-02-02 22:22:38 UTC (rev 5815)
+++ trunk/gta02-core/bom/workflow.fig 2010-02-05 14:53:07 UTC (rev 5816)
@@ -7,117 +7,141 @@
Single
-2
1200 2
-6 450 8100 6480 9225
-4 0 0 50 -1 12 12 0.0000 4 105 540 450 8280 .csv\001
-4 0 0 50 -1 12 12 0.0000 4 150 540 450 8505 .inv\001
-4 0 0 50 -1 12 12 0.0000 4 150 540 450 8730 .equ\001
-4 0 0 50 -1 12 12 0.0000 4 150 540 450 8955 .par\001
-4 0 0 50 -1 12 12 0.0000 4 150 540 450 9180 .ord\001
-4 0 0 50 -1 1 12 0.0000 4 195 2520 1350 8505 inventory with stock and cost\001
-4 0 0 50 -1 1 12 0.0000 4 195 3045 1350 8280 GTA02 EE component stock at FIC\001
-4 0 0 50 -1 1 12 0.0000 4 195 5130 1350 8730 part number equivalences, e.g., \
manufacturer vs. distributor\001
-4 0 0 50 -1 1 12 0.0000 4 195 2910 1350 8955 component to part number(s) map\001
-4 0 0 50 -1 1 12 0.0000 4 195 5025 1350 9180 list of parts to order, with price and \
component references\001
--6
-6 450 7650 3465 8100
-4 0 0 50 -1 12 12 0.0000 4 150 540 450 7830 .chr\001
-4 0 0 50 -1 12 12 0.0000 4 150 540 450 8055 .sub\001
-4 0 0 50 -1 1 12 0.0000 4 195 1695 1350 7830 part characteristics\001
-4 0 0 50 -1 1 12 0.0000 4 195 2085 1350 8055 parameter substitutions\001
--6
6 450 5850 3150 6525
4 0 0 50 -1 14 12 0.0000 4 180 2700 450 6030 Source file (in SVN)\001
4 0 0 50 -1 12 12 0.0000 4 150 1890 450 6255 Generated file\001
4 0 0 50 -1 18 12 0.0000 4 210 1830 450 6480 Program (in SVN)\001
-6
-6 6255 5175 8145 7425
+6 450 7875 6480 9000
+4 0 0 50 -1 12 12 0.0000 4 105 540 450 8055 .csv\001
+4 0 0 50 -1 12 12 0.0000 4 150 540 450 8280 .inv\001
+4 0 0 50 -1 12 12 0.0000 4 150 540 450 8505 .equ\001
+4 0 0 50 -1 12 12 0.0000 4 150 540 450 8730 .par\001
+4 0 0 50 -1 12 12 0.0000 4 150 540 450 8955 .ord\001
+4 0 0 50 -1 1 12 0.0000 4 195 2520 1350 8280 inventory with stock and cost\001
+4 0 0 50 -1 1 12 0.0000 4 195 3045 1350 8055 GTA02 EE component stock at FIC\001
+4 0 0 50 -1 1 12 0.0000 4 195 5130 1350 8505 part number equivalences, e.g., \
manufacturer vs. distributor\001 +4 0 0 50 -1 1 12 0.0000 4 195 2910 1350 8730 \
component to part number(s) map\001 +4 0 0 50 -1 1 12 0.0000 4 195 5025 1350 8955 \
list of parts to order, with price and component references\001 +-6
+6 450 7425 3465 7875
+4 0 0 50 -1 12 12 0.0000 4 150 540 450 7605 .chr\001
+4 0 0 50 -1 12 12 0.0000 4 150 540 450 7830 .sub\001
+4 0 0 50 -1 1 12 0.0000 4 195 1695 1350 7605 part characteristics\001
+4 0 0 50 -1 1 12 0.0000 4 195 2085 1350 7830 parameter substitutions\001
+-6
+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
+ 7875 2700 7875 2925 6525 2925 6525 4725
+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 2700 9000 5850 6525 5850 6525 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
+ 3150 1350 3150 5850 6075 5850 6075 6075
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
- 7200 5400 7200 5850
+ 6300 2700 6300 4725
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
- 7200 6075 7200 6525
+ 6300 2025 6300 2475
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
- 7200 6750 7200 7200
-4 1 0 50 -1 18 12 0.0000 4 210 990 7200 5355 bom2part\001
-4 1 0 50 -1 18 12 0.0000 4 210 1110 7200 6705 part2order\001
-4 1 0 50 -1 12 12 0.0000 4 195 1890 7200 7380 gta02-core.ord\001
-4 1 0 50 -1 12 12 0.0000 4 195 1890 7200 6030 gta02-core.par\001
--6
+ 6300 1350 6300 1800
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 5175
-2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 4
+ 4950 1350 4950 4275 6075 4275 6075 4725
+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
- 10350 3150 10350 6300 7425 6300 7425 6525
+ 3150 4500 5850 4500 5850 4725
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 1800 3150 6300 6975 6300 6975 6525
+ 8100 4275 8100 4500 6750 4500 6750 4725
+2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 3
+ 11700 1575 11700 3150 10170 3150
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
- 7200 3150 7200 5175
+ 6300 4950 6300 5400
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
- 10350 2475 10350 2925
+ 6300 5625 6300 6075
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
- 9000 2475 9000 2925
+ 6300 6300 6300 6750
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
- 7200 2475 7200 2925
+ 6300 6975 6300 7425
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
- 7200 1800 7200 2250
-2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 4
+ 6525 7650 6525 8100
+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
- 9675 1800 9675 2025 9000 2025 9000 2250
+ 9000 1350 9000 1800
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
- 9675 2025 10350 2025 10350 2250
-2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 4
+ 9000 1575 7875 1575 7875 1800
+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
- 5400 1800 5400 4725 6975 4725 6975 5175
+ 9000 1575 10125 1575 10125 1800
+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
+ 7875 2025 7875 2475
+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
+ 9000 2025 9000 2475
+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
+ 7875 2925 7875 3375
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
- 3150 4950 6750 4950 6750 5175
+ 8955 3150 8325 3150 8325 3375
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
- 9000 3375 9000 3825
+ 8100 3600 8100 4050
+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
+ 10125 2025 10125 2475
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
- 9225 4725 9225 4950 7650 4950 7650 5175
+ 10125 2700 10125 7200 6750 7200 6750 7425
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
- 9225 4050 9225 4500
-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
- 10305 3600 9450 3600 9450 3825
+ 8955 4500 8100 4500
+2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+ 9045 3150 10080 3150
2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 3
- 12150 2025 12150 3600 10395 3600
-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
- 12150 4500 12150 4950 9225 4950
+ 11700 4050 11700 4500 10170 4500
+2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+ 10080 4500 9045 4500
4 0 0 50 -1 2 16 0.0000 4 255 3345 450 675 BOM Processing - Workflow\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 0 0 50 -1 12 12 0.0000 4 150 540 450 7380 .lst\001
-4 0 0 50 -1 1 12 0.0000 4 195 2220 1350 7380 BOM generated by KiCad\001
-4 0 0 50 -1 12 12 0.0000 4 150 540 450 7155 .sch\001
-4 0 0 50 -1 1 12 0.0000 4 195 2010 1350 7155 schematics (for KiCad)\001
-4 0 0 50 -1 12 12 0.0000 4 150 540 450 7605 .gen\001
-4 0 0 50 -1 1 12 0.0000 4 195 2745 1350 7605 characteristics generation rules\001
-4 1 0 50 -1 14 12 0.0000 4 195 1890 3150 1755 gta02-core.inv\001
-4 1 0 50 -1 14 12 0.0000 4 195 1890 5400 1755 gta02-core.sub\001
-4 1 0 50 -1 14 12 0.0000 4 180 675 12150 1755 *.gen\001
-4 1 0 50 -1 18 12 0.0000 4 210 855 9225 4005 gen2chr\001
-4 1 0 50 -1 12 12 0.0000 4 150 675 9225 4680 *.chr\001
-4 1 0 50 -1 14 9 0.0000 4 135 1800 12150 1980 (darfon, ralec, ...)\001
-4 1 0 50 -1 14 9 0.0000 4 135 1440 12150 4455 (acx, misc, ...)\001
-4 1 0 50 -1 14 12 0.0000 4 150 675 12150 4230 *.chr\001
+4 1 0 50 -1 12 12 0.0000 4 195 1890 6300 2655 gta02-core.lst\001
+4 1 0 50 -1 18 12 0.0000 4 165 1035 6300 1980 eeschema\001
+4 1 0 50 -1 14 12 0.0000 4 150 675 6300 1305 *.sch\001
+4 1 0 50 -1 18 12 0.0000 4 210 990 6300 4905 bom2part\001
+4 1 0 50 -1 18 12 0.0000 4 210 1110 6300 6255 part2order\001
+4 1 0 50 -1 12 12 0.0000 4 195 1890 6300 6930 gta02-core.ord\001
+4 1 0 50 -1 12 12 0.0000 4 195 1890 6300 5580 gta02-core.par\001
+4 1 0 50 -1 14 12 0.0000 4 195 1890 4950 1305 gta02-core.sub\001
+4 1 0 50 -1 14 12 0.0000 4 195 1890 3105 1305 gta02-core.inv\001
+4 1 0 50 -1 18 12 0.0000 4 210 975 6525 7605 prettyord\001
+4 1 0 50 -1 18 12 0.0000 4 165 1095 7875 1980 fic2vendor\001
+4 1 0 50 -1 18 12 0.0000 4 165 675 9000 1980 fic2inv\001
+4 1 0 50 -1 18 12 0.0000 4 210 855 8100 3555 gen2chr\001
+4 1 0 50 -1 12 12 0.0000 4 150 675 8100 4230 *.chr\001
+4 1 0 50 -1 12 12 0.0000 4 195 945 7875 2655 fic.equ\001
+4 1 0 50 -1 12 12 0.0000 4 150 945 9000 2655 fic.inv\001
+4 1 0 50 -1 18 12 0.0000 4 165 735 10125 1980 fic2dsc\001
+4 1 0 50 -1 14 12 0.0000 4 195 2700 9000 1305 inventory-fic-ee.csv\001
+4 0 0 50 -1 12 12 0.0000 4 150 540 450 7155 .lst\001
+4 0 0 50 -1 1 12 0.0000 4 195 2220 1350 7155 BOM generated by KiCad\001
+4 0 0 50 -1 12 12 0.0000 4 150 540 450 6930 .sch\001
+4 0 0 50 -1 1 12 0.0000 4 195 2010 1350 6930 schematics (for KiCad)\001
+4 0 0 50 -1 12 12 0.0000 4 150 540 450 7380 .gen\001
+4 0 0 50 -1 1 12 0.0000 4 195 2745 1350 7380 characteristics generation rules\001
+4 0 0 50 -1 12 12 0.0000 4 150 540 450 9180 .dsc\001
+4 0 0 50 -1 1 12 0.0000 4 195 2685 1350 9180 Textual component description\001
+4 1 0 50 -1 14 12 0.0000 4 180 675 11700 1305 *.gen\001
+4 1 0 50 -1 14 12 0.0000 4 150 675 11700 3780 *.chr\001
+4 1 0 50 -1 14 9 0.0000 4 135 1440 11700 4005 (acx, misc, ...)\001
+4 1 0 50 -1 14 9 0.0000 4 135 1800 11700 1530 (darfon, ralec, ...)\001
+4 1 0 50 -1 12 12 0.0000 4 150 945 10125 2655 fic.dsc\001
Content-Transfer-Encoding: 8bit
From: werner@docs.openmoko.org
Precedence: list
To: commitlog@lists.openmoko.org
Date: Fri, 05 Feb 2010 21:57:10 +0100
Message-ID: <E1NdVEk-0005hz-5J@docs>
Content-Type: text/plain; charset=UTF-8
Subject: r5817 - trunk/gta02-core/bom
Message: 2
Author: werner
Date: 2010-02-05 21:57:09 +0100 (Fri, 05 Feb 2010)
New Revision: 5817
Added:
trunk/gta02-core/bom/digi-key.equ
trunk/gta02-core/bom/digi-key.inv
Modified:
trunk/gta02-core/bom/Makefile
Log:
Adding other sources.
- bom/Makefile: new target show-missing to make a "shopping list" of mapped but
unavailable parts
- bom/digi-key.inv, bom/digi-key.equ: some of the missing parts can be sourced
from Digi-Key
Modified: trunk/gta02-core/bom/Makefile
===================================================================
--- trunk/gta02-core/bom/Makefile 2010-02-05 14:53:07 UTC (rev 5816)
+++ trunk/gta02-core/bom/Makefile 2010-02-05 20:57:09 UTC (rev 5817)
@@ -2,11 +2,11 @@
COPY=rsync -e ssh --progress
KITS=20
-EQU=fic/fic.equ
-INV=fic/fic.inv gta02-core.inv dummy.inv
+EQU=fic/fic.equ fic/missing.equ digi-key.equ
+INV=fic/fic.inv gta02-core.inv dummy.inv fic/missing.inv digi-key.inv
CHR=darfon.chr ralec.chr avx.chr acx.chr misc.chr
-.PHONY: all spotless upload
+.PHONY: all spotless upload show-missing
all: gta02-core.ord
@@ -46,3 +46,6 @@
spotless:
$(MAKE) -C fic spotless
rm -f gta02-core.par gta02-core.ord darfon.chr ralec.chr
+
+show-missing:
+ (echo '#ORD'; grep MISSING gta02-core.ord ; ) | ./prettyord -
Added: trunk/gta02-core/bom/digi-key.equ
===================================================================
--- trunk/gta02-core/bom/digi-key.equ (rev 0)
+++ trunk/gta02-core/bom/digi-key.equ 2010-02-05 20:57:09 UTC (rev 5817)
@@ -0,0 +1,14 @@
+#EQU
+#
+# Note: many parts at cut-tape and thus need re-reeling.
+#
+DIGI-KEY ADG3304BCBZ-REEL7CT-ND ADI ADG3304BCBZ-REEL
+DIGI-KEY P10850SCT-ND PANASONIC EVQPUD02K
+DIGI-KEY P11169CT-ND PANASONIC EXC24CB102U
+DIGI-KEY HFQ439CT-ND HIROSE FH23-39S-0.3SHW(05)
+DIGI-KEY 490-4980-1-ND MURATA MM8430-2610RB3
+# note: this equivalence is a detour - the Digi-Key part is an RA1. It differs
+# from RB3 only in the reeling.
+DIGI-KEY SI1040X-T1-E3TR-ND VISHAY SI1040X-T1-E3
+DIGI-KEY 296-18200-1-ND TI SN74AUP1G00DCKR
+DIGI-KEY H9161CT-ND HIROSE U.FL-R-SMT-1(10)
Added: trunk/gta02-core/bom/digi-key.inv
===================================================================
--- trunk/gta02-core/bom/digi-key.inv (rev 0)
+++ trunk/gta02-core/bom/digi-key.inv 2010-02-05 20:57:09 UTC (rev 5817)
@@ -0,0 +1,15 @@
+#INV
+#
+# Note: many parts at cut-tape and thus need re-reeling.
+#
+DIGI-KEY ADG3304BCBZ-REEL7CT-ND 6726 USD 1 2.43 25 1.94
+DIGI-KEY P10850SCT-ND 31180 USD 1 0.76 10 0.569
+DIGI-KEY P11169CT-ND 7128 USD 1 0.68 10 0.509 100 0.3737
+DIGI-KEY HFQ439CT-ND 4738 USD 1 3.02 25 2.34 100 1.872
+DIGI-KEY 490-4980-1-ND 12423 USD 1 0.57 25 0.4388
+DIGI-KEY SI1040X-T1-E3TR-ND 0 USD 3000 0.294
+# the SI1040X is a family of similar switches. Shouldn't be hard to find
+# another one.
+DIGI-KEY 296-18200-1-ND 0 USD 1 0.61 25 0.3596
+# consider using a different package
+DIGI-KEY H9161CT-ND 39012 USD 1 1.46 10 1.19
Content-Transfer-Encoding: 8bit
From: werner@docs.openmoko.org
Precedence: list
To: commitlog@lists.openmoko.org
Date: Fri, 05 Feb 2010 22:03:12 +0100
Message-ID: <E1NdVKa-0005mL-RW@docs>
Content-Type: text/plain; charset=UTF-8
Subject: r5818 - trunk/gta02-core/bom
Message: 3
Author: werner
Date: 2010-02-05 22:03:12 +0100 (Fri, 05 Feb 2010)
New Revision: 5818
Added:
trunk/gta02-core/bom/digi-key.dsc
Modified:
trunk/gta02-core/bom/parser.pl
Log:
Added descriptions for Digi-Key parts.
- bom/digi-key.dsc: added descriptions for Digi-Key parts as well
- bom/parser.pl: description fields can now be separated by any amount of
whitespace, allowing for better formatting
Added: trunk/gta02-core/bom/digi-key.dsc
===================================================================
--- trunk/gta02-core/bom/digi-key.dsc (rev 0)
+++ trunk/gta02-core/bom/digi-key.dsc 2010-02-05 21:03:12 UTC (rev 5818)
@@ -0,0 +1,9 @@
+#DSC
+DIGI-KEY ADG3304BCBZ-REEL7CT-ND IC XLATOR 4CH 1.2/5.5V 12-WLCSP
+DIGI-KEY P10850SCT-ND LT SWITCH SIDE W/BOSS J LEAD SMD
+DIGI-KEY P11169CT-ND NOISE FILTER 2 MODE 1K OHM SMD
+DIGI-KEY HFQ439CT-ND CONN FPC 39POS .3MM GOLD SMD
+DIGI-KEY 490-4980-1-ND CONN MW COAXIAL WITH SWITCH SMD
+DIGI-KEY SI1040X-T1-E3TR-ND IC LOAD SW N/P-CH MOSFET SOT563F
+DIGI-KEY 296-18200-1-ND IC SNGL 2IN POS-NAND GATE SC70-5
+DIGI-KEY H9161CT-ND CONN RECPT ULTRA-MINI COAX SMD
Modified: trunk/gta02-core/bom/parser.pl
===================================================================
--- trunk/gta02-core/bom/parser.pl 2010-02-05 20:57:09 UTC (rev 5817)
+++ trunk/gta02-core/bom/parser.pl 2010-02-05 21:03:12 UTC (rev 5818)
@@ -302,7 +302,7 @@
sub dsc
{
- my @f = split(/ /);
+ my @f = split(/\s+/);
my @id = splice(@f, 0, 2);
$dsc{"$id[0] $id[1]"} = join(" ", @f);
}
Content-Transfer-Encoding: 8bit
From: werner@docs.openmoko.org
Precedence: list
To: commitlog@lists.openmoko.org
Date: Sat, 06 Feb 2010 07:09:13 +0100
Message-ID: <E1Nddqz-0002Wr-TU@docs>
Content-Type: text/plain; charset=UTF-8
Subject: r5819 - in trunk/gta02-core/bom: . fic
Message: 4
Author: werner
Date: 2010-02-06 07:09:13 +0100 (Sat, 06 Feb 2010)
New Revision: 5819
Added:
trunk/gta02-core/bom/misc.pl
Modified:
trunk/gta02-core/bom/Makefile
trunk/gta02-core/bom/README
trunk/gta02-core/bom/avx.chr
trunk/gta02-core/bom/bom2part
trunk/gta02-core/bom/fic/equ2equ
trunk/gta02-core/bom/fic/missing.inv
trunk/gta02-core/bom/part2order
trunk/gta02-core/bom/prettyord
Log:
Assorted cleanup and corrections.
- bom/part2order: sort list of missing parts by number missing, not by rank
(too confusing)
- bom/part2order, Makefile: group missing part if equivalent. For this,
part2order now also reads the equivalences.
- bom/part2order (rank): don't boost rank of "gratis" parts if they're not
available
- bom/avx.chr: corrected part number of CM316X5R476M06AT
- bom/README: decribed virtual inventory
- bom/missing.inv: added missing RTT0242R2FTH, PLL322512F2R2K, CC7V-T1A, and
HT-210UD/NB
- bom/Makefile: added target "xpdf" to show the workflow
- bom/misc.pl (eq), bom/bom2part (issue): turned "issue" into new helper
function to find all equivalent parts
- bom/prettyord: search also equivalent parts for descriptions
Modified: trunk/gta02-core/bom/Makefile
==================================================================--- \
trunk/gta02-core/bom/Makefile 2010-02-05 21:03:12 UTC (rev 5818)
+++ trunk/gta02-core/bom/Makefile 2010-02-06 06:09:13 UTC (rev 5819)
@@ -6,15 +6,16 @@
INV=fic/fic.inv gta02-core.inv dummy.inv fic/missing.inv digi-key.inv
CHRÚrfon.chr ralec.chr avx.chr acx.chr misc.chr
-.PHONY: all spotless upload show-missing
+.PHONY: all spotless upload show-missing show-dk
+# mark them as phony since we have incomplete dependencies in this Makefile
+.PHONY: fic/fic.equ fic/fic.inv fic/missing.equ
-
all: gta02-core.ord
gta02-core.ord: part2order parser.pl \
- gta02-core.par $(INV)
+ gta02-core.par $(INV) $(EQU)
perl part2order $(KITS) \
- $(INV) gta02-core.par >$@ || \
+ $(INV) $(EQU) gta02-core.par >$@ || \
{ rm -rf $@; exit 1; }
gta02-core.par: bom2part parser.pl match.pl \
@@ -37,9 +38,18 @@
fic/fic.inv:
$(MAKE) -C fic fic.inv
+fic/fic.dsc:
+ $(MAKE) -C fic fic.dsc
+
+fic/missing.equ:
+ $(MAKE) -C fic missing.equ
+
workflow.pdf: workflow.fig
fig2dev -L pdf $< >$@ || { rm -f $@; exit 1; }
+xpdf: workflow.pdf
+ xpdf workflow.pdf
+
upload: workflow.pdf
$(COPY) workflow.pdf $(UPLOAD)/bom-workflow.pdf
@@ -47,5 +57,10 @@
$(MAKE) -C fic spotless
rm -f gta02-core.par gta02-core.ord darfon.chr ralec.chr
-show-missing:
- (echo '#ORD'; grep MISSING gta02-core.ord ; ) | ./prettyord -
+show-missing: $(EQU) fic/fic.dsc
+ (echo '#ORD'; grep MISSING gta02-core.ord ; ) | \
+ ./prettyord - $(EQU) fic/fic.dsc
+
+show-dk:
+ (echo '#ORD'; grep DIGI-KEY gta02-core.ord ; ) | \
+ ./prettyord - digi-key.dsc
Modified: trunk/gta02-core/bom/README
==================================================================--- \
trunk/gta02-core/bom/README 2010-02-05 21:03:12 UTC (rev 5818)
+++ trunk/gta02-core/bom/README 2010-02-06 06:09:13 UTC (rev 5819)
@@ -211,7 +211,13 @@
Blank lines and comments (#) are ignored.
+The number of items in stock and the pricing data can be omitted. We
+call this "virtual inventory". In this case, the numer of items in
+stock and the price default to large numbers (e.g., 999999). Virtual
+inventory is used to suppress warnings for parts that have not been
+sourced yet, but where sourcing is in progress.
+
Description (.dsc)
------------------
Modified: trunk/gta02-core/bom/avx.chr
==================================================================--- \
trunk/gta02-core/bom/avx.chr 2010-02-05 21:03:12 UTC (rev 5818)
+++ trunk/gta02-core/bom/avx.chr 2010-02-06 06:09:13 UTC (rev 5819)
@@ -10,7 +10,7 @@
AVX CM21Y5V106Z10AT T=C CuF VV TOL€/20% FP05 M=Y5V
AVX CM316X5R106K25AT T=C CuF V%V TOL% FP06 M=X5R
AVX CV21X5R226M06AT T=C C"uF V=6.3V TOL % FP05 M=X5R
-AVX C1005Y5V474ZCT T=C CGuF V=6.3V TOL % FP06 M=X5R
+AVX CM316X5R476M06AT T=C CGuF V=6.3V TOL % FP06 M=X5R
AVX CM105X5R475K06AT T=C C=4.7uF V=6.3V TOL% FP03 M=X5R
AVX TLJA107M006R0500 T=C C0uF V=6.3V TOL % FP216 M=TANT ESR=0.5R
AVX TLJT107M010R0900 T=C C0uF VV TOL % FP528 M=TANT ESR=0.9R
Modified: trunk/gta02-core/bom/bom2part
==================================================================--- \
trunk/gta02-core/bom/bom2part 2010-02-05 21:03:12 UTC (rev 5818)
+++ trunk/gta02-core/bom/bom2part 2010-02-06 06:09:13 UTC (rev 5819)
@@ -2,24 +2,12 @@
require "parser.pl";
require "match.pl";
+require "misc.pl";
sub issue
{
- my %seen;
- print shift(@_);
- my @p = @_;
-
- # we determine all equivalent parts
-
- while (@p) {
- my $p = shift @p;
- next if $seen{$p};
- $seen{$p} = 1;
- print " $p";
- push(@p, @{ $eq{$p} });
- }
- print "\n";
+ print shift(@_), " ", join(" ", @_, &eq(@_)), "\n";
}
Modified: trunk/gta02-core/bom/fic/equ2equ
==================================================================--- \
trunk/gta02-core/bom/fic/equ2equ 2010-02-05 21:03:12 UTC (rev 5818)
+++ trunk/gta02-core/bom/fic/equ2equ 2010-02-06 06:09:13 UTC (rev 5819)
@@ -6,7 +6,7 @@
print "#EQU\n";
for my $id (keys %inv) {
-print STDERR "--> $id\n";
+#print STDERR "--> $id\n";
my @f = split(" ", $id);
die "can't find $f[1]" unless defined $id{$f[1]};
print "$id $id{$f[1]}\n";
Modified: trunk/gta02-core/bom/fic/missing.inv
==================================================================--- \
trunk/gta02-core/bom/fic/missing.inv 2010-02-05 21:03:12 UTC (rev \
5818)
+++ trunk/gta02-core/bom/fic/missing.inv 2010-02-06 06:09:13 UTC (rev 5819)
@@ -48,9 +48,11 @@
MISSING RTT02221JTH
MISSING RTT02473JTH
MISSING RTT021242FTH
+MISSING RTT0242R2FTH
MISSING EXC24CB102U
MISSING HI1608-1C3N9SNT
MISSING LQP15MN6N2B02
+MISSING PLL322512F2R2K
MISSING HCI-1005F-27NJ-M
MISSING PLL201212F2R2K
MISSING PLL201212F4R7K
@@ -66,4 +68,6 @@
MISSING B7820
MISSING B7821
MISSING B7825
+MISSING CC7V-T1A
+MISSING HT-210UD/NB
MISSING TD028TTEC1
Added: trunk/gta02-core/bom/misc.pl
==================================================================--- \
trunk/gta02-core/bom/misc.pl (rev 0)
+++ trunk/gta02-core/bom/misc.pl 2010-02-06 06:09:13 UTC (rev 5819)
@@ -0,0 +1,26 @@
+#!/usr/bin/perl
+
+
+#
+# determine the equivalent parts, taking into account that %eq is transitive
+#
+
+sub eq
+{
+ my %seen;
+ my @p = @_; # parts to consider
+ my @r = (); # new equivalences we've found
+ my $skip = @p;
+
+ while (@p) {
+ my $p = shift @p;
+ next if $seen{$p};
+ $seen{$p} = 1;
+ push(@r, $p) if $skip-- <= 0;
+ push(@p, @{ $eq{$p} });
+ }
+ return @r;
+}
+
+
+return 1;
Property changes on: trunk/gta02-core/bom/misc.pl
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/gta02-core/bom/part2order
==================================================================--- \
trunk/gta02-core/bom/part2order 2010-02-05 21:03:12 UTC (rev 5818)
+++ trunk/gta02-core/bom/part2order 2010-02-06 06:09:13 UTC (rev 5819)
@@ -1,6 +1,7 @@
#!/usr/bin/perl
require "parser.pl";
+require "misc.pl";
$mult = shift(@ARGV);
&parse;
@@ -36,14 +37,14 @@
{
local ($a, $b) = @_;
- my $na = &number($a);
+ my $na = &number($a); # min(number wanted, available)
my $nb = &number($b);
- my $pa = $inv{$a}[3];
+ my $pa = $inv{$a}[3]; # per unit price for smallest quantum
my $pb = $inv{$b}[3];
#print STDERR "a=$a b=$b na=$na nb=$nb pa=$pa pb=$pb\n";
- return 1 if !$pa && $pb;
- return -1 if $pa && !$pb;
+ return 1 if $na && !$pa && $pb;
+ return -1 if $nb && $pa && !$pb;
return $na <=> $nb if $na != $nb;
return $pb <=> $pa;
}
@@ -117,7 +118,16 @@
print "\n";
}
-# experimental
-for (sort { &rank($b, $a) } keys %want) {
- print STDERR "$_: $want{$_}\n" if $want{$_};
+for my $id (sort { $want{$b} <=> $want{$a} } keys %want) {
+ next unless $want{$id};
+ print STDERR "$id";
+ for (&eq($id)) {
+# next unless $want{$_};
+ die "\n$_ ($want{$_}) vs. $id want ($want{$id})"
+ unless $want{$_} == $want{$id};
+ print STDERR " $_";
+ $want{$_} = 0;
+ }
+ print STDERR ": want $want{$id}\n";
+ $want{$id} = 0;
}
Modified: trunk/gta02-core/bom/prettyord
==================================================================--- \
trunk/gta02-core/bom/prettyord 2010-02-05 21:03:12 UTC (rev 5818)
+++ trunk/gta02-core/bom/prettyord 2010-02-06 06:09:13 UTC (rev 5819)
@@ -1,6 +1,7 @@
#!/usr/bin/perl
require "parser.pl";
+require "misc.pl";
&parse;
@@ -17,7 +18,15 @@
@f = split(/\s+/, $_);
push(@{ $out[2] }, $f[1]);
print STDERR "$_: no description\n" unless defined $dsc{$_};
- push(@{ $out[3] }, defined $dsc{$_} ? $dsc{$_} : "???");
+ my $dsc = $dsc{$_};
+ if (!defined $dsc) {
+print STDERR "$_ -> ", join(" ", &eq($_)), "\n";
+ for (&eq($_)) {
+ $dsc = $dsc{$_};
+ last if defined $dsc;
+ }
+ }
+ push(@{ $out[3] }, defined $dsc ? $dsc : "???");
push(@{ $out[4] }, $order{$_}[1]);
push(@{ $out[5] }, sprintf("%.2f", $order{$_}[2]));
}
--==============80615165==--
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic