ID1 slot (named SAM, even if not entirely correct) added in schema (now v1.1)

1 files changed, 299 insertions, 229 deletions

diff --git a/hardware/kicad/SIMtrace.sch b/hardware/kicad/SIMtrace.sch
index 72e82ad..e80cb51 100644
--- a/hardware/kicad/SIMtrace.sch
+++ b/hardware/kicad/SIMtrace.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Do 23 Jun 2011 12:55:36 CEST
+EESchema Schematic File Version 2  date Fr 01 Jul 2011 10:59:40 CEST
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -39,16 +39,32 @@ $Descr A4 11700 8267
 encoding utf-8
 Sheet 1 1
 Title "SIMtrace hardware"
-Date "23 jun 2011"
-Rev "1.0"
+Date "1 jul 2011"
+Rev "1.1"
 Comp "osmocom"
 Comment1 "CC-BY-SA"
 Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Text Label 2650 5600 3    60   ~ 0
-VCC_SIM
+Text Label 7600 4500 0    60   ~ 0
+SW_SAM
+Wire Wire Line
+	7450 4500 8350 4500
+Wire Wire Line
+	10500 5250 10950 5250
+Wire Wire Line
+	10500 5050 10950 5050
+Wire Wire Line
+	9400 5150 8950 5150
+Wire Wire Line
+	7450 3900 8700 3900
+Connection ~ 9650 2550
+Wire Wire Line
+	9650 2550 9650 3350
+Connection ~ 9750 2650
+Wire Wire Line
+	9750 2650 9750 3250
 Connection ~ 2250 5450
 Wire Wire Line
 	2650 6200 2650 5450
@@ -95,11 +111,7 @@ Wire Wire Line
 Wire Wire Line
 	5050 1000 5050 950 
 Wire Wire Line
-	9100 4000 9100 3150
-Wire Wire Line
-	9800 3900 9200 3900
-Wire Wire Line
-	7450 3800 9200 3800
+	9750 3250 10350 3250
 Wire Wire Line
 	1750 6500 1750 6800
 Wire Wire Line
@@ -109,7 +121,7 @@ Wire Wire Line
 Wire Wire Line
 	500  2200 800  2200
 Wire Wire Line
-	10300 4550 10750 4550
+	10450 3800 10900 3800
 Connection ~ 1150 3550
 Wire Wire Line
 	1150 3550 900  3550
@@ -148,7 +160,7 @@ Wire Wire Line
 Wire Wire Line
 	4800 2700 4800 2900
 Wire Wire Line
-	8950 2550 8950 2650
+	9100 2150 9100 2250
 Connection ~ 7550 5200
 Wire Wire Line
 	7650 5200 7450 5200
@@ -178,9 +190,9 @@ Wire Wire Line
 	9900 6250 10550 6250
 Wire Wire Line
 	7450 3300 7900 3300
-Connection ~ 10700 1350
+Connection ~ 10850 950 
 Wire Wire Line
-	10950 1350 10700 1350
+	11100 950  10850 950 
 Wire Wire Line
 	6200 1350 6400 1350
 Wire Wire Line
@@ -232,17 +244,17 @@ Wire Wire Line
 Wire Wire Line
 	5050 4100 750  4100
 Wire Wire Line
-	10550 2050 10950 2050
+	10700 1650 11100 1650
 Wire Wire Line
-	9350 1750 8750 1750
+	9500 1350 8900 1350
 Wire Wire Line
 	7450 3700 7900 3700
 Wire Wire Line
 	7450 3500 7900 3500
 Wire Wire Line
-	9250 2150 9250 2050
+	9400 1750 9400 1650
 Wire Wire Line
-	9250 2050 9350 2050
+	9400 1650 9500 1650
 Wire Wire Line
 	8200 6550 8200 5750
 Wire Wire Line
@@ -283,7 +295,7 @@ Wire Wire Line
 Wire Wire Line
 	2250 1600 2900 1600
 Wire Wire Line
-	9300 4550 8800 4550
+	9450 3800 8950 3800
 Wire Wire Line
 	7450 4300 8350 4300
 Connection ~ 8250 4400
@@ -310,13 +322,13 @@ Connection ~ 8200 2500
 Wire Wire Line
 	7450 2000 8200 2000
 Wire Wire Line
-	9300 2800 9300 3050
+	10200 2200 10200 2450
 Wire Wire Line
-	9300 3050 9600 3050
+	10200 2450 10500 2450
 Wire Wire Line
-	9600 3350 9450 3350
+	10500 2750 10350 2750
 Wire Wire Line
-	9600 2850 9450 2850
+	10500 2250 10350 2250
 Wire Wire Line
 	8350 4400 7450 4400
 Connection ~ 3900 1800
@@ -443,11 +455,11 @@ Wire Wire Line
 	3800 1900 3900 1900
 Connection ~ 3900 1900
 Wire Wire Line
-	9450 2850 9450 2700
+	10350 2250 10350 2100
 Wire Wire Line
-	9600 2950 9450 2950
+	10500 2350 10350 2350
 Wire Wire Line
-	10350 4850 10800 4850
+	10500 4100 10950 4100
 Wire Wire Line
 	8350 2500 7450 2500
 Wire Wire Line
@@ -460,7 +472,7 @@ Connection ~ 8200 4200
 Wire Wire Line
 	8200 4700 7450 4700
 Wire Wire Line
-	9450 2950 9450 3350
+	10350 2350 10350 2750
 Wire Wire Line
 	2800 1700 2900 1700
 Wire Wire Line
@@ -499,11 +511,11 @@ Connection ~ 4900 5400
 Connection ~ 4900 4300
 Connection ~ 4900 4500
 Wire Wire Line
-	8800 4950 9250 4950
+	8950 4200 9400 4200
 Wire Wire Line
-	8800 5050 9250 5050
+	8950 4300 9400 4300
 Wire Wire Line
-	10800 5050 10350 5050
+	10950 4300 10500 4300
 Wire Wire Line
 	10100 6750 10550 6750
 Wire Wire Line
@@ -520,19 +532,19 @@ Wire Wire Line
 Wire Wire Line
 	8600 6450 8600 5750
 Wire Wire Line
-	10700 1200 10700 1750
+	10850 800  10850 1350
 Wire Wire Line
-	10700 1750 10550 1750
+	10850 1350 10700 1350
 Wire Wire Line
-	10950 1850 10550 1850
+	11100 1450 10700 1450
 Wire Wire Line
 	7450 3400 7900 3400
 Wire Wire Line
 	7450 3600 7900 3600
 Wire Wire Line
-	9350 1850 8750 1850
+	9500 1450 8900 1450
 Wire Wire Line
-	10550 1950 10950 1950
+	10700 1550 11100 1550
 Wire Wire Line
 	950  4200 950  4100
 Connection ~ 950  4100
@@ -581,7 +593,7 @@ Wire Wire Line
 Wire Wire Line
 	7000 1350 7650 1350
 Wire Wire Line
-	9350 1950 8750 1950
+	9500 1550 8900 1550
 Wire Wire Line
 	7450 2900 8350 2900
 Wire Wire Line
@@ -601,14 +613,13 @@ Wire Wire Line
 Wire Wire Line
 	4700 3000 4700 2900
 Wire Wire Line
-	9800 3800 9650 3800
-Connection ~ 9200 3800
+	10350 3150 10200 3150
 Wire Wire Line
 	7450 5300 7550 5300
 Connection ~ 7550 5300
 Wire Wire Line
-	8950 2050 8950 1950
-Connection ~ 8950 1950
+	9100 1650 9100 1550
+Connection ~ 9100 1550
 Wire Wire Line
 	3300 3050 3300 2900
 Connection ~ 3300 2900
@@ -655,7 +666,7 @@ Wire Wire Line
 Wire Wire Line
 	1700 2200 1500 2200
 Wire Wire Line
-	9250 4850 8800 4850
+	9400 4100 8950 4100
 Wire Wire Line
 	1050 6500 650  6500
 Wire Wire Line
@@ -666,16 +677,7 @@ Wire Wire Line
 	1600 6800 1600 6500
 Connection ~ 1600 6650
 Wire Wire Line
-	9100 4000 9800 4000
-Connection ~ 9100 3900
-Wire Wire Line
-	7450 3900 9100 3900
-Wire Wire Line
-	9200 3900 9200 3250
-Wire Wire Line
-	9200 3250 9600 3250
-Wire Wire Line
-	9100 3150 9600 3150
+	9650 3350 10350 3350
 Wire Wire Line
 	5050 1700 5050 1600
 Wire Wire Line
@@ -714,11 +716,80 @@ Wire Wire Line
 	900  6200 900  5450
 Wire Wire Line
 	2250 5450 2250 5650
+Wire Wire Line
+	8800 2650 8800 3800
+Wire Wire Line
+	8800 2650 10500 2650
+Wire Wire Line
+	8700 3900 8700 2550
+Wire Wire Line
+	8700 2550 10500 2550
+Wire Wire Line
+	8800 3800 7450 3800
+Wire Wire Line
+	9400 5050 8950 5050
+Wire Wire Line
+	9400 5250 8950 5250
+Wire Wire Line
+	10450 4800 10950 4800
+Wire Wire Line
+	9450 4800 8950 4800
+Text Label 10550 5250 0    60   ~ 0
+I/O_SIM
+Text Label 8950 5250 0    60   ~ 0
+CLK_SIM
+Text Label 8950 5150 0    60   ~ 0
+RST_SIM
+Text Label 8950 5050 0    60   ~ 0
+VCC_SIM
 $Comp
 L GND #PWR01
+U 1 1 4E0D8B6C
+P 10950 5050
+F 0 "#PWR01" H 10950 5050 30  0001 C CNN
+F 1 "GND" H 10950 4980 30  0001 C CNN
+	1    10950 5050
+	0    -1   -1   0   
+$EndComp
+$Comp
+L GND #PWR02
+U 1 1 4E0D8B67
+P 10950 4800
+F 0 "#PWR02" H 10950 4800 30  0001 C CNN
+F 1 "GND" H 10950 4730 30  0001 C CNN
+	1    10950 4800
+	0    -1   -1   0   
+$EndComp
+Text Label 8950 4800 0    60   ~ 0
+SW_SAM
+NoConn ~ 9400 5350
+NoConn ~ 10500 5350
+NoConn ~ 10500 5150
+$Comp
+L ISO7816_NO P5
+U 2 1 4E0D8A18
+P 9950 4800
+F 0 "P5" H 9800 4950 60  0000 C CNN
+F 1 "SAM" H 10100 4950 60  0000 C CNN
+	2    9950 4800
+	1    0    0    -1  
+$EndComp
+$Comp
+L ISO7816_NO P5
+U 1 1 4E0D8A0F
+P 9950 5200
+F 0 "P5" H 9800 5450 60  0000 C CNN
+F 1 "SAM" H 10100 5450 60  0000 C CNN
+	1    9950 5200
+	1    0    0    -1  
+$EndComp
+Text Label 2650 5600 3    60   ~ 0
+VCC_SIM
+$Comp
+L GND #PWR03
 U 1 1 4DFF996C
 P 2250 6150
-F 0 "#PWR01" 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
 	1    2250 6150
 	1    0    0    -1  
@@ -734,10 +805,10 @@ F 2 "SM0603" H 2250 5850 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR02
+L GND #PWR04
 U 1 1 4DFF9910
 P 1650 6100
-F 0 "#PWR02" 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
 	1    1650 6100
 	1    0    0    -1  
@@ -783,10 +854,10 @@ F 2 "SOT26" H 2500 6750 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR03
+L GND #PWR05
 U 1 1 4DFF74F0
 P 8300 5100
-F 0 "#PWR03" 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
 	1    8300 5100
 	0    -1   -1   0   
@@ -812,10 +883,10 @@ F 2 "SM0603" H 7950 4900 60  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR04
+L GND #PWR06
 U 1 1 4DFF73E0
 P 8400 1600
-F 0 "#PWR04" 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
 	1    8400 1600
 	-1   0    0    1   
@@ -833,23 +904,23 @@ $EndComp
 Text Label 7600 2300 0    60   ~ 0
 VCC_PHONE
 $Comp
-L GND #PWR05
+L GND #PWR07
 U 1 1 4DFDBB3F
-P 10750 4550
-F 0 "#PWR05" H 10750 4550 30  0001 C CNN
-F 1 "GND" H 10750 4480 30  0001 C CNN
-	1    10750 4550
+P 10900 3800
+F 0 "#PWR07" H 10900 3800 30  0001 C CNN
+F 1 "GND" H 10900 3730 30  0001 C CNN
+	1    10900 3800
 	0    -1   -1   0   
 $EndComp
 NoConn ~ 7450 1800
 $Comp
 L JACK_2.5 J2
 U 1 1 4DCBE233
-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
-	1    10150 3900
+P 10700 3250
+F 0 "J2" H 10650 3400 50  0000 L BNN
+F 1 "JACK_2.5" H 10550 3050 50  0000 L BNN
+F 2 "JACK_2.5" H 10700 3250 60  0001 C CNN
+	1    10700 3250
 	-1   0    0    -1  
 $EndComp
 Text Label 700  6500 0    60   ~ 0
@@ -879,21 +950,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
-	1    9800 5000
+P 9950 4250
+F 0 "P4" H 9800 4500 60  0000 C CNN
+F 1 "SIM" H 10100 4500 60  0000 C CNN
+F 2 "SIM_AMPHENOL" H 9950 4250 60  0001 C CNN
+	1    9950 4250
 	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
-	2    9800 4550
+P 9950 3800
+F 0 "P4" H 9800 3950 60  0000 C CNN
+F 1 "SIM" H 10100 3950 60  0000 C CNN
+F 2 "SIM_AMPHENOL" H 9950 3800 60  0001 C CNN
+	2    9950 3800
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -917,55 +988,55 @@ F 2 "SM0603" H 950 4400 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR06
+L 3V3 #PWR08
 U 1 1 4DC820B7
 P 9600 6750
-F 0 "#PWR06" H 9600 6850 40  0001 C CNN
+F 0 "#PWR08" 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 #PWR07
+L 3V3 #PWR09
 U 1 1 4DC815E7
 P 7700 6650
-F 0 "#PWR07" H 7700 6750 40  0001 C CNN
+F 0 "#PWR09" 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 #PWR08
+L 3V3 #PWR010
 U 1 1 4DC80D4F
 P 7300 6600
-F 0 "#PWR08" H 7300 6700 40  0001 C CNN
+F 0 "#PWR010" 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 #FLG09
+L PWR_FLAG #FLG011
 U 1 1 4DC80677
 P 900 3700
-F 0 "#FLG09" H 900 3970 30  0001 C CNN
+F 0 "#FLG011" 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 #PWR010
+L GND #PWR012
 U 1 1 4DC804F4
 P 900 7500
-F 0 "#PWR010" H 900 7500 30  0001 C CNN
+F 0 "#PWR012" 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 #FLG011
+L PWR_FLAG #FLG013
 U 1 1 4DC804C2
 P 1900 6500
-F 0 "#FLG011" H 1900 6770 30  0001 C CNN
+F 0 "#FLG013" 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  
@@ -981,10 +1052,10 @@ F 2 "PIN_ARRAY_2X1" H 900 7200 60  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L 3V3 #PWR012
+L 3V3 #PWR014
 U 1 1 4DC80254
 P 3750 6650
-F 0 "#PWR012" H 3750 6750 40  0001 C CNN
+F 0 "#PWR014" H 3750 6750 40  0001 C CNN
 F 1 "3V3" H 3750 6775 40  0000 C CNN
 	1    3750 6650
 	0    1    1    0   
@@ -1015,10 +1086,10 @@ F 5 "100mA" V 8850 1350 50  0000 C CNN "Field2"
 	0    1    -1   0   
 $EndComp
 $Comp
-L GND #PWR013
+L GND #PWR015
 U 1 1 4DC7A434
 P 8150 1100
-F 0 "#PWR013" H 8150 1100 30  0001 C CNN
+F 0 "#PWR015" H 8150 1100 30  0001 C CNN
 F 1 "GND" H 8150 1030 30  0001 C CNN
 	1    8150 1100
 	0    1    1    0   
@@ -1042,10 +1113,10 @@ F 5 "500mA" H 1450 550 50  0000 C CNN "Field2"
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR014
+L 3V3 #PWR016
 U 1 1 4DC7A233
 P 1300 1100
-F 0 "#PWR014" H 1300 1200 40  0001 C CNN
+F 0 "#PWR016" H 1300 1200 40  0001 C CNN
 F 1 "3V3" H 1300 1225 40  0000 C CNN
 	1    1300 1100
 	1    0    0    -1  
@@ -1063,10 +1134,10 @@ F 5 "100mA" H 950 1400 50  0000 C CNN "Field2"
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR015
+L 3V3 #PWR017
 U 1 1 4DC79FE6
 P 1350 3550
-F 0 "#PWR015" H 1350 3650 40  0001 C CNN
+F 0 "#PWR017" H 1350 3650 40  0001 C CNN
 F 1 "3V3" H 1350 3675 40  0000 C CNN
 	1    1350 3550
 	-1   0    0    1   
@@ -1074,10 +1145,10 @@ $EndComp
 Text Label 1550 3500 1    60   ~ 0
 A-B-DETECT
 $Comp
-L GND #PWR016
+L GND #PWR018
 U 1 1 4DC79F9B
 P 2850 3450
-F 0 "#PWR016" H 2850 3450 30  0001 C CNN
+F 0 "#PWR018" H 2850 3450 30  0001 C CNN
 F 1 "GND" H 2850 3380 30  0001 C CNN
 	1    2850 3450
 	0    1    1    0   
@@ -1186,83 +1257,83 @@ F 6 "39Ohm" H 750 2350 50  0000 C CNN "Field3"
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR017
+L GND #PWR019
 U 1 1 4DC799FC
-P 8950 2650
-F 0 "#PWR017" H 8950 2650 30  0001 C CNN
-F 1 "GND" H 8950 2580 30  0001 C CNN
-	1    8950 2650
+P 9100 2250
+F 0 "#PWR019" H 9100 2250 30  0001 C CNN
+F 1 "GND" H 9100 2180 30  0001 C CNN
+	1    9100 2250
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R17
 U 1 1 4DC799F2
-P 8950 2300
-F 0 "R17" V 9030 2300 50  0000 C CNN
-F 1 "10K" V 8950 2300 50  0000 C CNN
-F 2 "SM0603" H 8950 2300 60  0001 C CNN
-	1    8950 2300
+P 9100 1900
+F 0 "R17" V 9180 1900 50  0000 C CNN
+F 1 "10K" V 9100 1900 50  0000 C CNN
+F 2 "SM0603" H 9100 1900 60  0001 C CNN
+	1    9100 1900
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR018
+L GND #PWR020
 U 1 1 4DC790F9
 P 6200 1350
-F 0 "#PWR018" H 6200 1350 30  0001 C CNN
+F 0 "#PWR020" 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 #PWR019
+L GND #PWR021
 U 1 1 4DC790AF
 P 7650 5200
-F 0 "#PWR019" H 7650 5200 30  0001 C CNN
+F 0 "#PWR021" 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 #PWR020
+L GND #PWR022
 U 1 1 4DC6ABFD
-P 9650 3800
-F 0 "#PWR020" H 9650 3800 30  0001 C CNN
-F 1 "GND" H 9650 3730 30  0001 C CNN
-	1    9650 3800
+P 10200 3150
+F 0 "#PWR022" H 10200 3150 30  0001 C CNN
+F 1 "GND" H 10200 3080 30  0001 C CNN
+	1    10200 3150
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR021
+L GND #PWR023
 U 1 1 4DC6A8EB
 P 1150 3650
-F 0 "#PWR021" H 1150 3650 30  0001 C CNN
+F 0 "#PWR023" 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 #PWR022
+L GND #PWR024
 U 1 1 4DC6A5F7
 P 1750 7250
-F 0 "#PWR022" H 1750 7250 30  0001 C CNN
+F 0 "#PWR024" 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 #PWR023
+L GND #PWR025
 U 1 1 4DC6A5F4
 P 3600 7250
-F 0 "#PWR023" H 3600 7250 30  0001 C CNN
+F 0 "#PWR025" 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 #PWR024
+L GND #PWR026
 U 1 1 4DC6A5F0
 P 3100 7250
-F 0 "#PWR024" H 3100 7250 30  0001 C CNN
+F 0 "#PWR026" H 3100 7250 30  0001 C CNN
 F 1 "GND" H 3100 7180 30  0001 C CNN
 	1    3100 7250
 	1    0    0    -1  
@@ -1298,10 +1369,10 @@ F 2 "SM0603" H 3100 7000 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR025
+L GND #PWR027
 U 1 1 4DC6A577
 P 2950 7250
-F 0 "#PWR025" H 2950 7250 30  0001 C CNN
+F 0 "#PWR027" H 2950 7250 30  0001 C CNN
 F 1 "GND" H 2950 7180 30  0001 C CNN
 	1    2950 7250
 	1    0    0    -1  
@@ -1359,10 +1430,10 @@ F 2 "SM0603" H 7900 5450 60  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR026
+L GND #PWR028
 U 1 1 4DC68E36
 P 8250 5450
-F 0 "#PWR026" H 8250 5450 30  0001 C CNN
+F 0 "#PWR028" H 8250 5450 30  0001 C CNN
 F 1 "GND" H 8250 5380 30  0001 C CNN
 	1    8250 5450
 	0    -1   -1   0   
@@ -1385,10 +1456,10 @@ VCC_PHONE
 NoConn ~ 10550 6650
 Text Label 7600 2900 0    60   ~ 0
 I/O_SW
-NoConn ~ 10350 4950
+NoConn ~ 10500 4200
 Text Label 7600 3300 0    60   ~ 0
 WP
-Text Label 8850 1950 0    60   ~ 0
+Text Label 9000 1550 0    60   ~ 0
 WP
 Text Label 7050 1350 0    60   ~ 0
 BOOTLOADER
@@ -1403,19 +1474,19 @@ F 2 "PUSH_BUTTON" H 6700 1350 60  0001 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR027
+L 3V3 #PWR029
 U 1 1 4DC68405
 P 4450 650
-F 0 "#PWR027" H 4450 750 40  0001 C CNN
+F 0 "#PWR029" 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 #PWR028
+L 3V3 #PWR030
 U 1 1 4DC683FB
 P 5050 950
-F 0 "#PWR028" H 5050 1050 40  0001 C CNN
+F 0 "#PWR030" H 5050 1050 40  0001 C CNN
 F 1 "3V3" H 5050 1075 40  0000 C CNN
 	1    5050 950 
 	1    0    0    -1  
@@ -1441,28 +1512,28 @@ F 2 "PIN_ARRAY_2X1" H 4750 1300 60  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR029
+L GND #PWR031
 U 1 1 4DC665D5
 P 3350 5750
-F 0 "#PWR029" H 3350 5750 30  0001 C CNN
+F 0 "#PWR031" 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 #PWR030
+L GND #PWR032
 U 1 1 4DC665D1
 P 3200 5500
-F 0 "#PWR030" H 3200 5500 30  0001 C CNN
+F 0 "#PWR032" 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 #PWR031
+L 1V8 #PWR033
 U 1 1 4DC6650D
 P 3500 5000
-F 0 "#PWR031" H 3500 5140 20  0001 C CNN
+F 0 "#PWR033" H 3500 5140 20  0001 C CNN
 F 1 "1V8" H 3500 5110 30  0000 C CNN
 	1    3500 5000
 	0    -1   -1   0   
@@ -1498,30 +1569,30 @@ F 2 "SM0603" H 2000 4800 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR032
+L 3V3 #PWR034
 U 1 1 4DC662E1
 P 1300 4300
-F 0 "#PWR032" H 1300 4400 40  0001 C CNN
+F 0 "#PWR034" 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 #PWR033
+L GND #PWR035
 U 1 1 4DC66159
 P 950 4700
-F 0 "#PWR033" H 950 4700 30  0001 C CNN
+F 0 "#PWR035" H 950 4700 30  0001 C CNN
 F 1 "GND" H 950 4630 30  0001 C CNN
 	1    950  4700
 	1    0    0    -1  
 $EndComp
-Text Label 10700 2050 0    60   ~ 0
+Text Label 10850 1650 0    60   ~ 0
 MOSI
-Text Label 10700 1950 0    60   ~ 0
+Text Label 10850 1550 0    60   ~ 0
 SCK
-Text Label 8850 1850 0    60   ~ 0
+Text Label 9000 1450 0    60   ~ 0
 MISO
-Text Label 8850 1750 0    60   ~ 0
+Text Label 9000 1350 0    60   ~ 0
 CS
 Text Label 7600 3700 0    60   ~ 0
 CS
@@ -1532,43 +1603,43 @@ MOSI
 Text Label 7600 3400 0    60   ~ 0
 SCK
 $Comp
-L GND #PWR034
+L GND #PWR036
 U 1 1 4DC5A389
-P 9250 2150
-F 0 "#PWR034" H 9250 2150 30  0001 C CNN
-F 1 "GND" H 9250 2080 30  0001 C CNN
-	1    9250 2150
+P 9400 1750
+F 0 "#PWR036" H 9400 1750 30  0001 C CNN
+F 1 "GND" H 9400 1680 30  0001 C CNN
+	1    9400 1750
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R18
 U 1 1 4DC5A30D
-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
-	1    10950 1600
+P 11100 1200
+F 0 "R18" V 11180 1200 50  0000 C CNN
+F 1 "10K" V 11100 1200 50  0000 C CNN
+F 2 "SM0603" H 11100 1200 60  0001 C CNN
+	1    11100 1200
 	-1   0    0    1   
 $EndComp
 $Comp
-L 3V3 #PWR035
+L 3V3 #PWR037
 U 1 1 4DC5A300
-P 10700 1200
-F 0 "#PWR035" H 10700 1300 40  0001 C CNN
-F 1 "3V3" H 10700 1325 40  0000 C CNN
-	1    10700 1200
+P 10850 800
+F 0 "#PWR037" H 10850 900 40  0001 C CNN
+F 1 "3V3" H 10850 925 40  0000 C CNN
+	1    10850 800 
 	1    0    0    -1  
 $EndComp
-Text Notes 9650 950  0    100  ~ 20
+Text Notes 9800 950  0    100  ~ 20
 MEMORY
 $Comp
 L FLASH_SPI U1
 U 1 1 4DC5A250
-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 "SOIC8" H 9950 1900 60  0001 C CNN
-	1    9950 1900
+P 10100 1500
+F 0 "U1" H 10100 1800 60  0000 C CNN
+F 1 "FLASH" H 10100 1200 60  0000 C CNN
+F 2 "SOIC8" H 10100 1500 60  0001 C CNN
+	1    10100 1500
 	1    0    0    -1  
 $EndComp
 Text Label 9900 5600 0    60   ~ 0
@@ -1580,10 +1651,10 @@ CLK_SIM
 Text Label 9000 6000 1    60   ~ 0
 RST_SIM
 $Comp
-L GND #PWR036
+L GND #PWR038
 U 1 1 4DC55B6C
 P 8800 6750
-F 0 "#PWR036" H 8800 6750 30  0001 C CNN
+F 0 "#PWR038" H 8800 6750 30  0001 C CNN
 F 1 "GND" H 8800 6680 30  0001 C CNN
 	1    8800 6750
 	0    1    1    0   
@@ -1619,28 +1690,28 @@ F 2 "FFC_REBELSIM" H 10900 6500 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR037
+L 3V3 #PWR039
 U 1 1 4DC5061E
 P 2050 4400
-F 0 "#PWR037" H 2050 4500 40  0001 C CNN
+F 0 "#PWR039" 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 #PWR038
+L GND #PWR040
 U 1 1 4D037F90
 P 1550 4900
-F 0 "#PWR038" H 1550 4900 30  0001 C CNN
+F 0 "#PWR040" 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 #PWR039
+L GND #PWR041
 U 1 1 4D037F8C
 P 1900 5100
-F 0 "#PWR039" H 1900 5100 30  0001 C CNN
+F 0 "#PWR041" H 1900 5100 30  0001 C CNN
 F 1 "GND" H 1900 5030 30  0001 C CNN
 	1    1900 5100
 	0    1    1    0   
@@ -1657,12 +1728,12 @@ F 2 "SM0603" H 1550 4600 60  0001 C CNN
 $EndComp
 Text Notes 6600 7050 0    100  ~ 20
 LED
-Text Notes 9550 3600 0    100  ~ 20
+Text Notes 10450 3000 0    100  ~ 20
 DEBUG
 Text Notes 10350 6000 0    100  ~ 20
 PHONE
-Text Notes 10350 4300 0    100  ~ 20
-SIM
+Text Notes 8450 4650 0    100  ~ 20
+SIM/SAM SLOTS
 Text Notes 2250 6400 0    100  ~ 20
 POWER
 Text Notes 3450 3900 0    100  ~ 20
@@ -1696,10 +1767,10 @@ F 2 "SM0603" H 3500 5400 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR040
+L GND #PWR042
 U 1 1 4D020E3B
 P 1850 3950
-F 0 "#PWR040" H 1850 3950 30  0001 C CNN
+F 0 "#PWR042" H 1850 3950 30  0001 C CNN
 F 1 "GND" H 1850 3880 30  0001 C CNN
 	1    1850 3950
 	0    1    1    0   
@@ -1755,10 +1826,10 @@ F 2 "SM0603" H 2400 4900 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR041
+L GND #PWR043
 U 1 1 4D020854
 P 4450 850
-F 0 "#PWR041" H 4450 850 30  0001 C CNN
+F 0 "#PWR043" H 4450 850 30  0001 C CNN
 F 1 "GND" H 4450 780 30  0001 C CNN
 	1    4450 850 
 	-1   0    0    1   
@@ -1802,10 +1873,10 @@ I/O_PHONE
 Text Label 10000 6350 0    60   ~ 0
 RST_PHONE
 $Comp
-L GND #PWR042
+L GND #PWR044
 U 1 1 4CF7CFEB
 P 10100 6750
-F 0 "#PWR042" H 10100 6750 30  0001 C CNN
+F 0 "#PWR044" H 10100 6750 30  0001 C CNN
 F 1 "GND" H 10100 6680 30  0001 C CNN
 	1    10100 6750
 	0    1    1    0   
@@ -1814,24 +1885,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 10900 4300 2    60   ~ 0
 I/O_SIM
-Text Label 9150 5050 2    60   ~ 0
+Text Label 9300 4300 2    60   ~ 0
 CLK_SIM
-Text Label 9150 4950 2    60   ~ 0
+Text Label 9300 4200 2    60   ~ 0
 RST_SIM
-Text Label 9150 4850 2    60   ~ 0
+Text Label 9300 4100 2    60   ~ 0
 VCC_SIM
 $Comp
-L GND #PWR043
+L GND #PWR045
 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
-	1    10800 4850
+P 10950 4100
+F 0 "#PWR045" H 10950 4100 30  0001 C CNN
+F 1 "GND" H 10950 4030 30  0001 C CNN
+	1    10950 4100
 	0    -1   -1   0   
 $EndComp
-Text Label 8900 4550 0    60   ~ 0
+Text Label 8950 3800 0    60   ~ 0
 SW_SIM
 Text Label 7600 3000 0    60   ~ 0
 LED_G
@@ -1853,8 +1924,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 ~ 9400 4400
+NoConn ~ 10500 4400
 $Comp
 L LED D5
 U 1 1 4CF5471F
@@ -1890,31 +1961,31 @@ DRXD
 Text Label 7600 3800 0    60   ~ 0
 DTXD
 $Comp
-L 3V3 #PWR044
+L 3V3 #PWR046
 U 1 1 4CE9AE51
-P 9300 2800
-F 0 "#PWR044" H 9300 2900 40  0001 C CNN
-F 1 "3V3" H 9300 2925 40  0000 C CNN
-	1    9300 2800
+P 10200 2200
+F 0 "#PWR046" H 10200 2300 40  0001 C CNN
+F 1 "3V3" H 10200 2325 40  0000 C CNN
+	1    10200 2200
 	1    0    0    -1  
 $EndComp
 $Comp
 L DEBUG P2
 U 1 1 4CE9ADCF
-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
-	1    9950 3100
+P 10850 2500
+F 0 "P2" H 10850 2850 60  0000 C CNN
+F 1 "DEBUG" V 11050 2500 60  0000 C CNN
+F 2 "PIN_ARRAY-6X1" H 10850 2500 60  0001 C CNN
+	1    10850 2500
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR045
+L GND #PWR047
 U 1 1 4CE9AA96
-P 9450 2700
-F 0 "#PWR045" H 9450 2700 30  0001 C CNN
-F 1 "GND" H 9450 2630 30  0001 C CNN
-	1    9450 2700
+P 10350 2100
+F 0 "#PWR047" H 10350 2100 30  0001 C CNN
+F 1 "GND" H 10350 2030 30  0001 C CNN
+	1    10350 2100
 	-1   0    0    1   
 $EndComp
 Text Label 4450 2500 0    60   ~ 0
@@ -1927,19 +1998,19 @@ Text Label 4450 2200 0    60   ~ 0
 TDI
 NoConn ~ 5050 2600
 $Comp
-L GND #PWR046
+L GND #PWR048
 U 1 1 4CE9A7C1
 P 3900 2000
-F 0 "#PWR046" H 3900 2000 30  0001 C CNN
+F 0 "#PWR048" 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 #PWR047
+L 3V3 #PWR049
 U 1 1 4CE9A701
 P 1600 950
-F 0 "#PWR047" H 1600 1050 40  0001 C CNN
+F 0 "#PWR049" H 1600 1050 40  0001 C CNN
 F 1 "3V3" H 1600 1075 40  0000 C CNN
 	1    1600 950 
 	1    0    0    -1  
@@ -1997,15 +2068,14 @@ $EndComp
 NoConn ~ 2900 1900
 NoConn ~ 2900 1800
 $Comp
-L 1V8 #PWR048
+L 1V8 #PWR050
 U 1 1 4CE94C54
 P 3200 4850
-F 0 "#PWR048" H 3200 4990 20  0001 C CNN
+F 0 "#PWR050" 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 2100
 Text Label 7600 4700 0    60   ~ 0
 I/O_SIM
@@ -2026,19 +2096,19 @@ DDM
 Text Label 4350 2900 0    60   ~ 0
 DDP
 $Comp
-L 3V3 #PWR049
+L 3V3 #PWR051
 U 1 1 4CE91A30
 P 750 4100
-F 0 "#PWR049" H 750 4200 40  0001 C CNN
+F 0 "#PWR051" 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 #PWR050
+L GND #PWR052
 U 1 1 4CE9163C
 P 3600 3400
-F 0 "#PWR050" H 3600 3400 30  0001 C CNN
+F 0 "#PWR052" H 3600 3400 30  0001 C CNN
 F 1 "GND" H 3600 3330 30  0001 C CNN
 	1    3600 3400
 	0    1    1    0   
@@ -2074,10 +2144,10 @@ F 2 "Q_49U3HMS" H 4450 3400 60  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR051
+L GND #PWR053
 U 1 1 4CE8FFA5
 P 4750 6150
-F 0 "#PWR051" H 4750 6150 30  0001 C CNN
+F 0 "#PWR053" H 4750 6150 30  0001 C CNN
 F 1 "GND" H 4750 6080 30  0001 C CNN
 	1    4750 6150
 	1    0    0    -1