dummy

2010-08-09 14:15:17 +02:00 · 2010-08-09 14:15:17 +02:00 · c3a81213b0
commit c3a81213b0
parent fc5bb84f2d
17 changed files with 24434 additions and 13791 deletions
--- a/pcb/kicad/$savepcb.brd
+++ b/pcb/kicad/$savepcb.brd
--- a/pcb/kicad/fpga.bak
+++ b/pcb/kicad/fpga.bak
@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Thu 05 Aug 2010 10:52:51 AM CEST
+EESchema Schematic File Version 2  date Thu 05 Aug 2010 10:53:02 AM CEST
 LIBS:power
 LIBS:device
 LIBS:transistors
--- a/pcb/kicad/fpga.sch
+++ b/pcb/kicad/fpga.sch
@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Thu 05 Aug 2010 10:53:02 AM CEST
+EESchema Schematic File Version 2  date Thu 05 Aug 2010 12:50:29 PM CEST
 LIBS:power
 LIBS:device
 LIBS:transistors
@ -998,73 +998,73 @@ SNES_REFRESH
 Text GLabel 10900 4550 2    50   Input ~ 0
 SNES_SYS_CLK
 $Comp
-L GND #PWR0102
+L GND #PWR0101
 U 1 1 4BADE94E
 P 5800 2000
-F 0 "#PWR0102" H 5800 2000 30  0001 C CNN
+F 0 "#PWR0101" H 5800 2000 30  0001 C CNN
 F 1 "GND" H 5800 1930 30  0001 C CNN
 	1    5800 2000
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR0103
+L GND #PWR0102
 U 1 1 4BADE8CE
 P 8450 10900
-F 0 "#PWR0103" H 8450 10900 30  0001 C CNN
+F 0 "#PWR0102" H 8450 10900 30  0001 C CNN
 F 1 "GND" H 8450 10830 30  0001 C CNN
 	1    8450 10900
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1.2V #PWR0104
+L +1.2V #PWR0103
 U 1 1 4BADD09D
 P 4350 10200
-F 0 "#PWR0104" H 4350 10340 20  0001 C CNN
+F 0 "#PWR0103" H 4350 10340 20  0001 C CNN
 F 1 "+1.2V" H 4350 10310 30  0000 C CNN
 	1    4350 10200
 	1    0    0    -1  
 $EndComp
 $Comp
-L +2.5V #PWR0105
+L +2.5V #PWR0104
 U 1 1 4BADD090
 P 3000 10200
-F 0 "#PWR0105" H 3000 10150 20  0001 C CNN
+F 0 "#PWR0104" H 3000 10150 20  0001 C CNN
 F 1 "+2.5V" H 3000 10300 30  0000 C CNN
 	1    3000 10200
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR0106
+L GND #PWR0105
 U 1 1 4BADD08B
 P 4350 11100
-F 0 "#PWR0106" H 4350 11100 30  0001 C CNN
+F 0 "#PWR0105" H 4350 11100 30  0001 C CNN
 F 1 "GND" H 4350 11030 30  0001 C CNN
 	1    4350 11100
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR0107
+L GND #PWR0106
 U 1 1 4BADD089
 P 3000 11100
-F 0 "#PWR0107" H 3000 11100 30  0001 C CNN
+F 0 "#PWR0106" H 3000 11100 30  0001 C CNN
 F 1 "GND" H 3000 11030 30  0001 C CNN
 	1    3000 11100
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR0108
+L GND #PWR0107
 U 1 1 4BADD072
 P 650 11100
-F 0 "#PWR0108" H 650 11100 30  0001 C CNN
+F 0 "#PWR0107" H 650 11100 30  0001 C CNN
 F 1 "GND" H 650 11030 30  0001 C CNN
 	1    650  11100
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR0109
+L +3.3V #PWR0108
 U 1 1 4BADD05C
 P 650 10200
-F 0 "#PWR0109" H 650 10160 30  0001 C CNN
+F 0 "#PWR0108" H 650 10160 30  0001 C CNN
 F 1 "+3.3V" H 650 10310 30  0000 C CNN
 	1    650  10200
 	1    0    0    -1  
@ -1222,28 +1222,28 @@ $EndComp
 Text Notes 6550 1300 0    50   ~ 0
 JTAG
 $Comp
-L +3.3V #PWR0110
+L +3.3V #PWR0109
 U 1 1 4BAD12D2
 P 7650 800
-F 0 "#PWR0110" H 7650 760 30  0001 C CNN
+F 0 "#PWR0109" H 7650 760 30  0001 C CNN
 F 1 "+3.3V" H 7650 910 30  0000 C CNN
 	1    7650 800 
 	1    0    0    -1  
 $EndComp
 $Comp
-L +2.5V #PWR0111
+L +2.5V #PWR0110
 U 1 1 4BAD12BE
 P 9050 800
-F 0 "#PWR0111" H 9050 750 20  0001 C CNN
+F 0 "#PWR0110" H 9050 750 20  0001 C CNN
 F 1 "+2.5V" H 9050 900 30  0000 C CNN
 	1    9050 800 
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1.2V #PWR0112
+L +1.2V #PWR0111
 U 1 1 4BAD12B4
 P 9650 800
-F 0 "#PWR0112" H 9650 940 20  0001 C CNN
+F 0 "#PWR0111" H 9650 940 20  0001 C CNN
 F 1 "+1.2V" H 9650 910 30  0000 C CNN
 	1    9650 800 
 	1    0    0    -1  
--- a/pcb/kicad/mcu.bak
+++ b/pcb/kicad/mcu.bak
@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Thu 05 Aug 2010 10:52:51 AM CEST
+EESchema Schematic File Version 2  date Thu 05 Aug 2010 10:53:02 AM CEST
 LIBS:power
 LIBS:device
 LIBS:transistors
@ -54,390 +54,390 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Text GLabel 9050 5300 0    50   Input ~ 0
-USB_SWCONN
-Text GLabel 2800 4200 0    50   Output ~ 0
-USB_SWCONN
 Wire Wire Line
-	3200 4200 2800 4200
-Connection ~ 9150 4650
+	2700 4200 3200 4200
 Wire Wire Line
-	9150 4700 9150 4650
+	9050 5300 9150 5300
 Wire Wire Line
-	7700 4200 8150 4200
+	9150 5300 9150 5200
 Wire Wire Line
-	7200 4100 6700 4100
-Wire Wire Line
-	9700 4550 8150 4550
-Wire Wire Line
-	6700 5000 8450 5000
-Wire Wire Line
-	7200 4900 6700 4900
-Wire Wire Line
-	8450 5000 8450 3900
-Wire Wire Line
-	6700 5200 7600 5200
-Wire Wire Line
-	7600 6500 7400 6500
-Wire Wire Line
-	7400 6500 7400 6700
-Connection ~ 7850 5100
-Wire Wire Line
-	7850 5200 7850 5100
-Wire Wire Line
-	8550 4000 8550 5100
-Wire Wire Line
-	8550 4000 10500 4000
-Wire Wire Line
-	10500 4000 10500 3200
-Wire Wire Line
-	6700 5700 7000 5700
-Connection ~ 10700 3300
-Wire Wire Line
-	10950 3300 10300 3300
-Wire Wire Line
-	1350 1900 1350 2300
-Wire Wire Line
-	1050 2700 1050 3200
-Wire Wire Line
-	1050 3200 1850 3200
-Wire Wire Line
-	3200 3400 2800 3400
-Wire Wire Line
-	2800 3400 2800 850 
-Connection ~ 1200 5950
-Wire Wire Line
-	1200 5950 1400 5950
-Wire Wire Line
-	1400 5950 1400 5800
-Connection ~ 1400 5200
-Wire Wire Line
-	8150 4550 8150 4200
-Wire Wire Line
-	10500 3200 10300 3200
-Wire Wire Line
-	8850 5850 9450 5850
-Wire Wire Line
-	6700 4000 7000 4000
-Wire Wire Line
-	10250 6350 10500 6350
-Wire Wire Line
-	10250 6250 10500 6250
-Wire Wire Line
-	10250 6150 10500 6150
-Wire Wire Line
-	10250 6050 10500 6050
-Wire Wire Line
-	10250 5950 10500 5950
-Wire Wire Line
-	10250 5850 10500 5850
-Wire Wire Line
-	10250 5750 10500 5750
-Wire Wire Line
-	9050 3400 8450 3400
-Wire Wire Line
-	2800 850  8450 850 
-Wire Wire Line
-	8450 850  8450 3400
-Wire Wire Line
-	7500 3300 7750 3300
-Wire Wire Line
-	1650 2300 1650 2050
-Wire Wire Line
-	3200 3100 2350 3100
-Wire Wire Line
-	1850 3100 1350 3100
-Wire Wire Line
-	1350 3100 1350 2700
-Connection ~ 6350 7500
-Wire Wire Line
-	6600 7400 6600 7500
-Wire Wire Line
-	6600 7500 5850 7500
-Connection ~ 5850 7500
-Wire Wire Line
-	6100 7400 6100 7500
-Connection ~ 6100 6900
-Wire Wire Line
-	6350 6900 6350 7000
-Wire Wire Line
-	5850 6800 5850 7000
-Wire Wire Line
-	3200 4800 2700 4800
-Wire Wire Line
-	6700 2600 7000 2600
-Wire Wire Line
-	6700 5800 7000 5800
-Connection ~ 9600 5000
-Wire Wire Line
-	9700 5000 9600 5000
-Wire Wire Line
-	9600 5200 9600 4800
-Wire Wire Line
-	9600 4800 9700 4800
-Wire Wire Line
-	1200 5400 1200 6850
-Wire Wire Line
-	3200 4900 2700 4900
-Wire Wire Line
-	3200 4600 2700 4600
-Wire Wire Line
-	6700 3200 7000 3200
-Wire Wire Line
-	9050 3100 6700 3100
-Wire Wire Line
-	9050 3200 7750 3200
-Wire Wire Line
-	7750 3200 7750 2800
-Wire Wire Line
-	6700 2500 7000 2500
-Connection ~ 3100 6200
-Wire Wire Line
-	3100 6400 3100 5800
-Wire Wire Line
-	2500 6800 2500 6850
-Wire Wire Line
-	1600 6800 1600 6850
-Connection ~ 1600 6200
-Wire Wire Line
-	1600 6400 1600 5400
-Wire Wire Line
-	6700 2400 7000 2400
-Wire Wire Line
-	3200 5500 2200 5500
-Wire Wire Line
-	3100 5800 3200 5800
-Wire Wire Line
-	6700 3600 7000 3600
-Wire Wire Line
-	6700 3400 7000 3400
-Connection ~ 8750 3100
-Wire Wire Line
-	8750 2650 8750 3100
-Connection ~ 8950 2900
-Wire Wire Line
-	8950 2650 8950 2900
-Wire Wire Line
-	9050 2900 6700 2900
-Connection ~ 10700 3500
-Wire Wire Line
-	10700 3500 10300 3500
-Connection ~ 10700 3600
-Wire Wire Line
-	10700 3900 10700 3300
-Wire Wire Line
-	10700 2650 10700 2900
-Wire Wire Line
-	4450 6650 4450 6850
-Connection ~ 5250 1450
-Connection ~ 5550 1450
-Wire Wire Line
-	5550 1550 5550 1450
-Connection ~ 5350 1450
-Wire Wire Line
-	5350 1450 5350 1550
-Connection ~ 5050 1450
-Wire Wire Line
-	5050 1450 5050 1550
-Wire Wire Line
-	5650 1550 5650 1450
-Connection ~ 4950 6750
-Wire Wire Line
-	4950 6750 4950 6650
-Connection ~ 5150 6750
-Wire Wire Line
-	5150 6750 5150 6650
-Connection ~ 5100 6750
-Wire Wire Line
-	5100 6750 5100 6850
-Wire Wire Line
-	5350 6650 5350 6750
-Wire Wire Line
-	5350 6750 4850 6750
-Wire Wire Line
-	4850 6750 4850 6650
-Wire Wire Line
-	5250 6750 5250 6650
-Connection ~ 5250 6750
-Wire Wire Line
-	5050 6750 5050 6650
-Connection ~ 5050 6750
-Wire Wire Line
-	4650 6650 4650 6850
-Wire Wire Line
-	4850 1550 4850 1450
-Wire Wire Line
-	4850 1450 5650 1450
-Wire Wire Line
-	5150 1450 5150 1550
-Connection ~ 5150 1450
-Wire Wire Line
-	5450 1450 5450 1550
-Connection ~ 5450 1450
-Wire Wire Line
-	4350 1450 4350 1550
-Wire Wire Line
-	4650 1450 4650 1550
-Wire Wire Line
-	10300 3600 10700 3600
-Wire Wire Line
-	10700 3400 10300 3400
-Connection ~ 10700 3400
-Wire Wire Line
-	7750 2800 6700 2800
-Wire Wire Line
-	6700 3000 9050 3000
-Wire Wire Line
-	8850 2650 8850 3000
-Connection ~ 8850 3000
-Wire Wire Line
-	8650 2650 8650 3200
-Connection ~ 8650 3200
-Wire Wire Line
-	6700 3500 7000 3500
-Wire Wire Line
-	6700 3700 7000 3700
-Wire Wire Line
-	3200 5700 2500 5700
-Wire Wire Line
-	1600 5400 3200 5400
-Wire Wire Line
-	3200 2700 3000 2700
-Wire Wire Line
-	3000 2700 3000 1050
-Wire Wire Line
-	3200 4000 2700 4000
-Wire Wire Line
-	2200 5500 2200 6400
-Connection ~ 2200 6200
-Wire Wire Line
-	2200 6800 2200 6850
-Wire Wire Line
-	3100 6850 3100 6800
-Wire Wire Line
-	2500 5700 2500 6400
-Connection ~ 2500 6200
-Wire Wire Line
-	2700 2600 3200 2600
-Wire Wire Line
-	6700 3300 7000 3300
-Wire Wire Line
-	7000 3800 6700 3800
-Wire Wire Line
-	3200 4500 2700 4500
-Wire Wire Line
-	3200 4700 2700 4700
-Wire Wire Line
-	1200 5200 3200 5200
-Wire Wire Line
-	8050 4650 8050 4100
-Wire Wire Line
-	3000 1050 8250 1050
-Wire Wire Line
-	8250 1050 8250 4400
-Wire Wire Line
-	8250 4400 9700 4400
-Wire Wire Line
-	9700 4900 9600 4900
-Connection ~ 9600 4900
-Wire Wire Line
-	3200 2400 2700 2400
-Wire Wire Line
-	6700 2700 7000 2700
-Wire Wire Line
-	5850 7600 5850 7400
-Wire Wire Line
-	6100 7000 6100 6900
-Connection ~ 5850 6900
-Wire Wire Line
-	5850 6900 6600 6900
-Wire Wire Line
-	6600 6900 6600 7000
-Connection ~ 6350 6900
-Wire Wire Line
-	6350 7500 6350 7400
-Connection ~ 6100 7500
-Wire Wire Line
-	1650 2700 1650 3000
-Wire Wire Line
-	1650 3000 1850 3000
-Wire Wire Line
-	2350 3000 3200 3000
-Wire Wire Line
-	7950 4900 7700 4900
-Wire Wire Line
-	8350 950  2900 950 
-Wire Wire Line
-	8350 950  8350 3500
-Wire Wire Line
-	8350 3500 9050 3500
-Wire Wire Line
-	9450 5750 9200 5750
-Wire Wire Line
-	9450 5950 9200 5950
-Wire Wire Line
-	9450 6050 9200 6050
-Wire Wire Line
-	9450 6150 9200 6150
-Wire Wire Line
-	9450 6250 9200 6250
-Wire Wire Line
-	9450 6350 9200 6350
-Wire Wire Line
-	6700 3900 7000 3900
-Wire Wire Line
-	2800 4000 2800 3900
-Connection ~ 2800 4000
-Wire Wire Line
-	2800 3900 2700 3900
-Wire Wire Line
-	2800 5200 2800 5100
-Connection ~ 2800 5200
-Wire Wire Line
-	2800 5100 2700 5100
-Wire Wire Line
-	10300 3100 10400 3100
-Wire Wire Line
-	1400 4600 1400 4500
-Wire Wire Line
-	1400 5400 1400 5100
-Wire Wire Line
-	2900 950  2900 3300
-Wire Wire Line
-	2900 3300 3200 3300
-Wire Wire Line
-	3200 3200 2350 3200
-Wire Wire Line
-	1050 2300 1050 2050
-Wire Wire Line
-	1050 2050 1650 2050
-Connection ~ 1350 2050
-Wire Wire Line
-	10950 2900 10300 2900
-Connection ~ 10700 2900
-Wire Wire Line
-	3200 3800 2700 3800
-Wire Wire Line
-	10400 3100 10400 3900
-Wire Wire Line
-	10400 3900 8450 3900
-Wire Wire Line
-	7600 5200 7600 6300
-Wire Wire Line
-	8550 5100 6700 5100
-Wire Wire Line
-	7950 5200 7950 5000
-Connection ~ 7950 5000
-Wire Wire Line
-	8050 4650 9700 4650
+	7700 4100 8050 4100
 Wire Wire Line
 	6700 4200 7200 4200
 Wire Wire Line
-	8050 4100 7700 4100
+	9700 4650 8050 4650
+Connection ~ 7950 5000
 Wire Wire Line
-	9150 5200 9150 5300
+	7950 5200 7950 5000
 Wire Wire Line
-	9150 5300 9050 5300
+	6700 5100 8550 5100
+Wire Wire Line
+	7600 6300 7600 5200
+Wire Wire Line
+	10400 3900 8450 3900
+Wire Wire Line
+	10400 3900 10400 3100
+Wire Wire Line
+	3200 3800 2700 3800
+Connection ~ 10700 2900
+Wire Wire Line
+	10950 2900 10300 2900
+Connection ~ 1350 2050
+Wire Wire Line
+	1050 2050 1650 2050
+Wire Wire Line
+	1050 2050 1050 2300
+Wire Wire Line
+	3200 3200 2350 3200
+Wire Wire Line
+	3200 3300 2900 3300
+Wire Wire Line
+	2900 3300 2900 950 
+Wire Wire Line
+	1400 5400 1400 5100
+Wire Wire Line
+	1400 4600 1400 4500
+Wire Wire Line
+	10400 3100 10300 3100
+Wire Wire Line
+	2700 5100 2800 5100
+Connection ~ 2800 5200
+Wire Wire Line
+	2800 5100 2800 5200
+Wire Wire Line
+	2700 3900 2800 3900
+Connection ~ 2800 4000
+Wire Wire Line
+	2800 3900 2800 4000
+Wire Wire Line
+	6700 3900 7000 3900
+Wire Wire Line
+	9450 6350 9200 6350
+Wire Wire Line
+	9450 6250 9200 6250
+Wire Wire Line
+	9450 6150 9200 6150
+Wire Wire Line
+	9450 6050 9200 6050
+Wire Wire Line
+	9450 5950 9200 5950
+Wire Wire Line
+	9450 5750 9200 5750
+Wire Wire Line
+	9050 3500 8350 3500
+Wire Wire Line
+	8350 3500 8350 950 
+Wire Wire Line
+	8350 950  2900 950 
+Wire Wire Line
+	7950 4900 7700 4900
+Wire Wire Line
+	2350 3000 3200 3000
+Wire Wire Line
+	1850 3000 1650 3000
+Wire Wire Line
+	1650 3000 1650 2700
+Connection ~ 6100 7500
+Wire Wire Line
+	6350 7500 6350 7400
+Connection ~ 6350 6900
+Wire Wire Line
+	6600 7000 6600 6900
+Wire Wire Line
+	6600 6900 5850 6900
+Connection ~ 5850 6900
+Wire Wire Line
+	6100 7000 6100 6900
+Wire Wire Line
+	5850 7600 5850 7400
+Wire Wire Line
+	6700 2700 7000 2700
+Wire Wire Line
+	3200 2400 2700 2400
+Connection ~ 9600 4900
+Wire Wire Line
+	9700 4900 9600 4900
+Wire Wire Line
+	9700 4400 8250 4400
+Wire Wire Line
+	8250 4400 8250 1050
+Wire Wire Line
+	8250 1050 3000 1050
+Wire Wire Line
+	8050 4650 8050 4100
+Wire Wire Line
+	1200 5200 3200 5200
+Wire Wire Line
+	3200 4700 2700 4700
+Wire Wire Line
+	3200 4500 2700 4500
+Wire Wire Line
+	7000 3800 6700 3800
+Wire Wire Line
+	6700 3300 7000 3300
+Wire Wire Line
+	2700 2600 3200 2600
+Connection ~ 2500 6200
+Wire Wire Line
+	2500 6400 2500 5700
+Wire Wire Line
+	3100 6850 3100 6800
+Wire Wire Line
+	2200 6800 2200 6850
+Connection ~ 2200 6200
+Wire Wire Line
+	2200 6400 2200 5500
+Wire Wire Line
+	3200 4000 2700 4000
+Wire Wire Line
+	3000 1050 3000 2700
+Wire Wire Line
+	3000 2700 3200 2700
+Wire Wire Line
+	3200 5400 1600 5400
+Wire Wire Line
+	2500 5700 3200 5700
+Wire Wire Line
+	6700 3700 7000 3700
+Wire Wire Line
+	6700 3500 7000 3500
+Connection ~ 8650 3200
+Wire Wire Line
+	8650 2650 8650 3200
+Connection ~ 8850 3000
+Wire Wire Line
+	8850 2650 8850 3000
+Wire Wire Line
+	6700 3000 9050 3000
+Wire Wire Line
+	6700 2800 7750 2800
+Connection ~ 10700 3400
+Wire Wire Line
+	10700 3400 10300 3400
+Wire Wire Line
+	10300 3600 10700 3600
+Wire Wire Line
+	4650 1450 4650 1550
+Wire Wire Line
+	4350 1450 4350 1550
+Connection ~ 5450 1450
+Wire Wire Line
+	5450 1450 5450 1550
+Connection ~ 5150 1450
+Wire Wire Line
+	5150 1450 5150 1550
+Wire Wire Line
+	4850 1450 5650 1450
+Wire Wire Line
+	4850 1450 4850 1550
+Wire Wire Line
+	4650 6650 4650 6850
+Connection ~ 5050 6750
+Wire Wire Line
+	5050 6750 5050 6650
+Connection ~ 5250 6750
+Wire Wire Line
+	5250 6750 5250 6650
+Wire Wire Line
+	4850 6650 4850 6750
+Wire Wire Line
+	4850 6750 5350 6750
+Wire Wire Line
+	5350 6750 5350 6650
+Wire Wire Line
+	5100 6750 5100 6850
+Connection ~ 5100 6750
+Wire Wire Line
+	5150 6750 5150 6650
+Connection ~ 5150 6750
+Wire Wire Line
+	4950 6750 4950 6650
+Connection ~ 4950 6750
+Wire Wire Line
+	5650 1450 5650 1550
+Wire Wire Line
+	5050 1450 5050 1550
+Connection ~ 5050 1450
+Wire Wire Line
+	5350 1450 5350 1550
+Connection ~ 5350 1450
+Wire Wire Line
+	5550 1550 5550 1450
+Connection ~ 5550 1450
+Connection ~ 5250 1450
+Wire Wire Line
+	4450 6650 4450 6850
+Wire Wire Line
+	10700 2650 10700 2900
+Wire Wire Line
+	10700 3900 10700 3300
+Connection ~ 10700 3600
+Wire Wire Line
+	10700 3500 10300 3500
+Connection ~ 10700 3500
+Wire Wire Line
+	9050 2900 6700 2900
+Wire Wire Line
+	8950 2650 8950 2900
+Connection ~ 8950 2900
+Wire Wire Line
+	8750 2650 8750 3100
+Connection ~ 8750 3100
+Wire Wire Line
+	6700 3400 7000 3400
+Wire Wire Line
+	6700 3600 7000 3600
+Wire Wire Line
+	3200 5800 3100 5800
+Wire Wire Line
+	2200 5500 3200 5500
+Wire Wire Line
+	6700 2400 7000 2400
+Wire Wire Line
+	1600 5400 1600 6400
+Connection ~ 1600 6200
+Wire Wire Line
+	1600 6800 1600 6850
+Wire Wire Line
+	2500 6800 2500 6850
+Wire Wire Line
+	3100 5800 3100 6400
+Connection ~ 3100 6200
+Wire Wire Line
+	6700 2500 7000 2500
+Wire Wire Line
+	7750 2800 7750 3200
+Wire Wire Line
+	7750 3200 9050 3200
+Wire Wire Line
+	9050 3100 6700 3100
+Wire Wire Line
+	6700 3200 7000 3200
+Wire Wire Line
+	3200 4600 2700 4600
+Wire Wire Line
+	3200 4900 2700 4900
+Wire Wire Line
+	1200 5400 1200 6850
+Wire Wire Line
+	9700 4800 9600 4800
+Wire Wire Line
+	9600 4800 9600 5200
+Wire Wire Line
+	9700 5000 9600 5000
+Connection ~ 9600 5000
+Wire Wire Line
+	6700 5800 7000 5800
+Wire Wire Line
+	6700 2600 7000 2600
+Wire Wire Line
+	3200 4800 2700 4800
+Wire Wire Line
+	5850 6800 5850 7000
+Wire Wire Line
+	6350 6900 6350 7000
+Connection ~ 6100 6900
+Wire Wire Line
+	6100 7400 6100 7500
+Connection ~ 5850 7500
+Wire Wire Line
+	5850 7500 6600 7500
+Wire Wire Line
+	6600 7500 6600 7400
+Connection ~ 6350 7500
+Wire Wire Line
+	1350 2700 1350 3100
+Wire Wire Line
+	1350 3100 1850 3100
+Wire Wire Line
+	3200 3100 2350 3100
+Wire Wire Line
+	1650 2050 1650 2300
+Wire Wire Line
+	7500 3300 7750 3300
+Wire Wire Line
+	8450 850  8450 3400
+Wire Wire Line
+	8450 850  2800 850 
+Wire Wire Line
+	8450 3400 9050 3400
+Wire Wire Line
+	10250 5750 10500 5750
+Wire Wire Line
+	10250 5850 10500 5850
+Wire Wire Line
+	10250 5950 10500 5950
+Wire Wire Line
+	10250 6050 10500 6050
+Wire Wire Line
+	10250 6150 10500 6150
+Wire Wire Line
+	10250 6250 10500 6250
+Wire Wire Line
+	10250 6350 10500 6350
+Wire Wire Line
+	6700 4000 7000 4000
+Wire Wire Line
+	8850 5850 9450 5850
+Wire Wire Line
+	10300 3200 10500 3200
+Wire Wire Line
+	8150 4550 8150 4200
+Connection ~ 1400 5200
+Wire Wire Line
+	1400 5800 1400 5950
+Wire Wire Line
+	1400 5950 1200 5950
+Connection ~ 1200 5950
+Wire Wire Line
+	2800 850  2800 3400
+Wire Wire Line
+	2800 3400 3200 3400
+Wire Wire Line
+	1850 3200 1050 3200
+Wire Wire Line
+	1050 3200 1050 2700
+Wire Wire Line
+	1350 1900 1350 2300
+Wire Wire Line
+	10950 3300 10300 3300
+Connection ~ 10700 3300
+Wire Wire Line
+	6700 5700 7000 5700
+Wire Wire Line
+	10500 3200 10500 4000
+Wire Wire Line
+	10500 4000 8550 4000
+Wire Wire Line
+	8550 4000 8550 5100
+Wire Wire Line
+	7850 5200 7850 5100
+Connection ~ 7850 5100
+Wire Wire Line
+	7400 6700 7400 6500
+Wire Wire Line
+	7400 6500 7600 6500
+Wire Wire Line
+	7600 5200 6700 5200
+Wire Wire Line
+	8450 3900 8450 5000
+Wire Wire Line
+	7200 4900 6700 4900
+Wire Wire Line
+	8450 5000 6700 5000
+Wire Wire Line
+	8150 4550 9700 4550
+Wire Wire Line
+	7200 4100 6700 4100
+Wire Wire Line
+	8150 4200 7700 4200
+Wire Wire Line
+	9150 4700 9150 4650
+Connection ~ 9150 4650
+Text GLabel 9050 5300 0    50   Input ~ 0
+USB_SWCONN
+Text GLabel 2700 4200 0    50   Output ~ 0
+USB_SWCONN
 Text Notes 1000 1700 0    50   ~ 0
 or 3000mcd LEDs (10k for R401-403)
 NoConn ~ 6700 5600
--- a/pcb/kicad/mcu.sch
+++ b/pcb/kicad/mcu.sch
@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Thu 05 Aug 2010 10:53:02 AM CEST
+EESchema Schematic File Version 2  date Thu 05 Aug 2010 12:50:29 PM CEST
 LIBS:power
 LIBS:device
 LIBS:transistors
@ -594,28 +594,28 @@ $EndComp
 Text GLabel 2700 5100 0    50   Input ~ 0
 /RESET
 $Comp
-L +5V #PWR047
+L +5V #PWR046
 U 1 1 4BFBFF63
 P 10500 5750
-F 0 "#PWR047" H 10500 5840 20  0001 C CNN
+F 0 "#PWR046" H 10500 5840 20  0001 C CNN
 F 1 "+5V" H 10500 5840 30  0000 C CNN
 	1    10500 5750
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR048
+L +3.3V #PWR047
 U 1 1 4BFBFF50
 P 9200 5750
-F 0 "#PWR048" H 9200 5710 30  0001 C CNN
+F 0 "#PWR047" H 9200 5710 30  0001 C CNN
 F 1 "+3.3V" H 9200 5860 30  0000 C CNN
 	1    9200 5750
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR049
+L GND #PWR048
 U 1 1 4BFBFF44
 P 8850 5850
-F 0 "#PWR049" H 8850 5850 30  0001 C CNN
+F 0 "#PWR048" H 8850 5850 30  0001 C CNN
 F 1 "GND" H 8850 5780 30  0001 C CNN
 	1    8850 5850
 	0    1    1    0   
@ -669,10 +669,10 @@ F 2 "SM0805_FIXEDMASK" H 7450 4900 60  0001 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L +3.3V #PWR050
+L +3.3V #PWR049
 U 1 1 4BF84ABB
 P 1350 1900
-F 0 "#PWR050" H 1350 1860 30  0001 C CNN
+F 0 "#PWR049" H 1350 1860 30  0001 C CNN
 F 1 "+3.3V" H 1350 2010 30  0000 C CNN
 	1    1350 1900
 	-1   0    0    -1  
@ -718,19 +718,19 @@ F 2 "LED-3MM-FIXED" H 1350 2500 60  0001 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L GND #PWR051
+L GND #PWR050
 U 1 1 4BF6C1FC
 P 5850 7600
-F 0 "#PWR051" H 5850 7600 30  0001 C CNN
+F 0 "#PWR050" H 5850 7600 30  0001 C CNN
 F 1 "GND" H 5850 7530 30  0001 C CNN
 	1    5850 7600
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR052
+L +3.3V #PWR051
 U 1 1 4BF6C1F7
 P 5850 6800
-F 0 "#PWR052" H 5850 6760 30  0001 C CNN
+F 0 "#PWR051" H 5850 6760 30  0001 C CNN
 F 1 "+3.3V" H 5850 6910 30  0000 C CNN
 	1    5850 6800
 	-1   0    0    -1  
@ -796,10 +796,10 @@ CIC_DATA0
 Text GLabel 7000 5800 2    50   3State ~ 0
 CIC_DATA1
 $Comp
-L GND #PWR053
+L GND #PWR052
 U 1 1 4BF0021F
 P 9600 5200
-F 0 "#PWR053" H 9600 5200 30  0001 C CNN
+F 0 "#PWR052" H 9600 5200 30  0001 C CNN
 F 1 "GND" H 9600 5130 30  0001 C CNN
 	1    9600 5200
 	1    0    0    -1  
@ -815,10 +815,10 @@ F 2 "USB-MINIB-THT" H 10100 4700 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR054
+L GND #PWR053
 U 1 1 4BEFBCAA
 P 1200 6850
-F 0 "#PWR054" H 1200 6850 30  0001 C CNN
+F 0 "#PWR053" H 1200 6850 30  0001 C CNN
 F 1 "GND" H 1200 6780 30  0001 C CNN
 	1    1200 6850
 	-1   0    0    -1  
@ -855,7 +855,6 @@ U 1 1 4BAA6A9C
 P 9650 3250
 F 0 "J411" H 9400 2700 60  0000 C CNN
 F 1 "SD_CARD" H 9650 3750 60  0000 C CNN
-F 2 "SD-RSMT-2-MQ-WF" H 9650 3250 60  0001 C CNN
 	1    9650 3250
 	1    0    0    -1  
 $EndComp
@ -864,37 +863,37 @@ SNES_/RESET
 Text GLabel 7000 2400 2    50   Output ~ 0
 CIC_MCLR
 $Comp
-L GND #PWR055
+L GND #PWR054
 U 1 1 4BEECBF1
 P 3100 6850
-F 0 "#PWR055" H 3100 6850 30  0001 C CNN
+F 0 "#PWR054" H 3100 6850 30  0001 C CNN
 F 1 "GND" H 3100 6780 30  0001 C CNN
 	1    3100 6850
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR056
+L GND #PWR055
 U 1 1 4BEECBEF
 P 2500 6850
-F 0 "#PWR056" H 2500 6850 30  0001 C CNN
+F 0 "#PWR055" H 2500 6850 30  0001 C CNN
 F 1 "GND" H 2500 6780 30  0001 C CNN
 	1    2500 6850
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR057
+L GND #PWR056
 U 1 1 4BEECBEE
 P 2200 6850
-F 0 "#PWR057" H 2200 6850 30  0001 C CNN
+F 0 "#PWR056" H 2200 6850 30  0001 C CNN
 F 1 "GND" H 2200 6780 30  0001 C CNN
 	1    2200 6850
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR058
+L GND #PWR057
 U 1 1 4BEECBE5
 P 1600 6850
-F 0 "#PWR058" H 1600 6850 30  0001 C CNN
+F 0 "#PWR057" H 1600 6850 30  0001 C CNN
 F 1 "GND" H 1600 6780 30  0001 C CNN
 	1    1600 6850
 	-1   0    0    -1  
@ -980,73 +979,73 @@ F 2 "XTAL_SMD_05032" H 1900 6200 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR059
+L GND #PWR058
 U 1 1 4BB8BBE8
 P 10700 3900
-F 0 "#PWR059" H 10700 3900 30  0001 C CNN
+F 0 "#PWR058" H 10700 3900 30  0001 C CNN
 F 1 "GND" H 10700 3830 30  0001 C CNN
 	1    10700 3900
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR060
+L +3.3V #PWR059
 U 1 1 4BB8BBD6
 P 10700 2650
-F 0 "#PWR060" H 10700 2610 30  0001 C CNN
+F 0 "#PWR059" H 10700 2610 30  0001 C CNN
 F 1 "+3.3V" H 10700 2760 30  0000 C CNN
 	1    10700 2650
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR061
+L +3.3V #PWR060
 U 1 1 4BB8BB64
 P 4650 1450
-F 0 "#PWR061" H 4650 1410 30  0001 C CNN
+F 0 "#PWR060" H 4650 1410 30  0001 C CNN
 F 1 "+3.3V" H 4650 1560 30  0000 C CNN
 	1    4650 1450
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR062
+L GND #PWR061
 U 1 1 4BB8BB56
 P 4450 6850
-F 0 "#PWR062" H 4450 6850 30  0001 C CNN
+F 0 "#PWR061" H 4450 6850 30  0001 C CNN
 F 1 "GND" H 4450 6780 30  0001 C CNN
 	1    4450 6850
 	-1   0    0    -1  
 $EndComp
 $Comp
-L +BATT #PWR063
+L +BATT #PWR062
 U 1 1 4BB8AE61
 P 4350 1450
-F 0 "#PWR063" H 4350 1400 20  0001 C CNN
+F 0 "#PWR062" H 4350 1400 20  0001 C CNN
 F 1 "+BATT" H 4350 1550 30  0000 C CNN
 	1    4350 1450
 	-1   0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR064
+L +3.3V #PWR063
 U 1 1 4BB8AE12
 P 5250 1450
-F 0 "#PWR064" H 5250 1410 30  0001 C CNN
+F 0 "#PWR063" H 5250 1410 30  0001 C CNN
 F 1 "+3.3V" H 5250 1560 30  0000 C CNN
 	1    5250 1450
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR065
+L GND #PWR064
 U 1 1 4BAF2DEB
 P 4650 6850
-F 0 "#PWR065" H 4650 6850 30  0001 C CNN
+F 0 "#PWR064" H 4650 6850 30  0001 C CNN
 F 1 "GND" H 4650 6780 30  0001 C CNN
 	1    4650 6850
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR066
+L GND #PWR065
 U 1 1 4BAF2DE3
 P 5100 6850
-F 0 "#PWR066" H 5100 6850 30  0001 C CNN
+F 0 "#PWR065" H 5100 6850 30  0001 C CNN
 F 1 "GND" H 5100 6780 30  0001 C CNN
 	1    5100 6850
 	-1   0    0    -1  
--- a/pcb/kicad/memory.sch
+++ b/pcb/kicad/memory.sch
@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Thu 05 Aug 2010 10:53:02 AM CEST
+EESchema Schematic File Version 2  date Thu 05 Aug 2010 12:50:29 PM CEST
 LIBS:power
 LIBS:device
 LIBS:transistors
--- a/pcb/kicad/pwr_misc.bak
+++ b/pcb/kicad/pwr_misc.bak
@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Thu 05 Aug 2010 10:52:51 AM CEST
+EESchema Schematic File Version 2  date Thu 05 Aug 2010 10:53:02 AM CEST
 LIBS:power
 LIBS:device
 LIBS:transistors
--- a/pcb/kicad/pwr_misc.sch
+++ b/pcb/kicad/pwr_misc.sch
@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Thu 05 Aug 2010 10:53:02 AM CEST
+EESchema Schematic File Version 2  date Thu 05 Aug 2010 12:50:29 PM CEST
 LIBS:power
 LIBS:device
 LIBS:transistors
@ -318,28 +318,28 @@ REG_SW1
 Text Label 3350 2500 0    50   ~ 0
 REG_SW2
 $Comp
-L +3.3V #PWR067
+L +3.3V #PWR066
 U 1 1 4C05BAF5
 P 4350 2500
-F 0 "#PWR067" H 4350 2460 30  0001 C CNN
+F 0 "#PWR066" H 4350 2460 30  0001 C CNN
 F 1 "+3.3V" H 4350 2610 30  0000 C CNN
 	1    4350 2500
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1.2V #PWR068
+L +1.2V #PWR067
 U 1 1 4C05BAEC
 P 750 2500
-F 0 "#PWR068" H 750 2640 20  0001 C CNN
+F 0 "#PWR067" H 750 2640 20  0001 C CNN
 F 1 "+1.2V" H 750 2610 30  0000 C CNN
 	1    750  2500
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR069
+L GND #PWR068
 U 1 1 4C05AF72
 P 1400 2200
-F 0 "#PWR069" H 1400 2200 30  0001 C CNN
+F 0 "#PWR068" H 1400 2200 30  0001 C CNN
 F 1 "GND" H 1400 2130 30  0001 C CNN
 	1    1400 2200
 	1    0    0    -1  
@ -355,37 +355,37 @@ F 2 "SM0805_FIXEDMASK" H 1400 1850 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR070
+L GND #PWR069
 U 1 1 4C05ADCE
 P 4200 3600
-F 0 "#PWR070" H 4200 3600 30  0001 C CNN
+F 0 "#PWR069" H 4200 3600 30  0001 C CNN
 F 1 "GND" H 4200 3530 30  0001 C CNN
 	1    4200 3600
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR071
+L GND #PWR070
 U 1 1 4C05ADC9
 P 900 3600
-F 0 "#PWR071" H 900 3600 30  0001 C CNN
+F 0 "#PWR070" H 900 3600 30  0001 C CNN
 F 1 "GND" H 900 3530 30  0001 C CNN
 	1    900  3600
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR072
+L +5V #PWR071
 U 1 1 4C05AD31
 P 900 1400
-F 0 "#PWR072" H 900 1490 20  0001 C CNN
+F 0 "#PWR071" H 900 1490 20  0001 C CNN
 F 1 "+5V" H 900 1490 30  0000 C CNN
 	1    900  1400
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR073
+L GND #PWR072
 U 1 1 4C05AD0F
 P 3600 2200
-F 0 "#PWR073" H 3600 2200 30  0001 C CNN
+F 0 "#PWR072" H 3600 2200 30  0001 C CNN
 F 1 "GND" H 3600 2130 30  0001 C CNN
 	1    3600 2200
 	1    0    0    -1  
@ -441,19 +441,19 @@ F 2 "SM1210L" H 1350 2500 60  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR074
+L GND #PWR073
 U 1 1 4C05A4CA
 P 2650 3600
-F 0 "#PWR074" H 2650 3600 30  0001 C CNN
+F 0 "#PWR073" H 2650 3600 30  0001 C CNN
 F 1 "GND" H 2650 3530 30  0001 C CNN
 	1    2650 3600
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR075
+L GND #PWR074
 U 1 1 4C05A4C3
 P 2450 3600
-F 0 "#PWR075" H 2450 3600 30  0001 C CNN
+F 0 "#PWR074" H 2450 3600 30  0001 C CNN
 F 1 "GND" H 2450 3530 30  0001 C CNN
 	1    2450 3600
 	1    0    0    -1  
@ -471,19 +471,19 @@ $EndComp
 Text GLabel 9800 4750 2    50   Output ~ 0
 AUDIO_L
 $Comp
-L GND #PWR076
+L GND #PWR075
 U 1 1 4BF98FD5
 P 9750 5500
-F 0 "#PWR076" H 9750 5500 30  0001 C CNN
+F 0 "#PWR075" H 9750 5500 30  0001 C CNN
 F 1 "GND" H 9750 5430 30  0001 C CNN
 	1    9750 5500
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR077
+L GND #PWR076
 U 1 1 4BF98FC7
 P 9150 5500
-F 0 "#PWR077" H 9150 5500 30  0001 C CNN
+F 0 "#PWR076" H 9150 5500 30  0001 C CNN
 F 1 "GND" H 9150 5430 30  0001 C CNN
 	1    9150 5500
 	1    0    0    -1  
@ -491,19 +491,19 @@ $EndComp
 Text GLabel 8350 4750 2    50   Output ~ 0
 AUDIO_R
 $Comp
-L GND #PWR078
+L GND #PWR077
 U 1 1 4BF98F5A
 P 8300 5500
-F 0 "#PWR078" H 8300 5500 30  0001 C CNN
+F 0 "#PWR077" H 8300 5500 30  0001 C CNN
 F 1 "GND" H 8300 5430 30  0001 C CNN
 	1    8300 5500
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR079
+L GND #PWR078
 U 1 1 4BF98F1F
 P 7700 5500
-F 0 "#PWR079" H 7700 5500 30  0001 C CNN
+F 0 "#PWR078" H 7700 5500 30  0001 C CNN
 F 1 "GND" H 7700 5430 30  0001 C CNN
 	1    7700 5500
 	1    0    0    -1  
@ -589,19 +589,19 @@ F 2 "SM0805_FIXEDMASK" H 8300 5200 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR080
+L GND #PWR079
 U 1 1 4BF98D19
 P 9650 4500
-F 0 "#PWR080" H 9650 4500 30  0001 C CNN
+F 0 "#PWR079" H 9650 4500 30  0001 C CNN
 F 1 "GND" H 9650 4430 30  0001 C CNN
 	1    9650 4500
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR081
+L GND #PWR080
 U 1 1 4BF98C9E
 P 10350 4500
-F 0 "#PWR081" H 10350 4500 30  0001 C CNN
+F 0 "#PWR080" H 10350 4500 30  0001 C CNN
 F 1 "GND" H 10350 4430 30  0001 C CNN
 	1    10350 4500
 	1    0    0    -1  
@ -655,19 +655,19 @@ CIC_STATUS
 Text Label 5650 1400 0    50   ~ 0
 CIC_CLK
 $Comp
-L +BATT #PWR082
+L +BATT #PWR081
 U 1 1 4BAF2EDB
 P 5300 6900
-F 0 "#PWR082" H 5300 6850 20  0001 C CNN
+F 0 "#PWR081" H 5300 6850 20  0001 C CNN
 F 1 "+BATT" H 5300 7000 30  0000 C CNN
 	1    5300 6900
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR083
+L GND #PWR082
 U 1 1 4BAF2ED2
 P 6300 7100
-F 0 "#PWR083" H 6300 7100 30  0001 C CNN
+F 0 "#PWR082" H 6300 7100 30  0001 C CNN
 F 1 "GND" H 6300 7030 30  0001 C CNN
 	1    6300 7100
 	1    0    0    -1  
@ -683,10 +683,10 @@ F 2 "BT_KEYSTONE_1059_20MM" H 5800 7000 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR084
+L GND #PWR083
 U 1 1 4BADC749
 P 10150 6550
-F 0 "#PWR084" H 10150 6550 30  0001 C CNN
+F 0 "#PWR083" H 10150 6550 30  0001 C CNN
 F 1 "GND" H 10150 6480 30  0001 C CNN
 	1    10150 6550
 	1    0    0    -1  
@ -702,28 +702,28 @@ F 2 "SM0805_FIXEDMASK" H 10150 6150 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR085
+L +3.3V #PWR084
 U 1 1 4BADC711
 P 10150 5750
-F 0 "#PWR085" H 10150 5710 30  0001 C CNN
+F 0 "#PWR084" H 10150 5710 30  0001 C CNN
 F 1 "+3.3V" H 10150 5860 30  0000 C CNN
 	1    10150 5750
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR086
+L GND #PWR085
 U 1 1 4BAD0CFA
 P 6550 4800
-F 0 "#PWR086" H 6550 4800 30  0001 C CNN
+F 0 "#PWR085" H 6550 4800 30  0001 C CNN
 F 1 "GND" H 6550 4730 30  0001 C CNN
 	1    6550 4800
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR087
+L +3.3V #PWR086
 U 1 1 4BAD0CEA
 P 6550 3050
-F 0 "#PWR087" H 6550 3010 30  0001 C CNN
+F 0 "#PWR086" H 6550 3010 30  0001 C CNN
 F 1 "+3.3V" H 6550 3160 30  0000 C CNN
 	1    6550 3050
 	1    0    0    -1  
@ -741,10 +741,10 @@ F 2 "TSSOP10" H 6550 3900 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR088
+L GND #PWR087
 U 1 1 4BADC745
 P 10150 2250
-F 0 "#PWR088" H 10150 2250 30  0001 C CNN
+F 0 "#PWR087" H 10150 2250 30  0001 C CNN
 F 1 "GND" H 10150 2180 30  0001 C CNN
 	1    10150 2250
 	1    0    0    -1  
@ -760,10 +760,10 @@ F 2 "SM0805_FIXEDMASK" H 10150 1950 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR089
+L +5V #PWR088
 U 1 1 4BADC709
 P 10150 1650
-F 0 "#PWR089" H 10150 1740 20  0001 C CNN
+F 0 "#PWR088" H 10150 1740 20  0001 C CNN
 F 1 "+5V" H 10150 1740 30  0000 C CNN
 	1    10150 1650
 	1    0    0    -1  
@ -781,19 +781,19 @@ CIC_STATUS
 Text GLabel 5650 1400 0    60   Input ~ 0
 CIC_CLK
 $Comp
-L GND #PWR090
+L GND #PWR089
 U 1 1 4BAD0C41
 P 8500 1200
-F 0 "#PWR090" H 8500 1200 30  0001 C CNN
+F 0 "#PWR089" H 8500 1200 30  0001 C CNN
 F 1 "GND" H 8500 1130 30  0001 C CNN
 	1    8500 1200
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR091
+L GND #PWR090
 U 1 1 4BABCB69
 P 3500 5350
-F 0 "#PWR091" H 3500 5350 30  0001 C CNN
+F 0 "#PWR090" H 3500 5350 30  0001 C CNN
 F 1 "GND" H 3500 5280 30  0001 C CNN
 	1    3500 5350
 	1    0    0    -1  
@ -819,19 +819,19 @@ F 2 "SM0805_FIXEDMASK" H 1600 5000 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR092
+L GND #PWR091
 U 1 1 4BABCB5B
 P 1600 5350
-F 0 "#PWR092" H 1600 5350 30  0001 C CNN
+F 0 "#PWR091" H 1600 5350 30  0001 C CNN
 F 1 "GND" H 1600 5280 30  0001 C CNN
 	1    1600 5350
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR093
+L GND #PWR092
 U 1 1 4BABCAF4
 P 1600 6950
-F 0 "#PWR093" H 1600 6950 30  0001 C CNN
+F 0 "#PWR092" H 1600 6950 30  0001 C CNN
 F 1 "GND" H 1600 6880 30  0001 C CNN
 	1    1600 6950
 	1    0    0    -1  
@ -847,10 +847,10 @@ F 2 "SM0805_FIXEDMASK" H 3500 6600 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR094
+L GND #PWR093
 U 1 1 4BABCA9D
 P 3500 6950
-F 0 "#PWR094" H 3500 6950 30  0001 C CNN
+F 0 "#PWR093" H 3500 6950 30  0001 C CNN
 F 1 "GND" H 3500 6880 30  0001 C CNN
 	1    3500 6950
 	1    0    0    -1  
@ -870,10 +870,10 @@ Power Supply
 Text Notes 6950 700  0    100  ~ 0
 SuperCIC Key
 $Comp
-L +5V #PWR095
+L +5V #PWR094
 U 1 1 4BABC073
 P 6350 1000
-F 0 "#PWR095" H 6350 1090 20  0001 C CNN
+F 0 "#PWR094" H 6350 1090 20  0001 C CNN
 F 1 "+5V" H 6350 1090 30  0000 C CNN
 	1    6350 1000
 	1    0    0    -1  
@ -889,55 +889,55 @@ F 2 "SO8N" H 7450 1600 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR096
+L GND #PWR095
 U 1 1 4B6ED41C
 P 2550 6950
-F 0 "#PWR096" H 2550 6950 30  0001 C CNN
+F 0 "#PWR095" H 2550 6950 30  0001 C CNN
 F 1 "GND" H 2550 6880 30  0001 C CNN
 	1    2550 6950
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR097
+L GND #PWR096
 U 1 1 4B6ED418
 P 2550 5350
-F 0 "#PWR097" H 2550 5350 30  0001 C CNN
+F 0 "#PWR096" H 2550 5350 30  0001 C CNN
 F 1 "GND" H 2550 5280 30  0001 C CNN
 	1    2550 5350
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR098
+L +3.3V #PWR097
 U 1 1 4B6ED26C
 P 1150 6050
-F 0 "#PWR098" H 1150 6010 30  0001 C CNN
+F 0 "#PWR097" H 1150 6010 30  0001 C CNN
 F 1 "+3.3V" H 1150 6160 30  0000 C CNN
 	1    1150 6050
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR099
+L +3.3V #PWR098
 U 1 1 4B6ED268
 P 1150 4450
-F 0 "#PWR099" H 1150 4410 30  0001 C CNN
+F 0 "#PWR098" H 1150 4410 30  0001 C CNN
 F 1 "+3.3V" H 1150 4560 30  0000 C CNN
 	1    1150 4450
 	1    0    0    -1  
 $EndComp
 $Comp
-L +2.5V #PWR0100
+L +2.5V #PWR099
 U 1 1 4B6ED246
 P 3950 6050
-F 0 "#PWR0100" H 3950 6000 20  0001 C CNN
+F 0 "#PWR099" H 3950 6000 20  0001 C CNN
 F 1 "+2.5V" H 3950 6150 30  0000 C CNN
 	1    3950 6050
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1.8V #PWR0101
+L +1.8V #PWR0100
 U 1 1 4B6ED23A
 P 3950 4450
-F 0 "#PWR0101" H 3950 4590 20  0001 C CNN
+F 0 "#PWR0100" H 3950 4590 20  0001 C CNN
 F 1 "+1.8V" H 3950 4560 30  0000 C CNN
 	1    3950 4450
 	1    0    0    -1  
--- a/pcb/kicad/sd2snes-cache.bak
+++ b/pcb/kicad/sd2snes-cache.bak
@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: Thu 05 Aug 2010 10:52:51 AM CEST
+EESchema-LIBRARY Version 2.3  Date: Thu 05 Aug 2010 10:53:02 AM CEST
 #
 # +1.2V
 #
--- a/pcb/kicad/sd2snes-cache.lib
+++ b/pcb/kicad/sd2snes-cache.lib
@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: Thu 05 Aug 2010 10:53:02 AM CEST
+EESchema-LIBRARY Version 2.3  Date: Thu 05 Aug 2010 12:50:29 PM CEST
 #
 # +1.2V
 #
--- a/pcb/kicad/sd2snes.bak
+++ b/pcb/kicad/sd2snes.bak
@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Thu 05 Aug 2010 10:52:51 AM CEST
+EESchema Schematic File Version 2  date Thu 05 Aug 2010 10:53:02 AM CEST
 LIBS:power
 LIBS:device
 LIBS:transistors
--- a/pcb/kicad/sd2snes.brd
+++ b/pcb/kicad/sd2snes.brd
--- a/pcb/kicad/sd2snes.net
+++ b/pcb/kicad/sd2snes.net
--- a/pcb/kicad/sd2snes.pro
+++ b/pcb/kicad/sd2snes.pro
@ -1,6 +1,6 @@
-update=Tue 03 Aug 2010 17:38:57 CEST
+update=Thu 05 Aug 2010 06:33:30 PM CEST
 version=1
-last_client=eeschema
+last_client=pcbnew
 [general]
 version=1
 [cvpcb]
@ -8,40 +8,6 @@ version=1
 NetIExt=net
 [cvpcb/libraries]
 EquName1=devcms
-[pcbnew]
-version=1
-PadDrlX=433
-PadDimH=512
-PadDimV=512
-BoardThickness=500
-SgPcb45=1
-TxtPcbV=300
-TxtPcbH=300
-TxtModV=300
-TxtModH=300
-TxtModW=60
-VEgarde=40
-DrawLar=59
-EdgeLar=150
-TxtLar=60
-MSegLar=120
-LastNetListRead=sd2snes.net
-[pcbnew/libraries]
-LibDir=
-LibName1=sockets
-LibName2=connect
-LibName3=discret
-LibName4=pin_array
-LibName5=divers
-LibName6=libcms
-LibName7=display
-LibName8=valves
-LibName9=led
-LibName10=dip_sockets
-LibName11=libs/snescart
-LibName12=libs/mypackages
-LibName13=libs/sdcard
-LibName14=libs/diy_capacitors
 [eeschema]
 version=1
 LibDir=
@ -117,3 +83,38 @@ LibName38=libs/cs4344
 LibName39=libs/double_sch_kcom
 LibName40=libs/usb_minib
 LibName41=libs/mic23250
+[pcbnew]
+version=1
+PadDrlX=433
+PadDimH=512
+PadDimV=512
+BoardThickness=500
+SgPcb45=1
+TxtPcbV=300
+TxtPcbH=300
+TxtModV=300
+TxtModH=300
+TxtModW=60
+VEgarde=40
+DrawLar=59
+EdgeLar=150
+TxtLar=60
+MSegLar=120
+LastNetListRead=sd2snes.net
+[pcbnew/libraries]
+LibDir=
+LibName1=sockets
+LibName2=connect
+LibName3=discret
+LibName4=pin_array
+LibName5=divers
+LibName6=libcms
+LibName7=display
+LibName8=valves
+LibName9=led
+LibName10=dip_sockets
+LibName11=libs/snescart
+LibName12=libs/mypackages
+LibName13=libs/sdcard
+LibName14=libs/diy_capacitors
+LibName15=snail
--- a/pcb/kicad/sd2snes.sch
+++ b/pcb/kicad/sd2snes.sch
@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Thu 05 Aug 2010 10:53:02 AM CEST
+EESchema Schematic File Version 2  date Thu 05 Aug 2010 12:50:29 PM CEST
 LIBS:power
 LIBS:device
 LIBS:transistors
--- a/pcb/kicad/snesslot.bak
+++ b/pcb/kicad/snesslot.bak
@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Thu 05 Aug 2010 10:52:51 AM CEST
+EESchema Schematic File Version 2  date Thu 05 Aug 2010 10:53:02 AM CEST
 LIBS:power
 LIBS:device
 LIBS:transistors
--- a/pcb/kicad/snesslot.sch
+++ b/pcb/kicad/snesslot.sch
@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Thu 05 Aug 2010 10:53:02 AM CEST
+EESchema Schematic File Version 2  date Thu 05 Aug 2010 12:50:29 PM CEST
 LIBS:power
 LIBS:device
 LIBS:transistors