update to SIMtrac v0.2

2 files changed, 598 insertions, 247 deletions

diff --git a/hardware/kicad/SIMtrac.pro b/hardware/kicad/SIMtrac.pro
index ffd52c1..4591dc3 100644
--- a/hardware/kicad/SIMtrac.pro
+++ b/hardware/kicad/SIMtrac.pro
@@ -1,7 +1,5 @@
-update=So 21 Nov 2010 17:37:58 CET
-last_client=cvpcb
-[general]
-version=1
+update=Mo 22 Nov 2010 01:15:11 CET
+last_client=eeschema
 [eeschema]
 version=1
 LibDir=
@@ -72,43 +70,4 @@ LibName31=lib/at91sam7sxxx-au
 LibName32=lib/smartcard
 LibName33=lib/v-reg-2
 LibName34=lib/con-usb
-[pcbnew]
-version=1
-PadDrlX=320
-PadDimH=600
-PadDimV=600
-BoardThickness=630
-RouteTo=15
-RouteBo=0
-Segm45=1
-Racc45=1
-SgPcb45=1
-TxtPcbV=800
-TxtPcbH=600
-TxtModV=600
-TxtModH=600
-TxtModW=120
-VEgarde=100
-DrawLar=150
-EdgeLar=150
-TxtLar=120
-MSegLar=150
-WpenSer=10
-[pcbnew/libraries]
-LibName1=sockets
-LibName2=connect
-LibName3=discret
-LibName4=pin_array
-LibName5=divers
-LibName6=libcms
-LibName7=display
-LibName8=valves
-LibName9=led
-LibName10=dip_sockets
-LibName11=lib/v-reg-2
-LibDir=
-[cvpcb]
-version=1
-NetIExt=net
-[cvpcb/libraries]
-EquName1=devcms
+LibName35=lib/debug
diff --git a/hardware/kicad/SIMtrac.sch b/hardware/kicad/SIMtrac.sch
index 5fc3484..f452c66 100644
--- a/hardware/kicad/SIMtrac.sch
+++ b/hardware/kicad/SIMtrac.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date So 21 Nov 2010 18:44:43 CET
+EESchema Schematic File Version 2  date Mo 22 Nov 2010 01:15:16 CET
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -33,6 +33,7 @@ LIBS:at91sam7sxxx-au
 LIBS:smartcard
 LIBS:v-reg-2
 LIBS:con-usb
+LIBS:debug
 LIBS:trac-cache
 EELAYER 24  0
 EELAYER END
@@ -40,98 +41,215 @@ $Descr A4 11700 8267
 Sheet 1 1
 Title "SIMtrac hw"
 Date "21 nov 2010"
-Rev "0.1"
+Rev "0.2"
 Comp "osmocom"
 Comment1 "inspired by openPCD"
 Comment2 "CC-BY-SA"
 Comment3 ""
 Comment4 ""
 $EndDescr
+Text Label 7100 3600 0    60   ~ 0
+DRXD
+Text Label 7100 3500 0    60   ~ 0
+DTXD
 Wire Wire Line
-	4550 4800 4000 4800
+	8050 3400 7750 3400
+Wire Wire Line
+	7750 3400 7750 3600
+Wire Wire Line
+	7750 3600 6950 3600
+Wire Wire Line
+	7750 2950 7750 3200
+Wire Wire Line
+	7750 3200 8050 3200
+Wire Wire Line
+	8050 3500 7900 3500
+Wire Wire Line
+	8050 3000 7900 3000
+Wire Wire Line
+	8150 3900 8150 4100
+Wire Wire Line
+	8150 4100 8150 4300
+Connection ~ 8150 4100
+Wire Wire Line
+	8150 4100 6950 4100
+Wire Wire Line
+	9050 3800 8750 3800
+Wire Wire Line
+	8750 3800 6950 3800
+Wire Wire Line
+	7950 3900 7950 4200
+Wire Wire Line
+	7950 4200 7950 4400
+Connection ~ 3300 1500
+Wire Wire Line
+	3300 1500 3200 1500
+Connection ~ 3300 1300
+Wire Wire Line
+	3300 1300 3200 1300
+Connection ~ 3300 1100
+Wire Wire Line
+	3300 1100 3200 1100
+Connection ~ 3300 900 
+Wire Wire Line
+	3200 900  3300 900 
+Connection ~ 2300 700 
+Wire Wire Line
+	2300 700  2300 550 
+Wire Wire Line
+	2300 550  3300 550 
+Wire Wire Line
+	3300 550  3300 700 
+Wire Wire Line
+	3300 700  3200 700 
+Connection ~ 1100 1000
+Wire Wire Line
+	1250 1100 1100 1100
+Connection ~ 1100 800 
+Wire Wire Line
+	1100 900  1250 900 
+Connection ~ 2000 1300
+Wire Wire Line
+	2400 1300 2000 1300
+Wire Wire Line
+	2000 1300 1750 1300
+Connection ~ 2200 1000
+Wire Wire Line
+	2400 1000 2200 1000
+Wire Wire Line
+	2200 1000 1750 1000
+Wire Wire Line
+	2400 800  1750 800 
+Wire Wire Line
+	2000 1300 2000 2200
+Wire Wire Line
+	2000 2200 4550 2200
+Wire Wire Line
+	2100 1100 2100 1200
+Wire Wire Line
+	2100 1200 2100 2100
+Wire Wire Line
+	2100 2100 4550 2100
+Wire Wire Line
+	2300 900  2300 1900
+Wire Wire Line
+	2800 2400 2800 2700
+Connection ~ 1550 2150
+Wire Wire Line
+	1350 2150 1550 2150
+Wire Wire Line
+	4550 1600 3750 1600
+Wire Wire Line
+	3850 1050 3850 1500
+Wire Wire Line
+	4550 2600 2700 2600
+Wire Wire Line
+	1200 2500 1850 2500
+Wire Wire Line
+	1850 2500 2700 2500
+Wire Wire Line
+	4000 4800 4250 4800
+Wire Wire Line
+	4250 4800 4550 4800
 Connection ~ 4250 4600
 Wire Wire Line
-	4000 4600 4550 4600
+	4550 4600 4250 4600
+Wire Wire Line
+	4250 4600 4000 4600
 Connection ~ 4250 5850
 Wire Wire Line
 	4250 5850 3950 5850
 Wire Wire Line
-	2850 3700 2200 3700
-Connection ~ 8550 3650
+	2200 3700 2600 3700
 Wire Wire Line
-	8550 4250 8550 3250
-Connection ~ 10000 3650
+	2600 3700 2850 3700
+Connection ~ 8900 5750
 Wire Wire Line
-	9650 4250 10000 4250
+	8900 6350 8900 5750
 Wire Wire Line
-	10000 4250 10000 1800
-Connection ~ 10100 3550
+	8900 5750 8900 5350
+Connection ~ 10350 5750
 Wire Wire Line
-	9650 4150 10100 4150
+	10000 6350 10350 6350
 Wire Wire Line
-	10100 4150 10100 1250
+	10350 6350 10350 5750
 Wire Wire Line
-	8350 3450 8850 3450
-Connection ~ 8450 1800
+	10350 5750 10350 4600
 Wire Wire Line
-	8700 1800 8000 1800
-Connection ~ 10100 1600
+	10350 4600 10350 4200
 Wire Wire Line
-	6950 4300 8000 4300
+	10350 4200 10350 3900
+Connection ~ 10450 5650
 Wire Wire Line
-	8000 4300 8000 1800
+	10000 6250 10450 6250
 Wire Wire Line
-	7950 3900 6950 3900
-Connection ~ 10000 2100
+	10450 6250 10450 5650
+Wire Wire Line
+	10450 5650 10450 4400
+Wire Wire Line
+	10450 4400 10450 3700
 Wire Wire Line
-	10000 2100 7950 2100
-Connection ~ 10050 2400
+	10450 3700 10450 3350
 Wire Wire Line
-	9800 1700 10050 1700
-Connection ~ 8400 2400
+	9200 5550 8700 5550
+Connection ~ 8800 3900
+Connection ~ 10450 3700
 Wire Wire Line
-	8400 1700 8400 3300
-Connection ~ 9750 3450
+	7950 3900 6950 3900
+Connection ~ 10350 4200
+Connection ~ 10400 4500
+Wire Wire Line
+	10150 3800 10400 3800
+Connection ~ 8750 4500
 Wire Wire Line
-	9650 4050 9750 4050
+	8750 3800 8750 4500
 Wire Wire Line
-	9750 4050 9750 3300
+	8750 4500 8750 5400
+Connection ~ 10100 5550
 Wire Wire Line
-	8550 4250 8850 4250
-Connection ~ 8350 3450
+	10000 6150 10100 6150
 Wire Wire Line
-	10050 2400 9800 2400
+	10100 6150 10100 5550
 Wire Wire Line
-	9750 3450 9650 3450
+	10100 5550 10100 5400
 Wire Wire Line
-	9750 3300 8400 3300
+	8900 6350 9200 6350
+Connection ~ 8700 5550
 Wire Wire Line
-	8400 2400 8700 2400
+	10150 4500 10400 4500
 Wire Wire Line
-	8350 2300 8700 2300
+	10100 5550 10000 5550
 Wire Wire Line
-	2750 1500 4550 1500
+	10100 5400 8750 5400
 Wire Wire Line
-	2950 1300 2950 1400
+	8750 4500 9050 4500
 Wire Wire Line
-	2950 1400 2750 1400
+	8700 4400 9050 4400
 Connection ~ 4250 5100
 Wire Wire Line
-	4550 5100 4250 5100
+	4250 5100 4550 5100
 Connection ~ 4250 4000
 Wire Wire Line
-	4550 4000 4250 4000
+	4250 4000 4550 4000
 Connection ~ 4250 4300
 Wire Wire Line
 	4550 4300 4250 4300
 Wire Wire Line
-	4250 4400 4250 3800
+	4250 4400 4250 4300
+Wire Wire Line
+	4250 4300 4250 4200
+Wire Wire Line
+	4250 4200 4250 4000
+Wire Wire Line
+	4250 4000 4250 3800
 Wire Wire Line
 	4250 3800 4550 3800
 Wire Wire Line
 	3200 2800 3000 2800
 Wire Wire Line
-	3000 2800 3000 3400
+	3000 2800 3000 3100
+Wire Wire Line
+	3000 3100 3000 3400
 Connection ~ 3000 3100
 Wire Wire Line
 	4200 3200 4200 3400
@@ -139,32 +257,36 @@ Wire Wire Line
 	4200 3200 4550 3200
 Wire Wire Line
 	4200 2800 4200 3000
-Wire Wire Line
-	4250 2250 4250 2600
-Wire Wire Line
-	4250 2250 1200 2250
-Wire Wire Line
-	4550 2700 4350 2700
-Wire Wire Line
-	4350 2700 4350 2150
 Connection ~ 1550 6750
 Wire Wire Line
 	1850 6650 1850 6750
 Wire Wire Line
-	1850 6750 950  6750
+	1850 6750 1550 6750
+Wire Wire Line
+	1550 6750 1250 6750
+Wire Wire Line
+	1250 6750 950  6750
 Connection ~ 950  6750
 Wire Wire Line
 	1250 6750 1250 6650
 Connection ~ 1250 6150
 Wire Wire Line
-	1550 6150 1550 6250
+	1550 6250 1550 6150
 Connection ~ 1850 5550
 Wire Wire Line
 	2150 5450 2150 5550
 Wire Wire Line
-	2150 5550 950  5550
+	2150 5550 1850 5550
 Wire Wire Line
-	950  5450 950  5700
+	1850 5550 1550 5550
+Wire Wire Line
+	1550 5550 1250 5550
+Wire Wire Line
+	1250 5550 950  5550
+Wire Wire Line
+	950  5700 950  5550
+Wire Wire Line
+	950  5550 950  5450
 Connection ~ 1250 5550
 Wire Wire Line
 	1550 5550 1550 5450
@@ -172,60 +294,86 @@ Connection ~ 1250 4950
 Wire Wire Line
 	1550 4950 1550 5050
 Wire Wire Line
-	950  5050 950  4900
+	950  4900 950  4950
+Wire Wire Line
+	950  4950 950  5050
 Wire Wire Line
 	1350 3900 1350 3700
 Connection ~ 1350 4400
 Wire Wire Line
 	2600 4300 2600 4400
 Wire Wire Line
-	2600 4400 950  4400
+	2600 4400 1900 4400
+Wire Wire Line
+	1900 4400 1350 4400
+Wire Wire Line
+	1350 4400 950  4400
 Connection ~ 4250 5700
 Wire Wire Line
 	4250 5700 4550 5700
 Connection ~ 4250 5500
 Wire Wire Line
 	4550 5500 4250 5500
-Connection ~ 1850 2250
-Connection ~ 1550 2950
+Connection ~ 1850 2500
+Connection ~ 1550 3200
+Wire Wire Line
+	1550 3350 1550 3200
+Wire Wire Line
+	1550 3200 1550 2600
 Wire Wire Line
-	1550 3100 1550 2350
+	1550 2600 1200 2600
 Wire Wire Line
-	1550 2350 1200 2350
+	1550 3200 1850 3200
 Wire Wire Line
-	1550 2950 2200 2950
+	1850 3200 2200 3200
 Wire Wire Line
-	2200 2950 2200 2800
-Connection ~ 2200 2150
+	2200 3200 2200 3050
+Connection ~ 2200 2400
 Wire Wire Line
-	2200 2400 2200 2150
+	2200 2650 2200 2400
 Wire Wire Line
-	1850 2400 1850 2250
+	1850 2650 1850 2500
 Wire Wire Line
-	1850 2800 1850 2950
-Connection ~ 1850 2950
+	1850 3050 1850 3200
+Connection ~ 1850 3200
 Wire Wire Line
 	4550 5400 4250 5400
 Wire Wire Line
-	4250 5400 4250 6050
+	4250 5400 4250 5500
+Wire Wire Line
+	4250 5500 4250 5600
+Wire Wire Line
+	4250 5600 4250 5700
+Wire Wire Line
+	4250 5700 4250 5850
+Wire Wire Line
+	4250 5850 4250 6050
 Wire Wire Line
 	4550 5600 4250 5600
 Connection ~ 4250 5600
 Wire Wire Line
-	950  3500 950  3900
+	950  3900 950  3700
+Wire Wire Line
+	950  3700 950  3500
 Wire Wire Line
 	1350 4400 1350 4300
 Connection ~ 950  4400
 Connection ~ 1900 4400
 Wire Wire Line
-	950  3700 1600 3700
+	1600 3700 1350 3700
+Wire Wire Line
+	1350 3700 950  3700
 Connection ~ 950  3700
 Connection ~ 1350 3700
 Wire Wire Line
-	2600 3500 2600 3900
+	2600 3900 2600 3700
+Wire Wire Line
+	2600 3700 2600 3500
 Connection ~ 2600 3700
 Wire Wire Line
-	950  4300 950  4600
+	950  4600 950  4400
+Wire Wire Line
+	950  4400 950  4300
 Wire Wire Line
 	1250 5050 1250 4950
 Connection ~ 950  4950
@@ -239,14 +387,22 @@ Wire Wire Line
 	1850 5550 1850 5450
 Connection ~ 1550 5550
 Wire Wire Line
-	950  4950 2150 4950
+	950  4950 1250 4950
+Wire Wire Line
+	1250 4950 1550 4950
+Wire Wire Line
+	1550 4950 1850 4950
+Wire Wire Line
+	1850 4950 2150 4950
 Wire Wire Line
 	2150 4950 2150 5050
 Connection ~ 1850 4950
 Wire Wire Line
-	950  6250 950  6050
+	950  6050 950  6150
+Wire Wire Line
+	950  6150 950  6250
 Wire Wire Line
-	1250 6250 1250 6150
+	1250 6150 1250 6250
 Connection ~ 950  6150
 Wire Wire Line
 	1850 6250 1850 6150
@@ -255,108 +411,351 @@ Wire Wire Line
 	1550 6750 1550 6650
 Connection ~ 1250 6750
 Wire Wire Line
-	950  6650 950  6900
+	950  6900 950  6750
 Wire Wire Line
-	4350 2150 1200 2150
+	950  6750 950  6650
 Wire Wire Line
-	4250 2600 4550 2600
+	2800 2400 2200 2400
 Wire Wire Line
-	4200 2800 3600 2800
+	2200 2400 1200 2400
+Wire Wire Line
+	4200 2800 3950 2800
+Wire Wire Line
+	3950 2800 3600 2800
 Connection ~ 3950 2800
 Wire Wire Line
 	4200 3000 4550 3000
 Wire Wire Line
-	4200 3400 3600 3400
+	4200 3400 3950 3400
+Wire Wire Line
+	3950 3400 3600 3400
 Connection ~ 3950 3400
 Wire Wire Line
 	3000 3400 3200 3400
 Wire Wire Line
 	3000 3100 2800 3100
 Wire Wire Line
-	1550 2050 1550 1800
+	1550 2050 1550 2150
 Wire Wire Line
-	4050 4400 4550 4400
+	1550 2150 1550 2300
+Wire Wire Line
+	4550 4400 4250 4400
+Wire Wire Line
+	4250 4400 4050 4400
 Connection ~ 4250 4400
 Wire Wire Line
 	4550 4200 4250 4200
 Connection ~ 4250 4200
 Wire Wire Line
-	4250 4600 4250 5200
+	4250 4600 4250 4800
 Wire Wire Line
-	4250 5200 4550 5200
+	4250 4800 4250 5000
 Wire Wire Line
-	4550 5000 4250 5000
-Connection ~ 4250 5000
+	4250 5000 4250 5100
 Wire Wire Line
-	2750 1700 2950 1700
+	4250 5100 4250 5200
 Wire Wire Line
-	2950 1700 2950 1850
+	4250 5200 4550 5200
 Wire Wire Line
-	2750 1600 4550 1600
+	4550 5000 4250 5000
+Connection ~ 4250 5000
 Wire Wire Line
-	8450 2500 8700 2500
+	8800 4600 9050 4600
 Wire Wire Line
-	10100 2300 9800 2300
+	10450 4400 10150 4400
 Wire Wire Line
-	10000 2500 9800 2500
+	10350 4600 10150 4600
 Wire Wire Line
-	8850 4050 8350 4050
+	9200 6150 8700 6150
 Wire Wire Line
-	8850 4150 8450 4150
-Connection ~ 8450 3550
+	9200 6250 8800 6250
+Connection ~ 8800 5650
 Wire Wire Line
-	8700 1600 8350 1600
+	9050 3700 8700 3700
 Wire Wire Line
-	8350 1600 8350 4050
-Connection ~ 8350 2300
+	8700 3700 8700 4400
 Wire Wire Line
-	8450 4150 8450 1800
-Connection ~ 8450 2500
+	8700 4400 8700 5550
 Wire Wire Line
-	10100 1600 9800 1600
-Connection ~ 10100 2300
+	8700 5550 8700 6150
+Connection ~ 8700 4400
 Wire Wire Line
-	10000 1800 9800 1800
-Connection ~ 10000 2500
+	8800 6250 8800 5650
 Wire Wire Line
-	6950 3800 7900 3800
+	8800 5650 8800 4600
 Wire Wire Line
-	7900 3800 7900 1700
+	8800 4600 8800 3900
+Connection ~ 8800 4600
 Wire Wire Line
-	7900 1700 8700 1700
-Connection ~ 8400 1700
+	10450 3700 10150 3700
+Connection ~ 10450 4400
 Wire Wire Line
-	7950 2100 7950 4400
+	10350 3900 10150 3900
+Connection ~ 10350 4600
+Connection ~ 8750 3800
 Wire Wire Line
 	7950 4400 6950 4400
-Connection ~ 7950 3900
 Wire Wire Line
-	6950 4100 8000 4100
-Connection ~ 8000 4100
+	8800 5650 9200 5650
+Wire Wire Line
+	10450 5650 10000 5650
 Wire Wire Line
-	8450 3550 8850 3550
+	10350 5750 10000 5750
 Wire Wire Line
-	10100 3550 9650 3550
+	10400 3800 10400 4500
 Wire Wire Line
-	10000 3650 9650 3650
+	10400 4500 10400 5350
 Wire Wire Line
-	10050 1700 10050 3250
+	10400 5350 8900 5350
 Wire Wire Line
-	10050 3250 8550 3250
+	8900 5750 9200 5750
 Wire Wire Line
-	8550 3650 8850 3650
+	1850 6150 1550 6150
 Wire Wire Line
-	1800 1900 1800 2050
+	1550 6150 1250 6150
 Wire Wire Line
-	1800 2050 1200 2050
-Connection ~ 1550 2050
+	1250 6150 950  6150
 Wire Wire Line
-	1850 6150 750  6150
+	950  6150 750  6150
 Wire Wire Line
 	3950 5850 3950 5950
 Wire Wire Line
 	1900 4000 1900 4400
 Connection ~ 4250 4800
+Wire Wire Line
+	2800 2700 4550 2700
+Wire Wire Line
+	3950 1050 3950 1150
+Wire Wire Line
+	3950 1150 4100 1150
+Wire Wire Line
+	3500 1150 3650 1150
+Wire Wire Line
+	3650 1150 3650 1050
+Wire Wire Line
+	3850 1500 4550 1500
+Wire Wire Line
+	1550 2300 1200 2300
+Wire Wire Line
+	2300 1900 4550 1900
+Wire Wire Line
+	2700 2500 2700 2600
+Wire Wire Line
+	4550 2000 2200 2000
+Wire Wire Line
+	2200 2000 2200 1000
+Wire Wire Line
+	2400 1200 2100 1200
+Connection ~ 2100 1200
+Wire Wire Line
+	3750 1050 3750 1600
+Wire Wire Line
+	3750 1600 3750 1800
+Wire Wire Line
+	3750 1800 1900 1800
+Wire Wire Line
+	1900 1800 1900 1400
+Wire Wire Line
+	1900 1400 2400 1400
+Connection ~ 3750 1600
+Wire Wire Line
+	2400 900  2300 900 
+Wire Wire Line
+	2300 900  1750 900 
+Connection ~ 2300 900 
+Wire Wire Line
+	2400 1100 2100 1100
+Wire Wire Line
+	2100 1100 1750 1100
+Connection ~ 2100 1100
+Wire Wire Line
+	1100 800  1250 800 
+Wire Wire Line
+	1100 700  2300 700 
+Wire Wire Line
+	2300 700  2400 700 
+Connection ~ 1100 700 
+Wire Wire Line
+	1100 1000 1250 1000
+Connection ~ 1100 900 
+Wire Wire Line
+	1250 1300 1100 1300
+Wire Wire Line
+	1100 1300 1100 1100
+Wire Wire Line
+	1100 1100 1100 1000
+Wire Wire Line
+	1100 1000 1100 900 
+Wire Wire Line
+	1100 900  1100 800 
+Wire Wire Line
+	1100 800  1100 700 
+Wire Wire Line
+	1100 700  1100 650 
+Connection ~ 1100 1100
+Wire Wire Line
+	3200 800  3300 800 
+Wire Wire Line
+	3300 800  3300 900 
+Wire Wire Line
+	3300 900  3300 1000
+Wire Wire Line
+	3300 1000 3300 1100
+Wire Wire Line
+	3300 1100 3300 1200
+Wire Wire Line
+	3300 1200 3300 1300
+Wire Wire Line
+	3300 1300 3300 1400
+Wire Wire Line
+	3300 1400 3300 1500
+Wire Wire Line
+	3300 1500 3300 1600
+Wire Wire Line
+	3300 1600 3300 1700
+Wire Wire Line
+	3200 1000 3300 1000
+Connection ~ 3300 1000
+Wire Wire Line
+	3200 1200 3300 1200
+Connection ~ 3300 1200
+Wire Wire Line
+	3200 1400 3300 1400
+Connection ~ 3300 1400
+Wire Wire Line
+	3200 1600 3300 1600
+Connection ~ 3300 1600
+Wire Wire Line
+	7950 4200 10350 4200
+Connection ~ 7950 4200
+Wire Wire Line
+	8150 3900 8800 3900
+Wire Wire Line
+	8800 3900 9050 3900
+Wire Wire Line
+	8150 4300 6950 4300
+Wire Wire Line
+	7900 3000 7900 2850
+Wire Wire Line
+	7900 3500 7900 3100
+Wire Wire Line
+	7900 3100 8050 3100
+Wire Wire Line
+	6950 3500 7650 3500
+Wire Wire Line
+	7650 3500 7650 3300
+Wire Wire Line
+	7650 3300 8050 3300
+$Comp
+L 3V3 #PWR?
+U 1 1 4CE9AE51
+P 7750 2950
+F 0 "#PWR?" H 7750 3050 40  0001 C CNN
+F 1 "3V3" H 7750 3075 40  0000 C CNN
+	1    7750 2950
+	1    0    0    -1  
+$EndComp
+$Comp
+L DEBUG P5
+U 1 1 4CE9ADCF
+P 8400 3250
+F 0 "P5" H 8400 3600 60  0000 C CNN
+F 1 "DEBUG" V 8600 3250 60  0000 C CNN
+	1    8400 3250
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 4CE9AA96
+P 7900 2850
+F 0 "#PWR?" H 7900 2850 30  0001 C CNN
+F 1 "GND" H 7900 2780 30  0001 C CNN
+	1    7900 2850
+	-1   0    0    1   
+$EndComp
+Text Label 3950 2200 0    60   ~ 0
+TDO
+Text Label 3950 2100 0    60   ~ 0
+TCK
+Text Label 3950 2000 0    60   ~ 0
+TMS
+Text Label 3950 1900 0    60   ~ 0
+TDI
+NoConn ~ 4550 2300
+$Comp
+L GND #PWR?
+U 1 1 4CE9A7C1
+P 3300 1700
+F 0 "#PWR?" H 3300 1700 30  0001 C CNN
+F 1 "GND" H 3300 1630 30  0001 C CNN
+	1    3300 1700
+	1    0    0    -1  
+$EndComp
+$Comp
+L 3V3 #PWR?
+U 1 1 4CE9A701
+P 1100 650
+F 0 "#PWR?" H 1100 750 40  0001 C CNN
+F 1 "3V3" H 1100 775 40  0000 C CNN
+	1    1100 650 
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R5
+U 1 1 4CE9A6AE
+P 1500 1300
+F 0 "R5" V 1500 1200 50  0000 C CNN
+F 1 "4K7" V 1500 1350 50  0000 C CNN
+	1    1500 1300
+	0    1    1    0   
+$EndComp
+$Comp
+L R R4
+U 1 1 4CE9A6A9
+P 1500 1100
+F 0 "R4" V 1500 1000 50  0000 C CNN
+F 1 "4K7" V 1500 1150 50  0000 C CNN
+	1    1500 1100
+	0    1    1    0   
+$EndComp
+$Comp
+L R R3
+U 1 1 4CE9A6A5
+P 1500 1000
+F 0 "R3" V 1500 900 50  0000 C CNN
+F 1 "4K7" V 1500 1050 50  0000 C CNN
+	1    1500 1000
+	0    1    1    0   
+$EndComp
+$Comp
+L R R2
+U 1 1 4CE9A69A
+P 1500 900
+F 0 "R2" V 1500 800 50  0000 C CNN
+F 1 "4K7" V 1500 950 50  0000 C CNN
+	1    1500 900 
+	0    1    1    0   
+$EndComp
+$Comp
+L R R1
+U 1 1 4CE9A68C
+P 1500 800
+F 0 "R1" V 1500 700 50  0000 C CNN
+F 1 "4K7" V 1500 850 50  0000 C CNN
+	1    1500 800 
+	0    1    1    0   
+$EndComp
+NoConn ~ 2400 1600
+NoConn ~ 2400 1500
+$Comp
+L CONN_10X2 P4
+U 1 1 4CE9A47C
+P 2800 1150
+F 0 "P4" H 2800 1700 60  0000 C CNN
+F 1 "JTAG" V 2800 1050 50  0000 C CNN
+	1    2800 1150
+	1    0    0    -1  
+$EndComp
 $Comp
 L 1V8 #PWR?
 U 1 1 4CE94C54
@@ -369,14 +768,14 @@ $EndComp
 $Comp
 L USB_2 J1
 U 1 1 4CE945D9
-P 1000 2200
-F 0 "J1" H 925 2450 60  0000 C CNN
-F 1 "USB" H 950 1950 60  0000 C CNN
-F 2 "VCC" H 1325 2350 50  0001 C CNN
-F 3 "D+" H 1300 2250 50  0001 C CNN
-F 4 "D-" H 1300 2150 50  0001 C CNN "Data-"
-F 5 "GND" H 1325 2050 50  0001 C CNN "Ground"
-	1    1000 2200
+P 1000 2450
+F 0 "J1" H 925 2700 60  0000 C CNN
+F 1 "USB" H 950 2200 60  0000 C CNN
+F 2 "VCC" H 1350 2650 50  0000 C CNN
+F 3 "D+" H 1350 2550 50  0000 C CNN
+F 4 "D-" H 1350 2450 50  0000 C CNN "Data-"
+F 5 "GND" H 1350 2350 50  0000 C CNN "Ground"
+	1    1000 2450
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -418,35 +817,35 @@ $EndComp
 $Comp
 L PWR_FLAG #FLG05
 U 1 1 4CE937DD
-P 1800 1900
-F 0 "#FLG05" H 1800 2170 30  0001 C CNN
-F 1 "PWR_FLAG" H 1800 2130 30  0000 C CNN
-	1    1800 1900
+P 1350 2150
+F 0 "#FLG05" H 1350 2420 30  0001 C CNN
+F 1 "PWR_FLAG" H 1350 2380 30  0000 C CNN
+	1    1350 2150
 	1    0    0    -1  
 $EndComp
 NoConn ~ 6950 4500
 NoConn ~ 6950 4200
 NoConn ~ 6950 4000
-NoConn ~ 8700 2600
-NoConn ~ 9800 2600
-NoConn ~ 9800 1900
-NoConn ~ 8700 1900
+NoConn ~ 9050 4700
+NoConn ~ 10150 4700
+NoConn ~ 10150 4000
+NoConn ~ 9050 4000
 $Comp
 L CONN_3X2 P3
 U 1 1 4CE9355B
-P 9250 4200
-F 0 "P3" H 9250 4450 50  0000 C CNN
-F 1 "SC_OUT" V 9250 4250 40  0000 C CNN
-	1    9250 4200
+P 9600 6300
+F 0 "P3" H 9600 6550 50  0000 C CNN
+F 1 "SC_OUT" V 9600 6350 40  0000 C CNN
+	1    9600 6300
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_3X2 P2
 U 1 1 4CE93557
-P 9250 3600
-F 0 "P2" H 9250 3850 50  0000 C CNN
-F 1 "SC_IN" V 9250 3650 40  0000 C CNN
-	1    9250 3600
+P 9600 5700
+F 0 "P2" H 9600 5950 50  0000 C CNN
+F 1 "SC_IN" V 9600 5750 40  0000 C CNN
+	1    9600 5700
 	1    0    0    -1  
 $EndComp
 NoConn ~ 6950 5300
@@ -455,8 +854,6 @@ NoConn ~ 6950 5000
 NoConn ~ 6950 4900
 NoConn ~ 6950 4800
 NoConn ~ 6950 3700
-NoConn ~ 6950 3600
-NoConn ~ 6950 3500
 NoConn ~ 6950 3400
 NoConn ~ 6950 3300
 NoConn ~ 6950 3200
@@ -488,60 +885,55 @@ CLK
 $Comp
 L GND #PWR06
 U 1 1 4CE91D99
-P 10100 1250
-F 0 "#PWR06" H 10100 1250 30  0001 C CNN
-F 1 "GND" H 10100 1180 30  0001 C CNN
-	1    10100 1250
+P 10450 3350
+F 0 "#PWR06" H 10450 3350 30  0001 C CNN
+F 1 "GND" H 10450 3280 30  0001 C CNN
+	1    10450 3350
 	-1   0    0    1   
 $EndComp
-Text Label 9800 1800 0    60   ~ 0
+Text Label 10150 3900 0    60   ~ 0
 I/O
-Text Label 9800 1600 0    60   ~ 0
+Text Label 10150 3700 0    60   ~ 0
 GND
 Text Label 7100 4300 0    60   ~ 0
 CLK
 Text Label 7100 3800 0    60   ~ 0
 RST
-Text Label 3100 1600 0    60   ~ 0
+Text Label 3950 1600 0    60   ~ 0
 /RESET
-Text Label 3100 1500 0    60   ~ 0
+Text Label 3950 1500 0    60   ~ 0
 TEST
 $Comp
 L GND #PWR07
 U 1 1 4CE91B1B
-P 2950 1850
-F 0 "#PWR07" H 2950 1850 30  0001 C CNN
-F 1 "GND" H 2950 1780 30  0001 C CNN
-	1    2950 1850
-	1    0    0    -1  
+P 3500 1150
+F 0 "#PWR07" H 3500 1150 30  0001 C CNN
+F 1 "GND" H 3500 1080 30  0001 C CNN
+	1    3500 1150
+	0    1    1    0   
 $EndComp
 $Comp
 L 3V3 #PWR08
 U 1 1 4CE91B15
-P 2950 1300
-F 0 "#PWR08" H 2950 1400 40  0001 C CNN
-F 1 "3V3" H 2950 1425 40  0000 C CNN
-	1    2950 1300
-	1    0    0    -1  
+P 4100 1150
+F 0 "#PWR08" H 4100 1250 40  0001 C CNN
+F 1 "3V3" H 4100 1275 40  0000 C CNN
+	1    4100 1150
+	0    1    1    0   
 $EndComp
 $Comp
 L CONN_4 P1
 U 1 1 4CE91AE6
-P 2400 1550
-F 0 "P1" V 2350 1550 50  0000 C CNN
-F 1 "SAM-BA" V 2450 1550 50  0000 C CNN
-	1    2400 1550
-	-1   0    0    -1  
+P 3800 700
+F 0 "P1" V 3750 700 50  0000 C CNN
+F 1 "SAM-BA" V 3850 700 50  0000 C CNN
+	1    3800 700 
+	0    1    -1   0   
 $EndComp
 NoConn ~ 4550 1400
-NoConn ~ 4550 2300
-NoConn ~ 4550 2200
-NoConn ~ 4550 2100
-NoConn ~ 4550 2000
-NoConn ~ 4550 1900
-Text Label 2550 2250 0    60   ~ 0
+Text Label 2350 2500 0    60   ~ 0
 DDM
-Text Label 2550 2150 0    60   ~ 0
+Text Label 2350 2400 0    60   ~ 0
 DDP
 $Comp
 L 3V3 #PWR09
@@ -781,55 +1173,55 @@ $EndComp
 $Comp
 L GND #PWR019
 U 1 1 4CE8FE6C
-P 1550 3100
-F 0 "#PWR019" H 1550 3100 30  0001 C CNN
-F 1 "GND" H 1550 3030 30  0001 C CNN
-	1    1550 3100
+P 1550 3350
+F 0 "#PWR019" H 1550 3350 30  0001 C CNN
+F 1 "GND" H 1550 3280 30  0001 C CNN
+	1    1550 3350
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C2
 U 1 1 4CE8FE65
-P 2200 2600
-F 0 "C2" H 2250 2700 50  0000 L CNN
-F 1 "15pF" H 2250 2500 50  0000 L CNN
-	1    2200 2600
+P 2200 2850
+F 0 "C2" H 2250 2950 50  0000 L CNN
+F 1 "15pF" H 2250 2750 50  0000 L CNN
+	1    2200 2850
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C1
 U 1 1 4CE8FE5F
-P 1850 2600
-F 0 "C1" H 1900 2700 50  0000 L CNN
-F 1 "15pF" H 1900 2500 50  0000 L CNN
-	1    1850 2600
+P 1850 2850
+F 0 "C1" H 1900 2950 50  0000 L CNN
+F 1 "15pF" H 1900 2750 50  0000 L CNN
+	1    1850 2850
 	1    0    0    -1  
 $EndComp
 $Comp
 L +5V #PWR020
 U 1 1 4CE8FE3E
-P 1550 1800
-F 0 "#PWR020" H 1550 1890 20  0001 C CNN
-F 1 "+5V" H 1550 1890 30  0000 C CNN
-	1    1550 1800
+P 1550 2050
+F 0 "#PWR020" H 1550 2140 20  0001 C CNN
+F 1 "+5V" H 1550 2140 30  0000 C CNN
+	1    1550 2050
 	1    0    0    -1  
 $EndComp
 $Comp
 L ISO7816 SC2
 U 1 1 4CE8469D
-P 9250 2450
-F 0 "SC2" H 9250 2700 60  0000 C CNN
-F 1 "SC_ID-000" H 9250 2200 60  0000 C CNN
-	1    9250 2450
+P 9600 4550
+F 0 "SC2" H 9600 4800 60  0000 C CNN
+F 1 "SC_ID-000" H 9600 4300 60  0000 C CNN
+	1    9600 4550
 	1    0    0    -1  
 $EndComp
 $Comp
 L ISO7816 SC1
 U 1 1 4CE84691
-P 9250 1750
-F 0 "SC1" H 9250 2000 60  0000 C CNN
-F 1 "SC_ID-1" H 9250 1500 60  0000 C CNN
-	1    9250 1750
+P 9600 3850
+F 0 "SC1" H 9600 4100 60  0000 C CNN
+F 1 "SC_ID-1" H 9600 3600 60  0000 C CNN
+	1    9600 3850
 	1    0    0    -1  
 $EndComp
 $Comp