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. r5576 - trunk/gta02-core (wer...@docs.openmoko.org) 2. r5577 - trunk/gta02-core (da...@docs.openmoko.org) 3. r5578 - trunk/eda/fped (wer...@docs.openmoko.org)
--- Begin Message ---Author: werner Date: 2009-08-29 20:39:36 +0200 (Sat, 29 Aug 2009) New Revision: 5576 Modified: trunk/gta02-core/gta02-core.sch Log: - changed WLAN component reference pattern in overview sheet from 79xx to 80xx Modified: trunk/gta02-core/gta02-core.sch =================================================================== --- trunk/gta02-core/gta02-core.sch 2009-08-29 18:21:41 UTC (rev 5575) +++ trunk/gta02-core/gta02-core.sch 2009-08-29 18:39:36 UTC (rev 5576) @@ -30,7 +30,7 @@ Text Notes 9050 4850 0 60 ~ 0 x Text Notes 11000 4700 0 60 ~ 0 -79xx +80xx Text Notes 9050 4700 0 60 ~ 0 77xx Text Notes 7100 4700 0 60 ~ 0
--- End Message ---
--- Begin Message ---Author: daveb Date: 2009-08-29 21:54:50 +0200 (Sat, 29 Aug 2009) New Revision: 5577 Modified: trunk/gta02-core/modem.sch Log: modem updates - still WIP Modified: trunk/gta02-core/modem.sch =================================================================== --- trunk/gta02-core/modem.sch 2009-08-29 18:39:36 UTC (rev 5576) +++ trunk/gta02-core/modem.sch 2009-08-29 19:54:50 UTC (rev 5577) @@ -1,4 +1,4 @@ -EESchema Schematic File Version 2 date Sat 29 Aug 2009 18:12:38 BST +EESchema Schematic File Version 2 date Sat 29 Aug 2009 20:54:09 BST LIBS:power,device,conn,gta02-core EELAYER 24 0 EELAYER END @@ -14,281 +14,425 @@ Comment4 "" $EndDescr Wire Wire Line - 11950 6650 8000 6650 + 7800 7550 8000 7550 +$Comp +L TST P? +U 1 1 4A9986FD +P 8000 7550 +F 0 "P?" V 8000 7850 40 0000 C CNN +F 1 " " H 8000 7800 30 0000 C CNN + 1 8000 7550 + 0 1 1 0 +$EndComp Wire Wire Line - 8000 6650 8000 7350 + 9450 5100 9650 5100 Wire Wire Line - 8000 7350 7800 7350 -Connection ~ 6900 2850 + 8850 6550 8700 6550 Wire Wire Line - 11750 4750 11750 6050 + 8700 6550 8700 6450 Wire Wire Line - 9950 7200 10850 7200 + 8700 6450 8500 6450 Wire Wire Line - 10850 7200 10850 6850 + 8500 5750 8850 5750 Wire Wire Line - 10850 6850 11950 6850 -Connection ~ 10650 6650 + 9650 5700 9650 5900 Wire Wire Line - 10650 5950 10650 6650 -Connection ~ 10250 6450 + 7800 7350 9850 7350 Wire Wire Line - 10250 5950 10250 6450 + 9850 7350 9850 6650 Wire Wire Line - 10250 5250 10250 5450 + 9850 6650 11950 6650 +Connection ~ 10850 6450 Wire Wire Line - 9850 5250 9850 5450 + 10850 5850 10850 6450 +Connection ~ 10450 6250 Wire Wire Line - 11950 6250 11550 6250 + 10450 5850 10450 6250 Wire Wire Line - 11550 6250 11550 6150 + 11950 6050 7800 6050 Wire Wire Line - 11550 6150 7800 6150 + 13150 6250 13750 6250 Wire Wire Line - 8650 6000 8650 6050 + 5100 5550 5500 5550 Wire Wire Line - 8850 6300 8650 6300 + 5100 7350 5500 7350 +Connection ~ 10850 5150 Wire Wire Line - 8650 6000 8850 6000 + 11250 5150 10050 5150 Wire Wire Line - 8650 6050 7800 6050 + 6900 2650 6900 2950 Wire Wire Line - 11750 7400 11550 7400 + 3500 4850 5300 4850 Wire Wire Line - 11750 7400 11750 7050 + 5300 4850 5300 5450 Wire Wire Line - 11750 7050 11950 7050 + 5300 5450 5500 5450 Wire Wire Line - 6000 2850 5800 2850 + 10850 5150 10850 5350 Wire Wire Line - 5800 2850 5800 2650 + 11250 5150 11250 5350 Wire Wire Line - 9450 4850 9450 3750 + 13150 6650 13750 6650 +Connection ~ 10050 6050 Wire Wire Line - 9450 4850 9250 4850 + 10050 5850 10050 6050 Wire Wire Line - 8200 3700 8200 3500 + 13550 7150 13550 7200 Wire Wire Line - 8200 3500 8000 3500 + 13300 4050 13300 4250 Wire Wire Line - 8200 4300 8200 4500 + 6900 2850 6500 2850 Wire Wire Line - 8700 4600 8700 4400 + 9650 3450 9250 3450 Wire Wire Line - 8700 4400 8500 4400 + 9250 3450 9250 3950 Wire Wire Line - 8500 4400 8500 5550 + 9250 3950 8750 3950 Wire Wire Line - 8500 5550 7800 5550 + 8000 5450 8000 3500 Wire Wire Line - 9450 3750 9650 3750 + 8700 5200 8700 5400 +Connection ~ 7000 8750 Wire Wire Line - 7800 5450 8000 5450 -Connection ~ 6200 8750 + 7000 8550 7000 8750 +Connection ~ 6800 8750 Wire Wire Line - 6200 8950 6200 8550 -Connection ~ 6900 8750 + 6800 8750 6800 8550 +Connection ~ 6600 8750 Wire Wire Line - 6900 8550 6900 8750 -Connection ~ 6700 8750 + 6600 8750 6600 8550 +Connection ~ 6400 8750 Wire Wire Line - 6700 8550 6700 8750 -Connection ~ 6500 8750 + 6400 8750 6400 8550 Wire Wire Line - 6500 8550 6500 8750 -Connection ~ 6300 8750 + 7100 8550 7100 8750 Wire Wire Line - 6300 8550 6300 8750 + 7100 8750 6200 8750 Wire Wire Line - 5500 6850 5200 6850 + 4900 6800 5100 6800 Wire Wire Line - 5200 6850 5200 6950 + 5100 6800 5100 6750 Wire Wire Line - 5200 6950 4900 6950 + 5100 6750 5500 6750 Wire Wire Line - 4900 7100 5300 7100 + 5500 6350 5100 6350 Wire Wire Line - 5300 7100 5300 7050 + 5100 6350 5100 6400 Wire Wire Line - 5300 7050 5500 7050 + 5100 6400 4900 6400 Wire Wire Line - 4900 6650 5500 6650 + 4900 6050 5500 6050 +Connection ~ 6150 3900 Wire Wire Line - 5500 5950 5100 5950 + 5850 4100 5850 3900 Wire Wire Line - 5100 5950 5100 5900 + 5850 4500 5850 4700 Wire Wire Line - 5100 5900 4900 5900 + 5850 3900 6450 3900 Wire Wire Line - 4900 6250 5500 6250 -Connection ~ 6450 4650 + 6800 4850 6800 4650 Wire Wire Line - 6450 4850 6450 3700 + 6800 4650 6450 4650 Wire Wire Line - 6150 4500 6150 4700 + 13500 5550 13500 5750 Wire Wire Line - 6150 4100 6150 3900 -Connection ~ 6450 3900 -Connection ~ 6700 4650 + 13300 4750 13300 5850 +Connection ~ 11750 4750 +Connection ~ 13300 4950 Wire Wire Line - 6700 4850 6700 4650 + 13150 6850 13350 6850 Wire Wire Line + 11750 7050 11750 6850 +Wire Wire Line + 13300 5850 13150 5850 +Wire Wire Line + 13300 4950 13500 4950 +Wire Wire Line + 11950 5850 11750 5850 +Wire Wire Line + 11750 4750 11950 4750 +Wire Wire Line + 11950 4750 11950 4950 +Wire Wire Line + 13500 4950 13500 5150 +Wire Wire Line + 11950 5350 11950 5550 +Wire Wire Line + 13150 6050 13750 6050 +Wire Wire Line 13150 6450 13750 6450 Wire Wire Line - 13150 6250 13750 6250 + 6700 4850 6700 4650 +Connection ~ 6700 4650 +Connection ~ 6450 3900 Wire Wire Line - 11950 5550 11950 5750 + 6150 4100 6150 3900 Wire Wire Line - 13500 5350 13500 5150 + 6150 4500 6150 4700 Wire Wire Line - 11950 5150 11950 4950 + 6450 3700 6450 4850 +Connection ~ 6450 4650 Wire Wire Line - 11950 4950 11750 4950 + 4900 6250 5500 6250 Wire Wire Line - 11750 6050 11950 6050 + 4900 5900 5100 5900 Wire Wire Line - 13500 5150 13300 5150 + 5100 5900 5100 5950 Wire Wire Line - 13150 6050 13300 6050 + 5100 5950 5500 5950 Wire Wire Line - 13350 7250 13350 7050 + 4900 6650 5500 6650 Wire Wire Line - 13350 7050 13150 7050 -Connection ~ 13300 5150 -Connection ~ 11750 4950 + 5500 7050 5300 7050 Wire Wire Line - 13300 6050 13300 4950 + 5300 7050 5300 7100 Wire Wire Line - 13500 5750 13500 5950 + 5300 7100 4900 7100 Wire Wire Line - 6450 4650 6800 4650 + 4900 6950 5200 6950 Wire Wire Line - 6800 4650 6800 4850 + 5200 6950 5200 6850 Wire Wire Line - 6450 3900 5850 3900 + 5200 6850 5500 6850 Wire Wire Line - 5850 4500 5850 4700 + 6300 8550 6300 8750 +Connection ~ 6300 8750 Wire Wire Line - 5850 3900 5850 4100 -Connection ~ 6150 3900 + 6500 8550 6500 8750 +Connection ~ 6500 8750 Wire Wire Line - 4900 6050 5500 6050 + 6700 8550 6700 8750 +Connection ~ 6700 8750 Wire Wire Line - 4900 6400 5100 6400 + 6900 8550 6900 8750 +Connection ~ 6900 8750 Wire Wire Line - 5100 6400 5100 6350 + 6200 8550 6200 8950 +Connection ~ 6200 8750 Wire Wire Line - 5100 6350 5500 6350 + 8000 5450 7800 5450 Wire Wire Line - 5500 6750 5100 6750 + 9650 3750 9450 3750 Wire Wire Line - 5100 6750 5100 6800 + 7800 5550 8500 5550 Wire Wire Line - 5100 6800 4900 6800 + 8500 5550 8500 4400 Wire Wire Line - 6200 8750 7100 8750 + 8500 4400 8700 4400 Wire Wire Line - 7100 8750 7100 8550 + 8700 4400 8700 4600 Wire Wire Line - 6400 8550 6400 8750 -Connection ~ 6400 8750 + 8200 4300 8200 4500 Wire Wire Line - 6600 8550 6600 8750 -Connection ~ 6600 8750 + 8000 3500 8200 3500 Wire Wire Line - 6800 8550 6800 8750 -Connection ~ 6800 8750 + 8200 3500 8200 3700 Wire Wire Line - 7000 8550 7000 8750 -Connection ~ 7000 8750 + 9250 4850 9450 4850 Wire Wire Line - 8700 5200 8700 5400 + 9450 4850 9450 3750 Wire Wire Line - 8000 5450 8000 3500 + 5800 2650 5800 2850 Wire Wire Line - 8750 3950 9250 3950 + 5800 2850 6000 2850 Wire Wire Line - 9250 3950 9250 3450 + 11750 6850 11950 6850 Wire Wire Line - 9250 3450 9650 3450 + 13350 6850 13350 7200 Wire Wire Line - 6900 2850 6500 2850 + 13350 7200 13550 7200 Wire Wire Line - 13300 4250 13300 4450 + 10050 5150 10050 5350 Wire Wire Line - 11550 7400 11550 7350 + 10450 5150 10450 5350 Wire Wire Line - 7800 5750 8850 5750 + 11750 5850 11750 4550 +Connection ~ 6900 2850 +Connection ~ 10450 5150 Wire Wire Line - 7800 6350 8650 6350 + 10650 4950 10650 5150 +Connection ~ 10650 5150 Wire Wire Line - 8650 6350 8650 6300 + 5100 7500 5300 7500 Wire Wire Line - 11950 6450 7800 6450 + 5300 7500 5300 7450 Wire Wire Line - 9850 5950 9850 6150 -Connection ~ 9850 6150 + 5300 7450 5500 7450 Wire Wire Line - 7800 7550 8850 7550 + 11950 6450 9850 6450 Wire Wire Line - 13150 6850 13750 6850 + 11950 6250 7800 6250 Wire Wire Line - 13150 6650 13750 6650 + 7800 6350 9850 6350 Wire Wire Line - 11050 5250 11050 5450 + 9850 6350 9850 6450 Wire Wire Line - 10650 5250 10650 5450 + 11250 5850 11250 6650 +Connection ~ 11250 6650 Wire Wire Line - 11050 5950 11050 6850 -Connection ~ 11050 6850 + 7800 5650 9450 5650 Wire Wire Line - 5500 5550 4600 5550 + 9450 5650 9450 5100 Wire Wire Line - 5500 5450 5300 5450 + 9650 5100 9650 5300 Wire Wire Line - 5300 5450 5300 4850 + 8000 6750 7800 6750 Wire Wire Line - 5300 4850 3500 4850 + 8000 6450 7800 6450 Wire Wire Line - 6900 2950 6900 2650 -Text Label 9950 7200 0 50 ~ 0 -SERVICE -Text Label 4600 5550 0 50 ~ 0 -SERVICE + 8000 6150 7800 6150 +Wire Wire Line + 8000 5750 7800 5750 +Wire Wire Line + 8500 6150 8850 6150 +Wire Wire Line + 8500 6750 8850 6750 $Comp -L GSM_2V8 #PWR? -U 1 1 4A995ECE -P 11050 5250 -F 0 "#PWR?" H 11050 5150 50 0001 C CNN -F 1 "GSM_2V8" H 11050 5400 50 0000 C CNN - 1 11050 5250 +L R_US R? +U 1 1 4A998617 +P 8250 5750 +F 0 "R?" H 8300 5650 50 0000 C CNN +F 1 "33R" H 8100 5650 50 0000 C CNN + 1 8250 5750 1 0 0 -1 $EndComp $Comp +L R_US R? +U 1 1 4A998616 +P 8250 5750 +F 0 "R?" H 8300 5650 50 0000 C CNN +F 1 "33R" H 8100 5650 50 0000 C CNN + 1 8250 5750 + 1 0 0 -1 +$EndComp +$Comp +L R_US R? +U 1 1 4A998612 +P 8250 6750 +F 0 "R?" H 8300 6650 50 0000 C CNN +F 1 "33R" H 8100 6650 50 0000 C CNN + 1 8250 6750 + 1 0 0 -1 +$EndComp +Text GLabel 8850 6750 2 60 Output ~ 0 +GSM_INT +$Comp +L R_US R? +U 1 1 4A9985FD +P 8250 6150 +F 0 "R?" H 8450 6100 50 0000 C CNN +F 1 "33R" H 8000 6100 50 0000 C CNN + 1 8250 6150 + 1 0 0 -1 +$EndComp +$Comp +L R_US R? +U 1 1 4A9985F9 +P 8250 6450 +F 0 "R?" H 8300 6350 50 0000 C CNN +F 1 "33R" H 8100 6350 50 0000 C CNN + 1 8250 6450 + 1 0 0 -1 +$EndComp +$Comp +L R_US R? +U 1 1 4A9985B9 +P 8250 6750 +F 0 "R?" H 8300 6650 50 0000 C CNN +F 1 "33R" H 8100 6650 50 0000 C CNN + 1 8250 6750 + 1 0 0 -1 +$EndComp +$Comp +L GND #PWR? +U 1 1 4A99855C +P 9650 5900 +F 0 "#PWR?" H 9650 5900 30 0001 C CNN +F 1 "GND" H 9650 5830 30 0001 C CNN + 1 9650 5900 + 1 0 0 -1 +$EndComp +$Comp +L C C? +U 1 1 4A99855B +P 9650 5500 +F 0 "C?" H 9700 5600 50 0000 L CNN +F 1 "C" H 9700 5400 50 0000 L CNN + 1 9650 5500 + 1 0 0 -1 +$EndComp +Text GLabel 13750 6250 2 60 Input ~ 0 +MODEM_WAKE +$Comp +L TST P? +U 1 1 4A997EA4 +P 5100 7350 +F 0 "P?" V 5100 7650 40 0000 C CNN +F 1 " " H 5100 7600 30 0000 C CNN + 1 5100 7350 + 0 -1 -1 0 +$EndComp +$Comp +L TST P? +U 1 1 4A997E9D +P 5100 7500 +F 0 "P?" V 5100 7800 40 0000 C CNN +F 1 " " H 5100 7750 30 0000 C CNN + 1 5100 7500 + 0 -1 -1 0 +$EndComp +$Comp +L TST P? +U 1 1 4A997E9A +P 5100 7350 +F 0 "P?" V 5100 7650 40 0000 C CNN +F 1 " " H 5100 7600 30 0000 C CNN + 1 5100 7350 + 0 -1 -1 0 +$EndComp +$Comp +L TST P? +U 1 1 4A997E6F +P 5100 5550 +F 0 "P?" V 5100 5850 40 0000 C CNN +F 1 " " H 5100 5800 30 0000 C CNN + 1 5100 5550 + 0 -1 -1 0 +$EndComp +$Comp L GSM_2V8 #PWR? -U 1 1 4A995ECD -P 10650 5250 -F 0 "#PWR?" H 10650 5150 50 0001 C CNN -F 1 "GSM_2V8" H 10650 5400 50 0000 C CNN - 1 10650 5250 +U 1 1 4A997BF4 +P 13550 7150 +F 0 "#PWR?" H 13550 7050 50 0001 C CNN +F 1 "GSM_2V8" H 13550 7300 50 0000 C CNN + 1 13550 7150 1 0 0 -1 $EndComp $Comp +L IO_3V3 #PWR? +U 1 1 4A997BBB +P 13300 4050 +F 0 "#PWR?" H 13300 3950 50 0001 C CNN +F 1 "IO_3V3" H 13300 4200 50 0000 C CNN + 1 13300 4050 + 1 0 0 -1 +$EndComp +$Comp L R_US R? U 1 1 4A995ECC -P 11050 5700 -F 0 "R?" H 11050 5800 50 0000 C CNN -F 1 "NC" H 11050 5600 50 0000 C CNN - 1 11050 5700 +P 11250 5600 +F 0 "R?" V 11100 5700 50 0000 C CNN +F 1 "NC" V 11450 5700 50 0000 C CNN + 1 11250 5600 0 1 1 0 $EndComp $Comp L R_US R? U 1 1 4A995ECB -P 10650 5700 -F 0 "R?" H 10650 5800 50 0000 C CNN -F 1 "NC" H 10650 5600 50 0000 C CNN - 1 10650 5700 +P 10850 5600 +F 0 "R?" V 10700 5700 50 0000 C CNN +F 1 "NC" V 11050 5700 50 0000 C CNN + 1 10850 5600 0 1 1 0 $EndComp NoConn ~ 7800 7950 @@ -299,12 +443,9 @@ NoConn ~ 7800 7250 NoConn ~ 7800 7150 NoConn ~ 7800 7050 -NoConn ~ 7800 5650 NoConn ~ 5500 5650 Text GLabel 13750 6650 2 60 Input ~ 0 MODEM_nRFKILL -Text GLabel 13750 6850 2 60 Input ~ 0 -MODEM_SERVICE $Comp L PWR_FLAG #FLG? U 1 1 4A9955A5 @@ -317,62 +458,35 @@ $Comp L GSM_2V8 #PWR? U 1 1 4A995566 -P 10250 5250 -F 0 "#PWR?" H 10250 5150 50 0001 C CNN -F 1 "GSM_2V8" H 10250 5400 50 0000 C CNN - 1 10250 5250 +P 10650 4950 +F 0 "#PWR?" H 10650 4850 50 0001 C CNN +F 1 "GSM_2V8" H 10650 5100 50 0000 C CNN + 1 10650 4950 1 0 0 -1 $EndComp $Comp -L GSM_2V8 #PWR? -U 1 1 4A995562 -P 9850 5250 -F 0 "#PWR?" H 9850 5150 50 0001 C CNN -F 1 "GSM_2V8" H 9850 5400 50 0000 C CNN - 1 9850 5250 - 1 0 0 -1 -$EndComp -$Comp L R_US R? U 1 1 4A995551 -P 10250 5700 -F 0 "R?" H 10250 5800 50 0000 C CNN -F 1 "NC" H 10250 5600 50 0000 C CNN - 1 10250 5700 +P 10450 5600 +F 0 "R?" V 10300 5700 50 0000 C CNN +F 1 "NC" V 10650 5700 50 0000 C CNN + 1 10450 5600 0 1 1 0 $EndComp $Comp L R_US R? U 1 1 4A995546 -P 9850 5700 -F 0 "R?" H 9850 5800 50 0000 C CNN -F 1 "NC" H 9850 5600 50 0000 C CNN - 1 9850 5700 +P 10050 5600 +F 0 "R?" V 9900 5700 50 0000 C CNN +F 1 "NC" V 10250 5700 50 0000 C CNN + 1 10050 5600 0 1 1 0 $EndComp -Text GLabel 8850 6300 2 60 Output ~ 0 +Text GLabel 8850 6550 2 60 Output ~ 0 MODEM_RTS -Text GLabel 8850 6000 2 60 Output ~ 0 +Text GLabel 8850 6150 2 60 Output ~ 0 MODEM_TX $Comp -L IO_1V8 #PWR? -U 1 1 4A9951F8 -P 11550 7350 -F 0 "#PWR?" H 11550 7250 50 0001 C CNN -F 1 "IO_1V8" H 11550 7500 50 0000 C CNN - 1 11550 7350 - 1 0 0 -1 -$EndComp -$Comp -L IO_1V8 #PWR? -U 1 1 4A9951F4 -P 13300 4250 -F 0 "#PWR?" H 13300 4150 50 0001 C CNN -F 1 "IO_1V8" H 13300 4400 50 0000 C CNN - 1 13300 4250 - 1 0 0 -1 -$EndComp -$Comp L VB_GSM #PWR? U 1 1 4A994FBA P 6450 3700 @@ -393,10 +507,10 @@ $Comp L GSM_2V8 #PWR? U 1 1 4A994EF5 -P 11750 4750 -F 0 "#PWR?" H 11750 4650 50 0001 C CNN -F 1 "GSM_2V8" H 11750 4900 50 0000 C CNN - 1 11750 4750 +P 11750 4550 +F 0 "#PWR?" H 11750 4450 50 0001 C CNN +F 1 "GSM_2V8" H 11750 4700 50 0000 C CNN + 1 11750 4550 1 0 0 -1 $EndComp $Comp @@ -420,10 +534,10 @@ $Comp L R_US R? U 1 1 4A994D5D -P 13300 4700 -F 0 "R?" H 13300 4800 50 0000 C CNN -F 1 "0R" H 13300 4600 50 0000 C CNN - 1 13300 4700 +P 13300 4500 +F 0 "R?" H 13300 4600 50 0000 C CNN +F 1 "0R" H 13300 4400 50 0000 C CNN + 1 13300 4500 0 1 1 0 $EndComp $Comp @@ -477,8 +591,6 @@ NoConn ~ 5500 7950 NoConn ~ 5500 7850 NoConn ~ 5500 7750 -NoConn ~ 5500 7450 -NoConn ~ 5500 7350 $Comp L GND #PWR? U 1 1 4A994302 @@ -518,49 +630,49 @@ $Comp L GND #PWR? U 1 1 4A99424B -P 13350 7250 -F 0 "#PWR?" H 13350 7250 30 0001 C CNN -F 1 "GND" H 13350 7180 30 0001 C CNN - 1 13350 7250 +P 11750 7050 +F 0 "#PWR?" H 11750 7050 30 0001 C CNN +F 1 "GND" H 11750 6980 30 0001 C CNN + 1 11750 7050 1 0 0 -1 $EndComp $Comp L GND #PWR? U 1 1 4A994248 -P 11950 5750 -F 0 "#PWR?" H 11950 5750 30 0001 C CNN -F 1 "GND" H 11950 5680 30 0001 C CNN - 1 11950 5750 +P 11950 5550 +F 0 "#PWR?" H 11950 5550 30 0001 C CNN +F 1 "GND" H 11950 5480 30 0001 C CNN + 1 11950 5550 1 0 0 -1 $EndComp $Comp L GND #PWR? U 1 1 4A994244 -P 13500 5950 -F 0 "#PWR?" H 13500 5950 30 0001 C CNN -F 1 "GND" H 13500 5880 30 0001 C CNN - 1 13500 5950 +P 13500 5750 +F 0 "#PWR?" H 13500 5750 30 0001 C CNN +F 1 "GND" H 13500 5680 30 0001 C CNN + 1 13500 5750 1 0 0 -1 $EndComp $Comp L C C? U 1 1 4A99420B -P 11950 5350 -F 0 "C?" H 12000 5450 50 0000 L CNN -F 1 "C" H 12000 5250 50 0000 L CNN - 1 11950 5350 +P 11950 5150 +F 0 "C?" H 12000 5250 50 0000 L CNN +F 1 "C" H 12000 5050 50 0000 L CNN + 1 11950 5150 1 0 0 -1 $EndComp $Comp L C C? U 1 1 4A9941FF -P 13500 5550 -F 0 "C?" H 13550 5650 50 0000 L CNN -F 1 "C" H 13550 5450 50 0000 L CNN - 1 13500 5550 +P 13500 5350 +F 0 "C?" H 13550 5450 50 0000 L CNN +F 1 "C" H 13550 5250 50 0000 L CNN + 1 13500 5350 1 0 0 -1 $EndComp -Text GLabel 13750 6250 2 60 Input ~ 0 +Text GLabel 13750 6050 2 60 Input ~ 0 MODEM_RX Text GLabel 13750 6450 2 60 Input ~ 0 MODEM_CTS @@ -576,7 +688,7 @@ MODEM_ON Text GLabel 9650 3450 2 60 Input ~ 0 MODEM_RST -Text GLabel 8850 7550 2 60 Output ~ 0 +Text GLabel 8850 6750 2 60 Output ~ 0 GSM_INT Text GLabel 4900 6650 0 60 Output ~ 0 SIM_CLK @@ -586,18 +698,16 @@ SIM_V Text GLabel 4900 6950 0 60 BiDi ~ 0 SIM_IO -NoConn ~ 7800 6250 NoConn ~ 7800 6550 NoConn ~ 7800 6650 -NoConn ~ 7800 6750 $Comp L ADG3304_WLCSP U? U 1 1 4A994007 -P 12550 6250 -F 0 "U?" H 12550 6650 60 0000 C CNN -F 1 "ADG3304_WLCSP" H 12550 5250 60 0000 C CNN - 1 12550 6250 - 1 0 0 -1 +P 12550 6050 +F 0 "U?" H 12550 6450 60 0000 C CNN +F 1 "ADG3304_WLCSP" H 12550 5050 60 0000 C CNN + 1 12550 6050 + -1 0 0 -1 $EndComp $Comp L GE865 U?
--- End Message ---
--- Begin Message ---Author: werner Date: 2009-08-30 08:04:00 +0200 (Sun, 30 Aug 2009) New Revision: 5578 Modified: trunk/eda/fped/TODO trunk/eda/fped/fped.c trunk/eda/fped/kicad.c trunk/eda/fped/postscript.c Log: - postscript.c: added some code for frame display, but I'm not happy with it - postscript.c: moved tedious "... maxfont maxfont ..." into new function "boxfont" - postscript.c: "hcenter" was way off for diagonal text - postscript.c: "realsize" didn't take into account the effect of rotation and returned only the x component in the original coordinate system - fped.c: feed a dummy argv to gui_init, so that we can parse the arguments before deciding whether to bring up the GUI - fped.c: don't bring up Gtk+ if we're not going to use it Modified: trunk/eda/fped/TODO =================================================================== --- trunk/eda/fped/TODO 2009-08-29 19:54:50 UTC (rev 5577) +++ trunk/eda/fped/TODO 2009-08-30 06:04:00 UTC (rev 5578) @@ -36,8 +36,6 @@ - whenever we call parse_* for input parsing, we may leak lots of expressions - can't edit measurement labels through the GUI - unbalanced parentheses in text throw off Postscript syntax -- when starting, Gtk+ may issue many "extension [...] missing" warnings, which - can (and did) hide warnings about real problems Code cleanup: - merge edit_unique with edit_name Modified: trunk/eda/fped/fped.c =================================================================== --- trunk/eda/fped/fped.c 2009-08-29 19:54:50 UTC (rev 5577) +++ trunk/eda/fped/fped.c 2009-08-30 06:04:00 UTC (rev 5578) @@ -52,15 +52,14 @@ int main(int argc, char **argv) { - const char *name = *argv; - int error; + char *name = *argv; + char **fake_argv; + char *args[2]; + int fake_argc; + int error, batch; int batch_write_kicad = 0, batch_write_ps = 0; int c; - error = gui_init(&argc, &argv); - if (error) - return error; - while ((c = getopt(argc, argv, "kp")) != EOF) switch (c) { case 'k': @@ -73,6 +72,18 @@ usage(name); } + batch = batch_write_kicad || batch_write_ps; + + if (!batch) { + args[0] = name; + args[1] = NULL; + fake_argc = 1; + fake_argv = args; + error = gui_init(&fake_argc, &fake_argv); + if (error) + return error; + } + switch (argc-optind) { case 0: scan_empty(); @@ -103,7 +114,7 @@ write_kicad(); if (batch_write_ps) write_ps(); - if (!batch_write_kicad && !batch_write_ps) { + if (!batch) { error = gui_main(); if (error) return error; Modified: trunk/eda/fped/kicad.c =================================================================== --- trunk/eda/fped/kicad.c 2009-08-29 19:54:50 UTC (rev 5577) +++ trunk/eda/fped/kicad.c 2009-08-30 06:04:00 UTC (rev 5578) @@ -11,6 +11,7 @@ */ +#include <stdlib.h> #include <stdio.h> #include <time.h> Modified: trunk/eda/fped/postscript.c =================================================================== --- trunk/eda/fped/postscript.c 2009-08-29 19:54:50 UTC (rev 5577) +++ trunk/eda/fped/postscript.c 2009-08-30 06:04:00 UTC (rev 5578) @@ -16,7 +16,9 @@ #include "util.h" #include "coord.h" +#include "obj.h" #include "inst.h" +#include "unparse.h" #include "gui_status.h" #include "gui_inst.h" #include "postscript.h" @@ -57,14 +59,24 @@ #define PS_DOT_DIST mm_to_units(0.03) #define PS_DOT_DIAM mm_to_units(0.01) + #define PS_HATCH mm_to_units(0.1) #define PS_HATCH_LINE mm_to_units(0.015) + #define PS_FONT_OUTLINE mm_to_units(0.025) + +#define PS_VEC_LINE mm_to_units(0.02) +#define PS_VEC_ARROW_LEN mm_to_units(0.3) +#define PS_VEC_ARROW_ANGLE 20 +#define PS_VEC_TEXT_HEIGHT mm_to_units(3) /* ~8.5 pt, real mm */ +#define PS_VEC_BASE_OFFSET mm_to_units(0.5) /* real mm */ + #define PS_MEAS_LINE mm_to_units(0.015) #define PS_MEAS_ARROW_LEN mm_to_units(0.15) #define PS_MEAS_ARROW_ANGLE 30 #define PS_MEAS_TEXT_HEIGHT mm_to_units(3) /* ~8.5 pt, real mm */ #define PS_MEAS_BASE_OFFSET mm_to_units(0.5) /* real mm */ + #define PS_CROSS_WIDTH mm_to_units(0.01) #define PS_CROSS_DASH mm_to_units(0.1) @@ -137,11 +149,11 @@ if (xa) *xa = b->x0; if (ya) - *ya = b->y0; + *ya = b->y0+b->y-y; *best = b->next; - add_box(b->x0+x, b->y0, b->x0+b->x, b->y0+y); - add_box(b->x0, b->y0+y, b->x0+b->x, b->y0+b->y); + add_box(b->x0+x, b->y0, b->x0+b->x, b->y0+b->y); + add_box(b->x0, b->y0, b->x0+x, b->y0+b->y-y); free(b); return 1; @@ -165,13 +177,13 @@ w = -w; fprintf(file, "0 setgray /Helvetica-Bold findfont dup\n"); fprintf(file, " (%s) %d %d\n", inst->u.pad.name, w/2, h/2); - fprintf(file, " 4 copy 1000 maxfont\n"); - fprintf(file, " maxfont scalefont setfont\n"); + fprintf(file, " boxfont\n"); fprintf(file, " %d %d moveto\n", (a.x+b.x)/2, (a.y+b.y)/2); fprintf(file, " (%s) center %d showoutlined newpath\n", inst->u.pad.name, PS_FONT_OUTLINE); } + static const char *hatch(enum pad_type type) { switch (type) { @@ -284,11 +296,6 @@ } -static void ps_vec(FILE *file, const struct inst *inst) -{ -} - - static void ps_arrow(FILE *file, struct coord from, struct coord to, int len, int angle) { @@ -312,6 +319,44 @@ } +static void ps_vec(FILE *file, const struct inst *inst) +{ + struct coord a, b, c, d; + char *s, *sx, *sy; + + a = inst->base; + b = inst->u.vec.end; + fprintf(file, "1 setlinecap 0 setgray %d setlinewidth\n", PS_VEC_LINE); + fprintf(file, " %d %d moveto\n", a.x, a.y); + fprintf(file, " %d %d lineto\n", b.x, b.y); + fprintf(file, " stroke\n"); + + ps_arrow(file, a, b, PS_VEC_ARROW_LEN, PS_VEC_ARROW_ANGLE); + + if (!active_params.label_vecs) + return; + + sx = unparse(inst->vec->x); + sy = unparse(inst->vec->y); + s = stralloc_printf("(%s, %s)", sx, sy); + free(sx); + free(sy); + c = add_vec(a, b); + d = sub_vec(b, a); + fprintf(file, "gsave %d %d moveto\n", c.x/2, c.y/2); + fprintf(file, " /Helvetica-Bold findfont dup\n"); + fprintf(file, " (%s) %d %d realsize\n", s, + (int) (dist_point(a, b)-2*PS_VEC_ARROW_LEN), + PS_VEC_TEXT_HEIGHT); + fprintf(file, " boxfont\n"); + fprintf(file, " %f rotate\n", atan2(d.y, d.x)/M_PI*180); + fprintf(file, " (%s) %d realsize pop 0 hcenter\n", + s, PS_VEC_BASE_OFFSET); + fprintf(file, " show grestore\n"); + free(s); +} + + static void ps_meas(FILE *file, const struct inst *inst, enum curr_unit unit) { @@ -342,7 +387,7 @@ fprintf(file, " (%s) %d %d realsize\n", s, (int) (dist_point(a1, b1)-1.5*PS_MEAS_ARROW_LEN), PS_MEAS_TEXT_HEIGHT); - fprintf(file, " 4 copy 1000 maxfont maxfont scalefont setfont\n"); + fprintf(file, " boxfont\n"); fprintf(file, " %f rotate\n", atan2(d.y, d.x)/M_PI*180); fprintf(file, " (%s) %d realsize hcenter\n", s, PS_MEAS_BASE_OFFSET); @@ -443,11 +488,70 @@ /* ----- Object frames ----------------------------------------------------- */ +static void ps_draw_frame(FILE *file, const struct pkg *pkg, + const struct inst *outer, double zoom) +{ + enum inst_prio prio; + const struct inst *inst; + + fprintf(file, "gsave %f dup scale\n", zoom); + ps_cross(file, outer); + FOR_INST_PRIOS_UP(prio) { + FOR_PKG_INSTS(pkgs, prio, inst) + if (inst->outer == outer) + ps_background(file, prio, inst); + FOR_PKG_INSTS(pkg, prio, inst) + if (inst->outer == outer) + ps_background(file, prio, inst); + } + FOR_INST_PRIOS_UP(prio) { + FOR_PKG_INSTS(pkgs, prio, inst) + if (inst->outer == outer) + ps_foreground(file, prio, inst); + FOR_PKG_INSTS(pkg, prio, inst) + if (inst->outer == outer) + ps_foreground(file, prio, inst); + } + fprintf(file, "grestore\n"); +} + + static int generate_frames(FILE *file, const struct pkg *pkg, const struct frame *frame, double zoom) { const struct inst *inst; + unit_type x, y, xa, ya; + unit_type cx, cy, border; + int ok; + /* + * This doesn't work yet. The whole idea of just picking the current + * instance of each object and drawing it is flawed, since we may have + * very different sizes in a frame, so one big vector may dominate all + * the finer details. + * + * Also, the amount of text can be large and force tiny fonts to make + * things fit. + * + * A better approach would be to use a more qualitative display than a + * quantitative one, emphasizing the logical structure of the drawing + * and not the actual sizes. + * + * This could be done by ranking vectors by current, average, maximum, + * etc. size, then let their size be determined by the amount of text + * that's needed and the size of subordinate vectors. One difficulty + * would be in making vectors with a fixed length ratio look correct, + * particularly 1:1. + * + * Furthermore, don't write on the vector but put the text horizontally + * on either the left or the right side. + * + * Frame references could be drawn by simply connecting a line to the + * area of the respective frame. And let's not forget that we also need + * to list the variables somewhere. + */ + return 0; + while (frame) { if (frame->name) for (inst = pkg->insts[ip_frame]; inst; @@ -460,8 +564,39 @@ return 1; found_frame: - /* @@@ */ - return 0; + border = PS_MEAS_TEXT_HEIGHT+PS_DIVIDER_WIDTH+PS_DIVIDER_BORDER/2; + x = (inst->bbox.max.x-inst->bbox.min.x)*zoom+2*border; + y = (inst->bbox.max.y-inst->bbox.min.y)*zoom+2*border; + if (!get_box(x, y, &xa, &ya)) + return 0; + + /* + * Recurse down first, so that we only draw something if we can be sure + * that all the rest can be drawn too. + */ + + ok = generate_frames(file, pkg, frame->next, zoom); + if (!ok) + return 0; + + +#if 1 +fprintf(file, "0 setlinewidth 0.8 setgray\n"); +fprintf(file, "%d %d moveto\n", xa+border, ya+border); +fprintf(file, "%d %d lineto\n", xa+x-border, ya+border); +fprintf(file, "%d %d lineto\n", xa+x-border, ya+y-border); +fprintf(file, "%d %d lineto\n", xa+border, ya+y-border); +fprintf(file, "closepath fill\n"); +#endif + cx = xa+x/2-(inst->bbox.min.x+inst->bbox.max.x)/2*zoom; + cy = ya+y/2-(inst->bbox.min.y+inst->bbox.max.y)/2*zoom; + + fprintf(file, "%% Frame %s\n", frame->name ? frame->name : "(root)"); + fprintf(file, "gsave %d %d translate\n", cx, cy); + ps_draw_frame(file, pkg, inst, zoom); + fprintf(file, "grestore\n"); + + return 1; } @@ -483,7 +618,7 @@ fprintf(file, " /Helvetica-Bold findfont dup\n"); fprintf(file, " (%s) %d %d\n", pkg->name, PAGE_HALF_WIDTH, PS_HEADER_HEIGHT); - fprintf(file, " 4 copy 1000 maxfont maxfont scalefont setfont\n"); + fprintf(file, " boxfont\n"); fprintf(file, " (%s) show grestore\n", pkg->name); ps_hline(file, PAGE_HALF_HEIGHT-PS_HEADER_HEIGHT-PS_DIVIDER_BORDER); @@ -527,7 +662,7 @@ fprintf(file, "gsave %d %d moveto\n", x, y); fprintf(file, " /Helvetica findfont dup\n"); fprintf(file, " (%s) %d %d\n", s, w, h); - fprintf(file, " 4 copy 1000 maxfont maxfont scalefont setfont\n"); + fprintf(file, " boxfont\n"); fprintf(file, " (%s) show grestore\n", s); } @@ -583,11 +718,13 @@ /* divider */ d = PAGE_HALF_WIDTH-2*x/(f+2); - fprintf(file, "grestore %d %d moveto 0 %d rlineto stroke\n", + fprintf(file, "grestore gsave %d setlinewidth\n", + PS_DIVIDER_WIDTH); + fprintf(file, " %d %d moveto 0 %d rlineto stroke\n", d-PS_DIVIDER_BORDER, PS_DIVIDER_BORDER, y); /* x1 package */ - fprintf(file, "gsave %d %d translate\n", + fprintf(file, "grestore gsave %d %d translate\n", (d+PAGE_HALF_WIDTH)/2, y/6*5+PS_DIVIDER_BORDER); ps_draw_package(file, pkg, 1); @@ -605,11 +742,13 @@ /* divider */ d = PAGE_HALF_WIDTH-x/(f+1); - fprintf(file, "grestore %d %d moveto 0 %d rlineto stroke\n", + fprintf(file, "grestore gsave %d setlinewidth\n", + PS_DIVIDER_WIDTH); + fprintf(file, " %d %d moveto 0 %d rlineto stroke\n", d-PS_DIVIDER_BORDER, PS_DIVIDER_BORDER, y); /* x1 package */ - fprintf(file, "gsave %d %d translate\n", + fprintf(file, "grestore gsave %d %d translate\n", (d+PAGE_HALF_WIDTH)/2, c); ps_draw_package(file, pkg, 1); } else { @@ -624,8 +763,12 @@ /* * Put the frames + * + * @@@ is it really a good idea to use the same zoom for all of them ? */ + active_params.show_stuff = 1; + active_params.label_vecs = 1; for (f = 20; f >= 0.1; f = f > 1 ? f-1 : f-0.1) { add_box(-PAGE_HALF_WIDTH, -PAGE_HALF_HEIGHT, PAGE_HALF_WIDTH, -PS_DIVIDER_BORDER); @@ -705,6 +848,14 @@ " f mul grestore } def\n"); /* + * Unrotate: - -> - + */ + + fprintf(file, +"/getscale { matrix currentmatrix dup 0 get dup mul exch 1 get dup mul\n" +" add sqrt } def\n"); + + /* * Stack: string -> string */ @@ -724,11 +875,13 @@ fprintf(file, "/hcenter {\n" " /off exch def\n" -" gsave dup false charpath flattenpath pathbbox\n" +" gsave matrix setmatrix dup false charpath flattenpath pathbbox\n" " /ury exch def /urx exch def /lly exch def /llx exch def\n" " grestore\n" +//" /currscale getscale def\n" " llx urx sub 2 div\n" -" currentpoint exch pop lly sub off add rmoveto } def\n"); +//" off lly sub rmoveto } def\n"); +" off rmoveto } def\n"); /* * Stack: string outline_width -> - @@ -757,9 +910,17 @@ fprintf(file, "/originalsize 1 0 matrix currentmatrix idtransform pop def\n" "/realsize {\n" -" 254 div 72 mul 1000 div 0 matrix currentmatrix idtransform pop\n" +" 254 div 72 mul 1000 div 0 matrix currentmatrix idtransform\n" +" dup mul exch dup mul add sqrt\n" " originalsize div } def\n"); + /* + * Stack: font string x-size y-size -> - + */ + + fprintf(file, +"/boxfont { 4 copy 1000 maxfont maxfont scalefont setfont } def\n"); + fprintf(file, "%%%%EndProlog\n"); }
--- End Message ---
_______________________________________________ commitlog mailing list commitlog@lists.openmoko.org http://lists.openmoko.org/mailman/listinfo/commitlog
