change microcontroller to SAM3S

hardware/kicad/SIMtrace.sch

@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Fri 20 Jun 2014 09:43:57 AM CEST
+EESchema Schematic File Version 2
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -32,14 +32,15 @@ LIBS:valves
 LIBS:at91sam7sxxx-au
 LIBS:SIMtrace
 LIBS:smartcard
-EELAYER 25  0
+LIBS:SIMtrace-cache
+EELAYER 27 0
 EELAYER END
-$Descr A4 11700 8267
+$Descr A4 11693 8268
 encoding utf-8
 Sheet 1 1
 Title "SIMtrace hardware"
-Date "20 jun 2014"
-Rev "v1.4"
+Date "17 may 2015"
+Rev "v1.5"
 Comp "osmocom"
 Comment1 "CC-BY-SA v3.0 unported"
 Comment2 ""
@@ -753,6 +754,8 @@ 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
+F 2 "" H 8900 4050 60  0001 C CNN
+F 3 "" H 8900 4050 60  0001 C CNN
 	1    8900 4050
 	0    1    1    0   
 $EndComp
@@ -763,6 +766,7 @@ 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
+F 3 "" H 8700 4350 60  0001 C CNN
 	1    8700 4350
 	1    0    0    -1  
 $EndComp
@@ -773,6 +777,7 @@ 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
+F 3 "" H 8500 4350 60  0001 C CNN
 	1    8500 4350
 	1    0    0    -1  
 $EndComp
@@ -782,6 +787,8 @@ U 1 1 4FB67F39
 P 8600 1600
 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
@@ -792,6 +799,7 @@ 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
@@ -810,6 +818,7 @@ 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
@@ -826,6 +835,8 @@ U 1 1 4DFF996C
 P 2250 6150
 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
@@ -836,6 +847,7 @@ 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
@@ -845,6 +857,8 @@ U 1 1 4DFF9910
 P 1650 6100
 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
@@ -855,6 +869,7 @@ 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
@@ -875,6 +890,7 @@ 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
@@ -884,6 +900,8 @@ U 1 1 4DFF74F0
 P 8300 5100
 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
@@ -894,6 +912,7 @@ 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
@@ -904,6 +923,7 @@ 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
@@ -913,6 +933,8 @@ U 1 1 4DFF73E0
 P 8400 1600
 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
@@ -923,6 +945,7 @@ 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
@@ -934,6 +957,8 @@ U 1 1 4DFDBB3F
 P 11000 4550
 F 0 "#PWR07" H 11000 4550 30  0001 C CNN
 F 1 "GND" H 11000 4480 30  0001 C CNN
+F 2 "" H 11000 4550 60  0001 C CNN
+F 3 "" H 11000 4550 60  0001 C CNN
 	1    11000 4550
 	0    -1   -1   0   
 $EndComp
@@ -944,6 +969,7 @@ 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
@@ -958,6 +984,7 @@ 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
+F 3 "" H 10050 5000 60  0001 C CNN
 	1    10050 5000
 	1    0    0    -1  
 $EndComp
@@ -968,6 +995,7 @@ 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
+F 3 "" H 10050 4550 60  0001 C CNN
 	2    10050 4550
 	1    0    0    -1  
 $EndComp
@@ -978,6 +1006,7 @@ 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
@@ -988,6 +1017,7 @@ 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
@@ -997,6 +1027,8 @@ U 1 1 4DC820B7
 P 10900 5950
 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
@@ -1006,6 +1038,8 @@ U 1 1 4DC815E7
 P 7500 6650
 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
@@ -1015,6 +1049,8 @@ U 1 1 4DC80D4F
 P 6400 6850
 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
@@ -1024,6 +1060,8 @@ U 1 1 4DC804F4
 P 900 7500
 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
@@ -1033,6 +1071,8 @@ U 1 1 4DC804C2
 P 1900 6500
 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
@@ -1043,6 +1083,7 @@ 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
@@ -1052,6 +1093,8 @@ U 1 1 4DC80254
 P 4000 6650
 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
@@ -1064,6 +1107,7 @@ 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
@@ -1074,6 +1118,7 @@ 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
@@ -1083,6 +1128,8 @@ U 1 1 4DC7A434
 P 8150 1100
 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
@@ -1098,6 +1145,8 @@ U 1 1 4DC7A233
 P 1300 1100
 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
@@ -1108,6 +1157,7 @@ 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
@@ -1117,6 +1167,8 @@ U 1 1 4DC79FE6
 P 1350 3550
 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
@@ -1128,6 +1180,8 @@ U 1 1 4DC79F9B
 P 2850 3450
 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
@@ -1138,6 +1192,7 @@ 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
@@ -1148,6 +1203,7 @@ 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
@@ -1158,6 +1214,7 @@ 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
@@ -1168,6 +1225,7 @@ 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
@@ -1178,6 +1236,7 @@ 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
@@ -1188,6 +1247,7 @@ 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
@@ -1198,6 +1258,7 @@ 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,6 +1269,7 @@ 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
@@ -1218,6 +1280,7 @@ 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
@@ -1228,6 +1291,7 @@ 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
@@ -1237,6 +1301,8 @@ U 1 1 4DC799FC
 P 9100 2650
 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
@@ -1247,6 +1313,7 @@ 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
@@ -1256,6 +1323,8 @@ U 1 1 4DC790F9
 P 6200 1350
 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
@@ -1265,6 +1334,8 @@ U 1 1 4DC790AF
 P 7650 5200
 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
@@ -1274,6 +1345,8 @@ U 1 1 4DC6ABFD
 P 9650 3800
 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
@@ -1283,6 +1356,8 @@ U 1 1 4DC6A8EB
 P 1150 3650
 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
@@ -1292,6 +1367,8 @@ U 1 1 4DC6A5F7
 P 1750 7250
 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
@@ -1301,6 +1378,8 @@ U 1 1 4DC6A5F4
 P 3850 7250
 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
@@ -1310,6 +1389,8 @@ U 1 1 4DC6A5F0
 P 3100 7250
 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
@@ -1320,6 +1401,7 @@ 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
@@ -1330,6 +1412,7 @@ 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
@@ -1340,6 +1423,7 @@ 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
@@ -1349,6 +1433,8 @@ U 1 1 4DC6A577
 P 2950 7250
 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
@@ -1361,6 +1447,7 @@ 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
@@ -1371,6 +1458,7 @@ 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
@@ -1381,6 +1469,7 @@ 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
@@ -1391,6 +1480,7 @@ 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
@@ -1401,6 +1491,7 @@ 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
@@ -1410,6 +1501,8 @@ U 1 1 4DC68E36
 P 8250 5450
 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
@@ -1420,6 +1513,7 @@ 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
@@ -1440,6 +1534,7 @@ 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
@@ -1449,6 +1544,8 @@ U 1 1 4DC68405
 P 4450 650
 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
@@ -1458,6 +1555,8 @@ U 1 1 4DC683FB
 P 5050 950
 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
@@ -1468,6 +1567,7 @@ 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
@@ -1478,6 +1578,7 @@ 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
@@ -1487,6 +1588,8 @@ U 1 1 4DC665D5
 P 3350 5750
 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
@@ -1496,6 +1599,8 @@ U 1 1 4DC665D1
 P 3200 5500
 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
@@ -1505,6 +1610,8 @@ U 1 1 4DC6650D
 P 3500 5000
 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
@@ -1515,6 +1622,7 @@ 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
@@ -1525,6 +1633,7 @@ 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
@@ -1535,6 +1644,7 @@ 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
@@ -1544,6 +1654,8 @@ U 1 1 4DC662E1
 P 1300 4300
 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
@@ -1553,6 +1665,8 @@ U 1 1 4DC66159
 P 950 4700
 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
@@ -1578,6 +1692,8 @@ U 1 1 4DC5A389
 P 9250 2150
 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
@@ -1588,6 +1704,7 @@ 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
@@ -1597,6 +1714,8 @@ U 1 1 4DC5A300
 P 10700 1200
 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
@@ -1609,6 +1728,7 @@ 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
@@ -1626,6 +1746,8 @@ U 1 1 4DC55B6C
 P 10100 5950
 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
@@ -1636,6 +1758,7 @@ 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
@@ -1646,6 +1769,7 @@ 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
@@ -1656,6 +1780,7 @@ 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
@@ -1665,6 +1790,8 @@ U 1 1 4DC5061E
 P 2050 4400
 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
@@ -1674,6 +1801,8 @@ U 1 1 4D037F90
 P 1550 4900
 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
@@ -1683,6 +1812,8 @@ U 1 1 4D037F8C
 P 1900 5100
 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
@@ -1693,6 +1824,7 @@ 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
@@ -1721,6 +1853,7 @@ 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
@@ -1731,6 +1864,7 @@ 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
@@ -1740,6 +1874,8 @@ U 1 1 4D020E3B
 P 1850 3950
 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
@@ -1750,6 +1886,7 @@ 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
@@ -1760,6 +1897,7 @@ 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
@@ -1770,6 +1908,7 @@ 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
@@ -1780,6 +1919,7 @@ 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
@@ -1790,6 +1930,7 @@ 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
@@ -1799,6 +1940,8 @@ U 1 1 4D020854
 P 4450 850
 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
@@ -1809,6 +1952,7 @@ 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
@@ -1819,6 +1963,7 @@ 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
@@ -1833,6 +1978,7 @@ 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
@@ -1844,6 +1990,8 @@ U 1 1 4CF7CFEB
 P 10100 6750
 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
@@ -1865,6 +2013,8 @@ U 1 1 4CF7C43B
 P 11050 4850
 F 0 "#PWR044" H 11050 4850 30  0001 C CNN
 F 1 "GND" H 11050 4780 30  0001 C CNN
+F 2 "" H 11050 4850 60  0001 C CNN
+F 3 "" H 11050 4850 60  0001 C CNN
 	1    11050 4850
 	0    -1   -1   0   
 $EndComp
@@ -1899,6 +2049,7 @@ 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
@@ -1909,6 +2060,7 @@ 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
@@ -1917,8 +2069,9 @@ L AT91SAM7S512/256/128/64/321-AU IC3
 U 1 1 4CE84486
 P 6250 3800
 F 0 "IC3" H 5250 6100 50  0000 L BNN
-F 1 "AT91SAM7S" H 5250 1400 50  0000 L BNN
+F 1 "ATSAM3S2B" 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
@@ -1933,6 +2086,7 @@ 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
@@ -1942,6 +2096,8 @@ 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
+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
@@ -1960,6 +2116,8 @@ U 1 1 4CE9A7C1
 P 3900 2000
 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
@@ -1969,6 +2127,8 @@ U 1 1 4CE9A701
 P 1600 950
 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
@@ -1979,6 +2139,7 @@ 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
@@ -1989,6 +2150,7 @@ 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
@@ -1999,6 +2161,7 @@ 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
@@ -2009,6 +2172,7 @@ 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
@@ -2019,6 +2183,7 @@ 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
@@ -2030,6 +2195,8 @@ U 1 1 4CE94C54
 P 3200 4850
 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
@@ -2059,6 +2226,8 @@ U 1 1 4CE91A30
 P 750 4100
 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
@@ -2068,6 +2237,8 @@ U 1 1 4CE9163C
 P 3600 3400
 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
@@ -2078,6 +2249,7 @@ 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
@@ -2088,6 +2260,7 @@ 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
@@ -2098,6 +2271,7 @@ 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
@@ -2107,6 +2281,8 @@ U 1 1 4CE8FFA5
 P 4750 6150
 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
@@ -2172,6 +2348,7 @@ 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 60  0001 C CNN
 	1    3600 7050
 	1    0    0    -1  
 $EndComp
@@ -2182,6 +2359,7 @@ 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 60  0001 C CNN
 	1    2850 5700
 	1    0    0    -1  
 $EndComp
@@ -2191,6 +2369,8 @@ U 1 1 526C5044
 P 2850 6050
 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  0001 C CNN
+F 3 "" H 2850 6050 60  0001 C CNN
 	1    2850 6050
 	1    0    0    -1  
 $EndComp
@@ -2200,6 +2380,8 @@ U 1 1 526C5053
 P 3600 7400
 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  0001 C CNN
+F 3 "" H 3600 7400 60  0001 C CNN
 	1    3600 7400
 	1    0    0    -1  
 $EndComp

hardware/pcb/bom/SIMtrace.csv

@@ -1,37 +1,37 @@
-4.5-6V,1,"BT1",PIN_ARRAY_2X1,
-10pF,2,"C17 C18",SM0603,
-15pF,2,"C11 C13",SM0603,
-33pF,1,"C5",SM0603,
-1nF,1,"C10",SM0603,
-10nF,1,"C6",SM0603,
-100nF,10,"C3 C4 C7 C9 C15 C16 C19 C20 C23 C24",SM0603,
-1uF,2,"C21 C22",SM0603,
-2.2uF,2,"C1 C12",SM0603,
-4.7uF,1,"C14",SM0805,
-RED,1,"D4",LED-0805,
-GREEN,1,"D5",LED-0805,
-MBR0530,4,"D1 D2 D3 D6",SOD123,~
-FILTER,2,"FB1 FB2",SM0805,
-FPF2109,1,"IC1",SOT23-5,https://www.fairchildsemi.com/ds/FP/FPF2110.pdf
-AP7332,1,"IC2",SOT26,
-CB3Q3244,1,"IC4",SSOP20_BDQ,
-AT91SAM7S,1,"IC3",TQFP_64,
-JACK_2.5,1,"J2",JACK_2.5,
-USB-B_MINI,1,"J1",USB-MINI-B_UX60,
-TEST,1,"JP1",PIN_ARRAY_2X1,
-ERASE,1,"JP2",PIN_ARRAY_2X1,
-REBELSIM,1,"P3",FFC_REBELSIM,
-DEBUG,1,"P2",PIN_ARRAY-6X1,
-JTAG,1,"P1",PIN_ARRAY_10X2,
-SIM,1,"P4",SIM_AMPHENOL,
-BC847,2,"Q1 Q2",SOT23_BC847,
-27R,2,"R9 R10",SM0603,
-150R,2,"R13 R14",SM0603,
-1K5,2,"R3 R11",SM0603,
-10K,4,"R2 R16 R17 R18",SM0603,
-10k1%,2,"R20 R21",SM0603,
-100K,14,"R1 R4 R5 R6 R7 R8 R12 R15 R19 R22 R23 R24 R25 R26",SM0603,
-RESET,1,"SW1",PUSH_BUTTON,
-BOOTLOADER,1,"SW2",PUSH_BUTTON,
-FLASH,1,"U1",SOC008_WIDE,
-18.432MHz,1,"X1",Q_49U3HMS,
+4.5-6V,1,"BT1"
+10pF,2,"C17 C18"
+15pF,2,"C11 C13"
+33pF,1,"C5"
+1nF,1,"C10"
+10nF,1,"C6"
+100nF,10,"C3 C4 C7 C9 C15 C16 C19 C20 C23 C24"
+1uF,2,"C21 C22"
+2.2uF,2,"C1 C12"
+4.7uF,1,"C14"
+RED,1,"D4"
+GREEN,1,"D5"
+MBR0530,4,"D1 D2 D3 D6"
+FILTER,2,"FB1 FB2"
+FPF2109,1,"IC1"
+AP7332,1,"IC2"
+CB3Q3244,1,"IC4"
+ATSAM3S2B,1,"IC3"
+JACK_2.5,1,"J2"
+USB-B_MINI,1,"J1"
+TEST,1,"JP1"
+ERASE,1,"JP2"
+REBELSIM,1,"P3"
+DEBUG,1,"P2"
+JTAG,1,"P1"
+SIM,1,"P4"
+BC847,2,"Q1 Q2"
+27R,2,"R9 R10"
+150R,2,"R13 R14"
+1K5,2,"R3 R11"
+10K,4,"R2 R16 R17 R18"
+10k1%,2,"R20 R21"
+100K,14,"R1 R4 R5 R6 R7 R8 R12 R15 R19 R22 R23 R24 R25 R26"
+RESET,1,"SW1"
+BOOTLOADER,1,"SW2"
+FLASH,1,"U1"
+18.432MHz,1,"X1"

hardware/pcb/fabrication/SIMtrace-Back.pos

@@ -1,4 +1,4 @@
-### Module positions - created on So 22 Jun 2014 23:24:39 PDT ###
+### Module positions - created on So 17 Mai 2015 14:58:54 CEST ###
 ### Printed by Pcbnew version pcbnew (2013-may-18)-stable
 ## Unit = mm, Angle = deg.
 ## Side : Front

hardware/pcb/fabrication/SIMtrace-Front.pos

@@ -1,4 +1,4 @@
-### Module positions - created on So 22 Jun 2014 23:24:39 PDT ###
+### Module positions - created on So 17 Mai 2015 14:58:54 CEST ###
 ### Printed by Pcbnew version pcbnew (2013-may-18)-stable
 ## Unit = mm, Angle = deg.
 ## Side : Front
@@ -25,12 +25,22 @@ C21      1uF              SM0603             61.3410     6.3500      90.0    Fro
 C22      1uF              SM0603             61.3410     9.9060     270.0    Front
 C23      100nF            SM0603             32.5145    31.8440     180.0    Front
 C24      100nF            SM0603             58.2970    16.5020     270.0    Front
+D1       MBR0530          SOD123             74.2970    34.5020     270.0    Front
+D2       MBR0530          SOD123             73.2790     8.1280       0.0    Front
+D3       MBR0530          SOD123             73.2790     3.4290       0.0    Front
 D4       RED              LED-0805           40.1320     5.0800     180.0    Front
 D5       GREEN            LED-0805           40.1320     7.7470     180.0    Front
+D6       MBR0530          SOD123             61.7970     3.0020       0.0    Front
 FB1      FILTER           SM0805             73.7870    12.8270     270.0    Front
 FB2      FILTER           SM0805             28.0543    31.8694     180.0    Front
 IC1      FPF2109          SOT23-5            61.2970    16.0020       0.0    Front
+IC2      AP7332           SOT26              64.3890     9.3980       0.0    Front
+IC3      MCU              TQFP_64            46.9900    24.1300     270.0    Front
 IC4      CB3Q3244         SSOP20_BDQ         18.4150    35.4330     180.0    Front
+P3       FFC              FFC_REBELSIM        5.8420    36.1950     270.0    Front
+P4       SIM              SIM_AMPHENOL       26.6700    13.3350     180.0    Front
+Q1       BC847            SOT23_BC847        78.6130    25.7810      90.0    Front
+Q2       BC847            SOT23_BC847        70.4850    30.9880       0.0    Front
 R1       100K             SM0603             80.0100    29.3370     180.0    Front
 R2       10K              SM0603             73.6600    21.3360      90.0    Front
 R3       1K5              SM0603             71.8820    21.3360      90.0    Front
@@ -57,4 +67,8 @@ R23      100K             SM0603             14.2240    42.1640     270.0    Fro
 R24      100K             SM0603             65.7970     3.0020       0.0    Front
 R25      100K             SM0603             32.1310    14.4780      90.0    Front
 R26      100K             SM0603             30.2260    15.2400      90.0    Front
+SW1      RESET            PUSH_BUTTON         7.2390    49.4030     180.0    Front
+SW2      BOOTLOADER       PUSH_BUTTON        20.7010    49.4030     180.0    Front
+U1       FLASH            SOC008_WIDE        53.4670     7.2390     270.0    Front
+X1       18.432MHz        Q_49U3HMS          42.0370    39.6240     180.0    Front
 ## End

hardware/pcb/fabrication/SIMtrace.drl

@@ -1,5 +1,5 @@
 M48
-;DRILL file {Pcbnew (2013-may-18)-stable} date So 22 Jun 2014 23:53:21 PDT
+;DRILL file {Pcbnew (2013-may-18)-stable} date So 17 Mai 2015 15:00:01 CEST
 ;FORMAT={-:-/ absolute / metric / decimal}
 FMAT,2
 METRIC,TZ

hardware/pcb/gerber/SIMtrace-B_Mask.pho

@@ -1,4 +1,4 @@
-G04 (created by PCBNEW (2013-may-18)-stable) date So 22 Jun 2014 23:58:54 PDT*
+G04 (created by PCBNEW (2013-may-18)-stable) date So 17 Mai 2015 15:01:41 CEST*
 %MOIN*%
 G04 Gerber Fmt 3.4, Leading zero omitted, Abs format*
 %FSLAX34Y34*%

hardware/pcb/gerber/SIMtrace-B_Paste.pho

@@ -1,4 +1,4 @@
-G04 (created by PCBNEW (2013-may-18)-stable) date So 22 Jun 2014 23:58:54 PDT*
+G04 (created by PCBNEW (2013-may-18)-stable) date So 17 Mai 2015 15:01:41 CEST*
 %MOIN*%
 G04 Gerber Fmt 3.4, Leading zero omitted, Abs format*
 %FSLAX34Y34*%

hardware/pcb/gerber/SIMtrace-B_SilkS.pho

@@ -1,4 +1,4 @@
-G04 (created by PCBNEW (2013-may-18)-stable) date So 22 Jun 2014 23:58:54 PDT*
+G04 (created by PCBNEW (2013-may-18)-stable) date So 17 Mai 2015 15:01:41 CEST*
 %MOIN*%
 G04 Gerber Fmt 3.4, Leading zero omitted, Abs format*
 %FSLAX34Y34*%

hardware/pcb/gerber/SIMtrace-Edge_Cuts.pho

@@ -1,4 +1,4 @@
-G04 (created by PCBNEW (2013-may-18)-stable) date So 22 Jun 2014 23:58:54 PDT*
+G04 (created by PCBNEW (2013-may-18)-stable) date So 17 Mai 2015 15:01:41 CEST*
 %MOIN*%
 G04 Gerber Fmt 3.4, Leading zero omitted, Abs format*
 %FSLAX34Y34*%

hardware/pcb/gerber/SIMtrace-F_Mask.pho

@@ -1,4 +1,4 @@
-G04 (created by PCBNEW (2013-may-18)-stable) date So 22 Jun 2014 23:58:54 PDT*
+G04 (created by PCBNEW (2013-may-18)-stable) date So 17 Mai 2015 15:01:41 CEST*
 %MOIN*%
 G04 Gerber Fmt 3.4, Leading zero omitted, Abs format*
 %FSLAX34Y34*%

hardware/pcb/gerber/SIMtrace-F_Paste.pho

@@ -1,4 +1,4 @@
-G04 (created by PCBNEW (2013-may-18)-stable) date So 22 Jun 2014 23:58:54 PDT*
+G04 (created by PCBNEW (2013-may-18)-stable) date So 17 Mai 2015 15:01:41 CEST*
 %MOIN*%
 G04 Gerber Fmt 3.4, Leading zero omitted, Abs format*
 %FSLAX34Y34*%

hardware/pcb/gerber/SIMtrace-F_SilkS.pho

@@ -1,4 +1,4 @@
-G04 (created by PCBNEW (2013-may-18)-stable) date So 22 Jun 2014 23:58:54 PDT*
+G04 (created by PCBNEW (2013-may-18)-stable) date So 17 Mai 2015 15:01:41 CEST*
 %MOIN*%
 G04 Gerber Fmt 3.4, Leading zero omitted, Abs format*
 %FSLAX34Y34*%
@@ -22,37 +22,38 @@ G04 APERTURE LIST*
 %ADD23C,0.0045*%
 %ADD24C,0.00492126*%
 %ADD25C,0.00738189*%
-%ADD26R,0.045X0.065*%
-%ADD27R,0.065X0.045*%
-%ADD28R,0.055X0.075*%
-%ADD29R,0.075X0.055*%
-%ADD30R,0.066X0.0158*%
-%ADD31O,0.066X0.0158*%
-%ADD32O,0.0158X0.066*%
-%ADD33R,0.08X0.08*%
-%ADD34C,0.08*%
-%ADD35R,0.0515X0.0554*%
-%ADD36R,0.0554X0.0515*%
-%ADD37R,0.146X0.0594*%
-%ADD38C,0.0554*%
-%ADD39R,0.0987X0.0397*%
-%ADD40R,0.1066X0.1184*%
-%ADD41R,0.1106X0.0594*%
-%ADD42R,0.1106X0.0397*%
-%ADD43R,0.1775X0.0869*%
-%ADD44R,0.036X0.0948*%
-%ADD45R,0.0436X0.0633*%
-%ADD46R,0.0579X0.0397*%
-%ADD47R,0.0672X0.0672*%
-%ADD48R,0.1145X0.1361*%
-%ADD49R,0.1145X0.1243*%
-%ADD50C,0.0594*%
-%ADD51R,0.2365X0.0987*%
-%ADD52R,0.0987X0.0436*%
-%ADD53R,0.1854X0.0476*%
-%ADD54R,0.0558X0.068*%
-%ADD55R,0.068X0.0558*%
-%ADD56R,0.04X0.05*%
+%ADD26C,0.00606299*%
+%ADD27R,0.045X0.065*%
+%ADD28R,0.065X0.045*%
+%ADD29R,0.055X0.075*%
+%ADD30R,0.075X0.055*%
+%ADD31R,0.066X0.0158*%
+%ADD32O,0.066X0.0158*%
+%ADD33O,0.0158X0.066*%
+%ADD34R,0.08X0.08*%
+%ADD35C,0.08*%
+%ADD36R,0.0515X0.0554*%
+%ADD37R,0.0554X0.0515*%
+%ADD38R,0.146X0.0594*%
+%ADD39C,0.0554*%
+%ADD40R,0.0987X0.0397*%
+%ADD41R,0.1066X0.1184*%
+%ADD42R,0.1106X0.0594*%
+%ADD43R,0.1106X0.0397*%
+%ADD44R,0.1775X0.0869*%
+%ADD45R,0.036X0.0948*%
+%ADD46R,0.0436X0.0633*%
+%ADD47R,0.0579X0.0397*%
+%ADD48R,0.0672X0.0672*%
+%ADD49R,0.1145X0.1361*%
+%ADD50R,0.1145X0.1243*%
+%ADD51C,0.0594*%
+%ADD52R,0.2365X0.0987*%
+%ADD53R,0.0987X0.0436*%
+%ADD54R,0.1854X0.0476*%
+%ADD55R,0.0558X0.068*%
+%ADD56R,0.068X0.0558*%
+%ADD57R,0.04X0.05*%
 G04 APERTURE END LIST*
 G54D10*
 G54D11*
@@ -2805,7 +2806,7 @@ X45941Y-47914D01*
 X45922Y-47942D01*
 X45903Y-47961D01*
 X45884Y-47970D01*
-G54D23*
+G54D26*
 X42934Y-49824D02*
 X42934Y-50063D01*
 X42948Y-50091D01*
@@ -3541,55 +3542,136 @@ X47365Y-41502D01*
 X47253Y-41615D01*
 X47375Y-41615D01*
 G54D12*
-X44218Y-38755D02*
-X44260Y-38769D01*
-X44330Y-38769D01*
-X44358Y-38755D01*
-X44372Y-38741D01*
-X44386Y-38713D01*
-X44386Y-38685D01*
-X44372Y-38657D01*
-X44358Y-38642D01*
-X44330Y-38628D01*
-X44274Y-38614D01*
-X44246Y-38600D01*
-X44232Y-38586D01*
-X44218Y-38558D01*
-X44218Y-38530D01*
-X44232Y-38502D01*
-X44246Y-38488D01*
-X44274Y-38474D01*
-X44344Y-38474D01*
-X44386Y-38488D01*
-X44513Y-38614D02*
-X44611Y-38614D01*
-X44653Y-38769D02*
-X44513Y-38769D01*
-X44513Y-38474D01*
-X44653Y-38474D01*
-X44949Y-38769D02*
-X44850Y-38628D01*
-X44780Y-38769D02*
-X44780Y-38474D01*
-X44892Y-38474D01*
-X44921Y-38488D01*
-X44935Y-38502D01*
-X44949Y-38530D01*
-X44949Y-38572D01*
-X44935Y-38600D01*
+X43810Y-38769D02*
+X43782Y-38755D01*
+X43768Y-38741D01*
+X43754Y-38713D01*
+X43754Y-38628D01*
+X43768Y-38600D01*
+X43782Y-38586D01*
+X43810Y-38572D01*
+X43852Y-38572D01*
+X43880Y-38586D01*
+X43894Y-38600D01*
+X43908Y-38628D01*
+X43908Y-38713D01*
+X43894Y-38741D01*
+X43880Y-38755D01*
+X43852Y-38769D01*
+X43810Y-38769D01*
+X44021Y-38755D02*
+X44049Y-38769D01*
+X44105Y-38769D01*
+X44133Y-38755D01*
+X44147Y-38727D01*
+X44147Y-38713D01*
+X44133Y-38685D01*
+X44105Y-38671D01*
+X44063Y-38671D01*
+X44035Y-38657D01*
+X44021Y-38628D01*
+X44021Y-38614D01*
+X44035Y-38586D01*
+X44063Y-38572D01*
+X44105Y-38572D01*
+X44133Y-38586D01*
+X44274Y-38769D02*
+X44274Y-38572D01*
+X44274Y-38600D02*
+X44288Y-38586D01*
+X44316Y-38572D01*
+X44358Y-38572D01*
+X44386Y-38586D01*
+X44400Y-38614D01*
+X44400Y-38769D01*
+X44400Y-38614D02*
+X44414Y-38586D01*
+X44443Y-38572D01*
+X44485Y-38572D01*
+X44513Y-38586D01*
+X44527Y-38614D01*
+X44527Y-38769D01*
+X44710Y-38769D02*
+X44682Y-38755D01*
+X44667Y-38741D01*
+X44653Y-38713D01*
+X44653Y-38628D01*
+X44667Y-38600D01*
+X44682Y-38586D01*
+X44710Y-38572D01*
+X44752Y-38572D01*
+X44780Y-38586D01*
+X44794Y-38600D01*
+X44808Y-38628D01*
+X44808Y-38713D01*
+X44794Y-38741D01*
+X44780Y-38755D01*
+X44752Y-38769D01*
+X44710Y-38769D01*
+X44921Y-38755D02*
+X44949Y-38769D01*
+X45005Y-38769D01*
+X45033Y-38755D01*
+X45047Y-38727D01*
+X45047Y-38713D01*
+X45033Y-38685D01*
+X45005Y-38671D01*
+X44963Y-38671D01*
+X44935Y-38657D01*
+X44921Y-38628D01*
 X44921Y-38614D01*
-X44892Y-38628D01*
-X44780Y-38628D01*
-X45075Y-38769D02*
-X45075Y-38474D01*
-X45202Y-38685D02*
-X45342Y-38685D01*
-X45174Y-38769D02*
-X45272Y-38474D01*
-X45371Y-38769D01*
+X44935Y-38586D01*
+X44963Y-38572D01*
+X45005Y-38572D01*
+X45033Y-38586D01*
+X45286Y-38755D02*
+X45258Y-38769D01*
+X45202Y-38769D01*
+X45174Y-38755D01*
+X45160Y-38727D01*
+X45160Y-38614D01*
+X45174Y-38586D01*
+X45202Y-38572D01*
+X45258Y-38572D01*
+X45286Y-38586D01*
+X45300Y-38614D01*
+X45300Y-38642D01*
+X45160Y-38671D01*
+X45427Y-38769D02*
+X45427Y-38572D01*
+X45427Y-38628D02*
+X45441Y-38600D01*
+X45455Y-38586D01*
+X45483Y-38572D01*
+X45511Y-38572D01*
 X45610Y-38769D02*
-X45469Y-38769D01*
-X45469Y-38474D01*
+X45610Y-38572D01*
+X45610Y-38474D02*
+X45596Y-38488D01*
+X45610Y-38502D01*
+X45624Y-38488D01*
+X45610Y-38474D01*
+X45610Y-38502D01*
+X45877Y-38769D02*
+X45877Y-38614D01*
+X45863Y-38586D01*
+X45835Y-38572D01*
+X45778Y-38572D01*
+X45750Y-38586D01*
+X45877Y-38755D02*
+X45849Y-38769D01*
+X45778Y-38769D01*
+X45750Y-38755D01*
+X45736Y-38727D01*
+X45736Y-38699D01*
+X45750Y-38671D01*
+X45778Y-38657D01*
+X45849Y-38657D01*
+X45877Y-38642D01*
+X46060Y-38769D02*
+X46031Y-38755D01*
+X46017Y-38727D01*
+X46017Y-38474D01*
 G54D24*
 X30549Y-42008D02*
 X30680Y-42205D01*
@@ -4063,7 +4145,7 @@ X27216Y-51458D01*
 X27199Y-51449D01*
 X27191Y-51439D01*
 %LPC*%
-G54D26*
+G54D27*
 X33687Y-51400D03*
 X34287Y-51400D03*
 X41795Y-45537D03*
@@ -4080,7 +4162,7 @@ X40150Y-46550D03*
 X40750Y-46550D03*
 X40150Y-47300D03*
 X40750Y-47300D03*
-G54D27*
+G54D28*
 X32700Y-38350D03*
 X32700Y-38950D03*
 X30700Y-38350D03*
@@ -4095,22 +4177,22 @@ X42750Y-48200D03*
 X42750Y-47600D03*
 X43450Y-48200D03*
 X43450Y-47600D03*
-G54D26*
+G54D27*
 X46250Y-44750D03*
 X45650Y-44750D03*
 X27551Y-43763D03*
 X26951Y-43763D03*
-G54D27*
+G54D28*
 X38600Y-52100D03*
 X38600Y-52700D03*
 X38600Y-54100D03*
 X38600Y-53500D03*
-G54D26*
+G54D27*
 X34550Y-43450D03*
 X35150Y-43450D03*
 X32725Y-50400D03*
 X32125Y-50400D03*
-G54D27*
+G54D28*
 X29150Y-42200D03*
 X29150Y-42800D03*
 X31800Y-42800D03*
@@ -4125,10 +4207,10 @@ X29300Y-46700D03*
 X29300Y-46100D03*
 X37550Y-42450D03*
 X37550Y-41850D03*
-G54D26*
+G54D27*
 X25650Y-45500D03*
 X25050Y-45500D03*
-G54D27*
+G54D28*
 X33350Y-42800D03*
 X33350Y-42200D03*
 X36050Y-46025D03*
@@ -4137,23 +4219,23 @@ X26600Y-45400D03*
 X26600Y-44800D03*
 X41800Y-48150D03*
 X41800Y-47550D03*
-G54D26*
+G54D27*
 X31550Y-50275D03*
 X30950Y-50275D03*
-G54D27*
+G54D28*
 X32647Y-42804D03*
 X32647Y-42204D03*
 X29950Y-46400D03*
 X29950Y-45800D03*
-G54D28*
+G54D29*
 X25870Y-43753D03*
 X25120Y-43753D03*
-G54D29*
+G54D30*
 X43500Y-50875D03*
 X43500Y-51625D03*
-G54D30*
-X30639Y-45324D03*
 G54D31*
+X30639Y-45324D03*
+G54D32*
 X30639Y-45521D03*
 X30639Y-45718D03*
 X30639Y-45915D03*
@@ -4169,7 +4251,7 @@ X30639Y-47686D03*
 X30639Y-47883D03*
 X30639Y-48080D03*
 X30639Y-48277D03*
-G54D32*
+G54D33*
 X31474Y-49175D03*
 X31671Y-49175D03*
 X31868Y-49175D03*
@@ -4186,7 +4268,7 @@ X33836Y-49175D03*
 X34033Y-49175D03*
 X34230Y-49175D03*
 X34427Y-49175D03*
-G54D31*
+G54D32*
 X35325Y-48277D03*
 X35325Y-48080D03*
 X35325Y-47883D03*
@@ -4203,7 +4285,7 @@ X35325Y-45915D03*
 X35325Y-45718D03*
 X35325Y-45521D03*
 X35325Y-45324D03*
-G54D32*
+G54D33*
 X34427Y-44489D03*
 X34230Y-44489D03*
 X33836Y-44489D03*
@@ -4220,23 +4302,23 @@ X32067Y-44489D03*
 X31870Y-44489D03*
 X31674Y-44489D03*
 X31477Y-44489D03*
-G54D33*
-X42200Y-36200D03*
 G54D34*
+X42200Y-36200D03*
+G54D35*
 X43200Y-36200D03*
 X44200Y-36200D03*
 X45200Y-36200D03*
 X46200Y-36200D03*
 X47200Y-36200D03*
-G54D35*
+G54D36*
 X41806Y-44533D03*
 X42594Y-44533D03*
 X42200Y-43667D03*
-G54D36*
+G54D37*
 X45833Y-46544D03*
 X45833Y-45756D03*
 X44967Y-46150D03*
-G54D37*
+G54D38*
 X18639Y-36063D03*
 X18639Y-37637D03*
 X15961Y-37637D03*
@@ -4245,21 +4327,21 @@ X23939Y-36063D03*
 X23939Y-37637D03*
 X21261Y-37637D03*
 X21261Y-36063D03*
-G54D38*
+G54D39*
 X45650Y-50689D03*
 X45650Y-49311D03*
-G54D39*
+G54D40*
 X44764Y-50315D03*
 X44764Y-50000D03*
 X44764Y-49685D03*
 X44764Y-49370D03*
 X44764Y-50630D03*
-G54D40*
+G54D41*
 X44863Y-51654D03*
 X44863Y-48346D03*
 X46949Y-51654D03*
 X46949Y-48346D03*
-G54D41*
+G54D42*
 X25403Y-52294D03*
 X25403Y-51794D03*
 X25403Y-50794D03*
@@ -4268,13 +4350,13 @@ X25403Y-50294D03*
 X25403Y-49794D03*
 X25403Y-49294D03*
 X25403Y-48794D03*
-G54D42*
+G54D43*
 X25403Y-48400D03*
 X25403Y-47889D03*
-G54D43*
+G54D44*
 X15954Y-47172D03*
 X15954Y-54928D03*
-G54D44*
+G54D45*
 X22850Y-41300D03*
 X22600Y-41300D03*
 X22340Y-41300D03*
@@ -4295,10 +4377,10 @@ X22080Y-43400D03*
 X22340Y-43400D03*
 X22600Y-43400D03*
 X22850Y-43400D03*
-G54D26*
+G54D27*
 X40050Y-49500D03*
 X39450Y-49500D03*
-G54D27*
+G54D28*
 X24000Y-39100D03*
 X24000Y-39700D03*
 X22900Y-39700D03*
@@ -4307,18 +4389,18 @@ X21800Y-39100D03*
 X21800Y-39700D03*
 X37401Y-49503D03*
 X37401Y-50103D03*
-G54D45*
+G54D46*
 X39426Y-53112D03*
 X39800Y-53112D03*
 X40174Y-53112D03*
 X39426Y-52088D03*
 X39800Y-52088D03*
 X40174Y-52088D03*
-G54D33*
-X46600Y-53700D03*
 G54D34*
+X46600Y-53700D03*
+G54D35*
 X46600Y-54700D03*
-G54D46*
+G54D47*
 X36955Y-52700D03*
 X36955Y-54200D03*
 X36955Y-53700D03*
@@ -4327,14 +4409,14 @@ X34045Y-54200D03*
 X34045Y-53700D03*
 X34046Y-53200D03*
 X34045Y-52700D03*
-G54D47*
+G54D48*
 X30663Y-53250D03*
 X29837Y-53250D03*
 X30663Y-54300D03*
 X29837Y-54300D03*
-G54D33*
-X26700Y-37200D03*
 G54D34*
+X26700Y-37200D03*
+G54D35*
 X26700Y-36200D03*
 X27700Y-37200D03*
 X27700Y-36200D03*
@@ -4354,68 +4436,68 @@ X34700Y-37200D03*
 X34700Y-36200D03*
 X35700Y-37200D03*
 X35700Y-36200D03*
-G54D33*
+G54D34*
 X37750Y-38950D03*
-G54D34*
+G54D35*
 X38750Y-38950D03*
-G54D33*
-X39750Y-38950D03*
 G54D34*
+X39750Y-38950D03*
+G54D35*
 X40750Y-38950D03*
-G54D48*
+G54D49*
 X46843Y-38811D03*
 X45780Y-41281D03*
-G54D49*
-X43024Y-38752D03*
 G54D50*
+X43024Y-38752D03*
+G54D51*
 X46331Y-40100D03*
 X43969Y-40100D03*
-G54D51*
+G54D52*
 X32850Y-40700D03*
 X29150Y-40700D03*
-G54D27*
+G54D28*
 X33178Y-53736D03*
 X33178Y-54336D03*
-G54D52*
+G54D53*
 X16947Y-41066D03*
 X16947Y-41459D03*
 X16947Y-41853D03*
 X16947Y-42247D03*
 X16947Y-42641D03*
 X16947Y-43034D03*
-G54D53*
+G54D54*
 X16120Y-40672D03*
 X16120Y-43428D03*
-G54D29*
+G54D30*
 X40850Y-52075D03*
 X40850Y-52825D03*
-G54D27*
+G54D28*
 X20050Y-39400D03*
 X20050Y-40000D03*
-G54D54*
+G54D55*
 X39424Y-55118D03*
 X38134Y-55118D03*
-G54D26*
+G54D27*
 X40054Y-55118D03*
 X40654Y-55118D03*
-G54D27*
+G54D28*
 X36614Y-50093D03*
 X36614Y-50693D03*
-G54D55*
+G54D56*
 X43700Y-43361D03*
 X43700Y-42071D03*
-G54D54*
+G54D55*
 X43945Y-53100D03*
 X42655Y-53100D03*
 X43945Y-54950D03*
 X42655Y-54950D03*
-G54D56*
+G54D57*
 X38207Y-50500D03*
 X38957Y-50500D03*
 X38207Y-49500D03*
 X38582Y-50500D03*
 X38957Y-49500D03*
-G54D27*
+G54D28*
 X26350Y-50600D03*
 X26350Y-50000D03*
 X27100Y-50900D03*