From b8877e0cf285804213f6f1c59bc616ff5c1f5a1b Mon Sep 17 00:00:00 2001
From: Werner Almesberger <werner@openmoko.org>
Date: Thu, 2 Dec 2010 23:56:03 -0300
Subject: [PATCH] atusb: add automatic board revision detection; clean up feed
 line

- usb.sch: use P0.2 as board revision ID pin
- atrf.sch: label feed line
- atusb.brd: set feed line width via design rule, not as user size
- atusb.brd: increase feed line width from 18 mil to 19 mil (it should be
  58 mil, but we don't have room for more)
---
 atusb/atrf.sch  |  158 +++---
 atusb/atusb.brd | 1298 ++++++++++++++++++++++++-----------------------
 atusb/usb.sch   |  286 ++++++-----
 3 files changed, 902 insertions(+), 840 deletions(-)

diff --git a/atusb/atrf.sch b/atusb/atrf.sch
index b79b57b..3fc3a9d 100644
--- a/atusb/atrf.sch
+++ b/atusb/atrf.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Thu Dec  2 22:05:04 2010
+EESchema Schematic File Version 2  date Thu Dec  2 23:48:13 2010
 LIBS:power
 LIBS:device
 LIBS:conn
@@ -14,20 +14,24 @@ EELAYER END
 $Descr A4 11700 8267
 Sheet 3 3
 Title "IEEE 802.15.4 USB Transceiver (AT86RF230)"
-Date "2 dec 2010"
-Rev "101202"
+Date "3 dec 2010"
+Rev "101130"
 Comp "Werner Almesberger"
 Comment1 ""
 Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
+Text Label 2950 3800 0    60   ~ 0
+FEED
 Connection ~ 3150 4300
 Wire Wire Line
 	3350 4300 3150 4300
 Connection ~ 4350 4000
 Wire Wire Line
-	4350 3600 4350 4400
+	4350 3600 4350 4000
+Wire Wire Line
+	4350 4000 4350 4400
 Wire Wire Line
 	3350 4200 3150 4200
 Wire Wire Line
@@ -35,20 +39,24 @@ Wire Wire Line
 Wire Wire Line
 	4150 3800 4550 3800
 Wire Wire Line
-	2900 3800 3350 3800
+	2750 3800 3350 3800
 Wire Wire Line
 	3650 6350 3650 6150
 Wire Wire Line
-	3650 6150 3150 6150
+	3650 6150 3400 6150
+Wire Wire Line
+	3400 6150 3150 6150
 Wire Wire Line
 	3150 6150 3150 6350
 Wire Wire Line
-	2000 3900 2200 3900
+	1850 3900 2050 3900
 Connection ~ 7850 1250
 Wire Wire Line
 	7850 1050 7850 1250
 Wire Wire Line
-	7600 1250 8100 1250
+	7600 1250 7850 1250
+Wire Wire Line
+	7850 1250 8100 1250
 Wire Wire Line
 	7600 1250 7600 1450
 Wire Wire Line
@@ -57,7 +65,9 @@ Wire Wire Line
 	7950 2050 7950 1850
 Connection ~ 9700 1150
 Wire Wire Line
-	9900 1150 8400 1150
+	9900 1150 9700 1150
+Wire Wire Line
+	9700 1150 8400 1150
 Wire Wire Line
 	8400 1150 8400 2650
 Connection ~ 10500 1650
@@ -109,9 +119,13 @@ Wire Wire Line
 Wire Wire Line
 	8250 5650 8250 5450
 Wire Wire Line
-	8100 6350 8100 5450
+	8100 6350 8100 5650
 Wire Wire Line
-	8400 6350 8400 5450
+	8100 5650 8100 5450
+Wire Wire Line
+	8400 6350 8400 6150
+Wire Wire Line
+	8400 6150 8400 5450
 Wire Wire Line
 	8550 5850 8550 5450
 Wire Wire Line
@@ -123,10 +137,14 @@ Wire Wire Line
 Wire Wire Line
 	9500 4500 9700 4500
 Wire Wire Line
-	9700 4050 9700 4850
+	9700 4050 9700 4500
+Wire Wire Line
+	9700 4500 9700 4850
 Connection ~ 9700 4500
 Wire Wire Line
-	7500 5450 7500 5850
+	7500 5450 7500 5650
+Wire Wire Line
+	7500 5650 7500 5850
 Wire Wire Line
 	8100 6950 8100 6750
 Wire Wire Line
@@ -136,9 +154,21 @@ Wire Wire Line
 	6700 4350 6500 4350
 Connection ~ 6500 4350
 Wire Wire Line
-	6500 4850 6500 2450
+	6500 4850 6500 4350
 Wire Wire Line
-	6500 2450 7800 2450
+	6500 4350 6500 3900
+Wire Wire Line
+	6500 3900 6500 3750
+Wire Wire Line
+	6500 3750 6500 3600
+Wire Wire Line
+	6500 3600 6500 2450
+Wire Wire Line
+	6500 2450 7500 2450
+Wire Wire Line
+	7500 2450 7650 2450
+Wire Wire Line
+	7650 2450 7800 2450
 Connection ~ 7500 2450
 Connection ~ 6500 3600
 Wire Wire Line
@@ -146,14 +176,22 @@ Wire Wire Line
 Wire Wire Line
 	10300 1150 10500 1150
 Wire Wire Line
-	10500 1150 10500 2650
+	10500 1150 10500 1650
+Wire Wire Line
+	10500 1650 10500 1950
+Wire Wire Line
+	10500 1950 10500 2450
+Wire Wire Line
+	10500 2450 10500 2650
 Wire Wire Line
 	10500 1950 10100 1950
 Connection ~ 10500 1950
 Wire Wire Line
 	8550 2650 8550 2450
 Wire Wire Line
-	8550 2450 9900 2450
+	8550 2450 9700 2450
+Wire Wire Line
+	9700 2450 9900 2450
 Connection ~ 9700 2450
 Wire Wire Line
 	7950 2650 7950 2450
@@ -167,12 +205,12 @@ Wire Wire Line
 	8600 6150 8400 6150
 Connection ~ 8400 6150
 Wire Wire Line
-	2200 3900 2200 4600
+	2050 3900 2050 4600
 Wire Wire Line
 	3400 6350 3400 6150
 Connection ~ 3400 6150
 Wire Wire Line
-	2000 3800 2400 3800
+	1850 3800 2250 3800
 Wire Wire Line
 	6700 4200 5350 4200
 Wire Wire Line
@@ -190,30 +228,32 @@ Wire Wire Line
 Wire Wire Line
 	4350 5000 4350 4800
 Wire Wire Line
-	3150 4200 3150 5000
+	3150 4200 3150 4300
+Wire Wire Line
+	3150 4300 3150 5000
 $Comp
-L PWR_FLAG #FLG015
+L PWR_FLAG #FLG016
 U 1 1 4CF4B348
 P 4350 3600
-F 0 "#FLG015" H 4350 3870 30  0001 C CNN
+F 0 "#FLG016" H 4350 3870 30  0001 C CNN
 F 1 "PWR_FLAG" H 4350 3830 30  0000 C CNN
 	1    4350 3600
 	1    0    0    -1  
 $EndComp
 $Comp
-L AGND #PWR016
+L AGND #PWR017
 U 1 1 4CF4B229
 P 3150 5000
-F 0 "#PWR016" H 3150 5000 40  0001 C CNN
+F 0 "#PWR017" H 3150 5000 40  0001 C CNN
 F 1 "AGND" H 3150 4930 50  0000 C CNN
 	1    3150 5000
 	1    0    0    -1  
 $EndComp
 $Comp
-L AGND #PWR017
+L AGND #PWR018
 U 1 1 4CF4B224
 P 4350 5000
-F 0 "#PWR017" H 4350 5000 40  0001 C CNN
+F 0 "#PWR018" H 4350 5000 40  0001 C CNN
 F 1 "AGND" H 4350 4930 50  0000 C CNN
 	1    4350 5000
 	1    0    0    -1  
@@ -221,11 +261,11 @@ $EndComp
 $Comp
 L R R3
 U 1 1 4CF4B07E
-P 2650 3800
-F 0 "R3" V 2730 3800 50  0000 C CNN
-F 1 "0R" V 2650 3800 50  0000 C CNN
-F 2 "0402" H 2650 3800 60  0001 C CNN
-	1    2650 3800
+P 2500 3800
+F 0 "R3" V 2580 3800 50  0000 C CNN
+F 1 "0R" V 2500 3800 50  0000 C CNN
+F 2 "0402" H 2500 3800 60  0001 C CNN
+	1    2500 3800
 	0    -1   -1   0   
 $EndComp
 $Comp
@@ -246,39 +286,39 @@ RFN
 Text Label 5750 4050 0    60   ~ 0
 RPF
 $Comp
-L GND #PWR018
+L GND #PWR019
 U 1 1 4C641B5A
 P 3150 6350
-F 0 "#PWR018" H 3150 6350 30  0001 C CNN
+F 0 "#PWR019" H 3150 6350 30  0001 C CNN
 F 1 "GND" H 3150 6280 30  0001 C CNN
 	1    3150 6350
 	1    0    0    -1  
 $EndComp
 $Comp
-L DGND #PWR17
+L DGND #PWR18
 U 1 1 4C641B55
 P 3400 6350
-F 0 "#PWR17" H 3400 6350 40  0001 C CNN
+F 0 "#PWR18" H 3400 6350 40  0001 C CNN
 F 1 "DGND" H 3400 6280 40  0000 C CNN
 	1    3400 6350
 	1    0    0    -1  
 $EndComp
 $Comp
-L AGND #PWR019
+L AGND #PWR020
 U 1 1 4C641B53
 P 3650 6350
-F 0 "#PWR019" H 3650 6350 40  0001 C CNN
+F 0 "#PWR020" H 3650 6350 40  0001 C CNN
 F 1 "AGND" H 3650 6280 50  0000 C CNN
 	1    3650 6350
 	1    0    0    -1  
 $EndComp
 $Comp
-L AGND #PWR020
+L AGND #PWR021
 U 1 1 4C641731
-P 2200 4600
-F 0 "#PWR020" H 2200 4600 40  0001 C CNN
-F 1 "AGND" H 2200 4530 50  0000 C CNN
-	1    2200 4600
+P 2050 4600
+F 0 "#PWR021" H 2050 4600 40  0001 C CNN
+F 1 "AGND" H 2050 4530 50  0000 C CNN
+	1    2050 4600
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -328,37 +368,37 @@ nSS
 Text HLabel 10400 3600 2    60   Output ~ 0
 IRQ_RF
 $Comp
-L VDD #PWR021
+L VDD #PWR022
 U 1 1 4C641205
 P 8600 6150
-F 0 "#PWR021" H 8600 6250 30  0001 C CNN
+F 0 "#PWR022" H 8600 6250 30  0001 C CNN
 F 1 "VDD" H 8600 6260 30  0000 C CNN
 	1    8600 6150
 	0    1    1    0   
 $EndComp
 $Comp
-L VDD #PWR022
+L VDD #PWR023
 U 1 1 4C6411DB
 P 7850 1050
-F 0 "#PWR022" H 7850 1150 30  0001 C CNN
+F 0 "#PWR023" H 7850 1150 30  0001 C CNN
 F 1 "VDD" H 7850 1160 30  0000 C CNN
 	1    7850 1050
 	1    0    0    -1  
 $EndComp
 $Comp
-L AGND #PWR023
+L AGND #PWR024
 U 1 1 4C641100
 P 7600 2050
-F 0 "#PWR023" H 7600 2050 40  0001 C CNN
+F 0 "#PWR024" H 7600 2050 40  0001 C CNN
 F 1 "AGND" H 7600 1980 50  0000 C CNN
 	1    7600 2050
 	1    0    0    -1  
 $EndComp
 $Comp
-L AGND #PWR024
+L AGND #PWR025
 U 1 1 4C64109A
 P 8250 2450
-F 0 "#PWR024" H 8250 2450 40  0001 C CNN
+F 0 "#PWR025" H 8250 2450 40  0001 C CNN
 F 1 "AGND" H 8250 2380 50  0000 C CNN
 	1    8250 2450
 	-1   0    0    1   
@@ -392,10 +432,10 @@ F 1 "DGND" H 10500 2580 40  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L AGND #PWR025
+L AGND #PWR026
 U 1 1 4C640D33
 P 6500 4850
-F 0 "#PWR025" H 6500 4850 40  0001 C CNN
+F 0 "#PWR026" H 6500 4850 40  0001 C CNN
 F 1 "AGND" H 6500 4780 50  0000 C CNN
 	1    6500 4850
 	1    0    0    -1  
@@ -411,10 +451,10 @@ F 2 "PAD_60x60" H 10400 4650 60  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L AGND #PWR026
+L AGND #PWR027
 U 1 1 4C640CBA
 P 9000 5850
-F 0 "#PWR026" H 9000 5850 40  0001 C CNN
+F 0 "#PWR027" H 9000 5850 40  0001 C CNN
 F 1 "AGND" H 9000 5780 50  0000 C CNN
 	1    9000 5850
 	1    0    0    -1  
@@ -526,11 +566,11 @@ $EndComp
 $Comp
 L ANTENNA ANT1
 U 1 1 4C63FE17
-P 1700 3850
-F 0 "ANT1" H 1700 4100 60  0000 C CNN
-F 1 "50R" H 1700 3600 60  0000 C CNN
-F 2 "meander" H 1700 3850 60  0001 C CNN
-	1    1700 3850
+P 1550 3850
+F 0 "ANT1" H 1550 4100 60  0000 C CNN
+F 1 "50R" H 1550 3600 60  0000 C CNN
+F 2 "meander" H 1550 3850 60  0001 C CNN
+	1    1550 3850
 	1    0    0    -1  
 $EndComp
 $Comp
diff --git a/atusb/atusb.brd b/atusb/atusb.brd
index e0791bd..6a0cacf 100644
--- a/atusb/atusb.brd
+++ b/atusb/atusb.brd
@@ -1,4 +1,4 @@
-PCBNEW-BOARD Version 1 date Thu Dec  2 22:04:33 2010
+PCBNEW-BOARD Version 1 date Thu Dec  2 23:53:28 2010
 
 # Created by Pcbnew(2010-08-11 BZR 2448)-unstable
 
@@ -6,11 +6,11 @@ $GENERAL
 LayerCount 2
 Ly 1FFF8001
 EnabledLayers 12AA8001
-Links 80
+Links 81
 NoConn 0
 Di -580 -580 53375 52126
 Ndraw 13
-Ntrack 351
+Ntrack 353
 Nzone 0
 BoardThickness 630
 Nmodule 29
@@ -36,7 +36,6 @@ Layers 2
 Layer[0] Back signal
 Layer[15] Front signal
 TrackWidth 80
-TrackWidthList 180
 TrackClearence 80
 ZoneClearence 80
 TrackMinWidth 80
@@ -71,55 +70,55 @@ Na 1 "/RF/CLKM"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 2 "/RF/IRQ_RF"
+Na 2 "/RF/FEED"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 3 "/RF/RFN"
+Na 3 "/RF/IRQ_RF"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 4 "/RF/RPF"
+Na 4 "/RF/MOSI"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 5 "/RF/TST"
+Na 5 "/RF/RFN"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 6 "/RF/nRST_RF"
+Na 6 "/RF/RPF"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 7 "/USB/C2CK"
+Na 7 "/RF/SLP_TR"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 8 "/USB/C2D"
+Na 8 "/RF/TST"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 9 "/USB/D+"
+Na 9 "/USB/C2CK"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 10 "/USB/D-"
+Na 10 "/USB/C2D"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 11 "/USB/MISO"
+Na 11 "/USB/D+"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 12 "/USB/MOSI"
+Na 12 "/USB/D-"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 13 "/USB/SCLK"
+Na 13 "/USB/MISO"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 14 "/USB/SLP_TR"
+Na 14 "/USB/SCLK"
 St ~
 $EndEQUIPOT
 $EQUIPOT
@@ -131,55 +130,55 @@ Na 16 "/USB/VBUS"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 17 "/USB/nSS"
+Na 17 "/USB/nRST_RF"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 18 "AGND"
+Na 18 "/USB/nSS"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 19 "N-000014"
+Na 19 "AGND"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 20 "N-000015"
+Na 20 "N-000012"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 21 "N-000022"
+Na 21 "N-000015"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 22 "N-000023"
+Na 22 "N-000021"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 23 "N-000026"
+Na 23 "N-000022"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 24 "N-000027"
+Na 24 "N-000025"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 25 "N-000028"
+Na 25 "N-000026"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 26 "N-000031"
+Na 26 "N-000027"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 27 "N-000032"
+Na 27 "N-000030"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 28 "N-000033"
+Na 28 "N-000032"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 29 "N-000034"
+Na 29 "N-000033"
 St ~
 $EndEQUIPOT
 $EQUIPOT
@@ -198,31 +197,41 @@ uViaDrill 50
 AddNet ""
 AddNet "/RF/CLKM"
 AddNet "/RF/IRQ_RF"
+AddNet "/RF/MOSI"
 AddNet "/RF/RFN"
 AddNet "/RF/RPF"
+AddNet "/RF/SLP_TR"
 AddNet "/RF/TST"
-AddNet "/RF/nRST_RF"
 AddNet "/USB/C2CK"
 AddNet "/USB/C2D"
 AddNet "/USB/D+"
 AddNet "/USB/D-"
 AddNet "/USB/MISO"
-AddNet "/USB/MOSI"
 AddNet "/USB/SCLK"
-AddNet "/USB/SLP_TR"
 AddNet "/USB/TST"
+AddNet "/USB/nRST_RF"
 AddNet "/USB/nSS"
-AddNet "N-000014"
+AddNet "N-000012"
 AddNet "N-000015"
+AddNet "N-000021"
 AddNet "N-000022"
-AddNet "N-000023"
+AddNet "N-000025"
 AddNet "N-000026"
 AddNet "N-000027"
-AddNet "N-000028"
-AddNet "N-000031"
+AddNet "N-000030"
 AddNet "N-000032"
 AddNet "N-000033"
-AddNet "N-000034"
+$EndNCLASS
+$NCLASS
+Name "50R"
+Desc ""
+Clearance 80
+TrackWidth 190
+ViaDia 300
+ViaDrill 100
+uViaDia 200
+uViaDrill 50
+AddNet "/RF/FEED"
 $EndNCLASS
 $NCLASS
 Name "Power"
@@ -254,14 +263,14 @@ $PAD
 Sh "1" R 177 236 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 29 "N-000034"
+Ne 29 "N-000033"
 Po -186 0
 $EndPAD
 $PAD
 Sh "2" R 177 236 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po 186 0
 $EndPAD
 $EndMODULE  0402-M
@@ -289,7 +298,7 @@ $PAD
 Sh "2" R 177 236 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po 186 0
 $EndPAD
 $EndMODULE  0402-M
@@ -310,14 +319,14 @@ $PAD
 Sh "1" R 177 236 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 25 "N-000028"
+Ne 26 "N-000027"
 Po -186 0
 $EndPAD
 $PAD
 Sh "2" R 177 236 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po 186 0
 $EndPAD
 $EndMODULE  0402-M
@@ -345,7 +354,7 @@ $PAD
 Sh "2" R 177 236 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po 186 0
 $EndPAD
 $EndMODULE  0402-M
@@ -366,14 +375,14 @@ $PAD
 Sh "1" R 177 236 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 26 "N-000031"
+Ne 27 "N-000030"
 Po -186 0
 $EndPAD
 $PAD
 Sh "2" R 177 236 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po 186 0
 $EndPAD
 $EndMODULE  0402-M
@@ -394,14 +403,14 @@ $PAD
 Sh "1" R 177 236 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po -186 0
 $EndPAD
 $PAD
 Sh "2" R 177 236 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 23 "N-000026"
+Ne 24 "N-000025"
 Po 186 0
 $EndPAD
 $EndMODULE  0402-M
@@ -422,14 +431,14 @@ $PAD
 Sh "1" R 177 236 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 22 "N-000023"
+Ne 23 "N-000022"
 Po -186 0
 $EndPAD
 $PAD
 Sh "2" R 177 236 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 3 "/RF/RFN"
+Ne 5 "/RF/RFN"
 Po 186 0
 $EndPAD
 $EndMODULE  0402-M
@@ -450,14 +459,14 @@ $PAD
 Sh "1" R 177 236 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 21 "N-000022"
+Ne 22 "N-000021"
 Po -186 0
 $EndPAD
 $PAD
 Sh "2" R 177 236 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 4 "/RF/RPF"
+Ne 6 "/RF/RPF"
 Po 186 0
 $EndPAD
 $EndMODULE  0402-M
@@ -478,14 +487,14 @@ $PAD
 Sh "1" R 177 236 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 27 "N-000032"
+Ne 28 "N-000032"
 Po -186 0
 $EndPAD
 $PAD
 Sh "2" R 177 236 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po 186 0
 $EndPAD
 $EndMODULE  0402-M
@@ -506,14 +515,14 @@ $PAD
 Sh "1" R 177 236 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 24 "N-000027"
+Ne 25 "N-000026"
 Po -186 0
 $EndPAD
 $PAD
 Sh "2" R 177 236 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 28 "N-000033"
+Ne 2 "/RF/FEED"
 Po 186 0
 $EndPAD
 $EndMODULE  0402-M
@@ -541,7 +550,7 @@ $PAD
 Sh "2" R 177 236 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po 186 0
 $EndPAD
 $EndMODULE  0402-M
@@ -569,7 +578,7 @@ $PAD
 Sh "2" R 177 236 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po 186 0
 $EndPAD
 $EndMODULE  0402-M
@@ -590,14 +599,14 @@ $PAD
 Sh "1" R 177 236 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 20 "N-000015"
+Ne 21 "N-000015"
 Po -186 0
 $EndPAD
 $PAD
 Sh "2" R 177 236 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 19 "N-000014"
+Ne 20 "N-000012"
 Po 186 0
 $EndPAD
 $EndMODULE  0402-M
@@ -618,14 +627,14 @@ $PAD
 Sh "1" R 177 236 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 9 "/USB/D+"
+Ne 11 "/USB/D+"
 Po -186 0
 $EndPAD
 $PAD
 Sh "2" R 177 236 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po 186 0
 $EndPAD
 $EndMODULE  0402-M
@@ -646,14 +655,14 @@ $PAD
 Sh "1" R 177 236 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 10 "/USB/D-"
+Ne 12 "/USB/D-"
 Po -186 0
 $EndPAD
 $PAD
 Sh "2" R 177 236 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po 186 0
 $EndPAD
 $EndMODULE  0402-M
@@ -681,7 +690,7 @@ $PAD
 Sh "2" R 177 236 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po 186 0
 $EndPAD
 $EndMODULE  0402-M
@@ -702,14 +711,14 @@ $PAD
 Sh "1" R 217 354 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 20 "N-000015"
+Ne 21 "N-000015"
 Po -304 0
 $EndPAD
 $PAD
 Sh "2" R 217 354 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po 304 0
 $EndPAD
 $EndMODULE  0603-M
@@ -730,42 +739,42 @@ $PAD
 Sh "1" R 157 275 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 28 "N-000033"
+Ne 2 "/RF/FEED"
 Po 255 -186
 $EndPAD
 $PAD
 Sh "2" R 156 275 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 27 "N-000032"
+Ne 28 "N-000032"
 Po 0 -186
 $EndPAD
 $PAD
 Sh "3" R 157 275 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 22 "N-000023"
+Ne 23 "N-000022"
 Po -255 -186
 $EndPAD
 $PAD
 Sh "4" R 157 275 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 21 "N-000022"
+Ne 22 "N-000021"
 Po -255 186
 $EndPAD
 $PAD
 Sh "5" R 156 275 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po 0 186
 $EndPAD
 $PAD
 Sh "6" R 157 275 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po 255 186
 $EndPAD
 $EndMODULE  0805-6
@@ -786,7 +795,7 @@ $PAD
 Sh "1" R 354 196 0 0 0
 Dr 78 0 0
 At STD N 00CC8001
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po 0 -39
 $EndPAD
 $PAD
@@ -807,7 +816,7 @@ $PAD
 Sh "2" R 197 196 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 24 "N-000027"
+Ne 25 "N-000026"
 Po 826 -39
 $EndPAD
 $PAD
@@ -935,7 +944,7 @@ $PAD
 Sh "1" O 600 600 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 7 "/USB/C2CK"
+Ne 9 "/USB/C2CK"
 Po 0 0
 $EndPAD
 $EndMODULE  PAD_60x60
@@ -952,7 +961,7 @@ $PAD
 Sh "1" O 600 600 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 8 "/USB/C2D"
+Ne 10 "/USB/C2D"
 Po 0 0
 $EndPAD
 $EndMODULE  PAD_60x60
@@ -969,7 +978,7 @@ $PAD
 Sh "1" O 600 600 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po 0 0
 $EndPAD
 $EndMODULE  PAD_60x60
@@ -998,28 +1007,28 @@ $PAD
 Sh "1" R 355 98 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 2 "/RF/IRQ_RF"
+Ne 3 "/RF/IRQ_RF"
 Po -944 -590
 $EndPAD
 $PAD
 Sh "2" R 355 98 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po -944 -393
 $EndPAD
 $PAD
 Sh "3" R 355 99 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 9 "/USB/D+"
+Ne 11 "/USB/D+"
 Po -944 -196
 $EndPAD
 $PAD
 Sh "4" R 355 98 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 10 "/USB/D-"
+Ne 12 "/USB/D-"
 Po -944 0
 $EndPAD
 $PAD
@@ -1054,14 +1063,14 @@ $PAD
 Sh "9" R 98 355 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 7 "/USB/C2CK"
+Ne 9 "/USB/C2CK"
 Po -393 944
 $EndPAD
 $PAD
 Sh "10" R 99 355 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 8 "/USB/C2D"
+Ne 10 "/USB/C2D"
 Po -196 944
 $EndPAD
 $PAD
@@ -1110,21 +1119,21 @@ $PAD
 Sh "17" R 355 99 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 17 "/USB/nSS"
+Ne 18 "/USB/nSS"
 Po 944 196
 $EndPAD
 $PAD
 Sh "18" R 355 98 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 12 "/USB/MOSI"
+Ne 4 "/RF/MOSI"
 Po 944 0
 $EndPAD
 $PAD
 Sh "19" R 355 99 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 11 "/USB/MISO"
+Ne 13 "/USB/MISO"
 Po 944 -196
 $EndPAD
 $PAD
@@ -1145,21 +1154,21 @@ $PAD
 Sh "22" R 98 355 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 13 "/USB/SCLK"
+Ne 14 "/USB/SCLK"
 Po 590 -944
 $EndPAD
 $PAD
 Sh "23" R 98 355 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 6 "/RF/nRST_RF"
+Ne 17 "/USB/nRST_RF"
 Po 393 -944
 $EndPAD
 $PAD
 Sh "24" R 99 355 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 14 "/USB/SLP_TR"
+Ne 7 "/RF/SLP_TR"
 Po 196 -944
 $EndPAD
 $PAD
@@ -1180,21 +1189,21 @@ $PAD
 Sh "27" R 98 355 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 0 ""
+Ne 19 "AGND"
 Po -393 -944
 $EndPAD
 $PAD
 Sh "28" R 98 355 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 19 "N-000014"
+Ne 20 "N-000012"
 Po -590 -944
 $EndPAD
 $PAD
 Sh "29" R 1278 1278 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po 0 0
 $EndPAD
 $EndMODULE  QFN28
@@ -1223,42 +1232,42 @@ $PAD
 Sh "1" R 355 115 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po -1003 -688
 $EndPAD
 $PAD
 Sh "2" R 355 114 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po -1003 -492
 $EndPAD
 $PAD
 Sh "3" R 355 114 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po -1003 -295
 $EndPAD
 $PAD
 Sh "4" R 355 114 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 4 "/RF/RPF"
+Ne 6 "/RF/RPF"
 Po -1003 -98
 $EndPAD
 $PAD
 Sh "5" R 355 114 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 3 "/RF/RFN"
+Ne 5 "/RF/RFN"
 Po -1003 98
 $EndPAD
 $PAD
 Sh "6" R 355 114 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po -1003 295
 $EndPAD
 $PAD
@@ -1272,49 +1281,49 @@ $PAD
 Sh "8" R 355 115 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 6 "/RF/nRST_RF"
+Ne 17 "/USB/nRST_RF"
 Po -1003 688
 $EndPAD
 $PAD
 Sh "9" R 115 355 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po -688 1003
 $EndPAD
 $PAD
 Sh "10" R 114 355 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po -492 1003
 $EndPAD
 $PAD
 Sh "11" R 114 355 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 14 "/USB/SLP_TR"
+Ne 7 "/RF/SLP_TR"
 Po -295 1003
 $EndPAD
 $PAD
 Sh "12" R 114 355 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po -98 1003
 $EndPAD
 $PAD
 Sh "13" R 114 355 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 26 "N-000031"
+Ne 27 "N-000030"
 Po 98 1003
 $EndPAD
 $PAD
 Sh "14" R 114 355 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 26 "N-000031"
+Ne 27 "N-000030"
 Po 295 1003
 $EndPAD
 $PAD
@@ -1328,7 +1337,7 @@ $PAD
 Sh "16" R 115 355 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po 688 1003
 $EndPAD
 $PAD
@@ -1342,70 +1351,70 @@ $PAD
 Sh "18" R 355 114 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po 1003 492
 $EndPAD
 $PAD
 Sh "19" R 355 114 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 13 "/USB/SCLK"
+Ne 14 "/USB/SCLK"
 Po 1003 295
 $EndPAD
 $PAD
 Sh "20" R 355 114 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 11 "/USB/MISO"
+Ne 13 "/USB/MISO"
 Po 1003 98
 $EndPAD
 $PAD
 Sh "21" R 355 114 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po 1003 -98
 $EndPAD
 $PAD
 Sh "22" R 355 114 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 12 "/USB/MOSI"
+Ne 4 "/RF/MOSI"
 Po 1003 -295
 $EndPAD
 $PAD
 Sh "23" R 355 114 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 17 "/USB/nSS"
+Ne 18 "/USB/nSS"
 Po 1003 -492
 $EndPAD
 $PAD
 Sh "24" R 355 115 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 2 "/RF/IRQ_RF"
+Ne 3 "/RF/IRQ_RF"
 Po 1003 -688
 $EndPAD
 $PAD
 Sh "25" R 115 355 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 25 "N-000028"
+Ne 26 "N-000027"
 Po 688 -1003
 $EndPAD
 $PAD
 Sh "26" R 114 355 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 29 "N-000034"
+Ne 29 "N-000033"
 Po 492 -1003
 $EndPAD
 $PAD
 Sh "27" R 114 355 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po 295 -1003
 $EndPAD
 $PAD
@@ -1419,35 +1428,35 @@ $PAD
 Sh "29" R 114 355 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 23 "N-000026"
+Ne 24 "N-000025"
 Po -98 -1003
 $EndPAD
 $PAD
 Sh "30" R 114 355 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po -295 -1003
 $EndPAD
 $PAD
 Sh "31" R 114 355 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po -492 -1003
 $EndPAD
 $PAD
 Sh "32" R 115 355 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po -688 -1003
 $EndPAD
 $PAD
 Sh "33" R 1338 1338 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po 0 0
 $EndPAD
 $EndMODULE  QFN32
@@ -1472,35 +1481,35 @@ $PAD
 Sh "2" R 472 867 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 10 "/USB/D-"
+Ne 12 "/USB/D-"
 Po 393 -1062
 $EndPAD
 $PAD
 Sh "3" R 472 867 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 9 "/USB/D+"
+Ne 11 "/USB/D+"
 Po -393 -1062
 $EndPAD
 $PAD
 Sh "4" R 473 867 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po -1377 -1062
 $EndPAD
 $PAD
 Sh "5" O 787 1968 0 0 0
 Dr 393 0 0 O 393 984
 At STD N 00CC8001
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po -2243 0
 $EndPAD
 $PAD
 Sh "6" O 787 1968 0 0 0
 Dr 393 0 0 O 393 984
 At STD N 00CC8001
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po 2243 0
 $EndPAD
 $PAD
@@ -1535,28 +1544,28 @@ $PAD
 Sh "1" R 551 473 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 25 "N-000028"
+Ne 26 "N-000027"
 Po -432 314
 $EndPAD
 $PAD
 Sh "2" R 551 473 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po 432 314
 $EndPAD
 $PAD
 Sh "3" R 551 473 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 29 "N-000034"
+Ne 29 "N-000033"
 Po 432 -314
 $EndPAD
 $PAD
 Sh "4" R 551 473 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 19 "AGND"
 Po -432 -314
 $EndPAD
 $EndMODULE  xtal4-3.2mmx2.5mm
@@ -1573,7 +1582,7 @@ $PAD
 Sh "1" O 600 600 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 5 "/RF/TST"
+Ne 8 "/RF/TST"
 Po 0 0
 $EndPAD
 $EndMODULE  PAD_60x60
@@ -1637,152 +1646,132 @@ Po 0 47812 45253 47697 45253 80 -1
 De 15 0 1 0 800
 Po 0 47697 45253 46950 46000 80 -1
 De 15 0 1 0 400
-Po 0 49350 45800 49350 46400 80 -1
-De 0 0 2 0 0
-Po 0 49188 45638 49350 45800 80 -1
-De 15 0 2 0 0
-Po 3 49350 45800 49350 45800 300 -1
-De 15 1 2 0 0
-Po 0 48110 48244 47556 48244 80 -1
+Po 0 48464 41495 47609 41495 190 -1
 De 15 0 2 0 800
-Po 3 47500 48300 47500 48300 300 -1
-De 15 1 2 0 0
-Po 0 47556 48244 47500 48300 80 -1
-De 15 0 2 0 0
-Po 0 49188 45638 49188 45253 80 -1
+Po 0 47609 41495 47600 41486 190 -1
 De 15 0 2 0 400
-Po 0 47550 48250 47500 48300 80 -1
-De 0 0 2 0 0
-Po 0 49550 48250 47550 48250 80 -1
-De 0 0 2 0 0
-Po 0 49850 47950 49550 48250 80 -1
-De 0 0 2 0 0
-Po 0 49850 46900 49850 47950 80 -1
-De 0 0 2 0 0
-Po 0 49350 46400 49850 46900 80 -1
-De 0 0 2 0 0
-Po 0 48450 42786 48450 42900 80 -1
-De 15 0 3 0 800
-Po 0 48402 42948 48402 43247 80 -1
-De 15 0 3 0 400
-Po 0 48450 42900 48402 42948 80 -1
+Po 0 49350 45800 49350 46400 80 -1
+De 0 0 3 0 0
+Po 0 49188 45638 49350 45800 80 -1
 De 15 0 3 0 0
-Po 0 48598 43247 48598 43038 80 -1
-De 15 0 4 0 800
-Po 0 48598 43038 48850 42786 80 -1
-De 15 0 4 0 400
-Po 0 47250 46550 47100 46400 80 -1
-De 0 0 6 0 0
-Po 0 47507 46907 47250 46650 80 -1
-De 15 0 6 0 0
-Po 0 47250 46650 47250 46550 80 -1
-De 15 0 6 0 0
-Po 3 47250 46550 47250 46550 300 -1
-De 15 1 6 0 0
-Po 0 47756 46907 47507 46907 80 -1
-De 15 0 6 0 800
-Po 0 47197 43247 46900 42950 80 -1
-De 15 0 6 0 0
-Po 3 46900 42950 46900 42950 300 -1
-De 15 1 6 0 0
-Po 0 47197 43247 47812 43247 80 -1
-De 15 0 6 0 400
-Po 0 47400 43450 46900 42950 80 -1
-De 0 0 6 0 0
-Po 0 47400 44950 47400 43450 80 -1
-De 0 0 6 0 0
-Po 0 47100 45250 47400 44950 80 -1
-De 0 0 6 0 0
-Po 0 47100 46400 47100 45250 80 -1
-De 0 0 6 0 0
-Po 0 49644 47693 50107 47693 80 -1
-De 15 0 7 0 800
-Po 0 51650 47300 52100 46850 80 -1
-De 15 0 7 0 400
-Po 0 50500 47300 51650 47300 80 -1
-De 15 0 7 0 0
-Po 0 50107 47693 50500 47300 80 -1
-De 15 0 7 0 0
-Po 0 50400 47100 51200 47100 80 -1
-De 15 0 8 0 0
-Po 0 50004 47496 50400 47100 80 -1
-De 15 0 8 0 0
-Po 0 49644 47496 50004 47496 80 -1
-De 15 0 8 0 800
-Po 0 52100 46200 52100 45850 80 -1
-De 15 0 8 0 400
-Po 0 51200 47100 52100 46200 80 -1
-De 15 0 8 0 0
-Po 0 49157 49638 49157 49471 80 -1
-De 15 0 9 0 800
-Po 0 49157 49471 48536 48850 80 -1
-De 15 0 9 0 400
-Po 0 48504 48244 48504 48546 80 -1
-De 15 0 9 0 800
-Po 0 48536 48578 48536 48850 80 -1
-De 15 0 9 0 400
-Po 0 48504 48546 48536 48578 80 -1
-De 15 0 9 0 0
-Po 0 49943 49638 49943 49543 80 -1
-De 15 0 10 0 800
-Po 0 49314 48914 49314 48850 80 -1
-De 15 0 10 0 400
-Po 0 49943 49543 49314 48914 80 -1
-De 15 0 10 0 0
-Po 0 48700 48244 48700 48600 80 -1
-De 15 0 10 0 800
-Po 0 48950 48850 49314 48850 80 -1
-De 15 0 10 0 400
-Po 0 48700 48600 48950 48850 80 -1
-De 15 0 10 0 0
-Po 0 48402 45253 48402 45852 80 -1
-De 15 0 11 0 800
-Po 0 48504 45954 48504 46356 80 -1
-De 15 0 11 0 400
-Po 0 48402 45852 48504 45954 80 -1
-De 15 0 11 0 0
+Po 3 49350 45800 49350 45800 300 -1
+De 15 1 3 0 0
+Po 0 48110 48244 47556 48244 80 -1
+De 15 0 3 0 800
+Po 3 47500 48300 47500 48300 300 -1
+De 15 1 3 0 0
+Po 0 47556 48244 47500 48300 80 -1
+De 15 0 3 0 0
+Po 0 49188 45638 49188 45253 80 -1
+De 15 0 3 0 400
+Po 0 47550 48250 47500 48300 80 -1
+De 0 0 3 0 0
+Po 0 49550 48250 47550 48250 80 -1
+De 0 0 3 0 0
+Po 0 49850 47950 49550 48250 80 -1
+De 0 0 3 0 0
+Po 0 49850 46900 49850 47950 80 -1
+De 0 0 3 0 0
+Po 0 49350 46400 49850 46900 80 -1
+De 0 0 3 0 0
 Po 0 48700 46356 48700 45950 80 -1
-De 15 0 12 0 800
+De 15 0 4 0 800
 Po 0 48795 45855 48795 45253 80 -1
-De 15 0 12 0 400
+De 15 0 4 0 400
 Po 0 48700 45950 48795 45855 80 -1
-De 15 0 12 0 0
-Po 0 47756 46710 47756 46294 80 -1
-De 15 0 13 0 800
-Po 0 48205 45845 48205 45253 80 -1
-De 15 0 13 0 400
-Po 0 47756 46294 48205 45845 80 -1
-De 15 0 13 0 0
+De 15 0 4 0 0
+Po 0 48450 42786 48450 42900 80 -1
+De 15 0 5 0 800
+Po 0 48402 42948 48402 43247 80 -1
+De 15 0 5 0 400
+Po 0 48450 42900 48402 42948 80 -1
+De 15 0 5 0 0
+Po 0 48598 43247 48598 43038 80 -1
+De 15 0 6 0 800
+Po 0 48598 43038 48850 42786 80 -1
+De 15 0 6 0 400
 Po 0 47000 46850 47000 46800 80 -1
-De 0 0 14 0 0
+De 0 0 7 0 0
 Po 0 47255 43955 47150 43850 80 -1
-De 15 0 14 0 0
+De 15 0 7 0 0
 Po 0 47150 43850 47150 43650 80 -1
-De 15 0 14 0 0
+De 15 0 7 0 0
 Po 0 47150 43650 46900 43400 80 -1
-De 15 0 14 0 0
+De 15 0 7 0 0
 Po 3 46900 43400 46900 43400 300 -1
-De 15 1 14 0 0
+De 15 1 7 0 0
 Po 0 47497 43955 47255 43955 80 -1
-De 15 0 14 0 800
+De 15 0 7 0 800
 Po 0 47304 47104 47050 46850 80 -1
-De 15 0 14 0 0
+De 15 0 7 0 0
 Po 0 47050 46850 47000 46850 80 -1
-De 15 0 14 0 0
+De 15 0 7 0 0
 Po 3 47000 46850 47000 46850 300 -1
-De 15 1 14 0 0
+De 15 1 7 0 0
 Po 0 47304 47104 47756 47104 80 -1
-De 15 0 14 0 400
+De 15 0 7 0 400
 Po 0 47200 43700 46900 43400 80 -1
-De 0 0 14 0 0
+De 0 0 7 0 0
 Po 0 47200 44850 47200 43700 80 -1
-De 0 0 14 0 0
+De 0 0 7 0 0
 Po 0 46900 45150 47200 44850 80 -1
-De 0 0 14 0 0
+De 0 0 7 0 0
 Po 0 46900 46700 46900 45150 80 -1
-De 0 0 14 0 0
+De 0 0 7 0 0
 Po 0 47000 46800 46900 46700 80 -1
-De 0 0 14 0 0
+De 0 0 7 0 0
+Po 0 49644 47693 50107 47693 80 -1
+De 15 0 9 0 800
+Po 0 51650 47300 52100 46850 80 -1
+De 15 0 9 0 400
+Po 0 50500 47300 51650 47300 80 -1
+De 15 0 9 0 0
+Po 0 50107 47693 50500 47300 80 -1
+De 15 0 9 0 0
+Po 0 50400 47100 51200 47100 80 -1
+De 15 0 10 0 0
+Po 0 50004 47496 50400 47100 80 -1
+De 15 0 10 0 0
+Po 0 49644 47496 50004 47496 80 -1
+De 15 0 10 0 800
+Po 0 52100 46200 52100 45850 80 -1
+De 15 0 10 0 400
+Po 0 51200 47100 52100 46200 80 -1
+De 15 0 10 0 0
+Po 0 49157 49638 49157 49471 80 -1
+De 15 0 11 0 800
+Po 0 49157 49471 48536 48850 80 -1
+De 15 0 11 0 400
+Po 0 48504 48244 48504 48546 80 -1
+De 15 0 11 0 800
+Po 0 48536 48578 48536 48850 80 -1
+De 15 0 11 0 400
+Po 0 48504 48546 48536 48578 80 -1
+De 15 0 11 0 0
+Po 0 49943 49638 49943 49543 80 -1
+De 15 0 12 0 800
+Po 0 49314 48914 49314 48850 80 -1
+De 15 0 12 0 400
+Po 0 49943 49543 49314 48914 80 -1
+De 15 0 12 0 0
+Po 0 48700 48244 48700 48600 80 -1
+De 15 0 12 0 800
+Po 0 48950 48850 49314 48850 80 -1
+De 15 0 12 0 400
+Po 0 48700 48600 48950 48850 80 -1
+De 15 0 12 0 0
+Po 0 48402 45253 48402 45852 80 -1
+De 15 0 13 0 800
+Po 0 48504 45954 48504 46356 80 -1
+De 15 0 13 0 400
+Po 0 48402 45852 48504 45954 80 -1
+De 15 0 13 0 0
+Po 0 47756 46710 47756 46294 80 -1
+De 15 0 14 0 800
+Po 0 48205 45845 48205 45253 80 -1
+De 15 0 14 0 400
+Po 0 47756 46294 48205 45845 80 -1
+De 15 0 14 0 0
 Po 0 47000 47250 47050 47250 80 -1
 De 0 0 15 0 0
 Po 0 48008 43008 47900 42900 80 -1
@@ -1851,405 +1840,429 @@ Po 0 49644 48106 49644 47890 100 -1
 De 15 0 16 0 400
 Po 0 49506 48244 49644 48106 100 -1
 De 15 0 16 0 0
-Po 0 48896 46356 48896 46004 80 -1
-De 15 0 17 0 800
-Po 0 48992 45908 48992 45253 80 -1
-De 15 0 17 0 400
-Po 0 48896 46004 48992 45908 80 -1
+Po 0 47250 46550 47100 46400 80 -1
+De 0 0 17 0 0
+Po 0 47507 46907 47250 46650 80 -1
 De 15 0 17 0 0
-Po 0 50050 43300 50250 43500 100 -1
-De 15 0 18 0 0
-Po 0 49503 43562 49788 43562 100 -1
+Po 0 47250 46650 47250 46550 80 -1
+De 15 0 17 0 0
+Po 3 47250 46550 47250 46550 300 -1
+De 15 1 17 0 0
+Po 0 47756 46907 47507 46907 80 -1
+De 15 0 17 0 800
+Po 0 47197 43247 46900 42950 80 -1
+De 15 0 17 0 0
+Po 3 46900 42950 46900 42950 300 -1
+De 15 1 17 0 0
+Po 0 47197 43247 47812 43247 80 -1
+De 15 0 17 0 400
+Po 0 47400 43450 46900 42950 80 -1
+De 0 0 17 0 0
+Po 0 47400 44950 47400 43450 80 -1
+De 0 0 17 0 0
+Po 0 47100 45250 47400 44950 80 -1
+De 0 0 17 0 0
+Po 0 47100 46400 47100 45250 80 -1
+De 0 0 17 0 0
+Po 0 48896 46356 48896 46004 80 -1
 De 15 0 18 0 800
-Po 3 50050 43300 50050 43300 300 -1
-De 15 1 18 0 0
-Po 0 49788 43562 50050 43300 100 -1
-De 15 0 18 0 0
-Po 0 50986 43714 51100 43600 100 -1
-De 15 0 18 0 0
-Po 3 51100 43600 51100 43600 300 -1
-De 15 1 18 0 0
-Po 0 50986 43714 50550 43714 100 -1
+Po 0 48992 45908 48992 45253 80 -1
 De 15 0 18 0 400
-Po 0 51000 43500 51100 43600 100 -1
+Po 0 48896 46004 48992 45908 80 -1
 De 15 0 18 0 0
-Po 0 50250 43500 51000 43500 100 -1
-De 15 0 18 0 0
-Po 0 46750 40911 47011 40911 100 -1
-De 0 0 18 0 800
-Po 0 48050 41100 48550 41100 100 -1
-De 15 0 18 0 0
-Po 0 48550 41100 48800 41100 100 -1
-De 15 0 18 0 0
-Po 3 48550 41100 48550 41100 300 -1
-De 15 1 18 0 0
-Po 3 48050 41100 48050 41100 300 -1
-De 15 1 18 0 0
-Po 0 48050 41100 47200 41100 100 -1
-De 0 0 18 0 0
-Po 3 47200 41100 47200 41100 300 -1
-De 15 1 18 0 0
-Po 0 47011 40911 47200 41100 100 -1
-De 0 0 18 0 0
-Po 0 51793 50700 51050 50700 100 -1
-De 0 0 18 0 800
-Po 0 48100 50700 47307 50700 100 -1
-De 0 0 18 0 400
-Po 0 48500 51100 48100 50700 100 -1
-De 0 0 18 0 0
-Po 0 50650 51100 48500 51100 100 -1
-De 0 0 18 0 0
-Po 0 51050 50700 50650 51100 100 -1
-De 0 0 18 0 0
-Po 0 48992 43050 49188 43050 100 -1
-De 15 0 18 0 0
-Po 0 46750 41400 46750 41900 100 -1
-De 15 0 18 0 0
-Po 3 46750 41400 46750 41400 300 -1
-De 15 1 18 0 0
-Po 0 46750 40911 46750 41400 100 -1
-De 0 0 18 0 800
-Po 0 46900 42050 46800 41950 100 -1
-De 15 0 18 0 0
-Po 3 46800 41950 46800 41950 300 -1
-De 15 1 18 0 0
-Po 0 46900 42050 47614 42050 100 -1
-De 15 0 18 0 400
-Po 0 46750 41900 46800 41950 100 -1
-De 15 0 18 0 0
-Po 0 47497 44938 47812 44938 100 -1
-De 15 0 18 0 800
-Po 0 47812 44938 48500 44250 100 -1
-De 15 0 18 0 400
-Po 0 47497 44152 48402 44152 100 -1
-De 15 0 18 0 800
-Po 0 48402 44152 48500 44250 100 -1
-De 15 0 18 0 400
-Po 0 50300 48850 50350 48850 100 -1
-De 0 0 18 0 0
-Po 3 50300 48850 50300 48850 300 -1
-De 15 1 18 0 0
-Po 0 50350 48850 50800 48400 100 -1
-De 0 0 18 0 0
-Po 0 48307 48244 48307 47693 100 -1
-De 15 0 18 0 800
-Po 0 48307 47693 48700 47300 100 -1
-De 15 0 18 0 400
-Po 0 49350 42600 47850 42600 100 -1
-De 0 0 18 0 0
-Po 0 48205 42955 47850 42600 100 -1
-De 15 0 18 0 0
-Po 3 47850 42600 47850 42600 300 -1
-De 15 1 18 0 0
-Po 0 48205 42955 48205 43247 100 -1
-De 15 0 18 0 400
-Po 0 50550 44600 50550 45350 100 -1
-De 0 0 18 0 0
-Po 3 49950 45950 49950 45950 300 -1
-De 15 1 18 0 0
-Po 0 50032 46032 49950 45950 100 -1
-De 15 0 18 0 0
-Po 0 50032 46032 50586 46032 100 -1
-De 15 0 18 0 400
-Po 0 50550 45350 49950 45950 100 -1
-De 0 0 18 0 0
-Po 0 49503 44545 49981 44545 100 -1
-De 15 0 18 0 800
-Po 0 49981 44545 50050 44614 100 -1
-De 15 0 18 0 400
-Po 0 47050 48250 47050 47850 100 -1
-De 0 0 18 0 0
-Po 0 47454 48704 47050 48300 100 -1
-De 15 0 18 0 0
-Po 0 47050 48300 47050 48250 100 -1
-De 15 0 18 0 0
-Po 3 47050 48250 47050 48250 300 -1
-De 15 1 18 0 0
-Po 0 47454 48850 47454 48704 100 -1
-De 15 0 18 0 800
-Po 0 48008 45492 47650 45850 80 -1
-De 15 0 18 0 0
-Po 3 47650 45850 47650 45850 300 -1
-De 15 1 18 0 0
-Po 0 48008 45492 48008 45253 80 -1
-De 15 0 18 0 400
-Po 0 47800 46000 47650 45850 100 -1
-De 0 0 18 0 0
-Po 0 47800 47100 47800 46000 100 -1
-De 0 0 18 0 0
-Po 0 47050 47850 47800 47100 100 -1
-De 0 0 18 0 0
-Po 0 48307 48244 48307 48493 100 -1
-De 15 0 18 0 800
-Po 0 48164 48636 48164 48850 100 -1
-De 15 0 18 0 400
-Po 0 48307 48493 48164 48636 100 -1
-De 15 0 18 0 0
-Po 0 51793 50700 51793 49393 100 -1
-De 0 0 18 0 800
-Po 0 51793 49393 50800 48400 100 -1
-De 0 0 18 0 0
-Po 0 50800 48400 50450 48050 100 -1
-De 0 0 18 0 0
-Po 3 50450 48050 50450 48050 300 -1
-De 15 1 18 0 0
-Po 0 50650 48250 50914 48250 100 -1
-De 15 0 18 0 400
-Po 0 50650 48250 50450 48050 100 -1
-De 15 0 18 0 0
-Po 0 48836 41750 49200 41750 100 -1
-De 15 0 18 0 800
-Po 3 49350 41600 49350 41600 300 -1
-De 15 1 18 0 0
-Po 0 49245 41495 49350 41600 100 -1
-De 15 0 18 0 0
-Po 0 48836 41495 49245 41495 100 -1
-De 15 0 18 0 800
-Po 0 49188 42762 49188 43050 100 -1
-De 15 0 18 0 0
-Po 0 49188 42762 49350 42600 100 -1
-De 15 0 18 0 0
-Po 3 49350 42600 49350 42600 300 -1
-De 15 1 18 0 0
-Po 0 49188 43050 49188 43058 100 -1
-De 15 0 18 0 0
-Po 0 49188 43247 49188 43058 100 -1
-De 15 0 18 0 800
-Po 0 49350 42100 49350 41600 100 -1
-De 15 0 18 0 0
-Po 3 49350 42100 49350 42100 300 -1
-De 15 1 18 0 0
-Po 0 49350 42600 49350 42100 100 -1
-De 0 0 18 0 0
-Po 0 49200 41750 49350 41600 100 -1
-De 15 0 18 0 0
-Po 0 48795 43247 48795 43105 100 -1
-De 15 0 18 0 800
-Po 0 48992 43058 48992 43050 100 -1
-De 15 0 18 0 0
-Po 0 48992 43050 48992 43247 100 -1
-De 15 0 18 0 400
-Po 0 49000 43050 48992 43058 100 -1
-De 15 0 18 0 0
-Po 0 48850 43050 49000 43050 100 -1
-De 15 0 18 0 0
-Po 0 48795 43105 48850 43050 100 -1
-De 15 0 18 0 0
-Po 0 50050 43714 50550 43714 100 -1
-De 15 0 18 0 C00
-Po 0 48992 43247 48992 43758 100 -1
-De 15 0 18 0 800
-Po 0 48992 43758 48500 44250 100 -1
-De 15 0 18 0 400
-Po 0 48795 43247 48795 43955 100 -1
-De 15 0 18 0 800
-Po 0 48795 43955 48500 44250 100 -1
-De 15 0 18 0 400
-Po 0 47497 43562 47812 43562 100 -1
-De 15 0 18 0 800
-Po 0 47812 43562 48500 44250 100 -1
-De 15 0 18 0 400
-Po 0 47497 43758 48008 43758 100 -1
-De 15 0 18 0 800
-Po 0 48008 43758 48500 44250 100 -1
-De 15 0 18 0 400
-Po 0 48008 45253 48008 44742 100 -1
-De 15 0 18 0 800
-Po 0 48008 44742 48500 44250 100 -1
-De 15 0 18 0 400
-Po 0 49503 44545 48795 44545 100 -1
-De 15 0 18 0 800
-Po 0 48795 44545 48500 44250 100 -1
-De 15 0 18 0 400
-Po 0 49503 43955 48795 43955 100 -1
-De 15 0 18 0 800
-Po 0 48795 43955 48500 44250 100 -1
-De 15 0 18 0 400
-Po 0 49503 43758 48992 43758 100 -1
-De 15 0 18 0 800
-Po 0 48992 43758 48500 44250 100 -1
-De 15 0 18 0 400
-Po 0 49503 43562 49188 43562 100 -1
-De 15 0 18 0 800
-Po 0 49188 43562 48500 44250 100 -1
-De 15 0 18 0 400
-Po 0 49188 43247 49188 43562 100 -1
-De 15 0 18 0 800
-Po 0 49188 43562 48500 44250 100 -1
-De 15 0 18 0 400
-Po 0 49503 43758 49850 43758 100 -1
-De 15 0 18 0 800
-Po 0 49850 43758 49850 43714 100 -1
-De 15 0 18 0 0
-Po 0 49503 43955 49745 43955 100 -1
-De 15 0 18 0 800
-Po 0 49864 43714 49850 43714 100 -1
-De 15 0 18 0 0
-Po 0 49850 43714 50050 43714 100 -1
-De 15 0 18 0 400
-Po 0 49850 43700 49864 43714 100 -1
-De 15 0 18 0 0
-Po 0 49850 43850 49850 43700 100 -1
-De 15 0 18 0 0
-Po 0 49745 43955 49850 43850 100 -1
-De 15 0 18 0 0
-Po 0 50050 44614 50536 44614 100 -1
-De 15 0 18 0 800
-Po 0 50536 44614 50550 44600 100 -1
-De 15 0 18 0 0
-Po 3 50550 44600 50550 44600 300 -1
-De 15 1 18 0 0
-Po 0 50550 44600 51200 44600 100 -1
-De 0 0 18 0 0
-Po 3 51200 44600 51200 44600 300 -1
-De 15 1 18 0 0
-Po 0 51200 44600 51214 44614 100 -1
-De 15 0 18 0 0
-Po 0 51214 44614 51214 45168 100 -1
-De 15 0 18 0 400
-Po 0 50514 46650 50514 46104 100 -1
-De 15 0 18 0 800
-Po 0 50514 46104 50586 46032 100 -1
-De 15 0 18 0 400
-Po 0 51793 50700 51793 49157 100 -1
-De 15 0 18 0 800
-Po 0 51793 49157 52100 48850 100 -1
-De 15 0 18 0 400
-Po 0 47454 48850 47454 49296 100 -1
-De 15 0 18 0 800
-Po 0 47307 49443 47307 50700 100 -1
-De 15 0 18 0 400
-Po 0 47454 49296 47307 49443 100 -1
-De 15 0 18 0 0
-Po 0 48164 48850 48164 49629 100 -1
-De 15 0 18 0 800
-Po 0 48164 49629 48173 49638 100 -1
-De 15 0 18 0 400
-Po 0 47454 48850 48164 48850 100 -1
-De 15 0 18 0 C00
-Po 0 50914 47750 50914 48250 100 -1
-De 15 0 18 0 C00
-Po 0 50914 48850 50300 48850 100 -1
-De 15 0 18 0 800
-Po 0 50300 48850 49686 48850 100 -1
-De 15 0 18 0 400
-Po 0 48836 41750 48836 41495 100 -1
-De 15 0 18 0 C00
-Po 0 48800 41100 49050 41100 100 -1
-De 15 0 18 0 0
-Po 3 49050 41100 49050 41100 300 -1
-De 15 1 18 0 0
-Po 0 49050 41100 49550 41100 100 -1
-De 0 0 18 0 0
-Po 3 49550 41100 49550 41100 300 -1
-De 15 1 18 0 0
-Po 0 49550 41100 50000 41100 100 -1
-De 15 0 18 0 0
-Po 3 50000 41100 50000 41100 300 -1
-De 15 1 18 0 0
-Po 0 50000 41100 50450 41100 100 -1
-De 0 0 18 0 0
-Po 3 50450 41100 50450 41100 300 -1
-De 15 1 18 0 0
-Po 0 50450 41100 50900 41100 100 -1
-De 15 0 18 0 0
-Po 3 50900 41100 50900 41100 300 -1
-De 15 1 18 0 0
-Po 0 50900 41100 51400 41100 100 -1
-De 0 0 18 0 0
-Po 3 51400 41100 51400 41100 300 -1
-De 15 1 18 0 0
-Po 0 51400 41100 51900 41100 100 -1
-De 15 0 18 0 0
-Po 3 51900 41100 51900 41100 300 -1
-De 15 1 18 0 0
-Po 0 51900 41100 52400 41100 100 -1
-De 0 0 18 0 0
-Po 3 52400 41100 52400 41100 300 -1
-De 15 1 18 0 0
-Po 0 48836 41495 48836 41136 100 -1
-De 15 0 18 0 800
-Po 0 48836 41136 48800 41100 100 -1
-De 15 0 18 0 0
-Po 0 46900 45486 47114 45486 100 -1
-De 15 0 18 0 800
-Po 0 47497 45103 47497 44938 100 -1
-De 15 0 18 0 400
-Po 0 47114 45486 47497 45103 100 -1
-De 15 0 18 0 0
-Po 0 47497 44152 47208 44152 100 -1
-De 15 0 18 0 800
-Po 0 46970 43914 46900 43914 100 -1
-De 15 0 18 0 400
-Po 0 47208 44152 46970 43914 100 -1
-De 15 0 18 0 0
-Po 0 48598 45253 48598 44348 100 -1
-De 15 0 18 0 800
-Po 0 48598 44348 48500 44250 100 -1
-De 15 0 18 0 400
-Po 0 47756 47890 47490 47890 80 -1
+Po 0 47756 47693 48307 47693 100 -1
 De 15 0 19 0 800
-Po 0 47350 47750 47186 47750 80 -1
+Po 0 48307 47693 48700 47300 100 -1
 De 15 0 19 0 400
-Po 0 47490 47890 47350 47750 80 -1
+Po 0 50050 43300 50250 43500 100 -1
 De 15 0 19 0 0
-Po 0 46814 47750 46814 47786 80 -1
+Po 0 49503 43562 49788 43562 100 -1
+De 15 0 19 0 800
+Po 3 50050 43300 50050 43300 300 -1
+De 15 1 19 0 0
+Po 0 49788 43562 50050 43300 100 -1
+De 15 0 19 0 0
+Po 0 50986 43714 51100 43600 100 -1
+De 15 0 19 0 0
+Po 3 51100 43600 51100 43600 300 -1
+De 15 1 19 0 0
+Po 0 50986 43714 50550 43714 100 -1
+De 15 0 19 0 400
+Po 0 51000 43500 51100 43600 100 -1
+De 15 0 19 0 0
+Po 0 50250 43500 51000 43500 100 -1
+De 15 0 19 0 0
+Po 0 46750 40911 47011 40911 100 -1
+De 0 0 19 0 800
+Po 0 48050 41100 48550 41100 100 -1
+De 15 0 19 0 0
+Po 0 48550 41100 48800 41100 100 -1
+De 15 0 19 0 0
+Po 3 48550 41100 48550 41100 300 -1
+De 15 1 19 0 0
+Po 3 48050 41100 48050 41100 300 -1
+De 15 1 19 0 0
+Po 0 48050 41100 47200 41100 100 -1
+De 0 0 19 0 0
+Po 3 47200 41100 47200 41100 300 -1
+De 15 1 19 0 0
+Po 0 47011 40911 47200 41100 100 -1
+De 0 0 19 0 0
+Po 0 51793 50700 51050 50700 100 -1
+De 0 0 19 0 800
+Po 0 48100 50700 47307 50700 100 -1
+De 0 0 19 0 400
+Po 0 48500 51100 48100 50700 100 -1
+De 0 0 19 0 0
+Po 0 50650 51100 48500 51100 100 -1
+De 0 0 19 0 0
+Po 0 51050 50700 50650 51100 100 -1
+De 0 0 19 0 0
+Po 0 48992 43050 49188 43050 100 -1
+De 15 0 19 0 0
+Po 0 46750 41400 46750 41900 100 -1
+De 15 0 19 0 0
+Po 3 46750 41400 46750 41400 300 -1
+De 15 1 19 0 0
+Po 0 46750 40911 46750 41400 100 -1
+De 0 0 19 0 800
+Po 0 46900 42050 46800 41950 100 -1
+De 15 0 19 0 0
+Po 3 46800 41950 46800 41950 300 -1
+De 15 1 19 0 0
+Po 0 46900 42050 47614 42050 100 -1
+De 15 0 19 0 400
+Po 0 46750 41900 46800 41950 100 -1
+De 15 0 19 0 0
+Po 0 47497 44938 47812 44938 100 -1
+De 15 0 19 0 800
+Po 0 47812 44938 48500 44250 100 -1
+De 15 0 19 0 400
+Po 0 47497 44152 48402 44152 100 -1
+De 15 0 19 0 800
+Po 0 48402 44152 48500 44250 100 -1
+De 15 0 19 0 400
+Po 0 50300 48850 50350 48850 100 -1
+De 0 0 19 0 0
+Po 3 50300 48850 50300 48850 300 -1
+De 15 1 19 0 0
+Po 0 50350 48850 50800 48400 100 -1
+De 0 0 19 0 0
+Po 0 48307 48244 48307 47693 100 -1
+De 15 0 19 0 800
+Po 0 48307 47693 48700 47300 100 -1
+De 15 0 19 0 400
+Po 0 49350 42600 47850 42600 100 -1
+De 0 0 19 0 0
+Po 0 48205 42955 47850 42600 100 -1
+De 15 0 19 0 0
+Po 3 47850 42600 47850 42600 300 -1
+De 15 1 19 0 0
+Po 0 48205 42955 48205 43247 100 -1
+De 15 0 19 0 400
+Po 0 50550 44600 50550 45350 100 -1
+De 0 0 19 0 0
+Po 3 49950 45950 49950 45950 300 -1
+De 15 1 19 0 0
+Po 0 50032 46032 49950 45950 100 -1
+De 15 0 19 0 0
+Po 0 50032 46032 50586 46032 100 -1
+De 15 0 19 0 400
+Po 0 50550 45350 49950 45950 100 -1
+De 0 0 19 0 0
+Po 0 49503 44545 49981 44545 100 -1
+De 15 0 19 0 800
+Po 0 49981 44545 50050 44614 100 -1
+De 15 0 19 0 400
+Po 0 47050 48250 47050 47850 100 -1
+De 0 0 19 0 0
+Po 0 47454 48704 47050 48300 100 -1
+De 15 0 19 0 0
+Po 0 47050 48300 47050 48250 100 -1
+De 15 0 19 0 0
+Po 3 47050 48250 47050 48250 300 -1
+De 15 1 19 0 0
+Po 0 47454 48850 47454 48704 100 -1
+De 15 0 19 0 800
+Po 0 48008 45492 47650 45850 80 -1
+De 15 0 19 0 0
+Po 3 47650 45850 47650 45850 300 -1
+De 15 1 19 0 0
+Po 0 48008 45492 48008 45253 80 -1
+De 15 0 19 0 400
+Po 0 47800 46000 47650 45850 100 -1
+De 0 0 19 0 0
+Po 0 47800 47100 47800 46000 100 -1
+De 0 0 19 0 0
+Po 0 47050 47850 47800 47100 100 -1
+De 0 0 19 0 0
+Po 0 48307 48244 48307 48493 100 -1
+De 15 0 19 0 800
+Po 0 48164 48636 48164 48850 100 -1
+De 15 0 19 0 400
+Po 0 48307 48493 48164 48636 100 -1
+De 15 0 19 0 0
+Po 0 51793 50700 51793 49393 100 -1
+De 0 0 19 0 800
+Po 0 51793 49393 50800 48400 100 -1
+De 0 0 19 0 0
+Po 0 50800 48400 50450 48050 100 -1
+De 0 0 19 0 0
+Po 3 50450 48050 50450 48050 300 -1
+De 15 1 19 0 0
+Po 0 50650 48250 50914 48250 100 -1
+De 15 0 19 0 400
+Po 0 50650 48250 50450 48050 100 -1
+De 15 0 19 0 0
+Po 0 48836 41750 49200 41750 100 -1
+De 15 0 19 0 800
+Po 3 49350 41600 49350 41600 300 -1
+De 15 1 19 0 0
+Po 0 49245 41495 49350 41600 100 -1
+De 15 0 19 0 0
+Po 0 48836 41495 49245 41495 100 -1
+De 15 0 19 0 800
+Po 0 49188 42762 49188 43050 100 -1
+De 15 0 19 0 0
+Po 0 49188 42762 49350 42600 100 -1
+De 15 0 19 0 0
+Po 3 49350 42600 49350 42600 300 -1
+De 15 1 19 0 0
+Po 0 49188 43050 49188 43058 100 -1
+De 15 0 19 0 0
+Po 0 49188 43247 49188 43058 100 -1
+De 15 0 19 0 800
+Po 0 49350 42100 49350 41600 100 -1
+De 15 0 19 0 0
+Po 3 49350 42100 49350 42100 300 -1
+De 15 1 19 0 0
+Po 0 49350 42600 49350 42100 100 -1
+De 0 0 19 0 0
+Po 0 49200 41750 49350 41600 100 -1
+De 15 0 19 0 0
+Po 0 48795 43247 48795 43105 100 -1
+De 15 0 19 0 800
+Po 0 48992 43058 48992 43050 100 -1
+De 15 0 19 0 0
+Po 0 48992 43050 48992 43247 100 -1
+De 15 0 19 0 400
+Po 0 49000 43050 48992 43058 100 -1
+De 15 0 19 0 0
+Po 0 48850 43050 49000 43050 100 -1
+De 15 0 19 0 0
+Po 0 48795 43105 48850 43050 100 -1
+De 15 0 19 0 0
+Po 0 50050 43714 50550 43714 100 -1
+De 15 0 19 0 C00
+Po 0 48992 43247 48992 43758 100 -1
+De 15 0 19 0 800
+Po 0 48992 43758 48500 44250 100 -1
+De 15 0 19 0 400
+Po 0 48795 43247 48795 43955 100 -1
+De 15 0 19 0 800
+Po 0 48795 43955 48500 44250 100 -1
+De 15 0 19 0 400
+Po 0 47497 43562 47812 43562 100 -1
+De 15 0 19 0 800
+Po 0 47812 43562 48500 44250 100 -1
+De 15 0 19 0 400
+Po 0 47497 43758 48008 43758 100 -1
+De 15 0 19 0 800
+Po 0 48008 43758 48500 44250 100 -1
+De 15 0 19 0 400
+Po 0 48008 45253 48008 44742 100 -1
+De 15 0 19 0 800
+Po 0 48008 44742 48500 44250 100 -1
+De 15 0 19 0 400
+Po 0 49503 44545 48795 44545 100 -1
+De 15 0 19 0 800
+Po 0 48795 44545 48500 44250 100 -1
+De 15 0 19 0 400
+Po 0 49503 43955 48795 43955 100 -1
+De 15 0 19 0 800
+Po 0 48795 43955 48500 44250 100 -1
+De 15 0 19 0 400
+Po 0 49503 43758 48992 43758 100 -1
+De 15 0 19 0 800
+Po 0 48992 43758 48500 44250 100 -1
+De 15 0 19 0 400
+Po 0 49503 43562 49188 43562 100 -1
+De 15 0 19 0 800
+Po 0 49188 43562 48500 44250 100 -1
+De 15 0 19 0 400
+Po 0 49188 43247 49188 43562 100 -1
+De 15 0 19 0 800
+Po 0 49188 43562 48500 44250 100 -1
+De 15 0 19 0 400
+Po 0 49503 43758 49850 43758 100 -1
+De 15 0 19 0 800
+Po 0 49850 43758 49850 43714 100 -1
+De 15 0 19 0 0
+Po 0 49503 43955 49745 43955 100 -1
+De 15 0 19 0 800
+Po 0 49864 43714 49850 43714 100 -1
+De 15 0 19 0 0
+Po 0 49850 43714 50050 43714 100 -1
+De 15 0 19 0 400
+Po 0 49850 43700 49864 43714 100 -1
+De 15 0 19 0 0
+Po 0 49850 43850 49850 43700 100 -1
+De 15 0 19 0 0
+Po 0 49745 43955 49850 43850 100 -1
+De 15 0 19 0 0
+Po 0 50050 44614 50536 44614 100 -1
+De 15 0 19 0 800
+Po 0 50536 44614 50550 44600 100 -1
+De 15 0 19 0 0
+Po 3 50550 44600 50550 44600 300 -1
+De 15 1 19 0 0
+Po 0 50550 44600 51200 44600 100 -1
+De 0 0 19 0 0
+Po 3 51200 44600 51200 44600 300 -1
+De 15 1 19 0 0
+Po 0 51200 44600 51214 44614 100 -1
+De 15 0 19 0 0
+Po 0 51214 44614 51214 45168 100 -1
+De 15 0 19 0 400
+Po 0 50514 46650 50514 46104 100 -1
+De 15 0 19 0 800
+Po 0 50514 46104 50586 46032 100 -1
+De 15 0 19 0 400
+Po 0 51793 50700 51793 49157 100 -1
+De 15 0 19 0 800
+Po 0 51793 49157 52100 48850 100 -1
+De 15 0 19 0 400
+Po 0 47454 48850 47454 49296 100 -1
+De 15 0 19 0 800
+Po 0 47307 49443 47307 50700 100 -1
+De 15 0 19 0 400
+Po 0 47454 49296 47307 49443 100 -1
+De 15 0 19 0 0
+Po 0 48164 48850 48164 49629 100 -1
+De 15 0 19 0 800
+Po 0 48164 49629 48173 49638 100 -1
+De 15 0 19 0 400
+Po 0 47454 48850 48164 48850 100 -1
+De 15 0 19 0 C00
+Po 0 50914 47750 50914 48250 100 -1
+De 15 0 19 0 C00
+Po 0 50914 48850 50300 48850 100 -1
+De 15 0 19 0 800
+Po 0 50300 48850 49686 48850 100 -1
+De 15 0 19 0 400
+Po 0 48836 41750 48836 41495 100 -1
+De 15 0 19 0 C00
+Po 0 48800 41100 49050 41100 100 -1
+De 15 0 19 0 0
+Po 3 49050 41100 49050 41100 300 -1
+De 15 1 19 0 0
+Po 0 49050 41100 49550 41100 100 -1
+De 0 0 19 0 0
+Po 3 49550 41100 49550 41100 300 -1
+De 15 1 19 0 0
+Po 0 49550 41100 50000 41100 100 -1
+De 15 0 19 0 0
+Po 3 50000 41100 50000 41100 300 -1
+De 15 1 19 0 0
+Po 0 50000 41100 50450 41100 100 -1
+De 0 0 19 0 0
+Po 3 50450 41100 50450 41100 300 -1
+De 15 1 19 0 0
+Po 0 50450 41100 50900 41100 100 -1
+De 15 0 19 0 0
+Po 3 50900 41100 50900 41100 300 -1
+De 15 1 19 0 0
+Po 0 50900 41100 51400 41100 100 -1
+De 0 0 19 0 0
+Po 3 51400 41100 51400 41100 300 -1
+De 15 1 19 0 0
+Po 0 51400 41100 51900 41100 100 -1
+De 15 0 19 0 0
+Po 3 51900 41100 51900 41100 300 -1
+De 15 1 19 0 0
+Po 0 51900 41100 52400 41100 100 -1
+De 0 0 19 0 0
+Po 3 52400 41100 52400 41100 300 -1
+De 15 1 19 0 0
+Po 0 48836 41495 48836 41136 100 -1
+De 15 0 19 0 800
+Po 0 48836 41136 48800 41100 100 -1
+De 15 0 19 0 0
+Po 0 46900 45486 47114 45486 100 -1
+De 15 0 19 0 800
+Po 0 47497 45103 47497 44938 100 -1
+De 15 0 19 0 400
+Po 0 47114 45486 47497 45103 100 -1
+De 15 0 19 0 0
+Po 0 47497 44152 47208 44152 100 -1
+De 15 0 19 0 800
+Po 0 46970 43914 46900 43914 100 -1
+De 15 0 19 0 400
+Po 0 47208 44152 46970 43914 100 -1
+De 15 0 19 0 0
+Po 0 48598 45253 48598 44348 100 -1
+De 15 0 19 0 800
+Po 0 48598 44348 48500 44250 100 -1
+De 15 0 19 0 400
+Po 0 47756 47890 47490 47890 80 -1
 De 15 0 20 0 800
-Po 0 46700 48704 46846 48850 80 -1
+Po 0 47350 47750 47186 47750 80 -1
 De 15 0 20 0 400
-Po 0 46700 47900 46700 48704 80 -1
+Po 0 47490 47890 47350 47750 80 -1
 De 15 0 20 0 0
-Po 0 46814 47786 46700 47900 80 -1
-De 15 0 20 0 0
-Po 0 48850 42414 48850 42019 80 -1
+Po 0 46814 47750 46814 47786 80 -1
 De 15 0 21 0 800
-Po 0 48850 42019 48836 42005 80 -1
+Po 0 46700 48704 46846 48850 80 -1
 De 15 0 21 0 400
-Po 0 48450 42414 48450 42019 80 -1
+Po 0 46700 47900 46700 48704 80 -1
+De 15 0 21 0 0
+Po 0 46814 47786 46700 47900 80 -1
+De 15 0 21 0 0
+Po 0 48850 42414 48850 42019 80 -1
 De 15 0 22 0 800
-Po 0 48450 42019 48464 42005 80 -1
+Po 0 48850 42019 48836 42005 80 -1
 De 15 0 22 0 400
-Po 0 49503 44152 49984 44152 80 -1
+Po 0 48450 42414 48450 42019 80 -1
 De 15 0 23 0 800
-Po 0 49984 44152 50050 44086 80 -1
+Po 0 48450 42019 48464 42005 80 -1
 De 15 0 23 0 400
-Po 0 47576 40911 47576 41090 180 -1
+Po 0 49503 44152 49984 44152 80 -1
 De 15 0 24 0 800
-Po 0 47576 41090 47600 41114 180 -1
+Po 0 49984 44152 50050 44086 80 -1
 De 15 0 24 0 400
+Po 0 47576 40911 47576 41090 180 -1
+De 15 0 25 0 800
+Po 0 47576 41090 47600 41114 180 -1
+De 15 0 25 0 400
 Po 0 51214 46032 51214 46322 80 -1
-De 15 0 25 0 800
+De 15 0 26 0 800
 Po 0 51214 46322 50886 46650 80 -1
-De 15 0 25 0 400
-Po 0 49503 44938 49588 44938 80 -1
-De 15 0 25 0 800
-Po 0 51214 45914 51214 46032 80 -1
-De 15 0 25 0 400
-Po 0 50900 45600 51214 45914 80 -1
-De 15 0 25 0 0
-Po 0 50250 45600 50900 45600 80 -1
-De 15 0 25 0 0
-Po 0 49588 44938 50250 45600 80 -1
-De 15 0 25 0 0
-Po 0 47497 44545 47245 44545 80 -1
-De 15 0 26 0 800
-Po 0 47150 44450 47150 44348 80 -1
-De 15 0 26 0 0
-Po 0 47245 44545 47150 44450 80 -1
-De 15 0 26 0 0
-Po 0 47497 44348 47150 44348 80 -1
-De 15 0 26 0 800
-Po 0 47150 44348 46962 44348 80 -1
-De 15 0 26 0 0
-Po 0 46962 44348 46900 44286 80 -1
 De 15 0 26 0 400
-Po 0 48464 41750 48286 41750 80 -1
+Po 0 49503 44938 49588 44938 80 -1
+De 15 0 26 0 800
+Po 0 51214 45914 51214 46032 80 -1
+De 15 0 26 0 400
+Po 0 50900 45600 51214 45914 80 -1
+De 15 0 26 0 0
+Po 0 50250 45600 50900 45600 80 -1
+De 15 0 26 0 0
+Po 0 49588 44938 50250 45600 80 -1
+De 15 0 26 0 0
+Po 0 47497 44545 47245 44545 80 -1
 De 15 0 27 0 800
-Po 0 48286 41750 47986 42050 80 -1
+Po 0 47150 44450 47150 44348 80 -1
+De 15 0 27 0 0
+Po 0 47245 44545 47150 44450 80 -1
+De 15 0 27 0 0
+Po 0 47497 44348 47150 44348 80 -1
+De 15 0 27 0 800
+Po 0 47150 44348 46962 44348 80 -1
+De 15 0 27 0 0
+Po 0 46962 44348 46900 44286 80 -1
 De 15 0 27 0 400
-Po 0 48464 41495 47609 41495 180 -1
+Po 0 48464 41750 48286 41750 80 -1
 De 15 0 28 0 800
-Po 0 47609 41495 47600 41486 180 -1
+Po 0 48286 41750 47986 42050 80 -1
 De 15 0 28 0 400
 Po 0 50586 45168 50232 45168 80 -1
 De 15 0 29 0 800
@@ -2339,7 +2352,7 @@ $EndTRACK
 $ZONE
 $EndZONE
 $CZONE_OUTLINE
-ZInfo 4CF82A24 18 "AGND"
+ZInfo 4CF82A24 19 "AGND"
 ZLayer 0
 ZAux 8 E
 ZClearance 80 T
@@ -2432,7 +2445,7 @@ $FILLSEGMENTS
 $endFILLSEGMENTS
 $endCZONE_OUTLINE
 $CZONE_OUTLINE
-ZInfo 4CF82AAB 18 "AGND"
+ZInfo 4CF82AAB 19 "AGND"
 ZLayer 0
 ZAux 5 E
 ZClearance 80 T
@@ -2489,7 +2502,7 @@ $FILLSEGMENTS
 $endFILLSEGMENTS
 $endCZONE_OUTLINE
 $CZONE_OUTLINE
-ZInfo 4CF82B26 18 "AGND"
+ZInfo 4CF82B26 19 "AGND"
 ZLayer 0
 ZAux 10 E
 ZClearance 80 T
@@ -2553,7 +2566,7 @@ $FILLSEGMENTS
 $endFILLSEGMENTS
 $endCZONE_OUTLINE
 $CZONE_OUTLINE
-ZInfo 4CF82B8A 18 "AGND"
+ZInfo 4CF82B8A 19 "AGND"
 ZLayer 0
 ZAux 11 E
 ZClearance 80 T
@@ -3074,7 +3087,7 @@ $FILLSEGMENTS
 $endFILLSEGMENTS
 $endCZONE_OUTLINE
 $CZONE_OUTLINE
-ZInfo 4CF83175 18 "AGND"
+ZInfo 4CF83175 19 "AGND"
 ZLayer 15
 ZAux 8 E
 ZClearance 80 T
@@ -3112,10 +3125,9 @@ $POLYSCORNERS
 47827 40953 0 0
 47847 41000 0 0
 47847 41227 0 0
-47828 41275 0 0
-48464 41275 0 0
-48486 41279 0 0
-48488 41276 0 0
+47829 41270 0 0
+48464 41270 0 0
+48489 41274 0 0
 48558 41206 0 0
 48649 41168 0 0
 48725 41168 0 0
@@ -3389,7 +3401,7 @@ $FILLSEGMENTS
 $endFILLSEGMENTS
 $endCZONE_OUTLINE
 $CZONE_OUTLINE
-ZInfo 4CF83195 18 "AGND"
+ZInfo 4CF83195 19 "AGND"
 ZLayer 15
 ZAux 5 E
 ZClearance 80 T
@@ -3488,7 +3500,7 @@ $FILLSEGMENTS
 $endFILLSEGMENTS
 $endCZONE_OUTLINE
 $CZONE_OUTLINE
-ZInfo 4CF831BB 18 "AGND"
+ZInfo 4CF831BB 19 "AGND"
 ZLayer 15
 ZAux 10 E
 ZClearance 80 T
diff --git a/atusb/usb.sch b/atusb/usb.sch
index 8fbe4c9..414b5ea 100644
--- a/atusb/usb.sch
+++ b/atusb/usb.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Thu Dec  2 22:05:04 2010
+EESchema Schematic File Version 2  date Thu Dec  2 23:47:00 2010
 LIBS:power
 LIBS:device
 LIBS:conn
@@ -14,132 +14,142 @@ EELAYER END
 $Descr A4 11700 8267
 Sheet 2 3
 Title "IEEE 802.15.4 USB Transceiver (AT86RF230)"
-Date "2 dec 2010"
-Rev "101202"
+Date "3 dec 2010"
+Rev "101130"
 Comp "Werner Almesberger"
 Comment1 ""
 Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-NoConn ~ 6900 1800
-NoConn ~ 7050 1800
-NoConn ~ 8600 3500
 Wire Wire Line
-	8600 3350 9800 3350
+	6900 1600 6900 1800
 Wire Wire Line
-	9800 1150 7200 1150
+	8600 3200 9800 3200
 Wire Wire Line
-	7200 1150 7200 1800
-Wire Wire Line
-	7650 1800 7650 1600
-Wire Wire Line
-	2350 3350 2550 3350
-Wire Wire Line
-	8250 900  8050 900 
-Wire Wire Line
-	6950 900  6750 900 
-Wire Wire Line
-	3700 4050 3700 2900
-Connection ~ 5150 3350
-Wire Wire Line
-	5150 2700 5150 4500
-Wire Wire Line
-	4750 4500 4750 3650
-Wire Wire Line
-	5800 2750 5600 2750
-Wire Wire Line
-	5800 3050 4150 3050
-Wire Wire Line
-	4000 3200 4150 3050
-Wire Wire Line
-	2350 3200 4000 3200
-Wire Wire Line
-	4000 3050 4150 3200
-Wire Wire Line
-	4150 3200 5800 3200
-Wire Wire Line
-	8100 4600 8100 4800
-Wire Wire Line
-	7050 4600 7050 6150
-Connection ~ 6750 4800
-Wire Wire Line
-	6750 6150 6750 4600
-Connection ~ 4750 3650
-Connection ~ 3700 3650
-Wire Wire Line
-	3700 3650 5800 3650
-Wire Wire Line
-	3400 4550 3400 4750
-Wire Wire Line
-	3700 2900 2350 2900
-Connection ~ 3100 3200
-Wire Wire Line
-	3100 4050 3100 3200
-Wire Wire Line
-	4750 4900 4750 5100
-Connection ~ 5150 3500
-Wire Wire Line
-	5800 3500 5150 3500
-Wire Wire Line
-	2350 3050 4000 3050
-Wire Wire Line
-	2550 3350 2550 3550
-Wire Wire Line
-	1000 3550 1000 2900
-Connection ~ 1000 3350
-Wire Wire Line
-	1200 3350 1000 3350
-Wire Wire Line
-	1000 2900 1200 2900
-Wire Wire Line
-	5150 3350 5800 3350
-Wire Wire Line
-	5150 4900 5150 5100
-Wire Wire Line
-	3400 4050 3400 3050
-Connection ~ 3400 3050
-Wire Wire Line
-	3100 4550 3100 4750
-Wire Wire Line
-	3700 4550 3700 4750
-Wire Wire Line
-	5600 3650 5600 4800
-Connection ~ 5600 3650
-Wire Wire Line
-	5600 4800 6750 4800
-Wire Wire Line
-	6900 6150 6900 4600
-Wire Wire Line
-	6600 6150 6600 5500
-Wire Wire Line
-	6600 5500 6400 5500
-Wire Wire Line
-	6400 5500 6400 6150
-Wire Wire Line
-	5800 2900 5600 2900
-Wire Wire Line
-	6750 900  6750 1800
-Wire Wire Line
-	7450 900  7650 900 
-Wire Wire Line
-	6050 1150 5600 1150
-Wire Wire Line
-	5600 1150 5600 2750
-Wire Wire Line
-	7350 1800 7350 1300
-Wire Wire Line
-	7350 1300 9800 1300
-Wire Wire Line
-	7500 1800 7500 1450
-Wire Wire Line
-	7500 1450 9800 1450
+	9800 1600 7650 1600
 Wire Wire Line
 	8600 3050 9800 3050
 Wire Wire Line
-	7650 1600 9800 1600
+	9800 1450 7500 1450
 Wire Wire Line
-	8600 3200 9800 3200
+	7500 1450 7500 1800
+Wire Wire Line
+	9800 1300 7350 1300
+Wire Wire Line
+	7350 1300 7350 1800
+Wire Wire Line
+	5600 1150 5600 2750
+Wire Wire Line
+	5600 1150 6050 1150
+Wire Wire Line
+	7450 900  7650 900 
+Wire Wire Line
+	6750 1800 6750 900 
+Wire Wire Line
+	5800 2900 5600 2900
+Wire Wire Line
+	6400 6150 6400 5500
+Wire Wire Line
+	6400 5500 6600 5500
+Wire Wire Line
+	6600 5500 6600 6150
+Wire Wire Line
+	6900 6150 6900 4600
+Wire Wire Line
+	6750 4800 5600 4800
+Connection ~ 5600 3650
+Wire Wire Line
+	5600 4800 5600 3650
+Wire Wire Line
+	3700 4550 3700 4750
+Wire Wire Line
+	3100 4550 3100 4750
+Connection ~ 3400 3050
+Wire Wire Line
+	3400 4050 3400 3050
+Wire Wire Line
+	5150 4900 5150 5100
+Wire Wire Line
+	5150 3350 5800 3350
+Wire Wire Line
+	1200 2900 1000 2900
+Wire Wire Line
+	1200 3350 1000 3350
+Connection ~ 1000 3350
+Wire Wire Line
+	1000 2900 1000 3550
+Wire Wire Line
+	2550 3550 2550 3350
+Wire Wire Line
+	2350 3050 4000 3050
+Wire Wire Line
+	5800 3500 5150 3500
+Connection ~ 5150 3500
+Wire Wire Line
+	4750 4900 4750 5100
+Wire Wire Line
+	3100 4050 3100 3200
+Connection ~ 3100 3200
+Wire Wire Line
+	2350 2900 3700 2900
+Wire Wire Line
+	3400 4550 3400 4750
+Wire Wire Line
+	3700 3650 5800 3650
+Connection ~ 3700 3650
+Connection ~ 4750 3650
+Wire Wire Line
+	6750 6150 6750 4600
+Connection ~ 6750 4800
+Wire Wire Line
+	7050 4600 7050 6150
+Wire Wire Line
+	8100 4600 8100 4800
+Wire Wire Line
+	5800 3200 4150 3200
+Wire Wire Line
+	4150 3200 4000 3050
+Wire Wire Line
+	2350 3200 4000 3200
+Wire Wire Line
+	4000 3200 4150 3050
+Wire Wire Line
+	4150 3050 5800 3050
+Wire Wire Line
+	5600 2750 5800 2750
+Wire Wire Line
+	4750 4500 4750 3650
+Wire Wire Line
+	5150 2700 5150 4500
+Connection ~ 5150 3350
+Wire Wire Line
+	3700 2900 3700 4050
+Wire Wire Line
+	6750 900  6950 900 
+Wire Wire Line
+	8250 900  8050 900 
+Wire Wire Line
+	2550 3350 2350 3350
+Wire Wire Line
+	7650 1600 7650 1800
+Wire Wire Line
+	7200 1800 7200 1150
+Wire Wire Line
+	7200 1150 9800 1150
+Wire Wire Line
+	8600 3350 9800 3350
+$Comp
+L GND #PWR03
+U 1 1 4CF859A9
+P 6900 1600
+F 0 "#PWR03" H 6900 1600 30  0001 C CNN
+F 1 "GND" H 6900 1530 30  0001 C CNN
+	1    6900 1600
+	-1   0    0    1   
+$EndComp
+NoConn ~ 7050 1800
+NoConn ~ 8600 3500
 $Comp
 L C8051F326 U1
 U 1 1 4C609C36
@@ -172,109 +182,109 @@ D-
 Text Notes 1100 1200 0    200  ~ 40
 USB
 $Comp
-L VDD #PWR03
+L VDD #PWR04
 U 1 1 4C64122B
 P 5150 2700
-F 0 "#PWR03" H 5150 2800 30  0001 C CNN
+F 0 "#PWR04" H 5150 2800 30  0001 C CNN
 F 1 "VDD" H 5150 2810 30  0000 C CNN
 	1    5150 2700
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR04
+L GND #PWR05
 U 1 1 4C6408C7
 P 5150 5100
-F 0 "#PWR04" H 5150 5100 30  0001 C CNN
+F 0 "#PWR05" H 5150 5100 30  0001 C CNN
 F 1 "GND" H 5150 5030 30  0001 C CNN
 	1    5150 5100
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR05
+L GND #PWR06
 U 1 1 4C6408C5
 P 4750 5100
-F 0 "#PWR05" H 4750 5100 30  0001 C CNN
+F 0 "#PWR06" H 4750 5100 30  0001 C CNN
 F 1 "GND" H 4750 5030 30  0001 C CNN
 	1    4750 5100
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR06
+L GND #PWR07
 U 1 1 4C6408BA
 P 5600 2900
-F 0 "#PWR06" H 5600 2900 30  0001 C CNN
+F 0 "#PWR07" H 5600 2900 30  0001 C CNN
 F 1 "GND" H 5600 2830 30  0001 C CNN
 	1    5600 2900
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR07
+L GND #PWR08
 U 1 1 4C6408AD
 P 8250 900
-F 0 "#PWR07" H 8250 900 30  0001 C CNN
+F 0 "#PWR08" H 8250 900 30  0001 C CNN
 F 1 "GND" H 8250 830 30  0001 C CNN
 	1    8250 900 
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR08
+L GND #PWR09
 U 1 1 4C6408A8
 P 8100 4800
-F 0 "#PWR08" H 8100 4800 30  0001 C CNN
+F 0 "#PWR09" H 8100 4800 30  0001 C CNN
 F 1 "GND" H 8100 4730 30  0001 C CNN
 	1    8100 4800
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR09
+L GND #PWR010
 U 1 1 4C6408A3
 P 6400 6150
-F 0 "#PWR09" H 6400 6150 30  0001 C CNN
+F 0 "#PWR010" H 6400 6150 30  0001 C CNN
 F 1 "GND" H 6400 6080 30  0001 C CNN
 	1    6400 6150
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR010
+L GND #PWR011
 U 1 1 4C64089F
 P 2550 3550
-F 0 "#PWR010" H 2550 3550 30  0001 C CNN
+F 0 "#PWR011" H 2550 3550 30  0001 C CNN
 F 1 "GND" H 2550 3480 30  0001 C CNN
 	1    2550 3550
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR011
+L GND #PWR012
 U 1 1 4C640899
 P 1000 3550
-F 0 "#PWR011" H 1000 3550 30  0001 C CNN
+F 0 "#PWR012" H 1000 3550 30  0001 C CNN
 F 1 "GND" H 1000 3480 30  0001 C CNN
 	1    1000 3550
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR012
+L GND #PWR013
 U 1 1 4C640896
 P 3700 4750
-F 0 "#PWR012" H 3700 4750 30  0001 C CNN
+F 0 "#PWR013" H 3700 4750 30  0001 C CNN
 F 1 "GND" H 3700 4680 30  0001 C CNN
 	1    3700 4750
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR013
+L GND #PWR014
 U 1 1 4C64088F
 P 3400 4750
-F 0 "#PWR013" H 3400 4750 30  0001 C CNN
+F 0 "#PWR014" H 3400 4750 30  0001 C CNN
 F 1 "GND" H 3400 4680 30  0001 C CNN
 	1    3400 4750
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR014
+L GND #PWR015
 U 1 1 4C64088A
 P 3100 4750
-F 0 "#PWR014" H 3100 4750 30  0001 C CNN
+F 0 "#PWR015" H 3100 4750 30  0001 C CNN
 F 1 "GND" H 3100 4680 30  0001 C CNN
 	1    3100 4750
 	1    0    0    -1