Schematic: Make sure PA0 to PA2 are high on power-up

any other level is interfering with SAM-BA operation.  This fixes
the PA0=GND bug in the previous v1.3 version.

1 files changed, 205 insertions, 353 deletions

diff --git a/hardware/kicad/SIMtrace.sch b/hardware/kicad/SIMtrace.sch
index fcda7d5..c679909 100644
--- a/hardware/kicad/SIMtrace.sch
+++ b/hardware/kicad/SIMtrace.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2
+EESchema Schematic File Version 2  date Fri 20 Jun 2014 09:43:57 AM CEST
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -32,15 +32,14 @@ LIBS:valves
 LIBS:at91sam7sxxx-au
 LIBS:SIMtrace
 LIBS:smartcard
-LIBS:SIMtrace-cache
-EELAYER 27 0
+EELAYER 25  0
 EELAYER END
-$Descr A4 11693 8268
+$Descr A4 11700 8267
 encoding utf-8
 Sheet 1 1
 Title "SIMtrace hardware"
-Date "28 oct 2013"
-Rev "v1.3"
+Date "20 jun 2014"
+Rev "v1.4"
 Comp "osmocom"
 Comment1 "CC-BY-SA v3.0 unported"
 Comment2 ""
@@ -48,6 +47,16 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 Wire Wire Line
+	8900 4050 8500 4050
+Wire Wire Line
+	7450 4700 8700 4700
+Connection ~ 8700 4050
+Wire Wire Line
+	8500 4050 8500 4100
+Connection ~ 8200 4700
+Wire Wire Line
+	8700 4700 8700 4600
+Wire Wire Line
 	8300 2200 7450 2200
 Wire Wire Line
 	7450 2400 8600 2400
@@ -128,7 +137,7 @@ Wire Wire Line
 Wire Wire Line
 	500  2200 800  2200
 Wire Wire Line
-	10300 4550 10750 4550
+	10550 4550 11000 4550
 Wire Wire Line
 	9000 1100 9150 1100
 Wire Wire Line
@@ -284,14 +293,12 @@ Wire Wire Line
 Wire Wire Line
 	2250 1600 2900 1600
 Wire Wire Line
-	9300 4550 8800 4550
+	9550 4550 9050 4550
 Wire Wire Line
 	7450 4300 8350 4300
 Connection ~ 8250 4400
 Wire Wire Line
-	8250 4400 8250 4600
-Wire Wire Line
-	8250 4600 7450 4600
+	8250 4600 8250 4400
 Wire Wire Line
 	7450 4100 8350 4100
 Wire Wire Line
@@ -442,7 +449,7 @@ Wire Wire Line
 Wire Wire Line
 	9600 2950 9450 2950
 Wire Wire Line
-	10350 4850 10800 4850
+	10600 4850 11050 4850
 Wire Wire Line
 	8350 2500 7450 2500
 Wire Wire Line
@@ -450,11 +457,9 @@ Wire Wire Line
 Wire Wire Line
 	7450 3000 7900 3000
 Wire Wire Line
-	8200 4200 8200 4700
+	8200 4700 8200 4200
 Connection ~ 8200 4200
 Wire Wire Line
-	8200 4700 7450 4700
-Wire Wire Line
 	9450 2950 9450 3350
 Wire Wire Line
 	2800 1700 2900 1700
@@ -494,11 +499,11 @@ Connection ~ 4900 5400
 Connection ~ 4900 4300
 Connection ~ 4900 4500
 Wire Wire Line
-	8800 4950 9250 4950
+	9050 4950 9500 4950
 Wire Wire Line
-	8800 5050 9250 5050
+	9050 5050 9500 5050
 Wire Wire Line
-	10800 5050 10350 5050
+	11050 5050 10600 5050
 Wire Wire Line
 	10100 6750 10550 6750
 Wire Wire Line
@@ -640,7 +645,7 @@ Wire Wire Line
 Wire Wire Line
 	1700 2200 1500 2200
 Wire Wire Line
-	9250 4850 8800 4850
+	9500 4850 9050 4850
 Wire Wire Line
 	1050 6500 650  6500
 Wire Wire Line
@@ -691,7 +696,7 @@ Wire Wire Line
 Wire Wire Line
 	2250 5650 2250 5450
 Wire Wire Line
-	10350 4950 10800 4950
+	10600 4950 11050 4950
 Wire Wire Line
 	9600 5850 9600 5600
 Connection ~ 9600 5600
@@ -720,14 +725,63 @@ Wire Wire Line
 	7450 2300 8400 2300
 Wire Wire Line
 	8400 2300 8400 2200
+Wire Wire Line
+	3400 7200 3400 7650
+Wire Wire Line
+	3600 6750 3600 6800
+Wire Wire Line
+	3400 6750 3400 6800
+Connection ~ 3400 6750
+Wire Wire Line
+	3600 7300 3600 7400
+Connection ~ 2650 5450
+Wire Wire Line
+	2850 5950 2850 6050
+Wire Wire Line
+	8500 4600 7450 4600
+Connection ~ 8250 4600
+Wire Wire Line
+	8850 4050 8850 4800
+Wire Wire Line
+	8700 4050 8700 4100
+Connection ~ 8850 4050
+Wire Wire Line
+	8850 4800 7450 4800
+$Comp
+L 3V3 #PWR01
+U 1 1 53A3E4B3
+P 8900 4050
+F 0 "#PWR01" H 8900 4150 40  0001 C CNN
+F 1 "3V3" H 8900 4175 40  0000 C CNN
+	1    8900 4050
+	0    1    1    0   
+$EndComp
+$Comp
+L R R26
+U 1 1 53A3E46E
+P 8700 4350
+F 0 "R26" V 8780 4350 50  0000 C CNN
+F 1 "100K" V 8700 4350 50  0000 C CNN
+F 2 "SM0603" H 8700 4350 60  0001 C CNN
+	1    8700 4350
+	1    0    0    -1  
+$EndComp
 $Comp
-L GND #PWR01
+L R R25
+U 1 1 53A3E45D
+P 8500 4350
+F 0 "R25" V 8580 4350 50  0000 C CNN
+F 1 "100K" V 8500 4350 50  0000 C CNN
+F 2 "SM0603" H 8500 4350 60  0001 C CNN
+	1    8500 4350
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR02
 U 1 1 4FB67F39
 P 8600 1600
-F 0 "#PWR01" H 8600 1600 30  0001 C CNN
+F 0 "#PWR02" H 8600 1600 30  0001 C CNN
 F 1 "GND" H 8600 1530 30  0001 C CNN
-F 2 "" H 8600 1600 60  0001 C CNN
-F 3 "" H 8600 1600 60  0001 C CNN
 	1    8600 1600
 	-1   0    0    1   
 $EndComp
@@ -738,7 +792,6 @@ P 8600 1950
 F 0 "R23" V 8680 1950 50  0000 C CNN
 F 1 "100K" V 8600 1950 50  0000 C CNN
 F 2 "SM0603" H 8600 1950 60  0001 C CNN
-F 3 "" H 8600 1950 60  0001 C CNN
 	1    8600 1950
 	1    0    0    -1  
 $EndComp
@@ -757,25 +810,22 @@ P 8150 6550
 F 0 "IC4" V 8300 6550 60  0000 C CNN
 F 1 "CB3Q3244" H 7950 6400 60  0000 C CNN
 F 2 "SSOP20_BDQ" H 8150 6550 60  0001 C CNN
-F 3 "" H 8150 6550 60  0001 C CNN
 	4    8150 6550
 	0    1    1    0   
 $EndComp
 Text Notes 10450 5700 0    100  ~ 20
 PHONE
-Text Label 10400 4950 0    60   ~ 0
+Text Label 10650 4950 0    60   ~ 0
 VPP_SIM
 NoConn ~ 9600 3050
 Text Label 2650 5600 3    60   ~ 0
 VCC_SIM
 $Comp
-L GND #PWR02
+L GND #PWR03
 U 1 1 4DFF996C
 P 2250 6150
-F 0 "#PWR02" H 2250 6150 30  0001 C CNN
+F 0 "#PWR03" H 2250 6150 30  0001 C CNN
 F 1 "GND" H 2250 6080 30  0001 C CNN
-F 2 "" H 2250 6150 60  0001 C CNN
-F 3 "" H 2250 6150 60  0001 C CNN
 	1    2250 6150
 	1    0    0    -1  
 $EndComp
@@ -786,18 +836,15 @@ P 2250 5850
 F 0 "C24" H 2300 5950 50  0000 L CNN
 F 1 "100nF" H 2300 5750 50  0000 L CNN
 F 2 "SM0603" H 2250 5850 60  0001 C CNN
-F 3 "" H 2250 5850 60  0001 C CNN
 	1    2250 5850
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR03
+L GND #PWR04
 U 1 1 4DFF9910
 P 1650 6100
-F 0 "#PWR03" H 1650 6100 30  0001 C CNN
+F 0 "#PWR04" H 1650 6100 30  0001 C CNN
 F 1 "GND" H 1650 6030 30  0001 C CNN
-F 2 "" H 1650 6100 60  0001 C CNN
-F 3 "" H 1650 6100 60  0001 C CNN
 	1    1650 6100
 	1    0    0    -1  
 $EndComp
@@ -808,7 +855,6 @@ P 1150 6200
 F 0 "R22" V 1230 6200 50  0000 C CNN
 F 1 "100K" V 1150 6200 50  0000 C CNN
 F 2 "SM0603" H 1150 6200 60  0001 C CNN
-F 3 "" H 1150 6200 60  0001 C CNN
 	1    1150 6200
 	0    -1   -1   0   
 $EndComp
@@ -829,18 +875,15 @@ P 2500 6750
 F 0 "IC2" H 2500 7000 60  0000 C CNN
 F 1 "AP7332" H 2500 6500 60  0000 C CNN
 F 2 "SOT26" H 2500 6750 60  0001 C CNN
-F 3 "" H 2500 6750 60  0001 C CNN
 	1    2500 6750
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR04
+L GND #PWR05
 U 1 1 4DFF74F0
 P 8300 5100
-F 0 "#PWR04" H 8300 5100 30  0001 C CNN
+F 0 "#PWR05" H 8300 5100 30  0001 C CNN
 F 1 "GND" H 8300 5030 30  0001 C CNN
-F 2 "" H 8300 5100 60  0001 C CNN
-F 3 "" H 8300 5100 60  0001 C CNN
 	1    8300 5100
 	0    -1   -1   0   
 $EndComp
@@ -851,7 +894,6 @@ P 7950 5100
 F 0 "R21" V 8030 5100 50  0000 C CNN
 F 1 "10k1%" V 7950 5100 50  0000 C CNN
 F 2 "SM0603" H 7950 5100 60  0001 C CNN
-F 3 "" H 7950 5100 60  0001 C CNN
 	1    7950 5100
 	0    1    1    0   
 $EndComp
@@ -862,18 +904,15 @@ P 7950 4900
 F 0 "R20" V 8030 4900 50  0000 C CNN
 F 1 "10k1%" V 7950 4900 50  0000 C CNN
 F 2 "SM0603" H 7950 4900 60  0001 C CNN
-F 3 "" H 7950 4900 60  0001 C CNN
 	1    7950 4900
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR05
+L GND #PWR06
 U 1 1 4DFF73E0
 P 8400 1600
-F 0 "#PWR05" H 8400 1600 30  0001 C CNN
+F 0 "#PWR06" H 8400 1600 30  0001 C CNN
 F 1 "GND" H 8400 1530 30  0001 C CNN
-F 2 "" H 8400 1600 60  0001 C CNN
-F 3 "" H 8400 1600 60  0001 C CNN
 	1    8400 1600
 	-1   0    0    1   
 $EndComp
@@ -884,21 +923,18 @@ P 8400 1950
 F 0 "R19" V 8480 1950 50  0000 C CNN
 F 1 "100K" V 8400 1950 50  0000 C CNN
 F 2 "SM0603" H 8400 1950 60  0001 C CNN
-F 3 "" H 8400 1950 60  0001 C CNN
 	1    8400 1950
 	1    0    0    -1  
 $EndComp
 Text Label 7600 2300 0    60   ~ 0
 VCC_PHONE
 $Comp
-L GND #PWR06
+L GND #PWR07
 U 1 1 4DFDBB3F
-P 10750 4550
-F 0 "#PWR06" H 10750 4550 30  0001 C CNN
-F 1 "GND" H 10750 4480 30  0001 C CNN
-F 2 "" H 10750 4550 60  0001 C CNN
-F 3 "" H 10750 4550 60  0001 C CNN
-	1    10750 4550
+P 11000 4550
+F 0 "#PWR07" H 11000 4550 30  0001 C CNN
+F 1 "GND" H 11000 4480 30  0001 C CNN
+	1    11000 4550
 	0    -1   -1   0   
 $EndComp
 $Comp
@@ -908,7 +944,6 @@ P 10150 3900
 F 0 "J2" H 10100 4050 50  0000 L BNN
 F 1 "JACK_2.5" H 10000 3700 50  0000 L BNN
 F 2 "JACK_2.5" H 10150 3900 60  0001 C CNN
-F 3 "" H 10150 3900 60  0001 C CNN
 	1    10150 3900
 	-1   0    0    -1  
 $EndComp
@@ -919,23 +954,21 @@ USBVCC
 $Comp
 L ISO7816_NO P4
 U 1 1 4DC8FA06
-P 9800 5000
-F 0 "P4" H 9800 5250 60  0000 C CNN
-F 1 "SIM" H 9800 4750 60  0000 C CNN
-F 2 "SIM_AMPHENOL" H 9800 5000 60  0001 C CNN
-F 3 "" H 9800 5000 60  0001 C CNN
-	1    9800 5000
+P 10050 5000
+F 0 "P4" H 10050 5250 60  0000 C CNN
+F 1 "SIM" H 10050 4750 60  0000 C CNN
+F 2 "SIM_AMPHENOL" H 10050 5000 60  0001 C CNN
+	1    10050 5000
 	1    0    0    -1  
 $EndComp
 $Comp
 L ISO7816_NO P4
 U 2 1 4DC8F9F0
-P 9800 4550
-F 0 "P4" H 9800 4700 60  0000 C CNN
-F 1 "SIM" H 9800 4450 60  0000 C CNN
-F 2 "SIM_AMPHENOL" H 9800 4550 60  0001 C CNN
-F 3 "" H 9800 4550 60  0001 C CNN
-	2    9800 4550
+P 10050 4550
+F 0 "P4" H 10050 4700 60  0000 C CNN
+F 1 "SIM" H 10050 4450 60  0000 C CNN
+F 2 "SIM_AMPHENOL" H 10050 4550 60  0001 C CNN
+	2    10050 4550
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -945,7 +978,6 @@ P 3200 5200
 F 0 "C12" H 3250 5300 50  0000 L CNN
 F 1 "2.2uF" H 3250 5100 50  0000 L CNN
 F 2 "SM0603" H 3200 5200 60  0001 C CNN
-F 3 "" H 3200 5200 60  0001 C CNN
 	1    3200 5200
 	1    0    0    -1  
 $EndComp
@@ -956,62 +988,51 @@ P 950 4400
 F 0 "C1" H 1000 4500 50  0000 L CNN
 F 1 "2.2uF" H 1000 4300 50  0000 L CNN
 F 2 "SM0603" H 950 4400 60  0001 C CNN
-F 3 "" H 950 4400 60  0001 C CNN
 	1    950  4400
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR07
+L 3V3 #PWR08
 U 1 1 4DC820B7
 P 10900 5950
-F 0 "#PWR07" H 10900 6050 40  0001 C CNN
+F 0 "#PWR08" H 10900 6050 40  0001 C CNN
 F 1 "3V3" H 10900 6075 40  0000 C CNN
-F 2 "" H 10900 5950 60  0001 C CNN
-F 3 "" H 10900 5950 60  0001 C CNN
 	1    10900 5950
 	0    1    1    0   
 $EndComp
 $Comp
-L 3V3 #PWR08
+L 3V3 #PWR09
 U 1 1 4DC815E7
 P 7500 6650
-F 0 "#PWR08" H 7500 6750 40  0001 C CNN
+F 0 "#PWR09" H 7500 6750 40  0001 C CNN
 F 1 "3V3" H 7500 6775 40  0000 C CNN
-F 2 "" H 7500 6650 60  0001 C CNN
-F 3 "" H 7500 6650 60  0001 C CNN
 	1    7500 6650
 	-1   0    0    1   
 $EndComp
 $Comp
-L 3V3 #PWR09
+L 3V3 #PWR010
 U 1 1 4DC80D4F
 P 6400 6850
-F 0 "#PWR09" H 6400 6950 40  0001 C CNN
+F 0 "#PWR010" H 6400 6950 40  0001 C CNN
 F 1 "3V3" H 6400 6975 40  0000 C CNN
-F 2 "" H 6400 6850 60  0001 C CNN
-F 3 "" H 6400 6850 60  0001 C CNN
 	1    6400 6850
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR010
+L GND #PWR011
 U 1 1 4DC804F4
 P 900 7500
-F 0 "#PWR010" H 900 7500 30  0001 C CNN
+F 0 "#PWR011" H 900 7500 30  0001 C CNN
 F 1 "GND" H 900 7430 30  0001 C CNN
-F 2 "" H 900 7500 60  0001 C CNN
-F 3 "" H 900 7500 60  0001 C CNN
 	1    900  7500
 	1    0    0    -1  
 $EndComp
 $Comp
-L PWR_FLAG #FLG011
+L PWR_FLAG #FLG012
 U 1 1 4DC804C2
 P 1900 6500
-F 0 "#FLG011" H 1900 6770 30  0001 C CNN
+F 0 "#FLG012" H 1900 6770 30  0001 C CNN
 F 1 "PWR_FLAG" H 1900 6730 30  0000 C CNN
-F 2 "" H 1900 6500 60  0001 C CNN
-F 3 "" H 1900 6500 60  0001 C CNN
 	1    1900 6500
 	1    0    0    -1  
 $EndComp
@@ -1022,18 +1043,15 @@ P 900 7200
 F 0 "BT1" H 900 7400 50  0000 C CNN
 F 1 "4.5-6V" H 900 7000 50  0000 C CNN
 F 2 "PIN_ARRAY_2X1" H 900 7200 60  0001 C CNN
-F 3 "" H 900 7200 60  0001 C CNN
 	1    900  7200
 	0    1    1    0   
 $EndComp
 $Comp
-L 3V3 #PWR012
+L 3V3 #PWR013
 U 1 1 4DC80254
 P 4000 6650
-F 0 "#PWR012" H 4000 6750 40  0001 C CNN
+F 0 "#PWR013" H 4000 6750 40  0001 C CNN
 F 1 "3V3" H 4000 6775 40  0000 C CNN
-F 2 "" H 4000 6650 60  0001 C CNN
-F 3 "" H 4000 6650 60  0001 C CNN
 	1    4000 6650
 	0    1    1    0   
 $EndComp
@@ -1046,7 +1064,6 @@ P 8800 1950
 F 0 "R16" V 8880 1950 50  0000 C CNN
 F 1 "10K" V 8800 1950 50  0000 C CNN
 F 2 "SM0603" H 8800 1950 60  0001 C CNN
-F 3 "" H 8800 1950 60  0001 C CNN
 	1    8800 1950
 	1    0    0    -1  
 $EndComp
@@ -1057,18 +1074,15 @@ P 8800 1200
 F 0 "Q2" H 8800 1050 50  0000 R CNN
 F 1 "BC847" V 9200 1200 50  0000 R CNN
 F 2 "SOT23_BC847" H 8800 1200 60  0001 C CNN
-F 3 "" H 8800 1200 60  0001 C CNN
 	1    8800 1200
 	0    1    -1   0   
 $EndComp
 $Comp
-L GND #PWR013
+L GND #PWR014
 U 1 1 4DC7A434
 P 8150 1100
-F 0 "#PWR013" H 8150 1100 30  0001 C CNN
+F 0 "#PWR014" H 8150 1100 30  0001 C CNN
 F 1 "GND" H 8150 1030 30  0001 C CNN
-F 2 "" H 8150 1100 60  0001 C CNN
-F 3 "" H 8150 1100 60  0001 C CNN
 	1    8150 1100
 	0    1    1    0   
 $EndComp
@@ -1079,13 +1093,11 @@ Text Label 1250 650  0    60   ~ 0
 Text Label 750  900  0    60   ~ 0
 UDP_PUP
 $Comp
-L 3V3 #PWR014
+L 3V3 #PWR015
 U 1 1 4DC7A233
 P 1300 1100
-F 0 "#PWR014" H 1300 1200 40  0001 C CNN
+F 0 "#PWR015" H 1300 1200 40  0001 C CNN
 F 1 "3V3" H 1300 1225 40  0000 C CNN
-F 2 "" H 1300 1100 60  0001 C CNN
-F 3 "" H 1300 1100 60  0001 C CNN
 	1    1300 1100
 	1    0    0    -1  
 $EndComp
@@ -1096,31 +1108,26 @@ P 1200 1600
 F 0 "Q1" H 1200 1450 50  0000 R CNN
 F 1 "BC847" H 1050 1500 50  0000 R CNN
 F 2 "SOT23_BC847" H 1200 1600 60  0001 C CNN
-F 3 "" H 1200 1600 60  0001 C CNN
 	1    1200 1600
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR015
+L 3V3 #PWR016
 U 1 1 4DC79FE6
 P 1350 3550
-F 0 "#PWR015" H 1350 3650 40  0001 C CNN
+F 0 "#PWR016" H 1350 3650 40  0001 C CNN
 F 1 "3V3" H 1350 3675 40  0000 C CNN
-F 2 "" H 1350 3550 60  0001 C CNN
-F 3 "" H 1350 3550 60  0001 C CNN
 	1    1350 3550
 	-1   0    0    1   
 $EndComp
 Text Label 1550 3500 1    60   ~ 0
 A-B-DETECT
 $Comp
-L GND #PWR016
+L GND #PWR017
 U 1 1 4DC79F9B
 P 2850 3450
-F 0 "#PWR016" H 2850 3450 30  0001 C CNN
+F 0 "#PWR017" H 2850 3450 30  0001 C CNN
 F 1 "GND" H 2850 3380 30  0001 C CNN
-F 2 "" H 2850 3450 60  0001 C CNN
-F 3 "" H 2850 3450 60  0001 C CNN
 	1    2850 3450
 	0    1    1    0   
 $EndComp
@@ -1131,7 +1138,6 @@ P 2100 2350
 F 0 "C5" H 2150 2450 50  0000 L CNN
 F 1 "33pF" H 2150 2250 50  0000 L CNN
 F 2 "SM0603" H 2100 2350 60  0001 C CNN
-F 3 "" H 2100 2350 60  0001 C CNN
 	1    2100 2350
 	-1   0    0    1   
 $EndComp
@@ -1142,7 +1148,6 @@ P 3300 3250
 F 0 "C13" H 3350 3350 50  0000 L CNN
 F 1 "15pF" H 3350 3150 50  0000 L CNN
 F 2 "SM0603" H 3300 3250 60  0001 C CNN
-F 3 "" H 3300 3250 60  0001 C CNN
 	1    3300 3250
 	1    0    0    -1  
 $EndComp
@@ -1153,7 +1158,6 @@ P 3050 3250
 F 0 "C11" H 3100 3350 50  0000 L CNN
 F 1 "15pF" H 3100 3150 50  0000 L CNN
 F 2 "SM0603" H 3050 3250 60  0001 C CNN
-F 3 "" H 3050 3250 60  0001 C CNN
 	1    3050 3250
 	1    0    0    -1  
 $EndComp
@@ -1164,7 +1168,6 @@ P 1050 1250
 F 0 "R1" V 1130 1250 50  0000 C CNN
 F 1 "100K" V 1050 1250 50  0000 C CNN
 F 2 "SM0603" H 1050 1250 60  0001 C CNN
-F 3 "" H 1050 1250 60  0001 C CNN
 	1    1050 1250
 	0    1    1    0   
 $EndComp
@@ -1175,7 +1178,6 @@ P 1600 1950
 F 0 "R3" V 1680 1950 50  0000 C CNN
 F 1 "1K5" V 1600 1950 50  0000 C CNN
 F 2 "SM0603" H 1600 1950 60  0001 C CNN
-F 3 "" H 1600 1950 60  0001 C CNN
 	1    1600 1950
 	0    1    1    0   
 $EndComp
@@ -1186,7 +1188,6 @@ P 2700 2700
 F 0 "R9" V 2780 2700 50  0000 C CNN
 F 1 "27R" V 2700 2700 50  0000 C CNN
 F 2 "SM0603" H 2700 2700 60  0001 C CNN
-F 3 "" H 2700 2700 60  0001 C CNN
 	1    2700 2700
 	0    1    1    0   
 $EndComp
@@ -1197,7 +1198,6 @@ P 2700 2900
 F 0 "R10" V 2780 2900 50  0000 C CNN
 F 1 "27R" V 2700 2900 50  0000 C CNN
 F 2 "SM0603" H 2700 2900 60  0001 C CNN
-F 3 "" H 2700 2900 60  0001 C CNN
 	1    2700 2900
 	0    1    1    0   
 $EndComp
@@ -1208,7 +1208,6 @@ P 1350 3150
 F 0 "R2" V 1430 3150 50  0000 C CNN
 F 1 "10K" V 1350 3150 50  0000 C CNN
 F 2 "SM0603" H 1350 3150 60  0001 C CNN
-F 3 "" H 1350 3150 60  0001 C CNN
 	1    1350 3150
 	1    0    0    -1  
 $EndComp
@@ -1219,7 +1218,6 @@ P 750 2800
 F 0 "J1" H 800 3250 50  0000 L BNN
 F 1 "USB-B_MINI" H 650 2350 50  0000 L BNN
 F 2 "USB-MINI-B_UX60" H 750 2800 60  0001 C CNN
-F 3 "" H 750 2800 60  0001 C CNN
 	1    750  2800
 	1    0    0    -1  
 $EndComp
@@ -1230,18 +1228,15 @@ P 1150 2200
 F 0 "FB1" H 1150 2350 60  0000 C CNN
 F 1 "FILTER" H 1150 2100 60  0000 C CNN
 F 2 "SM0805" H 1150 2200 60  0001 C CNN
-F 3 "" H 1150 2200 60  0001 C CNN
 	1    1150 2200
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR017
+L GND #PWR018
 U 1 1 4DC799FC
 P 9100 2650
-F 0 "#PWR017" H 9100 2650 30  0001 C CNN
+F 0 "#PWR018" H 9100 2650 30  0001 C CNN
 F 1 "GND" H 9100 2580 30  0001 C CNN
-F 2 "" H 9100 2650 60  0001 C CNN
-F 3 "" H 9100 2650 60  0001 C CNN
 	1    9100 2650
 	1    0    0    -1  
 $EndComp
@@ -1252,84 +1247,69 @@ P 9100 2300
 F 0 "R17" V 9180 2300 50  0000 C CNN
 F 1 "10K" V 9100 2300 50  0000 C CNN
 F 2 "SM0603" H 9100 2300 60  0001 C CNN
-F 3 "" H 9100 2300 60  0001 C CNN
 	1    9100 2300
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR018
+L GND #PWR019
 U 1 1 4DC790F9
 P 6200 1350
-F 0 "#PWR018" H 6200 1350 30  0001 C CNN
+F 0 "#PWR019" H 6200 1350 30  0001 C CNN
 F 1 "GND" H 6200 1280 30  0001 C CNN
-F 2 "" H 6200 1350 60  0001 C CNN
-F 3 "" H 6200 1350 60  0001 C CNN
 	1    6200 1350
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR019
+L GND #PWR020
 U 1 1 4DC790AF
 P 7650 5200
-F 0 "#PWR019" H 7650 5200 30  0001 C CNN
+F 0 "#PWR020" H 7650 5200 30  0001 C CNN
 F 1 "GND" H 7650 5130 30  0001 C CNN
-F 2 "" H 7650 5200 60  0001 C CNN
-F 3 "" H 7650 5200 60  0001 C CNN
 	1    7650 5200
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR020
+L GND #PWR021
 U 1 1 4DC6ABFD
 P 9650 3800
-F 0 "#PWR020" H 9650 3800 30  0001 C CNN
+F 0 "#PWR021" H 9650 3800 30  0001 C CNN
 F 1 "GND" H 9650 3730 30  0001 C CNN
-F 2 "" H 9650 3800 60  0001 C CNN
-F 3 "" H 9650 3800 60  0001 C CNN
 	1    9650 3800
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR021
+L GND #PWR022
 U 1 1 4DC6A8EB
 P 1150 3650
-F 0 "#PWR021" H 1150 3650 30  0001 C CNN
+F 0 "#PWR022" H 1150 3650 30  0001 C CNN
 F 1 "GND" H 1150 3580 30  0001 C CNN
-F 2 "" H 1150 3650 60  0001 C CNN
-F 3 "" H 1150 3650 60  0001 C CNN
 	1    1150 3650
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR022
+L GND #PWR023
 U 1 1 4DC6A5F7
 P 1750 7250
-F 0 "#PWR022" H 1750 7250 30  0001 C CNN
+F 0 "#PWR023" H 1750 7250 30  0001 C CNN
 F 1 "GND" H 1750 7180 30  0001 C CNN
-F 2 "" H 1750 7250 60  0001 C CNN
-F 3 "" H 1750 7250 60  0001 C CNN
 	1    1750 7250
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR023
+L GND #PWR024
 U 1 1 4DC6A5F4
 P 3850 7250
-F 0 "#PWR023" H 3850 7250 30  0001 C CNN
+F 0 "#PWR024" H 3850 7250 30  0001 C CNN
 F 1 "GND" H 3850 7180 30  0001 C CNN
-F 2 "" H 3850 7250 60  0001 C CNN
-F 3 "" H 3850 7250 60  0001 C CNN
 	1    3850 7250
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR024
+L GND #PWR025
 U 1 1 4DC6A5F0
 P 3100 7250
-F 0 "#PWR024" H 3100 7250 30  0001 C CNN
+F 0 "#PWR025" H 3100 7250 30  0001 C CNN
 F 1 "GND" H 3100 7180 30  0001 C CNN
-F 2 "" H 3100 7250 60  0001 C CNN
-F 3 "" H 3100 7250 60  0001 C CNN
 	1    3100 7250
 	1    0    0    -1  
 $EndComp
@@ -1340,7 +1320,6 @@ P 1750 7000
 F 0 "C14" H 1750 7100 50  0000 L CNN
 F 1 "4.7uF" H 1750 6900 50  0000 L CNN
 F 2 "SM0805" H 1750 7000 60  0001 C CNN
-F 3 "" H 1750 7000 60  0001 C CNN
 	1    1750 7000
 	1    0    0    -1  
 $EndComp
@@ -1351,7 +1330,6 @@ P 3850 7000
 F 0 "C22" H 3900 7100 50  0000 L CNN
 F 1 "1uF" H 3900 6900 50  0000 L CNN
 F 2 "SM0603" H 3850 7000 60  0001 C CNN
-F 3 "" H 3850 7000 60  0001 C CNN
 	1    3850 7000
 	1    0    0    -1  
 $EndComp
@@ -1362,18 +1340,15 @@ P 3100 7000
 F 0 "C21" H 3100 7100 50  0000 L CNN
 F 1 "1uF" H 3100 6900 50  0000 L CNN
 F 2 "SM0603" H 3100 7000 60  0001 C CNN
-F 3 "" H 3100 7000 60  0001 C CNN
 	1    3100 7000
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR025
+L GND #PWR026
 U 1 1 4DC6A577
 P 2950 7250
-F 0 "#PWR025" H 2950 7250 30  0001 C CNN
+F 0 "#PWR026" H 2950 7250 30  0001 C CNN
 F 1 "GND" H 2950 7180 30  0001 C CNN
-F 2 "" H 2950 7250 60  0001 C CNN
-F 3 "" H 2950 7250 60  0001 C CNN
 	1    2950 7250
 	1    0    0    -1  
 $EndComp
@@ -1386,7 +1361,6 @@ P 10500 5850
 F 0 "IC4" V 10500 5850 60  0000 C CNN
 F 1 "CB3Q3244" V 10700 5850 60  0000 C CNN
 F 2 "SSOP20_BDQ" H 10500 5850 60  0001 C CNN
-F 3 "" H 10500 5850 60  0001 C CNN
 	9    10500 5850
 	0    1    1    0   
 $EndComp
@@ -1397,7 +1371,6 @@ P 8600 6450
 F 0 "IC4" V 8750 6450 60  0000 C CNN
 F 1 "CB3Q3244" H 8400 6300 60  0000 C CNN
 F 2 "SSOP20_BDQ" H 8600 6450 60  0001 C CNN
-F 3 "" H 8600 6450 60  0001 C CNN
 	5    8600 6450
 	0    1    1    0   
 $EndComp
@@ -1408,7 +1381,6 @@ P 9100 6350
 F 0 "IC4" V 9250 6350 60  0000 C CNN
 F 1 "CB3Q3244" H 8900 6200 60  0000 C CNN
 F 2 "SSOP20_BDQ" H 9100 6350 60  0001 C CNN
-F 3 "" H 9100 6350 60  0001 C CNN
 	3    9100 6350
 	0    1    1    0   
 $EndComp
@@ -1419,7 +1391,6 @@ P 9600 6250
 F 0 "IC4" V 9750 6250 60  0000 C CNN
 F 1 "CB3Q3244" H 9400 6100 60  0000 C CNN
 F 2 "SSOP20_BDQ" H 9600 6250 60  0001 C CNN
-F 3 "" H 9600 6250 60  0001 C CNN
 	2    9600 6250
 	0    1    1    0   
 $EndComp
@@ -1430,18 +1401,15 @@ P 7900 5450
 F 0 "C23" H 7950 5550 50  0000 L CNN
 F 1 "100nF" H 7950 5250 50  0000 L CNN
 F 2 "SM0603" H 7900 5450 60  0001 C CNN
-F 3 "" H 7900 5450 60  0001 C CNN
 	1    7900 5450
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR026
+L GND #PWR027
 U 1 1 4DC68E36
 P 8250 5450
-F 0 "#PWR026" H 8250 5450 30  0001 C CNN
+F 0 "#PWR027" H 8250 5450 30  0001 C CNN
 F 1 "GND" H 8250 5380 30  0001 C CNN
-F 2 "" H 8250 5450 60  0001 C CNN
-F 3 "" H 8250 5450 60  0001 C CNN
 	1    8250 5450
 	0    -1   -1   0   
 $EndComp
@@ -1452,7 +1420,6 @@ P 7500 6150
 F 0 "FB2" H 7500 6300 60  0000 C CNN
 F 1 "FILTER" H 7500 6050 60  0000 C CNN
 F 2 "SM0805" H 7500 6150 60  0001 C CNN
-F 3 "" H 7500 6150 60  0001 C CNN
 	1    7500 6150
 	0    1    1    0   
 $EndComp
@@ -1473,29 +1440,24 @@ P 6700 1350
 F 0 "SW2" H 6850 1460 50  0000 C CNN
 F 1 "BOOTLOADER" H 6700 1270 50  0000 C CNN
 F 2 "PUSH_BUTTON" H 6700 1350 60  0001 C CNN
-F 3 "" H 6700 1350 60  0001 C CNN
 	1    6700 1350
 	-1   0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR027
+L 3V3 #PWR028
 U 1 1 4DC68405
 P 4450 650
-F 0 "#PWR027" H 4450 750 40  0001 C CNN
+F 0 "#PWR028" H 4450 750 40  0001 C CNN
 F 1 "3V3" H 4450 775 40  0000 C CNN
-F 2 "" H 4450 650 60  0001 C CNN
-F 3 "" H 4450 650 60  0001 C CNN
 	1    4450 650 
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR028
+L 3V3 #PWR029
 U 1 1 4DC683FB
 P 5050 950
-F 0 "#PWR028" H 5050 1050 40  0001 C CNN
+F 0 "#PWR029" H 5050 1050 40  0001 C CNN
 F 1 "3V3" H 5050 1075 40  0000 C CNN
-F 2 "" H 5050 950 60  0001 C CNN
-F 3 "" H 5050 950 60  0001 C CNN
 	1    5050 950 
 	1    0    0    -1  
 $EndComp
@@ -1506,7 +1468,6 @@ P 5050 1300
 F 0 "JP2" H 5050 1350 50  0000 C CNN
 F 1 "ERASE" H 5050 1230 40  0000 C CNN
 F 2 "PIN_ARRAY_2X1" H 5050 1300 60  0001 C CNN
-F 3 "" H 5050 1300 60  0001 C CNN
 	1    5050 1300
 	0    -1   1    0   
 $EndComp
@@ -1517,40 +1478,33 @@ P 4750 1300
 F 0 "JP1" H 4750 1350 50  0000 C CNN
 F 1 "TEST" H 4750 1220 40  0000 C CNN
 F 2 "PIN_ARRAY_2X1" H 4750 1300 60  0001 C CNN
-F 3 "" H 4750 1300 60  0001 C CNN
 	1    4750 1300
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR029
+L GND #PWR030
 U 1 1 4DC665D5
 P 3350 5750
-F 0 "#PWR029" H 3350 5750 30  0001 C CNN
+F 0 "#PWR030" H 3350 5750 30  0001 C CNN
 F 1 "GND" H 3350 5680 30  0001 C CNN
-F 2 "" H 3350 5750 60  0001 C CNN
-F 3 "" H 3350 5750 60  0001 C CNN
 	1    3350 5750
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR030
+L GND #PWR031
 U 1 1 4DC665D1
 P 3200 5500
-F 0 "#PWR030" H 3200 5500 30  0001 C CNN
+F 0 "#PWR031" H 3200 5500 30  0001 C CNN
 F 1 "GND" H 3200 5430 30  0001 C CNN
-F 2 "" H 3200 5500 60  0001 C CNN
-F 3 "" H 3200 5500 60  0001 C CNN
 	1    3200 5500
 	1    0    0    -1  
 $EndComp
 $Comp
-L 1V8 #PWR031
+L 1V8 #PWR032
 U 1 1 4DC6650D
 P 3500 5000
-F 0 "#PWR031" H 3500 5140 20  0001 C CNN
+F 0 "#PWR032" H 3500 5140 20  0001 C CNN
 F 1 "1V8" H 3500 5110 30  0000 C CNN
-F 2 "" H 3500 5000 60  0001 C CNN
-F 3 "" H 3500 5000 60  0001 C CNN
 	1    3500 5000
 	0    -1   -1   0   
 $EndComp
@@ -1561,7 +1515,6 @@ P 4100 5700
 F 0 "C19" H 4150 5800 50  0000 L CNN
 F 1 "100nF" H 4150 5600 50  0000 L CNN
 F 2 "SM0603" H 4100 5700 60  0001 C CNN
-F 3 "" H 4100 5700 60  0001 C CNN
 	1    4100 5700
 	1    0    0    -1  
 $EndComp
@@ -1572,7 +1525,6 @@ P 3850 5600
 F 0 "C16" H 3900 5700 50  0000 L CNN
 F 1 "100nF" H 3900 5500 50  0000 L CNN
 F 2 "SM0603" H 3850 5600 60  0001 C CNN
-F 3 "" H 3850 5600 60  0001 C CNN
 	1    3850 5600
 	-1   0    0    -1  
 $EndComp
@@ -1583,29 +1535,24 @@ P 2000 4800
 F 0 "C4" H 2050 4900 50  0000 L CNN
 F 1 "100nF" H 2050 4700 50  0000 L CNN
 F 2 "SM0603" H 2000 4800 60  0001 C CNN
-F 3 "" H 2000 4800 60  0001 C CNN
 	1    2000 4800
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR032
+L 3V3 #PWR033
 U 1 1 4DC662E1
 P 1300 4300
-F 0 "#PWR032" H 1300 4400 40  0001 C CNN
+F 0 "#PWR033" H 1300 4400 40  0001 C CNN
 F 1 "3V3" H 1300 4425 40  0000 C CNN
-F 2 "" H 1300 4300 60  0001 C CNN
-F 3 "" H 1300 4300 60  0001 C CNN
 	1    1300 4300
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR033
+L GND #PWR034
 U 1 1 4DC66159
 P 950 4700
-F 0 "#PWR033" H 950 4700 30  0001 C CNN
+F 0 "#PWR034" H 950 4700 30  0001 C CNN
 F 1 "GND" H 950 4630 30  0001 C CNN
-F 2 "" H 950 4700 60  0001 C CNN
-F 3 "" H 950 4700 60  0001 C CNN
 	1    950  4700
 	1    0    0    -1  
 $EndComp
@@ -1626,13 +1573,11 @@ MOSI
 Text Label 7600 3400 0    60   ~ 0
 SCK
 $Comp
-L GND #PWR034
+L GND #PWR035
 U 1 1 4DC5A389
 P 9250 2150
-F 0 "#PWR034" H 9250 2150 30  0001 C CNN
+F 0 "#PWR035" H 9250 2150 30  0001 C CNN
 F 1 "GND" H 9250 2080 30  0001 C CNN
-F 2 "" H 9250 2150 60  0001 C CNN
-F 3 "" H 9250 2150 60  0001 C CNN
 	1    9250 2150
 	1    0    0    -1  
 $EndComp
@@ -1643,18 +1588,15 @@ P 10950 1600
 F 0 "R18" V 11030 1600 50  0000 C CNN
 F 1 "10K" V 10950 1600 50  0000 C CNN
 F 2 "SM0603" H 10950 1600 60  0001 C CNN
-F 3 "" H 10950 1600 60  0001 C CNN
 	1    10950 1600
 	-1   0    0    1   
 $EndComp
 $Comp
-L 3V3 #PWR035
+L 3V3 #PWR036
 U 1 1 4DC5A300
 P 10700 1200
-F 0 "#PWR035" H 10700 1300 40  0001 C CNN
+F 0 "#PWR036" H 10700 1300 40  0001 C CNN
 F 1 "3V3" H 10700 1325 40  0000 C CNN
-F 2 "" H 10700 1200 60  0001 C CNN
-F 3 "" H 10700 1200 60  0001 C CNN
 	1    10700 1200
 	1    0    0    -1  
 $EndComp
@@ -1667,7 +1609,6 @@ P 9950 1900
 F 0 "U1" H 9950 2200 60  0000 C CNN
 F 1 "FLASH" H 9950 1600 60  0000 C CNN
 F 2 "SOC008_WIDE" H 9950 1900 60  0001 C CNN
-F 3 "" H 9950 1900 60  0001 C CNN
 	1    9950 1900
 	1    0    0    -1  
 $EndComp
@@ -1680,13 +1621,11 @@ CLK_SIM
 Text Label 9300 6250 1    60   ~ 0
 RST_SIM
 $Comp
-L GND #PWR036
+L GND #PWR037
 U 1 1 4DC55B6C
 P 10100 5950
-F 0 "#PWR036" H 10100 5950 30  0001 C CNN
+F 0 "#PWR037" H 10100 5950 30  0001 C CNN
 F 1 "GND" H 10100 5880 30  0001 C CNN
-F 2 "" H 10100 5950 60  0001 C CNN
-F 3 "" H 10100 5950 60  0001 C CNN
 	1    10100 5950
 	0    1    1    0   
 $EndComp
@@ -1697,7 +1636,6 @@ P 5850 6950
 F 0 "R14" V 5930 6950 50  0000 C CNN
 F 1 "150R" V 5850 6950 50  0000 C CNN
 F 2 "SM0603" H 5850 6950 60  0001 C CNN
-F 3 "" H 5850 6950 60  0001 C CNN
 	1    5850 6950
 	0    1    1    0   
 $EndComp
@@ -1708,7 +1646,6 @@ P 5850 6750
 F 0 "R13" V 5930 6750 50  0000 C CNN
 F 1 "150R" V 5850 6750 50  0000 C CNN
 F 2 "SM0603" H 5850 6750 60  0001 C CNN
-F 3 "" H 5850 6750 60  0001 C CNN
 	1    5850 6750
 	0    1    1    0   
 $EndComp
@@ -1719,40 +1656,33 @@ P 10900 6500
 F 0 "P3" H 10950 6850 60  0000 C CNN
 F 1 "REBELSIM" V 11100 6500 60  0000 C CNN
 F 2 "FFC_REBELSIM" H 10900 6500 60  0001 C CNN
-F 3 "" H 10900 6500 60  0001 C CNN
 	1    10900 6500
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR037
+L 3V3 #PWR038
 U 1 1 4DC5061E
 P 2050 4400
-F 0 "#PWR037" H 2050 4500 40  0001 C CNN
+F 0 "#PWR038" H 2050 4500 40  0001 C CNN
 F 1 "3V3" H 2050 4525 40  0000 C CNN
-F 2 "" H 2050 4400 60  0001 C CNN
-F 3 "" H 2050 4400 60  0001 C CNN
 	1    2050 4400
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR038
+L GND #PWR039
 U 1 1 4D037F90
 P 1550 4900
-F 0 "#PWR038" H 1550 4900 30  0001 C CNN
+F 0 "#PWR039" H 1550 4900 30  0001 C CNN
 F 1 "GND" H 1550 4830 30  0001 C CNN
-F 2 "" H 1550 4900 60  0001 C CNN
-F 3 "" H 1550 4900 60  0001 C CNN
 	1    1550 4900
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR039
+L GND #PWR040
 U 1 1 4D037F8C
 P 1900 5100
-F 0 "#PWR039" H 1900 5100 30  0001 C CNN
+F 0 "#PWR040" H 1900 5100 30  0001 C CNN
 F 1 "GND" H 1900 5030 30  0001 C CNN
-F 2 "" H 1900 5100 60  0001 C CNN
-F 3 "" H 1900 5100 60  0001 C CNN
 	1    1900 5100
 	0    1    1    0   
 $EndComp
@@ -1763,7 +1693,6 @@ P 1550 4600
 F 0 "C3" H 1600 4700 50  0000 L CNN
 F 1 "100nF" H 1600 4500 50  0000 L CNN
 F 2 "SM0603" H 1550 4600 60  0001 C CNN
-F 3 "" H 1550 4600 60  0001 C CNN
 	1    1550 4600
 	1    0    0    -1  
 $EndComp
@@ -1771,7 +1700,7 @@ Text Notes 5700 7300 0    100  ~ 20
 LED
 Text Notes 9550 3600 0    100  ~ 20
 DEBUG
-Text Notes 10350 4300 0    100  ~ 20
+Text Notes 10600 4300 0    100  ~ 20
 SIM
 Text Notes 2250 6400 0    100  ~ 20
 POWER
@@ -1792,7 +1721,6 @@ P 4500 5800
 F 0 "C20" H 4550 5900 50  0000 L CNN
 F 1 "100nF" H 4550 5700 50  0000 L CNN
 F 2 "SM0603" H 4500 5800 60  0001 C CNN
-F 3 "" H 4500 5800 60  0001 C CNN
 	1    4500 5800
 	-1   0    0    -1  
 $EndComp
@@ -1803,18 +1731,15 @@ P 3500 5400
 F 0 "C15" H 3550 5600 50  0000 L CNN
 F 1 "100nF" H 3550 5500 50  0000 L CNN
 F 2 "SM0603" H 3500 5400 60  0001 C CNN
-F 3 "" H 3500 5400 60  0001 C CNN
 	1    3500 5400
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR040
+L GND #PWR041
 U 1 1 4D020E3B
 P 1850 3950
-F 0 "#PWR040" H 1850 3950 30  0001 C CNN
+F 0 "#PWR041" H 1850 3950 30  0001 C CNN
 F 1 "GND" H 1850 3880 30  0001 C CNN
-F 2 "" H 1850 3950 60  0001 C CNN
-F 3 "" H 1850 3950 60  0001 C CNN
 	1    1850 3950
 	0    1    1    0   
 $EndComp
@@ -1825,7 +1750,6 @@ P 2250 3950
 F 0 "C6" H 2300 4050 50  0000 L CNN
 F 1 "10nF" H 2300 3850 50  0000 L CNN
 F 2 "SM0603" H 2250 3950 60  0001 C CNN
-F 3 "" H 2250 3950 60  0001 C CNN
 	1    2250 3950
 	0    -1   -1   0   
 $EndComp
@@ -1836,7 +1760,6 @@ P 2850 3700
 F 0 "C10" H 2900 3800 50  0000 L CNN
 F 1 "1nF" H 2900 3600 50  0000 L CNN
 F 2 "SM0603" H 2850 3700 60  0001 C CNN
-F 3 "" H 2850 3700 60  0001 C CNN
 	1    2850 3700
 	0    -1   -1   0   
 $EndComp
@@ -1847,7 +1770,6 @@ P 2850 3950
 F 0 "R11" V 2930 3950 50  0000 C CNN
 F 1 "1K5" V 2850 3950 50  0000 C CNN
 F 2 "SM0603" H 2850 3950 60  0001 C CNN
-F 3 "" H 2850 3950 60  0001 C CNN
 	1    2850 3950
 	0    1    1    0   
 $EndComp
@@ -1858,7 +1780,6 @@ P 2800 5000
 F 0 "C9" H 2850 5100 50  0000 L CNN
 F 1 "100nF" H 2850 4900 50  0000 L CNN
 F 2 "SM0603" H 2800 5000 60  0001 C CNN
-F 3 "" H 2800 5000 60  0001 C CNN
 	1    2800 5000
 	1    0    0    -1  
 $EndComp
@@ -1869,18 +1790,15 @@ P 2400 4900
 F 0 "C7" H 2450 5000 50  0000 L CNN
 F 1 "100nF" H 2450 4800 50  0000 L CNN
 F 2 "SM0603" H 2400 4900 60  0001 C CNN
-F 3 "" H 2400 4900 60  0001 C CNN
 	1    2400 4900
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR041
+L GND #PWR042
 U 1 1 4D020854
 P 4450 850
-F 0 "#PWR041" H 4450 850 30  0001 C CNN
+F 0 "#PWR042" H 4450 850 30  0001 C CNN
 F 1 "GND" H 4450 780 30  0001 C CNN
-F 2 "" H 4450 850 60  0001 C CNN
-F 3 "" H 4450 850 60  0001 C CNN
 	1    4450 850 
 	-1   0    0    1   
 $EndComp
@@ -1891,7 +1809,6 @@ P 4450 1300
 F 0 "SW1" H 4600 1410 50  0000 C CNN
 F 1 "RESET" H 4450 1220 50  0000 C CNN
 F 2 "PUSH_BUTTON" H 4450 1300 60  0001 C CNN
-F 3 "" H 4450 1300 60  0001 C CNN
 	1    4450 1300
 	0    -1   -1   0   
 $EndComp
@@ -1902,7 +1819,6 @@ P 4150 1300
 F 0 "R12" V 4230 1300 50  0000 C CNN
 F 1 "100K" V 4150 1300 50  0000 C CNN
 F 2 "SM0603" H 4150 1300 60  0001 C CNN
-F 3 "" H 4150 1300 60  0001 C CNN
 	1    4150 1300
 	1    0    0    -1  
 $EndComp
@@ -1917,20 +1833,17 @@ P 3350 1450
 F 0 "P1" H 3350 2000 60  0000 C CNN
 F 1 "JTAG" H 3350 900 50  0000 C CNN
 F 2 "PIN_ARRAY_10X2" H 3350 1450 60  0001 C CNN
-F 3 "" H 3350 1450 60  0001 C CNN
 	1    3350 1450
 	1    0    0    -1  
 $EndComp
 Text Label 10000 6550 0    60   ~ 0
 I/O_PHONE
 $Comp
-L GND #PWR042
+L GND #PWR043
 U 1 1 4CF7CFEB
 P 10100 6750
-F 0 "#PWR042" H 10100 6750 30  0001 C CNN
+F 0 "#PWR043" H 10100 6750 30  0001 C CNN
 F 1 "GND" H 10100 6680 30  0001 C CNN
-F 2 "" H 10100 6750 60  0001 C CNN
-F 3 "" H 10100 6750 60  0001 C CNN
 	1    10100 6750
 	0    1    1    0   
 $EndComp
@@ -1938,26 +1851,24 @@ Text Label 10000 6450 0    60   ~ 0
 CLK_PHONE
 Text Label 10000 6250 0    60   ~ 0
 VCC_PHONE
-Text Label 10750 5050 2    60   ~ 0
+Text Label 11000 5050 2    60   ~ 0
 I/O_SIM
-Text Label 9150 5050 2    60   ~ 0
+Text Label 9400 5050 2    60   ~ 0
 CLK_SIM
-Text Label 9150 4950 2    60   ~ 0
+Text Label 9400 4950 2    60   ~ 0
 RST_SIM
-Text Label 9150 4850 2    60   ~ 0
+Text Label 9400 4850 2    60   ~ 0
 VCC_SIM
 $Comp
-L GND #PWR043
+L GND #PWR044
 U 1 1 4CF7C43B
-P 10800 4850
-F 0 "#PWR043" H 10800 4850 30  0001 C CNN
-F 1 "GND" H 10800 4780 30  0001 C CNN
-F 2 "" H 10800 4850 60  0001 C CNN
-F 3 "" H 10800 4850 60  0001 C CNN
-	1    10800 4850
+P 11050 4850
+F 0 "#PWR044" H 11050 4850 30  0001 C CNN
+F 1 "GND" H 11050 4780 30  0001 C CNN
+	1    11050 4850
 	0    -1   -1   0   
 $EndComp
-Text Label 8900 4550 0    60   ~ 0
+Text Label 9150 4550 0    60   ~ 0
 SW_SIM
 Text Label 7600 3000 0    60   ~ 0
 LED_G
@@ -1979,8 +1890,8 @@ Text Label 7600 4300 0    60   ~ 0
 SIM_PWEN
 Text Label 7600 4000 0    60   ~ 0
 SW_SIM
-NoConn ~ 9250 5150
-NoConn ~ 10350 5150
+NoConn ~ 9500 5150
+NoConn ~ 10600 5150
 $Comp
 L LED D5
 U 1 1 4CF5471F
@@ -1988,7 +1899,6 @@ P 5200 6950
 F 0 "D5" H 4950 7000 50  0000 C CNN
 F 1 "GREEN" H 5500 7000 50  0000 C CNN
 F 2 "LED-0805" H 5200 6950 60  0001 C CNN
-F 3 "" H 5200 6950 60  0001 C CNN
 	1    5200 6950
 	-1   0    0    -1  
 $EndComp
@@ -1999,7 +1909,6 @@ P 5200 6750
 F 0 "D4" H 4950 6800 50  0000 C CNN
 F 1 "RED" H 5450 6800 50  0000 C CNN
 F 2 "LED-0805" H 5200 6750 60  0001 C CNN
-F 3 "" H 5200 6750 60  0001 C CNN
 	1    5200 6750
 	-1   0    0    -1  
 $EndComp
@@ -2010,7 +1919,6 @@ P 6250 3800
 F 0 "IC3" H 5250 6100 50  0000 L BNN
 F 1 "AT91SAM7S" H 5250 1400 50  0000 L BNN
 F 2 "TQFP_64" H 6250 3950 50  0001 C CNN
-F 3 "" H 6250 3800 60  0001 C CNN
 	1    6250 3800
 	1    0    0    -1  
 $EndComp
@@ -2025,18 +1933,15 @@ P 9950 3100
 F 0 "P2" H 9950 3450 60  0000 C CNN
 F 1 "DEBUG" V 10150 3100 60  0000 C CNN
 F 2 "PIN_ARRAY-6X1" H 9950 3100 60  0001 C CNN
-F 3 "" H 9950 3100 60  0001 C CNN
 	1    9950 3100
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR044
+L GND #PWR045
 U 1 1 4CE9AA96
 P 9450 2700
-F 0 "#PWR044" H 9450 2700 30  0001 C CNN
+F 0 "#PWR045" H 9450 2700 30  0001 C CNN
 F 1 "GND" H 9450 2630 30  0001 C CNN
-F 2 "" H 9450 2700 60  0001 C CNN
-F 3 "" H 9450 2700 60  0001 C CNN
 	1    9450 2700
 	-1   0    0    1   
 $EndComp
@@ -2050,24 +1955,20 @@ Text Label 4450 2200 0    60   ~ 0
 TDI
 NoConn ~ 5050 2600
 $Comp
-L GND #PWR045
+L GND #PWR046
 U 1 1 4CE9A7C1
 P 3900 2000
-F 0 "#PWR045" H 3900 2000 30  0001 C CNN
+F 0 "#PWR046" H 3900 2000 30  0001 C CNN
 F 1 "GND" H 3900 1930 30  0001 C CNN
-F 2 "" H 3900 2000 60  0001 C CNN
-F 3 "" H 3900 2000 60  0001 C CNN
 	1    3900 2000
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR046
+L 3V3 #PWR047
 U 1 1 4CE9A701
 P 1600 950
-F 0 "#PWR046" H 1600 1050 40  0001 C CNN
+F 0 "#PWR047" H 1600 1050 40  0001 C CNN
 F 1 "3V3" H 1600 1075 40  0000 C CNN
-F 2 "" H 1600 950 60  0001 C CNN
-F 3 "" H 1600 950 60  0001 C CNN
 	1    1600 950 
 	1    0    0    -1  
 $EndComp
@@ -2078,7 +1979,6 @@ P 2000 1600
 F 0 "R8" V 2000 1500 50  0000 C CNN
 F 1 "100K" V 2000 1650 50  0000 C CNN
 F 2 "SM0603" H 2000 1600 60  0001 C CNN
-F 3 "" H 2000 1600 60  0001 C CNN
 	1    2000 1600
 	0    1    1    0   
 $EndComp
@@ -2089,7 +1989,6 @@ P 2000 1400
 F 0 "R7" V 2000 1300 50  0000 C CNN
 F 1 "100K" V 2000 1450 50  0000 C CNN
 F 2 "SM0603" H 2000 1400 60  0001 C CNN
-F 3 "" H 2000 1400 60  0001 C CNN
 	1    2000 1400
 	0    1    1    0   
 $EndComp
@@ -2100,7 +1999,6 @@ P 2000 1300
 F 0 "R6" V 2000 1200 50  0000 C CNN
 F 1 "100K" V 2000 1350 50  0000 C CNN
 F 2 "SM0603" H 2000 1300 60  0001 C CNN
-F 3 "" H 2000 1300 60  0001 C CNN
 	1    2000 1300
 	0    1    1    0   
 $EndComp
@@ -2111,7 +2009,6 @@ P 2000 1200
 F 0 "R5" V 2000 1100 50  0000 C CNN
 F 1 "100K" V 2000 1250 50  0000 C CNN
 F 2 "SM0603" H 2000 1200 60  0001 C CNN
-F 3 "" H 2000 1200 60  0001 C CNN
 	1    2000 1200
 	0    1    1    0   
 $EndComp
@@ -2122,20 +2019,17 @@ P 2000 1100
 F 0 "R4" V 2000 1000 50  0000 C CNN
 F 1 "100K" V 2000 1150 50  0000 C CNN
 F 2 "SM0603" H 2000 1100 60  0001 C CNN
-F 3 "" H 2000 1100 60  0001 C CNN
 	1    2000 1100
 	0    1    1    0   
 $EndComp
 NoConn ~ 2900 1900
 NoConn ~ 2900 1800
 $Comp
-L 1V8 #PWR047
+L 1V8 #PWR048
 U 1 1 4CE94C54
 P 3200 4850
-F 0 "#PWR047" H 3200 4990 20  0001 C CNN
+F 0 "#PWR048" H 3200 4990 20  0001 C CNN
 F 1 "1V8" H 3200 4960 30  0000 C CNN
-F 2 "" H 3200 4850 60  0001 C CNN
-F 3 "" H 3200 4850 60  0001 C CNN
 	1    3200 4850
 	1    0    0    -1  
 $EndComp
@@ -2160,24 +2054,20 @@ DDM
 Text Label 4350 2900 0    60   ~ 0
 DDP
 $Comp
-L 3V3 #PWR048
+L 3V3 #PWR049
 U 1 1 4CE91A30
 P 750 4100
-F 0 "#PWR048" H 750 4200 40  0001 C CNN
+F 0 "#PWR049" H 750 4200 40  0001 C CNN
 F 1 "3V3" H 750 4225 40  0000 C CNN
-F 2 "" H 750 4100 60  0001 C CNN
-F 3 "" H 750 4100 60  0001 C CNN
 	1    750  4100
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR049
+L GND #PWR050
 U 1 1 4CE9163C
 P 3600 3400
-F 0 "#PWR049" H 3600 3400 30  0001 C CNN
+F 0 "#PWR050" H 3600 3400 30  0001 C CNN
 F 1 "GND" H 3600 3330 30  0001 C CNN
-F 2 "" H 3600 3400 60  0001 C CNN
-F 3 "" H 3600 3400 60  0001 C CNN
 	1    3600 3400
 	0    1    1    0   
 $EndComp
@@ -2188,7 +2078,6 @@ P 4000 3700
 F 0 "C18" V 3900 3850 50  0000 L CNN
 F 1 "10pF" V 4050 3850 50  0000 L CNN
 F 2 "SM0603" H 4000 3700 60  0001 C CNN
-F 3 "" H 4000 3700 60  0001 C CNN
 	1    4000 3700
 	0    1    1    0   
 $EndComp
@@ -2199,7 +2088,6 @@ P 4000 3100
 F 0 "C17" V 3900 3250 50  0000 L CNN
 F 1 "10pF" V 4050 3250 50  0000 L CNN
 F 2 "SM0603" H 4000 3100 60  0001 C CNN
-F 3 "" H 4000 3100 60  0001 C CNN
 	1    4000 3100
 	0    1    1    0   
 $EndComp
@@ -2210,18 +2098,15 @@ P 4450 3400
 F 0 "X1" V 4350 3200 60  0000 C CNN
 F 1 "18.432MHz" V 4500 3000 60  0000 C CNN
 F 2 "Q_49U3HMS" H 4450 3400 60  0001 C CNN
-F 3 "" H 4450 3400 60  0001 C CNN
 	1    4450 3400
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR050
+L GND #PWR051
 U 1 1 4CE8FFA5
 P 4750 6150
-F 0 "#PWR050" H 4750 6150 30  0001 C CNN
+F 0 "#PWR051" H 4750 6150 30  0001 C CNN
 F 1 "GND" H 4750 6080 30  0001 C CNN
-F 2 "" H 4750 6150 60  0001 C CNN
-F 3 "" H 4750 6150 60  0001 C CNN
 	1    4750 6150
 	1    0    0    -1  
 $EndComp
@@ -2280,8 +2165,6 @@ F 3 "~" H 3400 7000 60  0000 C CNN
 	1    3400 7000
 	0    1    1    0   
 $EndComp
-Wire Wire Line
-	3400 7200 3400 7650
 $Comp
 L R R24
 U 1 1 526C5026
@@ -2289,7 +2172,6 @@ P 3600 7050
 F 0 "R24" V 3680 7050 40  0000 C CNN
 F 1 "100K" V 3607 7051 40  0000 C CNN
 F 2 "SM0603" V 3530 7050 30  0001 C CNN
-F 3 "" H 3600 7050 30  0000 C CNN
 	1    3600 7050
 	1    0    0    -1  
 $EndComp
@@ -2300,56 +2182,26 @@ P 2850 5700
 F 0 "R15" V 2930 5700 40  0000 C CNN
 F 1 "100K" V 2857 5701 40  0000 C CNN
 F 2 "SM0603" V 2780 5700 30  0001 C CNN
-F 3 "" H 2850 5700 30  0000 C CNN
 	1    2850 5700
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR051
+L GND #PWR052
 U 1 1 526C5044
 P 2850 6050
-F 0 "#PWR051" H 2850 6050 30  0001 C CNN
+F 0 "#PWR052" H 2850 6050 30  0001 C CNN
 F 1 "GND" H 2850 5980 30  0001 C CNN
-F 2 "" H 2850 6050 60  0000 C CNN
-F 3 "" H 2850 6050 60  0000 C CNN
 	1    2850 6050
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR052
+L GND #PWR053
 U 1 1 526C5053
 P 3600 7400
-F 0 "#PWR052" H 3600 7400 30  0001 C CNN
+F 0 "#PWR053" H 3600 7400 30  0001 C CNN
 F 1 "GND" H 3600 7330 30  0001 C CNN
-F 2 "" H 3600 7400 60  0000 C CNN
-F 3 "" H 3600 7400 60  0000 C CNN
 	1    3600 7400
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	3600 6750 3600 6800
-Wire Wire Line
-	3400 6750 3400 6800
-Connection ~ 3400 6750
-Wire Wire Line
-	3600 7300 3600 7400
-Connection ~ 2650 5450
-Wire Wire Line
-	2850 5950 2850 6050
-$Comp
-L GND #PWR053
-U 1 1 526D3731
-P 8150 4800
-F 0 "#PWR053" H 8150 4800 30  0001 C CNN
-F 1 "GND" H 8150 4730 30  0001 C CNN
-F 2 "" H 8150 4800 60  0000 C CNN
-F 3 "" H 8150 4800 60  0000 C CNN
-	1    8150 4800
-	0    -1   -1   0   
-$EndComp
-Wire Wire Line
-	7450 4800 8150 4800
-Text Label 7600 4800 0    60   ~ 0
-V_1.3
 NoConn ~ 7450 1800
 $EndSCHEMATC