update kicad project to v0.8

1 files changed, 741 insertions, 810 deletions

diff --git a/hardware/kicad/SIMtrace.sch b/hardware/kicad/SIMtrace.sch
index 86ac58f..aacae5d 100644
--- a/hardware/kicad/SIMtrace.sch
+++ b/hardware/kicad/SIMtrace.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Mo 09 Mai 2011 10:27:08 CEST
+EESchema Schematic File Version 2  date Mo 09 Mai 2011 19:17:29 CEST
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -39,827 +39,812 @@ $Descr A4 11700 8267
 Sheet 1 1
 Title "SIMtrace hardware"
 Date "9 may 2011"
-Rev "0.7+"
+Rev "0.8-"
 Comp "osmocom"
 Comment1 "CC-BY-SA"
 Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Text Label 8600 1100 0    60   ~ 0
-UDP_PUP
-Wire Wire Line
-	8550 1100 8900 1100
-Wire Wire Line
-	7850 1700 7750 1700
-Wire Wire Line
-	7750 1700 7750 1800
-Wire Wire Line
-	7750 1800 7450 1800
-Wire Wire Line
-	7450 1700 7650 1700
-Wire Wire Line
-	1300 1100 1300 1250
-Wire Wire Line
-	1300 1250 1300 1400
-Wire Wire Line
-	800  1600 800  1250
-Wire Wire Line
-	2100 1950 1850 1950
-Wire Wire Line
-	2100 1950 2100 2150
-Connection ~ 2100 2700
-Wire Wire Line
-	2100 2700 2100 2550
-Wire Wire Line
-	1150 2800 1850 2800
-Wire Wire Line
-	1850 2800 2450 2800
-Wire Wire Line
-	2950 2700 3050 2700
-Wire Wire Line
-	3050 2700 4800 2700
-Wire Wire Line
-	1350 2200 1350 2600
-Wire Wire Line
-	1350 2600 1150 2600
-Wire Wire Line
-	1550 3600 1550 2900
-Wire Wire Line
-	2450 2800 2450 2900
-Connection ~ 3050 2700
-Wire Wire Line
-	3050 3050 3050 2700
-Wire Wire Line
-	4800 2700 4800 2900
-Wire Wire Line
-	8950 2550 8950 2650
-Connection ~ 7650 1250
-Wire Wire Line
-	7650 1700 7650 1250
-Wire Wire Line
-	7650 1250 7650 1000
-Wire Wire Line
-	7650 1000 7500 1000
-Connection ~ 7550 5200
-Wire Wire Line
-	7450 5200 7550 5200
-Wire Wire Line
-	7550 5200 7650 5200
-Wire Wire Line
-	7550 5200 7550 5300
-Wire Wire Line
-	7550 5300 7550 5400
-Wire Wire Line
-	7550 5400 7450 5400
-Connection ~ 9300 3900
-Wire Wire Line
-	7450 3900 9300 3900
-Wire Wire Line
-	9300 3900 9800 3900
-Wire Wire Line
-	9600 3250 9300 3250
-Wire Wire Line
-	9300 3250 9300 3900
-Wire Wire Line
-	1150 3000 1150 3150
-Connection ~ 3450 7000
-Wire Wire Line
-	3450 7150 3450 7000
-Connection ~ 5000 7000
-Wire Wire Line
-	5000 7150 5000 7000
-Wire Wire Line
-	4700 7150 4500 7150
-Wire Wire Line
-	4100 7600 4100 7400
-Connection ~ 3550 7000
-Wire Wire Line
-	3700 7150 3550 7150
-Wire Wire Line
-	3550 7150 3550 7000
-Wire Wire Line
-	8450 6050 8450 5600
-Wire Wire Line
-	9650 5750 9650 5600
-Wire Wire Line
-	8850 5950 8850 5600
-Connection ~ 7700 5600
-Wire Wire Line
-	7700 5450 7700 5600
-Wire Wire Line
-	7700 5600 7700 5800
-Wire Wire Line
-	7450 5600 7700 5600
-Wire Wire Line
-	8250 5450 8100 5450
 Wire Wire Line
-	7450 5100 7900 5100
-Wire Wire Line
-	10550 6450 9100 6450
-Wire Wire Line
-	9900 6250 10550 6250
-Wire Wire Line
-	7450 3300 7900 3300
-Connection ~ 10700 1350
-Wire Wire Line
-	10950 1350 10700 1350
-Wire Wire Line
-	6200 1250 6400 1250
-Wire Wire Line
-	5050 1700 5050 1500
-Wire Wire Line
-	3200 5400 3200 5500
-Connection ~ 3500 5900
-Wire Wire Line
-	3500 5900 3850 5900
-Wire Wire Line
-	3850 5900 3850 5800
-Wire Wire Line
-	3500 5600 3500 5750
-Wire Wire Line
-	3500 5750 3500 5900
-Wire Wire Line
-	3500 5900 3500 6000
-Wire Wire Line
-	3500 6000 3500 6100
-Wire Wire Line
-	3500 6100 4500 6100
-Wire Wire Line
-	4500 6100 4500 6000
-Wire Wire Line
-	4100 5500 4100 5400
-Wire Wire Line
-	4100 5400 4900 5400
-Wire Wire Line
-	4900 5400 5050 5400
-Wire Wire Line
-	3500 5200 3500 5100
-Wire Wire Line
-	3500 5100 4900 5100
+	9250 4850 8800 4850
 Wire Wire Line
-	4900 5100 5050 5100
+	800  2100 800  2200
 Wire Wire Line
-	3500 5000 4900 5000
-Connection ~ 2000 5200
+	1500 2200 1700 2200
 Wire Wire Line
-	2000 5200 2400 5200
+	1150 3000 1150 3650
 Wire Wire Line
-	2400 5200 2400 5100
-Connection ~ 4900 4700
+	2800 6600 2800 6450
+Connection ~ 750  6850
 Wire Wire Line
-	2800 4800 2800 4700
+	650  6950 650  6850
 Wire Wire Line
-	2800 4700 4900 4700
+	650  6850 1250 6850
+Connection ~ 950  6850
 Wire Wire Line
-	4900 4700 5050 4700
+	950  6950 950  6850
 Wire Wire Line
-	2000 4600 2000 4500
+	7900 1100 8150 1100
 Wire Wire Line
-	2000 4500 4900 4500
+	8350 1700 8350 1400
 Wire Wire Line
-	4900 4500 5050 4500
+	7450 1900 8300 1900
 Wire Wire Line
-	4900 4700 4900 4600
+	1150 650  1600 650 
+Connection ~ 650  900 
 Wire Wire Line
-	4900 4600 4900 4500
+	750  650  650  650 
 Wire Wire Line
-	4900 4500 4900 4400
+	650  650  650  1600
+Connection ~ 800  1600
 Wire Wire Line
-	4900 4400 2050 4400
-Connection ~ 1550 4300
+	1400 900  650  900 
 Wire Wire Line
-	1550 4300 1550 4400
+	650  1600 1000 1600
+Connection ~ 1300 1250
 Wire Wire Line
-	950  4600 950  4700
+	1300 1800 1300 1950
 Wire Wire Line
-	750  4100 950  4100
+	1300 1950 1350 1950
+Connection ~ 1850 2800
 Wire Wire Line
-	950  4100 5050 4100
+	1850 2800 1850 1950
 Wire Wire Line
-	10550 2050 10950 2050
+	1150 2700 2450 2700
 Wire Wire Line
-	9350 1750 8750 1750
+	2950 2900 4700 2900
 Wire Wire Line
-	7450 3700 7900 3700
+	650  2050 650  2200
 Wire Wire Line
-	7450 3500 7900 3500
+	1350 3550 1350 3400
+Connection ~ 1350 2900
 Wire Wire Line
-	9250 2150 9250 2050
+	1150 2900 1550 2900
+Connection ~ 3050 3450
 Wire Wire Line
-	9250 2050 9350 2050
-Connection ~ 2550 7000
+	2850 3450 3300 3450
+Connection ~ 3300 2900
 Wire Wire Line
-	2250 7000 2550 7000
+	3300 3050 3300 2900
+Connection ~ 8950 1950
 Wire Wire Line
-	2550 7000 2850 7000
+	8950 2050 8950 1950
 Wire Wire Line
-	1450 6400 1150 6400
+	6850 1000 7000 1000
+Connection ~ 7550 5300
 Wire Wire Line
-	1150 6400 1150 6850
+	7450 5300 7550 5300
+Connection ~ 9200 3800
 Wire Wire Line
-	1150 6850 1150 7000
-Connection ~ 1150 6850
+	9800 4000 9200 4000
 Wire Wire Line
-	1250 6850 1150 6850
+	9200 4000 9200 3150
 Wire Wire Line
-	1150 6850 800  6850
+	9800 3800 9650 3800
 Wire Wire Line
-	1250 7400 1250 7150
+	9200 3150 9600 3150
 Wire Wire Line
-	2550 7400 2550 7500
+	7450 3800 9200 3800
 Wire Wire Line
-	8200 6550 8200 5750
+	4700 2900 4700 3000
 Wire Wire Line
-	9000 6350 9000 5750
-Connection ~ 9250 5600
+	3450 7550 3450 7600
 Wire Wire Line
-	9400 6250 9400 5750
+	5000 7600 5000 7550
 Wire Wire Line
-	9600 6750 9450 6750
+	4500 7000 5150 7000
 Wire Wire Line
-	7000 6500 7150 6500
+	4700 7600 4700 7550
 Wire Wire Line
-	6300 6700 6500 6700
+	3700 7000 3350 7000
 Wire Wire Line
-	10750 4550 10300 4550
-Connection ~ 4900 4600
-Connection ~ 4900 5300
+	10200 5600 8850 5600
 Wire Wire Line
-	5050 1900 4450 1900
+	9250 5850 9250 5600
 Wire Wire Line
-	4450 1900 4150 1900
+	7700 6650 7700 6500
+Connection ~ 9650 5600
 Wire Wire Line
-	1850 3950 1950 3950
+	10550 6550 8700 6550
 Wire Wire Line
-	1950 3950 2050 3950
-Connection ~ 3300 3950
+	10550 6350 9500 6350
 Wire Wire Line
-	3050 3700 3300 3700
+	7450 2900 8350 2900
 Wire Wire Line
-	3300 3700 3300 3950
+	8750 1950 9350 1950
 Wire Wire Line
-	2600 3950 2450 3950
-Connection ~ 4450 700 
+	7000 1250 7650 1250
 Wire Wire Line
-	4150 700  4450 700 
+	5050 1100 5050 950 
 Wire Wire Line
-	4450 700  4750 700 
+	4750 1000 4750 700 
+Connection ~ 3500 5750
 Wire Wire Line
-	4450 1000 4450 850 
+	3500 5750 3350 5750
+Connection ~ 3500 6000
 Wire Wire Line
-	4750 1600 4750 1800
+	3500 6000 4100 6000
 Wire Wire Line
-	4200 3700 4450 3700
+	4100 6000 4100 5900
 Wire Wire Line
-	4450 3700 4700 3700
+	4500 5600 4500 5500
 Wire Wire Line
-	3700 3100 3700 3400
+	4500 5500 5050 5500
 Wire Wire Line
-	3700 3400 3700 3700
+	3850 5400 3850 5300
 Wire Wire Line
-	5300 6700 5900 6700
+	3850 5300 5050 5300
 Wire Wire Line
-	2900 1600 2400 1600
+	4900 5500 4900 5000
+Connection ~ 3200 4900
 Wire Wire Line
-	2400 1600 2250 1600
+	3200 5000 3200 4850
 Wire Wire Line
-	9300 4550 8800 4550
+	5050 4900 3200 4900
+Connection ~ 2000 5100
 Wire Wire Line
-	7450 4300 8350 4300
-Connection ~ 8250 4400
+	1900 5100 2000 5100
 Wire Wire Line
-	8250 4400 8250 4600
+	2000 5000 2000 5300
 Wire Wire Line
-	8250 4600 7450 4600
+	2000 5300 2800 5300
 Wire Wire Line
-	7450 4100 8350 4100
+	2800 5300 2800 5200
 Wire Wire Line
-	7450 2800 8350 2800
+	2400 4700 2400 4600
 Wire Wire Line
-	7450 2600 8200 2600
+	2400 4600 5050 4600
 Wire Wire Line
-	8200 2600 8350 2600
+	1550 4800 1550 4900
 Wire Wire Line
-	7450 2400 8350 2400
+	1300 4300 5050 4300
+Connection ~ 950  4100
 Wire Wire Line
-	8350 4000 7450 4000
+	950  4200 950  4100
 Wire Wire Line
-	9250 4850 8800 4850
-Connection ~ 8200 2600
+	10550 1950 10950 1950
 Wire Wire Line
-	7450 2700 8200 2700
+	9350 1850 8750 1850
 Wire Wire Line
-	8200 2700 8200 2600
+	7450 3600 7900 3600
 Wire Wire Line
-	8200 2500 8200 2000
-Connection ~ 8200 2500
+	7450 3400 7900 3400
 Wire Wire Line
-	8200 2000 7450 2000
+	10950 1850 10550 1850
 Wire Wire Line
-	9300 2800 9300 3050
+	10550 1750 10700 1750
 Wire Wire Line
-	9300 3050 9600 3050
+	10700 1750 10700 1200
 Wire Wire Line
-	9600 3350 9450 3350
+	2250 6850 2400 6850
 Wire Wire Line
-	9600 2850 9450 2850
+	2400 6850 2400 6400
 Wire Wire Line
-	7450 4400 8250 4400
+	2400 6400 2050 6400
 Wire Wire Line
-	8250 4400 8350 4400
-Connection ~ 3900 1800
+	950  7350 950  7500
 Wire Wire Line
-	3900 1800 3800 1800
-Connection ~ 3900 1600
+	1250 7000 1150 7000
 Wire Wire Line
-	3900 1600 3800 1600
-Connection ~ 3900 1400
+	2250 7500 2250 7150
 Wire Wire Line
-	3900 1400 3800 1400
-Connection ~ 3900 1200
+	8600 6450 8600 5750
 Wire Wire Line
-	3800 1200 3900 1200
-Connection ~ 2800 1000
+	8950 6750 8800 6750
+Connection ~ 7150 6600
 Wire Wire Line
-	2800 1000 2800 850 
+	7000 6700 7150 6700
 Wire Wire Line
-	2800 850  3900 850 
+	7150 6700 7150 6500
 Wire Wire Line
-	3900 850  3900 1000
+	7300 6600 7150 6600
 Wire Wire Line
-	3900 1000 3800 1000
-Connection ~ 1600 1300
+	6300 6500 6500 6500
 Wire Wire Line
-	1750 1400 1600 1400
-Connection ~ 1600 1100
+	10100 6750 10550 6750
 Wire Wire Line
-	1600 1200 1750 1200
-Connection ~ 2400 1600
-Connection ~ 2600 1300
+	10800 5050 10350 5050
 Wire Wire Line
-	2250 1300 2600 1300
+	8800 5050 9250 5050
 Wire Wire Line
-	2600 1300 2900 1300
+	8800 4950 9250 4950
+Connection ~ 4900 4500
+Connection ~ 4900 4300
+Connection ~ 4900 5400
+Connection ~ 4900 5100
+Connection ~ 4900 5500
 Wire Wire Line
-	2900 1100 2250 1100
+	5050 1800 4750 1800
+Connection ~ 1950 3950
 Wire Wire Line
-	5050 2500 2400 2500
+	1950 3950 1950 3700
 Wire Wire Line
-	2500 1400 2500 1500
+	1950 3700 2650 3700
 Wire Wire Line
-	2500 1500 2500 2400
+	3100 3950 4800 3950
 Wire Wire Line
-	2500 2400 5050 2400
+	4800 3950 4800 3800
 Wire Wire Line
-	2700 1200 2700 2200
+	4800 3800 5050 3800
 Wire Wire Line
-	5050 3000 4700 3000
+	4150 1050 4150 700 
 Wire Wire Line
-	8350 4200 8200 4200
+	4450 650  4450 700 
 Wire Wire Line
-	8200 4200 7450 4200
+	4150 1550 4150 1900
 Wire Wire Line
-	3700 3100 3800 3100
+	4450 1600 4450 2100
 Wire Wire Line
-	4700 3700 4700 3500
+	4200 3100 4700 3100
+Connection ~ 3700 3400
 Wire Wire Line
-	4700 3500 5050 3500
+	3600 3400 3700 3400
 Wire Wire Line
-	4700 3300 4700 3100
-Connection ~ 4750 6000
+	5300 6500 5900 6500
 Wire Wire Line
-	4750 6000 5050 6000
-Connection ~ 4750 5800
+	2400 1600 2400 2500
 Wire Wire Line
-	5050 5800 4750 5800
+	2900 1700 2800 1700
 Wire Wire Line
-	5050 5700 4750 5700
+	9450 2950 9450 3350
 Wire Wire Line
-	4750 5700 4750 5800
+	7450 4700 8200 4700
+Connection ~ 8200 4200
 Wire Wire Line
-	4750 5800 4750 5900
+	8200 4700 8200 4200
 Wire Wire Line
-	4750 5900 4750 6000
+	7450 3000 7900 3000
 Wire Wire Line
-	4750 6000 4750 6150
+	7900 3100 7450 3100
 Wire Wire Line
-	4750 5900 5050 5900
-Connection ~ 4750 5900
-Connection ~ 4450 3100
+	7450 2500 8350 2500
 Wire Wire Line
-	4700 3300 5050 3300
-Connection ~ 4450 3700
+	10350 4850 10800 4850
 Wire Wire Line
-	3700 3700 3800 3700
+	9450 2950 9600 2950
 Wire Wire Line
-	4800 2900 5050 2900
+	9450 2700 9450 2850
+Connection ~ 3900 1900
 Wire Wire Line
-	2700 2200 5050 2200
+	3800 1900 3900 1900
+Connection ~ 3900 1700
 Wire Wire Line
-	5050 2300 2600 2300
+	3900 1700 3800 1700
+Connection ~ 3900 1500
 Wire Wire Line
-	2600 2300 2600 1300
+	3900 1500 3800 1500
+Connection ~ 3900 1300
 Wire Wire Line
-	2900 1500 2500 1500
-Connection ~ 2500 1500
+	3900 1300 3800 1300
 Wire Wire Line
-	2800 2100 4450 2100
+	3900 2000 3900 1100
 Wire Wire Line
-	2800 2100 2800 1700
-Connection ~ 4450 1900
+	3900 1100 3800 1100
+Connection ~ 1600 1400
 Wire Wire Line
-	2250 1200 2700 1200
+	1600 950  1600 1600
 Wire Wire Line
-	2700 1200 2900 1200
-Connection ~ 2700 1200
+	1600 1600 1750 1600
+Connection ~ 1600 1200
 Wire Wire Line
-	2250 1400 2500 1400
+	1600 1300 1750 1300
+Connection ~ 1600 1000
 Wire Wire Line
-	2500 1400 2900 1400
-Connection ~ 2500 1400
+	1600 1000 2900 1000
 Wire Wire Line
 	1600 1100 1750 1100
+Connection ~ 2500 1400
 Wire Wire Line
-	2900 1000 2800 1000
-Wire Wire Line
-	2800 1000 1600 1000
-Connection ~ 1600 1000
+	2250 1400 2900 1400
+Connection ~ 2700 1200
 Wire Wire Line
-	1600 1300 1750 1300
-Connection ~ 1600 1200
+	2250 1200 2900 1200
+Connection ~ 4450 1900
 Wire Wire Line
-	1750 1600 1600 1600
+	2800 1700 2800 2100
 Wire Wire Line
-	1600 1600 1600 1400
+	2800 2100 4450 2100
+Connection ~ 2500 1500
 Wire Wire Line
-	1600 1400 1600 1300
+	2900 1500 2500 1500
 Wire Wire Line
-	1600 1300 1600 1200
+	2600 1300 2600 2300
 Wire Wire Line
-	1600 1200 1600 1100
+	2600 2300 5050 2300
 Wire Wire Line
-	1600 1100 1600 1000
+	5050 2200 2700 2200
 Wire Wire Line
-	1600 1000 1600 950 
-Connection ~ 1600 1400
+	5050 2900 4800 2900
 Wire Wire Line
-	3800 1100 3900 1100
+	3800 3700 3700 3700
+Connection ~ 4450 3700
 Wire Wire Line
-	3900 1100 3900 1200
+	5050 3300 4700 3300
+Connection ~ 4450 3100
+Connection ~ 4750 5900
 Wire Wire Line
-	3900 1200 3900 1300
+	4750 5900 5050 5900
 Wire Wire Line
-	3900 1300 3900 1400
+	4750 6150 4750 5700
 Wire Wire Line
-	3900 1400 3900 1500
+	4750 5700 5050 5700
 Wire Wire Line
-	3900 1500 3900 1600
+	5050 5800 4750 5800
+Connection ~ 4750 5800
 Wire Wire Line
-	3900 1600 3900 1700
+	4750 6000 5050 6000
+Connection ~ 4750 6000
 Wire Wire Line
-	3900 1700 3900 1800
+	4700 3300 4700 3100
 Wire Wire Line
-	3900 1800 3900 1900
+	5050 3500 4700 3500
 Wire Wire Line
-	3900 1900 3900 2000
+	4700 3500 4700 3700
 Wire Wire Line
-	3900 1300 3800 1300
-Connection ~ 3900 1300
+	3800 3100 3700 3100
 Wire Wire Line
-	3900 1500 3800 1500
-Connection ~ 3900 1500
+	8350 4200 7450 4200
 Wire Wire Line
-	3900 1700 3800 1700
-Connection ~ 3900 1700
+	4700 3000 5050 3000
 Wire Wire Line
-	3800 1900 3900 1900
-Connection ~ 3900 1900
+	2700 2200 2700 1200
 Wire Wire Line
-	9450 2850 9450 2700
+	5050 2400 2500 2400
 Wire Wire Line
-	9600 2950 9450 2950
+	2500 2400 2500 1400
 Wire Wire Line
-	10350 4850 10800 4850
+	2400 2500 5050 2500
 Wire Wire Line
-	7450 2500 8200 2500
+	2900 1100 2250 1100
 Wire Wire Line
-	8200 2500 8350 2500
+	2250 1300 2900 1300
+Connection ~ 2600 1300
+Connection ~ 2400 1600
 Wire Wire Line
-	7900 3100 7450 3100
+	1600 1200 1750 1200
+Connection ~ 1600 1100
 Wire Wire Line
-	7450 3000 7900 3000
+	1750 1400 1600 1400
+Connection ~ 1600 1300
 Wire Wire Line
-	8200 4200 8200 4700
-Connection ~ 8200 4200
+	3800 1000 3900 1000
 Wire Wire Line
-	8200 4700 7450 4700
+	3900 1000 3900 850 
 Wire Wire Line
-	9450 2950 9450 3350
+	3900 850  2800 850 
 Wire Wire Line
-	2800 1700 2900 1700
+	2800 850  2800 1000
+Connection ~ 2800 1000
 Wire Wire Line
-	2400 2500 2400 1600
+	3800 1200 3900 1200
+Connection ~ 3900 1200
 Wire Wire Line
-	5300 6500 5900 6500
+	3900 1400 3800 1400
+Connection ~ 3900 1400
 Wire Wire Line
-	3600 3400 3700 3400
-Connection ~ 3700 3400
+	3900 1600 3800 1600
+Connection ~ 3900 1600
 Wire Wire Line
-	4700 3100 4450 3100
+	3900 1800 3800 1800
+Connection ~ 3900 1800
 Wire Wire Line
-	4450 3100 4200 3100
+	7450 4400 8350 4400
 Wire Wire Line
-	4450 2100 4450 1900
+	9450 2850 9600 2850
 Wire Wire Line
-	4450 1900 4450 1600
+	9450 3350 9600 3350
 Wire Wire Line
-	4150 1900 4150 1550
+	9600 3050 9300 3050
 Wire Wire Line
-	4450 650  4450 700 
+	9300 3050 9300 2800
 Wire Wire Line
-	4150 700  4150 1050
+	7450 2000 8200 2000
+Connection ~ 8200 2500
 Wire Wire Line
-	5050 3800 4800 3800
+	8200 2000 8200 2500
 Wire Wire Line
-	4800 3800 4800 3950
+	8200 2600 8200 2700
 Wire Wire Line
-	4800 3950 3300 3950
+	8200 2700 7450 2700
+Connection ~ 8200 2600
 Wire Wire Line
-	3300 3950 3100 3950
+	8350 4000 7450 4000
 Wire Wire Line
-	2650 3700 1950 3700
+	7450 2400 8350 2400
 Wire Wire Line
-	1950 3700 1950 3950
-Connection ~ 1950 3950
+	7450 2600 8350 2600
 Wire Wire Line
-	4750 1800 5050 1800
-Connection ~ 4900 5500
-Connection ~ 4900 5100
-Connection ~ 4900 5400
-Connection ~ 4900 4300
-Connection ~ 4900 4500
+	7450 2800 8350 2800
 Wire Wire Line
-	8800 4950 9250 4950
+	7450 4100 8350 4100
 Wire Wire Line
-	8800 5050 9250 5050
+	7450 4600 8250 4600
 Wire Wire Line
-	10800 5050 10350 5050
+	8250 4600 8250 4400
+Connection ~ 8250 4400
 Wire Wire Line
-	10100 6750 10550 6750
+	7450 4300 8350 4300
 Wire Wire Line
-	6300 6500 6500 6500
+	9300 4550 8800 4550
 Wire Wire Line
-	7300 6600 7150 6600
+	2900 1600 2250 1600
 Wire Wire Line
-	7150 6500 7150 6600
+	5300 6700 5900 6700
 Wire Wire Line
-	7150 6600 7150 6700
+	3700 3100 3700 3700
 Wire Wire Line
-	7150 6700 7000 6700
-Connection ~ 7150 6600
+	4700 3700 4200 3700
 Wire Wire Line
-	8950 6750 8800 6750
+	4750 1800 4750 1600
 Wire Wire Line
-	8600 6450 8600 5750
+	4450 1000 4450 850 
 Wire Wire Line
-	2250 7500 2250 7150
+	4150 700  4750 700 
+Connection ~ 4450 700 
 Wire Wire Line
-	1150 7000 1250 7000
+	2600 3950 2450 3950
 Wire Wire Line
-	950  7250 950  7400
+	3300 3950 3300 3700
 Wire Wire Line
-	2050 6400 2400 6400
+	3300 3700 3050 3700
+Connection ~ 3300 3950
 Wire Wire Line
-	2400 6400 2400 6850
+	1850 3950 2050 3950
 Wire Wire Line
-	2400 6850 2250 6850
+	4150 1900 5050 1900
+Connection ~ 4900 5300
+Connection ~ 4900 4600
 Wire Wire Line
-	10700 1200 10700 1350
+	6300 6700 6500 6700
 Wire Wire Line
-	10700 1350 10700 1750
+	7150 6500 7000 6500
 Wire Wire Line
-	10700 1750 10550 1750
+	9600 6750 9450 6750
 Wire Wire Line
-	10950 1850 10550 1850
+	9400 6250 9400 5750
+Connection ~ 9250 5600
 Wire Wire Line
-	7450 3400 7900 3400
+	9000 6350 9000 5750
 Wire Wire Line
-	7450 3600 7900 3600
+	8200 6550 8200 5750
 Wire Wire Line
-	9350 1850 8750 1850
+	2550 7400 2550 7500
 Wire Wire Line
-	10550 1950 10950 1950
+	1250 7400 1250 7150
+Connection ~ 1150 6850
 Wire Wire Line
-	950  4200 950  4100
-Connection ~ 950  4100
+	1150 7000 1150 6400
 Wire Wire Line
-	1300 4300 1550 4300
+	1150 6400 1450 6400
+Connection ~ 2550 7000
 Wire Wire Line
-	1550 4300 4900 4300
+	9350 2050 9250 2050
 Wire Wire Line
-	4900 4300 5050 4300
+	9250 2050 9250 2150
 Wire Wire Line
-	1550 4800 1550 4900
+	7450 3500 7900 3500
 Wire Wire Line
-	5050 4600 4900 4600
+	7450 3700 7900 3700
 Wire Wire Line
-	4900 4600 2400 4600
+	9350 1750 8750 1750
 Wire Wire Line
-	2400 4600 2400 4700
+	10550 2050 10950 2050
 Wire Wire Line
-	2800 5200 2800 5300
+	750  4100 5050 4100
 Wire Wire Line
-	2800 5300 2000 5300
+	950  4600 950  4700
 Wire Wire Line
-	2000 5300 2000 5200
+	1550 4400 1550 4300
+Connection ~ 1550 4300
 Wire Wire Line
-	2000 5200 2000 5100
+	2050 4400 4900 4400
 Wire Wire Line
-	2000 5100 2000 5000
+	4900 4400 4900 4700
 Wire Wire Line
-	1900 5100 2000 5100
-Connection ~ 2000 5100
+	5050 4500 2000 4500
 Wire Wire Line
-	5050 4900 3200 4900
+	2000 4500 2000 4600
 Wire Wire Line
-	3200 5000 3200 4900
+	5050 4700 2800 4700
 Wire Wire Line
-	3200 4900 3200 4850
-Connection ~ 3200 4900
+	2800 4700 2800 4800
+Connection ~ 4900 4700
 Wire Wire Line
-	4900 5000 4900 5100
+	2400 5100 2400 5200
 Wire Wire Line
-	4900 5100 4900 5300
+	2400 5200 2000 5200
+Connection ~ 2000 5200
 Wire Wire Line
-	4900 5300 4900 5400
+	4900 5000 3500 5000
 Wire Wire Line
-	4900 5400 4900 5500
+	5050 5100 3500 5100
 Wire Wire Line
-	5050 5300 4900 5300
+	3500 5100 3500 5200
 Wire Wire Line
-	4900 5300 3850 5300
+	5050 5400 4100 5400
 Wire Wire Line
-	3850 5300 3850 5400
+	4100 5400 4100 5500
 Wire Wire Line
-	5050 5500 4900 5500
+	4500 6000 4500 6100
 Wire Wire Line
-	4900 5500 4500 5500
+	4500 6100 3500 6100
 Wire Wire Line
-	4500 5500 4500 5600
+	3500 6100 3500 5600
 Wire Wire Line
-	4100 5900 4100 6000
+	3850 5800 3850 5900
 Wire Wire Line
-	4100 6000 3500 6000
-Connection ~ 3500 6000
+	3850 5900 3500 5900
+Connection ~ 3500 5900
 Wire Wire Line
-	3500 5750 3350 5750
-Connection ~ 3500 5750
+	3200 5400 3200 5500
 Wire Wire Line
-	4750 700  4750 1000
+	5050 1700 5050 1500
 Wire Wire Line
-	5050 1100 5050 950 
+	6200 1250 6400 1250
 Wire Wire Line
-	7000 1250 7650 1250
+	10950 1350 10700 1350
+Connection ~ 10700 1350
 Wire Wire Line
-	8750 1950 8950 1950
+	7450 3300 7900 3300
 Wire Wire Line
-	8950 1950 9350 1950
+	9900 6250 10550 6250
 Wire Wire Line
-	7450 2900 8350 2900
+	10550 6450 9100 6450
 Wire Wire Line
-	10550 6350 9500 6350
+	7450 5100 7900 5100
 Wire Wire Line
-	10550 6550 8700 6550
-Connection ~ 9650 5600
+	8250 5450 8100 5450
 Wire Wire Line
-	7700 6650 7700 6500
+	7450 5600 7700 5600
 Wire Wire Line
-	9250 5850 9250 5600
+	7700 5450 7700 5800
+Connection ~ 7700 5600
 Wire Wire Line
-	8850 5600 9250 5600
+	8850 5600 8850 5950
 Wire Wire Line
-	9250 5600 9650 5600
+	9650 5600 9650 5750
 Wire Wire Line
-	9650 5600 10200 5600
+	8450 6050 8450 5600
 Wire Wire Line
-	3700 7000 3550 7000
+	3550 7000 3550 7150
 Wire Wire Line
-	3550 7000 3450 7000
+	3550 7150 3700 7150
+Connection ~ 3550 7000
 Wire Wire Line
-	3450 7000 3350 7000
+	4100 7600 4100 7400
 Wire Wire Line
-	4700 7600 4700 7550
+	4700 7150 4500 7150
 Wire Wire Line
-	4500 7000 5000 7000
+	5000 7150 5000 7000
+Connection ~ 5000 7000
 Wire Wire Line
-	5000 7000 5150 7000
+	3450 7000 3450 7150
+Connection ~ 3450 7000
 Wire Wire Line
-	5000 7600 5000 7550
+	9300 3900 9300 3250
 Wire Wire Line
-	3450 7550 3450 7600
+	9300 3250 9600 3250
 Wire Wire Line
-	4700 3000 4700 2900
+	7450 3900 9800 3900
+Connection ~ 9300 3900
 Wire Wire Line
-	9200 3800 7450 3800
+	7450 5400 7550 5400
 Wire Wire Line
-	9600 3150 9200 3150
+	7550 5400 7550 5200
 Wire Wire Line
-	9800 3800 9650 3800
+	7450 5200 7650 5200
+Connection ~ 7550 5200
 Wire Wire Line
-	9200 3150 9200 3800
+	7500 1000 7650 1000
 Wire Wire Line
-	9200 3800 9200 4000
+	7650 1000 7650 1700
+Connection ~ 7650 1250
 Wire Wire Line
-	9200 4000 9800 4000
-Connection ~ 9200 3800
+	8950 2550 8950 2650
 Wire Wire Line
-	7450 5300 7550 5300
-Connection ~ 7550 5300
+	4800 2900 4800 2700
 Wire Wire Line
-	6850 1000 7000 1000
+	3050 3050 3050 2700
+Connection ~ 3050 2700
 Wire Wire Line
-	8950 2050 8950 1950
-Connection ~ 8950 1950
+	2450 2900 2450 2800
 Wire Wire Line
-	3300 3050 3300 2900
-Connection ~ 3300 2900
+	1550 2900 1550 3600
 Wire Wire Line
-	2850 3450 3050 3450
+	1150 2600 1700 2600
 Wire Wire Line
-	3050 3450 3300 3450
-Connection ~ 3050 3450
+	1700 2600 1700 2200
 Wire Wire Line
-	1550 2900 1350 2900
+	4800 2700 2950 2700
 Wire Wire Line
-	1350 2900 1150 2900
-Connection ~ 1350 2900
+	2450 2800 1150 2800
 Wire Wire Line
-	1350 3550 1350 3400
+	2100 2550 2100 2700
+Connection ~ 2100 2700
 Wire Wire Line
-	650  2200 650  2050
+	2100 2150 2100 1950
 Wire Wire Line
-	4700 2900 3300 2900
+	2100 1950 1850 1950
 Wire Wire Line
-	3300 2900 2950 2900
+	800  1250 800  1600
 Wire Wire Line
-	1150 2700 2100 2700
+	1300 1100 1300 1400
 Wire Wire Line
-	2100 2700 2450 2700
+	7650 1700 7450 1700
 Wire Wire Line
-	1850 1950 1850 2800
-Connection ~ 1850 2800
+	7450 1800 7750 1800
 Wire Wire Line
-	1350 1950 1300 1950
+	7750 1800 7750 1700
 Wire Wire Line
-	1300 1950 1300 1800
-Connection ~ 1300 1250
+	7750 1700 7850 1700
 Wire Wire Line
-	1000 1600 800  1600
+	8550 1100 8900 1100
 Wire Wire Line
-	800  1600 650  1600
+	750  6850 750  6700
 Wire Wire Line
-	650  900  1400 900 
-Connection ~ 800  1600
+	750  6100 750  5950
 Wire Wire Line
-	650  1600 650  900 
+	2250 7000 2800 7000
 Wire Wire Line
-	650  900  650  650 
+	5850 7000 5550 7000
 Wire Wire Line
-	650  650  750  650 
-Connection ~ 650  900 
+	900  3700 900  3550
 Wire Wire Line
-	1150 650  1600 650 
+	900  3550 1150 3550
+Connection ~ 1150 3550
 Wire Wire Line
-	7450 1900 8300 1900
+	650  2200 800  2200
 Wire Wire Line
-	8350 1700 8350 1400
+	10300 4550 10750 4550
 Wire Wire Line
-	7900 1100 8150 1100
+	5700 7150 5700 7000
+Connection ~ 5700 7000
+$Comp
+L PWR_FLAG #FLG02
+U 1 1 4DC82183
+P 5700 7150
+F 0 "#FLG02" H 5700 7420 30  0001 C CNN
+F 1 "PWR_FLAG" H 5700 7380 30  0000 C CNN
+	1    5700 7150
+	-1   0    0    1   
+$EndComp
+$Comp
+L 3V3 #PWR03
+U 1 1 4DC820B7
+P 9600 6750
+F 0 "#PWR03" 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
+U 1 1 4DC815E7
+P 7700 6650
+F 0 "#PWR04" 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
+U 1 1 4DC80D76
+P 10750 4550
+F 0 "#PWR05" H 10750 4650 40  0001 C CNN
+F 1 "3V3" H 10750 4675 40  0000 C CNN
+	1    10750 4550
+	0    1    1    0   
+$EndComp
+$Comp
+L 3V3 #PWR06
+U 1 1 4DC80D4F
+P 7300 6600
+F 0 "#PWR06" 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 #FLG07
+U 1 1 4DC8070F
+P 800 2100
+F 0 "#FLG07" H 800 2370 30  0001 C CNN
+F 1 "PWR_FLAG" H 800 2330 30  0000 C CNN
+	1    800  2100
+	1    0    0    -1  
+$EndComp
+$Comp
+L PWR_FLAG #FLG08
+U 1 1 4DC80677
+P 900 3700
+F 0 "#FLG08" 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 DIODE D5
+U 1 1 4DC80636
+P 5350 7000
+F 0 "D5" H 5350 7100 40  0000 C CNN
+F 1 "1N4148" H 5350 6900 40  0000 C CNN
+	1    5350 7000
+	1    0    0    -1  
+$EndComp
+$Comp
+L DIODE D4
+U 1 1 4DC8060C
+P 2800 6800
+F 0 "D4" H 2800 6900 40  0000 C CNN
+F 1 "1N4148" H 2800 6700 40  0000 C CNN
+	1    2800 6800
+	0    -1   -1   0   
+$EndComp
+$Comp
+L GND #PWR09
+U 1 1 4DC804F4
+P 750 5950
+F 0 "#PWR09" H 750 5950 30  0001 C CNN
+F 1 "GND" H 750 5880 30  0001 C CNN
+	1    750  5950
+	-1   0    0    1   
+$EndComp
+$Comp
+L PWR_FLAG #FLG010
+U 1 1 4DC804C2
+P 650 6950
+F 0 "#FLG010" H 650 7220 30  0001 C CNN
+F 1 "PWR_FLAG" H 650 7180 30  0000 C CNN
+	1    650  6950
+	-1   0    0    1   
+$EndComp
+$Comp
+L BATTERY BT1
+U 1 1 4DC804A6
+P 750 6400
+F 0 "BT1" H 750 6600 50  0000 C CNN
+F 1 "BATTERY" H 750 6210 50  0000 C CNN
+	1    750  6400
+	0    -1   -1   0   
+$EndComp
+$Comp
+L 3V3 #PWR011
+U 1 1 4DC80254
+P 5850 7000
+F 0 "#PWR011" H 5850 7100 40  0001 C CNN
+F 1 "3V3" H 5850 7125 40  0000 C CNN
+	1    5850 7000
+	0    1    1    0   
+$EndComp
+NoConn ~ 7450 3200
+NoConn ~ 7450 4800
+Text Label 8600 1100 0    60   ~ 0
+UDP_PUP
 $Comp
-L R R?
+L R R16
 U 1 1 4DC7A441
 P 8100 1700
-F 0 "R?" V 8180 1700 50  0000 C CNN
+F 0 "R16" V 8180 1700 50  0000 C CNN
 F 1 "10K" V 8100 1700 50  0000 C CNN
 	1    8100 1700
 	0    -1   -1   0   
 $EndComp
 $Comp
-L NPN Q?
+L NPN Q2
 U 1 1 4DC7A43A
 P 8350 1200
-F 0 "Q?" H 8350 1050 50  0000 R CNN
+F 0 "Q2" H 8350 1050 50  0000 R CNN
 F 1 "BC487" V 8750 1200 50  0000 R CNN
 F 4 "45V,100mA" V 8600 1200 50  0000 C CNN "Field1"
 	1    8350 1200
 	0    1    -1   0   
 $EndComp
 $Comp
-L GND #PWR?
+L GND #PWR012
 U 1 1 4DC7A434
 P 7900 1100
-F 0 "#PWR?" H 7900 1100 30  0001 C CNN
+F 0 "#PWR012" H 7900 1100 30  0001 C CNN
 F 1 "GND" H 7900 1030 30  0001 C CNN
 	1    7900 1100
 	0    1    1    0   
@@ -871,39 +856,39 @@ Text Label 1250 650  0    60   ~ 0
 Text Label 750  900  0    60   ~ 0
 UDP_PUP
 $Comp
-L ZENER D?
+L ZENER D1
 U 1 1 4DC7A27C
 P 950 650
-F 0 "D?" H 950 750 50  0000 C CNN
+F 0 "D1" H 950 750 50  0000 C CNN
 F 1 "Schottky" H 950 550 40  0000 C CNN
 F 4 "45V,100m" H 1300 550 50  0000 C CNN "Field1"
 	1    950  650 
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR?
+L 3V3 #PWR013
 U 1 1 4DC7A233
 P 1300 1100
-F 0 "#PWR?" H 1300 1200 40  0001 C CNN
+F 0 "#PWR013" H 1300 1200 40  0001 C CNN
 F 1 "3V3" H 1300 1225 40  0000 C CNN
 	1    1300 1100
 	1    0    0    -1  
 $EndComp
 $Comp
-L NPN Q?
+L NPN Q1
 U 1 1 4DC7A1CA
 P 1200 1600
-F 0 "Q?" H 1200 1450 50  0000 R CNN
+F 0 "Q1" H 1200 1450 50  0000 R CNN
 F 1 "BC847" H 1050 1500 50  0000 R CNN
 F 4 "45V,100mA" H 850 1400 50  0000 C CNN "Field1"
 	1    1200 1600
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR?
+L 3V3 #PWR014
 U 1 1 4DC79FE6
 P 1350 3550
-F 0 "#PWR?" H 1350 3650 40  0001 C CNN
+F 0 "#PWR014" H 1350 3650 40  0001 C CNN
 F 1 "3V3" H 1350 3675 40  0000 C CNN
 	1    1350 3550
 	-1   0    0    1   
@@ -911,82 +896,82 @@ $EndComp
 Text Label 1550 3500 1    60   ~ 0
 A-B-DETECT
 $Comp
-L GND #PWR?
+L GND #PWR015
 U 1 1 4DC79F9B
 P 2850 3450
-F 0 "#PWR?" H 2850 3450 30  0001 C CNN
+F 0 "#PWR015" H 2850 3450 30  0001 C CNN
 F 1 "GND" H 2850 3380 30  0001 C CNN
 	1    2850 3450
 	0    1    1    0   
 $EndComp
 $Comp
-L C C?
+L C C5
 U 1 1 4DC79EDF
 P 2100 2350
-F 0 "C?" H 2150 2450 50  0000 L CNN
-F 1 "C" H 2150 2250 50  0000 L CNN
+F 0 "C5" H 2150 2450 50  0000 L CNN
+F 1 "33pF" H 2150 2250 50  0000 L CNN
 	1    2100 2350
 	-1   0    0    1   
 $EndComp
 $Comp
-L C C?
+L C C13
 U 1 1 4DC79EDC
 P 3300 3250
-F 0 "C?" H 3350 3350 50  0000 L CNN
+F 0 "C13" H 3350 3350 50  0000 L CNN
 F 1 "15pF" H 3350 3150 50  0000 L CNN
 	1    3300 3250
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C?
+L C C11
 U 1 1 4DC79ED8
 P 3050 3250
-F 0 "C?" H 3100 3350 50  0000 L CNN
+F 0 "C11" H 3100 3350 50  0000 L CNN
 F 1 "15pF" H 3100 3150 50  0000 L CNN
 	1    3050 3250
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R?
+L R R1
 U 1 1 4DC79ED1
 P 1050 1250
-F 0 "R?" V 1130 1250 50  0000 C CNN
+F 0 "R1" V 1130 1250 50  0000 C CNN
 F 1 "100K" V 1050 1250 50  0000 C CNN
 	1    1050 1250
 	0    1    1    0   
 $EndComp
 $Comp
-L R R?
+L R R3
 U 1 1 4DC79ECE
 P 1600 1950
-F 0 "R?" V 1680 1950 50  0000 C CNN
+F 0 "R3" V 1680 1950 50  0000 C CNN
 F 1 "1K5" V 1600 1950 50  0000 C CNN
 	1    1600 1950
 	0    1    1    0   
 $EndComp
 $Comp
-L R R?
+L R R9
 U 1 1 4DC79EAD
 P 2700 2700
-F 0 "R?" V 2780 2700 50  0000 C CNN
+F 0 "R9" V 2780 2700 50  0000 C CNN
 F 1 "27R" V 2700 2700 50  0000 C CNN
 	1    2700 2700
 	0    1    1    0   
 $EndComp
 $Comp
-L R R?
+L R R10
 U 1 1 4DC79EA7
 P 2700 2900
-F 0 "R?" V 2780 2900 50  0000 C CNN
+F 0 "R10" V 2780 2900 50  0000 C CNN
 F 1 "27R" V 2700 2900 50  0000 C CNN
 	1    2700 2900
 	0    1    1    0   
 $EndComp
 $Comp
-L R R?
+L R R2
 U 1 1 4DC79E9A
 P 1350 3150
-F 0 "R?" V 1430 3150 50  0000 C CNN
+F 0 "R2" V 1430 3150 50  0000 C CNN
 F 1 "10K" V 1350 3150 50  0000 C CNN
 	1    1350 3150
 	1    0    0    -1  
@@ -1001,145 +986,145 @@ F 1 "USB-B_MINI" H 650 2350 50  0000 L BNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L FILTER FB?
+L FILTER FB1
 U 1 1 4DC79E48
-P 1000 2200
-F 0 "FB?" H 1000 2350 60  0000 C CNN
-F 1 "FILTER" H 1000 2100 60  0000 C CNN
-	1    1000 2200
+P 1150 2200
+F 0 "FB1" H 1150 2350 60  0000 C CNN
+F 1 "FILTER" H 1150 2100 60  0000 C CNN
+	1    1150 2200
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR?
+L GND #PWR016
 U 1 1 4DC799FC
 P 8950 2650
-F 0 "#PWR?" H 8950 2650 30  0001 C CNN
+F 0 "#PWR016" H 8950 2650 30  0001 C CNN
 F 1 "GND" H 8950 2580 30  0001 C CNN
 	1    8950 2650
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R?
+L R R17
 U 1 1 4DC799F2
 P 8950 2300
-F 0 "R?" V 9030 2300 50  0000 C CNN
+F 0 "R17" V 9030 2300 50  0000 C CNN
 F 1 "10k" V 8950 2300 50  0000 C CNN
 	1    8950 2300
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?
+L GND #PWR017
 U 1 1 4DC790F9
 P 6850 1000
-F 0 "#PWR?" H 6850 1000 30  0001 C CNN
+F 0 "#PWR017" H 6850 1000 30  0001 C CNN
 F 1 "GND" H 6850 930 30  0001 C CNN
 	1    6850 1000
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR?
+L GND #PWR018
 U 1 1 4DC790AF
 P 7650 5200
-F 0 "#PWR?" H 7650 5200 30  0001 C CNN
+F 0 "#PWR018" 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 #PWR?
+L GND #PWR019
 U 1 1 4DC6ABFD
 P 9650 3800
-F 0 "#PWR?" H 9650 3800 30  0001 C CNN
+F 0 "#PWR019" 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 JACK J?
+L JACK J2
 U 1 1 4DC6ABE9
 P 10100 3900
-F 0 "J?" H 10100 4050 50  0000 L BNN
+F 0 "J2" H 10100 4050 50  0000 L BNN
 F 1 "JACK" H 10050 3700 50  0000 L BNN
 	1    10100 3900
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?
+L GND #PWR020
 U 1 1 4DC6A8EB
-P 1150 3150
-F 0 "#PWR?" H 1150 3150 30  0001 C CNN
-F 1 "GND" H 1150 3080 30  0001 C CNN
-	1    1150 3150
+P 1150 3650
+F 0 "#PWR020" 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 #PWR?
+L GND #PWR021
 U 1 1 4DC6A5F7
 P 3450 7600
-F 0 "#PWR?" H 3450 7600 30  0001 C CNN
+F 0 "#PWR021" H 3450 7600 30  0001 C CNN
 F 1 "GND" H 3450 7530 30  0001 C CNN
 	1    3450 7600
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?
+L GND #PWR022
 U 1 1 4DC6A5F4
 P 5000 7600
-F 0 "#PWR?" H 5000 7600 30  0001 C CNN
+F 0 "#PWR022" H 5000 7600 30  0001 C CNN
 F 1 "GND" H 5000 7530 30  0001 C CNN
 	1    5000 7600
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?
+L GND #PWR023
 U 1 1 4DC6A5F0
 P 4700 7600
-F 0 "#PWR?" H 4700 7600 30  0001 C CNN
+F 0 "#PWR023" H 4700 7600 30  0001 C CNN
 F 1 "GND" H 4700 7530 30  0001 C CNN
 	1    4700 7600
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C?
+L C C14
 U 1 1 4DC6A5DE
 P 3450 7350
-F 0 "C?" H 3500 7450 50  0000 L CNN
+F 0 "C14" H 3500 7450 50  0000 L CNN
 F 1 "1uF" H 3500 7250 50  0000 L CNN
 	1    3450 7350
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C?
+L C C22
 U 1 1 4DC6A5D9
 P 5000 7350
-F 0 "C?" H 5050 7450 50  0000 L CNN
+F 0 "C22" H 5050 7450 50  0000 L CNN
 F 1 "1uF" H 5050 7250 50  0000 L CNN
 	1    5000 7350
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C?
+L C C21
 U 1 1 4DC6A5CB
 P 4700 7350
-F 0 "C?" H 4750 7450 50  0000 L CNN
+F 0 "C21" H 4750 7450 50  0000 L CNN
 F 1 "10nF" H 4750 7250 50  0000 L CNN
 	1    4700 7350
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?
+L GND #PWR024
 U 1 1 4DC6A577
 P 4100 7600
-F 0 "#PWR?" H 4100 7600 30  0001 C CNN
+F 0 "#PWR024" H 4100 7600 30  0001 C CNN
 F 1 "GND" H 4100 7530 30  0001 C CNN
 	1    4100 7600
 	1    0    0    -1  
 $EndComp
 $Comp
-L TPS736XX IC?
+L TPS736XX IC2
 U 1 1 4DC6A52E
 P 4100 7200
-F 0 "IC?" H 4100 7650 60  0000 C CNN
+F 0 "IC2" H 4100 7650 60  0000 C CNN
 F 1 "TPS73633" H 4100 7550 60  0000 C CNN
 	1    4100 7200
 	1    0    0    -1  
@@ -1147,82 +1132,73 @@ $EndComp
 Text Label 8450 5950 1    60   ~ 0
 I/O_SW
 $Comp
-L QS3244 IC?
+L QS3244 IC4
 U 9 1 4DC6A187
 P 9200 6650
-F 0 "IC?" V 9200 6650 60  0000 C CNN
+F 0 "IC4" V 9200 6650 60  0000 C CNN
 F 1 "QS3244" V 9400 6650 60  0000 C CNN
 	9    9200 6650
 	0    1    1    0   
 $EndComp
 $Comp
-L QS3244 IC?
+L QS3244 IC4
 U 5 1 4DC6A15F
 P 8450 6450
-F 0 "IC?" V 8600 6450 60  0000 C CNN
+F 0 "IC4" V 8600 6450 60  0000 C CNN
 F 1 "QS3244" H 8250 6300 60  0000 C CNN
 	5    8450 6450
 	0    1    1    0   
 $EndComp
 $Comp
-L QS3244 IC?
+L QS3244 IC4
 U 3 1 4DC6A152
 P 8850 6350
-F 0 "IC?" V 9000 6350 60  0000 C CNN
+F 0 "IC4" V 9000 6350 60  0000 C CNN
 F 1 "QS3244" H 8650 6200 60  0000 C CNN
 	3    8850 6350
 	0    1    1    0   
 $EndComp
 $Comp
-L QS3244 IC?
+L QS3244 IC4
 U 2 1 4DC6A149
 P 9250 6250
-F 0 "IC?" V 9400 6250 60  0000 C CNN
+F 0 "IC4" V 9400 6250 60  0000 C CNN
 F 1 "QS3244" H 9050 6100 60  0000 C CNN
 	2    9250 6250
 	0    1    1    0   
 $EndComp
 $Comp
-L QS3244 IC?
+L QS3244 IC4
 U 1 1 4DC6A134
 P 9650 6150
-F 0 "IC?" V 9800 6150 60  0000 C CNN
+F 0 "IC4" V 9800 6150 60  0000 C CNN
 F 1 "QS3244" H 9450 6000 60  0000 C CNN
 	1    9650 6150
 	0    1    1    0   
 $EndComp
 $Comp
-L C C?
+L C C23
 U 1 1 4DC68E45
 P 7900 5450
-F 0 "C?" H 7950 5550 50  0000 L CNN
+F 0 "C23" H 7950 5550 50  0000 L CNN
 F 1 "100nF" H 7950 5350 50  0000 L CNN
 	1    7900 5450
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR?
+L GND #PWR025
 U 1 1 4DC68E36
 P 8250 5450
-F 0 "#PWR?" H 8250 5450 30  0001 C CNN
+F 0 "#PWR025" H 8250 5450 30  0001 C CNN
 F 1 "GND" H 8250 5380 30  0001 C CNN
 	1    8250 5450
 	0    -1   -1   0   
 $EndComp
 $Comp
-L 3V3 #PWR?
-U 1 1 4DC68E2E
-P 7700 6650
-F 0 "#PWR?" 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 FILTER FB?
+L FILTER FB2
 U 1 1 4DC68E1D
 P 7700 6150
-F 0 "FB?" H 7700 6300 60  0000 C CNN
+F 0 "FB2" H 7700 6300 60  0000 C CNN
 F 1 "100MHz,1A, 39Ohm" H 7700 6050 60  0000 C CNN
 	1    7700 6150
 	0    1    1    0   
@@ -1240,154 +1216,154 @@ WP
 Text Label 7650 1100 3    60   ~ 0
 BOOTLOADER
 $Comp
-L 3V3 #PWR?
+L 3V3 #PWR026
 U 1 1 4DC6854C
 P 6200 1250
-F 0 "#PWR?" H 6200 1350 40  0001 C CNN
+F 0 "#PWR026" H 6200 1350 40  0001 C CNN
 F 1 "3V3" H 6200 1375 40  0000 C CNN
 	1    6200 1250
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R?
+L R R15
 U 1 1 4DC68538
 P 7250 1000
-F 0 "R?" V 7330 1000 50  0000 C CNN
+F 0 "R15" V 7330 1000 50  0000 C CNN
 F 1 "10K" V 7250 1000 50  0000 C CNN
 	1    7250 1000
 	0    -1   -1   0   
 $EndComp
 $Comp
-L SW_PUSH SW?
+L SW_PUSH SW2
 U 1 1 4DC6852C
 P 6700 1250
-F 0 "SW?" H 6850 1360 50  0000 C CNN
+F 0 "SW2" H 6850 1360 50  0000 C CNN
 F 1 "BOOTLOADER" H 6700 1170 50  0000 C CNN
 	1    6700 1250
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR?
+L 3V3 #PWR027
 U 1 1 4DC68405
 P 4450 650
-F 0 "#PWR?" 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 #PWR?
+L 3V3 #PWR028
 U 1 1 4DC683FB
 P 5050 950
-F 0 "#PWR?" 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  
 $EndComp
 $Comp
-L TEST W?
+L TEST W1
 U 1 1 4DC683ED
 P 5050 1300
-F 0 "W?" H 5050 1360 40  0000 C CNN
+F 0 "W1" H 5050 1360 40  0000 C CNN
 F 1 "ERASE" H 5050 1230 40  0000 C CNN
 	1    5050 1300
 	0    1    1    0   
 $EndComp
 $Comp
-L JUMPER JP?
+L JUMPER JP1
 U 1 1 4DC68259
 P 4750 1300
-F 0 "JP?" H 4750 1450 60  0000 C CNN
+F 0 "JP1" H 4750 1450 60  0000 C CNN
 F 1 "TEST" H 4750 1220 40  0000 C CNN
 	1    4750 1300
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR?
+L GND #PWR029
 U 1 1 4DC665D5
 P 3350 5750
-F 0 "#PWR?" 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 #PWR?
+L GND #PWR030
 U 1 1 4DC665D1
 P 3200 5500
-F 0 "#PWR?" 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 #PWR?
+L 1V8 #PWR031
 U 1 1 4DC6650D
 P 3500 5000
-F 0 "#PWR?" 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   
 $EndComp
 $Comp
-L C C?
+L C C19
 U 1 1 4DC664E0
 P 4100 5700
-F 0 "C?" H 4150 5800 50  0000 L CNN
+F 0 "C19" H 4150 5800 50  0000 L CNN
 F 1 "100nF" H 4150 5600 50  0000 L CNN
 	1    4100 5700
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C?
+L C C16
 U 1 1 4DC664DD
 P 3850 5600
-F 0 "C?" H 3900 5700 50  0000 L CNN
+F 0 "C16" H 3900 5700 50  0000 L CNN
 F 1 "100nF" H 3900 5500 50  0000 L CNN
 	1    3850 5600
 	-1   0    0    -1  
 $EndComp
 $Comp
-L CP C?
+L CP C12
 U 1 1 4DC664CD
 P 3200 5200
-F 0 "C?" H 3250 5300 50  0000 L CNN
+F 0 "C12" H 3250 5300 50  0000 L CNN
 F 1 "10uF" H 3250 5100 50  0000 L CNN
 	1    3200 5200
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C?
+L C C4
 U 1 1 4DC66392
 P 2000 4800
-F 0 "C?" H 2050 4900 50  0000 L CNN
+F 0 "C4" H 2050 4900 50  0000 L CNN
 F 1 "100nF" H 2050 4700 50  0000 L CNN
 	1    2000 4800
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR?
+L 3V3 #PWR032
 U 1 1 4DC662E1
 P 1300 4300
-F 0 "#PWR?" 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 #PWR?
+L GND #PWR033
 U 1 1 4DC66159
 P 950 4700
-F 0 "#PWR?" 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  
 $EndComp
 $Comp
-L CP C?
+L CP C1
 U 1 1 4DC6613D
 P 950 4400
-F 0 "C?" H 1000 4500 50  0000 L CNN
+F 0 "C1" H 1000 4500 50  0000 L CNN
 F 1 "10uF" H 1000 4300 50  0000 L CNN
 	1    950  4400
 	-1   0    0    1   
@@ -1409,28 +1385,28 @@ MOSI
 Text Label 7600 3400 0    60   ~ 0
 SCK
 $Comp
-L GND #PWR?
+L GND #PWR034
 U 1 1 4DC5A389
 P 9250 2150
-F 0 "#PWR?" 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  
 $EndComp
 $Comp
-L R R?
+L R R18
 U 1 1 4DC5A30D
 P 10950 1600
-F 0 "R?" V 11030 1600 50  0000 C CNN
+F 0 "R18" V 11030 1600 50  0000 C CNN
 F 1 "10k" V 10950 1600 50  0000 C CNN
 	1    10950 1600
 	-1   0    0    1   
 $EndComp
 $Comp
-L 3V3 #PWR?
+L 3V3 #PWR035
 U 1 1 4DC5A300
 P 10700 1200
-F 0 "#PWR?" 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  
@@ -1438,10 +1414,10 @@ $EndComp
 Text Notes 9650 950  0    100  ~ 20
 MEMORY
 $Comp
-L FLASH_SPI U?
+L FLASH_SPI U1
 U 1 1 4DC5A250
 P 9950 1900
-F 0 "U?" H 9950 2200 60  0000 C CNN
+F 0 "U1" H 9950 2200 60  0000 C CNN
 F 1 "FLASH_SPI" H 9950 1600 60  0000 C CNN
 	1    9950 1900
 	1    0    0    -1  
@@ -1449,91 +1425,82 @@ $EndComp
 Text Notes 1350 6250 0    100  ~ 20
 BATT-POWER
 $Comp
-L 3V3 #PWR?
+L 3V3 #PWR036
 U 1 1 4DC58DC4
-P 2850 7000
-F 0 "#PWR?" H 2850 7100 40  0001 C CNN
-F 1 "3V3" H 2850 7125 40  0000 C CNN
-	1    2850 7000
-	0    1    1    0   
+P 2800 6450
+F 0 "#PWR036" H 2800 6550 40  0001 C CNN
+F 1 "3V3" H 2800 6575 40  0000 C CNN
+	1    2800 6450
+	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?
+L GND #PWR037
 U 1 1 4DC58D93
 P 2250 7500
-F 0 "#PWR?" H 2250 7500 30  0001 C CNN
+F 0 "#PWR037" H 2250 7500 30  0001 C CNN
 F 1 "GND" H 2250 7430 30  0001 C CNN
 	1    2250 7500
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?
+L GND #PWR038
 U 1 1 4DC58D8B
 P 2550 7500
-F 0 "#PWR?" H 2550 7500 30  0001 C CNN
+F 0 "#PWR038" H 2550 7500 30  0001 C CNN
 F 1 "GND" H 2550 7430 30  0001 C CNN
 	1    2550 7500
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?
+L GND #PWR039
 U 1 1 4DC58D84
-P 950 7400
-F 0 "#PWR?" H 950 7400 30  0001 C CNN
-F 1 "GND" H 950 7330 30  0001 C CNN
-	1    950  7400
+P 950 7500
+F 0 "#PWR039" H 950 7500 30  0001 C CNN
+F 1 "GND" H 950 7430 30  0001 C CNN
+	1    950  7500
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?
+L GND #PWR040
 U 1 1 4DC58D7E
 P 1250 7400
-F 0 "#PWR?" H 1250 7400 30  0001 C CNN
+F 0 "#PWR040" H 1250 7400 30  0001 C CNN
 F 1 "GND" H 1250 7330 30  0001 C CNN
 	1    1250 7400
 	1    0    0    -1  
 $EndComp
 $Comp
-L INDUCTOR L?
+L INDUCTOR L1
 U 1 1 4DC58D6B
 P 1750 6400
-F 0 "L?" V 1700 6400 40  0000 C CNN
+F 0 "L1" V 1700 6400 40  0000 C CNN
 F 1 "4.7uH" V 1850 6400 40  0000 C CNN
 	1    1750 6400
 	0    1    1    0   
 $EndComp
 $Comp
-L C C?
+L C C8
 U 1 1 4DC58D42
 P 2550 7200
-F 0 "C?" H 2600 7300 50  0000 L CNN
+F 0 "C8" H 2600 7300 50  0000 L CNN
 F 1 "22uF" H 2600 7100 50  0000 L CNN
 	1    2550 7200
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C?
+L C C2
 U 1 1 4DC58D30
-P 950 7050
-F 0 "C?" H 1000 7150 50  0000 L CNN
-F 1 "22uF" H 1000 6950 50  0000 L CNN
-	1    950  7050
+P 950 7150
+F 0 "C2" H 1000 7250 50  0000 L CNN
+F 1 "22uF" H 1000 7050 50  0000 L CNN
+	1    950  7150
 	1    0    0    -1  
 $EndComp
 $Comp
-L +BATT #PWR?
-U 1 1 4DC58D14
-P 800 6850
-F 0 "#PWR?" H 800 6800 20  0001 C CNN
-F 1 "+BATT" H 800 6950 30  0000 C CNN
-	1    800  6850
-	0    -1   -1   0   
-$EndComp
-$Comp
-L SC120 IC?
+L SC120 IC1
 U 1 1 4DC58CE2
 P 1750 7000
-F 0 "IC?" H 1750 7350 60  0000 C CNN
+F 0 "IC1" H 1750 7350 60  0000 C CNN
 F 1 "SC120" H 1750 6650 60  0000 C CNN
 	1    1750 7000
 	1    0    0    -1  
@@ -1549,82 +1516,73 @@ RST_SIM
 Text Label 9400 6000 1    60   ~ 0
 VCC_SIM
 $Comp
-L GND #PWR?
+L GND #PWR041
 U 1 1 4DC55B6C
 P 8800 6750
-F 0 "#PWR?" H 8800 6750 30  0001 C CNN
+F 0 "#PWR041" H 8800 6750 30  0001 C CNN
 F 1 "GND" H 8800 6680 30  0001 C CNN
 	1    8800 6750
 	0    1    1    0   
 $EndComp
 $Comp
-L 3V3 #PWR?
-U 1 1 4DC55B59
-P 9600 6750
-F 0 "#PWR?" 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 R R?
+L R R14
 U 1 1 4DC555D0
 P 6750 6700
-F 0 "R?" V 6830 6700 50  0000 C CNN
+F 0 "R14" V 6830 6700 50  0000 C CNN
 F 1 "150R" V 6750 6700 50  0000 C CNN
 	1    6750 6700
 	0    1    1    0   
 $EndComp
 $Comp
-L R R10
+L R R13
 U 1 1 4CF7BAEE
 P 6750 6500
-F 0 "R10" V 6830 6500 50  0000 C CNN
+F 0 "R13" V 6830 6500 50  0000 C CNN
 F 1 "150R" V 6750 6500 50  0000 C CNN
 	1    6750 6500
 	0    1    1    0   
 $EndComp
 $Comp
-L REBELSIM P?
+L REBELSIM P3
 U 1 1 4DC51F05
 P 10900 6500
-F 0 "P?" H 10950 6850 60  0000 C CNN
+F 0 "P3" H 10950 6850 60  0000 C CNN
 F 1 "REBELSIM" V 11100 6500 60  0000 C CNN
 	1    10900 6500
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR?
+L 3V3 #PWR042
 U 1 1 4DC5061E
 P 2050 4400
-F 0 "#PWR?" H 2050 4500 40  0001 C CNN
+F 0 "#PWR042" 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 #PWR?
+L GND #PWR043
 U 1 1 4D037F90
 P 1550 4900
-F 0 "#PWR?" H 1550 4900 30  0001 C CNN
+F 0 "#PWR043" 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 #PWR?
+L GND #PWR044
 U 1 1 4D037F8C
 P 1900 5100
-F 0 "#PWR?" H 1900 5100 30  0001 C CNN
+F 0 "#PWR044" H 1900 5100 30  0001 C CNN
 F 1 "GND" H 1900 5030 30  0001 C CNN
 	1    1900 5100
 	0    1    1    0   
 $EndComp
 $Comp
-L C C?
+L C C3
 U 1 1 4D037E30
 P 1550 4600
-F 0 "C?" H 1600 4700 50  0000 L CNN
+F 0 "C3" H 1600 4700 50  0000 L CNN
 F 1 "100nF" H 1600 4500 50  0000 L CNN
 	1    1550 4600
 	1    0    0    -1  
@@ -1650,100 +1608,100 @@ RESET
 Text Notes 2100 800  0    100  ~ 20
 JTAG
 $Comp
-L C C?
+L C C20
 U 1 1 4D020EDF
 P 4500 5800
-F 0 "C?" H 4550 5900 50  0000 L CNN
+F 0 "C20" H 4550 5900 50  0000 L CNN
 F 1 "100nF" H 4550 5700 50  0000 L CNN
 	1    4500 5800
 	-1   0    0    -1  
 $EndComp
 $Comp
-L C C?
+L C C15
 U 1 1 4D020ED8
 P 3500 5400
-F 0 "C?" H 3550 5500 50  0000 L CNN
+F 0 "C15" H 3550 5500 50  0000 L CNN
 F 1 "100nF" H 3550 5300 50  0000 L CNN
 	1    3500 5400
 	1    0    0    1   
 $EndComp
 $Comp
-L GND #PWR?
+L GND #PWR045
 U 1 1 4D020E3B
 P 1850 3950
-F 0 "#PWR?" H 1850 3950 30  0001 C CNN
+F 0 "#PWR045" H 1850 3950 30  0001 C CNN
 F 1 "GND" H 1850 3880 30  0001 C CNN
 	1    1850 3950
 	0    1    1    0   
 $EndComp
 $Comp
-L C C?
+L C C6
 U 1 1 4D020DD3
 P 2250 3950
-F 0 "C?" H 2300 4050 50  0000 L CNN
+F 0 "C6" H 2300 4050 50  0000 L CNN
 F 1 "10nF" H 2300 3850 50  0000 L CNN
 	1    2250 3950
 	0    -1   -1   0   
 $EndComp
 $Comp
-L C C?
+L C C10
 U 1 1 4D020DCD
 P 2850 3700
-F 0 "C?" H 2900 3800 50  0000 L CNN
+F 0 "C10" H 2900 3800 50  0000 L CNN
 F 1 "1nF" H 2900 3600 50  0000 L CNN
 	1    2850 3700
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R?
+L R R11
 U 1 1 4D020DC6
 P 2850 3950
-F 0 "R?" V 2930 3950 50  0000 C CNN
+F 0 "R11" V 2930 3950 50  0000 C CNN
 F 1 "1k5" V 2850 3950 50  0000 C CNN
 	1    2850 3950
 	0    1    1    0   
 $EndComp
 $Comp
-L C C?
+L C C9
 U 1 1 4D020BEB
 P 2800 5000
-F 0 "C?" H 2850 5100 50  0000 L CNN
+F 0 "C9" H 2850 5100 50  0000 L CNN
 F 1 "100nF" H 2850 4900 50  0000 L CNN
 	1    2800 5000
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C?
+L C C7
 U 1 1 4D020BDE
 P 2400 4900
-F 0 "C?" H 2450 5000 50  0000 L CNN
+F 0 "C7" H 2450 5000 50  0000 L CNN
 F 1 "100nF" H 2450 4800 50  0000 L CNN
 	1    2400 4900
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?
+L GND #PWR046
 U 1 1 4D020854
 P 4450 850
-F 0 "#PWR?" H 4450 850 30  0001 C CNN
+F 0 "#PWR046" H 4450 850 30  0001 C CNN
 F 1 "GND" H 4450 780 30  0001 C CNN
 	1    4450 850 
 	-1   0    0    1   
 $EndComp
 $Comp
-L SW_PUSH SW?
+L SW_PUSH SW1
 U 1 1 4D020733
 P 4450 1300
-F 0 "SW?" H 4600 1410 50  0000 C CNN
+F 0 "SW1" H 4600 1410 50  0000 C CNN
 F 1 "RESET" H 4450 1220 50  0000 C CNN
 	1    4450 1300
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R?
+L R R12
 U 1 1 4D0206C7
 P 4150 1300
-F 0 "R?" V 4230 1300 50  0000 C CNN
+F 0 "R12" V 4230 1300 50  0000 C CNN
 F 1 "100k" V 4150 1300 50  0000 C CNN
 	1    4150 1300
 	1    0    0    -1  
@@ -1753,30 +1711,21 @@ LED_G
 Text Label 5400 6500 0    60   ~ 0
 LED_R
 $Comp
-L 3V3 #PWR?
-U 1 1 4CFF81DF
-P 7300 6600
-F 0 "#PWR?" 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 JTAG P3
+L JTAG P1
 U 1 1 4CFCD6C9
 P 3350 1450
-F 0 "P3" H 3350 2000 60  0000 C CNN
+F 0 "P1" H 3350 2000 60  0000 C CNN
 F 1 "JTAG" H 3350 900 50  0000 C CNN
 	1    3350 1450
 	1    0    0    -1  
 $EndComp
 $Comp
-L ISO7816_NO SC
-U 2 1 4CFA9F7B
-P 9800 4550
-F 0 "SC" H 9600 4400 60  0000 C CNN
-F 1 "SC_ID-000" H 10100 4400 60  0000 C CNN
-	2    9800 4550
+L ISO7816_NO SC1
+U 1 1 4CFA9F7B
+P 9800 5000
+F 0 "SC1" H 9800 5250 60  0000 C CNN
+F 1 "SC_ID-000" H 9800 4700 60  0000 C CNN
+	1    9800 5000
 	1    0    0    -1  
 $EndComp
 Text Label 10000 6550 0    60   ~ 0
@@ -1784,10 +1733,10 @@ I/O_PHONE
 Text Label 10000 6350 0    60   ~ 0
 RST_PHONE
 $Comp
-L GND #PWR01
+L GND #PWR047
 U 1 1 4CF7CFEB
 P 10100 6750
-F 0 "#PWR01" H 10100 6750 30  0001 C CNN
+F 0 "#PWR047" H 10100 6750 30  0001 C CNN
 F 1 "GND" H 10100 6680 30  0001 C CNN
 	1    10100 6750
 	0    1    1    0   
@@ -1805,10 +1754,10 @@ RST_SIM
 Text Label 9150 4850 2    60   ~ 0
 VCC_SIM
 $Comp
-L GND #PWR02
+L GND #PWR048
 U 1 1 4CF7C43B
 P 10800 4850
-F 0 "#PWR02" H 10800 4850 30  0001 C CNN
+F 0 "#PWR048" H 10800 4850 30  0001 C CNN
 F 1 "GND" H 10800 4780 30  0001 C CNN
 	1    10800 4850
 	0    -1   -1   0   
@@ -1836,48 +1785,39 @@ VCC_SIM
 Text Label 7600 4000 0    60   ~ 0
 SW_SIM
 $Comp
-L VDD #PWR03
-U 1 1 4CF6A167
-P 10750 4550
-F 0 "#PWR03" H 10750 4650 30  0001 C CNN
-F 1 "VDD" H 10750 4660 30  0000 C CNN
-	1    10750 4550
-	0    1    1    0   
-$EndComp
-$Comp
-L ISO7816_NC SC
-U 1 1 4CF6A13B
-P 9800 5000
-F 0 "SC" H 9800 5250 60  0000 C CNN
-F 1 "SC_ID-000" H 9800 4750 60  0000 C CNN
-	1    9800 5000
+L ISO7816_NO SC1
+U 2 1 4CF6A13B
+P 9800 4550
+F 0 "SC1" H 9800 4800 60  0000 C CNN
+F 1 "SC_ID-000" H 9800 4700 60  0000 C CNN
+	2    9800 4550
 	1    0    0    -1  
 $EndComp
 NoConn ~ 9250 5150
 NoConn ~ 10350 5150
 $Comp
-L LED D4
+L LED D3
 U 1 1 4CF5471F
 P 6100 6700
-F 0 "D4" H 5850 6750 50  0000 C CNN
+F 0 "D3" H 5850 6750 50  0000 C CNN
 F 1 "GREEN" H 6400 6750 50  0000 C CNN
 	1    6100 6700
 	-1   0    0    -1  
 $EndComp
 $Comp
-L LED D3
+L LED D2
 U 1 1 4CF54717
 P 6100 6500
-F 0 "D3" H 5850 6550 50  0000 C CNN
+F 0 "D2" H 5850 6550 50  0000 C CNN
 F 1 "RED" H 6350 6550 50  0000 C CNN
 	1    6100 6500
 	-1   0    0    -1  
 $EndComp
 $Comp
-L AT91SAM7S512/256/128/64/321-AU IC1
+L AT91SAM7S512/256/128/64/321-AU IC3
 U 1 1 4CE84486
 P 6250 3800
-F 0 "IC1" H 5250 6100 50  0000 L BNN
+F 0 "IC3" H 5250 6100 50  0000 L BNN
 F 1 "AT91SAM7S512/256/128/64/321-AU" H 5250 1400 50  0000 L BNN
 F 2 "at91sam7sxxx-au-LQFP64" H 6250 3950 50  0001 C CNN
 	1    6250 3800
@@ -1888,10 +1828,10 @@ DRXD
 Text Label 7600 3800 0    60   ~ 0
 DTXD
 $Comp
-L 3V3 #PWR011
+L 3V3 #PWR049
 U 1 1 4CE9AE51
 P 9300 2800
-F 0 "#PWR011" H 9300 2900 40  0001 C CNN
+F 0 "#PWR049" H 9300 2900 40  0001 C CNN
 F 1 "3V3" H 9300 2925 40  0000 C CNN
 	1    9300 2800
 	1    0    0    -1  
@@ -1906,10 +1846,10 @@ F 1 "DEBUG" V 10150 3100 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR012
+L GND #PWR050
 U 1 1 4CE9AA96
 P 9450 2700
-F 0 "#PWR012" H 9450 2700 30  0001 C CNN
+F 0 "#PWR050" H 9450 2700 30  0001 C CNN
 F 1 "GND" H 9450 2630 30  0001 C CNN
 	1    9450 2700
 	-1   0    0    1   
@@ -1924,64 +1864,64 @@ Text Label 4450 2200 0    60   ~ 0
 TDI
 NoConn ~ 5050 2600
 $Comp
-L GND #PWR013
+L GND #PWR051
 U 1 1 4CE9A7C1
 P 3900 2000
-F 0 "#PWR013" H 3900 2000 30  0001 C CNN
+F 0 "#PWR051" 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 #PWR014
+L 3V3 #PWR052
 U 1 1 4CE9A701
 P 1600 950
-F 0 "#PWR014" H 1600 1050 40  0001 C CNN
+F 0 "#PWR052" H 1600 1050 40  0001 C CNN
 F 1 "3V3" H 1600 1075 40  0000 C CNN
 	1    1600 950 
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R7
+L R R8
 U 1 1 4CE9A6AE
 P 2000 1600
-F 0 "R7" V 2000 1500 50  0000 C CNN
+F 0 "R8" V 2000 1500 50  0000 C CNN
 F 1 "100K" V 2000 1650 50  0000 C CNN
 	1    2000 1600
 	0    1    1    0   
 $EndComp
 $Comp
-L R R6
+L R R7
 U 1 1 4CE9A6A9
 P 2000 1400
-F 0 "R6" V 2000 1300 50  0000 C CNN
+F 0 "R7" V 2000 1300 50  0000 C CNN
 F 1 "100K" V 2000 1450 50  0000 C CNN
 	1    2000 1400
 	0    1    1    0   
 $EndComp
 $Comp
-L R R5
+L R R6
 U 1 1 4CE9A6A5
 P 2000 1300
-F 0 "R5" V 2000 1200 50  0000 C CNN
+F 0 "R6" V 2000 1200 50  0000 C CNN
 F 1 "100K" V 2000 1350 50  0000 C CNN
 	1    2000 1300
 	0    1    1    0   
 $EndComp
 $Comp
-L R R4
+L R R5
 U 1 1 4CE9A69A
 P 2000 1200
-F 0 "R4" V 2000 1100 50  0000 C CNN
+F 0 "R5" V 2000 1100 50  0000 C CNN
 F 1 "100K" V 2000 1250 50  0000 C CNN
 	1    2000 1200
 	0    1    1    0   
 $EndComp
 $Comp
-L R R3
+L R R4
 U 1 1 4CE9A68C
 P 2000 1100
-F 0 "R3" V 2000 1000 50  0000 C CNN
+F 0 "R4" V 2000 1000 50  0000 C CNN
 F 1 "100K" V 2000 1150 50  0000 C CNN
 	1    2000 1100
 	0    1    1    0   
@@ -1989,10 +1929,10 @@ $EndComp
 NoConn ~ 2900 1900
 NoConn ~ 2900 1800
 $Comp
-L 1V8 #PWR015
+L 1V8 #PWR053
 U 1 1 4CE94C54
 P 3200 4850
-F 0 "#PWR015" H 3200 4990 20  0001 C CNN
+F 0 "#PWR053" H 3200 4990 20  0001 C CNN
 F 1 "1V8" H 3200 4960 30  0000 C CNN
 	1    3200 4850
 	1    0    0    -1  
@@ -2020,37 +1960,37 @@ DDM
 Text Label 4350 2900 0    60   ~ 0
 DDP
 $Comp
-L 3V3 #PWR019
+L 3V3 #PWR054
 U 1 1 4CE91A30
 P 750 4100
-F 0 "#PWR019" H 750 4200 40  0001 C CNN
+F 0 "#PWR054" 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 #PWR020
+L GND #PWR055
 U 1 1 4CE9163C
 P 3600 3400
-F 0 "#PWR020" H 3600 3400 30  0001 C CNN
+F 0 "#PWR055" H 3600 3400 30  0001 C CNN
 F 1 "GND" H 3600 3330 30  0001 C CNN
 	1    3600 3400
 	0    1    1    0   
 $EndComp
 $Comp
-L C C15
+L C C18
 U 1 1 4CE91633
 P 4000 3700
-F 0 "C15" V 3900 3850 50  0000 L CNN
+F 0 "C18" V 3900 3850 50  0000 L CNN
 F 1 "10pF" V 4050 3850 50  0000 L CNN
 	1    4000 3700
 	0    1    1    0   
 $EndComp
 $Comp
-L C C14
+L C C17
 U 1 1 4CE9162F
 P 4000 3100
-F 0 "C14" V 3900 3250 50  0000 L CNN
+F 0 "C17" V 3900 3250 50  0000 L CNN
 F 1 "10pF" V 4050 3250 50  0000 L CNN
 	1    4000 3100
 	0    1    1    0   
@@ -2065,37 +2005,28 @@ F 1 "18.432MHz" V 4500 3000 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L 3V3 #PWR026
-U 1 1 4CE9124D
-P 5150 7000
-F 0 "#PWR026" H 5150 7100 40  0001 C CNN
-F 1 "3V3" H 5150 7125 40  0000 C CNN
-	1    5150 7000
-	0    1    1    0   
-$EndComp
-$Comp
-L +5V #PWR027
+L +5V #PWR056
 U 1 1 4CE91241
 P 3350 7000
-F 0 "#PWR027" H 3350 7090 20  0001 C CNN
+F 0 "#PWR056" H 3350 7090 20  0001 C CNN
 F 1 "+5V" H 3350 7090 30  0000 C CNN
 	1    3350 7000
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR028
+L GND #PWR057
 U 1 1 4CE8FFA5
 P 4750 6150
-F 0 "#PWR028" H 4750 6150 30  0001 C CNN
+F 0 "#PWR057" H 4750 6150 30  0001 C CNN
 F 1 "GND" H 4750 6080 30  0001 C CNN
 	1    4750 6150
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR030
+L +5V #PWR058
 U 1 1 4CE8FE3E
 P 650 2050
-F 0 "#PWR030" H 650 2140 20  0001 C CNN
+F 0 "#PWR058" H 650 2140 20  0001 C CNN
 F 1 "+5V" H 650 2140 30  0000 C CNN
 	1    650  2050
 	1    0    0    -1