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. r5282 - in trunk/gta02-core: . docs/ecn (da...@docs.openmoko.org)
   2. r5283 - trunk/gta02-core (da...@docs.openmoko.org)
   3. r5284 - trunk/gta02-core/kicad-patches (wer...@docs.openmoko.org)
--- Begin Message ---
Author: daveb
Date: 2009-07-03 13:28:37 +0200 (Fri, 03 Jul 2009)
New Revision: 5282

Modified:
   trunk/gta02-core/audio.sch
   trunk/gta02-core/bt.sch
   trunk/gta02-core/cpu.sch
   trunk/gta02-core/docs/ecn/ecn0001.txt
   trunk/gta02-core/io.sch
   trunk/gta02-core/memory.sch
Log:
more ERC prompted fixes
 - PWR_FLAGs
 - Missing GLabels
 - Inconisistently named GLabels

Relocate BT_PIO5 and board revision detection



Modified: trunk/gta02-core/audio.sch
===================================================================
--- trunk/gta02-core/audio.sch  2009-07-03 10:08:52 UTC (rev 5281)
+++ trunk/gta02-core/audio.sch  2009-07-03 11:28:37 UTC (rev 5282)
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Thu 02 Jul 2009 11:37:33 BST
+EESchema Schematic File Version 2  date Fri 03 Jul 2009 11:23:01 BST
 LIBS:power,device,conn,gta02-core
 EELAYER 24  0
 EELAYER END
@@ -1484,11 +1484,11 @@
 $EndComp
 Text GLabel 4600 5550 0    60   Input ~ 0
 PCM_OUT
-Text GLabel 4600 5400 0    60   Input ~ 0
+Text GLabel 4600 5400 0    60   BiDi ~ 0
 PCM_SYNC
-Text GLabel 4600 5250 0    60   Input ~ 0
+Text GLabel 4600 5250 0    60   BiDi ~ 0
 PCM_CLK
-Text GLabel 4600 5100 0    60   Input ~ 0
+Text GLabel 4600 5100 0    60   Output ~ 0
 PCM_IN
 $Comp
 L GND #PWR?

Modified: trunk/gta02-core/bt.sch
===================================================================
--- trunk/gta02-core/bt.sch     2009-07-03 10:08:52 UTC (rev 5281)
+++ trunk/gta02-core/bt.sch     2009-07-03 11:28:37 UTC (rev 5282)
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Fri 03 Jul 2009 11:08:10 BST
+EESchema Schematic File Version 2  date Fri 03 Jul 2009 11:45:10 BST
 LIBS:power,device,conn,gta02-core
 EELAYER 24  0
 EELAYER END
@@ -553,17 +553,17 @@
 Text GLabel 8300 3450 0    60   Input ~ 0
 BT_ACTIVE
 Text GLabel 8300 3200 0    60   Input ~ 0
-PIO_5
+BT_PIO5
 Text GLabel 8300 3050 0    60   Input ~ 0
-PIO_2
+BT_PIO2
 Text GLabel 13500 4150 2    60   BiDi ~ 0
 USB_DN
 Text GLabel 13500 4000 2    60   BiDi ~ 0
 USB_DP
-Text GLabel 13500 3350 2    60   Input ~ 0
-PCM_IN
-Text GLabel 13500 3200 2    60   Input ~ 0
-PCM_IN
+Text GLabel 13500 3350 2    60   BiDi ~ 0
+PCM_SYNC
+Text GLabel 13500 3200 2    60   BiDi ~ 0
+PCM_CLK
 Text GLabel 13500 2900 2    60   Input ~ 0
 PCM_IN
 Text GLabel 13500 3050 2    60   Output ~ 0

Modified: trunk/gta02-core/cpu.sch
===================================================================
--- trunk/gta02-core/cpu.sch    2009-07-03 10:08:52 UTC (rev 5281)
+++ trunk/gta02-core/cpu.sch    2009-07-03 11:28:37 UTC (rev 5282)
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Fri 03 Jul 2009 10:21:21 BST
+EESchema Schematic File Version 2  date Fri 03 Jul 2009 12:25:30 BST
 LIBS:power,device,conn,gta02-core
 EELAYER 24  0
 EELAYER END
@@ -13,6 +13,44 @@
 Comment3 ""
 Comment4 ""
 $EndDescr
+Wire Wire Line
+       3450 6850 4150 6850
+Wire Wire Line
+       4150 6850 4150 6700
+Wire Wire Line
+       11550 7500 11550 7350
+Wire Wire Line
+       12250 7350 12850 7350
+Wire Wire Line
+       4800 4300 3700 4300
+Wire Wire Line
+       3700 4300 3700 4600
+Wire Wire Line
+       3700 4600 3450 4600
+Wire Wire Line
+       13450 6500 12350 6500
+Wire Wire Line
+       12350 6500 12350 6600
+Wire Wire Line
+       12350 6600 11550 6600
+Wire Wire Line
+       13450 6700 12550 6700
+Wire Wire Line
+       12550 6700 12550 6900
+Wire Wire Line
+       12550 6900 11550 6900
+Wire Wire Line
+       11550 7200 12750 7200
+Wire Wire Line
+       12750 7200 12750 6900
+Wire Wire Line
+       12750 6900 13450 6900
+Wire Wire Line
+       13450 7100 12950 7100
+Wire Wire Line
+       12950 7100 12950 7500
+Wire Wire Line
+       13150 7300 13150 7800
 Connection ~ 7000 7700
 Wire Wire Line
        7200 7700 7000 7700
@@ -38,28 +76,6 @@
 Wire Wire Line
        13150 6150 11550 6150
 Wire Wire Line
-       13450 6400 12450 6400
-Wire Wire Line
-       12450 6400 12450 6450
-Wire Wire Line
-       12450 6450 11550 6450
-Wire Wire Line
-       11550 6750 12650 6750
-Wire Wire Line
-       12650 6750 12650 6600
-Wire Wire Line
-       12650 6600 13450 6600
-Wire Wire Line
-       11550 7050 12850 7050
-Wire Wire Line
-       12850 7050 12850 6800
-Wire Wire Line
-       12850 6800 13450 6800
-Wire Wire Line
-       13050 7200 13050 7350
-Wire Wire Line
-       13250 7400 13250 7650
-Wire Wire Line
        9800 6150 10500 6150
 Connection ~ 10500 5700
 Wire Wire Line
@@ -110,12 +126,6 @@
 Wire Wire Line
        4200 4900 3450 4900
 Wire Wire Line
-       4800 5050 4600 5050
-Wire Wire Line
-       4600 5050 4600 5100
-Wire Wire Line
-       4600 5100 3450 5100
-Wire Wire Line
        4800 5800 3700 5800
 Wire Wire Line
        3700 5800 3700 5700
@@ -149,8 +159,6 @@
 Wire Wire Line
        3450 8300 5600 8300
 Wire Wire Line
-       3450 6850 3850 6850
-Wire Wire Line
        3650 6550 3650 6750
 Wire Wire Line
        5300 8000 5300 7800
@@ -408,9 +416,9 @@
 Wire Wire Line
        13550 2500 15050 2500
 Wire Wire Line
-       13250 7400 13450 7400
+       13450 7400 13250 7400
 Wire Wire Line
-       13250 7650 11550 7650
+       11550 7950 13250 7950
 Wire Wire Line
        13450 5200 13150 5200
 Wire Wire Line
@@ -424,9 +432,9 @@
 Wire Wire Line
        13150 4950 11550 4950
 Wire Wire Line
-       13450 7300 13150 7300
+       13150 7300 13450 7300
 Wire Wire Line
-       11550 7500 13150 7500
+       13150 7800 11550 7800
 Wire Wire Line
        12850 5500 12850 5400
 Wire Wire Line
@@ -472,30 +480,10 @@
 Wire Wire Line
        3450 7400 7000 7400
 Wire Wire Line
-       13050 7200 13450 7200
+       13450 7200 13050 7200
 Wire Wire Line
-       13050 7350 11550 7350
+       11550 7650 13050 7650
 Wire Wire Line
-       13150 7500 13150 7300
-Wire Wire Line
-       11550 7200 12950 7200
-Wire Wire Line
-       12950 7200 12950 6900
-Wire Wire Line
-       12950 6900 13450 6900
-Wire Wire Line
-       13450 6700 12750 6700
-Wire Wire Line
-       12750 6700 12750 6900
-Wire Wire Line
-       12750 6900 11550 6900
-Wire Wire Line
-       11550 6600 12550 6600
-Wire Wire Line
-       12550 6600 12550 6500
-Wire Wire Line
-       12550 6500 13450 6500
-Wire Wire Line
        11550 6300 13250 6300
 Wire Wire Line
        13250 6300 13250 6100
@@ -524,7 +512,78 @@
 Wire Wire Line
        8300 7300 3450 7300
 Connection ~ 8300 7700
+Wire Wire Line
+       13050 7650 13050 7200
+Wire Wire Line
+       13250 7950 13250 7400
+Wire Wire Line
+       13450 7000 12850 7000
+Wire Wire Line
+       12850 7000 12850 7350
+Wire Wire Line
+       13450 6800 12650 6800
+Wire Wire Line
+       12650 6800 12650 7050
+Wire Wire Line
+       12650 7050 11550 7050
+Wire Wire Line
+       13450 6600 12450 6600
+Wire Wire Line
+       12450 6600 12450 6750
+Wire Wire Line
+       12450 6750 11550 6750
+Wire Wire Line
+       11550 6450 12250 6450
+Wire Wire Line
+       12250 6450 12250 6400
+Wire Wire Line
+       12250 6400 13450 6400
+Wire Wire Line
+       11550 7350 11750 7350
+Wire Wire Line
+       12950 7500 12250 7500
+Wire Wire Line
+       11750 7500 10750 7500
+Wire Wire Line
+       10750 7500 10750 7400
+Connection ~ 11550 7500
+Text Notes 9750 7400 0    50   ~ 0
+board revision detection\necn0001
+Text Notes 3750 4200 0    50   ~ 0
+BT_PIO5 moved here - ecn0001
+Text Notes 4800 5100 0    50   ~ 0
+3D_RST net removed - ecn0001
+NoConn ~ 3450 5100
 $Comp
+L R_US R1551
+U 1 1 4A4DE542
+P 12000 7500
+F 0 "R1551" H 11870 7420 50  0000 C CNN
+F 1 "NC" H 12130 7420 50  0000 C CNN
+       1    12000 7500
+       1    0    0    -1  
+$EndComp
+$Comp
+L R_US R1550
+U 1 1 4A4DE541
+P 12000 7350
+F 0 "R1550" H 11870 7430 50  0000 C CNN
+F 1 "NC" H 12130 7430 50  0000 C CNN
+       1    12000 7350
+       1    0    0    -1  
+$EndComp
+$Comp
+L IO_3V3 #PWR?
+U 1 1 4A4DE43E
+P 10750 7400
+F 0 "#PWR?" H 10750 7300 50  0001 C CNN
+F 1 "IO_3V3" H 10750 7550 50  0000 C CNN
+       1    10750 7400
+       1    0    0    -1  
+$EndComp
+Text GLabel 4800 4300 2    60   BiDi ~ 0
+BT_PIO5
+$Comp
 L TST TP1525
 U 1 1 4A4B8E1E
 P 12550 4550
@@ -610,11 +669,11 @@
 ACCEL_SPIMOSI
 Text GLabel 11550 6450 0    60   Input ~ 0
 ACCEL_SPIMISO
-Text GLabel 11550 7650 0    60   Input ~ 0
+Text GLabel 11550 7950 0    60   Input ~ 0
 NAND_BUS_WIDTH
-Text GLabel 11550 7500 0    60   Input ~ 0
+Text GLabel 11550 7800 0    60   Input ~ 0
 NAND_ADDR_CYCLE
-Text GLabel 11550 7350 0    60   Input ~ 0
+Text GLabel 11550 7650 0    60   Input ~ 0
 NAND_PAGE_SIZE
 Text GLabel 11550 6300 0    60   Input ~ 0
 WLAN_SS
@@ -630,13 +689,12 @@
 JACK_INSERT
 Text GLabel 11550 5250 0    60   Input ~ 0
 EINT3
-Text GLabel 11550 5100 0    60   Input ~ 0
-PIO_2
+Text GLabel 11550 5100 0    60   BiDi ~ 0
+BT_PIO2
 Text GLabel 11550 4950 0    60   Input ~ 0
 IO1
 Text GLabel 11550 4800 0    60   Input ~ 0
 nACCEL_INT1
-NoConn ~ 13450 7000
 NoConn ~ 13450 6300
 NoConn ~ 13450 6200
 $Comp
@@ -648,7 +706,6 @@
        1    12000 5250
        1    0    0    -1  
 $EndComp
-NoConn ~ 13450 7100
 $Comp
 L SC32442 U1501
 U 4 1 4A4B73FE
@@ -690,8 +747,6 @@
 INTO
 Text GLabel 4800 4900 2    60   Output ~ 0
 nGSM_EN
-Text GLabel 4800 5050 2    60   Output ~ 0
-3D_RST
 $Comp
 L R_US R1545
 U 1 1 4A45665C
@@ -727,7 +782,6 @@
 Text GLabel 4800 5200 2    60   Output ~ 0
 DL_GSM
 NoConn ~ 3450 5600
-NoConn ~ 3450 4600
 $Comp
 L C C1516
 U 1 1 4A4564D2
@@ -830,10 +884,10 @@
 $Comp
 L TST TP1532
 U 1 1 4A456249
-P 3850 6850
-F 0 "TP1532" H 3850 7150 40  0000 C CNN
-F 1 " " H 3850 7100 30  0000 C CNN
-       1    3850 6850
+P 4150 6700
+F 0 "TP1532" H 4150 7000 40  0000 C CNN
+F 1 " " H 4150 6950 30  0000 C CNN
+       1    4150 6700
        1    0    0    -1  
 $EndComp
 $Comp

Modified: trunk/gta02-core/docs/ecn/ecn0001.txt
===================================================================
--- trunk/gta02-core/docs/ecn/ecn0001.txt       2009-07-03 10:08:52 UTC (rev 
5281)
+++ trunk/gta02-core/docs/ecn/ecn0001.txt       2009-07-03 11:28:37 UTC (rev 
5282)
@@ -6,10 +6,13 @@
 - LCM controller SPI moved to GPIO (GPG-5-7)
 - LCD_xRES signal moved to GPD9
 - LP Filters for LCM interface rearranged for better organization
+- SD/MMC moved to CPU SDIO interface
+- WLAN moved to SPI0
+- Moved BT PIO_5 from LCDVF0/GPC5 to CAMDATA0/GPJ0
+- Move board-revision detection from VD5/GPC13 & VD12/GPD3 to EINT19/GPG11 & 
EINT20/GPG12
+- Remove 3D_RST and 3D_INT nets
 
 To do:
-- reassign SD/MMC
-- move WLAN to SPI
 - software impact of LCM pixel change on kernel
 - software impact of LCM controller SPI change on kernel
 - software impact of SD/MMC change on Qi and kernel

Modified: trunk/gta02-core/io.sch
===================================================================
--- trunk/gta02-core/io.sch     2009-07-03 10:08:52 UTC (rev 5281)
+++ trunk/gta02-core/io.sch     2009-07-03 11:28:37 UTC (rev 5282)
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Fri 03 Jul 2009 10:26:25 BST
+EESchema Schematic File Version 2  date Fri 03 Jul 2009 12:13:57 BST
 LIBS:power,device,conn,gta02-core
 EELAYER 24  0
 EELAYER END
@@ -13,7 +13,13 @@
 Comment3 ""
 Comment4 ""
 $EndDescr
+Connection ~ 9150 4800
 Wire Wire Line
+       9600 4500 9600 4600
+Connection ~ 9150 4600
+Wire Wire Line
+       9600 4600 9150 4600
+Wire Wire Line
        4850 5450 6250 5450
 Wire Wire Line
        4850 5250 6250 5250
@@ -151,11 +157,9 @@
 Connection ~ 7950 6100
 Wire Wire Line
        9150 4800 8450 4800
-Wire Wire Line
-       9150 5300 9150 4600
 Connection ~ 9150 4900
 Wire Wire Line
-       9150 3950 9150 4100
+       9150 3750 9150 3900
 Wire Wire Line
        5650 4600 5650 4950
 Connection ~ 5650 4950
@@ -284,6 +288,17 @@
        4850 5050 6250 5050
 Wire Wire Line
        4850 5350 6250 5350
+Wire Wire Line
+       9150 4400 9150 5300
+$Comp
+L PWR_FLAG #FLG?
+U 1 1 4A4DE7CA
+P 9600 4500
+F 0 "#FLG?" H 9600 4770 30  0001 C CNN
+F 1 "PWR_FLAG" H 9600 4730 30  0000 C CNN
+       1    9600 4500
+       1    0    0    -1  
+$EndComp
 Text GLabel 4850 5450 0    60   Input ~ 0
 ACCEL_SPICLK
 Text GLabel 4850 5350 0    60   Input ~ 0
@@ -766,19 +781,19 @@
 $Comp
 L R_US R7804
 U 1 1 4A401AEB
-P 9150 4350
-F 0 "R7804" H 9150 4250 50  0000 C CNN
-F 1 "0R" H 9150 4450 50  0000 C CNN
-       1    9150 4350
+P 9150 4150
+F 0 "R7804" H 9150 4050 50  0000 C CNN
+F 1 "0R" H 9150 4250 50  0000 C CNN
+       1    9150 4150
        0    1    1    0   
 $EndComp
 $Comp
 L GSENSOR_3V3 #PWR?
 U 1 1 4A401A8A
-P 9150 3950
-F 0 "#PWR?" H 9150 3850 50  0001 C CNN
-F 1 "GSENSOR_3V3" H 9150 4100 50  0000 C CNN
-       1    9150 3950
+P 9150 3750
+F 0 "#PWR?" H 9150 3650 50  0001 C CNN
+F 1 "GSENSOR_3V3" H 9150 3900 50  0000 C CNN
+       1    9150 3750
        1    0    0    -1  
 $EndComp
 $Comp

Modified: trunk/gta02-core/memory.sch
===================================================================
--- trunk/gta02-core/memory.sch 2009-07-03 10:08:52 UTC (rev 5281)
+++ trunk/gta02-core/memory.sch 2009-07-03 11:28:37 UTC (rev 5282)
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Fri 03 Jul 2009 11:02:23 BST
+EESchema Schematic File Version 2  date Fri 03 Jul 2009 11:35:43 BST
 LIBS:power,device,conn,gta02-core
 EELAYER 24  0
 EELAYER END
@@ -13,11 +13,15 @@
 Comment3 ""
 Comment4 ""
 $EndDescr
+Wire Wire Line
+       2950 3850 2950 3500
+Wire Wire Line
+       2950 3500 2000 3500
 Connection ~ 13050 1150
 Wire Wire Line
-       13250 1150 13250 1050
+       13250 1050 13250 1150
 Wire Wire Line
-       12450 1150 13250 1150
+       13250 1150 12450 1150
 Wire Wire Line
        12650 1950 13050 1950
 Connection ~ 13300 3900
@@ -467,6 +471,14 @@
        13400 2750 13400 4100
 Connection ~ 13400 3900
 Connection ~ 13850 2750
+Wire Wire Line
+       2850 3850 2850 3700
+Wire Wire Line
+       2850 3700 2000 3700
+Text GLabel 2000 3500 0    60   Output ~ 0
+BT_EN
+Text GLabel 2000 3700 0    60   Output ~ 0
+MODEM_RST
 $Comp
 L PWR_FLAG #FLG?
 U 1 1 4A4DD71E
@@ -526,8 +538,6 @@
 NoConn ~ 3450 3850
 NoConn ~ 3350 3850
 NoConn ~ 3250 3850
-NoConn ~ 2950 3850
-NoConn ~ 2850 3850
 NoConn ~ 1850 7600
 NoConn ~ 1850 7200
 NoConn ~ 1850 7100




--- End Message ---
--- Begin Message ---
Author: daveb
Date: 2009-07-03 13:45:28 +0200 (Fri, 03 Jul 2009)
New Revision: 5283

Modified:
   trunk/gta02-core/gps.sch
   trunk/gta02-core/memory.sch
   trunk/gta02-core/usb.sch
Log:
add missing GLabels
connect missed ground on USB
rename EXTINT0 to GPS_EXTINT



Modified: trunk/gta02-core/gps.sch
===================================================================
--- trunk/gta02-core/gps.sch    2009-07-03 11:28:37 UTC (rev 5282)
+++ trunk/gta02-core/gps.sch    2009-07-03 11:45:28 UTC (rev 5283)
@@ -1,9 +1,9 @@
-EESchema Schematic File Version 2  date Mon 29 Jun 2009 17:56:30 WEST
-LIBS:power,device,conn,gta02-core,gta02-core-cache
+EESchema Schematic File Version 2  date Fri 03 Jul 2009 12:43:13 BST
+LIBS:power,device,conn,gta02-core
 EELAYER 24  0
 EELAYER END
 $Descr A3 16535 11700
-Sheet 10 11
+Sheet 11 12
 Title ""
 Date ""
 Rev ""
@@ -1110,7 +1110,7 @@
        -1   0    0    1   
 $EndComp
 Text GLabel 4300 6400 0    60   Input ~ 0
-EXTINT0
+GPS_EXTINT
 $Comp
 L R_US R7609
 U 1 1 4A3D39FE

Modified: trunk/gta02-core/memory.sch
===================================================================
--- trunk/gta02-core/memory.sch 2009-07-03 11:28:37 UTC (rev 5282)
+++ trunk/gta02-core/memory.sch 2009-07-03 11:45:28 UTC (rev 5283)
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Fri 03 Jul 2009 11:35:43 BST
+EESchema Schematic File Version 2  date Fri 03 Jul 2009 12:43:08 BST
 LIBS:power,device,conn,gta02-core
 EELAYER 24  0
 EELAYER END
@@ -14,9 +14,15 @@
 Comment4 ""
 $EndDescr
 Wire Wire Line
-       2950 3850 2950 3500
+       2750 8850 3550 8850
 Wire Wire Line
-       2950 3500 2000 3500
+       2750 8550 3350 8550
+Wire Wire Line
+       3450 8350 3450 8700
+Wire Wire Line
+       2950 3850 2950 3550
+Wire Wire Line
+       2950 3550 2350 3550
 Connection ~ 13050 1150
 Wire Wire Line
        13250 1050 13250 1150
@@ -474,10 +480,22 @@
 Wire Wire Line
        2850 3850 2850 3700
 Wire Wire Line
-       2850 3700 2000 3700
-Text GLabel 2000 3500 0    60   Output ~ 0
+       2850 3700 2350 3700
+Wire Wire Line
+       3350 8550 3350 8350
+Wire Wire Line
+       3550 8850 3550 8350
+Wire Wire Line
+       3450 8700 2750 8700
+Text GLabel 2750 8550 0    60   Output ~ 0
+MODEM_ON
+Text GLabel 2750 8850 0    60   Output ~ 0
+USB_PULLUP
+Text GLabel 2750 8700 0    60   Output ~ 0
+GPS_EXTINT
+Text GLabel 2350 3550 0    60   Output ~ 0
 BT_EN
-Text GLabel 2000 3700 0    60   Output ~ 0
+Text GLabel 2350 3700 0    60   Output ~ 0
 MODEM_RST
 $Comp
 L PWR_FLAG #FLG?
@@ -527,9 +545,6 @@
        1    0    0    -1  
 $EndComp
 NoConn ~ 3650 8350
-NoConn ~ 3550 8350
-NoConn ~ 3450 8350
-NoConn ~ 3350 8350
 NoConn ~ 4150 3850
 NoConn ~ 4050 3850
 NoConn ~ 3750 3850

Modified: trunk/gta02-core/usb.sch
===================================================================
--- trunk/gta02-core/usb.sch    2009-07-03 11:28:37 UTC (rev 5282)
+++ trunk/gta02-core/usb.sch    2009-07-03 11:45:28 UTC (rev 5283)
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Thu 02 Jul 2009 11:25:43 BST
+EESchema Schematic File Version 2  date Fri 03 Jul 2009 12:43:29 BST
 LIBS:power,device,conn,gta02-core
 EELAYER 24  0
 EELAYER END
@@ -13,272 +13,275 @@
 Comment3 ""
 Comment4 ""
 $EndDescr
+Connection ~ 6000 8500
 Wire Wire Line
-       11150 1400 11150 1450
+       6000 9550 6000 8400
 Wire Wire Line
-       10350 1400 11150 1400
+       6000 8400 5800 8400
 Wire Wire Line
-       10350 1550 11600 1550
+       11600 1650 11300 1650
 Wire Wire Line
-       11600 1750 11400 1750
+       11300 1650 11300 2200
 Wire Wire Line
-       11400 1750 11400 2500
+       11300 2200 9900 2200
 Wire Wire Line
-       11400 2500 9900 2500
-Connection ~ 10250 3550
+       11600 1450 11150 1450
+Connection ~ 11900 3550
 Wire Wire Line
-       10250 4550 10250 3550
-Connection ~ 9000 3550
+       11900 3350 11900 3550
 Wire Wire Line
-       9200 3550 9000 3550
+       12100 3550 9900 3550
+Connection ~ 12100 4750
 Wire Wire Line
-       2400 8450 3900 8450
+       12100 4750 11850 4750
 Wire Wire Line
-       6150 8800 6150 8250
+       11850 4750 11850 4450
 Wire Wire Line
-       6000 9550 6000 8500
+       2400 8200 2550 8200
 Wire Wire Line
-       6850 8600 6850 8000
+       2550 8200 2550 8350
 Wire Wire Line
-       5550 3700 5050 3700
+       2550 8350 3900 8350
+Connection ~ 9650 3850
 Wire Wire Line
-       5050 3700 5050 4500
+       9650 4550 9650 3850
 Wire Wire Line
-       4500 1650 4500 1450
+       6400 8200 6400 8000
 Wire Wire Line
-       11850 2800 11500 2800
+       7400 8600 7400 7400
+Connection ~ 7400 2500
 Wire Wire Line
-       11500 2800 11500 4550
-Connection ~ 11500 4000
+       7400 2000 7400 2500
+Connection ~ 6950 2200
 Wire Wire Line
-       9400 2500 5950 2500
+       6950 2000 6950 2200
 Wire Wire Line
-       11800 7050 11800 8550
-Connection ~ 13450 4150
+       4850 4500 5050 4500
 Wire Wire Line
-       13250 4150 13450 4150
-Connection ~ 13450 3700
+       4500 3250 4500 2950
 Wire Wire Line
-       13250 3700 13450 3700
-Connection ~ 7950 2200
+       11500 4000 12100 4000
 Wire Wire Line
-       3500 2050 3500 2350
+       9000 4550 9000 3200
+Connection ~ 10900 3700
 Wire Wire Line
-       3500 2350 3900 2350
-Connection ~ 3700 2500
-Connection ~ 7800 3850
+       10900 4550 10900 3700
 Wire Wire Line
-       7800 2500 7800 3850
+       9400 2200 5950 2200
+Connection ~ 13450 4000
 Wire Wire Line
-       7450 3850 12100 3850
+       13250 4000 13450 4000
 Wire Wire Line
-       5100 2500 5450 2500
+       13250 3550 13450 3550
 Wire Wire Line
-       5550 3850 5350 3850
+       13450 3550 13450 5250
+Connection ~ 7800 2500
+Connection ~ 3500 2050
 Wire Wire Line
-       4200 5250 4200 5050
+       3250 2050 3900 2050
 Wire Wire Line
-       11500 5250 11500 5050
+       3700 3250 3700 2200
 Wire Wire Line
-       10900 5250 10900 5050
+       3700 2200 3900 2200
 Wire Wire Line
-       9650 5250 9650 5050
+       3700 2500 3900 2500
 Wire Wire Line
-       6150 4500 6150 4300
+       12100 3700 7950 3700
 Wire Wire Line
-       4200 3950 4200 3750
+       7950 3700 7950 2200
 Wire Wire Line
-       3350 4400 3600 4400
-Connection ~ 11250 8350
+       6750 3850 6950 3850
 Wire Wire Line
-       10600 8350 12000 8350
-Connection ~ 11800 8000
+       5100 2200 5450 2200
 Wire Wire Line
-       12650 8900 12650 8700
-Connection ~ 13600 8000
+       5350 4050 5350 3850
 Wire Wire Line
-       14450 8000 13300 8000
-Connection ~ 13500 8350
-Connection ~ 14050 8350
+       12100 5250 12100 4150
 Wire Wire Line
-       14050 8350 13300 8350
+       10250 5250 10250 5050
 Wire Wire Line
-       13500 9150 13500 8950
+       9000 5250 9000 5050
 Wire Wire Line
-       13600 8000 13600 7800
+       6150 3350 6150 3150
 Wire Wire Line
-       11250 9250 11250 9050
+       3350 4600 3600 4600
 Wire Wire Line
-       4500 7400 4500 7200
+       11800 9250 11800 9050
 Wire Wire Line
-       4500 6950 4300 6950
+       11250 8350 11250 8550
 Wire Wire Line
-       4300 6950 4300 7200
+       11800 8000 12000 8000
 Wire Wire Line
-       4300 7200 4600 7200
-Connection ~ 2750 8350
+       13600 7300 13600 7100
 Wire Wire Line
-       2750 8000 2750 8350
-Connection ~ 5100 7200
+       14050 9150 14050 8950
 Wire Wire Line
-       5000 7400 5000 7200
+       14050 8550 14050 7100
 Wire Wire Line
-       6150 8800 6400 8800
+       13500 8350 13500 8550
 Wire Wire Line
-       6150 8250 5800 8250
+       5100 7400 5100 7200
 Wire Wire Line
-       6000 8600 5800 8600
-Connection ~ 3200 7950
+       5100 6950 5300 6950
 Wire Wire Line
-       3200 7950 3900 7950
+       5300 6950 5300 7200
 Wire Wire Line
-       3200 8800 3200 7150
-Connection ~ 7400 7800
+       5300 7200 5000 7200
+Connection ~ 4500 7200
 Wire Wire Line
-       7400 7800 5800 7800
+       4600 7400 4600 7200
+Connection ~ 6400 8800
 Wire Wire Line
-       6850 9000 6850 9550
+       6400 8900 6400 8700
+Connection ~ 6000 8600
 Wire Wire Line
-       3700 9400 3700 9250
+       6000 8500 5800 8500
+Connection ~ 3200 8150
 Wire Wire Line
-       2750 7500 2750 7150
+       3200 8150 3900 8150
+Connection ~ 3200 7850
 Wire Wire Line
-       3200 9400 3200 9200
+       3200 7850 3900 7850
 Wire Wire Line
-       6400 9550 6400 9400
+       3700 8750 3700 8550
 Wire Wire Line
-       6850 8000 5800 8000
-Connection ~ 6400 8000
+       3700 8550 3900 8550
 Wire Wire Line
        7400 9000 7400 9550
+Connection ~ 6400 8000
 Wire Wire Line
-       3900 8550 3700 8550
+       5800 8000 6850 8000
 Wire Wire Line
-       3700 8550 3700 8750
+       6400 9550 6400 9400
 Wire Wire Line
-       3200 7850 3900 7850
-Connection ~ 3200 7850
+       3200 9400 3200 9200
 Wire Wire Line
-       3200 8150 3900 8150
-Connection ~ 3200 8150
+       2750 7500 2750 7150
 Wire Wire Line
-       6000 8500 5800 8500
-Connection ~ 6000 8600
+       3700 9400 3700 9250
 Wire Wire Line
-       6400 8900 6400 8700
-Connection ~ 6400 8800
+       6850 9000 6850 9550
 Wire Wire Line
-       4600 7200 4600 7400
-Connection ~ 4500 7200
+       7400 7800 5800 7800
+Connection ~ 7400 7800
 Wire Wire Line
-       5000 7200 5300 7200
+       3200 8800 3200 7150
 Wire Wire Line
-       5300 7200 5300 6950
+       3200 7950 3900 7950
+Connection ~ 3200 7950
 Wire Wire Line
-       5300 6950 5100 6950
+       6000 8600 5800 8600
 Wire Wire Line
-       5100 7400 5100 7200
+       5800 8250 6150 8250
 Wire Wire Line
-       13500 8350 13500 8550
+       6400 8800 6150 8800
 Wire Wire Line
-       14050 8550 14050 7100
+       5000 7200 5000 7400
+Connection ~ 5100 7200
 Wire Wire Line
-       14050 9150 14050 8950
+       2750 8000 2750 8350
+Connection ~ 2750 8350
 Wire Wire Line
-       13600 7300 13600 7100
+       4600 7200 4300 7200
 Wire Wire Line
-       11800 8000 12000 8000
+       4300 7200 4300 6950
 Wire Wire Line
-       11250 8350 11250 8550
+       4300 6950 4500 6950
 Wire Wire Line
-       11800 9250 11800 9050
+       4500 7400 4500 7200
 Wire Wire Line
-       3350 4600 3600 4600
+       11250 9250 11250 9050
 Wire Wire Line
-       6150 3350 6150 3150
+       13600 8000 13600 7800
 Wire Wire Line
-       9000 5250 9000 5050
+       13500 9150 13500 8950
 Wire Wire Line
-       10250 5250 10250 5050
+       14050 8350 13300 8350
+Connection ~ 14050 8350
+Connection ~ 13500 8350
 Wire Wire Line
-       12100 5250 12100 4150
+       14450 8000 13300 8000
+Connection ~ 13600 8000
 Wire Wire Line
-       5350 3850 5350 4050
+       12650 8900 12650 8700
+Connection ~ 11800 8000
 Wire Wire Line
-       5100 2200 5450 2200
+       10600 8350 12000 8350
+Connection ~ 11250 8350
 Wire Wire Line
-       6750 3850 6950 3850
+       3350 4400 3600 4400
 Wire Wire Line
-       7950 2200 7950 3700
+       4200 3950 4200 3750
 Wire Wire Line
-       7950 3700 12100 3700
+       6150 4500 6150 4300
 Wire Wire Line
-       3700 2500 3900 2500
+       9650 5250 9650 5050
 Wire Wire Line
-       3900 2200 3700 2200
+       10900 5250 10900 5050
 Wire Wire Line
-       3700 2200 3700 3250
+       11500 5250 11500 5050
 Wire Wire Line
-       3250 2050 3900 2050
-Connection ~ 3500 2050
-Connection ~ 7800 2500
+       4200 5250 4200 5050
 Wire Wire Line
-       13450 5250 13450 3550
+       5350 3850 5550 3850
 Wire Wire Line
-       13450 3550 13250 3550
+       5100 2500 5450 2500
 Wire Wire Line
-       13250 4000 13450 4000
-Connection ~ 13450 4000
+       7450 3850 12100 3850
 Wire Wire Line
-       9400 2200 5950 2200
+       7800 2500 7800 3850
+Connection ~ 7800 3850
+Connection ~ 3700 2500
 Wire Wire Line
-       10900 4550 10900 3700
-Connection ~ 10900 3700
+       3900 2350 3500 2350
 Wire Wire Line
-       9000 4550 9000 3200
+       3500 2350 3500 2050
+Connection ~ 7950 2200
 Wire Wire Line
-       11500 4000 12100 4000
+       13250 3700 13450 3700
+Connection ~ 13450 3700
 Wire Wire Line
-       4500 3250 4500 2950
+       13250 4150 13450 4150
+Connection ~ 13450 4150
 Wire Wire Line
-       5050 4500 4850 4500
+       11800 7050 11800 8550
 Wire Wire Line
-       6950 2000 6950 2200
-Connection ~ 6950 2200
+       9400 2500 5950 2500
+Connection ~ 11500 4000
 Wire Wire Line
-       7400 2000 7400 2500
-Connection ~ 7400 2500
+       11500 4550 11500 2800
 Wire Wire Line
-       7400 8600 7400 7400
+       11500 2800 11850 2800
 Wire Wire Line
-       6400 8200 6400 8000
+       4500 1650 4500 1450
 Wire Wire Line
-       9650 4550 9650 3850
-Connection ~ 9650 3850
+       5050 4500 5050 3700
 Wire Wire Line
-       3900 8350 2550 8350
+       5050 3700 5550 3700
 Wire Wire Line
-       2550 8350 2550 8200
+       6850 8000 6850 8600
 Wire Wire Line
-       2550 8200 2400 8200
+       6150 8800 6150 8250
 Wire Wire Line
-       11850 4450 11850 4750
+       2400 8450 3900 8450
 Wire Wire Line
-       11850 4750 12100 4750
-Connection ~ 12100 4750
+       9200 3550 9000 3550
+Connection ~ 9000 3550
 Wire Wire Line
-       12100 3550 9900 3550
+       10250 4550 10250 3550
+Connection ~ 10250 3550
 Wire Wire Line
-       11900 3350 11900 3550
-Connection ~ 11900 3550
+       9900 2500 11400 2500
 Wire Wire Line
-       11150 1450 11600 1450
+       11400 2500 11400 1750
 Wire Wire Line
-       9900 2200 11300 2200
+       11400 1750 11600 1750
 Wire Wire Line
-       11300 2200 11300 1650
+       10350 1550 11600 1550
 Wire Wire Line
-       11300 1650 11600 1650
+       10350 1400 11150 1400
+Wire Wire Line
+       11150 1400 11150 1450
 $Comp
 L SC32442 U1501
 U 11 1 4A44EBED




--- End Message ---
--- Begin Message ---
Author: werner
Date: 2009-07-03 15:23:31 +0200 (Fri, 03 Jul 2009)
New Revision: 5284

Added:
   trunk/gta02-core/kicad-patches/erc-exceptions.patch
   trunk/gta02-core/kicad-patches/streamline-erc.patch
Modified:
   trunk/gta02-core/kicad-patches/series
Log:
Upgraded to r1857 and added ERC exceptions.



Added: trunk/gta02-core/kicad-patches/erc-exceptions.patch
===================================================================
--- trunk/gta02-core/kicad-patches/erc-exceptions.patch                         
(rev 0)
+++ trunk/gta02-core/kicad-patches/erc-exceptions.patch 2009-07-03 13:23:31 UTC 
(rev 5284)
@@ -0,0 +1,278 @@
+This patch adds a mechanism to suppress ERC errors and warnings that
+are caused by pins incompatibilities. It works by loading a file with
+ERC exceptions each time an ERC is performed and then looking for an
+entry before issuing a warning or error.
+
+The file has the same path and name as the .sch file, but ends in .erx
+(Electric Rule eXceptions). Each line contains the following four
+whitespace-separated fields:
+
+- component reference of the first component 
+- pin number of the first component 
+- component reference of the second component 
+- pin number of the second component 
+
+# is used as a comment character. Note that the file is reloaded
+each time ERC is invoked, so one can edit it in parallel to
+running eeschema.
+
+Known bug: ERC dialog window needs reformatting for displaying the
+exception count.
+
+The patch needs to be applied on top of the TestOthersItems
+streamlining patch.
+
+- Werner
+
+---
+
+Index: kicad/eeschema/erc.cpp
+===================================================================
+--- kicad.orig/eeschema/erc.cpp        2009-07-03 10:05:43.000000000 -0300
++++ kicad/eeschema/erc.cpp     2009-07-03 10:19:15.000000000 -0300
+@@ -267,6 +267,188 @@
+ }
+ 
+ 
++static struct exception
++{
++    char* a_ref;
++    char* a_pin;
++    char* b_ref;
++    char* b_pin;
++    char* line; /* pointer to the memory object we've allocated */
++    struct exception* next;
++}* exceptions;
++
++
++
++/********************************************************************/
++static void FreeExceptions( void )
++/********************************************************************/
++{
++    struct exception* next;
++
++    while( exceptions )
++    {
++      next = exceptions->next;
++      MyFree( exceptions->line );
++      MyFree( exceptions );
++      exceptions = next;
++    }
++}
++
++
++/********************************************************************/
++static bool ParseField( char **s, char **field )
++/********************************************************************/
++{
++    *field = *s;
++    if( ! **s )
++      return FALSE;
++    while( **s && ! isspace( **s ) )
++      (*s)++;
++    if( ! **s )
++      return TRUE;
++    *(*s)++ = 0;
++    while( **s && isspace( **s ) )
++      (*s)++;
++    return TRUE;
++}
++
++
++/********************************************************************/
++static bool ParseException( char *s )
++/********************************************************************/
++{
++    struct exception tmp;
++    struct exception* e;
++
++    tmp.line = s;
++
++    if( ! ParseField( &s, &tmp.a_ref))
++      return FALSE;
++    if( ! ParseField( &s, &tmp.a_pin ))
++      return FALSE;
++    if( ! ParseField( &s, &tmp.b_ref))
++      return FALSE;
++    if( ! ParseField( &s, &tmp.b_pin ))
++      return FALSE;
++
++    e = (struct exception*) MyMalloc( sizeof( *e ));
++    *e = tmp;
++    e->next = exceptions;
++    exceptions = e;
++
++    return TRUE;
++}
++
++
++/********************************************************************/
++static bool LoadExceptionsByName( const wxString &file_name )
++/********************************************************************/
++{
++    FILE* file;
++    char buf[200]; /* enough room for chatty comments */
++    char* s;
++    char* tmp;
++    char* hash;
++    int n = 0;
++
++    FreeExceptions();
++    file = wxFopen( file_name, wxT( "r" ) );
++    if( ! file )
++      return FALSE;
++
++    while( 1 )
++    {
++      s = fgets( buf, sizeof( buf ), file );
++      if( ! s )
++          break;
++
++      n++;
++
++      // remove comments
++      hash = strchr( s, '#' );
++      if( hash )
++          *hash = 0;
++
++      // skip leading whitespace
++      while( *s && isspace( *s ) )
++          s++;
++      if( ! *s )
++          continue;
++
++      tmp = (char*) MyMalloc( strlen( s ) + 1 );
++      strcpy( tmp, s );
++
++      if( ! ParseException( tmp ) )
++      {
++          wxString msg;
++
++          msg.Printf( wxT( "Parse error at %s:%d" ),
++            CONV_TO_UTF8( file_name ), n );
++          DisplayError( NULL, msg );
++          MyFree( tmp );
++          break;
++      }
++    }
++
++    fclose( file );
++
++    return TRUE;
++}
++
++
++/********************************************************************/
++static void LoadExceptions( void )
++/********************************************************************/
++{
++    wxFileName fn;
++
++    fn = g_RootSheet->m_AssociatedScreen->m_FileName;
++    fn.SetExt( wxT( "erx" ) );
++    if ( LoadExceptionsByName( fn.GetFullPath() ) )
++      g_EESchemaVar.NbExceptionErc = 0;
++}
++
++
++/********************************************************************/
++static bool FindException( ObjetNetListStruct* a, ObjetNetListStruct* b )
++/********************************************************************/
++{
++    SCH_COMPONENT* a_comp = (SCH_COMPONENT*) a->m_Link;
++    SCH_COMPONENT* b_comp = (SCH_COMPONENT*) b->m_Link;
++    const char* a_ref = CONV_TO_UTF8( a_comp->GetRef( &a->m_SheetList ) );
++    const char* b_ref = CONV_TO_UTF8( b_comp->GetRef( &b->m_SheetList ) );
++    const char* a_pin = (char *) &a->m_PinNum;
++    const char* b_pin = (char *) &b->m_PinNum;
++    struct exception* e = exceptions;
++
++    for( e = exceptions; e; e = e->next )
++    {
++#if 0
++fprintf(stderr, "a) %s %4.4s =? %s %4.4s\n", e->a_ref, e->a_pin, a_ref, 
a_pin);
++fprintf(stderr, "b) %s %4.4s =? %s %4.4s\n", e->b_ref, e->b_pin, b_ref, 
b_pin);
++#endif
++      if( strcmp( e->a_ref, a_ref ) )
++          continue;
++      if( strncmp( e->a_pin, a_pin, 4 ) )
++          continue;
++      if( strcmp( e->b_ref, b_ref ) )
++          continue;
++      if( strncmp( e->b_pin, b_pin, 4 ) )
++          continue;
++      return TRUE;
++    }
++    return FALSE;
++}
++
++
++/********************************************************************/
++static bool IsException( ObjetNetListStruct* a, ObjetNetListStruct* b )
++/********************************************************************/
++{
++    return FindException( a, b ) || FindException( b, a);
++}
++
++
+ /**************************************************/
+ void WinEDA_ErcFrame::TestErc( wxCommandEvent& event )
+ /**************************************************/
+@@ -303,6 +485,7 @@
+ 
+     g_EESchemaVar.NbErrorErc   = 0;
+     g_EESchemaVar.NbWarningErc = 0;
++    g_EESchemaVar.NbExceptionErc = -1; /* -1 means "no file" */
+ 
+     /* Cleanup the entire hierarchy */
+     EDA_ScreenList ScreenList;
+@@ -320,6 +503,8 @@
+ 
+     m_Parent->BuildNetListBase();
+ 
++    LoadExceptions();
++
+     /* Analyse de la table des connexions : */
+     Lim = g_TabObjNet + g_NbrObjNet;
+ 
+@@ -379,7 +564,13 @@
+     FreeTabNetList( g_TabObjNet, g_NbrObjNet );
+ 
+     wxString num;
+-    num.Printf( wxT( "%d" ), g_EESchemaVar.NbErrorErc );
++
++    if( g_EESchemaVar.NbExceptionErc >= 0)
++      num.Printf( wxT( "%d (%d exception%s)" ), g_EESchemaVar.NbErrorErc,
++        g_EESchemaVar.NbExceptionErc,
++        g_EESchemaVar.NbExceptionErc == 1 ? "" : "s" );
++    else
++      num.Printf( wxT( "%d" ), g_EESchemaVar.NbErrorErc );
+     m_TotalErrCount->SetLabel( num );
+ 
+     num.Printf( wxT( "%d" ), g_EESchemaVar.NbErrorErc - 
g_EESchemaVar.NbWarningErc );
+@@ -693,6 +884,12 @@
+             if( NetItemTst->m_FlagOfConnection > 0 )
+               break;
+ 
++          if( IsException( NetItemRef, NetItemTst ) )
++          {
++              g_EESchemaVar.NbExceptionErc++;
++              break;
++          }
++
+             Diagnose( panel, DC, NetItemRef, NetItemTst, 0, erc );
+             NetItemTst->m_FlagOfConnection = NOCONNECT;
+             break;
+Index: kicad/eeschema/general.h
+===================================================================
+--- kicad.orig/eeschema/general.h      2009-07-03 10:04:40.000000000 -0300
++++ kicad/eeschema/general.h   2009-07-03 10:05:43.000000000 -0300
+@@ -123,6 +123,7 @@
+ {
+     int NbErrorErc;
+     int NbWarningErc;
++    int NbExceptionErc;
+ };
+ 
+ extern struct EESchemaVariables g_EESchemaVar;

Modified: trunk/gta02-core/kicad-patches/series
===================================================================
--- trunk/gta02-core/kicad-patches/series       2009-07-03 11:45:28 UTC (rev 
5283)
+++ trunk/gta02-core/kicad-patches/series       2009-07-03 13:23:31 UTC (rev 
5284)
@@ -1,7 +1,8 @@
-# Based on SVN revision 1856
+# Based on SVN revision 1857
 
 # tentative fix for making command-line invocation with relative paths work
-eeschema-fix-relative-path.patch
+# functionality has been added into 1857
+#eeschema-fix-relative-path.patch
 
 # eeschema --plot extension, pending
 eeschema-plot-only-mode.patch
@@ -19,3 +20,7 @@
 # accepted as of r1854
 #make-junctions-larger-in-plots.patch
 #make-junctions-larger-on-plotps.patch
+
+# ERC pin exceptions
+streamline-erc.patch
+erc-exceptions.patch

Added: trunk/gta02-core/kicad-patches/streamline-erc.patch
===================================================================
--- trunk/gta02-core/kicad-patches/streamline-erc.patch                         
(rev 0)
+++ trunk/gta02-core/kicad-patches/streamline-erc.patch 2009-07-03 13:23:31 UTC 
(rev 5284)
@@ -0,0 +1,44 @@
+streamline TestOthersItems (ERC)
+
+This patch changes a deeply nested "if" into a series of "breaks",
+for better readability and to facilitate future extensions.
+
+- Werner
+
+---
+
+Index: kicad/eeschema/erc.cpp
+===================================================================
+--- kicad.orig/eeschema/erc.cpp        2009-07-03 05:00:34.000000000 -0300
++++ kicad/eeschema/erc.cpp     2009-07-03 05:06:29.000000000 -0300
+@@ -683,18 +683,18 @@
+                 break;
+ 
+             *NetNbItems += 1;
+-            if( erc == OK )         // 1 marqueur par pin maxi
+-            {
+-                erc = DiagErc[ref_elect_type][jj];
+-                if( erc != OK )
+-                {
+-                    if( NetItemTst->m_FlagOfConnection == 0 )
+-                    {
+-                        Diagnose( panel, DC, NetItemRef, NetItemTst, 0, erc );
+-                        NetItemTst->m_FlagOfConnection = NOCONNECT;
+-                    }
+-                }
+-            }
++            if( erc != OK )         // 1 marqueur par pin maxi
++              break;
++
++            erc = DiagErc[ref_elect_type][jj];
++            if( erc == OK )
++              break;
++
++            if( NetItemTst->m_FlagOfConnection > 0 )
++              break;
++
++            Diagnose( panel, DC, NetItemRef, NetItemTst, 0, erc );
++            NetItemTst->m_FlagOfConnection = NOCONNECT;
+             break;
+         }
+     }




--- End Message ---
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog

Reply via email to