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-requ...@lists.openmoko.org
You can reach the person managing the list at
commitlog-ow...@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. r5546 - trunk/gta02-core (wer...@docs.openmoko.org)
2. r5547 - trunk/gta02-core/docs/ecn (wer...@docs.openmoko.org)
3. r5548 - trunk/gta02-core/docs/ecn (re...@docs.openmoko.org)
4. r5549 - in trunk/gta02-core: . docs/ecn (wer...@docs.openmoko.org)
5. r5550 - trunk/eda/scripts (alvie...@docs.openmoko.org)
6. r5551 - trunk/gta02-core/modules (wer...@docs.openmoko.org)
7. r5552 - trunk/eda/fped (wer...@docs.openmoko.org)
--- Begin Message ---
Author: werner
Date: 2009-08-26 23:36:20 +0200 (Wed, 26 Aug 2009)
New Revision: 5546
Modified:
trunk/gta02-core/cpu.sch
trunk/gta02-core/io.sch
Log:
- cpu.sch: implemented nACCEL_CS removal, freeing EINT8/GPG0
- io.sch: implemented nACCEL_CS removal, removing R7810
- io.sch: added pointer to ECN0016
Modified: trunk/gta02-core/cpu.sch
===================================================================
--- trunk/gta02-core/cpu.sch 2009-08-26 21:20:17 UTC (rev 5545)
+++ trunk/gta02-core/cpu.sch 2009-08-26 21:36:20 UTC (rev 5546)
@@ -1,9 +1,9 @@
-EESchema Schematic File Version 2 date s?n 23 aug 2009 16:32:15 CEST
-LIBS:power,device,conn,gta02-core
+EESchema Schematic File Version 2 date Wed Aug 26 18:32:51 2009
+LIBS:power,device,conn,gta02-core,gta02-core-cache
EELAYER 24 0
EELAYER END
$Descr A3 16535 11700
-Sheet 6 12
+Sheet 8 14
Title ""
Date ""
Rev ""
@@ -13,6 +13,9 @@
Comment3 ""
Comment4 ""
$EndDescr
+NoConn ~ 13450 5900
+Text Notes 10750 5850 0 50 ~ 0
+removed nACCEL_CS network ECN0016
Text Notes 10750 5700 0 50 ~ 0
removed nHOLD network ECN0031
NoConn ~ 13450 5800
@@ -513,12 +516,6 @@
13150 5200 13150 4550
Connection ~ 12550 6000
Wire Wire Line
- 13450 5900 12350 5900
-Wire Wire Line
- 12350 5900 12350 5850
-Wire Wire Line
- 12350 5850 11550 5850
-Wire Wire Line
11550 6300 13250 6300
Wire Wire Line
13250 6300 13250 6200
@@ -608,8 +605,6 @@
1 13150 4550
1 0 0 -1
$EndComp
-Text GLabel 11550 5850 0 60 Output ~ 0
-nACCEL_CS
$Comp
L GND #PWR071
U 1 1 4A4B88E1
Modified: trunk/gta02-core/io.sch
===================================================================
--- trunk/gta02-core/io.sch 2009-08-26 21:20:17 UTC (rev 5545)
+++ trunk/gta02-core/io.sch 2009-08-26 21:36:20 UTC (rev 5546)
@@ -1,9 +1,9 @@
-EESchema Schematic File Version 2 date s?n 23 aug 2009 16:48:54 CEST
-LIBS:power,device,conn,gta02-core
+EESchema Schematic File Version 2 date Wed Aug 26 18:34:24 2009
+LIBS:power,device,conn,gta02-core,gta02-core-cache
EELAYER 24 0
EELAYER END
$Descr A3 16535 11700
-Sheet 8 12
+Sheet 10 14
Title ""
Date ""
Rev ""
@@ -13,7 +13,13 @@
Comment3 ""
Comment4 ""
$EndDescr
+Text Notes 4550 6150 0 50 ~ 0
+Removed secondary acceleration sensor and cleaned up.\nSee ECN0016 for details.
Wire Wire Line
+ 6250 4850 6050 4850
+Wire Wire Line
+ 6050 4850 6050 5650
+Wire Wire Line
12400 2500 12950 2500
Connection ~ 13250 3500
Wire Wire Line
@@ -32,7 +38,7 @@
Wire Wire Line
12400 2150 12400 2700
Wire Wire Line
- 12950 3500 12950 3250
+ 12950 3250 12950 3500
Wire Wire Line
4050 9600 3850 9600
Wire Wire Line
@@ -46,15 +52,11 @@
Wire Wire Line
4850 5400 4650 5400
Wire Wire Line
- 4950 4750 4950 4850
-Wire Wire Line
- 4950 4750 4650 4750
-Wire Wire Line
4850 4900 4850 4950
Wire Wire Line
4850 4900 4650 4900
Wire Wire Line
- 6250 5050 4650 5050
+ 4650 5050 6250 5050
Wire Wire Line
4150 2500 3950 2500
Wire Wire Line
@@ -70,7 +72,7 @@
Wire Wire Line
14250 6150 12350 6150
Wire Wire Line
- 14250 6250 12150 6250
+ 12150 6250 14250 6250
Wire Wire Line
14250 6350 12350 6350
Wire Wire Line
@@ -90,7 +92,7 @@
Wire Wire Line
12150 8300 12350 8300
Wire Wire Line
- 14250 8150 12150 8150
+ 12150 8150 14250 8150
Wire Wire Line
14250 7850 12550 7850
Wire Wire Line
@@ -106,7 +108,7 @@
Wire Wire Line
12550 7850 12550 7700
Wire Wire Line
- 3650 8550 6800 8550
+ 6800 8550 3650 8550
Wire Wire Line
3650 9250 4050 9250
Wire Wire Line
@@ -120,35 +122,35 @@
Wire Wire Line
5300 8350 3650 8350
Wire Wire Line
- 5150 3900 6050 3900
+ 5400 3900 5850 3900
Wire Wire Line
- 9150 4400 9150 5300
+ 9150 5300 9150 4400
Wire Wire Line
13850 9800 13850 9550
Wire Wire Line
- 14250 9550 13650 9550
+ 13650 9550 14250 9550
Connection ~ 14500 9950
Wire Wire Line
14500 10150 14500 9950
Connection ~ 6550 8550
Wire Wire Line
- 6550 8550 6550 8350
+ 6550 8350 6550 8550
Connection ~ 4600 8450
Wire Wire Line
4600 8050 4600 8450
Connection ~ 3900 8250
Wire Wire Line
- 3900 8250 3900 8050
+ 3900 8050 3900 8250
Wire Wire Line
4050 8900 3850 8900
Wire Wire Line
14250 5850 14150 5850
Wire Wire Line
- 13550 8250 13550 7600
+ 13550 7600 13550 8250
Wire Wire Line
- 12750 7850 12750 7600
+ 12750 7600 12750 7850
Wire Wire Line
- 13150 6150 13150 5700
+ 13150 5700 13150 6150
Wire Wire Line
13950 6550 13950 5700
Wire Wire Line
@@ -166,7 +168,7 @@
12950 6050 12950 5800
Connection ~ 12950 6050
Wire Wire Line
- 13350 6250 13350 5800
+ 13350 5800 13350 6250
Connection ~ 13350 6250
Connection ~ 13950 8450
Connection ~ 13550 8250
@@ -184,15 +186,12 @@
14350 5300 14150 5300
Wire Wire Line
14150 5300 14150 5850
-Connection ~ 5150 3900
Wire Wire Line
- 5150 4100 5150 3750
+ 5850 3900 5850 4100
+Connection ~ 5400 4950
Wire Wire Line
- 6050 3900 6050 4100
-Connection ~ 5600 4950
+ 5400 4950 5400 4600
Wire Wire Line
- 5600 4950 5600 4600
-Wire Wire Line
9150 3750 9150 3900
Connection ~ 9150 4900
Wire Wire Line
@@ -227,18 +226,13 @@
Wire Wire Line
9150 6100 9150 5700
Wire Wire Line
- 8450 4900 9150 4900
+ 9150 4900 8450 4900
Connection ~ 9150 5000
Wire Wire Line
- 6050 5050 6050 4600
-Connection ~ 6050 5050
+ 5850 4600 5850 5050
+Connection ~ 5850 5050
+Connection ~ 5400 3900
Wire Wire Line
- 5150 4850 5150 4600
-Connection ~ 5150 4850
-Wire Wire Line
- 5600 4100 5600 3900
-Connection ~ 5600 3900
-Wire Wire Line
11600 2950 11850 2950
Wire Wire Line
14250 9650 14050 9650
@@ -252,7 +246,7 @@
12950 7950 12950 7700
Connection ~ 12950 7950
Wire Wire Line
- 13350 8150 13350 7700
+ 13350 7700 13350 8150
Connection ~ 13350 8150
Wire Wire Line
13750 8350 13750 7700
@@ -261,17 +255,17 @@
13650 6700 13650 6850
Connection ~ 13650 6850
Wire Wire Line
- 13550 6350 13550 5700
+ 13550 5700 13550 6350
Wire Wire Line
12750 5950 12750 5700
Wire Wire Line
- 13150 8050 13150 7600
+ 13150 7600 13150 8050
Wire Wire Line
- 13950 8450 13950 7600
+ 13950 7600 13950 8450
Wire Wire Line
4050 9400 3850 9400
Wire Wire Line
- 4250 8350 4250 8050
+ 4250 8050 4250 8350
Connection ~ 4250 8350
Wire Wire Line
5000 8550 5000 8050
@@ -279,7 +273,7 @@
Wire Wire Line
6550 7650 6550 7850
Wire Wire Line
- 14050 9350 14050 9550
+ 14050 9550 14050 9350
Connection ~ 14050 9550
Wire Wire Line
12750 6850 12750 7050
@@ -297,7 +291,7 @@
Wire Wire Line
5200 8150 5200 8250
Wire Wire Line
- 3650 8450 5500 8450
+ 5500 8450 3650 8450
Wire Wire Line
3650 8950 3850 8950
Wire Wire Line
@@ -323,7 +317,7 @@
Wire Wire Line
12450 7850 12150 7850
Wire Wire Line
- 14250 6850 12150 6850
+ 12150 6850 14250 6850
Wire Wire Line
12550 6550 14250 6550
Wire Wire Line
@@ -355,8 +349,6 @@
Wire Wire Line
4850 4950 6250 4950
Wire Wire Line
- 4950 4850 6250 4850
-Wire Wire Line
4650 5550 4950 5550
Wire Wire Line
4950 5550 4950 5450
@@ -376,12 +368,23 @@
Wire Wire Line
12400 2050 12200 2050
Wire Wire Line
- 12400 3700 12400 3300
+ 12400 3300 12400 3700
Wire Wire Line
13250 3500 13250 2400
Connection ~ 12950 3500
Wire Wire Line
13750 1700 13750 2350
+Wire Wire Line
+ 5400 3750 5400 4100
+$Comp
+L GND #PWR?
+U 1 1 4A95A96F
+P 6050 5650
+F 0 "#PWR?" H 6050 5650 30 0001 C CNN
+F 1 "GND" H 6050 5580 30 0001 C CNN
+ 1 6050 5650
+ 1 0 0 -1
+$EndComp
Text Notes 3950 9800 0 50 ~ 0
Connect CLKOUT1 to \nUEXTCLK - ecn0025
Text GLabel 4050 9600 2 60 Input ~ 0
@@ -405,8 +408,6 @@
nACCEL_INT2
Text GLabel 4650 4900 0 60 Output ~ 0
nACCEL_INT1
-Text GLabel 4650 4750 0 60 Input ~ 0
-nACCEL_CS
Text GLabel 12150 5800 0 60 Output ~ 0
STDI
$Comp
@@ -842,37 +843,28 @@
$Comp
L GSENSOR_3V3 #PWR?
U 1 1 4A401C8A
-P 5150 3750
-F 0 "#PWR?" H 5150 3650 50 0001 C CNN
-F 1 "GSENSOR_3V3" H 5150 3900 50 0000 C CNN
- 1 5150 3750
+P 5400 3750
+F 0 "#PWR?" H 5400 3650 50 0001 C CNN
+F 1 "GSENSOR_3V3" H 5400 3900 50 0000 C CNN
+ 1 5400 3750
1 0 0 -1
$EndComp
$Comp
-L R_US R7810
-U 1 1 4A401C59
-P 5150 4350
-F 0 "R7810" V 5100 4175 50 0000 C CNN
-F 1 "NC" V 5200 4240 50 0000 C CNN
- 1 5150 4350
- 0 1 1 0
-$EndComp
-$Comp
L R_US R7807
U 1 1 4A401C2B
-P 5600 4350
-F 0 "R7807" V 5550 4175 50 0000 C CNN
-F 1 "NC" V 5650 4240 50 0000 C CNN
- 1 5600 4350
+P 5400 4350
+F 0 "R7807" V 5350 4175 50 0000 C CNN
+F 1 "NC" V 5450 4240 50 0000 C CNN
+ 1 5400 4350
0 1 1 0
$EndComp
$Comp
L R_US R7811
U 1 1 4A401C19
-P 6050 4350
-F 0 "R7811" V 6000 4175 50 0000 C CNN
-F 1 "NC" V 6100 4240 50 0000 C CNN
- 1 6050 4350
+P 5850 4350
+F 0 "R7811" V 5800 4175 50 0000 C CNN
+F 1 "NC" V 5900 4240 50 0000 C CNN
+ 1 5850 4350
0 1 1 0
$EndComp
$Comp
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2009-08-26 23:37:47 +0200 (Wed, 26 Aug 2009)
New Revision: 5547
Modified:
trunk/gta02-core/docs/ecn/STATUS
trunk/gta02-core/docs/ecn/ecn0016.txt
Log:
- moved ECN0016 to "Execute" (review, really)
Modified: trunk/gta02-core/docs/ecn/STATUS
===================================================================
--- trunk/gta02-core/docs/ecn/STATUS 2009-08-26 21:36:20 UTC (rev 5546)
+++ trunk/gta02-core/docs/ecn/STATUS 2009-08-26 21:37:47 UTC (rev 5547)
@@ -15,7 +15,7 @@
0013 Defer Increase rated current of B4902
0014 Defer Limit non-ESD overvoltage on USB_VBUS (U4905)
0015 Execute Remove Calypso serial interface on headset (U4401)
-0016 Edit Remove upper acceleration sensor (U7801)
+0016 Execute Remove upper acceleration sensor (U7801)
0017 Edit Move Bluetooth module (U2) to main PCB
0018 Edit Add beads/filters to audio signals leaving/entering can
0019 Discuss Consider applying buzz fix
Modified: trunk/gta02-core/docs/ecn/ecn0016.txt
===================================================================
--- trunk/gta02-core/docs/ecn/ecn0016.txt 2009-08-26 21:36:20 UTC (rev
5546)
+++ trunk/gta02-core/docs/ecn/ecn0016.txt 2009-08-26 21:37:47 UTC (rev
5547)
@@ -24,3 +24,6 @@
- why the upper ?
http://lists.openmoko.org/pipermail/devel/2009-June/005758.html
- connect both interrupts (motivation)
+
+
+Commit: SVN 5546 (nACCEL_CS removal)
--- End Message ---
--- Begin Message ---
Author: rehar
Date: 2009-08-26 23:39:54 +0200 (Wed, 26 Aug 2009)
New Revision: 5548
Modified:
trunk/gta02-core/docs/ecn/ecn0032.txt
trunk/gta02-core/docs/ecn/ecn0033.txt
Log:
- removed CRLF in ECN0032
- changed C3008 to C3006, added C4406 and added possible capacitors to ECN0033
Modified: trunk/gta02-core/docs/ecn/ecn0032.txt
===================================================================
--- trunk/gta02-core/docs/ecn/ecn0032.txt 2009-08-26 21:37:47 UTC (rev
5547)
+++ trunk/gta02-core/docs/ecn/ecn0032.txt 2009-08-26 21:39:54 UTC (rev
5548)
@@ -1,26 +1,27 @@
-Add EMI and ESD protection to headset jack
-
-
-To prevent destroying the codec from any discharge we need to add a proper
-ESD protection.
-We might still get RF feeding through the headset jack into the codec/system.
-To be 100% sure it's best to add low pass EMI filter in all signal lines of the
-headset jack.
-
-based on Joerg's proposal!
-
-ESD protection
-- add varistors (D4403/4404/4405) 5.6Vac to all headset jack signal pins
- (same as D4402)
-
-EMI protection
+Add EMI and ESD protection to headset jack
+
+
+To prevent destroying the codec from any discharge we need to add a proper
+ESD protection.
+We might still get RF feeding through the headset jack into the codec/system.
+To be 100% sure it's best to add low pass EMI filter in all signal lines of the
+headset jack.
+
+based on Joerg's proposal!
+
+ESD protection
+- add varistors (D4403/4404/4405) 5.6Vac to all headset jack signal pins
+ (same as D4402)
+
+EMI protection
- add Pi-filter to all signal lines of the headset jack
- (see ecn0032/pi-filter.png)
- C1=47pF C2=47pF B=BLM15HD102SN1 1R25(DC)
- possible references C4408-C4415, B4415-B4419
-- remove 22pF capacitors C4403/4404/4405
-- remove common mode choke B4102
-
-attenuation: f=1..3GHz approx 55dB(IN)/68dB(OUT) (150pF varistor)
-
+ (see ecn0032/pi-filter.png)
+ C1=47pF C2=47pF B=BLM15HD102SN1 1R25(DC)
+ possible references C4408-C4415, B4415-B4419
+- remove 22pF capacitors C4403/4404/4405
+- remove common mode choke B4102
+
+attenuation: f=1..3GHz approx 55dB(IN)/68dB(OUT) (150pF varistor)
+
+
Author: Rene Harder <re...@saweb.de>
Modified: trunk/gta02-core/docs/ecn/ecn0033.txt
===================================================================
--- trunk/gta02-core/docs/ecn/ecn0033.txt 2009-08-26 21:37:47 UTC (rev
5547)
+++ trunk/gta02-core/docs/ecn/ecn0033.txt 2009-08-26 21:39:54 UTC (rev
5548)
@@ -6,14 +6,18 @@
To follow Wolfson's recommendation we will change all line input/output
coupling capacitors to 1uF.
-Replace the following capacitors with 1uF (CM105X5R105M16AT):
+Replace the following capacitors with 1uF/6.3V SMD-0402 :
- C4304 and C4303 (MIC input)
-- C3007 and C3008 (GSM modem input)
+- C3007 and C3006 (GSM modem input)
- C3018 and C3011 (GSM modem output)
-- C3016 (headset MIC)
+- C3016 and C4406 (headset MIC)
[1] http://www.wolfsonmicro.com/uploads/documents/en/WM8753.pdf (p. 88)
+Todo:
+find a suitable and easy to source capacitor e.g. TDK C1005X5R0J105K (Digi-Key)
+or AVX 04026D105KAT2A (Digi-Key & Farnell)
+
Author: Rene Harder <re...@saweb.de>
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2009-08-27 09:36:43 +0200 (Thu, 27 Aug 2009)
New Revision: 5549
Modified:
trunk/gta02-core/STATUS
trunk/gta02-core/docs/ecn/STATUS
trunk/gta02-core/docs/ecn/ecn0029.txt
Log:
Reviewed ECN0029 and the whole PMU. Closed ECN0029.
Modified: trunk/gta02-core/STATUS
===================================================================
--- trunk/gta02-core/STATUS 2009-08-26 21:39:54 UTC (rev 5548)
+++ trunk/gta02-core/STATUS 2009-08-27 07:36:43 UTC (rev 5549)
@@ -8,7 +8,7 @@
GPS Alvaro Werner 5253
LCM Luke Dave 5306 Rene 5307
MEMORY Luke Werner 5182 Dave 5308
-PMU Alvaro Werner 5182 Rene 5319
+PMU Alvaro Werner 5548 Rene 5319
SD-SIM Dave Werner 5275
USB Rene Werner 5182 Dave 5311
Modified: trunk/gta02-core/docs/ecn/STATUS
===================================================================
--- trunk/gta02-core/docs/ecn/STATUS 2009-08-26 21:39:54 UTC (rev 5548)
+++ trunk/gta02-core/docs/ecn/STATUS 2009-08-27 07:36:43 UTC (rev 5549)
@@ -53,7 +53,6 @@
0024 GPS
0026 SD-SIM
0027 General
-0029 PMU
0030 MODEM
0031 AUDIO
0032 AUDIO
Modified: trunk/gta02-core/docs/ecn/ecn0029.txt
===================================================================
--- trunk/gta02-core/docs/ecn/ecn0029.txt 2009-08-26 21:39:54 UTC (rev
5548)
+++ trunk/gta02-core/docs/ecn/ecn0029.txt 2009-08-27 07:36:43 UTC (rev
5549)
@@ -14,3 +14,5 @@
Author: Werner Almesberger <wer...@openmoko.org>
Review: Joerg Reisenweber <jo...@openmoko.org>, SVN 5470
+Commit: 5509 through 5513
+Review: Werner Almesberger <wer...@openmoko.org>, SVN5548
--- End Message ---
--- Begin Message ---
Author: alvieboy
Date: 2009-08-27 10:28:25 +0200 (Thu, 27 Aug 2009)
New Revision: 5550
Added:
trunk/eda/scripts/footprint-report.pl
Log:
Add footprint reporter (using BOM list)
Added: trunk/eda/scripts/footprint-report.pl
===================================================================
--- trunk/eda/scripts/footprint-report.pl (rev 0)
+++ trunk/eda/scripts/footprint-report.pl 2009-08-27 08:28:25 UTC (rev
5550)
@@ -0,0 +1,52 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use Carp;
+
+my %footprints;
+
+my ($filename,$reqsheet) = @ARGV;
+
+sub usage
+{
+ print STDERR "Usage: $0 bom.lst [SHEETNAME]\n";
+ exit;
+}
+
+usage() unless defined $filename;
+
+open(FILE,$filename)
+ or croak "Cannot open $filename: $!";
+
+while(<FILE>) {
+ last if /order = Value/;
+ next unless /^\|/;
+ chomp;
+ my ($ref, $component, $sheet, $location, $footprint)=
+
m/\|\s+(\S+)\s+([^\(]+)\(Sheet\s\/([^\/]+)\/\)\s+\(([^\)]+)\);\s*(.*)$/;
+ croak "Invalid line '$_'" unless defined $ref;
+ next unless defined $sheet;
+ # Filter if needed
+ if (defined $reqsheet) {
+ next unless $reqsheet eq $sheet;
+ }
+ $footprint=~s/\s+$//;
+ $component=~s/\s+$//;
+ $footprint = "* UNKNOWN FOOTPRINT *" if $footprint eq '';
+
+ $footprints{$footprint}||=[];
+
+ push(@{$footprints{$footprint}}, { 'ref'=>$ref,'comp'=>$component});
+}
+
+print "*** FOOTPRINT REPORT ***\n";
+print "**> Sheet $reqsheet only <**\n" if defined $reqsheet;
+print "\n\n";
+foreach my $foot (sort keys %footprints) {
+ print "'${foot}' used by:\n";
+ foreach my $inst(@{$footprints{$foot}}) {
+ print " $inst->{'ref'} [ $inst->{'comp'} ]\n";
+ }
+ print "\n";
+}
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2009-08-27 11:00:28 +0200 (Thu, 27 Aug 2009)
New Revision: 5551
Modified:
trunk/gta02-core/modules/332fbga-p05.fpd
Log:
- modules/332fbga-p05.fpd: added measurements
Modified: trunk/gta02-core/modules/332fbga-p05.fpd
===================================================================
--- trunk/gta02-core/modules/332fbga-p05.fpd 2009-08-27 08:28:25 UTC (rev
5550)
+++ trunk/gta02-core/modules/332fbga-p05.fpd 2009-08-27 09:00:28 UTC (rev
5551)
@@ -147,3 +147,8 @@
frame cin_long @
frame cmid_side @
frame outline @
+measy outline.__0 >> outline.__1 1.5mm
+measx outline.__0 >> outline.__1 Oy+1.5mm
+measy ball.__0 >> ball.__0 1.5mm
+measx ball.__0 >> ball.__0 Oy
+measx ball.__0 -> ball.__0 -1.5mm
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2009-08-27 11:01:24 +0200 (Thu, 27 Aug 2009)
New Revision: 5552
Modified:
trunk/eda/fped/gui_inst.c
trunk/eda/fped/gui_meas.c
trunk/eda/fped/gui_tool.c
trunk/eda/fped/inst.c
trunk/eda/fped/inst.h
Log:
Made interactive selection of measurement points a little less inefficient.
- vectors now have their own struct in inst.u and don't share inst.u.rect.end
- when selecting points for measurements, use the highlighting we've already
done and don't redo all the O(n^3) searching for each mouse pointer movement
- removed debug code that printed what new measurements are like. We can now
use the code view for that.
Modified: trunk/eda/fped/gui_inst.c
===================================================================
--- trunk/eda/fped/gui_inst.c 2009-08-27 09:00:28 UTC (rev 5551)
+++ trunk/eda/fped/gui_inst.c 2009-08-27 09:01:24 UTC (rev 5552)
@@ -122,7 +122,7 @@
{
unit_type d;
- d = dist_point(pos, self->u.rect.end)/scale;
+ d = dist_point(pos, self->u.vec.end)/scale;
return d > VEC_EYE_R ? -1 : d;
}
@@ -138,14 +138,14 @@
{
unit_type d;
- d = dist_line(pos, self->base, self->u.rect.end)/scale;
+ d = dist_line(pos, self->base, self->u.vec.end)/scale;
return d > SELECT_R ? -1 : d;
}
void gui_highlight_vec(struct inst *self)
{
- struct coord center = translate(self->u.rect.end);
+ struct coord center = translate(self->u.vec.end);
draw_circle(DA, gc_highlight, FALSE, center.x, center.y, VEC_EYE_R);
}
@@ -154,7 +154,7 @@
void gui_draw_vec(struct inst *self)
{
struct coord from = translate(self->base);
- struct coord to = translate(self->u.rect.end);
+ struct coord to = translate(self->u.vec.end);
GdkGC *gc;
gc = gc_vec[get_mode(self)];
Modified: trunk/eda/fped/gui_meas.c
===================================================================
--- trunk/eda/fped/gui_meas.c 2009-08-27 09:00:28 UTC (rev 5551)
+++ trunk/eda/fped/gui_meas.c 2009-08-27 09:01:24 UTC (rev 5552)
@@ -64,7 +64,7 @@
struct coord min;
min = meas_find_min(lt, active_pkg->samples[inst->vec->n]);
- return coord_eq(inst->u.rect.end, min);
+ return coord_eq(inst->u.vec.end, min);
}
@@ -74,8 +74,8 @@
struct coord next;
next = meas_find_next(lt, active_pkg->samples[inst->vec->n],
- ref->u.rect.end);
- return coord_eq(inst->u.rect.end, next);
+ ref->u.vec.end);
+ return coord_eq(inst->u.vec.end, next);
}
@@ -84,7 +84,7 @@
struct coord max;
max = meas_find_max(lt, active_pkg->samples[inst->vec->n]);
- return coord_eq(inst->u.rect.end, max);
+ return coord_eq(inst->u.vec.end, max);
}
@@ -97,7 +97,7 @@
min = meas_find_min(lt, active_pkg->samples[a->vec->n]);
next = meas_find_next(lt, active_pkg->samples[inst->vec->n],
min);
- if (coord_eq(next, inst->u.rect.end))
+ if (coord_eq(next, inst->u.vec.end))
return 1;
}
return 0;
@@ -112,7 +112,7 @@
min = meas_find_min(lt, inst->vec->samples);
next = meas_find_next(lt, ref->vec->samples, min);
- return coord_eq(next, ref->u.rect.end);
+ return coord_eq(next, ref->u.vec.end);
}
#endif
@@ -234,12 +234,15 @@
/* ----- find start point (new measurement) -------------------------------- */
+static int is_highlighted(struct inst *inst, void *user)
+{
+ return inst->u.vec.highlighted;
+}
+
+
static struct inst *find_point_meas_new(struct coord pos)
{
- if (meas_inst)
- return inst_find_vec(pos, meas_pick_vec_b, meas_inst);
- else
- return inst_find_vec(pos, meas_pick_vec_a, NULL);
+ return inst_find_vec(pos, is_highlighted, NULL);
}
@@ -302,14 +305,8 @@
}
meas->inverted =
mode == min_to_next_or_max && is_min(meas_dsc->lt, to) ? 0 :
- meas_dsc->lt(from->u.rect.end, to->u.rect.end) !=
+ meas_dsc->lt(from->u.vec.end, to->u.vec.end) !=
(mode == min_to_next_or_max);
-{
-char *sm[] = { "min_to", "max_to", "next_to" };
-char *st[] = { "nxy", "nx", "ny", "mxy", "mx", "my" };
-fprintf(stderr, "mode %s type %s, inverted %d\n",
-sm[mode], st[meas->type], meas->inverted);
-}
meas->offset = NULL;
meas_dsc = NULL;
return 1;
@@ -388,7 +385,7 @@
struct inst *find_point_meas_move(struct inst *inst, struct coord pos)
{
- return inst_find_vec(pos, meas_pick_vec_b, meas_inst);
+ return inst_find_vec(pos, is_highlighted, NULL);
}
Modified: trunk/eda/fped/gui_tool.c
===================================================================
--- trunk/eda/fped/gui_tool.c 2009-08-27 09:00:28 UTC (rev 5551)
+++ trunk/eda/fped/gui_tool.c 2009-08-27 09:01:24 UTC (rev 5552)
@@ -274,14 +274,14 @@
struct pix_buf *draw_move_vec(struct inst *inst, struct coord pos, int i)
{
return draw_move_line_common(inst,
- add_vec(sub_vec(inst->u.rect.end, inst->base), pos), pos, i);
+ add_vec(sub_vec(inst->u.vec.end, inst->base), pos), pos, i);
}
struct pix_buf *gui_hover_vec(struct inst *self)
{
return hover_common(gc_vec[mode_hover],
- self->u.rect.end, VEC_EYE_R);
+ self->u.vec.end, VEC_EYE_R);
}
Modified: trunk/eda/fped/inst.c
===================================================================
--- trunk/eda/fped/inst.c 2009-08-27 09:00:28 UTC (rev 5551)
+++ trunk/eda/fped/inst.c 2009-08-27 09:01:24 UTC (rev 5552)
@@ -353,7 +353,7 @@
struct coord inst_get_point(const struct inst *inst)
{
if (inst->ops == &vec_ops)
- return inst->u.rect.end;
+ return inst->u.vec.end;
if (inst->ops == &frame_ops)
return inst->base;
abort();
@@ -575,7 +575,7 @@
{
status_set_type_entry("ref =");
status_set_name("%s", self->vec->name ? self->vec->name : "");
- rect_status(self->base, self->u.rect.end, -1, 0);
+ rect_status(self->base, self->u.vec.end, -1, 0);
vec_edit(self->vec);
}
@@ -628,7 +628,7 @@
inst = add_inst(&vec_ops, ip_vec, base);
inst->vec = vec;
- inst->u.rect.end = vec->pos;
+ inst->u.vec.end = vec->pos;
update_bbox(&inst->bbox, vec->pos);
propagate_bbox(inst);
return 1;
@@ -1199,9 +1199,11 @@
struct inst *inst;
int i;
- FOR_ALL_INSTS(i, ip_vec, inst)
- if (pick(inst, user))
+ FOR_ALL_INSTS(i, ip_vec, inst) {
+ inst->u.vec.highlighted = pick(inst, user);
+ if (inst->u.vec.highlighted)
gui_highlight_vec(inst);
+ }
}
Modified: trunk/eda/fped/inst.h
===================================================================
--- trunk/eda/fped/inst.h 2009-08-27 09:00:28 UTC (rev 5551)
+++ trunk/eda/fped/inst.h 2009-08-27 09:01:24 UTC (rev 5552)
@@ -79,13 +79,17 @@
int active;
union {
struct {
+ int highlighted; /* for measurements */
+ struct coord end;
+ } vec;
+ struct {
struct frame *ref;
int active;
} frame;
const char *name;
struct {
+ unit_type width;
struct coord end;
- unit_type width;
} rect;
struct {
char *name;
--- End Message ---
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog
