From 9f8a77e879fd3336d93cbb389f4e62f71678cabb Mon Sep 17 00:00:00 2001
From: Werner Almesberger <werner@openmoko.org>
Date: Tue, 4 Jan 2011 01:19:54 -0300
Subject: [PATCH] atusb: switched from the AT86RF230 to the AT86RF231, added
 missing RF ground

- atrf.sch: replaced the AT86RF230 with the AT86RF231
- atusb.sch, usb.sch, atrf.sch: removed TST signal
- atrf.sch: grounded former TST pin
- atusb.brd: updated for TST removal
- atusb.brd: increased space between SLP_TR and nRST_RF vias
- atusb.brd: connect U2 pin 6 to ground pad
- atusb.sch, usb.sch, atrf.sch, atusb.brd: changed version to 20110104
---
 atusb/atrf.sch  |  444 ++++++------
 atusb/atusb.brd | 1815 ++++++++++++++++++++++++-----------------------
 atusb/atusb.pro |    4 +-
 atusb/atusb.sch |   40 +-
 atusb/usb.sch   |   15 +-
 5 files changed, 1169 insertions(+), 1149 deletions(-)

diff --git a/atusb/atrf.sch b/atusb/atrf.sch
index 6407395..4809d70 100644
--- a/atusb/atrf.sch
+++ b/atusb/atrf.sch
@@ -1,8 +1,8 @@
-EESchema Schematic File Version 2  date Mon Jan  3 17:10:47 2011
+EESchema Schematic File Version 2  date Tue Jan  4 00:55:48 2011
 LIBS:power
 LIBS:device
 LIBS:conn
-LIBS:at86rf230
+LIBS:at86rf231
 LIBS:c8051f326
 LIBS:usb_a_plug
 LIBS:xtal-4
@@ -14,223 +14,205 @@ EELAYER END
 $Descr A4 11700 8267
 Sheet 3 3
 Title "IEEE 802.15.4 USB Transceiver (AT86RF230)"
-Date "3 jan 2011"
-Rev "101130"
+Date "4 jan 2011"
+Rev "20110104"
 Comp "Werner Almesberger"
 Comment1 ""
 Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Text Label 2950 3800 0    60   ~ 0
-FEED
-Connection ~ 3150 4300
+Connection ~ 6200 3750
 Wire Wire Line
-	3350 4300 3150 4300
-Connection ~ 4350 4000
+	6700 3750 6200 3750
 Wire Wire Line
-	4350 3600 4350 4000
+	6700 4500 6500 4500
 Wire Wire Line
-	4350 4000 4350 4400
+	6500 4500 6500 4850
 Wire Wire Line
-	3350 4200 3150 4200
-Wire Wire Line
-	4150 4200 4550 4200
-Wire Wire Line
-	4150 3800 4550 3800
-Wire Wire Line
-	2750 3800 3350 3800
-Wire Wire Line
-	3650 6350 3650 6150
-Wire Wire Line
-	3650 6150 3400 6150
-Wire Wire Line
-	3400 6150 3150 6150
-Wire Wire Line
-	3150 6150 3150 6350
-Wire Wire Line
-	1850 3900 2050 3900
-Connection ~ 7850 1250
-Wire Wire Line
-	7850 1050 7850 1250
-Wire Wire Line
-	7600 1250 7850 1250
-Wire Wire Line
-	7850 1250 8100 1250
-Wire Wire Line
-	7600 1250 7600 1450
-Wire Wire Line
-	7800 6350 7800 5450
-Wire Wire Line
-	7950 2050 7950 1850
-Connection ~ 9700 1150
-Wire Wire Line
-	9900 1150 9700 1150
-Wire Wire Line
-	9700 1150 8400 1150
-Wire Wire Line
-	8400 1150 8400 2650
-Connection ~ 10500 1650
-Wire Wire Line
-	10100 1650 10500 1650
-Connection ~ 10500 2450
-Wire Wire Line
-	10500 2450 10300 2450
-Wire Wire Line
-	9700 2250 9700 2450
-Connection ~ 7650 2450
-Wire Wire Line
-	7650 2450 7650 2650
-Wire Wire Line
-	7500 2650 7500 2450
-Wire Wire Line
-	7800 2650 7800 2450
-Connection ~ 6500 3900
-Wire Wire Line
-	6500 3900 6700 3900
-Wire Wire Line
-	6500 3600 6700 3600
-Wire Wire Line
-	6700 4500 6000 4500
-Wire Wire Line
-	9000 5850 9000 5450
-Wire Wire Line
-	8400 6750 8400 6950
-Connection ~ 7500 5650
-Wire Wire Line
-	7500 5650 7650 5650
-Wire Wire Line
-	7650 5650 7650 5450
-Wire Wire Line
-	7950 5850 7950 5450
-Wire Wire Line
-	9500 4050 9700 4050
-Wire Wire Line
-	9500 3750 10400 3750
-Wire Wire Line
-	9500 4200 10400 4200
-Wire Wire Line
-	10400 4650 9500 4650
-Wire Wire Line
-	6000 4650 6700 4650
-Connection ~ 8100 5650
-Wire Wire Line
-	8100 5650 8250 5650
-Wire Wire Line
-	8250 5650 8250 5450
-Wire Wire Line
-	8100 6350 8100 5650
-Wire Wire Line
-	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
-	10400 4350 9500 4350
-Wire Wire Line
-	10400 3900 9500 3900
-Wire Wire Line
-	10400 3600 9500 3600
-Wire Wire Line
-	9500 4500 9700 4500
-Wire Wire Line
-	9700 4050 9700 4500
-Wire Wire Line
-	9700 4500 9700 4850
-Connection ~ 9700 4500
-Wire Wire Line
-	7500 5450 7500 5650
-Wire Wire Line
-	7500 5650 7500 5850
-Wire Wire Line
-	8100 6950 8100 6750
-Wire Wire Line
-	6500 3750 6700 3750
-Connection ~ 6500 3750
-Wire Wire Line
-	6700 4350 6500 4350
-Connection ~ 6500 4350
-Wire Wire Line
-	6500 4850 6500 4350
-Wire Wire Line
-	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
-	9700 1350 9700 1150
-Wire Wire Line
-	10300 1150 10500 1150
-Wire Wire Line
-	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 9700 2450
-Wire Wire Line
-	9700 2450 9900 2450
-Connection ~ 9700 2450
-Wire Wire Line
-	7950 2650 7950 2450
-Wire Wire Line
-	8250 2650 8250 2450
-Wire Wire Line
-	8100 1250 8100 2650
-Wire Wire Line
-	7600 2050 7600 1850
-Wire Wire Line
-	8600 6150 8400 6150
-Connection ~ 8400 6150
-Wire Wire Line
-	2050 3900 2050 4600
-Wire Wire Line
-	3400 6350 3400 6150
-Connection ~ 3400 6150
-Wire Wire Line
-	1850 3800 2250 3800
-Wire Wire Line
-	6700 4200 5350 4200
-Wire Wire Line
-	5350 4200 5350 3800
-Wire Wire Line
-	5350 3800 4950 3800
-Wire Wire Line
-	6700 4050 5150 4050
-Wire Wire Line
-	5150 4050 5150 4200
-Wire Wire Line
-	5150 4200 4950 4200
-Wire Wire Line
-	4350 4000 4150 4000
+	3150 5000 3150 4200
 Wire Wire Line
 	4350 5000 4350 4800
 Wire Wire Line
-	3150 4200 3150 4300
+	4150 4000 4350 4000
 Wire Wire Line
-	3150 4300 3150 5000
+	4950 4200 5150 4200
+Wire Wire Line
+	5150 4200 5150 4050
+Wire Wire Line
+	5150 4050 6700 4050
+Wire Wire Line
+	4950 3800 5350 3800
+Wire Wire Line
+	5350 3800 5350 4200
+Wire Wire Line
+	5350 4200 6700 4200
+Wire Wire Line
+	1850 3800 2250 3800
+Connection ~ 3400 6150
+Wire Wire Line
+	3400 6350 3400 6150
+Wire Wire Line
+	2050 4600 2050 3900
+Connection ~ 8400 6150
+Wire Wire Line
+	8600 6150 8400 6150
+Wire Wire Line
+	7600 2050 7600 1850
+Wire Wire Line
+	8100 2650 8100 1250
+Wire Wire Line
+	8250 2650 8250 2450
+Wire Wire Line
+	7950 2650 7950 2450
+Connection ~ 9700 2450
+Wire Wire Line
+	9900 2450 8550 2450
+Wire Wire Line
+	8550 2450 8550 2650
+Connection ~ 10500 1950
+Wire Wire Line
+	10500 1950 10100 1950
+Wire Wire Line
+	10500 2650 10500 1150
+Wire Wire Line
+	10500 1150 10300 1150
+Wire Wire Line
+	9700 1350 9700 1150
+Connection ~ 7500 2450
+Wire Wire Line
+	6200 2450 7800 2450
+Wire Wire Line
+	6200 2450 6200 4850
+Connection ~ 6200 4350
+Wire Wire Line
+	6700 4350 6200 4350
+Wire Wire Line
+	8100 6950 8100 6750
+Wire Wire Line
+	7500 5850 7500 5450
+Connection ~ 9700 4500
+Wire Wire Line
+	9700 4850 9700 4050
+Wire Wire Line
+	9500 4500 9700 4500
+Wire Wire Line
+	10400 3600 9500 3600
+Wire Wire Line
+	10400 3900 9500 3900
+Wire Wire Line
+	10400 4350 9500 4350
+Wire Wire Line
+	8550 5850 8550 5450
+Wire Wire Line
+	8400 5450 8400 6350
+Wire Wire Line
+	8100 5450 8100 6350
+Wire Wire Line
+	8250 5450 8250 5650
+Wire Wire Line
+	8250 5650 8100 5650
+Connection ~ 8100 5650
+Wire Wire Line
+	6000 4650 6700 4650
+Wire Wire Line
+	10400 4650 9500 4650
+Wire Wire Line
+	9500 4200 10400 4200
+Wire Wire Line
+	9500 3750 10400 3750
+Wire Wire Line
+	9700 4050 9500 4050
+Wire Wire Line
+	7950 5850 7950 5450
+Wire Wire Line
+	7650 5450 7650 5650
+Wire Wire Line
+	7650 5650 7500 5650
+Connection ~ 7500 5650
+Wire Wire Line
+	8400 6750 8400 6950
+Wire Wire Line
+	9000 5850 9000 5450
+Wire Wire Line
+	6200 3900 6700 3900
+Connection ~ 6200 3900
+Wire Wire Line
+	7800 2450 7800 2650
+Wire Wire Line
+	7500 2650 7500 2450
+Wire Wire Line
+	7650 2450 7650 2650
+Connection ~ 7650 2450
+Wire Wire Line
+	9700 2250 9700 2450
+Wire Wire Line
+	10500 2450 10300 2450
+Connection ~ 10500 2450
+Wire Wire Line
+	10100 1650 10500 1650
+Connection ~ 10500 1650
+Wire Wire Line
+	8400 2650 8400 1150
+Wire Wire Line
+	8400 1150 9900 1150
+Connection ~ 9700 1150
+Wire Wire Line
+	7950 2050 7950 1850
+Wire Wire Line
+	7800 6350 7800 5450
+Wire Wire Line
+	7600 1450 7600 1250
+Wire Wire Line
+	7600 1250 8100 1250
+Wire Wire Line
+	7850 1050 7850 1250
+Connection ~ 7850 1250
+Wire Wire Line
+	2050 3900 1850 3900
+Wire Wire Line
+	3150 6350 3150 6150
+Wire Wire Line
+	3150 6150 3650 6150
+Wire Wire Line
+	3650 6150 3650 6350
+Wire Wire Line
+	2750 3800 3350 3800
+Wire Wire Line
+	4150 3800 4550 3800
+Wire Wire Line
+	4150 4200 4550 4200
+Wire Wire Line
+	3150 4200 3350 4200
+Wire Wire Line
+	4350 4400 4350 3600
+Connection ~ 4350 4000
+Wire Wire Line
+	3350 4300 3150 4300
+Connection ~ 3150 4300
+Wire Wire Line
+	6700 3600 6200 3600
+Connection ~ 6200 3600
+$Comp
+L DGND #PWR22
+U 1 1 4D2296C2
+P 6500 4850
+F 0 "#PWR22" H 6500 4850 40  0001 C CNN
+F 1 "DGND" H 6500 4780 40  0000 C CNN
+	1    6500 4850
+	1    0    0    -1  
+$EndComp
+$Comp
+L AT86RF231 U2
+U 1 1 4D229690
+P 8100 4050
+F 0 "U2" H 7100 5250 60  0000 C CNN
+F 1 "AT86RF231" H 8100 4050 60  0000 C CNN
+	1    8100 4050
+	1    0    0    -1  
+$EndComp
+Text Label 2950 3800 0    60   ~ 0
+FEED
 $Comp
 L PWR_FLAG #FLG016
 U 1 1 4CF4B348
@@ -277,8 +259,6 @@ F 1 "2450FB15L0001" H 3750 3550 60  0000 C CNN
 	1    3750 4000
 	1    0    0    -1  
 $EndComp
-Text HLabel 6000 4500 0    60   Input ~ 0
-TST
 Text Label 9900 4650 0    60   ~ 0
 CLKM
 Text Label 5750 4200 0    60   ~ 0
@@ -404,10 +384,10 @@ F 1 "AGND" H 8250 2380 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L DGND #PWR25
+L DGND #PWR26
 U 1 1 4C641010
 P 7950 1850
-F 0 "#PWR25" H 7950 1850 40  0001 C CNN
+F 0 "#PWR26" H 7950 1850 40  0001 C CNN
 F 1 "DGND" H 7950 1780 40  0000 C CNN
 	1    7950 1850
 	-1   0    0    1   
@@ -423,10 +403,10 @@ F 2 "0402" H 7950 2250 60  0001 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L DGND #PWR34
+L DGND #PWR35
 U 1 1 4C640E02
 P 10500 2650
-F 0 "#PWR34" H 10500 2650 40  0001 C CNN
+F 0 "#PWR35" H 10500 2650 40  0001 C CNN
 F 1 "DGND" H 10500 2580 40  0000 C CNN
 	1    10500 2650
 	1    0    0    -1  
@@ -434,10 +414,10 @@ $EndComp
 $Comp
 L AGND #PWR026
 U 1 1 4C640D33
-P 6500 4850
-F 0 "#PWR026" H 6500 4850 40  0001 C CNN
-F 1 "AGND" H 6500 4780 50  0000 C CNN
-	1    6500 4850
+P 6200 4850
+F 0 "#PWR026" H 6200 4850 40  0001 C CNN
+F 1 "AGND" H 6200 4780 50  0000 C CNN
+	1    6200 4850
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -460,55 +440,55 @@ F 1 "AGND" H 9000 5780 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L DGND #PWR27
+L DGND #PWR28
 U 1 1 4C640C4C
 P 8100 6950
-F 0 "#PWR27" H 8100 6950 40  0001 C CNN
+F 0 "#PWR28" H 8100 6950 40  0001 C CNN
 F 1 "DGND" H 8100 6880 40  0000 C CNN
 	1    8100 6950
 	1    0    0    -1  
 $EndComp
 $Comp
-L DGND #PWR29
+L DGND #PWR30
 U 1 1 4C640C48
 P 8400 6950
-F 0 "#PWR29" H 8400 6950 40  0001 C CNN
+F 0 "#PWR30" H 8400 6950 40  0001 C CNN
 F 1 "DGND" H 8400 6880 40  0000 C CNN
 	1    8400 6950
 	1    0    0    -1  
 $EndComp
 $Comp
-L DGND #PWR22
+L DGND #PWR23
 U 1 1 4C640C14
 P 7500 5850
-F 0 "#PWR22" H 7500 5850 40  0001 C CNN
+F 0 "#PWR23" H 7500 5850 40  0001 C CNN
 F 1 "DGND" H 7500 5780 40  0000 C CNN
 	1    7500 5850
 	1    0    0    -1  
 $EndComp
 $Comp
-L DGND #PWR33
+L DGND #PWR34
 U 1 1 4C640BFC
 P 9700 4850
-F 0 "#PWR33" H 9700 4850 40  0001 C CNN
+F 0 "#PWR34" H 9700 4850 40  0001 C CNN
 F 1 "DGND" H 9700 4780 40  0000 C CNN
 	1    9700 4850
 	1    0    0    -1  
 $EndComp
 $Comp
-L DGND #PWR26
+L DGND #PWR27
 U 1 1 4C640BF7
 P 7950 5850
-F 0 "#PWR26" H 7950 5850 40  0001 C CNN
+F 0 "#PWR27" H 7950 5850 40  0001 C CNN
 F 1 "DGND" H 7950 5780 40  0000 C CNN
 	1    7950 5850
 	1    0    0    -1  
 $EndComp
 $Comp
-L DGND #PWR30
+L DGND #PWR31
 U 1 1 4C640BD2
 P 8550 5850
-F 0 "#PWR30" H 8550 5850 40  0001 C CNN
+F 0 "#PWR31" H 8550 5850 40  0001 C CNN
 F 1 "DGND" H 8550 5780 40  0000 C CNN
 	1    8550 5850
 	1    0    0    -1  
@@ -586,14 +566,4 @@ F 6 "ESR=80R" V 9450 2250 60  0000 C CNN "Field3"
 	1    9700 1800
 	0    -1   -1   0   
 $EndComp
-$Comp
-L AT86RF230 U2
-U 1 1 4C609C4B
-P 8100 4050
-F 0 "U2" H 7100 5250 60  0000 C CNN
-F 1 "AT86RF230" H 8100 4050 60  0000 C CNN
-F 2 "QFN32" H 8100 4050 60  0001 C CNN
-	1    8100 4050
-	1    0    0    -1  
-$EndComp
 $EndSCHEMATC
diff --git a/atusb/atusb.brd b/atusb/atusb.brd
index 22072b1..49976bb 100644
--- a/atusb/atusb.brd
+++ b/atusb/atusb.brd
@@ -1,4 +1,4 @@
-PCBNEW-BOARD Version 1 date Sun Jan  2 17:43:53 2011
+PCBNEW-BOARD Version 1 date Tue Jan  4 01:19:20 2011
 
 # Created by Pcbnew(2010-12-27 BZR 2685)-unstable
 
@@ -10,18 +10,18 @@ Links 81
 NoConn 0
 Di 45606 36414 53375 52126
 Ndraw 16
-Ntrack 431
+Ntrack 420
 Nzone 0
 BoardThickness 630
 Nmodule 28
-Nnets 30
+Nnets 29
 $EndGENERAL
 
 $SHEETDESCR
 Sheet A4 11700 8267
-Title "IEEE 802.15.4 USB Transceiver (AT86RF230)"
-Date "2 jan 2011"
-Rev "110102"
+Title "IEEE 802.15.4 USB Transceiver (AT86RF231)"
+Date "4 jan 2011"
+Rev "20110104"
 Comp "Werner Almesberger"
 Comment1 ""
 Comment2 ""
@@ -79,15 +79,15 @@ Na 3 "/RF/IRQ_RF"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 4 "/RF/MOSI"
+Na 4 "/RF/RFN"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 5 "/RF/RFN"
+Na 5 "/RF/RPF"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 6 "/RF/RPF"
+Na 6 "/RF/SCLK"
 St ~
 $EndEQUIPOT
 $EQUIPOT
@@ -95,31 +95,31 @@ Na 7 "/RF/SLP_TR"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 8 "/USB/C2CK"
+Na 8 "/RF/nSS"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 9 "/USB/C2D"
+Na 9 "/USB/C2CK"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 10 "/USB/D+"
+Na 10 "/USB/C2D"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 11 "/USB/D-"
+Na 11 "/USB/D+"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 12 "/USB/MISO"
+Na 12 "/USB/D-"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 13 "/USB/SCLK"
+Na 13 "/USB/MISO"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 14 "/USB/TST"
+Na 14 "/USB/MOSI"
 St ~
 $EndEQUIPOT
 $EQUIPOT
@@ -131,55 +131,51 @@ Na 16 "/USB/nRST_RF"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 17 "/USB/nSS"
+Na 17 "AGND"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 18 "AGND"
+Na 18 "N-000012"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 19 "N-000012"
+Na 19 "N-000015"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 20 "N-000015"
+Na 20 "N-000021"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 21 "N-000021"
+Na 21 "N-000023"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 22 "N-000022"
+Na 22 "N-000025"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 23 "N-000025"
+Na 23 "N-000027"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 24 "N-000026"
+Na 24 "N-000029"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 25 "N-000027"
+Na 25 "N-000030"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 26 "N-000030"
+Na 26 "N-000031"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 27 "N-000032"
+Na 27 "N-000033"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 28 "N-000033"
-St ~
-$EndEQUIPOT
-$EQUIPOT
-Na 29 "VDD"
+Na 28 "VDD"
 St ~
 $EndEQUIPOT
 $NCLASS
@@ -194,28 +190,27 @@ uViaDrill 50
 AddNet ""
 AddNet "/RF/CLKM"
 AddNet "/RF/IRQ_RF"
-AddNet "/RF/MOSI"
 AddNet "/RF/RFN"
 AddNet "/RF/RPF"
+AddNet "/RF/SCLK"
 AddNet "/RF/SLP_TR"
+AddNet "/RF/nSS"
 AddNet "/USB/C2CK"
 AddNet "/USB/C2D"
 AddNet "/USB/D+"
 AddNet "/USB/D-"
 AddNet "/USB/MISO"
-AddNet "/USB/SCLK"
-AddNet "/USB/TST"
+AddNet "/USB/MOSI"
 AddNet "/USB/nRST_RF"
-AddNet "/USB/nSS"
 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-000029"
 AddNet "N-000030"
-AddNet "N-000032"
+AddNet "N-000031"
 AddNet "N-000033"
 $EndNCLASS
 $NCLASS
@@ -259,14 +254,14 @@ $PAD
 Sh "1" R 177 236 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 28 "N-000033"
+Ne 25 "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 17 "AGND"
 Po 186 0
 $EndPAD
 $EndMODULE  0402-M
@@ -287,14 +282,14 @@ $PAD
 Sh "1" R 177 236 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 29 "VDD"
+Ne 28 "VDD"
 Po -186 0
 $EndPAD
 $PAD
 Sh "2" R 177 236 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 17 "AGND"
 Po 186 0
 $EndPAD
 $EndMODULE  0402-M
@@ -315,14 +310,14 @@ $PAD
 Sh "1" R 177 236 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 25 "N-000027"
+Ne 27 "N-000033"
 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 17 "AGND"
 Po 186 0
 $EndPAD
 $EndMODULE  0402-M
@@ -343,14 +338,14 @@ $PAD
 Sh "1" R 177 236 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 29 "VDD"
+Ne 28 "VDD"
 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 17 "AGND"
 Po 186 0
 $EndPAD
 $EndMODULE  0402-M
@@ -371,14 +366,14 @@ $PAD
 Sh "1" R 177 236 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 26 "N-000030"
+Ne 23 "N-000027"
 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 17 "AGND"
 Po 186 0
 $EndPAD
 $EndMODULE  0402-M
@@ -399,14 +394,14 @@ $PAD
 Sh "1" R 177 236 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 17 "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-000025"
+Ne 26 "N-000031"
 Po 186 0
 $EndPAD
 $EndMODULE  0402-M
@@ -418,7 +413,7 @@ AR /4C609C08/4C641506
 Op 0 0 0
 At SMD 
 T0 0 -150 200 200 2700 40 N V 25 N"C8"
-T1 0 150 200 200 2700 40 N I 25 N"22pF"
+T1 0 150 200 200 2700 40 N I 25 N"22pF/RF"
 DS -325 168 -325 -168 50 21
 DS -325 -168 325 -168 50 21
 DS 325 -168 325 168 50 21
@@ -427,14 +422,14 @@ $PAD
 Sh "1" R 177 236 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 22 "N-000022"
+Ne 22 "N-000025"
 Po -186 0
 $EndPAD
 $PAD
 Sh "2" R 177 236 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 5 "/RF/RFN"
+Ne 4 "/RF/RFN"
 Po 186 0
 $EndPAD
 $EndMODULE  0402-M
@@ -446,7 +441,7 @@ AR /4C609C08/4C641509
 Op 0 0 0
 At SMD 
 T0 0 -150 200 200 2700 40 N V 25 N"C9"
-T1 0 150 200 200 2700 40 N I 25 N"22pF"
+T1 0 150 200 200 2700 40 N I 25 N"22pF/RF"
 DS -325 168 -325 -168 50 21
 DS -325 -168 325 -168 50 21
 DS 325 -168 325 168 50 21
@@ -455,14 +450,14 @@ $PAD
 Sh "1" R 177 236 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 21 "N-000021"
+Ne 21 "N-000023"
 Po -186 0
 $EndPAD
 $PAD
 Sh "2" R 177 236 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 6 "/RF/RPF"
+Ne 5 "/RF/RPF"
 Po 186 0
 $EndPAD
 $EndMODULE  0402-M
@@ -474,7 +469,7 @@ AR /4C609C08/4C641710
 Op 0 0 0
 At SMD 
 T0 0 -150 200 200 1800 40 N V 25 N"C3"
-T1 0 150 200 200 1800 40 N I 25 N"22pF"
+T1 0 150 200 200 1800 40 N I 25 N"22pF/RF"
 DS -325 168 -325 -168 50 21
 DS -325 -168 325 -168 50 21
 DS 325 -168 325 168 50 21
@@ -483,14 +478,14 @@ $PAD
 Sh "1" R 177 236 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 27 "N-000032"
+Ne 20 "N-000021"
 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 17 "AGND"
 Po 186 0
 $EndPAD
 $EndMODULE  0402-M
@@ -511,7 +506,7 @@ $PAD
 Sh "1" R 177 236 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 24 "N-000026"
+Ne 24 "N-000029"
 Po -186 0
 $EndPAD
 $PAD
@@ -546,7 +541,7 @@ $PAD
 Sh "2" R 177 236 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 17 "AGND"
 Po 186 0
 $EndPAD
 $EndMODULE  0402-M
@@ -567,14 +562,14 @@ $PAD
 Sh "1" R 177 236 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 29 "VDD"
+Ne 28 "VDD"
 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 17 "AGND"
 Po 186 0
 $EndPAD
 $EndMODULE  0402-M
@@ -595,14 +590,14 @@ $PAD
 Sh "1" R 177 236 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 20 "N-000015"
+Ne 19 "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-000012"
+Ne 18 "N-000012"
 Po 186 0
 $EndPAD
 $EndMODULE  0402-M
@@ -623,14 +618,14 @@ $PAD
 Sh "1" R 177 236 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 10 "/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 17 "AGND"
 Po 186 0
 $EndPAD
 $EndMODULE  0402-M
@@ -651,14 +646,14 @@ $PAD
 Sh "1" R 177 236 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 11 "/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 17 "AGND"
 Po 186 0
 $EndPAD
 $EndMODULE  0402-M
@@ -686,7 +681,7 @@ $PAD
 Sh "2" R 177 236 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 17 "AGND"
 Po 186 0
 $EndPAD
 $EndMODULE  0402-M
@@ -698,7 +693,7 @@ AR /4C609BEF/4C6402EE
 Op 0 0 0
 At SMD 
 T0 0 -150 200 200 0 40 N V 25 N"D1"
-T1 0 150 200 200 0 40 N I 25 N"LTST-C190KTKR"
+T1 0 150 200 200 0 40 N I 25 N"LTST-C190KRKT"
 DS -463 227 -463 -227 50 21
 DS -463 -227 463 -227 50 21
 DS 463 -227 463 227 50 21
@@ -707,14 +702,14 @@ $PAD
 Sh "1" R 217 354 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 20 "N-000015"
+Ne 19 "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 17 "AGND"
 Po 304 0
 $EndPAD
 $EndMODULE  0603-M
@@ -742,35 +737,35 @@ $PAD
 Sh "2" R 156 275 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 27 "N-000032"
+Ne 20 "N-000021"
 Po 0 -186
 $EndPAD
 $PAD
 Sh "3" R 157 275 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 22 "N-000022"
+Ne 22 "N-000025"
 Po -255 -186
 $EndPAD
 $PAD
 Sh "4" R 157 275 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 21 "N-000021"
+Ne 21 "N-000023"
 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 17 "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 17 "AGND"
 Po 255 186
 $EndPAD
 $EndMODULE  0805-6
@@ -791,7 +786,7 @@ $PAD
 Sh "1" R 354 196 0 0 0
 Dr 78 0 0
 At STD N 00CC8001
-Ne 18 "AGND"
+Ne 17 "AGND"
 Po 0 -39
 $EndPAD
 $PAD
@@ -812,7 +807,7 @@ $PAD
 Sh "2" R 197 196 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 24 "N-000026"
+Ne 24 "N-000029"
 Po 826 -39
 $EndPAD
 $PAD
@@ -940,7 +935,7 @@ $PAD
 Sh "1" O 600 600 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 8 "/USB/C2CK"
+Ne 9 "/USB/C2CK"
 Po 0 0
 $EndPAD
 $EndMODULE  PAD_60x60
@@ -957,7 +952,7 @@ $PAD
 Sh "1" O 600 600 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 9 "/USB/C2D"
+Ne 10 "/USB/C2D"
 Po 0 0
 $EndPAD
 $EndMODULE  PAD_60x60
@@ -974,7 +969,7 @@ $PAD
 Sh "1" O 600 600 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 17 "AGND"
 Po 0 0
 $EndPAD
 $EndMODULE  PAD_60x60
@@ -1010,35 +1005,35 @@ $PAD
 Sh "2" R 355 98 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 17 "AGND"
 Po -944 -393
 $EndPAD
 $PAD
 Sh "3" R 355 99 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 10 "/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 11 "/USB/D-"
+Ne 12 "/USB/D-"
 Po -944 0
 $EndPAD
 $PAD
 Sh "5" R 355 99 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 29 "VDD"
+Ne 28 "VDD"
 Po -944 196
 $EndPAD
 $PAD
 Sh "6" R 355 98 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 29 "VDD"
+Ne 28 "VDD"
 Po -944 393
 $EndPAD
 $PAD
@@ -1059,14 +1054,14 @@ $PAD
 Sh "9" R 98 355 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 8 "/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 9 "/USB/C2D"
+Ne 10 "/USB/C2D"
 Po -196 944
 $EndPAD
 $PAD
@@ -1115,21 +1110,21 @@ $PAD
 Sh "17" R 355 99 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 17 "/USB/nSS"
+Ne 8 "/RF/nSS"
 Po 944 196
 $EndPAD
 $PAD
 Sh "18" R 355 98 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 4 "/RF/MOSI"
+Ne 14 "/USB/MOSI"
 Po 944 0
 $EndPAD
 $PAD
 Sh "19" R 355 99 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 12 "/USB/MISO"
+Ne 13 "/USB/MISO"
 Po 944 -196
 $EndPAD
 $PAD
@@ -1150,7 +1145,7 @@ $PAD
 Sh "22" R 98 355 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 13 "/USB/SCLK"
+Ne 6 "/RF/SCLK"
 Po 590 -944
 $EndPAD
 $PAD
@@ -1171,7 +1166,7 @@ $PAD
 Sh "25" R 98 355 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 14 "/USB/TST"
+Ne 0 ""
 Po 0 -944
 $EndPAD
 $PAD
@@ -1185,21 +1180,21 @@ $PAD
 Sh "27" R 98 355 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 17 "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-000012"
+Ne 18 "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 17 "AGND"
 Po 0 0
 $EndPAD
 $EndMODULE  QFN28
@@ -1207,11 +1202,11 @@ $MODULE QFN32
 Po 48500 44250 2700 15 4CD4C835 4CF5C2C2 ~~
 Li QFN32
 Sc 4CF5C2C2
-AR /4C609C08/4C609C4B
+AR /4C609C08/4D229690
 Op 0 0 0
 At SMD 
 T0 0 -150 200 200 2700 40 N V 25 N"U2"
-T1 0 150 200 200 2700 40 N I 25 N"AT86RF230"
+T1 0 150 200 200 2700 40 N I 25 N"AT86RF231"
 DS -1003 -1003 -826 -1003 50 21
 DS -1003 -1003 -1003 -826 50 21
 DS -1003 -826 -826 -1003 50 21
@@ -1228,49 +1223,49 @@ $PAD
 Sh "1" R 355 115 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 17 "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 17 "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 17 "AGND"
 Po -1003 -295
 $EndPAD
 $PAD
 Sh "4" R 355 114 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 6 "/RF/RPF"
+Ne 5 "/RF/RPF"
 Po -1003 -98
 $EndPAD
 $PAD
 Sh "5" R 355 114 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 5 "/RF/RFN"
+Ne 4 "/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 17 "AGND"
 Po -1003 295
 $EndPAD
 $PAD
 Sh "7" R 355 114 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 14 "/USB/TST"
+Ne 17 "AGND"
 Po -1003 492
 $EndPAD
 $PAD
@@ -1284,14 +1279,14 @@ $PAD
 Sh "9" R 115 355 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 17 "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 17 "AGND"
 Po -492 1003
 $EndPAD
 $PAD
@@ -1305,35 +1300,35 @@ $PAD
 Sh "12" R 114 355 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 17 "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-000030"
+Ne 23 "N-000027"
 Po 98 1003
 $EndPAD
 $PAD
 Sh "14" R 114 355 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 26 "N-000030"
+Ne 23 "N-000027"
 Po 295 1003
 $EndPAD
 $PAD
 Sh "15" R 114 355 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 29 "VDD"
+Ne 28 "VDD"
 Po 492 1003
 $EndPAD
 $PAD
 Sh "16" R 115 355 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 17 "AGND"
 Po 688 1003
 $EndPAD
 $PAD
@@ -1347,42 +1342,42 @@ $PAD
 Sh "18" R 355 114 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "AGND"
+Ne 17 "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 6 "/RF/SCLK"
 Po 1003 295
 $EndPAD
 $PAD
 Sh "20" R 355 114 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 12 "/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 17 "AGND"
 Po 1003 -98
 $EndPAD
 $PAD
 Sh "22" R 355 114 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 4 "/RF/MOSI"
+Ne 14 "/USB/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 8 "/RF/nSS"
 Po 1003 -492
 $EndPAD
 $PAD
@@ -1396,63 +1391,63 @@ $PAD
 Sh "25" R 115 355 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 25 "N-000027"
+Ne 27 "N-000033"
 Po 688 -1003
 $EndPAD
 $PAD
 Sh "26" R 114 355 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 28 "N-000033"
+Ne 25 "N-000030"
 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 17 "AGND"
 Po 295 -1003
 $EndPAD
 $PAD
 Sh "28" R 114 355 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 29 "VDD"
+Ne 28 "VDD"
 Po 98 -1003
 $EndPAD
 $PAD
 Sh "29" R 114 355 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 23 "N-000025"
+Ne 26 "N-000031"
 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 17 "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 17 "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 17 "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 17 "AGND"
 Po 0 0
 $EndPAD
 $EndMODULE  QFN32
@@ -1477,35 +1472,35 @@ $PAD
 Sh "2" R 472 867 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 11 "/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 10 "/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 17 "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 17 "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 17 "AGND"
 Po 2243 0
 $EndPAD
 $PAD
@@ -1540,28 +1535,28 @@ $PAD
 Sh "1" R 551 473 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 25 "N-000027"
+Ne 27 "N-000033"
 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 17 "AGND"
 Po 432 314
 $EndPAD
 $PAD
 Sh "3" R 551 473 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 28 "N-000033"
+Ne 25 "N-000030"
 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 17 "AGND"
 Po -432 -314
 $EndPAD
 $EndMODULE  xtal4-3.2mmx2.5mm
@@ -1578,7 +1573,7 @@ Po 0 52750 51800 52750 50300 50
 De 28 0 900 0 0
 $EndDRAWSEGMENT
 $TEXTPCB
-Te "20110102"
+Te "20110104"
 Po 51450 43150 300 300 75 0
 De 15 1 0 Normal
 $EndTEXTPCB
@@ -1677,146 +1672,118 @@ Po 0 48000 48500 47700 48500 80 -1
 De 15 0 3 0 0
 Po 0 48110 48390 48000 48500 80 -1
 De 15 0 3 0 0
-Po 0 48700 46356 48700 45950 80 -1
-De 15 0 4 0 800
-Po 0 48795 45855 48795 45253 80 -1
-De 15 0 4 0 400
-Po 0 48700 45950 48795 45855 80 -1
-De 15 0 4 0 0
 Po 0 48450 42786 48450 42900 80 -1
-De 15 0 5 0 800
+De 15 0 4 0 800
 Po 0 48402 42948 48402 43247 80 -1
-De 15 0 5 0 400
+De 15 0 4 0 400
 Po 0 48450 42900 48402 42948 80 -1
-De 15 0 5 0 0
+De 15 0 4 0 0
 Po 0 48598 43247 48598 43038 80 -1
-De 15 0 6 0 800
+De 15 0 5 0 800
 Po 0 48598 43038 48850 42786 80 -1
+De 15 0 5 0 400
+Po 0 47756 46710 47610 46710 80 -1
+De 15 0 6 0 800
+Po 0 48205 45845 48205 45253 80 -1
 De 15 0 6 0 400
-Po 0 47000 46850 47000 46800 80 -1
-De 0 0 7 0 0
-Po 0 47255 43955 47150 43850 80 -1
-De 15 0 7 0 0
-Po 0 47150 43850 47150 43650 80 -1
-De 15 0 7 0 0
-Po 0 47150 43650 46900 43400 80 -1
-De 15 0 7 0 0
-Po 3 46900 43400 46900 43400 300 -1
-De 15 1 7 0 0
-Po 0 47497 43955 47255 43955 80 -1
-De 15 0 7 0 800
-Po 0 47304 47104 47050 46850 80 -1
-De 15 0 7 0 0
-Po 0 47050 46850 47000 46850 80 -1
-De 15 0 7 0 0
-Po 3 47000 46850 47000 46850 300 -1
-De 15 1 7 0 0
-Po 0 47304 47104 47756 47104 80 -1
-De 15 0 7 0 400
-Po 0 47200 43700 46900 43400 80 -1
-De 0 0 7 0 0
-Po 0 47200 44850 47200 43700 80 -1
-De 0 0 7 0 0
-Po 0 46900 45150 47200 44850 80 -1
+Po 0 47850 46200 48205 45845 80 -1
+De 15 0 6 0 0
+Po 0 47700 46200 47850 46200 80 -1
+De 15 0 6 0 0
+Po 0 47600 46300 47700 46200 80 -1
+De 15 0 6 0 0
+Po 0 47600 46700 47600 46300 80 -1
+De 15 0 6 0 0
+Po 0 47610 46710 47600 46700 80 -1
+De 15 0 6 0 0
+Po 0 46900 46700 46900 46850 80 -1
 De 0 0 7 0 0
 Po 0 46900 46700 46900 45150 80 -1
 De 0 0 7 0 0
-Po 0 47000 46800 46900 46700 80 -1
+Po 0 46900 45150 47200 44850 80 -1
 De 0 0 7 0 0
-Po 3 51650 47300 51650 47300 300 -1
-De 15 1 8 0 0
-Po 0 49644 47693 50107 47693 80 -1
+Po 0 47200 44850 47200 43700 80 -1
+De 0 0 7 0 0
+Po 0 47200 43700 46900 43400 80 -1
+De 0 0 7 0 0
+Po 0 47497 43955 47255 43955 80 -1
+De 15 0 7 0 800
+Po 3 46900 43400 46900 43400 300 -1
+De 15 1 7 0 0
+Po 0 47150 43650 46900 43400 80 -1
+De 15 0 7 0 0
+Po 0 47150 43850 47150 43650 80 -1
+De 15 0 7 0 0
+Po 0 47255 43955 47150 43850 80 -1
+De 15 0 7 0 0
+Po 0 47154 47104 47000 46950 80 -1
+De 15 0 7 0 0
+Po 3 47000 46950 47000 46950 300 -1
+De 15 1 7 0 0
+Po 0 47154 47104 47756 47104 80 -1
+De 15 0 7 0 400
+Po 0 46900 46850 47000 46950 80 -1
+De 0 0 7 0 0
+Po 0 48896 46356 48896 46004 80 -1
 De 15 0 8 0 800
-Po 0 51650 47300 52100 46850 80 -1
+Po 0 48992 45908 48992 45253 80 -1
 De 15 0 8 0 400
-Po 0 50500 47300 51650 47300 80 -1
+Po 0 48896 46004 48992 45908 80 -1
 De 15 0 8 0 0
-Po 0 50107 47693 50500 47300 80 -1
-De 15 0 8 0 0
-Po 0 50400 47100 51200 47100 80 -1
-De 15 0 9 0 0
-Po 0 50004 47496 50400 47100 80 -1
-De 15 0 9 0 0
-Po 0 49644 47496 50004 47496 80 -1
+Po 3 51650 47300 51650 47300 300 -1
+De 15 1 9 0 0
+Po 0 49644 47693 50107 47693 80 -1
 De 15 0 9 0 800
-Po 0 52100 46200 52100 45850 80 -1
+Po 0 51650 47300 52100 46850 80 -1
 De 15 0 9 0 400
-Po 0 51200 47100 52100 46200 80 -1
+Po 0 50500 47300 51650 47300 80 -1
 De 15 0 9 0 0
-Po 0 49157 49638 49157 49471 80 -1
-De 15 0 10 0 800
-Po 0 49157 49471 48536 48850 80 -1
-De 15 0 10 0 400
-Po 0 48504 48244 48504 48546 80 -1
-De 15 0 10 0 800
-Po 0 48536 48578 48536 48850 80 -1
-De 15 0 10 0 400
-Po 0 48504 48546 48536 48578 80 -1
+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 11 0 800
-Po 0 49314 48914 49314 48850 80 -1
-De 15 0 11 0 400
-Po 0 49943 49543 49314 48914 80 -1
-De 15 0 11 0 0
-Po 0 48700 48244 48700 48600 80 -1
-De 15 0 11 0 800
-Po 0 48950 48850 49314 48850 80 -1
-De 15 0 11 0 400
-Po 0 48700 48600 48950 48850 80 -1
-De 15 0 11 0 0
-Po 0 48402 45253 48402 45852 80 -1
 De 15 0 12 0 800
-Po 0 48504 45954 48504 46356 80 -1
+Po 0 49314 48914 49314 48850 80 -1
 De 15 0 12 0 400
-Po 0 48402 45852 48504 45954 80 -1
+Po 0 49943 49543 49314 48914 80 -1
 De 15 0 12 0 0
-Po 0 47756 46710 47610 46710 80 -1
+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 48205 45845 48205 45253 80 -1
+Po 0 48504 45954 48504 46356 80 -1
 De 15 0 13 0 400
-Po 0 47850 46200 48205 45845 80 -1
+Po 0 48402 45852 48504 45954 80 -1
 De 15 0 13 0 0
-Po 0 47700 46200 47850 46200 80 -1
-De 15 0 13 0 0
-Po 0 47600 46300 47700 46200 80 -1
-De 15 0 13 0 0
-Po 0 47600 46700 47600 46300 80 -1
-De 15 0 13 0 0
-Po 0 47610 46710 47600 46700 80 -1
-De 15 0 13 0 0
-Po 0 47000 47250 47050 47250 80 -1
-De 0 0 14 0 0
-Po 0 48008 43008 47900 42900 80 -1
-De 15 0 14 0 0
-Po 0 47900 42900 47300 42900 80 -1
-De 15 0 14 0 0
-Po 0 47300 42900 46900 42500 80 -1
-De 15 0 14 0 0
-Po 3 46900 42500 46900 42500 300 -1
-De 15 1 14 0 0
-Po 0 48008 43247 48008 43008 80 -1
+Po 0 48700 46356 48700 45950 80 -1
 De 15 0 14 0 800
-Po 0 47050 47300 47000 47250 80 -1
-De 15 0 14 0 0
-Po 3 47000 47250 47000 47250 300 -1
-De 15 1 14 0 0
-Po 0 47050 47300 47756 47300 80 -1
+Po 0 48795 45855 48795 45253 80 -1
 De 15 0 14 0 400
-Po 0 47600 43200 46900 42500 80 -1
-De 0 0 14 0 0
-Po 0 47600 45050 47600 43200 80 -1
-De 0 0 14 0 0
-Po 0 47300 45350 47600 45050 80 -1
-De 0 0 14 0 0
-Po 0 47300 46050 47300 45350 80 -1
-De 0 0 14 0 0
-Po 0 47550 46300 47300 46050 80 -1
-De 0 0 14 0 0
-Po 0 47550 46750 47550 46300 80 -1
-De 0 0 14 0 0
-Po 0 47050 47250 47550 46750 80 -1
-De 0 0 14 0 0
+Po 0 48700 45950 48795 45855 80 -1
+De 15 0 14 0 0
 Po 0 49290 48244 49290 48340 100 -1
 De 15 0 15 0 800
 Po 0 49950 48200 49950 47890 100 -1
@@ -1861,506 +1828,516 @@ Po 0 50210 47890 50600 47500 100 -1
 De 15 0 15 0 0
 Po 0 47756 46907 47507 46907 80 -1
 De 15 0 16 0 800
-Po 0 47812 43212 47700 43100 80 -1
-De 15 0 16 0 0
-Po 0 47700 43100 47050 43100 80 -1
-De 15 0 16 0 0
-Po 0 47050 43100 46900 42950 80 -1
-De 15 0 16 0 0
-Po 3 46900 42950 46900 42950 300 -1
+Po 3 47250 46550 47250 46550 300 -1
 De 15 1 16 0 0
-Po 0 47400 43450 46900 42950 80 -1
-De 0 0 16 0 0
-Po 0 47400 44950 47400 43450 80 -1
-De 0 0 16 0 0
-Po 0 47100 45250 47400 44950 80 -1
-De 0 0 16 0 0
-Po 0 47100 46350 47100 45250 80 -1
+Po 0 47250 46550 47100 46400 80 -1
 De 0 0 16 0 0
 Po 0 47812 43212 47812 43247 80 -1
 De 15 0 16 0 400
-Po 0 47250 46500 47100 46350 80 -1
+Po 0 47100 46400 47100 45250 80 -1
 De 0 0 16 0 0
-Po 3 47250 46500 47250 46500 300 -1
+Po 0 47100 45250 47400 44950 80 -1
+De 0 0 16 0 0
+Po 0 47400 44950 47400 43450 80 -1
+De 0 0 16 0 0
+Po 0 47400 43450 46900 42950 80 -1
+De 0 0 16 0 0
+Po 3 46900 42950 46900 42950 300 -1
 De 15 1 16 0 0
-Po 0 47250 46650 47250 46500 80 -1
+Po 0 47050 43100 46900 42950 80 -1
+De 15 0 16 0 0
+Po 0 47700 43100 47050 43100 80 -1
+De 15 0 16 0 0
+Po 0 47812 43212 47700 43100 80 -1
+De 15 0 16 0 0
+Po 0 47250 46650 47250 46550 80 -1
 De 15 0 16 0 0
 Po 0 47507 46907 47250 46650 80 -1
 De 15 0 16 0 0
-Po 0 48896 46356 48896 46004 80 -1
+Po 0 48008 43247 48008 42758 100 -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 48008 42758 47850 42600 100 -1
 De 15 0 17 0 0
-Po 0 52400 42100 52400 42400 100 -1
-De 0 0 18 0 0
-Po 3 52400 42100 52400 42100 300 -1
-De 15 1 18 0 0
-Po 0 52400 41600 52400 42100 100 -1
-De 15 0 18 0 0
-Po 3 52400 41600 52400 41600 300 -1
-De 15 1 18 0 0
-Po 3 50250 42550 50250 42550 300 -1
-De 15 1 18 0 0
-Po 0 50750 42550 50250 42550 100 -1
-De 0 0 18 0 0
-Po 3 50750 42550 50750 42550 300 -1
-De 15 1 18 0 0
-Po 0 51250 42550 50750 42550 100 -1
-De 15 0 18 0 0
-Po 3 51250 42550 51250 42550 300 -1
-De 15 1 18 0 0
-Po 0 51750 42550 51250 42550 100 -1
-De 0 0 18 0 0
-Po 3 51750 42550 51750 42550 300 -1
-De 15 1 18 0 0
-Po 0 52250 42550 51750 42550 100 -1
-De 15 0 18 0 0
-Po 3 52250 42550 52250 42550 300 -1
-De 15 1 18 0 0
-Po 0 52400 42400 52250 42550 100 -1
-De 0 0 18 0 0
-Po 0 52400 41600 51400 41550 100 -1
-De 0 0 18 0 0
-Po 3 50450 41550 50450 41550 300 -1
-De 15 1 18 0 0
-Po 0 51400 41550 50450 41550 100 -1
-De 15 0 18 0 0
-Po 3 51400 41550 51400 41550 300 -1
-De 15 1 18 0 0
-Po 0 52400 40600 51400 40550 100 -1
-De 15 0 18 0 0
-Po 3 49550 40550 49550 40550 300 -1
-De 15 1 18 0 0
-Po 0 50450 40550 49550 40550 100 -1
-De 15 0 18 0 0
-Po 3 50450 40550 50450 40550 300 -1
-De 15 1 18 0 0
-Po 0 51400 40550 50450 40550 100 -1
-De 0 0 18 0 0
-Po 3 51400 40550 51400 40550 300 -1
-De 15 1 18 0 0
-Po 0 48200 40100 48200 39750 100 -1
-De 15 0 18 0 0
-Po 3 48500 40600 48500 40600 300 -1
-De 15 1 18 0 0
-Po 0 48500 40600 48200 40300 100 -1
-De 0 0 18 0 0
-Po 0 48200 40300 48200 40100 100 -1
-De 0 0 18 0 0
-Po 3 48200 40100 48200 40100 300 -1
-De 15 1 18 0 0
-Po 0 49350 41100 49000 41100 100 -1
-De 0 0 18 0 0
-Po 3 49350 41600 49350 41600 300 -1
-De 15 1 18 0 0
-Po 3 49350 41100 49350 41100 300 -1
-De 15 1 18 0 0
-Po 0 49350 41600 49350 41100 100 -1
-De 15 0 18 0 0
-Po 3 48850 40950 48850 40950 300 -1
-De 15 1 18 0 0
-Po 0 49000 41100 48850 40950 100 -1
-De 0 0 18 0 0
-Po 0 48850 40950 48500 40600 100 -1
-De 15 0 18 0 0
-Po 0 48200 39750 48050 39600 100 -1
-De 15 0 18 0 0
-Po 0 47614 42050 47614 41686 100 -1
-De 15 0 18 0 800
-Po 0 47614 41686 47700 41600 100 -1
-De 15 0 18 0 0
-Po 0 47700 41600 47350 41250 100 -1
-De 0 0 18 0 0
-Po 3 47350 41250 47350 41250 300 -1
-De 15 1 18 0 0
-Po 0 47350 41250 47000 40900 100 -1
-De 15 0 18 0 0
-Po 0 47000 40900 47000 40700 100 -1
-De 15 0 18 0 0
-Po 3 47000 40700 47000 40700 300 -1
-De 15 1 18 0 0
-Po 0 47000 40700 47000 40150 100 -1
-De 0 0 18 0 0
-Po 3 47000 40150 47000 40150 300 -1
-De 15 1 18 0 0
-Po 3 47700 41600 47700 41600 300 -1
-De 15 1 18 0 0
-Po 0 47500 41400 47700 41600 100 -1
-De 15 0 18 0 0
-Po 0 46700 41500 46700 42000 100 -1
-De 0 0 18 0 0
-Po 0 46900 42050 47614 42050 100 -1
-De 15 0 18 0 400
-Po 3 46700 41500 46700 41500 300 -1
-De 15 1 18 0 0
-Po 0 46750 42050 46900 42050 100 -1
-De 15 0 18 0 0
-Po 0 46700 42000 46750 42050 100 -1
-De 15 0 18 0 0
-Po 3 46700 42000 46700 42000 300 -1
-De 15 1 18 0 0
-Po 0 52400 39600 52400 40100 100 -1
-De 15 0 18 0 0
-Po 3 48550 39600 48550 39600 300 -1
-De 15 1 18 0 0
-Po 0 48550 39600 48800 39600 100 -1
-De 15 0 18 0 0
-Po 0 48050 39600 48550 39600 100 -1
-De 15 0 18 0 0
-Po 3 52400 40100 52400 40100 300 -1
-De 15 1 18 0 0
-Po 0 52400 40100 52400 40600 100 -1
-De 0 0 18 0 0
-Po 3 52400 40600 52400 40600 300 -1
-De 15 1 18 0 0
-Po 0 52400 40600 52400 41100 100 -1
-De 15 0 18 0 0
-Po 3 52400 41100 52400 41100 300 -1
-De 15 1 18 0 0
-Po 0 52400 41100 52400 41600 100 -1
-De 0 0 18 0 0
-Po 0 48800 39600 49050 39600 100 -1
-De 15 0 18 0 0
-Po 3 49050 39600 49050 39600 300 -1
-De 15 1 18 0 0
-Po 0 49050 39600 49550 39600 100 -1
-De 0 0 18 0 0
-Po 3 49550 39600 49550 39600 300 -1
-De 15 1 18 0 0
-Po 0 49550 39600 50000 39600 100 -1
-De 15 0 18 0 0
-Po 3 50000 39600 50000 39600 300 -1
-De 15 1 18 0 0
-Po 0 50000 39600 50450 39600 100 -1
-De 0 0 18 0 0
-Po 3 50450 39600 50450 39600 300 -1
-De 15 1 18 0 0
-Po 0 50450 39600 50900 39600 100 -1
-De 15 0 18 0 0
-Po 3 50900 39600 50900 39600 300 -1
-De 15 1 18 0 0
-Po 0 50900 39600 51400 39600 100 -1
-De 0 0 18 0 0
-Po 3 51400 39600 51400 39600 300 -1
-De 15 1 18 0 0
-Po 0 51400 39600 51900 39600 100 -1
-De 15 0 18 0 0
-Po 3 51900 39600 51900 39600 300 -1
-De 15 1 18 0 0
-Po 0 51900 39600 52400 39600 100 -1
-De 0 0 18 0 0
-Po 3 52400 39600 52400 39600 300 -1
-De 15 1 18 0 0
-Po 0 48836 41750 49200 41750 100 -1
-De 15 0 18 0 800
-Po 0 49200 41750 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 3 49350 42100 49350 42100 300 -1
-De 15 1 18 0 0
-Po 0 49350 42100 49350 42600 100 -1
-De 0 0 18 0 0
-Po 0 49350 41600 49350 42100 100 -1
-De 15 0 18 0 0
-Po 0 49245 41495 49350 41600 100 -1
-De 15 0 18 0 0
-Po 3 46700 40450 46700 40450 300 -1
-De 15 1 18 0 0
-Po 0 46750 39411 46700 39900 100 -1
-De 0 0 18 0 800
-Po 3 46700 39900 46700 39900 300 -1
-De 15 1 18 0 0
-Po 0 46700 39900 46700 40450 100 -1
-De 15 0 18 0 0
-Po 0 46700 41000 46700 41500 100 -1
-De 15 0 18 0 0
-Po 3 46700 41000 46700 41000 300 -1
-De 15 1 18 0 0
-Po 0 46700 40450 46700 41000 100 -1
-De 0 0 18 0 0
-Po 0 46750 39411 47011 39411 100 -1
-De 0 0 18 0 800
-Po 0 47011 39411 47200 39600 100 -1
-De 0 0 18 0 0
-Po 3 47200 39600 47200 39600 300 -1
-De 15 1 18 0 0
-Po 0 48050 39600 47200 39600 100 -1
-De 0 0 18 0 0
-Po 3 48050 39600 48050 39600 300 -1
-De 15 1 18 0 0
-Po 0 48008 45253 48008 45592 100 -1
-De 15 0 18 0 800
-Po 0 47050 47850 47800 47100 100 -1
-De 0 0 18 0 0
-Po 0 47800 47100 47800 45950 100 -1
-De 0 0 18 0 0
-Po 0 47454 48704 47454 48850 100 -1
-De 15 0 18 0 400
-Po 3 47050 48250 47050 48250 300 -1
-De 15 1 18 0 0
-Po 0 47050 48300 47050 48250 100 -1
-De 15 0 18 0 0
-Po 0 47454 48704 47050 48300 100 -1
-De 15 0 18 0 0
-Po 0 47050 48250 47050 47850 100 -1
-De 0 0 18 0 0
-Po 0 47800 45900 47800 45950 100 -1
-De 0 0 18 0 0
-Po 0 47750 45850 47800 45900 100 -1
-De 0 0 18 0 0
-Po 3 47750 45850 47750 45850 300 -1
-De 15 1 18 0 0
-Po 0 48008 45592 47750 45850 100 -1
-De 15 0 18 0 0
-Po 0 47497 44938 47312 44938 100 -1
-De 15 0 18 0 800
-Po 0 47064 45486 46900 45486 100 -1
-De 15 0 18 0 400
-Po 0 47200 45350 47064 45486 100 -1
-De 15 0 18 0 0
-Po 0 47200 45050 47200 45350 100 -1
-De 15 0 18 0 0
-Po 0 47312 44938 47200 45050 100 -1
-De 15 0 18 0 0
-Po 0 47756 47693 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 50050 43300 50250 43500 100 -1
-De 15 0 18 0 0
-Po 0 49503 43562 49788 43562 100 -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
-De 15 0 18 0 400
-Po 0 51000 43500 51100 43600 100 -1
-De 15 0 18 0 0
-Po 0 50250 43500 51000 43500 100 -1
-De 15 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 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 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 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 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 48205 43247 48205 43955 100 -1
+De 15 0 17 0 800
+Po 0 48205 43955 48500 44250 100 -1
+De 15 0 17 0 400
+Po 0 48008 43247 48008 43758 100 -1
+De 15 0 17 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
+De 15 0 17 0 400
+Po 0 52400 42100 52400 42400 100 -1
+De 0 0 17 0 0
+Po 3 52400 42100 52400 42100 300 -1
+De 15 1 17 0 0
+Po 0 52400 41600 52400 42100 100 -1
+De 15 0 17 0 0
+Po 3 52400 41600 52400 41600 300 -1
+De 15 1 17 0 0
+Po 3 50250 42550 50250 42550 300 -1
+De 15 1 17 0 0
+Po 0 50750 42550 50250 42550 100 -1
+De 0 0 17 0 0
+Po 3 50750 42550 50750 42550 300 -1
+De 15 1 17 0 0
+Po 0 51250 42550 50750 42550 100 -1
+De 15 0 17 0 0
+Po 3 51250 42550 51250 42550 300 -1
+De 15 1 17 0 0
+Po 0 51750 42550 51250 42550 100 -1
+De 0 0 17 0 0
+Po 3 51750 42550 51750 42550 300 -1
+De 15 1 17 0 0
+Po 0 52250 42550 51750 42550 100 -1
+De 15 0 17 0 0
+Po 3 52250 42550 52250 42550 300 -1
+De 15 1 17 0 0
+Po 0 52400 42400 52250 42550 100 -1
+De 0 0 17 0 0
+Po 0 52400 41600 51400 41550 100 -1
+De 0 0 17 0 0
+Po 3 50450 41550 50450 41550 300 -1
+De 15 1 17 0 0
+Po 0 51400 41550 50450 41550 100 -1
+De 15 0 17 0 0
+Po 3 51400 41550 51400 41550 300 -1
+De 15 1 17 0 0
+Po 0 52400 40600 51400 40550 100 -1
+De 15 0 17 0 0
+Po 3 49550 40550 49550 40550 300 -1
+De 15 1 17 0 0
+Po 0 50450 40550 49550 40550 100 -1
+De 15 0 17 0 0
+Po 3 50450 40550 50450 40550 300 -1
+De 15 1 17 0 0
+Po 0 51400 40550 50450 40550 100 -1
+De 0 0 17 0 0
+Po 3 51400 40550 51400 40550 300 -1
+De 15 1 17 0 0
+Po 0 48200 40100 48200 39750 100 -1
+De 15 0 17 0 0
+Po 3 48500 40600 48500 40600 300 -1
+De 15 1 17 0 0
+Po 0 48500 40600 48200 40300 100 -1
+De 0 0 17 0 0
+Po 0 48200 40300 48200 40100 100 -1
+De 0 0 17 0 0
+Po 3 48200 40100 48200 40100 300 -1
+De 15 1 17 0 0
+Po 0 49350 41100 49000 41100 100 -1
+De 0 0 17 0 0
+Po 3 49350 41600 49350 41600 300 -1
+De 15 1 17 0 0
+Po 3 49350 41100 49350 41100 300 -1
+De 15 1 17 0 0
+Po 0 49350 41600 49350 41100 100 -1
+De 15 0 17 0 0
+Po 3 48850 40950 48850 40950 300 -1
+De 15 1 17 0 0
+Po 0 49000 41100 48850 40950 100 -1
+De 0 0 17 0 0
+Po 0 48850 40950 48500 40600 100 -1
+De 15 0 17 0 0
+Po 0 48200 39750 48050 39600 100 -1
+De 15 0 17 0 0
+Po 0 47614 42050 47614 41686 100 -1
+De 15 0 17 0 800
+Po 0 47614 41686 47700 41600 100 -1
+De 15 0 17 0 0
+Po 0 47700 41600 47350 41250 100 -1
+De 0 0 17 0 0
+Po 3 47350 41250 47350 41250 300 -1
+De 15 1 17 0 0
+Po 0 47350 41250 47000 40900 100 -1
+De 15 0 17 0 0
+Po 0 47000 40900 47000 40700 100 -1
+De 15 0 17 0 0
+Po 3 47000 40700 47000 40700 300 -1
+De 15 1 17 0 0
+Po 0 47000 40700 47000 40150 100 -1
+De 0 0 17 0 0
+Po 3 47000 40150 47000 40150 300 -1
+De 15 1 17 0 0
+Po 3 47700 41600 47700 41600 300 -1
+De 15 1 17 0 0
+Po 0 47500 41400 47700 41600 100 -1
+De 15 0 17 0 0
+Po 0 46700 41500 46700 42000 100 -1
+De 0 0 17 0 0
+Po 0 46900 42050 47614 42050 100 -1
+De 15 0 17 0 400
+Po 3 46700 41500 46700 41500 300 -1
+De 15 1 17 0 0
+Po 0 46750 42050 46900 42050 100 -1
+De 15 0 17 0 0
+Po 0 46700 42000 46750 42050 100 -1
+De 15 0 17 0 0
+Po 3 46700 42000 46700 42000 300 -1
+De 15 1 17 0 0
+Po 0 52400 39600 52400 40100 100 -1
+De 15 0 17 0 0
+Po 3 48550 39600 48550 39600 300 -1
+De 15 1 17 0 0
+Po 0 48550 39600 48800 39600 100 -1
+De 15 0 17 0 0
+Po 0 48050 39600 48550 39600 100 -1
+De 15 0 17 0 0
+Po 3 52400 40100 52400 40100 300 -1
+De 15 1 17 0 0
+Po 0 52400 40100 52400 40600 100 -1
+De 0 0 17 0 0
+Po 3 52400 40600 52400 40600 300 -1
+De 15 1 17 0 0
+Po 0 52400 40600 52400 41100 100 -1
+De 15 0 17 0 0
+Po 3 52400 41100 52400 41100 300 -1
+De 15 1 17 0 0
+Po 0 52400 41100 52400 41600 100 -1
+De 0 0 17 0 0
+Po 0 48800 39600 49050 39600 100 -1
+De 15 0 17 0 0
+Po 3 49050 39600 49050 39600 300 -1
+De 15 1 17 0 0
+Po 0 49050 39600 49550 39600 100 -1
+De 0 0 17 0 0
+Po 3 49550 39600 49550 39600 300 -1
+De 15 1 17 0 0
+Po 0 49550 39600 50000 39600 100 -1
+De 15 0 17 0 0
+Po 3 50000 39600 50000 39600 300 -1
+De 15 1 17 0 0
+Po 0 50000 39600 50450 39600 100 -1
+De 0 0 17 0 0
+Po 3 50450 39600 50450 39600 300 -1
+De 15 1 17 0 0
+Po 0 50450 39600 50900 39600 100 -1
+De 15 0 17 0 0
+Po 3 50900 39600 50900 39600 300 -1
+De 15 1 17 0 0
+Po 0 50900 39600 51400 39600 100 -1
+De 0 0 17 0 0
+Po 3 51400 39600 51400 39600 300 -1
+De 15 1 17 0 0
+Po 0 51400 39600 51900 39600 100 -1
+De 15 0 17 0 0
+Po 3 51900 39600 51900 39600 300 -1
+De 15 1 17 0 0
+Po 0 51900 39600 52400 39600 100 -1
+De 0 0 17 0 0
+Po 3 52400 39600 52400 39600 300 -1
+De 15 1 17 0 0
+Po 0 48836 41750 49200 41750 100 -1
+De 15 0 17 0 800
+Po 0 49200 41750 49350 41600 100 -1
+De 15 0 17 0 0
+Po 0 48836 41495 49245 41495 100 -1
+De 15 0 17 0 800
+Po 3 49350 42100 49350 42100 300 -1
+De 15 1 17 0 0
+Po 0 49350 42100 49350 42600 100 -1
+De 0 0 17 0 0
+Po 0 49350 41600 49350 42100 100 -1
+De 15 0 17 0 0
+Po 0 49245 41495 49350 41600 100 -1
+De 15 0 17 0 0
+Po 3 46700 40450 46700 40450 300 -1
+De 15 1 17 0 0
+Po 0 46750 39411 46700 39900 100 -1
+De 0 0 17 0 800
+Po 3 46700 39900 46700 39900 300 -1
+De 15 1 17 0 0
+Po 0 46700 39900 46700 40450 100 -1
+De 15 0 17 0 0
+Po 0 46700 41000 46700 41500 100 -1
+De 15 0 17 0 0
+Po 3 46700 41000 46700 41000 300 -1
+De 15 1 17 0 0
+Po 0 46700 40450 46700 41000 100 -1
+De 0 0 17 0 0
+Po 0 46750 39411 47011 39411 100 -1
+De 0 0 17 0 800
+Po 0 47011 39411 47200 39600 100 -1
+De 0 0 17 0 0
+Po 3 47200 39600 47200 39600 300 -1
+De 15 1 17 0 0
+Po 0 48050 39600 47200 39600 100 -1
+De 0 0 17 0 0
+Po 3 48050 39600 48050 39600 300 -1
+De 15 1 17 0 0
+Po 0 48008 45253 48008 45592 100 -1
+De 15 0 17 0 800
+Po 0 47050 47850 47800 47100 100 -1
+De 0 0 17 0 0
+Po 0 47800 47100 47800 45950 100 -1
+De 0 0 17 0 0
+Po 0 47454 48704 47454 48850 100 -1
+De 15 0 17 0 400
+Po 3 47050 48250 47050 48250 300 -1
+De 15 1 17 0 0
+Po 0 47050 48300 47050 48250 100 -1
+De 15 0 17 0 0
+Po 0 47454 48704 47050 48300 100 -1
+De 15 0 17 0 0
+Po 0 47050 48250 47050 47850 100 -1
+De 0 0 17 0 0
+Po 0 47800 45900 47800 45950 100 -1
+De 0 0 17 0 0
+Po 0 47750 45850 47800 45900 100 -1
+De 0 0 17 0 0
+Po 3 47750 45850 47750 45850 300 -1
+De 15 1 17 0 0
+Po 0 48008 45592 47750 45850 100 -1
+De 15 0 17 0 0
+Po 0 47497 44938 47312 44938 100 -1
+De 15 0 17 0 800
+Po 0 47064 45486 46900 45486 100 -1
+De 15 0 17 0 400
+Po 0 47200 45350 47064 45486 100 -1
+De 15 0 17 0 0
+Po 0 47200 45050 47200 45350 100 -1
+De 15 0 17 0 0
+Po 0 47312 44938 47200 45050 100 -1
+De 15 0 17 0 0
+Po 0 47756 47693 48307 47693 100 -1
+De 15 0 17 0 800
+Po 0 48307 47693 48700 47300 100 -1
+De 15 0 17 0 400
+Po 0 50050 43300 50250 43500 100 -1
+De 15 0 17 0 0
+Po 0 49503 43562 49788 43562 100 -1
+De 15 0 17 0 800
+Po 3 50050 43300 50050 43300 300 -1
+De 15 1 17 0 0
+Po 0 49788 43562 50050 43300 100 -1
+De 15 0 17 0 0
+Po 0 50986 43714 51100 43600 100 -1
+De 15 0 17 0 0
+Po 3 51100 43600 51100 43600 300 -1
+De 15 1 17 0 0
+Po 0 50986 43714 50550 43714 100 -1
+De 15 0 17 0 400
+Po 0 51000 43500 51100 43600 100 -1
+De 15 0 17 0 0
+Po 0 50250 43500 51000 43500 100 -1
+De 15 0 17 0 0
+Po 0 51793 50700 51050 50700 100 -1
+De 0 0 17 0 800
+Po 0 48100 50700 47307 50700 100 -1
+De 0 0 17 0 400
+Po 0 48500 51100 48100 50700 100 -1
+De 0 0 17 0 0
+Po 0 50650 51100 48500 51100 100 -1
+De 0 0 17 0 0
+Po 0 51050 50700 50650 51100 100 -1
+De 0 0 17 0 0
+Po 0 48992 43050 49188 43050 100 -1
+De 15 0 17 0 0
+Po 0 47497 44938 47812 44938 100 -1
+De 15 0 17 0 800
+Po 0 47812 44938 48500 44250 100 -1
+De 15 0 17 0 400
+Po 0 47497 44152 48402 44152 100 -1
+De 15 0 17 0 800
+Po 0 48402 44152 48500 44250 100 -1
+De 15 0 17 0 400
+Po 0 50300 48850 50350 48850 100 -1
+De 0 0 17 0 0
+Po 3 50300 48850 50300 48850 300 -1
+De 15 1 17 0 0
+Po 0 50350 48850 50800 48400 100 -1
+De 0 0 17 0 0
+Po 0 48307 48244 48307 47693 100 -1
+De 15 0 17 0 800
+Po 0 48307 47693 48700 47300 100 -1
+De 15 0 17 0 400
+Po 0 49350 42600 47850 42600 100 -1
+De 0 0 17 0 0
+Po 3 47850 42600 47850 42600 300 -1
+De 15 1 17 0 0
+Po 0 48205 42955 47850 42600 100 -1
+De 15 0 17 0 0
+Po 0 48205 42955 48205 43247 100 -1
+De 15 0 17 0 400
+Po 0 50550 44600 50550 45350 100 -1
+De 0 0 17 0 0
+Po 3 49950 45950 49950 45950 300 -1
+De 15 1 17 0 0
+Po 0 50032 46032 49950 45950 100 -1
+De 15 0 17 0 0
+Po 0 50032 46032 50586 46032 100 -1
+De 15 0 17 0 400
+Po 0 50550 45350 49950 45950 100 -1
+De 0 0 17 0 0
+Po 0 49503 44545 49981 44545 100 -1
+De 15 0 17 0 800
+Po 0 49981 44545 50050 44614 100 -1
+De 15 0 17 0 400
+Po 0 48307 48244 48307 48493 100 -1
+De 15 0 17 0 800
+Po 0 48164 48636 48164 48850 100 -1
+De 15 0 17 0 400
+Po 0 48307 48493 48164 48636 100 -1
+De 15 0 17 0 0
+Po 0 51793 50700 51793 49393 100 -1
+De 0 0 17 0 800
+Po 0 51793 49393 50800 48400 100 -1
+De 0 0 17 0 0
+Po 0 50800 48400 50450 48050 100 -1
+De 0 0 17 0 0
+Po 3 50450 48050 50450 48050 300 -1
+De 15 1 17 0 0
+Po 0 50650 48250 50914 48250 100 -1
+De 15 0 17 0 400
+Po 0 50650 48250 50450 48050 100 -1
+De 15 0 17 0 0
+Po 0 49188 42762 49188 43050 100 -1
+De 15 0 17 0 0
+Po 0 49188 42762 49350 42600 100 -1
+De 15 0 17 0 0
+Po 3 49350 42600 49350 42600 300 -1
+De 15 1 17 0 0
+Po 0 49188 43050 49188 43058 100 -1
+De 15 0 17 0 0
+Po 0 49188 43247 49188 43058 100 -1
+De 15 0 17 0 800
+Po 0 48795 43247 48795 43105 100 -1
+De 15 0 17 0 800
+Po 0 48992 43058 48992 43050 100 -1
+De 15 0 17 0 0
+Po 0 48992 43050 48992 43247 100 -1
+De 15 0 17 0 400
+Po 0 49000 43050 48992 43058 100 -1
+De 15 0 17 0 0
+Po 0 48850 43050 49000 43050 100 -1
+De 15 0 17 0 0
+Po 0 48795 43105 48850 43050 100 -1
+De 15 0 17 0 0
+Po 0 50050 43714 50550 43714 100 -1
+De 15 0 17 0 C00
+Po 0 48992 43247 48992 43758 100 -1
+De 15 0 17 0 800
 Po 0 48992 43758 48500 44250 100 -1
-De 15 0 18 0 400
+De 15 0 17 0 400
+Po 0 48795 43247 48795 43955 100 -1
+De 15 0 17 0 800
+Po 0 48795 43955 48500 44250 100 -1
+De 15 0 17 0 400
+Po 0 47497 43562 47812 43562 100 -1
+De 15 0 17 0 800
+Po 0 47812 43562 48500 44250 100 -1
+De 15 0 17 0 400
+Po 0 47497 43758 48008 43758 100 -1
+De 15 0 17 0 800
+Po 0 48008 43758 48500 44250 100 -1
+De 15 0 17 0 400
+Po 0 48008 45253 48008 44742 100 -1
+De 15 0 17 0 800
+Po 0 48008 44742 48500 44250 100 -1
+De 15 0 17 0 400
+Po 0 49503 44545 48795 44545 100 -1
+De 15 0 17 0 800
+Po 0 48795 44545 48500 44250 100 -1
+De 15 0 17 0 400
+Po 0 49503 43955 48795 43955 100 -1
+De 15 0 17 0 800
+Po 0 48795 43955 48500 44250 100 -1
+De 15 0 17 0 400
+Po 0 49503 43758 48992 43758 100 -1
+De 15 0 17 0 800
+Po 0 48992 43758 48500 44250 100 -1
+De 15 0 17 0 400
 Po 0 49503 43562 49188 43562 100 -1
-De 15 0 18 0 800
+De 15 0 17 0 800
 Po 0 49188 43562 48500 44250 100 -1
-De 15 0 18 0 400
+De 15 0 17 0 400
 Po 0 49188 43247 49188 43562 100 -1
-De 15 0 18 0 800
+De 15 0 17 0 800
 Po 0 49188 43562 48500 44250 100 -1
-De 15 0 18 0 400
+De 15 0 17 0 400
 Po 0 49503 43758 49850 43758 100 -1
-De 15 0 18 0 800
+De 15 0 17 0 800
 Po 0 49850 43758 49850 43714 100 -1
-De 15 0 18 0 0
+De 15 0 17 0 0
 Po 0 49503 43955 49745 43955 100 -1
-De 15 0 18 0 800
+De 15 0 17 0 800
 Po 0 49864 43714 49850 43714 100 -1
-De 15 0 18 0 0
+De 15 0 17 0 0
 Po 0 49850 43714 50050 43714 100 -1
-De 15 0 18 0 400
+De 15 0 17 0 400
 Po 0 49850 43700 49864 43714 100 -1
-De 15 0 18 0 0
+De 15 0 17 0 0
 Po 0 49850 43850 49850 43700 100 -1
-De 15 0 18 0 0
+De 15 0 17 0 0
 Po 0 49745 43955 49850 43850 100 -1
-De 15 0 18 0 0
+De 15 0 17 0 0
 Po 0 50050 44614 50536 44614 100 -1
-De 15 0 18 0 800
+De 15 0 17 0 800
 Po 0 50536 44614 50550 44600 100 -1
-De 15 0 18 0 0
+De 15 0 17 0 0
 Po 3 50550 44600 50550 44600 300 -1
-De 15 1 18 0 0
+De 15 1 17 0 0
 Po 0 50550 44600 51200 44600 100 -1
-De 0 0 18 0 0
+De 0 0 17 0 0
 Po 3 51200 44600 51200 44600 300 -1
-De 15 1 18 0 0
+De 15 1 17 0 0
 Po 0 51200 44600 51214 44614 100 -1
-De 15 0 18 0 0
+De 15 0 17 0 0
 Po 0 51214 44614 51214 45168 100 -1
-De 15 0 18 0 400
+De 15 0 17 0 400
 Po 0 50514 46650 50514 46104 100 -1
-De 15 0 18 0 800
+De 15 0 17 0 800
 Po 0 50514 46104 50586 46032 100 -1
-De 15 0 18 0 400
+De 15 0 17 0 400
 Po 0 51793 50700 51793 49157 100 -1
-De 15 0 18 0 800
+De 15 0 17 0 800
 Po 0 51793 49157 52100 48850 100 -1
-De 15 0 18 0 400
+De 15 0 17 0 400
 Po 0 47454 48850 47454 49296 100 -1
-De 15 0 18 0 800
+De 15 0 17 0 800
 Po 0 47454 49296 47307 49443 100 -1
-De 15 0 18 0 0
+De 15 0 17 0 0
 Po 0 47307 49443 47307 50700 100 -1
-De 15 0 18 0 400
+De 15 0 17 0 400
 Po 0 48164 48850 48164 49629 100 -1
-De 15 0 18 0 800
+De 15 0 17 0 800
 Po 0 48164 49629 48173 49638 100 -1
-De 15 0 18 0 400
+De 15 0 17 0 400
 Po 0 47454 48850 48164 48850 100 -1
-De 15 0 18 0 C00
+De 15 0 17 0 C00
 Po 0 50914 47750 50914 48250 100 -1
-De 15 0 18 0 C00
+De 15 0 17 0 C00
 Po 0 50914 48850 50300 48850 100 -1
-De 15 0 18 0 800
+De 15 0 17 0 800
 Po 0 50300 48850 49686 48850 100 -1
-De 15 0 18 0 400
+De 15 0 17 0 400
 Po 0 47497 44152 47208 44152 100 -1
-De 15 0 18 0 800
+De 15 0 17 0 800
 Po 0 46970 43914 46900 43914 100 -1
-De 15 0 18 0 400
+De 15 0 17 0 400
 Po 0 47208 44152 46970 43914 100 -1
-De 15 0 18 0 0
+De 15 0 17 0 0
 Po 0 48598 45253 48598 44348 100 -1
-De 15 0 18 0 800
+De 15 0 17 0 800
 Po 0 48598 44348 48500 44250 100 -1
-De 15 0 18 0 400
+De 15 0 17 0 400
 Po 0 47756 47890 47490 47890 80 -1
-De 15 0 19 0 800
+De 15 0 18 0 800
 Po 0 47350 47750 47186 47750 80 -1
-De 15 0 19 0 400
+De 15 0 18 0 400
 Po 0 47490 47890 47350 47750 80 -1
-De 15 0 19 0 0
+De 15 0 18 0 0
 Po 0 46814 47750 46814 47786 80 -1
-De 15 0 20 0 800
+De 15 0 19 0 800
 Po 0 46700 48704 46846 48850 80 -1
-De 15 0 20 0 400
+De 15 0 19 0 400
 Po 0 46700 47900 46700 48704 80 -1
-De 15 0 20 0 0
+De 15 0 19 0 0
 Po 0 46814 47786 46700 47900 80 -1
-De 15 0 20 0 0
+De 15 0 19 0 0
+Po 0 48464 41750 48286 41750 80 -1
+De 15 0 20 0 800
+Po 0 48286 41750 47986 42050 80 -1
+De 15 0 20 0 400
 Po 0 48850 42414 48850 42019 80 -1
 De 15 0 21 0 800
 Po 0 48850 42019 48836 42005 80 -1
@@ -2369,137 +2346,133 @@ Po 0 48450 42414 48450 42019 80 -1
 De 15 0 22 0 800
 Po 0 48450 42019 48464 42005 80 -1
 De 15 0 22 0 400
-Po 0 49503 44152 49984 44152 80 -1
+Po 0 47497 44545 47245 44545 80 -1
 De 15 0 23 0 800
-Po 0 49984 44152 50050 44086 80 -1
+Po 0 47150 44450 47150 44348 80 -1
+De 15 0 23 0 0
+Po 0 47245 44545 47150 44450 80 -1
+De 15 0 23 0 0
+Po 0 47497 44348 47150 44348 80 -1
+De 15 0 23 0 800
+Po 0 47150 44348 46962 44348 80 -1
+De 15 0 23 0 0
+Po 0 46962 44348 46900 44286 80 -1
 De 15 0 23 0 400
 Po 0 47576 39411 47576 39590 180 -1
 De 15 0 24 0 800
 Po 0 47576 39590 47600 39614 180 -1
 De 15 0 24 0 400
-Po 0 51214 46032 51214 46322 80 -1
-De 15 0 25 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
-De 15 0 27 0 800
-Po 0 48286 41750 47986 42050 80 -1
-De 15 0 27 0 400
 Po 0 50586 45168 50232 45168 80 -1
-De 15 0 28 0 800
+De 15 0 25 0 800
 Po 0 50232 45168 50050 44986 80 -1
-De 15 0 28 0 400
+De 15 0 25 0 400
 Po 0 49503 44742 49742 44742 80 -1
-De 15 0 28 0 800
+De 15 0 25 0 800
 Po 0 49986 44986 50050 44986 80 -1
-De 15 0 28 0 400
+De 15 0 25 0 400
 Po 0 49742 44742 49986 44986 80 -1
-De 15 0 28 0 0
+De 15 0 25 0 0
+Po 0 49503 44152 49984 44152 80 -1
+De 15 0 26 0 800
+Po 0 49984 44152 50050 44086 80 -1
+De 15 0 26 0 400
+Po 0 51214 46032 51214 46322 80 -1
+De 15 0 27 0 800
+Po 0 51214 46322 50886 46650 80 -1
+De 15 0 27 0 400
+Po 0 49503 44938 49588 44938 80 -1
+De 15 0 27 0 800
+Po 0 51214 45914 51214 46032 80 -1
+De 15 0 27 0 400
+Po 0 50900 45600 51214 45914 80 -1
+De 15 0 27 0 0
+Po 0 50250 45600 50900 45600 80 -1
+De 15 0 27 0 0
+Po 0 49588 44938 50250 45600 80 -1
+De 15 0 27 0 0
 Po 0 52100 46850 52100 47400 100 -1
-De 0 0 29 0 0
+De 0 0 28 0 0
 Po 0 50050 48000 50350 47700 100 -1
-De 0 0 29 0 0
+De 0 0 28 0 0
 Po 0 50350 47700 51250 47700 100 -1
-De 0 0 29 0 0
+De 0 0 28 0 0
 Po 0 52100 46850 52100 44300 100 -1
-De 0 0 29 0 0
+De 0 0 28 0 0
 Po 0 52100 44300 51850 44050 100 -1
-De 0 0 29 0 0
+De 0 0 28 0 0
 Po 0 51850 44050 51100 44050 100 -1
-De 0 0 29 0 0
+De 0 0 28 0 0
 Po 0 50550 44086 51064 44086 100 -1
-De 15 0 29 0 800
+De 15 0 28 0 800
 Po 0 51100 44050 51064 44086 100 -1
-De 15 0 29 0 0
+De 15 0 28 0 0
 Po 3 51100 44050 51100 44050 300 -1
-De 15 1 29 0 0
+De 15 1 28 0 0
 Po 0 50050 48000 50050 48450 100 -1
-De 0 0 29 0 0
+De 0 0 28 0 0
 Po 0 51800 47700 51250 47700 100 -1
-De 0 0 29 0 0
+De 0 0 28 0 0
 Po 0 52100 47400 51800 47700 100 -1
-De 0 0 29 0 0
+De 0 0 28 0 0
 Po 0 49093 48600 49950 48600 100 -1
-De 15 0 29 0 0
+De 15 0 28 0 0
 Po 0 50100 48450 50300 48450 100 -1
-De 15 0 29 0 0
+De 15 0 28 0 0
 Po 0 49950 48600 50100 48450 100 -1
-De 15 0 29 0 0
+De 15 0 28 0 0
 Po 0 49503 44348 50288 44348 100 -1
-De 15 0 29 0 800
+De 15 0 28 0 800
 Po 0 50288 44348 50550 44086 100 -1
-De 15 0 29 0 400
+De 15 0 28 0 400
 Po 0 46700 48350 46700 44900 100 -1
-De 0 0 29 0 0
+De 0 0 28 0 0
 Po 0 49650 48450 50050 48450 100 -1
-De 0 0 29 0 0
+De 0 0 28 0 0
 Po 0 49150 48450 49650 48450 100 -1
-De 0 0 29 0 0
+De 0 0 28 0 0
 Po 3 46900 44700 46900 44700 300 -1
-De 15 1 29 0 0
+De 15 1 28 0 0
 Po 0 46900 44700 46700 44900 100 -1
-De 0 0 29 0 0
+De 0 0 28 0 0
 Po 0 47050 48700 46700 48350 100 -1
-De 0 0 29 0 0
+De 0 0 28 0 0
 Po 0 48900 48700 47050 48700 100 -1
-De 0 0 29 0 0
+De 0 0 28 0 0
 Po 0 49150 48450 48900 48700 100 -1
-De 0 0 29 0 0
+De 0 0 28 0 0
 Po 3 50300 48450 50300 48450 300 -1
-De 15 1 29 0 0
+De 15 1 28 0 0
 Po 0 50050 48450 50300 48450 100 -1
-De 0 0 29 0 0
+De 0 0 28 0 0
 Po 0 51286 48850 51286 48736 100 -1
-De 15 0 29 0 800
+De 15 0 28 0 800
 Po 0 50400 48550 50300 48450 100 -1
-De 15 0 29 0 0
+De 15 0 28 0 0
 Po 0 51100 48550 50400 48550 100 -1
-De 15 0 29 0 0
+De 15 0 28 0 0
 Po 0 51286 48736 51100 48550 100 -1
-De 15 0 29 0 0
+De 15 0 28 0 0
 Po 0 49093 48244 49093 48600 100 -1
-De 15 0 29 0 800
+De 15 0 28 0 800
 Po 0 48896 48244 48896 48546 100 -1
-De 15 0 29 0 800
+De 15 0 28 0 800
 Po 0 48950 48600 49093 48600 100 -1
-De 15 0 29 0 0
+De 15 0 28 0 0
 Po 0 48896 48546 48950 48600 100 -1
-De 15 0 29 0 0
+De 15 0 28 0 0
 Po 0 47497 44742 47192 44742 100 -1
-De 15 0 29 0 800
+De 15 0 28 0 800
 Po 0 47192 44742 47150 44700 100 -1
-De 15 0 29 0 0
+De 15 0 28 0 0
 Po 0 47150 44700 46900 44700 100 -1
-De 15 0 29 0 0
+De 15 0 28 0 0
 Po 0 46900 44700 46900 45114 100 -1
-De 15 0 29 0 400
+De 15 0 28 0 400
 $EndTRACK
 $ZONE
 $EndZONE
 $CZONE_OUTLINE
-ZInfo 4CF82A24 18 "AGND"
+ZInfo 4CF82A24 17 "AGND"
 ZLayer 0
 ZAux 8 E
 ZClearance 100 T
@@ -2611,7 +2584,7 @@ $FILLSEGMENTS
 $endFILLSEGMENTS
 $endCZONE_OUTLINE
 $CZONE_OUTLINE
-ZInfo 4CF82AAB 18 "AGND"
+ZInfo 4CF82AAB 17 "AGND"
 ZLayer 0
 ZAux 5 E
 ZClearance 100 T
@@ -2668,7 +2641,7 @@ $FILLSEGMENTS
 $endFILLSEGMENTS
 $endCZONE_OUTLINE
 $CZONE_OUTLINE
-ZInfo 4CF82B26 18 "AGND"
+ZInfo 4CF82B26 17 "AGND"
 ZLayer 0
 ZAux 10 E
 ZClearance 100 T
@@ -2732,7 +2705,7 @@ $FILLSEGMENTS
 $endFILLSEGMENTS
 $endCZONE_OUTLINE
 $CZONE_OUTLINE
-ZInfo 4CF82B8A 18 "AGND"
+ZInfo 4CF82B8A 17 "AGND"
 ZLayer 0
 ZAux 11 E
 ZClearance 100 T
@@ -2898,25 +2871,62 @@ $POLYSCORNERS
 49000 45120 0 0
 49000 43750 0 0
 48329 43750 0 0
-47790 43211 0 0
-47790 45050 0 0
-47776 45123 0 0
-47734 45185 0 0
-47490 45428 0 0
-47490 45971 0 0
-47684 46165 0 0
-47726 46227 0 0
-47740 46300 0 0
-47740 46750 0 0
-47726 46823 0 0
-47684 46884 0 0
-47299 47269 0 0
-47299 47310 0 0
-47253 47420 0 0
-47169 47504 0 0
-47059 47549 0 0
-46940 47549 0 0
-46900 47532 0 0
+47079 42500 0 0
+46500 42500 0 0
+46500 44900 0 0
+46515 44823 0 0
+46559 44759 0 0
+46601 44716 0 0
+46601 44640 0 0
+46647 44530 0 0
+46731 44446 0 0
+46841 44401 0 0
+46960 44401 0 0
+47010 44421 0 0
+47010 43778 0 0
+46930 43699 0 0
+46840 43699 0 0
+46730 43653 0 0
+46646 43569 0 0
+46601 43459 0 0
+46601 43340 0 0
+46647 43230 0 0
+46701 43174 0 0
+46646 43119 0 0
+46601 43009 0 0
+46601 42890 0 0
+46647 42780 0 0
+46731 42696 0 0
+46841 42651 0 0
+46960 42651 0 0
+47070 42697 0 0
+47154 42781 0 0
+47199 42891 0 0
+47199 42981 0 0
+47534 43316 0 0
+47576 43377 0 0
+47590 43450 0 0
+47590 44950 0 0
+47576 45023 0 0
+47534 45085 0 0
+47290 45328 0 0
+47290 46251 0 0
+47310 46251 0 0
+47420 46297 0 0
+47504 46381 0 0
+47549 46491 0 0
+47549 46610 0 0
+47503 46720 0 0
+47419 46804 0 0
+47309 46849 0 0
+47281 46849 0 0
+47299 46891 0 0
+47299 47010 0 0
+47253 47120 0 0
+47169 47204 0 0
+47059 47249 0 0
+46940 47249 0 0
+46900 47232 0 0
 46900 48267 0 0
 47132 48500 1 0
 $endPOLYSCORNERS
@@ -3084,78 +3094,115 @@ $FILLSEGMENTS
 46500 51570 46685 51570
 47928 51570 51171 51570
 52414 51570 52600 51570
-47790 43211 47790 43211
-47790 43291 47870 43291
-47790 43371 47950 43371
-47790 43451 48030 43451
-47790 43531 48110 43531
-47790 43611 48190 43611
-47790 43691 48270 43691
-47790 43771 49000 43771
-47790 43851 49000 43851
-47790 43931 49000 43931
-47790 44011 49000 44011
-47790 44091 49000 44091
-47790 44171 49000 44171
-47790 44251 49000 44251
-47790 44331 49000 44331
-47790 44411 49000 44411
-47790 44491 49000 44491
-47790 44571 49000 44571
-47790 44651 49000 44651
-47790 44731 49000 44731
-47790 44811 49000 44811
-47790 44891 49000 44891
-47790 44971 49000 44971
-47789 45051 49000 45051
-47770 45131 49011 45131
-47707 45211 49091 45211
-47627 45291 49171 45291
-47547 45371 49251 45371
-47490 45451 49331 45451
-47490 45531 49218 45531
-47490 45611 49116 45611
-47490 45691 49072 45691
-47490 45771 49051 45771
-47490 45851 49051 45851
-47490 45931 49080 45931
-47530 46011 49138 46011
-47610 46091 49160 46091
-47689 46171 49160 46171
-47731 46251 49160 46251
-47740 46331 49160 46331
-47740 46411 49162 46411
-47740 46491 49186 46491
-47740 46571 49253 46571
-47740 46651 49333 46651
-47740 46731 49413 46731
-47728 46811 49493 46811
-47677 46891 49573 46891
-47597 46971 49653 46971
-47517 47051 49660 47051
-47437 47131 49660 47131
-47357 47211 49660 47211
-47299 47291 49660 47291
-47273 47371 49660 47371
-47222 47451 49660 47451
-47103 47531 49660 47531
-46900 47611 49660 47611
-46900 47691 49660 47691
-46900 47771 49660 47771
-46900 47851 49660 47851
-46900 47931 49600 47931
-46900 48011 47417 48011
-47584 48011 49520 48011
-46900 48091 47286 48091
-46900 48171 47230 48171
-46900 48251 47201 48251
-46964 48331 47201 48331
-47044 48411 47222 48411
-47124 48491 47268 48491
+46500 42500 47079 42500
+46500 42580 47159 42580
+46500 42660 46819 42660
+46982 42660 47239 42660
+46500 42740 46687 42740
+47113 42740 47319 42740
+46500 42820 46631 42820
+47170 42820 47399 42820
+46500 42900 46601 42900
+47199 42900 47479 42900
+46500 42980 46601 42980
+47199 42980 47559 42980
+46500 43060 46621 43060
+47278 43060 47639 43060
+46500 43140 46667 43140
+47358 43140 47719 43140
+46500 43220 46657 43220
+47438 43220 47799 43220
+46500 43300 46618 43300
+47518 43300 47879 43300
+46500 43380 46601 43380
+47577 43380 47959 43380
+46500 43460 46601 43460
+47590 43460 48039 43460
+46500 43540 46634 43540
+47590 43540 48119 43540
+46500 43620 46697 43620
+47590 43620 48199 43620
+46500 43700 46931 43700
+47590 43700 48279 43700
+46500 43780 47010 43780
+47590 43780 49000 43780
+46500 43860 47010 43860
+47590 43860 49000 43860
+46500 43940 47010 43940
+47590 43940 49000 43940
+46500 44020 47010 44020
+47590 44020 49000 44020
+46500 44100 47010 44100
+47590 44100 49000 44100
+46500 44180 47010 44180
+47590 44180 49000 44180
+46500 44260 47010 44260
+47590 44260 49000 44260
+46500 44340 47010 44340
+47590 44340 49000 44340
+46500 44420 46795 44420
+47008 44420 47010 44420
+47590 44420 49000 44420
+46500 44500 46677 44500
+47590 44500 49000 44500
+46500 44580 46627 44580
+47590 44580 49000 44580
+46500 44660 46601 44660
+47590 44660 49000 44660
+46500 44740 46578 44740
+47590 44740 49000 44740
+46500 44820 46518 44820
+47590 44820 49000 44820
+47590 44900 49000 44900
+47584 44980 49000 44980
+47550 45060 49000 45060
+47478 45140 49020 45140
+47398 45220 49100 45220
+47318 45300 49180 45300
+47290 45380 49260 45380
+47290 45460 49340 45460
+47290 45540 49196 45540
+47290 45620 49107 45620
+47290 45700 49068 45700
+47290 45780 49051 45780
+47290 45860 49051 45860
+47290 45940 49084 45940
+47290 46020 49147 46020
+47290 46100 49160 46100
+47290 46180 49160 46180
+47332 46260 49160 46260
+47463 46340 49160 46340
+47520 46420 49163 46420
+47549 46500 49192 46500
+47549 46580 49262 46580
+47528 46660 49342 46660
+47483 46740 49422 46740
+47379 46820 49502 46820
+47299 46900 49582 46900
+47299 46980 49660 46980
+47278 47060 49660 47060
+47233 47140 49660 47140
+47129 47220 49660 47220
+46900 47300 49660 47300
+46900 47380 49660 47380
+46900 47460 49660 47460
+46900 47540 49660 47540
+46900 47620 49660 47620
+46900 47700 49660 47700
+46900 47780 49660 47780
+46900 47860 49660 47860
+46900 47940 49591 47940
+46900 48020 47395 48020
+47606 48020 49511 48020
+46900 48100 47277 48100
+46900 48180 47227 48180
+46900 48260 47201 48260
+46973 48340 47201 48340
+47053 48420 47225 48420
 $endFILLSEGMENTS
 $endCZONE_OUTLINE
 $CZONE_OUTLINE
-ZInfo 4CF83175 18 "AGND"
+ZInfo 4CF83175 17 "AGND"
 ZLayer 15
 ZAux 8 E
 ZClearance 100 T
@@ -3264,7 +3311,17 @@ $POLYSCORNERS
 49295 42821 0 0
 49386 42859 0 0
 49456 42929 1 0
-48183 42870 0 0
+47980 42886 0 0
+48007 42859 0 0
+48016 42855 0 1
+48016 42821 0 0
+48098 42820 0 0
+48096 42821 0 0
+48016 42821 0 1
+48016 42855 0 0
+48096 42821 0 0
+48116 42821 0 0
+48183 42849 0 0
 48183 42821 0 0
 48116 42821 0 0
 48115 42820 0 0
@@ -3366,14 +3423,14 @@ $POLYSCORNERS
 47570 42356 0 0
 47508 42418 0 1
 47508 42588 0 0
-47630 42710 0 0
-47900 42710 0 0
-47973 42724 0 0
-48034 42766 0 0
-48092 42823 0 0
-48098 42821 0 0
-48116 42821 0 0
-48164 42869 1 0
+47794 42874 0 0
+47810 42859 0 0
+47901 42821 0 0
+47919 42821 0 0
+47918 42820 0 0
+48000 42821 0 0
+47919 42821 0 0
+47980 42882 1 0
 $endPOLYSCORNERS
 $FILLSEGMENTS
 47823 39350 52600 39350
@@ -3488,12 +3545,14 @@ $FILLSEGMENTS
 47390 42470 48183 42470
 47470 42550 48190 42550
 47550 42630 48199 42630
-47900 42710 48183 42710
-48059 42790 48183 42790
+47630 42710 48183 42710
+47710 42790 48183 42790
+47790 42870 47799 42870
+47968 42870 47996 42870
 $endFILLSEGMENTS
 $endCZONE_OUTLINE
 $CZONE_OUTLINE
-ZInfo 4CF83195 18 "AGND"
+ZInfo 4CF83195 17 "AGND"
 ZLayer 15
 ZAux 5 E
 ZClearance 100 T
@@ -3574,7 +3633,7 @@ $FILLSEGMENTS
 $endFILLSEGMENTS
 $endCZONE_OUTLINE
 $CZONE_OUTLINE
-ZInfo 4CF831BB 18 "AGND"
+ZInfo 4CF831BB 17 "AGND"
 ZLayer 15
 ZAux 12 E
 ZClearance 100 T
diff --git a/atusb/atusb.pro b/atusb/atusb.pro
index 8d96cfb..a64d16d 100644
--- a/atusb/atusb.pro
+++ b/atusb/atusb.pro
@@ -1,4 +1,4 @@
-update=Thu Dec  2 17:34:14 2010
+update=Tue Jan  4 01:05:08 2011
 last_client=pcbnew
 [eeschema]
 version=1
@@ -39,7 +39,7 @@ ShowSheetReferenceAndTitleBlock=1
 LibName1=power
 LibName2=device
 LibName3=conn
-LibName4=../components/at86rf230
+LibName4=../components/at86rf231
 LibName5=../components/c8051f326
 LibName6=../components/usb_a_plug
 LibName7=../components/xtal-4
diff --git a/atusb/atusb.sch b/atusb/atusb.sch
index 328e7cf..247ca34 100644
--- a/atusb/atusb.sch
+++ b/atusb/atusb.sch
@@ -1,8 +1,8 @@
-EESchema Schematic File Version 2  date Thu Dec  2 22:05:04 2010
+EESchema Schematic File Version 2  date Tue Jan  4 00:55:48 2011
 LIBS:power
 LIBS:device
 LIBS:conn
-LIBS:at86rf230
+LIBS:at86rf231
 LIBS:c8051f326
 LIBS:usb_a_plug
 LIBS:xtal-4
@@ -13,17 +13,28 @@ EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267
 Sheet 1 3
-Title "IEEE 802.15.4 USB Transceiver (AT86RF230)"
-Date "1 dec 2010"
-Rev "101202"
+Title "IEEE 802.15.4 USB Transceiver (AT86RF231)"
+Date "4 jan 2011"
+Rev "20110104"
 Comp "Werner Almesberger"
 Comment1 ""
 Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Wire Wire Line
-	4350 5050 7350 5050
+$Sheet
+S 2300 3400 2050 2050
+U 4C609BEF
+F0 "USB" 60
+F1 "usb.sch" 60
+F2 "nRST_RF" O R 4350 4700 60 
+F3 "SLP_TR" O R 4350 4850 60 
+F4 "IRQ_RF" I R 4350 4500 60 
+F5 "nSS" O R 4350 4300 60 
+F6 "SCLK" O R 4350 4150 60 
+F7 "MOSI" O R 4350 3850 60 
+F8 "MISO" I R 4350 4000 60 
+$EndSheet
 Wire Wire Line
 	7350 4850 4350 4850
 Wire Wire Line
@@ -61,20 +72,6 @@ $EndComp
 Text Notes 900  1250 0    200  ~ 40
 IEEE 802.15.4 USB TXRX
 $Sheet
-S 2300 3400 2050 2050
-U 4C609BEF
-F0 "USB" 60
-F1 "usb.sch" 60
-F2 "nRST_RF" O R 4350 4700 60 
-F3 "SLP_TR" O R 4350 4850 60 
-F4 "IRQ_RF" I R 4350 4500 60 
-F5 "nSS" O R 4350 4300 60 
-F6 "SCLK" O R 4350 4150 60 
-F7 "MOSI" O R 4350 3850 60 
-F8 "MISO" I R 4350 4000 60 
-F9 "TST" O R 4350 5050 60 
-$EndSheet
-$Sheet
 S 7350 3450 1800 1950
 U 4C609C08
 F0 "RF" 60
@@ -86,6 +83,5 @@ F5 "MISO" O L 7350 4000 60
 F6 "MOSI" I L 7350 3850 60 
 F7 "nSS" I L 7350 4300 60 
 F8 "IRQ_RF" O L 7350 4500 60 
-F9 "TST" I L 7350 5050 60 
 $EndSheet
 $EndSCHEMATC
diff --git a/atusb/usb.sch b/atusb/usb.sch
index d0e8f44..fe026e5 100644
--- a/atusb/usb.sch
+++ b/atusb/usb.sch
@@ -1,8 +1,8 @@
-EESchema Schematic File Version 2  date Mon Jan  3 16:32:06 2011
+EESchema Schematic File Version 2  date Tue Jan  4 00:55:48 2011
 LIBS:power
 LIBS:device
 LIBS:conn
-LIBS:at86rf230
+LIBS:at86rf231
 LIBS:c8051f326
 LIBS:usb_a_plug
 LIBS:xtal-4
@@ -14,14 +14,15 @@ EELAYER END
 $Descr A4 11700 8267
 Sheet 2 3
 Title "IEEE 802.15.4 USB Transceiver (AT86RF230)"
-Date "3 jan 2011"
-Rev "101130"
+Date "4 jan 2011"
+Rev "20110104"
 Comp "Werner Almesberger"
 Comment1 ""
 Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
+NoConn ~ 7200 1800
 Text Notes 2600 5000 0    60   ~ 0
 USB 2.0 limits the capacitative load\non full-speed drivers to 50 pF.
 Wire Notes Line
@@ -139,10 +140,6 @@ 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
 Wire Notes Line
@@ -183,8 +180,6 @@ F 1 "USB_A_PLUG " H 1750 2750 60  0000 C CNN
 $EndComp
 Text Notes 5750 6700 0    60   ~ 0
 Space P11 through P14 at 100 mil interval close to board edge\nto allow use with a 0.1" header soldered to the board.
-Text HLabel 9800 1150 2    60   Output ~ 0
-TST
 Text Label 2550 3200 0    60   ~ 0
 D+
 Text Label 2550 3050 0    60   ~ 0