LDO, and power switch added. not verified yet

1 files changed, 220 insertions, 157 deletions

diff --git a/hardware/kicad/SIMtrace.sch b/hardware/kicad/SIMtrace.sch
index 148270d..152e019 100644
--- a/hardware/kicad/SIMtrace.sch
+++ b/hardware/kicad/SIMtrace.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Mo 20 Jun 2011 20:09:16 CEST
+EESchema Schematic File Version 2  date Mo 20 Jun 2011 21:16:25 CEST
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -46,12 +46,35 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
+Text Label 2650 5600 3    60   ~ 0
+VCC_SIM
+Connection ~ 2250 5450
+Wire Wire Line
+	2650 6200 2650 5450
+Wire Wire Line
+	2650 5450 2050 5450
+Wire Wire Line
+	2250 6150 2250 6050
+Wire Wire Line
+	1650 6100 1650 6050
+Wire Wire Line
+	2050 5650 2050 6200
+Wire Wire Line
+	2050 6200 1400 6200
+Wire Wire Line
+	1900 6500 1750 6500
+Wire Wire Line
+	8250 2300 8250 2250
+Wire Wire Line
+	650  5450 1250 5450
+Wire Wire Line
+	2050 6850 2050 7350
 Wire Wire Line
 	1750 7200 1750 7250
 Wire Wire Line
 	2950 6850 2950 7250
 Wire Wire Line
-	2950 6650 3750 6650
+	3750 6650 2950 6650
 Wire Wire Line
 	2050 6750 1950 6750
 Wire Wire Line
@@ -61,11 +84,11 @@ Wire Wire Line
 Wire Wire Line
 	8550 4900 8200 4900
 Wire Wire Line
-	7700 5100 7450 5100
+	7450 5100 7700 5100
 Wire Wire Line
 	8400 1700 8400 1600
 Wire Wire Line
-	8350 2300 7450 2300
+	7450 2300 8350 2300
 Wire Wire Line
 	2050 6650 1600 6650
 Wire Wire Line
@@ -96,7 +119,7 @@ Wire Wire Line
 Wire Wire Line
 	7450 1700 7650 1700
 Wire Wire Line
-	1300 1100 1300 1400
+	1300 1400 1300 1100
 Wire Wire Line
 	800  1250 800  1600
 Wire Wire Line
@@ -127,7 +150,7 @@ Wire Wire Line
 	8950 2550 8950 2650
 Connection ~ 7550 5200
 Wire Wire Line
-	7450 5200 7650 5200
+	7650 5200 7450 5200
 Wire Wire Line
 	7550 5200 7550 5400
 Wire Wire Line
@@ -140,12 +163,10 @@ Connection ~ 1950 6650
 Wire Wire Line
 	8450 6050 8450 5600
 Wire Wire Line
-	9650 5600 9650 5750
-Wire Wire Line
 	8850 5950 8850 5600
 Connection ~ 7700 5600
 Wire Wire Line
-	7700 5450 7700 5800
+	7700 5800 7700 5450
 Wire Wire Line
 	7450 5600 7700 5600
 Wire Wire Line
@@ -204,11 +225,11 @@ Wire Wire Line
 	4900 4400 2050 4400
 Connection ~ 1550 4300
 Wire Wire Line
-	1550 4400 1550 4300
+	1550 4300 1550 4400
 Wire Wire Line
 	950  4600 950  4700
 Wire Wire Line
-	750  4100 5050 4100
+	5050 4100 750  4100
 Wire Wire Line
 	10550 2050 10950 2050
 Wire Wire Line
@@ -227,8 +248,6 @@ Wire Wire Line
 	9000 6350 9000 5750
 Connection ~ 9250 5600
 Wire Wire Line
-	9400 6250 9400 5750
-Wire Wire Line
 	9600 6750 9450 6750
 Wire Wire Line
 	7000 6500 7150 6500
@@ -239,7 +258,7 @@ Connection ~ 4900 5300
 Wire Wire Line
 	5050 1900 4150 1900
 Wire Wire Line
-	1850 3950 2050 3950
+	2050 3950 1850 3950
 Connection ~ 3300 3950
 Wire Wire Line
 	3050 3700 3300 3700
@@ -261,7 +280,7 @@ Wire Wire Line
 Wire Wire Line
 	5300 6700 5900 6700
 Wire Wire Line
-	2900 1600 2250 1600
+	2250 1600 2900 1600
 Wire Wire Line
 	9300 4550 8800 4550
 Wire Wire Line
@@ -276,7 +295,7 @@ Wire Wire Line
 Wire Wire Line
 	7450 2800 8350 2800
 Wire Wire Line
-	7450 2600 8350 2600
+	8350 2600 7450 2600
 Wire Wire Line
 	7450 2400 8350 2400
 Wire Wire Line
@@ -286,11 +305,9 @@ Wire Wire Line
 	7450 2700 8200 2700
 Wire Wire Line
 	8200 2700 8200 2600
-Wire Wire Line
-	8200 2500 8200 2000
 Connection ~ 8200 2500
 Wire Wire Line
-	8200 2000 7450 2000
+	7450 2000 8200 2000
 Wire Wire Line
 	9300 2800 9300 3050
 Wire Wire Line
@@ -300,7 +317,7 @@ Wire Wire Line
 Wire Wire Line
 	9600 2850 9450 2850
 Wire Wire Line
-	7450 4400 8350 4400
+	8350 4400 7450 4400
 Connection ~ 3900 1800
 Wire Wire Line
 	3900 1800 3800 1800
@@ -331,7 +348,7 @@ Wire Wire Line
 Connection ~ 2400 1600
 Connection ~ 2600 1300
 Wire Wire Line
-	2250 1300 2900 1300
+	2900 1300 2250 1300
 Wire Wire Line
 	2900 1100 2250 1100
 Wire Wire Line
@@ -345,7 +362,7 @@ Wire Wire Line
 Wire Wire Line
 	5050 3000 4700 3000
 Wire Wire Line
-	8350 4200 7450 4200
+	7450 4200 8350 4200
 Wire Wire Line
 	3700 3100 3800 3100
 Wire Wire Line
@@ -390,10 +407,10 @@ Wire Wire Line
 	2800 2100 2800 1700
 Connection ~ 4450 1900
 Wire Wire Line
-	2250 1200 2900 1200
+	2900 1200 2250 1200
 Connection ~ 2700 1200
 Wire Wire Line
-	2250 1400 2900 1400
+	2900 1400 2250 1400
 Connection ~ 2500 1400
 Wire Wire Line
 	1600 1100 1750 1100
@@ -431,7 +448,7 @@ Wire Wire Line
 Wire Wire Line
 	10350 4850 10800 4850
 Wire Wire Line
-	7450 2500 8350 2500
+	8350 2500 7450 2500
 Wire Wire Line
 	7900 3100 7450 3100
 Wire Wire Line
@@ -519,7 +536,7 @@ Wire Wire Line
 	950  4200 950  4100
 Connection ~ 950  4100
 Wire Wire Line
-	1300 4300 5050 4300
+	5050 4300 1300 4300
 Wire Wire Line
 	1550 4800 1550 4900
 Wire Wire Line
@@ -538,7 +555,7 @@ Connection ~ 2000 5100
 Wire Wire Line
 	5050 4900 3200 4900
 Wire Wire Line
-	3200 5000 3200 4850
+	3200 4850 3200 5000
 Connection ~ 3200 4900
 Wire Wire Line
 	4900 5000 4900 5500
@@ -563,14 +580,13 @@ Wire Wire Line
 Wire Wire Line
 	7000 1350 7650 1350
 Wire Wire Line
-	8750 1950 9350 1950
+	9350 1950 8750 1950
 Wire Wire Line
 	7450 2900 8350 2900
 Wire Wire Line
 	10550 6350 9500 6350
 Wire Wire Line
 	10550 6550 8700 6550
-Connection ~ 9650 5600
 Wire Wire Line
 	7700 6650 7700 6500
 Wire Wire Line
@@ -596,7 +612,7 @@ Wire Wire Line
 	3300 3050 3300 2900
 Connection ~ 3300 2900
 Wire Wire Line
-	2850 3450 3300 3450
+	3300 3450 2850 3450
 Connection ~ 3050 3450
 Wire Wire Line
 	1550 2900 1150 2900
@@ -606,7 +622,7 @@ Wire Wire Line
 Wire Wire Line
 	4700 2900 2950 2900
 Wire Wire Line
-	1150 2700 2450 2700
+	2450 2700 1150 2700
 Wire Wire Line
 	1850 1950 1850 2800
 Connection ~ 1850 2800
@@ -634,7 +650,7 @@ Wire Wire Line
 Wire Wire Line
 	8150 1100 8400 1100
 Wire Wire Line
-	1150 3000 1150 3650
+	1150 3650 1150 3000
 Wire Wire Line
 	1700 2200 1500 2200
 Wire Wire Line
@@ -667,10 +683,6 @@ Wire Wire Line
 	8600 3200 8600 2200
 Wire Wire Line
 	7650 1350 7650 1700
-Wire Wire Line
-	8250 2300 8250 2200
-Wire Wire Line
-	8250 2200 8400 2200
 Connection ~ 8250 2300
 Wire Wire Line
 	7700 4900 7550 4900
@@ -682,30 +694,94 @@ Wire Wire Line
 Wire Wire Line
 	3100 6800 3100 6750
 Wire Wire Line
-	2950 6750 3400 6750
-Wire Wire Line
-	3400 6750 3400 7250
+	3400 7250 3400 6750
 Connection ~ 3100 6750
 Wire Wire Line
-	2050 6850 2050 7250
+	3400 6750 2950 6750
+Wire Wire Line
+	1250 5650 650  5650
+Wire Wire Line
+	8250 2250 8400 2250
+Wire Wire Line
+	8400 2250 8400 2200
+Wire Wire Line
+	8200 2000 8200 2500
+Wire Wire Line
+	8350 2200 7450 2200
+Connection ~ 900  5450
+Wire Wire Line
+	900  6200 900  5450
+Wire Wire Line
+	2250 5450 2250 5650
+$Comp
+L GND #PWR01
+U 1 1 4DFF996C
+P 2250 6150
+F 0 "#PWR01" H 2250 6150 30  0001 C CNN
+F 1 "GND" H 2250 6080 30  0001 C CNN
+	1    2250 6150
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C24
+U 1 1 4DFF9964
+P 2250 5850
+F 0 "C24" H 2300 5950 50  0000 L CNN
+F 1 "100nF" H 2300 5750 50  0000 L CNN
+	1    2250 5850
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR02
+U 1 1 4DFF9910
+P 1650 6100
+F 0 "#PWR02" H 1650 6100 30  0001 C CNN
+F 1 "GND" H 1650 6030 30  0001 C CNN
+	1    1650 6100
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R22
+U 1 1 4DFF9902
+P 1150 6200
+F 0 "R22" V 1230 6200 50  0000 C CNN
+F 1 "100k" V 1150 6200 50  0000 C CNN
+	1    1150 6200
+	0    -1   -1   0   
+$EndComp
+Text Label 700  5650 0    60   ~ 0
+VCC_FWD
+Text Label 7600 2200 0    60   ~ 0
+VCC_FWD
+Text Label 700  5450 0    60   ~ 0
+VCC_PHONE
+$Comp
+L FPF200X IC5
+U 1 1 4DFF9774
+P 1650 5550
+F 0 "IC5" H 1650 5900 60  0000 C CNN
+F 1 "FPF2005" H 1650 5800 60  0000 C CNN
+	1    1650 5550
+	1    0    0    -1  
+$EndComp
 Text Label 2050 7300 1    60   ~ 0
 SIM_PWEN
 Text Label 3400 7150 1    60   ~ 0
 VCC_SIM
 $Comp
-L AP7332 IC?
+L AP7332 IC2
 U 1 1 4DFF8B97
 P 2500 6750
-F 0 "IC?" H 2500 7000 60  0000 C CNN
+F 0 "IC2" H 2500 7000 60  0000 C CNN
 F 1 "AP7332" H 2500 6500 60  0000 C CNN
 	1    2500 6750
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?
+L GND #PWR03
 U 1 1 4DFF74F0
 P 8300 5100
-F 0 "#PWR?" H 8300 5100 30  0001 C CNN
+F 0 "#PWR03" H 8300 5100 30  0001 C CNN
 F 1 "GND" H 8300 5030 30  0001 C CNN
 	1    8300 5100
 	0    -1   -1   0   
@@ -729,10 +805,10 @@ F 1 "10k1%" V 7950 4900 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR01
+L GND #PWR04
 U 1 1 4DFF73E0
 P 8400 1600
-F 0 "#PWR01" H 8400 1600 30  0001 C CNN
+F 0 "#PWR04" H 8400 1600 30  0001 C CNN
 F 1 "GND" H 8400 1530 30  0001 C CNN
 	1    8400 1600
 	-1   0    0    1   
@@ -749,10 +825,10 @@ $EndComp
 Text Label 7600 2300 0    60   ~ 0
 VCC_PHONE
 $Comp
-L GND #PWR02
+L GND #PWR05
 U 1 1 4DFDBB3F
 P 10750 4550
-F 0 "#PWR02" H 10750 4550 30  0001 C CNN
+F 0 "#PWR05" H 10750 4550 30  0001 C CNN
 F 1 "GND" H 10750 4480 30  0001 C CNN
 	1    10750 4550
 	0    -1   -1   0   
@@ -833,57 +909,57 @@ F 2 "SM0603" H 950 4400 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR03
+L 3V3 #PWR06
 U 1 1 4DC820B7
 P 9600 6750
-F 0 "#PWR03" H 9600 6850 40  0001 C CNN
+F 0 "#PWR06" H 9600 6850 40  0001 C CNN
 F 1 "3V3" H 9600 6875 40  0000 C CNN
 	1    9600 6750
 	0    1    1    0   
 $EndComp
 $Comp
-L 3V3 #PWR04
+L 3V3 #PWR07
 U 1 1 4DC815E7
 P 7700 6650
-F 0 "#PWR04" H 7700 6750 40  0001 C CNN
+F 0 "#PWR07" H 7700 6750 40  0001 C CNN
 F 1 "3V3" H 7700 6775 40  0000 C CNN
 	1    7700 6650
 	-1   0    0    1   
 $EndComp
 $Comp
-L 3V3 #PWR05
+L 3V3 #PWR08
 U 1 1 4DC80D4F
 P 7300 6600
-F 0 "#PWR05" H 7300 6700 40  0001 C CNN
+F 0 "#PWR08" H 7300 6700 40  0001 C CNN
 F 1 "3V3" H 7300 6725 40  0000 C CNN
 	1    7300 6600
 	0    1    1    0   
 $EndComp
 $Comp
-L PWR_FLAG #FLG06
+L PWR_FLAG #FLG09
 U 1 1 4DC80677
 P 900 3700
-F 0 "#FLG06" H 900 3970 30  0001 C CNN
+F 0 "#FLG09" H 900 3970 30  0001 C CNN
 F 1 "PWR_FLAG" H 900 3930 30  0000 C CNN
 	1    900  3700
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR07
+L GND #PWR010
 U 1 1 4DC804F4
 P 900 7500
-F 0 "#PWR07" H 900 7500 30  0001 C CNN
+F 0 "#PWR010" H 900 7500 30  0001 C CNN
 F 1 "GND" H 900 7430 30  0001 C CNN
 	1    900  7500
 	1    0    0    -1  
 $EndComp
 $Comp
-L PWR_FLAG #FLG08
+L PWR_FLAG #FLG011
 U 1 1 4DC804C2
-P 1750 6500
-F 0 "#FLG08" H 1750 6770 30  0001 C CNN
-F 1 "PWR_FLAG" H 1750 6730 30  0000 C CNN
-	1    1750 6500
+P 1900 6500
+F 0 "#FLG011" H 1900 6770 30  0001 C CNN
+F 1 "PWR_FLAG" H 1900 6730 30  0000 C CNN
+	1    1900 6500
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -897,10 +973,10 @@ F 2 "PIN_ARRAY_2X1" H 900 7200 60  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L 3V3 #PWR09
+L 3V3 #PWR012
 U 1 1 4DC80254
 P 3750 6650
-F 0 "#PWR09" H 3750 6750 40  0001 C CNN
+F 0 "#PWR012" H 3750 6750 40  0001 C CNN
 F 1 "3V3" H 3750 6775 40  0000 C CNN
 	1    3750 6650
 	0    1    1    0   
@@ -931,10 +1007,10 @@ F 5 "100mA" V 8850 1350 50  0000 C CNN "Field2"
 	0    1    -1   0   
 $EndComp
 $Comp
-L GND #PWR010
+L GND #PWR013
 U 1 1 4DC7A434
 P 8150 1100
-F 0 "#PWR010" H 8150 1100 30  0001 C CNN
+F 0 "#PWR013" H 8150 1100 30  0001 C CNN
 F 1 "GND" H 8150 1030 30  0001 C CNN
 	1    8150 1100
 	0    1    1    0   
@@ -958,10 +1034,10 @@ F 5 "500mA" H 1450 550 50  0000 C CNN "Field2"
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR011
+L 3V3 #PWR014
 U 1 1 4DC7A233
 P 1300 1100
-F 0 "#PWR011" H 1300 1200 40  0001 C CNN
+F 0 "#PWR014" H 1300 1200 40  0001 C CNN
 F 1 "3V3" H 1300 1225 40  0000 C CNN
 	1    1300 1100
 	1    0    0    -1  
@@ -979,10 +1055,10 @@ F 5 "100mA" H 950 1400 50  0000 C CNN "Field2"
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR012
+L 3V3 #PWR015
 U 1 1 4DC79FE6
 P 1350 3550
-F 0 "#PWR012" H 1350 3650 40  0001 C CNN
+F 0 "#PWR015" H 1350 3650 40  0001 C CNN
 F 1 "3V3" H 1350 3675 40  0000 C CNN
 	1    1350 3550
 	-1   0    0    1   
@@ -990,10 +1066,10 @@ $EndComp
 Text Label 1550 3500 1    60   ~ 0
 A-B-DETECT
 $Comp
-L GND #PWR013
+L GND #PWR016
 U 1 1 4DC79F9B
 P 2850 3450
-F 0 "#PWR013" H 2850 3450 30  0001 C CNN
+F 0 "#PWR016" H 2850 3450 30  0001 C CNN
 F 1 "GND" H 2850 3380 30  0001 C CNN
 	1    2850 3450
 	0    1    1    0   
@@ -1102,10 +1178,10 @@ F 6 "39Ohm" H 750 2350 50  0000 C CNN "Field3"
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR014
+L GND #PWR017
 U 1 1 4DC799FC
 P 8950 2650
-F 0 "#PWR014" H 8950 2650 30  0001 C CNN
+F 0 "#PWR017" H 8950 2650 30  0001 C CNN
 F 1 "GND" H 8950 2580 30  0001 C CNN
 	1    8950 2650
 	1    0    0    -1  
@@ -1121,64 +1197,64 @@ F 2 "SM0603" H 8950 2300 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR015
+L GND #PWR018
 U 1 1 4DC790F9
 P 6200 1350
-F 0 "#PWR015" H 6200 1350 30  0001 C CNN
+F 0 "#PWR018" H 6200 1350 30  0001 C CNN
 F 1 "GND" H 6200 1280 30  0001 C CNN
 	1    6200 1350
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR016
+L GND #PWR019
 U 1 1 4DC790AF
 P 7650 5200
-F 0 "#PWR016" H 7650 5200 30  0001 C CNN
+F 0 "#PWR019" H 7650 5200 30  0001 C CNN
 F 1 "GND" H 7650 5130 30  0001 C CNN
 	1    7650 5200
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR017
+L GND #PWR020
 U 1 1 4DC6ABFD
 P 9650 3800
-F 0 "#PWR017" H 9650 3800 30  0001 C CNN
+F 0 "#PWR020" H 9650 3800 30  0001 C CNN
 F 1 "GND" H 9650 3730 30  0001 C CNN
 	1    9650 3800
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR018
+L GND #PWR021
 U 1 1 4DC6A8EB
 P 1150 3650
-F 0 "#PWR018" H 1150 3650 30  0001 C CNN
+F 0 "#PWR021" H 1150 3650 30  0001 C CNN
 F 1 "GND" H 1150 3580 30  0001 C CNN
 	1    1150 3650
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR019
+L GND #PWR022
 U 1 1 4DC6A5F7
 P 1750 7250
-F 0 "#PWR019" H 1750 7250 30  0001 C CNN
+F 0 "#PWR022" H 1750 7250 30  0001 C CNN
 F 1 "GND" H 1750 7180 30  0001 C CNN
 	1    1750 7250
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR020
+L GND #PWR023
 U 1 1 4DC6A5F4
 P 3600 7250
-F 0 "#PWR020" H 3600 7250 30  0001 C CNN
+F 0 "#PWR023" H 3600 7250 30  0001 C CNN
 F 1 "GND" H 3600 7180 30  0001 C CNN
 	1    3600 7250
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR021
+L GND #PWR024
 U 1 1 4DC6A5F0
 P 3100 7250
-F 0 "#PWR021" H 3100 7250 30  0001 C CNN
+F 0 "#PWR024" H 3100 7250 30  0001 C CNN
 F 1 "GND" H 3100 7180 30  0001 C CNN
 	1    3100 7250
 	1    0    0    -1  
@@ -1214,10 +1290,10 @@ F 2 "SM0603" H 3100 7000 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR022
+L GND #PWR025
 U 1 1 4DC6A577
 P 2950 7250
-F 0 "#PWR022" H 2950 7250 30  0001 C CNN
+F 0 "#PWR025" H 2950 7250 30  0001 C CNN
 F 1 "GND" H 2950 7180 30  0001 C CNN
 	1    2950 7250
 	1    0    0    -1  
@@ -1265,16 +1341,6 @@ F 2 "SSOP20" H 9250 6250 60  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L CB3Q3244 IC4
-U 1 1 4DC6A134
-P 9650 6150
-F 0 "IC4" V 9800 6150 60  0000 C CNN
-F 1 "CB3Q3244" H 9450 6000 60  0000 C CNN
-F 2 "SSOP20" H 9650 6150 60  0001 C CNN
-	1    9650 6150
-	0    1    1    0   
-$EndComp
-$Comp
 L C C23
 U 1 1 4DC68E45
 P 7900 5450
@@ -1285,10 +1351,10 @@ F 2 "SM0603" H 7900 5450 60  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR023
+L GND #PWR026
 U 1 1 4DC68E36
 P 8250 5450
-F 0 "#PWR023" H 8250 5450 30  0001 C CNN
+F 0 "#PWR026" H 8250 5450 30  0001 C CNN
 F 1 "GND" H 8250 5380 30  0001 C CNN
 	1    8250 5450
 	0    -1   -1   0   
@@ -1329,19 +1395,19 @@ F 2 "PUSH_BUTTON" H 6700 1350 60  0001 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR024
+L 3V3 #PWR027
 U 1 1 4DC68405
 P 4450 650
-F 0 "#PWR024" H 4450 750 40  0001 C CNN
+F 0 "#PWR027" H 4450 750 40  0001 C CNN
 F 1 "3V3" H 4450 775 40  0000 C CNN
 	1    4450 650 
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR025
+L 3V3 #PWR028
 U 1 1 4DC683FB
 P 5050 950
-F 0 "#PWR025" H 5050 1050 40  0001 C CNN
+F 0 "#PWR028" H 5050 1050 40  0001 C CNN
 F 1 "3V3" H 5050 1075 40  0000 C CNN
 	1    5050 950 
 	1    0    0    -1  
@@ -1367,28 +1433,28 @@ F 2 "PIN_ARRAY_2X1" H 4750 1300 60  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR026
+L GND #PWR029
 U 1 1 4DC665D5
 P 3350 5750
-F 0 "#PWR026" H 3350 5750 30  0001 C CNN
+F 0 "#PWR029" H 3350 5750 30  0001 C CNN
 F 1 "GND" H 3350 5680 30  0001 C CNN
 	1    3350 5750
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR027
+L GND #PWR030
 U 1 1 4DC665D1
 P 3200 5500
-F 0 "#PWR027" H 3200 5500 30  0001 C CNN
+F 0 "#PWR030" H 3200 5500 30  0001 C CNN
 F 1 "GND" H 3200 5430 30  0001 C CNN
 	1    3200 5500
 	1    0    0    -1  
 $EndComp
 $Comp
-L 1V8 #PWR028
+L 1V8 #PWR031
 U 1 1 4DC6650D
 P 3500 5000
-F 0 "#PWR028" H 3500 5140 20  0001 C CNN
+F 0 "#PWR031" H 3500 5140 20  0001 C CNN
 F 1 "1V8" H 3500 5110 30  0000 C CNN
 	1    3500 5000
 	0    -1   -1   0   
@@ -1424,19 +1490,19 @@ F 2 "SM0603" H 2000 4800 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR029
+L 3V3 #PWR032
 U 1 1 4DC662E1
 P 1300 4300
-F 0 "#PWR029" H 1300 4400 40  0001 C CNN
+F 0 "#PWR032" H 1300 4400 40  0001 C CNN
 F 1 "3V3" H 1300 4425 40  0000 C CNN
 	1    1300 4300
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR030
+L GND #PWR033
 U 1 1 4DC66159
 P 950 4700
-F 0 "#PWR030" H 950 4700 30  0001 C CNN
+F 0 "#PWR033" H 950 4700 30  0001 C CNN
 F 1 "GND" H 950 4630 30  0001 C CNN
 	1    950  4700
 	1    0    0    -1  
@@ -1458,10 +1524,10 @@ MOSI
 Text Label 7600 3400 0    60   ~ 0
 SCK
 $Comp
-L GND #PWR031
+L GND #PWR034
 U 1 1 4DC5A389
 P 9250 2150
-F 0 "#PWR031" H 9250 2150 30  0001 C CNN
+F 0 "#PWR034" H 9250 2150 30  0001 C CNN
 F 1 "GND" H 9250 2080 30  0001 C CNN
 	1    9250 2150
 	1    0    0    -1  
@@ -1477,10 +1543,10 @@ F 2 "SM0603" H 10950 1600 60  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L 3V3 #PWR032
+L 3V3 #PWR035
 U 1 1 4DC5A300
 P 10700 1200
-F 0 "#PWR032" H 10700 1300 40  0001 C CNN
+F 0 "#PWR035" H 10700 1300 40  0001 C CNN
 F 1 "3V3" H 10700 1325 40  0000 C CNN
 	1    10700 1200
 	1    0    0    -1  
@@ -1505,13 +1571,11 @@ Text Label 8600 6000 1    60   ~ 0
 CLK_SIM
 Text Label 9000 6000 1    60   ~ 0
 RST_SIM
-Text Label 9400 6000 1    60   ~ 0
-VCC_SIM
 $Comp
-L GND #PWR033
+L GND #PWR036
 U 1 1 4DC55B6C
 P 8800 6750
-F 0 "#PWR033" H 8800 6750 30  0001 C CNN
+F 0 "#PWR036" H 8800 6750 30  0001 C CNN
 F 1 "GND" H 8800 6680 30  0001 C CNN
 	1    8800 6750
 	0    1    1    0   
@@ -1547,28 +1611,28 @@ F 2 "FFC_REBELSIM" H 10900 6500 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR034
+L 3V3 #PWR037
 U 1 1 4DC5061E
 P 2050 4400
-F 0 "#PWR034" H 2050 4500 40  0001 C CNN
+F 0 "#PWR037" H 2050 4500 40  0001 C CNN
 F 1 "3V3" H 2050 4525 40  0000 C CNN
 	1    2050 4400
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR035
+L GND #PWR038
 U 1 1 4D037F90
 P 1550 4900
-F 0 "#PWR035" H 1550 4900 30  0001 C CNN
+F 0 "#PWR038" H 1550 4900 30  0001 C CNN
 F 1 "GND" H 1550 4830 30  0001 C CNN
 	1    1550 4900
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR036
+L GND #PWR039
 U 1 1 4D037F8C
 P 1900 5100
-F 0 "#PWR036" H 1900 5100 30  0001 C CNN
+F 0 "#PWR039" H 1900 5100 30  0001 C CNN
 F 1 "GND" H 1900 5030 30  0001 C CNN
 	1    1900 5100
 	0    1    1    0   
@@ -1591,7 +1655,7 @@ Text Notes 10350 6000 0    100  ~ 20
 PHONE
 Text Notes 10350 4300 0    100  ~ 20
 SIM
-Text Notes 2000 6200 0    100  ~ 20
+Text Notes 2250 6400 0    100  ~ 20
 POWER
 Text Notes 3450 3900 0    100  ~ 20
 XTAL
@@ -1624,10 +1688,10 @@ F 2 "SM0603" H 3500 5400 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR037
+L GND #PWR040
 U 1 1 4D020E3B
 P 1850 3950
-F 0 "#PWR037" H 1850 3950 30  0001 C CNN
+F 0 "#PWR040" H 1850 3950 30  0001 C CNN
 F 1 "GND" H 1850 3880 30  0001 C CNN
 	1    1850 3950
 	0    1    1    0   
@@ -1683,10 +1747,10 @@ F 2 "SM0603" H 2400 4900 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR038
+L GND #PWR041
 U 1 1 4D020854
 P 4450 850
-F 0 "#PWR038" H 4450 850 30  0001 C CNN
+F 0 "#PWR041" H 4450 850 30  0001 C CNN
 F 1 "GND" H 4450 780 30  0001 C CNN
 	1    4450 850 
 	-1   0    0    1   
@@ -1730,10 +1794,10 @@ I/O_PHONE
 Text Label 10000 6350 0    60   ~ 0
 RST_PHONE
 $Comp
-L GND #PWR039
+L GND #PWR042
 U 1 1 4CF7CFEB
 P 10100 6750
-F 0 "#PWR039" H 10100 6750 30  0001 C CNN
+F 0 "#PWR042" H 10100 6750 30  0001 C CNN
 F 1 "GND" H 10100 6680 30  0001 C CNN
 	1    10100 6750
 	0    1    1    0   
@@ -1751,10 +1815,10 @@ RST_SIM
 Text Label 9150 4850 2    60   ~ 0
 VCC_SIM
 $Comp
-L GND #PWR040
+L GND #PWR043
 U 1 1 4CF7C43B
 P 10800 4850
-F 0 "#PWR040" H 10800 4850 30  0001 C CNN
+F 0 "#PWR043" H 10800 4850 30  0001 C CNN
 F 1 "GND" H 10800 4780 30  0001 C CNN
 	1    10800 4850
 	0    -1   -1   0   
@@ -1818,10 +1882,10 @@ DRXD
 Text Label 7600 3800 0    60   ~ 0
 DTXD
 $Comp
-L 3V3 #PWR041
+L 3V3 #PWR044
 U 1 1 4CE9AE51
 P 9300 2800
-F 0 "#PWR041" H 9300 2900 40  0001 C CNN
+F 0 "#PWR044" H 9300 2900 40  0001 C CNN
 F 1 "3V3" H 9300 2925 40  0000 C CNN
 	1    9300 2800
 	1    0    0    -1  
@@ -1837,10 +1901,10 @@ F 2 "PIN_ARRAY-6X1" H 9950 3100 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR042
+L GND #PWR045
 U 1 1 4CE9AA96
 P 9450 2700
-F 0 "#PWR042" 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
 	1    9450 2700
 	-1   0    0    1   
@@ -1855,19 +1919,19 @@ Text Label 4450 2200 0    60   ~ 0
 TDI
 NoConn ~ 5050 2600
 $Comp
-L GND #PWR043
+L GND #PWR046
 U 1 1 4CE9A7C1
 P 3900 2000
-F 0 "#PWR043" 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
 	1    3900 2000
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR044
+L 3V3 #PWR047
 U 1 1 4CE9A701
 P 1600 950
-F 0 "#PWR044" 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
 	1    1600 950 
 	1    0    0    -1  
@@ -1925,16 +1989,15 @@ $EndComp
 NoConn ~ 2900 1900
 NoConn ~ 2900 1800
 $Comp
-L 1V8 #PWR045
+L 1V8 #PWR048
 U 1 1 4CE94C54
 P 3200 4850
-F 0 "#PWR045" 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
 	1    3200 4850
 	1    0    0    -1  
 $EndComp
 NoConn ~ 7450 4500
-NoConn ~ 7450 2200
 NoConn ~ 7450 2100
 Text Label 7600 4700 0    60   ~ 0
 I/O_SIM
@@ -1955,19 +2018,19 @@ DDM
 Text Label 4350 2900 0    60   ~ 0
 DDP
 $Comp
-L 3V3 #PWR046
+L 3V3 #PWR049
 U 1 1 4CE91A30
 P 750 4100
-F 0 "#PWR046" 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
 	1    750  4100
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR047
+L GND #PWR050
 U 1 1 4CE9163C
 P 3600 3400
-F 0 "#PWR047" 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
 	1    3600 3400
 	0    1    1    0   
@@ -2003,10 +2066,10 @@ F 2 "Q_49U3HMS" H 4450 3400 60  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR048
+L GND #PWR051
 U 1 1 4CE8FFA5
 P 4750 6150
-F 0 "#PWR048" 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
 	1    4750 6150
 	1    0    0    -1