From a9aac8e18f54a2f37c5539afb775d56983853285 Mon Sep 17 00:00:00 2001
From: Michael Ossmann <mike@ossmann.com>
Date: Mon, 27 Aug 2012 22:38:00 -0600
Subject: [PATCH] bom info, extra amp

---
 hardware/jawbreaker/baseband.sch         | 725 ++++++++++++-----------
 hardware/jawbreaker/frontend.sch         | 684 ++++++++++++---------
 hardware/jawbreaker/jawbreaker-cache.lib |   2 +-
 hardware/jawbreaker/jawbreaker.sch       |   4 +-
 hardware/jawbreaker/mcu.sch              | 460 +++++++-------
 5 files changed, 1008 insertions(+), 867 deletions(-)

diff --git a/hardware/jawbreaker/baseband.sch b/hardware/jawbreaker/baseband.sch
index bf266fda..38efd766 100644
--- a/hardware/jawbreaker/baseband.sch
+++ b/hardware/jawbreaker/baseband.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Mon Aug 27 12:18:28 2012
+EESchema Schematic File Version 2  date Mon Aug 27 22:37:01 2012
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -35,9 +35,9 @@ EELAYER 25  0
 EELAYER END
 $Descr User 17000 11000
 encoding utf-8
-Sheet 2 4
+Sheet 3 4
 Title "jawbreaker baseband"
-Date "27 aug 2012"
+Date "28 aug 2012"
 Rev ""
 Comp "Copyright 2012 Michael Ossmann"
 Comment1 "License: GPL v2"
@@ -45,6 +45,262 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
+$Comp
+L R R?
+U 1 1 503C4AC5
+P 2500 7600
+F 0 "R?" V 2580 7600 50  0000 C CNN
+F 1 "4k7" V 2500 7600 50  0000 C CNN
+F 4 "Stackpole" H 2500 7600 60  0001 C CNN "Manufacturer"
+F 5 "RMCF0402JT4K70" H 2500 7600 60  0001 C CNN "Part Number"
+F 6 "RES 4.7K OHM 1/16W 5% 0402 SMD" H 2500 7600 60  0001 C CNN "Description"
+	1    2500 7600
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R?
+U 1 1 503C4ABC
+P 9100 5850
+F 0 "R?" V 9180 5850 50  0000 C CNN
+F 1 "4k7" V 9100 5850 50  0000 C CNN
+F 4 "Stackpole" H 9100 5850 60  0001 C CNN "Manufacturer"
+F 5 "RMCF0402JT4K70" H 9100 5850 60  0001 C CNN "Part Number"
+F 6 "RES 4.7K OHM 1/16W 5% 0402 SMD" H 9100 5850 60  0001 C CNN "Description"
+	1    9100 5850
+	-1   0    0    1   
+$EndComp
+$Comp
+L R R?
+U 1 1 503C4AB0
+P 4750 9200
+F 0 "R?" V 4830 9200 50  0000 C CNN
+F 1 "4k7" V 4750 9200 50  0000 C CNN
+F 4 "Stackpole" H 4750 9200 60  0001 C CNN "Manufacturer"
+F 5 "RMCF0402JT4K70" H 4750 9200 60  0001 C CNN "Part Number"
+F 6 "RES 4.7K OHM 1/16W 5% 0402 SMD" H 4750 9200 60  0001 C CNN "Description"
+	1    4750 9200
+	0    1    1    0   
+$EndComp
+$Comp
+L C C?
+U 1 1 503C4A4B
+P 4350 1300
+F 0 "C?" H 4400 1400 50  0000 L CNN
+F 1 "10nF" H 4400 1200 50  0000 L CNN
+F 4 "Murata" H 10750 50  60  0001 C CNN "Manufacturer"
+F 5 "GRM155R71C103KA01D" H 10750 50  60  0001 C CNN "Part Number"
+F 6 "CAP CER 10000PF 16V 10% X7R 0402" H 10750 50  60  0001 C CNN "Description"
+	1    4350 1300
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 503C4A4A
+P 4050 1300
+F 0 "C?" H 4100 1400 50  0000 L CNN
+F 1 "10nF" H 4100 1200 50  0000 L CNN
+F 4 "Murata" H 10450 50  60  0001 C CNN "Manufacturer"
+F 5 "GRM155R71C103KA01D" H 10450 50  60  0001 C CNN "Part Number"
+F 6 "CAP CER 10000PF 16V 10% X7R 0402" H 10450 50  60  0001 C CNN "Description"
+	1    4050 1300
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 503C4A48
+P 3150 1300
+F 0 "C?" H 3200 1400 50  0000 L CNN
+F 1 "10nF" H 3200 1200 50  0000 L CNN
+F 4 "Murata" H 9550 50  60  0001 C CNN "Manufacturer"
+F 5 "GRM155R71C103KA01D" H 9550 50  60  0001 C CNN "Part Number"
+F 6 "CAP CER 10000PF 16V 10% X7R 0402" H 9550 50  60  0001 C CNN "Description"
+	1    3150 1300
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 503C4A45
+P 2850 1300
+F 0 "C?" H 2900 1400 50  0000 L CNN
+F 1 "10nF" H 2900 1200 50  0000 L CNN
+F 4 "Murata" H 9250 50  60  0001 C CNN "Manufacturer"
+F 5 "GRM155R71C103KA01D" H 9250 50  60  0001 C CNN "Part Number"
+F 6 "CAP CER 10000PF 16V 10% X7R 0402" H 9250 50  60  0001 C CNN "Description"
+	1    2850 1300
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 503C4A38
+P 2550 1300
+F 0 "C?" H 2600 1400 50  0000 L CNN
+F 1 "10nF" H 2600 1200 50  0000 L CNN
+F 4 "Murata" H 8950 50  60  0001 C CNN "Manufacturer"
+F 5 "GRM155R71C103KA01D" H 8950 50  60  0001 C CNN "Part Number"
+F 6 "CAP CER 10000PF 16V 10% X7R 0402" H 8950 50  60  0001 C CNN "Description"
+	1    2550 1300
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 503C49FB
+P 15550 1250
+F 0 "C?" H 15600 1350 50  0000 L CNN
+F 1 "100nF" H 15600 1150 50  0000 L CNN
+F 4 "Murata" H 15550 1250 60  0001 C CNN "Manufacturer"
+F 5 "GRM155R61A104KA01D" H 15550 1250 60  0001 C CNN "Part Number"
+F 6 "CAP CER 0.1UF 10V 10% X5R 0402" H 15550 1250 60  0001 C CNN "Description"
+	1    15550 1250
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 503C49FA
+P 14950 1250
+F 0 "C?" H 15000 1350 50  0000 L CNN
+F 1 "100nF" H 15000 1150 50  0000 L CNN
+F 4 "Murata" H 14950 1250 60  0001 C CNN "Manufacturer"
+F 5 "GRM155R61A104KA01D" H 14950 1250 60  0001 C CNN "Part Number"
+F 6 "CAP CER 0.1UF 10V 10% X5R 0402" H 14950 1250 60  0001 C CNN "Description"
+	1    14950 1250
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 503C49F8
+P 14350 1250
+F 0 "C?" H 14400 1350 50  0000 L CNN
+F 1 "100nF" H 14400 1150 50  0000 L CNN
+F 4 "Murata" H 14350 1250 60  0001 C CNN "Manufacturer"
+F 5 "GRM155R61A104KA01D" H 14350 1250 60  0001 C CNN "Part Number"
+F 6 "CAP CER 0.1UF 10V 10% X5R 0402" H 14350 1250 60  0001 C CNN "Description"
+	1    14350 1250
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 503C49F7
+P 13750 1250
+F 0 "C?" H 13800 1350 50  0000 L CNN
+F 1 "100nF" H 13800 1150 50  0000 L CNN
+F 4 "Murata" H 13750 1250 60  0001 C CNN "Manufacturer"
+F 5 "GRM155R61A104KA01D" H 13750 1250 60  0001 C CNN "Part Number"
+F 6 "CAP CER 0.1UF 10V 10% X5R 0402" H 13750 1250 60  0001 C CNN "Description"
+	1    13750 1250
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 503C49F4
+P 13150 1250
+F 0 "C?" H 13200 1350 50  0000 L CNN
+F 1 "100nF" H 13200 1150 50  0000 L CNN
+F 4 "Murata" H 13150 1250 60  0001 C CNN "Manufacturer"
+F 5 "GRM155R61A104KA01D" H 13150 1250 60  0001 C CNN "Part Number"
+F 6 "CAP CER 0.1UF 10V 10% X5R 0402" H 13150 1250 60  0001 C CNN "Description"
+	1    13150 1250
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 503C49F2
+P 12550 1250
+F 0 "C?" H 12600 1350 50  0000 L CNN
+F 1 "100nF" H 12600 1150 50  0000 L CNN
+F 4 "Murata" H 12550 1250 60  0001 C CNN "Manufacturer"
+F 5 "GRM155R61A104KA01D" H 12550 1250 60  0001 C CNN "Part Number"
+F 6 "CAP CER 0.1UF 10V 10% X5R 0402" H 12550 1250 60  0001 C CNN "Description"
+	1    12550 1250
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 503C49DF
+P 11950 1250
+F 0 "C?" H 12000 1350 50  0000 L CNN
+F 1 "100nF" H 12000 1150 50  0000 L CNN
+F 4 "Murata" H 11950 1250 60  0001 C CNN "Manufacturer"
+F 5 "GRM155R61A104KA01D" H 11950 1250 60  0001 C CNN "Part Number"
+F 6 "CAP CER 0.1UF 10V 10% X5R 0402" H 11950 1250 60  0001 C CNN "Description"
+	1    11950 1250
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 503C49D3
+P 14000 8800
+F 0 "C?" H 14050 8900 50  0000 L CNN
+F 1 "100nF" H 14050 8700 50  0000 L CNN
+F 4 "Murata" H 14000 8800 60  0001 C CNN "Manufacturer"
+F 5 "GRM155R61A104KA01D" H 14000 8800 60  0001 C CNN "Part Number"
+F 6 "CAP CER 0.1UF 10V 10% X5R 0402" H 14000 8800 60  0001 C CNN "Description"
+	1    14000 8800
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 503C49CE
+P 12050 8800
+F 0 "C?" H 12100 8900 50  0000 L CNN
+F 1 "100nF" H 12100 8700 50  0000 L CNN
+F 4 "Murata" H 12050 8800 60  0001 C CNN "Manufacturer"
+F 5 "GRM155R61A104KA01D" H 12050 8800 60  0001 C CNN "Part Number"
+F 6 "CAP CER 0.1UF 10V 10% X5R 0402" H 12050 8800 60  0001 C CNN "Description"
+	1    12050 8800
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 503C49CD
+P 11350 8800
+F 0 "C?" H 11400 8900 50  0000 L CNN
+F 1 "100nF" H 11400 8700 50  0000 L CNN
+F 4 "Murata" H 11350 8800 60  0001 C CNN "Manufacturer"
+F 5 "GRM155R61A104KA01D" H 11350 8800 60  0001 C CNN "Part Number"
+F 6 "CAP CER 0.1UF 10V 10% X5R 0402" H 11350 8800 60  0001 C CNN "Description"
+	1    11350 8800
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 503C49CC
+P 10700 8800
+F 0 "C?" H 10750 8900 50  0000 L CNN
+F 1 "100nF" H 10750 8700 50  0000 L CNN
+F 4 "Murata" H 10700 8800 60  0001 C CNN "Manufacturer"
+F 5 "GRM155R61A104KA01D" H 10700 8800 60  0001 C CNN "Part Number"
+F 6 "CAP CER 0.1UF 10V 10% X5R 0402" H 10700 8800 60  0001 C CNN "Description"
+	1    10700 8800
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 503C49AF
+P 10000 8800
+F 0 "C?" H 10050 8900 50  0000 L CNN
+F 1 "100nF" H 10050 8700 50  0000 L CNN
+F 4 "Murata" H 10000 8800 60  0001 C CNN "Manufacturer"
+F 5 "GRM155R61A104KA01D" H 10000 8800 60  0001 C CNN "Part Number"
+F 6 "CAP CER 0.1UF 10V 10% X5R 0402" H 10000 8800 60  0001 C CNN "Description"
+	1    10000 8800
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 503C49A8
+P 3800 6900
+F 0 "C?" H 3850 7000 50  0000 L CNN
+F 1 "100nF" H 3850 6800 50  0000 L CNN
+F 4 "Murata" H 3800 6900 60  0001 C CNN "Manufacturer"
+F 5 "GRM155R61A104KA01D" H 3800 6900 60  0001 C CNN "Part Number"
+F 6 "CAP CER 0.1UF 10V 10% X5R 0402" H 3800 6900 60  0001 C CNN "Description"
+	1    3800 6900
+	1    0    0    -1  
+$EndComp
+Text GLabel 3650 5400 0    60   Input ~ 0
+TX_IF
+Text GLabel 4150 4300 0    60   Input ~ 0
+RX_IF
 Text GLabel 9100 5000 2    40   Input ~ 0
 CS_XCVR
 Text GLabel 15650 4400 2    40   Input ~ 0
@@ -377,28 +633,8 @@ Connection ~ 14650 1450
 Connection ~ 14650 1050
 Connection ~ 14050 1050
 Connection ~ 15250 1450
-Connection ~ 3450 4800
 Wire Wire Line
-	3450 4900 3450 4800
-Wire Wire Line
-	3450 4800 3450 4700
-Wire Wire Line
-	3450 4700 3450 4600
-Wire Wire Line
-	3450 4600 3450 4500
-Connection ~ 3450 4600
-Wire Wire Line
-	4250 4300 4050 4300
-Connection ~ 3050 5700
-Wire Wire Line
-	3050 5600 3050 5700
-Wire Wire Line
-	3050 5700 3050 5800
-Wire Wire Line
-	3050 5800 3050 5900
-Wire Wire Line
-	3050 5900 3050 6000
-Connection ~ 3050 5900
+	4250 4300 4150 4300
 Wire Wire Line
 	5150 5600 5050 5600
 Wire Wire Line
@@ -689,10 +925,8 @@ Wire Wire Line
 Wire Wire Line
 	4350 1100 4650 1100
 Connection ~ 4350 1100
-Connection ~ 3050 5800
 Wire Wire Line
 	3650 5400 3750 5400
-Connection ~ 3450 4700
 Wire Wire Line
 	10900 5900 10900 6000
 Wire Wire Line
@@ -972,28 +1206,28 @@ Wire Notes Line
 Text Notes 13250 7500 0    40   ~ 0
 Use 0 ohm resistors to select MAX5864 I/O voltage.
 $Comp
-L VCC #PWR155
+L VCC #PWR153
 U 1 1 5037BA6B
 P 14150 7800
-F 0 "#PWR155" H 14150 7900 30  0001 C CNN
+F 0 "#PWR153" H 14150 7900 30  0001 C CNN
 F 1 "VCC" H 14150 7900 30  0000 C CNN
 	1    14150 7800
 	1    0    0    -1  
 $EndComp
 $Comp
-L 1V8 #PWR154
+L 1V8 #PWR152
 U 1 1 5037BA6A
 P 13850 7800
-F 0 "#PWR154" H 13850 7940 20  0001 C CNN
+F 0 "#PWR152" H 13850 7940 20  0001 C CNN
 F 1 "1V8" H 13850 7910 30  0000 C CNN
 	1    13850 7800
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR162
+L GND #PWR160
 U 1 1 5037BA69
 P 14000 9100
-F 0 "#PWR162" H 14000 9100 30  0001 C CNN
+F 0 "#PWR160" H 14000 9100 30  0001 C CNN
 F 1 "GND" H 14000 9030 30  0001 C CNN
 	1    14000 9100
 	1    0    0    -1  
@@ -1018,28 +1252,28 @@ F 1 "0" V 14150 8150 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR151
+L VCC #PWR149
 U 1 1 5037BA07
 P 11450 7800
-F 0 "#PWR151" H 11450 7900 30  0001 C CNN
+F 0 "#PWR149" H 11450 7900 30  0001 C CNN
 F 1 "VCC" H 11450 7900 30  0000 C CNN
 	1    11450 7800
 	1    0    0    -1  
 $EndComp
 $Comp
-L 1V8 #PWR150
+L 1V8 #PWR148
 U 1 1 5037BA06
 P 11250 7800
-F 0 "#PWR150" H 11250 7940 20  0001 C CNN
+F 0 "#PWR148" H 11250 7940 20  0001 C CNN
 F 1 "1V8" H 11250 7910 30  0000 C CNN
 	1    11250 7800
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR160
+L GND #PWR158
 U 1 1 5037BA05
 P 11350 9100
-F 0 "#PWR160" H 11350 9100 30  0001 C CNN
+F 0 "#PWR158" H 11350 9100 30  0001 C CNN
 F 1 "GND" H 11350 9030 30  0001 C CNN
 	1    11350 9100
 	1    0    0    -1  
@@ -1083,55 +1317,55 @@ F 4 "DNP" V 11850 8150 60  0000 C CNN "Note"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR161
+L GND #PWR159
 U 1 1 5037B9FF
 P 12050 9100
-F 0 "#PWR161" H 12050 9100 30  0001 C CNN
+F 0 "#PWR159" H 12050 9100 30  0001 C CNN
 F 1 "GND" H 12050 9030 30  0001 C CNN
 	1    12050 9100
 	1    0    0    -1  
 $EndComp
 $Comp
-L 1V8 #PWR152
+L 1V8 #PWR150
 U 1 1 5037B9FE
 P 11950 7800
-F 0 "#PWR152" H 11950 7940 20  0001 C CNN
+F 0 "#PWR150" H 11950 7940 20  0001 C CNN
 F 1 "1V8" H 11950 7910 30  0000 C CNN
 	1    11950 7800
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR153
+L VCC #PWR151
 U 1 1 5037B9FD
 P 12150 7800
-F 0 "#PWR153" H 12150 7900 30  0001 C CNN
+F 0 "#PWR151" H 12150 7900 30  0001 C CNN
 F 1 "VCC" H 12150 7900 30  0000 C CNN
 	1    12150 7800
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR149
+L VCC #PWR147
 U 1 1 5037B9EA
 P 10800 7800
-F 0 "#PWR149" H 10800 7900 30  0001 C CNN
+F 0 "#PWR147" H 10800 7900 30  0001 C CNN
 F 1 "VCC" H 10800 7900 30  0000 C CNN
 	1    10800 7800
 	1    0    0    -1  
 $EndComp
 $Comp
-L 1V8 #PWR148
+L 1V8 #PWR146
 U 1 1 5037B9E9
 P 10600 7800
-F 0 "#PWR148" H 10600 7940 20  0001 C CNN
+F 0 "#PWR146" H 10600 7940 20  0001 C CNN
 F 1 "1V8" H 10600 7910 30  0000 C CNN
 	1    10600 7800
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR159
+L GND #PWR157
 U 1 1 5037B9E8
 P 10700 9100
-F 0 "#PWR159" H 10700 9100 30  0001 C CNN
+F 0 "#PWR157" H 10700 9100 30  0001 C CNN
 F 1 "GND" H 10700 9030 30  0001 C CNN
 	1    10700 9100
 	1    0    0    -1  
@@ -1261,6 +1495,7 @@ U 1 1 5037A131
 P 4400 9450
 F 0 "P18" H 4480 9450 40  0000 L CNN
 F 1 "OEB" H 4400 9505 30  0001 C CNN
+F 4 "DNP" H 4400 9450 60  0001 C CNN "Note"
 	1    4400 9450
 	0    1    1    0   
 $EndComp
@@ -1350,10 +1585,10 @@ VDDOC
 Text Notes 2950 9500 0    40   ~ 0
 If trace is cut, a jumper should be used\non P9 at all times when an external\nclock is not connected to P8.
 $Comp
-L GND #PWR163
+L GND #PWR161
 U 1 1 4FA55BA8
 P 14300 9100
-F 0 "#PWR163" H 14300 9100 30  0001 C CNN
+F 0 "#PWR161" H 14300 9100 30  0001 C CNN
 F 1 "GND" H 14300 9030 30  0001 C CNN
 	1    14300 9100
 	1    0    0    -1  
@@ -1365,10 +1600,10 @@ OVDD
 Text Notes 10250 7500 0    40   ~ 0
 Use 0 ohm resistors to select clock output voltage.
 $Comp
-L GND #PWR139
+L GND #PWR137
 U 1 1 4FA55875
 P 3800 7200
-F 0 "#PWR139" H 3800 7200 30  0001 C CNN
+F 0 "#PWR137" H 3800 7200 30  0001 C CNN
 F 1 "GND" H 3800 7130 30  0001 C CNN
 	1    3800 7200
 	1    0    0    -1  
@@ -1380,37 +1615,28 @@ VDDOD
 Text Label 10350 8500 0    40   ~ 0
 VDDOB
 $Comp
-L C C119
-U 1 1 4F5D0705
-P 10000 8800
-F 0 "C119" H 10050 8900 50  0000 L CNN
-F 1 "100nF" H 10050 8700 50  0000 L CNN
-	1    10000 8800
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR158
+L GND #PWR156
 U 1 1 4FA557DB
 P 10000 9100
-F 0 "#PWR158" H 10000 9100 30  0001 C CNN
+F 0 "#PWR156" H 10000 9100 30  0001 C CNN
 F 1 "GND" H 10000 9030 30  0001 C CNN
 	1    10000 9100
 	1    0    0    -1  
 $EndComp
 $Comp
-L 1V8 #PWR146
+L 1V8 #PWR144
 U 1 1 4FA557BE
 P 9900 7800
-F 0 "#PWR146" H 9900 7940 20  0001 C CNN
+F 0 "#PWR144" H 9900 7940 20  0001 C CNN
 F 1 "1V8" H 9900 7910 30  0000 C CNN
 	1    9900 7800
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR147
+L VCC #PWR145
 U 1 1 4FA557B9
 P 10100 7800
-F 0 "#PWR147" H 10100 7900 30  0001 C CNN
+F 0 "#PWR145" H 10100 7900 30  0001 C CNN
 F 1 "VCC" H 10100 7900 30  0000 C CNN
 	1    10100 7800
 	1    0    0    -1  
@@ -1482,10 +1708,10 @@ $EndComp
 Text Notes 6300 9200 0    40   ~ 0
 Install R37 only if 1.8 V\noutput is desired and VDDOA\nis set to VCC.
 $Comp
-L GND #PWR167
+L GND #PWR165
 U 1 1 4FA469EE
 P 6150 9550
-F 0 "#PWR167" H 6150 9550 30  0001 C CNN
+F 0 "#PWR165" H 6150 9550 30  0001 C CNN
 F 1 "GND" H 6150 9480 30  0001 C CNN
 	1    6150 9550
 	1    0    0    -1  
@@ -1550,6 +1776,9 @@ U 1 1 4F5BBC9D
 P 7700 4950
 F 0 "U17" H 7700 5000 60  0000 C CNN
 F 1 "MAX2837" H 7700 4900 60  0000 C CNN
+F 4 "Maxim" H 7700 4950 60  0001 C CNN "Manufacturer"
+F 5 "MAX2837ETM+T" H 7700 4950 60  0001 C CNN "Part Number"
+F 6 "IC TXRX 2.3GHZ-2.7GHZ 48TQFN" H 7700 4950 60  0001 C CNN "Description"
 	1    7700 4950
 	1    0    0    -1  
 $EndComp
@@ -1576,24 +1805,15 @@ F 1 "39" V 8700 10150 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR131
+L GND #PWR129
 U 1 1 4F5D6C22
 P 9100 6200
-F 0 "#PWR131" H 9100 6200 30  0001 C CNN
+F 0 "#PWR129" H 9100 6200 30  0001 C CNN
 F 1 "GND" H 9100 6130 30  0001 C CNN
 	1    9100 6200
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R24
-U 1 1 4F5D6C1A
-P 9100 5850
-F 0 "R24" V 9180 5850 50  0000 C CNN
-F 1 "4k7" V 9100 5850 50  0000 C CNN
-	1    9100 5850
-	1    0    0    -1  
-$EndComp
-$Comp
 L INDUCTOR L8
 U 1 1 4F5D6AFA
 P 5300 5600
@@ -1696,41 +1916,32 @@ CLK4
 Text Label 4400 9000 1    40   ~ 0
 OEB
 $Comp
-L VCC #PWR164
+L VCC #PWR162
 U 1 1 4F5D1968
 P 5100 9200
-F 0 "#PWR164" H 5100 9300 30  0001 C CNN
+F 0 "#PWR162" H 5100 9300 30  0001 C CNN
 F 1 "VCC" H 5100 9300 30  0000 C CNN
 	1    5100 9200
 	0    1    1    0   
 $EndComp
-$Comp
-L R R41
-U 1 1 4F5D195D
-P 4750 9200
-F 0 "R41" V 4830 9200 50  0000 C CNN
-F 1 "4k7" V 4750 9200 50  0000 C CNN
-	1    4750 9200
-	0    1    1    0   
-$EndComp
 Text Label 4500 9000 1    40   ~ 0
 CLK3
 Text Label 4600 9000 1    40   ~ 0
 CLK2
 $Comp
-L GND #PWR166
+L GND #PWR164
 U 1 1 4F5D1728
 P 2400 9450
-F 0 "#PWR166" H 2400 9450 30  0001 C CNN
+F 0 "#PWR164" H 2400 9450 30  0001 C CNN
 F 1 "GND" H 2400 9380 30  0001 C CNN
 	1    2400 9450
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR165
+L GND #PWR163
 U 1 1 4F5D1722
 P 3750 9300
-F 0 "#PWR165" H 3750 9300 30  0001 C CNN
+F 0 "#PWR163" H 3750 9300 30  0001 C CNN
 F 1 "GND" H 3750 9230 30  0001 C CNN
 	1    3750 9300
 	1    0    0    -1  
@@ -1756,19 +1967,19 @@ F 4 "DNP" H 2450 8800 60  0000 C CNN "Note"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR144
+L GND #PWR142
 U 1 1 4F5D0F3F
 P 2950 7700
-F 0 "#PWR144" H 2950 7700 30  0001 C CNN
+F 0 "#PWR142" H 2950 7700 30  0001 C CNN
 F 1 "GND" H 2950 7630 30  0001 C CNN
 	1    2950 7700
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR145
+L GND #PWR143
 U 1 1 4F5D0F39
 P 3150 7700
-F 0 "#PWR145" H 3150 7700 30  0001 C CNN
+F 0 "#PWR143" H 3150 7700 30  0001 C CNN
 F 1 "GND" H 3150 7630 30  0001 C CNN
 	1    3150 7700
 	1    0    0    -1  
@@ -1805,91 +2016,55 @@ F 4 "DNP" H 6450 8150 60  0001 C CNN "Note"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR157
+L GND #PWR155
 U 1 1 4F5D08A9
 P 6750 8150
-F 0 "#PWR157" H 6750 8150 30  0001 C CNN
+F 0 "#PWR155" H 6750 8150 30  0001 C CNN
 F 1 "GND" H 6750 8080 30  0001 C CNN
 	1    6750 8150
 	0    -1   -1   0   
 $EndComp
 $Comp
-L C C120
-U 1 1 4F5D0702
-P 10700 8800
-F 0 "C120" H 10750 8900 50  0000 L CNN
-F 1 "100nF" H 10750 8700 50  0000 L CNN
-	1    10700 8800
-	1    0    0    -1  
-$EndComp
-$Comp
-L C C113
-U 1 1 4F5D0700
-P 3800 6900
-F 0 "C113" H 3850 7000 50  0000 L CNN
-F 1 "100nF" H 3850 6800 50  0000 L CNN
-	1    3800 6900
-	1    0    0    -1  
-$EndComp
-$Comp
-L C C121
-U 1 1 4F5D06FB
-P 11350 8800
-F 0 "C121" H 11400 8900 50  0000 L CNN
-F 1 "100nF" H 11400 8700 50  0000 L CNN
-	1    11350 8800
-	1    0    0    -1  
-$EndComp
-$Comp
-L C C122
-U 1 1 4F5D06F0
-P 12050 8800
-F 0 "C122" H 12100 8900 50  0000 L CNN
-F 1 "100nF" H 12100 8700 50  0000 L CNN
-	1    12050 8800
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR143
+L GND #PWR141
 U 1 1 4F5D067A
 P 3600 7550
-F 0 "#PWR143" H 3600 7550 30  0001 C CNN
+F 0 "#PWR141" H 3600 7550 30  0001 C CNN
 F 1 "GND" H 3600 7480 30  0001 C CNN
 	1    3600 7550
 	0    1    1    0   
 $EndComp
 $Comp
-L VCC #PWR138
+L VCC #PWR136
 U 1 1 4F5D0674
 P 4300 6550
-F 0 "#PWR138" H 4300 6650 30  0001 C CNN
+F 0 "#PWR136" H 4300 6650 30  0001 C CNN
 F 1 "VCC" H 4300 6650 30  0000 C CNN
 	1    4300 6550
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR140
+L VCC #PWR138
 U 1 1 4F5D062E
 P 2100 7250
-F 0 "#PWR140" H 2100 7350 30  0001 C CNN
+F 0 "#PWR138" H 2100 7350 30  0001 C CNN
 F 1 "VCC" H 2100 7350 30  0000 C CNN
 	1    2100 7250
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR141
+L VCC #PWR139
 U 1 1 4F5D062D
 P 2300 7250
-F 0 "#PWR141" H 2300 7350 30  0001 C CNN
+F 0 "#PWR139" H 2300 7350 30  0001 C CNN
 F 1 "VCC" H 2300 7350 30  0000 C CNN
 	1    2300 7250
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR142
+L VCC #PWR140
 U 1 1 4F5D062A
 P 2500 7250
-F 0 "#PWR142" H 2500 7350 30  0001 C CNN
+F 0 "#PWR140" H 2500 7350 30  0001 C CNN
 F 1 "VCC" H 2500 7350 30  0000 C CNN
 	1    2500 7250
 	1    0    0    -1  
@@ -1913,69 +2088,54 @@ F 1 "2k" V 2300 7600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R29
-U 1 1 4F5D05D0
-P 2500 7600
-F 0 "R29" V 2580 7600 50  0000 C CNN
-F 1 "4k7" V 2500 7600 50  0000 C CNN
-	1    2500 7600
-	1    0    0    -1  
-$EndComp
-$Comp
 L SI5351C U19
 U 1 1 4F5D0564
 P 4500 7950
 F 0 "U19" H 4500 8000 60  0000 C CNN
 F 1 "SI5351C" H 4500 7900 60  0000 C CNN
+F 4 "Silicon Laboratories Inc" H 4500 7950 60  0001 C CNN "Manufacturer"
+F 5 "SI5351C-A-GM" H 4500 7950 60  0001 C CNN "Part Number"
+F 6 "IC CLK GEN PLL BLANK CUST 20-QFN" H 4500 7950 60  0001 C CNN "Description"
 	1    4500 7950
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR130
+L GND #PWR128
 U 1 1 4F5CD4D5
 P 11650 6000
-F 0 "#PWR130" H 11650 6000 30  0001 C CNN
+F 0 "#PWR128" H 11650 6000 30  0001 C CNN
 F 1 "GND" H 11650 5930 30  0001 C CNN
 	1    11650 6000
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR129
+L GND #PWR127
 U 1 1 4F5CD4D4
 P 11400 6000
-F 0 "#PWR129" H 11400 6000 30  0001 C CNN
+F 0 "#PWR127" H 11400 6000 30  0001 C CNN
 F 1 "GND" H 11400 5930 30  0001 C CNN
 	1    11400 6000
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR128
+L GND #PWR126
 U 1 1 4F5CD4D2
 P 11150 6000
-F 0 "#PWR128" H 11150 6000 30  0001 C CNN
+F 0 "#PWR126" H 11150 6000 30  0001 C CNN
 F 1 "GND" H 11150 5930 30  0001 C CNN
 	1    11150 6000
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR127
+L GND #PWR125
 U 1 1 4F5CD4D0
 P 10900 6000
-F 0 "#PWR127" H 10900 6000 30  0001 C CNN
+F 0 "#PWR125" H 10900 6000 30  0001 C CNN
 F 1 "GND" H 10900 5930 30  0001 C CNN
 	1    10900 6000
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C77
-U 1 1 4F5CD360
-P 13750 1250
-F 0 "C77" H 13800 1350 50  0000 L CNN
-F 1 "100nF" H 13800 1150 50  0000 L CNN
-	1    13750 1250
-	1    0    0    -1  
-$EndComp
-$Comp
 L C C78
 U 1 1 4F5CD35F
 P 14050 1250
@@ -1994,24 +2154,6 @@ F 1 "2.2μF" H 14700 1150 50  0000 L CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C79
-U 1 1 4F5CD35D
-P 14350 1250
-F 0 "C79" H 14400 1350 50  0000 L CNN
-F 1 "100nF" H 14400 1150 50  0000 L CNN
-	1    14350 1250
-	1    0    0    -1  
-$EndComp
-$Comp
-L C C81
-U 1 1 4F5CD35C
-P 14950 1250
-F 0 "C81" H 15000 1350 50  0000 L CNN
-F 1 "100nF" H 15000 1150 50  0000 L CNN
-	1    14950 1250
-	1    0    0    -1  
-$EndComp
-$Comp
 L C C82
 U 1 1 4F5CD35B
 P 15250 1250
@@ -2020,22 +2162,13 @@ F 1 "2.2μF" H 15300 1150 50  0000 L CNN
 	1    15250 1250
 	1    0    0    -1  
 $EndComp
-$Comp
-L C C83
-U 1 1 4F5CD35A
-P 15550 1250
-F 0 "C83" H 15600 1350 50  0000 L CNN
-F 1 "100nF" H 15600 1150 50  0000 L CNN
-	1    15550 1250
-	1    0    0    -1  
-$EndComp
 Text Label 7550 6600 1    40   ~ 0
 XTAL2
 $Comp
-L GND #PWR156
+L GND #PWR154
 U 1 1 4F5CCE80
 P 6750 7850
-F 0 "#PWR156" H 6750 7850 30  0001 C CNN
+F 0 "#PWR154" H 6750 7850 30  0001 C CNN
 F 1 "GND" H 6750 7780 30  0001 C CNN
 	1    6750 7850
 	0    -1   -1   0   
@@ -2061,42 +2194,6 @@ F 1 "1nF" H 5900 7750 50  0000 L CNN
 $EndComp
 NoConn ~ 7650 6250
 $Comp
-L GND #PWR115
-U 1 1 4F5CCCEA
-P 3450 4900
-F 0 "#PWR115" H 3450 4900 30  0001 C CNN
-F 1 "GND" H 3450 4830 30  0001 C CNN
-	1    3450 4900
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR126
-U 1 1 4F5CCCE5
-P 3050 6000
-F 0 "#PWR126" H 3050 6000 30  0001 C CNN
-F 1 "GND" H 3050 5930 30  0001 C CNN
-	1    3050 6000
-	1    0    0    -1  
-$EndComp
-$Comp
-L GSG-SMA-CONN P12
-U 1 1 4F5CCCDE
-P 3750 4300
-F 0 "P12" H 3750 4450 60  0000 C CNN
-F 1 "RX_SMA" H 3750 4150 60  0000 C CNN
-	1    3750 4300
-	1    0    0    -1  
-$EndComp
-$Comp
-L GSG-SMA-CONN P13
-U 1 1 4F5CCC9A
-P 3350 5400
-F 0 "P13" H 3350 5550 60  0000 C CNN
-F 1 "TX_SMA" H 3350 5250 60  0000 C CNN
-	1    3350 5400
-	1    0    0    -1  
-$EndComp
-$Comp
 L BALUN T4
 U 1 1 4F5BDC0F
 P 4650 5600
@@ -2109,10 +2206,10 @@ F 6 "BALUN CERAMIC CHIP WIMAX 2.5GHZ" H 4650 5600 60  0001 C CNN "Description"
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR123
+L GND #PWR122
 U 1 1 4F5BDBA2
 P 5150 5600
-F 0 "#PWR123" H 5150 5600 30  0001 C CNN
+F 0 "#PWR122" H 5150 5600 30  0001 C CNN
 F 1 "GND" H 5150 5530 30  0001 C CNN
 	1    5150 5600
 	0    -1   -1   0   
@@ -2215,15 +2312,6 @@ DIN_AD
 Text Label 15650 4500 0    40   ~ 0
 SCLK_AD
 $Comp
-L C C123
-U 1 1 4F5BCC00
-P 14000 8800
-F 0 "C123" H 14050 8900 50  0000 L CNN
-F 1 "100nF" H 14050 8700 50  0000 L CNN
-	1    14000 8800
-	1    0    0    -1  
-$EndComp
-$Comp
 L C C124
 U 1 1 4F5BCBFF
 P 14300 8800
@@ -2233,10 +2321,10 @@ F 1 "2.2μF" H 14350 8700 50  0000 L CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR132
+L GND #PWR130
 U 1 1 4F5BCB52
 P 14200 6300
-F 0 "#PWR132" H 14200 6300 30  0001 C CNN
+F 0 "#PWR130" H 14200 6300 30  0001 C CNN
 F 1 "GND" H 14200 6230 30  0001 C CNN
 	1    14200 6300
 	1    0    0    -1  
@@ -2260,28 +2348,28 @@ F 1 "VCC" H 15700 4800 30  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L VCC #PWR121
+L VCC #PWR120
 U 1 1 4F5BCB1A
 P 13000 5400
-F 0 "#PWR121" H 13000 5500 30  0001 C CNN
+F 0 "#PWR120" H 13000 5500 30  0001 C CNN
 F 1 "VCC" H 13000 5500 30  0000 C CNN
 	1    13000 5400
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR122
+L GND #PWR121
 U 1 1 4F5BCAE8
 P 13000 5500
-F 0 "#PWR122" H 13000 5500 30  0001 C CNN
+F 0 "#PWR121" H 13000 5500 30  0001 C CNN
 F 1 "GND" H 13000 5430 30  0001 C CNN
 	1    13000 5500
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR117
+L GND #PWR116
 U 1 1 4F5BCAE2
 P 13000 5000
-F 0 "#PWR117" H 13000 5000 30  0001 C CNN
+F 0 "#PWR116" H 13000 5000 30  0001 C CNN
 F 1 "GND" H 13000 4930 30  0001 C CNN
 	1    13000 5000
 	0    1    1    0   
@@ -2323,24 +2411,6 @@ F 1 "2.2μF" H 13500 1150 50  0000 L CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C75
-U 1 1 4F5BCAA6
-P 13150 1250
-F 0 "C75" H 13200 1350 50  0000 L CNN
-F 1 "100nF" H 13200 1150 50  0000 L CNN
-	1    13150 1250
-	1    0    0    -1  
-$EndComp
-$Comp
-L C C73
-U 1 1 4F5BCAA1
-P 12550 1250
-F 0 "C73" H 12600 1350 50  0000 L CNN
-F 1 "100nF" H 12600 1150 50  0000 L CNN
-	1    12550 1250
-	1    0    0    -1  
-$EndComp
-$Comp
 L C C74
 U 1 1 4F5BCAA0
 P 12850 1250
@@ -2359,15 +2429,6 @@ F 1 "2.2μF" H 12300 1150 50  0000 L CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C71
-U 1 1 4F5BCA43
-P 11950 1250
-F 0 "C71" H 12000 1350 50  0000 L CNN
-F 1 "100nF" H 12000 1150 50  0000 L CNN
-	1    11950 1250
-	1    0    0    -1  
-$EndComp
-$Comp
 L VCC #PWR94
 U 1 1 4F5BCA2F
 P 14300 3600
@@ -2377,10 +2438,10 @@ F 1 "VCC" H 14300 3700 30  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR118
+L VCC #PWR117
 U 1 1 4F5BCA2A
 P 13000 5100
-F 0 "#PWR118" H 13000 5200 30  0001 C CNN
+F 0 "#PWR117" H 13000 5200 30  0001 C CNN
 F 1 "VCC" H 13000 5200 30  0000 C CNN
 	1    13000 5100
 	0    -1   -1   0   
@@ -2440,24 +2501,6 @@ F 1 "330nF" H 12600 4100 50  0000 L CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C93
-U 1 1 4F5BC686
-P 4350 1300
-F 0 "C93" H 4400 1400 50  0000 L CNN
-F 1 "10nF" H 4400 1200 50  0000 L CNN
-	1    4350 1300
-	1    0    0    -1  
-$EndComp
-$Comp
-L C C92
-U 1 1 4F5BC684
-P 4050 1300
-F 0 "C92" H 4100 1400 50  0000 L CNN
-F 1 "10nF" H 4100 1200 50  0000 L CNN
-	1    4050 1300
-	1    0    0    -1  
-$EndComp
-$Comp
 L C C91
 U 1 1 4F5BC682
 P 3750 1300
@@ -2503,19 +2546,19 @@ F 1 "100pF" H 3500 1200 50  0000 L CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR134
+L VCC #PWR132
 U 1 1 4F5BC5F8
 P 7750 6400
-F 0 "#PWR134" H 7750 6500 30  0001 C CNN
+F 0 "#PWR132" H 7750 6500 30  0001 C CNN
 F 1 "VCC" H 7750 6500 30  0000 C CNN
 	1    7750 6400
 	-1   0    0    1   
 $EndComp
 $Comp
-L VCC #PWR135
+L VCC #PWR133
 U 1 1 4F5BC5F6
 P 7850 6400
-F 0 "#PWR135" H 7850 6500 30  0001 C CNN
+F 0 "#PWR133" H 7850 6500 30  0001 C CNN
 F 1 "VCC" H 7850 6500 30  0000 C CNN
 	1    7850 6400
 	-1   0    0    1   
@@ -2571,6 +2614,9 @@ U 1 1 4F5BBCA6
 P 14350 4950
 F 0 "U18" H 14350 5000 60  0000 C CNN
 F 1 "MAX5864" H 14350 4900 60  0000 C CNN
+F 4 "Maxim" H 14350 4950 60  0001 C CNN "Manufacturer"
+F 5 "MAX5864ETM+T" H 14350 4950 60  0001 C CNN "Part Number"
+F 6 "IC ANLG FRONT END 22MSPS 48-TQFN" H 14350 4950 60  0001 C CNN "Description"
 	1    14350 4950
 	1    0    0    -1  
 $EndComp
@@ -2651,28 +2697,28 @@ DOUT_XCVR
 Text Label 9100 4900 0    40   ~ 0
 DIN_XCVR
 $Comp
-L VCC #PWR119
+L VCC #PWR118
 U 1 1 4F5BC1B8
 P 9150 5200
-F 0 "#PWR119" H 9150 5300 30  0001 C CNN
+F 0 "#PWR118" H 9150 5300 30  0001 C CNN
 F 1 "VCC" H 9150 5300 30  0000 C CNN
 	1    9150 5200
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR125
+L GND #PWR124
 U 1 1 4F5BC1B0
 P 9700 5900
-F 0 "#PWR125" H 9700 5900 30  0001 C CNN
+F 0 "#PWR124" H 9700 5900 30  0001 C CNN
 F 1 "GND" H 9700 5830 30  0001 C CNN
 	1    9700 5900
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR120
+L GND #PWR119
 U 1 1 4F5BC191
 P 9150 5400
-F 0 "#PWR120" H 9150 5400 30  0001 C CNN
+F 0 "#PWR119" H 9150 5400 30  0001 C CNN
 F 1 "GND" H 9150 5330 30  0001 C CNN
 	1    9150 5400
 	0    -1   -1   0   
@@ -2687,33 +2733,15 @@ F 1 "1μF" H 9750 5500 50  0000 L CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR136
+L VCC #PWR134
 U 1 1 4F5BC10F
 P 7950 6400
-F 0 "#PWR136" H 7950 6500 30  0001 C CNN
+F 0 "#PWR134" H 7950 6500 30  0001 C CNN
 F 1 "VCC" H 7950 6500 30  0000 C CNN
 	1    7950 6400
 	-1   0    0    1   
 $EndComp
 $Comp
-L C C88
-U 1 1 4F5BC0CE
-P 2850 1300
-F 0 "C88" H 2900 1400 50  0000 L CNN
-F 1 "10nF" H 2900 1200 50  0000 L CNN
-	1    2850 1300
-	1    0    0    -1  
-$EndComp
-$Comp
-L C C87
-U 1 1 4F5BC0CD
-P 2550 1300
-F 0 "C87" H 2600 1400 50  0000 L CNN
-F 1 "10nF" H 2600 1200 50  0000 L CNN
-	1    2550 1300
-	1    0    0    -1  
-$EndComp
-$Comp
 L C C86
 U 1 1 4F5BC0BF
 P 2250 1300
@@ -2759,10 +2787,10 @@ F 1 "180pF" H 8500 6400 50  0000 L CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR137
+L GND #PWR135
 U 1 1 4F5BC043
 P 8050 6400
-F 0 "#PWR137" H 8050 6400 30  0001 C CNN
+F 0 "#PWR135" H 8050 6400 30  0001 C CNN
 F 1 "GND" H 8050 6330 30  0001 C CNN
 	1    8050 6400
 	1    0    0    -1  
@@ -2781,37 +2809,28 @@ F 1 "GND" H 1450 1530 30  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C89
-U 1 1 4F5BBFA4
-P 3150 1300
-F 0 "C89" H 3200 1400 50  0000 L CNN
-F 1 "10nF" H 3200 1200 50  0000 L CNN
-	1    3150 1300
-	1    0    0    -1  
-$EndComp
-$Comp
-L VCC #PWR133
+L VCC #PWR131
 U 1 1 4F5BBF97
 P 7150 6400
-F 0 "#PWR133" H 7150 6500 30  0001 C CNN
+F 0 "#PWR131" H 7150 6500 30  0001 C CNN
 F 1 "VCC" H 7150 6500 30  0000 C CNN
 	1    7150 6400
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR124
+L GND #PWR123
 U 1 1 4F5BBEDE
 P 4150 5900
-F 0 "#PWR124" H 4150 5900 30  0001 C CNN
+F 0 "#PWR123" H 4150 5900 30  0001 C CNN
 F 1 "GND" H 4150 5830 30  0001 C CNN
 	1    4150 5900
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR116
+L VCC #PWR115
 U 1 1 4F5BBE5D
 P 6250 5000
-F 0 "#PWR116" H 6250 5100 30  0001 C CNN
+F 0 "#PWR115" H 6250 5100 30  0001 C CNN
 F 1 "VCC" H 6250 5100 30  0000 C CNN
 	1    6250 5000
 	0    -1   -1   0   
diff --git a/hardware/jawbreaker/frontend.sch b/hardware/jawbreaker/frontend.sch
index 13f9c305..ff4c9982 100644
--- a/hardware/jawbreaker/frontend.sch
+++ b/hardware/jawbreaker/frontend.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Mon Aug 27 12:18:28 2012
+EESchema Schematic File Version 2  date Mon Aug 27 22:37:01 2012
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -37,7 +37,7 @@ $Descr User 17000 11000
 encoding utf-8
 Sheet 2 4
 Title ""
-Date "27 aug 2012"
+Date "28 aug 2012"
 Rev ""
 Comp ""
 Comment1 ""
@@ -45,6 +45,24 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
+Wire Wire Line
+	16300 5850 16300 5950
+Wire Wire Line
+	18400 6800 17850 6800
+Connection ~ 17950 6800
+Wire Wire Line
+	18300 7400 18300 7300
+Wire Wire Line
+	17950 7400 17950 7300
+Wire Wire Line
+	17950 6800 17950 6900
+Connection ~ 18300 6800
+Wire Wire Line
+	18300 6900 18300 6800
+Wire Wire Line
+	18900 6800 19000 6800
+Wire Wire Line
+	19000 6800 19000 6700
 Wire Wire Line
 	6500 6450 6500 6350
 Wire Wire Line
@@ -58,11 +76,11 @@ Wire Wire Line
 Wire Wire Line
 	7200 7300 7200 7200
 Wire Wire Line
-	12900 8800 14000 8800
+	14000 8800 12900 8800
 Wire Wire Line
 	11850 7750 11700 7750
 Wire Wire Line
-	11700 8000 11400 8000
+	11400 8000 11700 8000
 Wire Wire Line
 	12350 7750 12250 7750
 Wire Wire Line
@@ -77,7 +95,7 @@ Wire Wire Line
 Wire Wire Line
 	9900 8600 9900 8500
 Wire Wire Line
-	10300 8000 9500 8000
+	9500 8000 10300 8000
 Connection ~ 9900 8000
 Connection ~ 15300 8650
 Wire Wire Line
@@ -116,7 +134,7 @@ Wire Wire Line
 	15100 9000 15200 9000
 Connection ~ 13050 3000
 Wire Wire Line
-	13050 3100 13050 2850
+	13050 2850 13050 3100
 Wire Wire Line
 	13650 3000 13550 3000
 Connection ~ 9550 3250
@@ -129,7 +147,7 @@ Wire Wire Line
 Wire Wire Line
 	10250 2050 10150 2050
 Wire Wire Line
-	9650 1900 9650 2150
+	9650 2150 9650 1900
 Connection ~ 7100 6000
 Wire Wire Line
 	7200 6000 7100 6000
@@ -151,7 +169,7 @@ Wire Wire Line
 Wire Wire Line
 	15200 7900 14300 7900
 Wire Wire Line
-	12600 8100 12800 8100
+	12800 8100 12600 8100
 Wire Wire Line
 	12800 8000 12700 8000
 Wire Wire Line
@@ -178,7 +196,7 @@ Wire Wire Line
 	9700 5950 13250 5950
 Connection ~ 15700 9000
 Wire Wire Line
-	15800 9000 15600 9000
+	15600 9000 15800 9000
 Wire Wire Line
 	14450 5350 14550 5350
 Wire Wire Line
@@ -237,7 +255,7 @@ Wire Wire Line
 	1950 3500 1950 4550
 Connection ~ 2750 3450
 Wire Wire Line
-	2750 3550 2750 3300
+	2750 3300 2750 3550
 Wire Wire Line
 	3350 3450 3250 3450
 Wire Wire Line
@@ -245,7 +263,7 @@ Wire Wire Line
 Wire Wire Line
 	2650 5250 2650 5150
 Wire Wire Line
-	2650 4450 2650 4750
+	2650 4750 2650 4450
 Wire Wire Line
 	2550 4450 2550 4550
 Wire Wire Line
@@ -263,16 +281,16 @@ Connection ~ 4150 4550
 Wire Wire Line
 	4450 3850 4350 3850
 Wire Wire Line
-	4350 4550 4350 3850
+	4350 3850 4350 4550
 Wire Wire Line
-	3950 4550 4350 4550
+	4350 4550 3950 4550
 Connection ~ 4150 3750
 Wire Wire Line
 	3950 4400 4050 4400
 Wire Wire Line
-	4050 3750 4050 4400
+	4050 4400 4050 3750
 Wire Wire Line
-	4450 3750 4050 3750
+	4050 3750 4450 3750
 Wire Wire Line
 	3350 4400 3250 4400
 Wire Wire Line
@@ -301,17 +319,17 @@ Wire Wire Line
 	8850 9950 8950 9950
 Connection ~ 1850 2700
 Wire Wire Line
-	1850 3100 1850 2600
+	1850 2600 1850 3100
 Wire Wire Line
 	2050 1450 1950 1450
 Wire Wire Line
 	2550 1450 2450 1450
 Wire Wire Line
-	1950 1700 1950 1050
+	1950 1050 1950 1700
 Connection ~ 1950 1450
 Connection ~ 1950 6450
 Wire Wire Line
-	1950 6700 1950 6050
+	1950 6050 1950 6700
 Wire Wire Line
 	2550 6450 2450 6450
 Wire Wire Line
@@ -330,15 +348,15 @@ Wire Wire Line
 	12250 4100 12350 4100
 Connection ~ 2200 9300
 Wire Wire Line
-	2200 9400 2100 9400
+	2100 9400 2200 9400
 Connection ~ 7650 5050
 Wire Wire Line
-	7650 4550 7650 5050
+	7650 5050 7650 4550
 Wire Wire Line
 	7650 4550 8950 4550
 Connection ~ 7850 4850
 Wire Wire Line
-	7850 4350 7850 4850
+	7850 4850 7850 4350
 Wire Wire Line
 	7850 4350 9150 4350
 Wire Wire Line
@@ -369,7 +387,7 @@ Connection ~ 8350 9700
 Wire Wire Line
 	8600 9700 8350 9700
 Wire Wire Line
-	8350 9800 8350 9600
+	8350 9600 8350 9800
 Wire Wire Line
 	6700 10050 6800 10050
 Wire Wire Line
@@ -383,7 +401,7 @@ Wire Wire Line
 Wire Wire Line
 	5500 9550 5900 9550
 Wire Wire Line
-	2100 9300 2450 9300
+	2450 9300 2100 9300
 Wire Wire Line
 	2100 9600 2250 9600
 Wire Wire Line
@@ -426,20 +444,20 @@ Wire Wire Line
 Connection ~ 5750 800 
 Connection ~ 5200 800 
 Wire Wire Line
-	4800 800  4800 700 
+	4800 700  4800 800 
 Connection ~ 5750 1200
 Connection ~ 5200 1200
 Wire Wire Line
-	4800 1200 4800 1300
+	4800 1300 4800 1200
 Connection ~ 8650 2150
 Wire Wire Line
 	8650 2150 8650 2250
 Wire Wire Line
 	8950 2750 8950 2650
 Wire Wire Line
-	8950 3350 8950 3250
+	8950 3250 8950 3350
 Wire Wire Line
-	6750 3350 8950 3350
+	8950 3350 6750 3350
 Wire Wire Line
 	7750 2750 7750 2650
 Connection ~ 7750 2150
@@ -450,7 +468,7 @@ Wire Wire Line
 	7050 2250 7050 2150
 Connection ~ 4650 5350
 Wire Wire Line
-	4650 5450 4650 4950
+	4650 4950 4650 5450
 Wire Wire Line
 	5250 2350 5250 2150
 Wire Wire Line
@@ -459,13 +477,13 @@ Wire Wire Line
 	5350 4650 5350 4850
 Connection ~ 4650 5050
 Wire Wire Line
-	4750 5350 4650 5350
+	4650 5350 4750 5350
 Connection ~ 5450 5050
 Wire Wire Line
 	5350 5050 5450 5050
 Connection ~ 16400 9300
 Wire Wire Line
-	16400 9600 16400 9200
+	16400 9200 16400 9600
 Connection ~ 16400 9500
 Wire Wire Line
 	10950 2550 11050 2550
@@ -473,27 +491,17 @@ Wire Wire Line
 	12250 2550 12350 2550
 Wire Wire Line
 	12350 4400 12250 4400
-Connection ~ 650  2000
-Connection ~ 650  7000
 Wire Wire Line
 	6500 6350 6400 6350
-Connection ~ 650  7100
 Wire Wire Line
-	650  7200 650  6800
-Connection ~ 650  6900
-Connection ~ 650  2100
-Wire Wire Line
-	650  2200 650  1800
-Connection ~ 650  1900
-Wire Wire Line
-	5450 6350 5800 6350
+	5800 6350 5450 6350
 Wire Wire Line
 	4350 3650 4450 3650
 Wire Wire Line
 	10950 4100 11050 4100
 Connection ~ 16400 9400
 Wire Wire Line
-	4650 5050 4750 5050
+	4750 5050 4650 5050
 Wire Wire Line
 	5350 5350 5550 5350
 Connection ~ 5550 5350
@@ -510,11 +518,11 @@ Wire Wire Line
 Wire Wire Line
 	6750 3150 6850 3150
 Wire Wire Line
-	6850 2150 6850 3150
+	6850 3150 6850 2150
 Wire Wire Line
-	7150 2150 6850 2150
+	6850 2150 7150 2150
 Wire Wire Line
-	7850 2150 7650 2150
+	7650 2150 7850 2150
 Wire Wire Line
 	7050 2750 7050 2650
 Wire Wire Line
@@ -534,23 +542,23 @@ Wire Wire Line
 Connection ~ 4900 1200
 Connection ~ 5450 1200
 Wire Wire Line
-	6300 1200 4800 1200
+	4800 1200 6300 1200
 Connection ~ 6000 1200
 Connection ~ 4900 800 
 Connection ~ 5450 800 
 Wire Wire Line
-	6300 800  4800 800 
+	4800 800  6300 800 
 Connection ~ 6000 800 
 Wire Wire Line
 	7650 3550 7550 3550
 Wire Wire Line
-	5850 4950 5850 4650
+	5850 4650 5850 4950
 Wire Wire Line
-	7950 4950 5850 4950
+	5850 4950 7950 4950
 Wire Wire Line
-	5650 5150 5650 4650
+	5650 4650 5650 5150
 Wire Wire Line
-	7950 5150 5650 5150
+	5650 5150 7950 5150
 Wire Wire Line
 	7150 4150 7150 4250
 Wire Wire Line
@@ -581,7 +589,7 @@ Wire Wire Line
 Wire Wire Line
 	2450 9900 2450 9800
 Wire Wire Line
-	2450 9400 2450 9200
+	2450 9200 2450 9400
 Connection ~ 2450 9300
 Wire Wire Line
 	5900 9450 5500 9450
@@ -632,20 +640,20 @@ Wire Wire Line
 Wire Wire Line
 	12350 2850 12250 2850
 Wire Wire Line
-	10250 4150 10250 4500
+	10250 4500 10250 4150
 Wire Wire Line
 	10250 5000 10250 4900
 Connection ~ 5550 5550
 Wire Wire Line
-	5550 4650 5550 5650
+	5550 5650 5550 4650
 Wire Wire Line
-	5450 4650 5450 6350
+	5450 6350 5450 4650
 Wire Wire Line
 	11050 2850 10950 2850
 Wire Wire Line
 	10950 2400 10850 2400
 Wire Wire Line
-	10350 3250 10350 2250
+	10350 2250 10350 3250
 Connection ~ 10350 2400
 Wire Wire Line
 	8950 10050 8850 10050
@@ -740,7 +748,7 @@ Wire Wire Line
 Wire Wire Line
 	13250 5050 13350 5050
 Wire Wire Line
-	1850 8100 1850 7600
+	1850 7600 1850 8100
 Wire Wire Line
 	15200 8700 15100 8700
 Wire Wire Line
@@ -762,9 +770,9 @@ Wire Wire Line
 Wire Wire Line
 	14000 8700 12700 8700
 Wire Wire Line
-	13700 7900 13900 7900
+	13900 7900 13700 7900
 Wire Wire Line
-	13800 7900 13800 6850
+	13800 6850 13800 7900
 Wire Wire Line
 	10200 8600 10200 9600
 Wire Wire Line
@@ -774,23 +782,23 @@ Wire Wire Line
 Wire Wire Line
 	13900 9000 14000 9000
 Wire Wire Line
-	13700 6850 13900 6850
+	13900 6850 13700 6850
 Connection ~ 13800 6850
 Connection ~ 14600 6850
 Wire Wire Line
-	15950 6550 16300 6550
+	15950 6550 16650 6550
 Wire Wire Line
-	7000 7200 7000 7450
+	7000 7450 7000 7200
 Connection ~ 7000 7300
 Wire Wire Line
-	7100 5850 7100 6300
+	7100 6300 7100 5850
 Wire Wire Line
 	7700 6000 7600 6000
 Wire Wire Line
 	9750 2050 9650 2050
 Connection ~ 9650 2050
 Wire Wire Line
-	9550 3050 9550 3350
+	9550 3350 9550 3050
 Wire Wire Line
 	7200 6200 9250 6200
 Wire Wire Line
@@ -806,7 +814,7 @@ Wire Wire Line
 Wire Wire Line
 	12950 4850 12950 4750
 Wire Wire Line
-	12950 4000 12950 4350
+	12950 4350 12950 4000
 Wire Wire Line
 	12800 4250 12950 4250
 Connection ~ 12950 4250
@@ -819,9 +827,9 @@ Wire Wire Line
 Wire Wire Line
 	800  9300 800  9100
 Wire Wire Line
-	2200 9100 800  9100
+	800  9100 2200 9100
 Wire Wire Line
-	2200 9400 2200 9100
+	2200 9100 2200 9400
 Wire Wire Line
 	3800 10350 3800 10250
 Wire Wire Line
@@ -838,7 +846,7 @@ Wire Wire Line
 	4400 9900 4800 9900
 Connection ~ 5000 9300
 Wire Wire Line
-	5000 9400 5000 9200
+	5000 9200 5000 9400
 Wire Wire Line
 	5000 9900 5000 9800
 Wire Wire Line
@@ -846,17 +854,17 @@ Wire Wire Line
 Wire Wire Line
 	14850 5750 14850 5650
 Wire Wire Line
-	15200 5150 14450 5150
+	14450 5150 15200 5150
 Connection ~ 14850 5150
 Wire Wire Line
 	12950 5850 12950 5750
 Wire Wire Line
 	12400 5750 12400 5650
 Wire Wire Line
-	13350 5250 12600 5250
+	12600 5250 13350 5250
 Connection ~ 12950 5250
 Wire Wire Line
-	12000 5150 13350 5150
+	13350 5150 12000 5150
 Connection ~ 12400 5150
 Connection ~ 13150 8800
 Connection ~ 13700 8900
@@ -877,18 +885,190 @@ Wire Wire Line
 Wire Wire Line
 	11600 7900 11400 7900
 Wire Wire Line
-	11700 7500 11700 8000
+	11700 8000 11700 7500
 Connection ~ 11700 7750
 Wire Wire Line
 	4450 3350 4350 3350
 Wire Wire Line
-	13300 8900 14000 8900
+	14000 8900 13300 8900
 Wire Wire Line
-	15050 6850 14500 6850
+	14500 6850 15050 6850
 Wire Wire Line
 	3250 4400 3250 4300
 Wire Wire Line
 	6500 6950 6500 6850
+Wire Wire Line
+	16300 6450 16300 6550
+Connection ~ 16300 6550
+$Comp
+L R R?
+U 1 1 503C490B
+P 19650 6150
+F 0 "R?" V 19730 6150 50  0000 C CNN
+F 1 "4k7" V 19650 6150 50  0000 C CNN
+F 4 "Stackpole" H 19650 6150 60  0001 C CNN "Manufacturer"
+F 5 "RMCF0402JT4K70" H 19650 6150 60  0001 C CNN "Part Number"
+F 6 "RES 4.7K OHM 1/16W 5% 0402 SMD" H 19650 6150 60  0001 C CNN "Description"
+	1    19650 6150
+	1    0    0    -1  
+$EndComp
+$Comp
+L VCC #PWR?
+U 1 1 503C4905
+P 16300 5850
+F 0 "#PWR?" H 16300 5950 30  0001 C CNN
+F 1 "VCC" H 16300 5950 30  0000 C CNN
+	1    16300 5850
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R?
+U 1 1 503C48ED
+P 16300 6200
+F 0 "R?" V 16380 6200 50  0000 C CNN
+F 1 "4k7" V 16300 6200 50  0000 C CNN
+F 4 "Stackpole" H 16300 6200 60  0001 C CNN "Manufacturer"
+F 5 "RMCF0402JT4K70" H 16300 6200 60  0001 C CNN "Part Number"
+F 6 "RES 4.7K OHM 1/16W 5% 0402 SMD" H 16300 6200 60  0001 C CNN "Description"
+	1    16300 6200
+	1    0    0    -1  
+$EndComp
+$Comp
+L MGA-81563 U25
+U 1 1 503BF2DD
+P 18100 7950
+F 0 "U25" H 18100 8000 60  0000 C CNN
+F 1 "MGA-81563" H 18100 7900 60  0000 C CNN
+F 4 "Avago" H 18100 7950 60  0001 C CNN "Manufacturer"
+F 5 "MGA-81563" H 18100 7950 60  0001 C CNN "Part Number"
+F 6 "0.1-6 GHz 3 V, 14 dBm Amplifier" H 18100 7950 60  0001 C CNN "Description"
+	1    18100 7950
+	0    1    1    0   
+$EndComp
+$Comp
+L INDUCTOR L12
+U 1 1 503BF2DC
+P 17550 6800
+F 0 "L12" V 17500 6800 40  0000 C CNN
+F 1 "1uH" V 17650 6800 40  0000 C CNN
+F 4 "Taiyo Yuden" H 17550 6800 60  0001 C CNN "Manufacturer"
+F 5 "Digi-Key 587-2897-1-ND" H 17550 6800 60  0001 C CNN "Part Number"
+F 6 "INDUCTR 1.0UH 650MA 20% 0603 SMD" H 17550 6800 60  0001 C CNN "Description"
+	1    17550 6800
+	0    1    1    0   
+$EndComp
+$Comp
+L C C160
+U 1 1 503BF2DB
+P 17950 7100
+F 0 "C160" H 18000 7200 50  0000 L CNN
+F 1 "100pF" H 18000 7000 50  0000 L CNN
+F 4 "Murata" H 20950 8650 60  0001 C CNN "Manufacturer"
+F 5 "GRM1555C1H101JZ01D" H 20950 8650 60  0001 C CNN "Part Number"
+F 6 "CAP CER 100PF 50V 5% NP0 0402" H 20950 8650 60  0001 C CNN "Description"
+	1    17950 7100
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C161
+U 1 1 503BF2DA
+P 18300 7100
+F 0 "C161" H 18350 7200 50  0000 L CNN
+F 1 "1uF" H 18350 7000 50  0000 L CNN
+	1    18300 7100
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR53
+U 1 1 503BF2D9
+P 17950 7400
+F 0 "#PWR53" H 17950 7400 30  0001 C CNN
+F 1 "GND" H 17950 7330 30  0001 C CNN
+	1    17950 7400
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR54
+U 1 1 503BF2D8
+P 18300 7400
+F 0 "#PWR54" H 18300 7400 30  0001 C CNN
+F 1 "GND" H 18300 7330 30  0001 C CNN
+	1    18300 7400
+	1    0    0    -1  
+$EndComp
+$Comp
+L MOSFET_P Q2
+U 1 1 503BF2D7
+P 19100 6500
+F 0 "Q2" H 19100 6690 60  0000 R CNN
+F 1 "MOSFET_P" H 19100 6320 60  0000 R CNN
+F 4 "Fairchild" H 19100 6500 60  0001 C CNN "Manufacturer"
+F 5 "BSS84" H 19100 6500 60  0001 C CNN "Part Number"
+F 6 "MOSFET P-CH 50V 130MA SOT-23" H 19100 6500 60  0001 C CNN "Description"
+	1    19100 6500
+	-1   0    0    1   
+$EndComp
+$Comp
+L R R103
+U 1 1 503BF2D6
+P 18650 6800
+F 0 "R103" V 18730 6800 50  0000 C CNN
+F 1 "33" V 18650 6800 50  0000 C CNN
+	1    18650 6800
+	0    1    1    0   
+$EndComp
+$Comp
+L C C162
+U 1 1 503BF2D5
+P 18700 7250
+F 0 "C162" H 18750 7350 50  0000 L CNN
+F 1 "10nF" H 18750 7150 50  0000 L CNN
+F 4 "Murata" H 25100 6000 60  0001 C CNN "Manufacturer"
+F 5 "GRM155R71C103KA01D" H 25100 6000 60  0001 C CNN "Part Number"
+F 6 "CAP CER 10000PF 16V 10% X7R 0402" H 25100 6000 60  0001 C CNN "Description"
+	1    18700 7250
+	1    0    0    1   
+$EndComp
+$Comp
+L C C163
+U 1 1 503BF2CB
+P 15350 7300
+F 0 "C163" H 15400 7400 50  0000 L CNN
+F 1 "10nF" H 15400 7200 50  0000 L CNN
+F 4 "Murata" H 21750 6050 60  0001 C CNN "Manufacturer"
+F 5 "GRM155R71C103KA01D" H 21750 6050 60  0001 C CNN "Part Number"
+F 6 "CAP CER 10000PF 16V 10% X7R 0402" H 21750 6050 60  0001 C CNN "Description"
+	1    15350 7300
+	1    0    0    1   
+$EndComp
+$Comp
+L INDUCTOR L3
+U 1 1 503BF2B7
+P 5050 5350
+F 0 "L3" V 5000 5350 40  0000 C CNN
+F 1 "1uH" V 5150 5350 40  0000 C CNN
+F 4 "Taiyo Yuden" H 5050 5350 60  0001 C CNN "Manufacturer"
+F 5 "Digi-Key 587-2897-1-ND" H 5050 5350 60  0001 C CNN "Part Number"
+F 6 "INDUCTR 1.0UH 650MA 20% 0603 SMD" H 5050 5350 60  0001 C CNN "Description"
+	1    5050 5350
+	0    1    1    0   
+$EndComp
+$Comp
+L INDUCTOR L2
+U 1 1 503BF2A7
+P 5050 5050
+F 0 "L2" V 5000 5050 40  0000 C CNN
+F 1 "1uH" V 5150 5050 40  0000 C CNN
+F 4 "Taiyo Yuden" H 5050 5050 60  0001 C CNN "Manufacturer"
+F 5 "Digi-Key 587-2897-1-ND" H 5050 5050 60  0001 C CNN "Part Number"
+F 6 "INDUCTR 1.0UH 650MA 20% 0603 SMD" H 5050 5050 60  0001 C CNN "Description"
+	1    5050 5050
+	0    1    1    0   
+$EndComp
+Text GLabel 1250 1600 0    60   Input ~ 0
+TX_IF
+Text GLabel 1250 6600 0    60   Input ~ 0
+RX_IF
 $Comp
 L C C49
 U 1 1 503BB2CE
@@ -923,10 +1103,10 @@ F 1 "33" V 15300 6850 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR53
+L GND #PWR51
 U 1 1 502E7B4C
 P 7200 7300
-F 0 "#PWR53" H 7200 7300 30  0001 C CNN
+F 0 "#PWR51" H 7200 7300 30  0001 C CNN
 F 1 "GND" H 7200 7230 30  0001 C CNN
 	1    7200 7300
 	1    0    0    -1  
@@ -967,10 +1147,10 @@ F 6 "CAP CER 33PF 50V 5% NP0 0402" H 23250 9550 60  0001 C CNN "Description"
 	0    -1   1    0   
 $EndComp
 $Comp
-L GND #PWR54
+L GND #PWR52
 U 1 1 502E7A0F
 P 12200 7300
-F 0 "#PWR54" H 12200 7300 30  0001 C CNN
+F 0 "#PWR52" H 12200 7300 30  0001 C CNN
 F 1 "GND" H 12200 7230 30  0001 C CNN
 	1    12200 7300
 	0    -1   -1   0   
@@ -1086,19 +1266,19 @@ F 6 "CAP CER 33PF 50V 5% NP0 0402" H 23750 7700 60  0001 C CNN "Description"
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR42
+L GND #PWR41
 U 1 1 502E792A
 P 12400 5750
-F 0 "#PWR42" H 12400 5750 30  0001 C CNN
+F 0 "#PWR41" H 12400 5750 30  0001 C CNN
 F 1 "GND" H 12400 5680 30  0001 C CNN
 	1    12400 5750
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR44
+L GND #PWR43
 U 1 1 502E7923
 P 12950 5850
-F 0 "#PWR44" H 12950 5850 30  0001 C CNN
+F 0 "#PWR43" H 12950 5850 30  0001 C CNN
 F 1 "GND" H 12950 5780 30  0001 C CNN
 	1    12950 5850
 	1    0    0    -1  
@@ -1130,10 +1310,10 @@ F 6 "CAP CER 33PF 50V 5% NP0 0402" H 26200 7700 60  0001 C CNN "Description"
 	1    0    0    1   
 $EndComp
 $Comp
-L GND #PWR43
+L GND #PWR42
 U 1 1 502E78E1
 P 14850 5750
-F 0 "#PWR43" H 14850 5750 30  0001 C CNN
+F 0 "#PWR42" H 14850 5750 30  0001 C CNN
 F 1 "GND" H 14850 5680 30  0001 C CNN
 	1    14850 5750
 	1    0    0    -1  
@@ -1217,6 +1397,9 @@ U 1 1 502E7695
 P 3800 9600
 F 0 "U16" V 3750 9600 60  0000 C CNN
 F 1 "GSG-74HC08" V 3850 9600 60  0000 C CNN
+F 4 "Texas Instruments" H 3800 9600 60  0001 C CNN "Manufacturer"
+F 5 "SN74AHC08RGYR" H 3800 9600 60  0001 C CNN "Part Number"
+F 6 "IC QUAD 2IN POS-AND GATE 14-QFN" H 3800 9600 60  0001 C CNN "Description"
 	1    3800 9600
 	1    0    0    -1  
 $EndComp
@@ -1233,10 +1416,10 @@ F 6 "CAP CER 33PF 50V 5% NP0 0402" H 16100 4350 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR32
+L GND #PWR31
 U 1 1 502E6FED
 P 12950 4850
-F 0 "#PWR32" H 12950 4850 30  0001 C CNN
+F 0 "#PWR31" H 12950 4850 30  0001 C CNN
 F 1 "GND" H 12950 4780 30  0001 C CNN
 	1    12950 4850
 	1    0    0    -1  
@@ -1246,10 +1429,10 @@ HP
 Text Label 13050 2850 3    40   ~ 0
 LP
 $Comp
-L GND #PWR16
+L GND #PWR15
 U 1 1 502E6F90
 P 13650 3000
-F 0 "#PWR16" H 13650 3000 30  0001 C CNN
+F 0 "#PWR15" H 13650 3000 30  0001 C CNN
 F 1 "GND" H 13650 2930 30  0001 C CNN
 	1    13650 3000
 	0    -1   -1   0   
@@ -1267,10 +1450,10 @@ F 6 "CAP CER 33PF 50V 5% NP0 0402" H 24700 5250 60  0001 C CNN "Description"
 	0    1    -1   0   
 $EndComp
 $Comp
-L GND #PWR24
+L GND #PWR23
 U 1 1 502E6F53
 P 9550 3850
-F 0 "#PWR24" H 9550 3850 30  0001 C CNN
+F 0 "#PWR23" H 9550 3850 30  0001 C CNN
 F 1 "GND" H 9550 3780 30  0001 C CNN
 	1    9550 3850
 	1    0    0    -1  
@@ -1313,10 +1496,10 @@ F 6 "CAP CER 33PF 50V 5% NP0 0402" H 13100 1850 60  0001 C CNN "Description"
 	0    1    -1   0   
 $EndComp
 $Comp
-L GND #PWR47
+L GND #PWR46
 U 1 1 502E6EDE
 P 7700 6000
-F 0 "#PWR47" H 7700 6000 30  0001 C CNN
+F 0 "#PWR46" H 7700 6000 30  0001 C CNN
 F 1 "GND" H 7700 5930 30  0001 C CNN
 	1    7700 6000
 	0    -1   -1   0   
@@ -1336,10 +1519,10 @@ F 6 "CAP CER 33PF 50V 5% NP0 0402" H 10550 5800 60  0001 C CNN "Description"
 	0    1    -1   0   
 $EndComp
 $Comp
-L GND #PWR52
+L GND #PWR50
 U 1 1 502E6EC5
 P 6400 7300
-F 0 "#PWR52" H 6400 7300 30  0001 C CNN
+F 0 "#PWR50" H 6400 7300 30  0001 C CNN
 F 1 "GND" H 6400 7230 30  0001 C CNN
 	1    6400 7300
 	0    1    1    0   
@@ -1362,7 +1545,7 @@ Text Label 2750 3300 3    40   ~ 0
 RX
 Text Label 2500 4650 0    40   ~ 0
 TX
-Text Label 16300 6550 2    40   ~ 0
+Text Label 16650 6550 2    40   ~ 0
 !AMP_PWR
 $Comp
 L MOSFET_P Q1
@@ -1457,10 +1640,10 @@ F 1 "GND" H 14550 8080 30  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR31
+L GND #PWR30
 U 1 1 502E619A
 P 13900 4500
-F 0 "#PWR31" H 13900 4500 30  0001 C CNN
+F 0 "#PWR30" H 13900 4500 30  0001 C CNN
 F 1 "GND" H 13900 4430 30  0001 C CNN
 	1    13900 4500
 	-1   0    0    1   
@@ -1513,14 +1696,17 @@ U 1 1 502DE480
 P 13250 8000
 F 0 "U13" H 13250 8050 60  0000 C CNN
 F 1 "MGA-81563" H 13250 7950 60  0000 C CNN
+F 4 "Avago" H 13250 8000 60  0001 C CNN "Manufacturer"
+F 5 "MGA-81563" H 13250 8000 60  0001 C CNN "Part Number"
+F 6 "0.1-6 GHz 3 V, 14 dBm Amplifier" H 13250 8000 60  0001 C CNN "Description"
 	1    13250 8000
 	0    1    1    0   
 $EndComp
 $Comp
-L VCC #PWR48
+L VCC #PWR47
 U 1 1 502C6DC8
 P 15650 6250
-F 0 "#PWR48" H 15650 6350 30  0001 C CNN
+F 0 "#PWR47" H 15650 6350 30  0001 C CNN
 F 1 "VCC" H 15650 6350 30  0000 C CNN
 	1    15650 6250
 	1    0    0    -1  
@@ -1581,10 +1767,10 @@ L INDUCTOR L5
 U 1 1 502C6D12
 P 14200 6850
 F 0 "L5" V 14150 6850 40  0000 C CNN
-F 1 "180nH" V 14300 6850 40  0000 C CNN
-F 4 "Wurth" H 14200 6850 60  0001 C CNN "Manufacturer"
-F 5 "744761218C" H 14200 6850 60  0001 C CNN "Part Number"
-F 6 "INDUCTOR 180NH .25A WW 0603" H 14200 6850 60  0001 C CNN "Description"
+F 1 "1uH" V 14300 6850 40  0000 C CNN
+F 4 "Taiyo Yuden" H 14200 6850 60  0001 C CNN "Manufacturer"
+F 5 "Digi-Key 587-2897-1-ND" H 14200 6850 60  0001 C CNN "Part Number"
+F 6 "INDUCTR 1.0UH 650MA 20% 0603 SMD" H 14200 6850 60  0001 C CNN "Description"
 	1    14200 6850
 	0    1    1    0   
 $EndComp
@@ -1594,6 +1780,9 @@ U 1 1 502C6BE2
 P 14550 8850
 F 0 "U14" H 14550 8850 60  0000 C CNN
 F 1 "SKY13317" H 14550 9100 60  0000 C CNN
+F 4 "Skyworks" H 14550 8850 60  0001 C CNN "Manufacturer"
+F 5 "SKY13317-373LF" H 14550 8850 60  0001 C CNN "Part Number"
+F 6 "20 MHz-6.0 GHz pHEMT GaAs SP3T Switch" H 14550 8850 60  0001 C CNN "Description"
 	1    14550 8850
 	-1   0    0    1   
 $EndComp
@@ -1603,6 +1792,9 @@ U 1 1 502C6BDF
 P 10850 7950
 F 0 "U12" H 10850 7950 60  0000 C CNN
 F 1 "SKY13317" H 10850 8200 60  0000 C CNN
+F 4 "Skyworks" H 10850 7950 60  0001 C CNN "Manufacturer"
+F 5 "SKY13317-373LF" H 10850 7950 60  0001 C CNN "Part Number"
+F 6 "20 MHz-6.0 GHz pHEMT GaAs SP3T Switch" H 10850 7950 60  0001 C CNN "Description"
 	1    10850 7950
 	1    0    0    -1  
 $EndComp
@@ -1612,6 +1804,9 @@ U 1 1 502BE21C
 P 5600 3500
 F 0 "U4" H 5600 3600 60  0000 C CNN
 F 1 "RFFC5072" H 5600 3400 60  0000 C CNN
+F 4 "RFMD" H 5600 3500 60  0001 C CNN "Manufacturer"
+F 5 "RFFC5072" H 5600 3500 60  0001 C CNN "Part Number"
+F 6 "WIDEBAND SYNTHESIZER/VCO WITH INTEGRATED 6GHz MIXER" H 5600 3500 60  0001 C CNN "Description"
 	1    5600 3500
 	-1   0    0    1   
 $EndComp
@@ -1645,6 +1840,9 @@ U 1 1 502B5704
 P 13900 5200
 F 0 "U9" H 13900 5200 60  0000 C CNN
 F 1 "SKY13317" H 13900 5450 60  0000 C CNN
+F 4 "Skyworks" H 13900 5200 60  0001 C CNN "Manufacturer"
+F 5 "SKY13317-373LF" H 13900 5200 60  0001 C CNN "Part Number"
+F 6 "20 MHz-6.0 GHz pHEMT GaAs SP3T Switch" H 13900 5200 60  0001 C CNN "Description"
 	1    13900 5200
 	-1   0    0    1   
 $EndComp
@@ -1661,19 +1859,19 @@ F 6 "CAP CER 10000PF 16V 10% X7R 0402" H 19650 3500 60  0001 C CNN "Description"
 	1    0    0    1   
 $EndComp
 $Comp
-L GND #PWR15
+L GND #PWR14
 U 1 1 502B5542
 P 12850 3000
-F 0 "#PWR15" H 12850 3000 30  0001 C CNN
+F 0 "#PWR14" H 12850 3000 30  0001 C CNN
 F 1 "GND" H 12850 2930 30  0001 C CNN
 	1    12850 3000
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR29
+L GND #PWR28
 U 1 1 502B54A4
 P 10450 4250
-F 0 "#PWR29" H 10450 4250 30  0001 C CNN
+F 0 "#PWR28" H 10450 4250 30  0001 C CNN
 F 1 "GND" H 10450 4180 30  0001 C CNN
 	1    10450 4250
 	1    0    0    -1  
@@ -1729,6 +1927,9 @@ U 1 1 502B4C1C
 P 7100 6750
 F 0 "U10" H 7100 6950 60  0000 C CNN
 F 1 "SKY13350" H 7100 6550 60  0000 C CNN
+F 4 "Skyworks" H 7100 6750 60  0001 C CNN "Manufacturer"
+F 5 "SKY13350-385LF" H 7100 6750 60  0001 C CNN "Part Number"
+F 6 "0.01-6.0 GHz GaAs SPDT Switch" H 7100 6750 60  0001 C CNN "Description"
 	1    7100 6750
 	0    -1   -1   0   
 $EndComp
@@ -1745,30 +1946,6 @@ F 6 "CAP CER 10000PF 16V 10% X7R 0402" H 13100 4950 60  0001 C CNN "Description"
 	0    1    1    0   
 $EndComp
 $Comp
-L INDUCTOR L3
-U 1 1 502B4BB6
-P 5050 5350
-F 0 "L3" V 5000 5350 40  0000 C CNN
-F 1 "180nH" V 5150 5350 40  0000 C CNN
-F 4 "Wurth" H 5050 5350 60  0001 C CNN "Manufacturer"
-F 5 "744761218C" H 5050 5350 60  0001 C CNN "Part Number"
-F 6 "INDUCTOR 180NH .25A WW 0603" H 5050 5350 60  0001 C CNN "Description"
-	1    5050 5350
-	0    1    1    0   
-$EndComp
-$Comp
-L INDUCTOR L2
-U 1 1 502B4BB2
-P 5050 5050
-F 0 "L2" V 5000 5050 40  0000 C CNN
-F 1 "180nH" V 5150 5050 40  0000 C CNN
-F 4 "Wurth" H 5050 5050 60  0001 C CNN "Manufacturer"
-F 5 "744761218C" H 5050 5050 60  0001 C CNN "Part Number"
-F 6 "INDUCTOR 180NH .25A WW 0603" H 5050 5050 60  0001 C CNN "Description"
-	1    5050 5050
-	0    1    1    0   
-$EndComp
-$Comp
 L INDUCTOR L4
 U 1 1 4FB55E30
 P 5550 5950
@@ -1783,6 +1960,9 @@ U 1 1 502B490F
 P 9550 2600
 F 0 "U2" H 9550 2800 60  0000 C CNN
 F 1 "SKY13350" H 9550 2400 60  0000 C CNN
+F 4 "Skyworks" H 9550 2600 60  0001 C CNN "Manufacturer"
+F 5 "SKY13350-385LF" H 9550 2600 60  0001 C CNN "Part Number"
+F 6 "0.01-6.0 GHz GaAs SPDT Switch" H 9550 2600 60  0001 C CNN "Description"
 	1    9550 2600
 	0    1    1    0   
 $EndComp
@@ -1799,10 +1979,10 @@ F 6 "CAP CER 33PF 50V 5% NP0 0402" H 5800 4750 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR35
+L GND #PWR34
 U 1 1 502B477F
 P 2650 5250
-F 0 "#PWR35" H 2650 5250 30  0001 C CNN
+F 0 "#PWR34" H 2650 5250 30  0001 C CNN
 F 1 "GND" H 2650 5180 30  0001 C CNN
 	1    2650 5250
 	1    0    0    -1  
@@ -1813,14 +1993,17 @@ U 1 1 502B477E
 P 2650 4000
 F 0 "U7" H 2650 4200 60  0000 C CNN
 F 1 "SKY13350" H 2650 3800 60  0000 C CNN
+F 4 "Skyworks" H 2650 4000 60  0001 C CNN "Manufacturer"
+F 5 "SKY13350-385LF" H 2650 4000 60  0001 C CNN "Part Number"
+F 6 "0.01-6.0 GHz GaAs SPDT Switch" H 2650 4000 60  0001 C CNN "Description"
 	1    2650 4000
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR18
+L GND #PWR17
 U 1 1 502B477C
 P 2550 3450
-F 0 "#PWR18" H 2550 3450 30  0001 C CNN
+F 0 "#PWR17" H 2550 3450 30  0001 C CNN
 F 1 "GND" H 2550 3380 30  0001 C CNN
 	1    2550 3450
 	-1   0    0    1   
@@ -1850,10 +2033,10 @@ F 6 "CAP CER 33PF 50V 5% NP0 0402" H 14400 5700 60  0001 C CNN "Description"
 	0    1    -1   0   
 $EndComp
 $Comp
-L GND #PWR19
+L GND #PWR18
 U 1 1 502B4778
 P 3350 3450
-F 0 "#PWR19" H 3350 3450 30  0001 C CNN
+F 0 "#PWR18" H 3350 3450 30  0001 C CNN
 F 1 "GND" H 3350 3380 30  0001 C CNN
 	1    3350 3450
 	0    -1   -1   0   
@@ -1873,6 +2056,7 @@ U 1 1 4FB3CC51
 P 7650 9200
 F 0 "P5" V 7600 9200 40  0000 C CNN
 F 1 "CLK" V 7700 9200 40  0000 C CNN
+F 4 "DNP" H 7650 9200 60  0001 C CNN "Note"
 	1    7650 9200
 	-1   0    0    1   
 $EndComp
@@ -1882,6 +2066,7 @@ U 1 1 501F4DC6
 P 9350 9750
 F 0 "P7" H 9350 10150 60  0000 C CNN
 F 1 "VCC" V 9350 9750 60  0000 C CNN
+F 4 "DNP" H 9350 9750 60  0001 C CNN "Note"
 	1    9350 9750
 	1    0    0    -1  
 $EndComp
@@ -1898,10 +2083,10 @@ HP
 Text Label 10350 2250 3    40   ~ 0
 LP
 $Comp
-L GND #PWR11
+L GND #PWR10
 U 1 1 501F4794
 P 1250 2700
-F 0 "#PWR11" H 1250 2700 30  0001 C CNN
+F 0 "#PWR10" H 1250 2700 30  0001 C CNN
 F 1 "GND" H 1250 2630 30  0001 C CNN
 	1    1250 2700
 	0    1    1    0   
@@ -1952,10 +2137,10 @@ F 6 "CAP CER 33PF 50V 5% NP0 0402" H 13600 8700 60  0001 C CNN "Description"
 	0    1    -1   0   
 $EndComp
 $Comp
-L GND #PWR49
+L GND #PWR48
 U 1 1 501F477C
 P 2550 6450
-F 0 "#PWR49" H 2550 6450 30  0001 C CNN
+F 0 "#PWR48" H 2550 6450 30  0001 C CNN
 F 1 "GND" H 2550 6380 30  0001 C CNN
 	1    2550 6450
 	0    -1   -1   0   
@@ -1982,10 +2167,10 @@ F 1 "GND" H 1250 7630 30  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR8
+L GND #PWR7
 U 1 1 501F46AE
 P 10950 2400
-F 0 "#PWR8" H 10950 2400 30  0001 C CNN
+F 0 "#PWR7" H 10950 2400 30  0001 C CNN
 F 1 "GND" H 10950 2330 30  0001 C CNN
 	1    10950 2400
 	0    -1   -1   0   
@@ -2058,14 +2243,17 @@ U 1 1 501F3B20
 P 12950 3550
 F 0 "U5" H 12950 3750 60  0000 C CNN
 F 1 "SKY13350" H 12950 3350 60  0000 C CNN
+F 4 "Skyworks" H 12950 3550 60  0001 C CNN "Manufacturer"
+F 5 "SKY13350-385LF" H 12950 3550 60  0001 C CNN "Part Number"
+F 6 "0.01-6.0 GHz GaAs SPDT Switch" H 12950 3550 60  0001 C CNN "Description"
 	1    12950 3550
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR12
+L GND #PWR11
 U 1 1 501EF7A8
 P 2050 2700
-F 0 "#PWR12" H 2050 2700 30  0001 C CNN
+F 0 "#PWR11" H 2050 2700 30  0001 C CNN
 F 1 "GND" H 2050 2630 30  0001 C CNN
 	1    2050 2700
 	1    0    0    -1  
@@ -2088,6 +2276,9 @@ U 1 1 501EF778
 P 1950 2150
 F 0 "U1" H 1950 2350 60  0000 C CNN
 F 1 "SKY13350" H 1950 1950 60  0000 C CNN
+F 4 "Skyworks" H 1950 2150 60  0001 C CNN "Manufacturer"
+F 5 "SKY13350-385LF" H 1950 2150 60  0001 C CNN "Part Number"
+F 6 "0.01-6.0 GHz GaAs SPDT Switch" H 1950 2150 60  0001 C CNN "Description"
 	1    1950 2150
 	0    -1   -1   0   
 $EndComp
@@ -2130,6 +2321,9 @@ U 1 1 501EF646
 P 1950 7150
 F 0 "U11" H 1950 7350 60  0000 C CNN
 F 1 "SKY13350" H 1950 6950 60  0000 C CNN
+F 4 "Skyworks" H 1950 7150 60  0001 C CNN "Manufacturer"
+F 5 "SKY13350-385LF" H 1950 7150 60  0001 C CNN "Part Number"
+F 6 "0.01-6.0 GHz GaAs SPDT Switch" H 1950 7150 60  0001 C CNN "Description"
 	1    1950 7150
 	0    -1   -1   0   
 $EndComp
@@ -2139,14 +2333,17 @@ U 1 1 501EF4A4
 P 6100 6300
 F 0 "T2" H 6100 6500 70  0000 C CNN
 F 1 "MIX_OUT_BALUN" H 6000 6150 70  0000 C CNN
+F 4 "Anaren" H 6100 6300 60  0001 C CNN "Manufacturer"
+F 5 "B0310J50100AHF" H 6100 6300 60  0001 C CNN "Part Number"
+F 6 "Ultra Low Profile 0805 Balun 50 to 100 ohm Balanced" H 6100 6300 60  0001 C CNN "Description"
 	1    6100 6300
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR23
+L GND #PWR22
 U 1 1 501EF4A0
 P 3250 3800
-F 0 "#PWR23" H 3250 3800 30  0001 C CNN
+F 0 "#PWR22" H 3250 3800 30  0001 C CNN
 F 1 "GND" H 3250 3730 30  0001 C CNN
 	1    3250 3800
 	-1   0    0    1   
@@ -2157,6 +2354,9 @@ U 1 1 501EF483
 P 3650 4450
 F 0 "T1" H 3650 4650 70  0000 C CNN
 F 1 "MIX_IN_BALUN" H 3650 4300 70  0000 C CNN
+F 4 "Anaren" H 3650 4450 60  0001 C CNN "Manufacturer"
+F 5 "B0310J50100AHF" H 3650 4450 60  0001 C CNN "Part Number"
+F 6 "Ultra Low Profile 0805 Balun 50 to 100 ohm Balanced" H 3650 4450 60  0001 C CNN "Description"
 	1    3650 4450
 	-1   0    0    1   
 $EndComp
@@ -2178,6 +2378,9 @@ U 1 1 501EF258
 P 10350 3700
 F 0 "U6" H 10350 3900 60  0000 C CNN
 F 1 "SKY13350" H 10350 3500 60  0000 C CNN
+F 4 "Skyworks" H 10350 3700 60  0001 C CNN "Manufacturer"
+F 5 "SKY13350-385LF" H 10350 3700 60  0001 C CNN "Part Number"
+F 6 "0.01-6.0 GHz GaAs SPDT Switch" H 10350 3700 60  0001 C CNN "Description"
 	1    10350 3700
 	0    -1   -1   0   
 $EndComp
@@ -2190,53 +2393,11 @@ F 1 "GND" H 1500 10280 30  0001 C CNN
 	1    1500 10350
 	1    0    0    -1  
 $EndComp
-NoConn ~ 12000 10350
-NoConn ~ 11900 10350
-NoConn ~ 11800 10350
-NoConn ~ 11700 10350
-Text Notes 11600 10000 0    40   ~ 0
-mounting holes
 $Comp
-L CONN_1 P8
-U 1 1 4FB81E54
-P 11700 10200
-F 0 "P8" H 11780 10200 40  0000 L CNN
-F 1 "CONN_1" H 11700 10255 30  0001 C CNN
-	1    11700 10200
-	0    -1   -1   0   
-$EndComp
-$Comp
-L CONN_1 P9
-U 1 1 4FB81E53
-P 11800 10200
-F 0 "P9" H 11880 10200 40  0000 L CNN
-F 1 "CONN_1" H 11800 10255 30  0001 C CNN
-	1    11800 10200
-	0    -1   -1   0   
-$EndComp
-$Comp
-L CONN_1 P10
-U 1 1 4FB81E51
-P 11900 10200
-F 0 "P10" H 11980 10200 40  0000 L CNN
-F 1 "CONN_1" H 11900 10255 30  0001 C CNN
-	1    11900 10200
-	0    -1   -1   0   
-$EndComp
-$Comp
-L CONN_1 P11
-U 1 1 4FB81E45
-P 12000 10200
-F 0 "P11" H 12080 10200 40  0000 L CNN
-F 1 "CONN_1" H 12000 10255 30  0001 C CNN
-	1    12000 10200
-	0    -1   -1   0   
-$EndComp
-$Comp
-L GND #PWR37
+L GND #PWR36
 U 1 1 4FB57576
 P 8850 5350
-F 0 "#PWR37" H 8850 5350 30  0001 C CNN
+F 0 "#PWR36" H 8850 5350 30  0001 C CNN
 F 1 "GND" H 8850 5280 30  0001 C CNN
 	1    8850 5350
 	1    0    0    -1  
@@ -2247,6 +2408,7 @@ U 1 1 4FB57544
 P 8350 5050
 F 0 "P2" H 8350 5350 60  0000 C CNN
 F 1 "SERIAL" V 8350 5050 50  0000 C CNN
+F 4 "DNP" H 8350 5050 60  0001 C CNN "Note"
 	1    8350 5050
 	1    0    0    -1  
 $EndComp
@@ -2264,10 +2426,10 @@ F 6 "CAP CER 100PF 50V 5% NP0 0402" H 7650 7200 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR45
+L GND #PWR44
 U 1 1 4FB55FAC
 P 4350 5950
-F 0 "#PWR45" H 4350 5950 30  0001 C CNN
+F 0 "#PWR44" H 4350 5950 30  0001 C CNN
 F 1 "GND" H 4350 5880 30  0001 C CNN
 	1    4350 5950
 	1    0    0    -1  
@@ -2287,10 +2449,10 @@ F 6 "CAP CER 47PF 50V 5% NP0 0402" H 8350 9400 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR28
+L GND #PWR27
 U 1 1 4FB52F5A
 P 6850 4250
-F 0 "#PWR28" H 6850 4250 30  0001 C CNN
+F 0 "#PWR27" H 6850 4250 30  0001 C CNN
 F 1 "GND" H 6850 4180 30  0001 C CNN
 	1    6850 4250
 	1    0    0    -1  
@@ -2396,6 +2558,7 @@ U 1 1 4FB3CA54
 P 6300 9750
 F 0 "P6" H 6300 10150 60  0000 C CNN
 F 1 "SWITCH_CTRL" V 6300 9750 60  0000 C CNN
+F 4 "DNP" H 6300 9750 60  0001 C CNN "Note"
 	1    6300 9750
 	1    0    0    -1  
 $EndComp
@@ -2480,19 +2643,19 @@ F 6 "IC HEX INVERTERS 14-QFN" H 1500 9600 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR36
+L GND #PWR35
 U 1 1 4FAECFE7
 P 7850 5350
-F 0 "#PWR36" H 7850 5350 30  0001 C CNN
+F 0 "#PWR35" H 7850 5350 30  0001 C CNN
 F 1 "GND" H 7850 5280 30  0001 C CNN
 	1    7850 5350
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR27
+L VCC #PWR26
 U 1 1 4FAECFB5
 P 7350 4150
-F 0 "#PWR27" H 7350 4250 30  0001 C CNN
+F 0 "#PWR26" H 7350 4250 30  0001 C CNN
 F 1 "VCC" H 7350 4250 30  0000 C CNN
 	1    7350 4150
 	1    0    0    -1  
@@ -2510,37 +2673,37 @@ F 6 "RES 4.7K OHM 1/16W 5% 0402 SMD" H 7350 4500 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR41
+L GND #PWR40
 U 1 1 4FAECE90
 P 6950 5750
-F 0 "#PWR41" H 6950 5750 30  0001 C CNN
+F 0 "#PWR40" H 6950 5750 30  0001 C CNN
 F 1 "GND" H 6950 5680 30  0001 C CNN
 	1    6950 5750
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR40
+L GND #PWR39
 U 1 1 4FAECE8F
 P 6650 5750
-F 0 "#PWR40" H 6650 5750 30  0001 C CNN
+F 0 "#PWR39" H 6650 5750 30  0001 C CNN
 F 1 "GND" H 6650 5680 30  0001 C CNN
 	1    6650 5750
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR39
+L GND #PWR38
 U 1 1 4FAECE8E
 P 6350 5750
-F 0 "#PWR39" H 6350 5750 30  0001 C CNN
+F 0 "#PWR38" H 6350 5750 30  0001 C CNN
 F 1 "GND" H 6350 5680 30  0001 C CNN
 	1    6350 5750
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR38
+L GND #PWR37
 U 1 1 4FAECE8C
 P 6050 5750
-F 0 "#PWR38" H 6050 5750 30  0001 C CNN
+F 0 "#PWR37" H 6050 5750 30  0001 C CNN
 F 1 "GND" H 6050 5680 30  0001 C CNN
 	1    6050 5750
 	1    0    0    -1  
@@ -2594,10 +2757,10 @@ F 6 "CAP CER 33PF 50V 5% NP0 0402" H 6950 5450 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR26
+L VCC #PWR25
 U 1 1 4FAECE5B
 P 7150 4150
-F 0 "#PWR26" H 7150 4250 30  0001 C CNN
+F 0 "#PWR25" H 7150 4250 30  0001 C CNN
 F 1 "VCC" H 7150 4250 30  0000 C CNN
 	1    7150 4150
 	1    0    0    -1  
@@ -2617,10 +2780,10 @@ $EndComp
 Text Label 5650 4900 1    40   ~ 0
 RESETX
 $Comp
-L GND #PWR7
+L GND #PWR6
 U 1 1 4FAECD9D
 P 5650 2250
-F 0 "#PWR7" H 5650 2250 30  0001 C CNN
+F 0 "#PWR6" H 5650 2250 30  0001 C CNN
 F 1 "GND" H 5650 2180 30  0001 C CNN
 	1    5650 2250
 	-1   0    0    1   
@@ -2640,10 +2803,10 @@ $EndComp
 NoConn ~ 6750 3750
 NoConn ~ 6750 3650
 $Comp
-L GND #PWR21
+L GND #PWR20
 U 1 1 4FAECC8F
 P 7650 3550
-F 0 "#PWR21" H 7650 3550 30  0001 C CNN
+F 0 "#PWR20" H 7650 3550 30  0001 C CNN
 F 1 "GND" H 7650 3480 30  0001 C CNN
 	1    7650 3550
 	0    -1   -1   0   
@@ -2681,10 +2844,10 @@ F 1 "VCC" H 4800 800 30  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR20
+L VCC #PWR19
 U 1 1 4FAECBCE
 P 6850 3450
-F 0 "#PWR20" H 6850 3550 30  0001 C CNN
+F 0 "#PWR19" H 6850 3550 30  0001 C CNN
 F 1 "VCC" H 6850 3550 30  0000 C CNN
 	1    6850 3450
 	0    1    1    0   
@@ -2800,19 +2963,19 @@ F 6 "CAP CER 8.2PF 50V NP0 0402" H 8650 2450 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR14
+L GND #PWR13
 U 1 1 4FAEC88E
 P 7750 2750
-F 0 "#PWR14" H 7750 2750 30  0001 C CNN
+F 0 "#PWR13" H 7750 2750 30  0001 C CNN
 F 1 "GND" H 7750 2680 30  0001 C CNN
 	1    7750 2750
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR13
+L GND #PWR12
 U 1 1 4FAEC88B
 P 7050 2750
-F 0 "#PWR13" H 7050 2750 30  0001 C CNN
+F 0 "#PWR12" H 7050 2750 30  0001 C CNN
 F 1 "GND" H 7050 2680 30  0001 C CNN
 	1    7050 2750
 	1    0    0    -1  
@@ -2866,10 +3029,10 @@ F 6 "CAP CER 330PF 50V 10% X7R 0402" H 7050 2450 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR46
+L GND #PWR45
 U 1 1 4FAEC785
 P 4650 5950
-F 0 "#PWR46" H 4650 5950 30  0001 C CNN
+F 0 "#PWR45" H 4650 5950 30  0001 C CNN
 F 1 "GND" H 4650 5880 30  0001 C CNN
 	1    4650 5950
 	1    0    0    -1  
@@ -2905,10 +3068,10 @@ HP
 Text Label 5500 9650 0    40   ~ 0
 TX
 $Comp
-L VCC #PWR33
+L VCC #PWR32
 U 1 1 4FAEC085
 P 4650 4950
-F 0 "#PWR33" H 4650 5050 30  0001 C CNN
+F 0 "#PWR32" H 4650 5050 30  0001 C CNN
 F 1 "VCC" H 4650 5050 30  0000 C CNN
 	1    4650 4950
 	1    0    0    -1  
@@ -2935,46 +3098,46 @@ F 6 "CAP CER 47PF 50V 5% NP0 0402" H 12550 5800 60  0001 C CNN "Description"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR25
+L GND #PWR24
 U 1 1 4FAA142A
 P 10950 4100
-F 0 "#PWR25" H 10950 4100 30  0001 C CNN
+F 0 "#PWR24" H 10950 4100 30  0001 C CNN
 F 1 "GND" H 10950 4030 30  0001 C CNN
 	1    10950 4100
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR9
+L GND #PWR8
 U 1 1 4FAA1424
 P 10950 2550
-F 0 "#PWR9" H 10950 2550 30  0001 C CNN
+F 0 "#PWR8" H 10950 2550 30  0001 C CNN
 F 1 "GND" H 10950 2480 30  0001 C CNN
 	1    10950 2550
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR10
+L GND #PWR9
 U 1 1 4FAA10AF
 P 12350 2550
-F 0 "#PWR10" H 12350 2550 30  0001 C CNN
+F 0 "#PWR9" H 12350 2550 30  0001 C CNN
 F 1 "GND" H 12350 2480 30  0001 C CNN
 	1    12350 2550
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR30
+L GND #PWR29
 U 1 1 4FAA1098
 P 12350 4400
-F 0 "#PWR30" H 12350 4400 30  0001 C CNN
+F 0 "#PWR29" H 12350 4400 30  0001 C CNN
 F 1 "GND" H 12350 4330 30  0001 C CNN
 	1    12350 4400
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR34
+L GND #PWR33
 U 1 1 4FAA0C6C
 P 10250 5000
-F 0 "#PWR34" H 10250 5000 30  0001 C CNN
+F 0 "#PWR33" H 10250 5000 30  0001 C CNN
 F 1 "GND" H 10250 4930 30  0001 C CNN
 	1    10250 5000
 	1    0    0    -1  
@@ -2992,75 +3155,33 @@ F 6 "CAP CER 33PF 50V 5% NP0 0402" H 13400 4500 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR22
+L VCC #PWR21
 U 1 1 4FAA0C25
 P 4350 3650
-F 0 "#PWR22" H 4350 3750 30  0001 C CNN
+F 0 "#PWR21" H 4350 3750 30  0001 C CNN
 F 1 "VCC" H 4350 3750 30  0000 C CNN
 	1    4350 3650
 	0    -1   -1   0   
 $EndComp
 $Comp
-L VCC #PWR17
+L VCC #PWR16
 U 1 1 4FAA0C0D
 P 4350 3350
-F 0 "#PWR17" H 4350 3450 30  0001 C CNN
+F 0 "#PWR16" H 4350 3450 30  0001 C CNN
 F 1 "VCC" H 4350 3450 30  0000 C CNN
 	1    4350 3350
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR6
-U 1 1 4FAA08FD
-P 650 2200
-F 0 "#PWR6" H 650 2200 30  0001 C CNN
-F 1 "GND" H 650 2130 30  0001 C CNN
-	1    650  2200
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR51
-U 1 1 4FAA08F7
-P 650 7200
-F 0 "#PWR51" H 650 7200 30  0001 C CNN
-F 1 "GND" H 650 7130 30  0001 C CNN
-	1    650  7200
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR50
+L GND #PWR49
 U 1 1 4FAA08EA
 P 6500 6950
-F 0 "#PWR50" H 6500 6950 30  0001 C CNN
+F 0 "#PWR49" H 6500 6950 30  0001 C CNN
 F 1 "GND" H 6500 6880 30  0001 C CNN
 	1    6500 6950
 	1    0    0    -1  
 $EndComp
 $Comp
-L GSG-SMA-CONN P3
-U 1 1 4FA9C5BB
-P 950 6600
-F 0 "P3" H 950 6750 60  0000 C CNN
-F 1 "RX-OUT" H 950 6450 60  0000 C CNN
-F 4 "Linx" H -14000 2200 60  0001 C CNN "Manufacturer"
-F 5 "CONSMA003.062" H -14000 2200 60  0001 C CNN "Part Number"
-F 6 "CONN FEMALE EDGE MT FOR .062\" BD" H -14000 2200 60  0001 C CNN "Description"
-	1    950  6600
-	1    0    0    -1  
-$EndComp
-$Comp
-L GSG-SMA-CONN P1
-U 1 1 4FA9C5A4
-P 950 1600
-F 0 "P1" H 950 1750 60  0000 C CNN
-F 1 "TX-IN" H 950 1450 60  0000 C CNN
-F 4 "Linx" H -14000 4050 60  0001 C CNN "Manufacturer"
-F 5 "CONSMA003.062" H -14000 4050 60  0001 C CNN "Part Number"
-F 6 "CONN FEMALE EDGE MT FOR .062\" BD" H -14000 4050 60  0001 C CNN "Description"
-	1    950  1600
-	1    0    0    -1  
-$EndComp
-$Comp
 L FIL-LP0603 U3
 U 1 1 4F94D561
 P 11650 2700
@@ -3093,6 +3214,7 @@ F 1 "ANTENNA" H 16100 8850 60  0000 C CNN
 F 4 "Linx" H 16100 9000 60  0001 C CNN "Manufacturer"
 F 5 "CONSMA003.062" H 16100 9000 60  0001 C CNN "Part Number"
 F 6 "CONN FEMALE EDGE MT FOR .062\" BD" H 16100 9000 60  0001 C CNN "Description"
+F 7 "DNP" H 15850 9000 60  0000 C CNN "Note"
 	1    16100 9000
 	-1   0    0    -1  
 $EndComp
diff --git a/hardware/jawbreaker/jawbreaker-cache.lib b/hardware/jawbreaker/jawbreaker-cache.lib
index 621e0832..e75edd24 100644
--- a/hardware/jawbreaker/jawbreaker-cache.lib
+++ b/hardware/jawbreaker/jawbreaker-cache.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: Mon Aug 27 12:18:28 2012
+EESchema-LIBRARY Version 2.3  Date: Mon Aug 27 22:37:01 2012
 #encoding utf-8
 #
 # +1.8V
diff --git a/hardware/jawbreaker/jawbreaker.sch b/hardware/jawbreaker/jawbreaker.sch
index 8a564813..0e84d372 100644
--- a/hardware/jawbreaker/jawbreaker.sch
+++ b/hardware/jawbreaker/jawbreaker.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Mon Aug 27 12:18:27 2012
+EESchema Schematic File Version 2  date Mon Aug 27 22:37:01 2012
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -37,7 +37,7 @@ $Descr User 17000 11000
 encoding utf-8
 Sheet 1 4
 Title "jawbreaker"
-Date "27 aug 2012"
+Date "28 aug 2012"
 Rev ""
 Comp "Copyright 2012 Michael Ossmann"
 Comment1 "License: GPL v2"
diff --git a/hardware/jawbreaker/mcu.sch b/hardware/jawbreaker/mcu.sch
index 11dbe367..337eae78 100644
--- a/hardware/jawbreaker/mcu.sch
+++ b/hardware/jawbreaker/mcu.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Mon Aug 27 12:18:28 2012
+EESchema Schematic File Version 2  date Mon Aug 27 22:37:01 2012
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -37,7 +37,7 @@ $Descr User 17000 11000
 encoding utf-8
 Sheet 4 4
 Title "jawbreaker mcu/usb/power"
-Date "27 aug 2012"
+Date "28 aug 2012"
 Rev ""
 Comp "Copyright 2012 Michael Ossmann"
 Comment1 "License: GPL v2"
@@ -1956,10 +1956,10 @@ DA6
 Text GLabel 11300 9600 2    40   Input ~ 0
 DA7
 $Comp
-L 1V8 #PWR212
+L 1V8 #PWR210
 U 1 1 503717E2
 P 12950 3700
-F 0 "#PWR212" H 12950 3840 20  0001 C CNN
+F 0 "#PWR210" H 12950 3840 20  0001 C CNN
 F 1 "1V8" H 12950 3810 30  0000 C CNN
 	1    12950 3700
 	1    0    0    -1  
@@ -1990,10 +1990,10 @@ F 7 "DNP" H 12950 4050 60  0001 C CNN "Note"
 	-1   0    0    1   
 $EndComp
 $Comp
-L VCC #PWR211
+L VCC #PWR209
 U 1 1 503717B7
 P 12750 3700
-F 0 "#PWR211" H 12750 3800 30  0001 C CNN
+F 0 "#PWR209" H 12750 3800 30  0001 C CNN
 F 1 "VCC" H 12750 3800 30  0000 C CNN
 	1    12750 3700
 	1    0    0    -1  
@@ -2009,10 +2009,10 @@ NoConn ~ 4300 3000
 Text Label 2300 9300 2    40   ~ 0
 BOOT3
 $Comp
-L VCC #PWR266
+L VCC #PWR264
 U 1 1 503713EC
 P 2050 8600
-F 0 "#PWR266" H 2050 8700 30  0001 C CNN
+F 0 "#PWR264" H 2050 8700 30  0001 C CNN
 F 1 "VCC" H 2050 8700 30  0000 C CNN
 	1    2050 8600
 	1    0    0    -1  
@@ -2031,28 +2031,28 @@ F 7 "DNP" H 2050 8950 60  0001 C CNN "Note"
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR274
+L GND #PWR272
 U 1 1 503713EA
 P 2050 10000
-F 0 "#PWR274" H 2050 10000 30  0001 C CNN
+F 0 "#PWR272" H 2050 10000 30  0001 C CNN
 F 1 "GND" H 2050 9930 30  0001 C CNN
 	1    2050 10000
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR273
+L GND #PWR271
 U 1 1 503713B9
 P 1600 10000
-F 0 "#PWR273" H 1600 10000 30  0001 C CNN
+F 0 "#PWR271" H 1600 10000 30  0001 C CNN
 F 1 "GND" H 1600 9930 30  0001 C CNN
 	1    1600 10000
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR265
+L VCC #PWR263
 U 1 1 503713B7
 P 1600 8600
-F 0 "#PWR265" H 1600 8700 30  0001 C CNN
+F 0 "#PWR263" H 1600 8700 30  0001 C CNN
 F 1 "VCC" H 1600 8700 30  0000 C CNN
 	1    1600 8600
 	1    0    0    -1  
@@ -2062,28 +2062,28 @@ BOOT2
 Text Label 1400 9300 2    40   ~ 0
 BOOT1
 $Comp
-L VCC #PWR264
+L VCC #PWR262
 U 1 1 50371392
 P 1150 8600
-F 0 "#PWR264" H 1150 8700 30  0001 C CNN
+F 0 "#PWR262" H 1150 8700 30  0001 C CNN
 F 1 "VCC" H 1150 8700 30  0000 C CNN
 	1    1150 8600
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR272
+L GND #PWR270
 U 1 1 5037138F
 P 1150 10000
-F 0 "#PWR272" H 1150 10000 30  0001 C CNN
+F 0 "#PWR270" H 1150 10000 30  0001 C CNN
 F 1 "GND" H 1150 9930 30  0001 C CNN
 	1    1150 10000
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR271
+L GND #PWR269
 U 1 1 50371368
 P 700 10000
-F 0 "#PWR271" H 700 10000 30  0001 C CNN
+F 0 "#PWR269" H 700 10000 30  0001 C CNN
 F 1 "GND" H 700 9930 30  0001 C CNN
 	1    700  10000
 	1    0    0    -1  
@@ -2093,19 +2093,19 @@ XTAL2
 Text Label 2650 9600 0    40   ~ 0
 XTAL1
 $Comp
-L GND #PWR279
+L GND #PWR277
 U 1 1 50370EE5
 P 3650 10200
-F 0 "#PWR279" H 3650 10200 30  0001 C CNN
+F 0 "#PWR277" H 3650 10200 30  0001 C CNN
 F 1 "GND" H 3650 10130 30  0001 C CNN
 	1    3650 10200
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR278
+L GND #PWR276
 U 1 1 50370EE4
 P 2850 10200
-F 0 "#PWR278" H 2850 10200 30  0001 C CNN
+F 0 "#PWR276" H 2850 10200 30  0001 C CNN
 F 1 "GND" H 2850 10130 30  0001 C CNN
 	1    2850 10200
 	1    0    0    -1  
@@ -2129,19 +2129,19 @@ F 1 "10pF" H 3700 9800 50  0000 L CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR276
+L GND #PWR274
 U 1 1 50370EC9
 P 3350 10000
-F 0 "#PWR276" H 3350 10000 30  0001 C CNN
+F 0 "#PWR274" H 3350 10000 30  0001 C CNN
 F 1 "GND" H 3350 9930 30  0001 C CNN
 	1    3350 10000
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR275
+L GND #PWR273
 U 1 1 50370EC7
 P 3150 10000
-F 0 "#PWR275" H 3150 10000 30  0001 C CNN
+F 0 "#PWR273" H 3150 10000 30  0001 C CNN
 F 1 "GND" H 3150 9930 30  0001 C CNN
 	1    3150 10000
 	1    0    0    -1  
@@ -2415,10 +2415,10 @@ F 6 "LED YLW SUPER BRIGHT 0606 SMD" H 10600 5600 60  0001 C CNN "Description"
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR246
+L GND #PWR244
 U 1 1 4F87ACCB
 P 10600 6500
-F 0 "#PWR246" H 10600 6500 30  0001 C CNN
+F 0 "#PWR244" H 10600 6500 30  0001 C CNN
 F 1 "GND" H 10600 6430 30  0001 C CNN
 	1    10600 6500
 	1    0    0    -1  
@@ -2447,10 +2447,10 @@ SPIFI_SCK
 Text Label 7750 1550 1    40   ~ 0
 SPIFI_SIO3
 $Comp
-L VCC #PWR263
+L VCC #PWR261
 U 1 1 4F8714B2
 P 700 8600
-F 0 "#PWR263" H 700 8700 30  0001 C CNN
+F 0 "#PWR261" H 700 8700 30  0001 C CNN
 F 1 "VCC" H 700 8700 30  0000 C CNN
 	1    700  8600
 	1    0    0    -1  
@@ -2474,19 +2474,19 @@ VCCIO1
 Text Label 13600 9250 1    40   ~ 0
 VCCIO1
 $Comp
-L VCC #PWR230
+L VCC #PWR228
 U 1 1 4F8712D4
 P 12600 4700
-F 0 "#PWR230" H 12600 4800 30  0001 C CNN
+F 0 "#PWR228" H 12600 4800 30  0001 C CNN
 F 1 "VCC" H 12600 4800 30  0000 C CNN
 	1    12600 4700
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR231
+L VCC #PWR229
 U 1 1 4F8712C6
 P 13600 4700
-F 0 "#PWR231" H 13600 4800 30  0001 C CNN
+F 0 "#PWR229" H 13600 4800 30  0001 C CNN
 F 1 "VCC" H 13600 4800 30  0000 C CNN
 	1    13600 4700
 	1    0    0    -1  
@@ -2499,10 +2499,10 @@ LED2
 Text Label 4000 3200 0    40   ~ 0
 LED1
 $Comp
-L GND #PWR236
+L GND #PWR234
 U 1 1 4F83C49F
 P 3200 5150
-F 0 "#PWR236" H 3200 5150 30  0001 C CNN
+F 0 "#PWR234" H 3200 5150 30  0001 C CNN
 F 1 "GND" H 3200 5080 30  0001 C CNN
 	1    3200 5150
 	1    0    0    -1  
@@ -2538,10 +2538,10 @@ LED2
 Text Label 2550 6650 3    40   ~ 0
 LED1
 $Comp
-L VCC #PWR247
+L VCC #PWR245
 U 1 1 4F83C294
 P 3450 6750
-F 0 "#PWR247" H 3450 6850 30  0001 C CNN
+F 0 "#PWR245" H 3450 6850 30  0001 C CNN
 F 1 "VCC" H 3450 6850 30  0000 C CNN
 	1    3450 6750
 	1    0    0    -1  
@@ -2559,10 +2559,10 @@ F 6 "LED YLW SUPER BRIGHT 0606 SMD" H 2850 7700 60  0001 C CNN "Description"
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR262
+L GND #PWR260
 U 1 1 4F83C274
 P 3750 8000
-F 0 "#PWR262" H 3750 8000 30  0001 C CNN
+F 0 "#PWR260" H 3750 8000 30  0001 C CNN
 F 1 "GND" H 3750 7930 30  0001 C CNN
 	1    3750 8000
 	1    0    0    -1  
@@ -2570,10 +2570,10 @@ $EndComp
 Text Label 3750 6650 3    40   ~ 0
 EN1V8
 $Comp
-L GND #PWR258
+L GND #PWR256
 U 1 1 4F83C1E2
 P 2550 8000
-F 0 "#PWR258" H 2550 8000 30  0001 C CNN
+F 0 "#PWR256" H 2550 8000 30  0001 C CNN
 F 1 "GND" H 2550 7930 30  0001 C CNN
 	1    2550 8000
 	1    0    0    -1  
@@ -2615,19 +2615,19 @@ F 6 "LED GREEN STD BRIGHT 0603 SMD" H 2550 7700 60  0001 C CNN "Description"
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR259
+L GND #PWR257
 U 1 1 4F83C1DD
 P 2850 8000
-F 0 "#PWR259" H 2850 8000 30  0001 C CNN
+F 0 "#PWR257" H 2850 8000 30  0001 C CNN
 F 1 "GND" H 2850 7930 30  0001 C CNN
 	1    2850 8000
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR261
+L GND #PWR259
 U 1 1 4F83C1D8
 P 3450 8000
-F 0 "#PWR261" H 3450 8000 30  0001 C CNN
+F 0 "#PWR259" H 3450 8000 30  0001 C CNN
 F 1 "GND" H 3450 7930 30  0001 C CNN
 	1    3450 8000
 	1    0    0    -1  
@@ -2657,28 +2657,28 @@ F 6 "LED RED STD BRIGHT 0603 SMD" H 3150 7700 60  0001 C CNN "Description"
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR260
+L GND #PWR258
 U 1 1 4F83C1A5
 P 3150 8000
-F 0 "#PWR260" H 3150 8000 30  0001 C CNN
+F 0 "#PWR258" H 3150 8000 30  0001 C CNN
 F 1 "GND" H 3150 7930 30  0001 C CNN
 	1    3150 8000
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR206
+L GND #PWR204
 U 1 1 4F83C11C
 P 12250 3350
-F 0 "#PWR206" H 12250 3350 30  0001 C CNN
+F 0 "#PWR204" H 12250 3350 30  0001 C CNN
 F 1 "GND" H 12250 3280 30  0001 C CNN
 	1    12250 3350
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR199
+L VCC #PWR197
 U 1 1 4F83C110
 P 11250 2750
-F 0 "#PWR199" H 11250 2850 30  0001 C CNN
+F 0 "#PWR197" H 11250 2850 30  0001 C CNN
 F 1 "VCC" H 11250 2850 30  0000 C CNN
 	1    11250 2750
 	1    0    0    -1  
@@ -2710,10 +2710,10 @@ I2S0_TX_SDA
 Text Label 8250 1650 3    40   ~ 0
 I2S0_TX_WS
 $Comp
-L GND #PWR245
+L GND #PWR243
 U 1 1 4F83B36A
 P 10300 6500
-F 0 "#PWR245" H 10300 6500 30  0001 C CNN
+F 0 "#PWR243" H 10300 6500 30  0001 C CNN
 F 1 "GND" H 10300 6430 30  0001 C CNN
 	1    10300 6500
 	1    0    0    -1  
@@ -2732,10 +2732,10 @@ F 6 "LED GREEN STD BRIGHT 0603 SMD" H 10300 5600 60  0001 C CNN "Description"
 $EndComp
 NoConn ~ 3000 2900
 $Comp
-L GND #PWR200
+L GND #PWR198
 U 1 1 4F83AF62
 P 1800 3000
-F 0 "#PWR200" H 1800 3000 30  0001 C CNN
+F 0 "#PWR198" H 1800 3000 30  0001 C CNN
 F 1 "GND" H 1800 2930 30  0001 C CNN
 	1    1800 3000
 	0    1    1    0   
@@ -2751,10 +2751,10 @@ WAKEUP
 Text Label 800  7600 0    40   ~ 0
 TRACECLK
 $Comp
-L GND #PWR257
+L GND #PWR255
 U 1 1 4F838489
 P 2000 8000
-F 0 "#PWR257" H 2000 8000 30  0001 C CNN
+F 0 "#PWR255" H 2000 8000 30  0001 C CNN
 F 1 "GND" H 2000 7930 30  0001 C CNN
 	1    2000 8000
 	1    0    0    -1  
@@ -2776,10 +2776,10 @@ CTOUT_4
 Text Label 800  6800 0    40   ~ 0
 CTIN_4
 $Comp
-L GND #PWR190
+L GND #PWR188
 U 1 1 4F83825A
 P 750 2200
-F 0 "#PWR190" H 750 2200 30  0001 C CNN
+F 0 "#PWR188" H 750 2200 30  0001 C CNN
 F 1 "GND" H 750 2130 30  0001 C CNN
 	1    750  2200
 	1    0    0    -1  
@@ -2811,10 +2811,10 @@ ADC0_5
 Text Label 4000 3500 0    40   ~ 0
 ADC0_0
 $Comp
-L GND #PWR194
+L GND #PWR192
 U 1 1 4F8381B1
 P 2850 2350
-F 0 "#PWR194" H 2850 2350 30  0001 C CNN
+F 0 "#PWR192" H 2850 2350 30  0001 C CNN
 F 1 "GND" H 2850 2280 30  0001 C CNN
 	1    2850 2350
 	1    0    0    -1  
@@ -2860,19 +2860,19 @@ GPIO3_9
 Text Label 8650 1750 3    40   ~ 0
 GPIO3_8
 $Comp
-L VCC #PWR250
+L VCC #PWR248
 U 1 1 4F837E2D
 P 11000 7400
-F 0 "#PWR250" H 11000 7500 30  0001 C CNN
+F 0 "#PWR248" H 11000 7500 30  0001 C CNN
 F 1 "VCC" H 11000 7500 30  0000 C CNN
 	1    11000 7400
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR249
+L GND #PWR247
 U 1 1 4F837E27
 P 9550 7400
-F 0 "#PWR249" H 9550 7400 30  0001 C CNN
+F 0 "#PWR247" H 9550 7400 30  0001 C CNN
 F 1 "GND" H 9550 7330 30  0001 C CNN
 	1    9550 7400
 	0    1    1    0   
@@ -2917,10 +2917,10 @@ Text Notes 14500 600  0    40   ~ 0
 Text Notes 13400 800  0    40   ~ 0
 1%
 $Comp
-L GND #PWR281
+L GND #PWR279
 U 1 1 4F837BDB
 P 7300 10350
-F 0 "#PWR281" H 7300 10350 30  0001 C CNN
+F 0 "#PWR279" H 7300 10350 30  0001 C CNN
 F 1 "GND" H 7300 10280 30  0001 C CNN
 	1    7300 10350
 	1    0    0    -1  
@@ -3019,10 +3019,10 @@ B1AUX15
 Text Label 15900 7250 2    40   ~ 0
 B1AUX16
 $Comp
-L GND #PWR277
+L GND #PWR275
 U 1 1 4F8378E2
 P 7650 10050
-F 0 "#PWR277" H 7650 10050 30  0001 C CNN
+F 0 "#PWR275" H 7650 10050 30  0001 C CNN
 F 1 "GND" H 7650 9980 30  0001 C CNN
 	1    7650 10050
 	1    0    0    -1  
@@ -3056,10 +3056,10 @@ $EndComp
 Text Label 4800 9600 2    40   ~ 0
 GP_CLKIN
 $Comp
-L GND #PWR280
+L GND #PWR278
 U 1 1 4F8375EA
 P 4500 10200
-F 0 "#PWR280" H 4500 10200 30  0001 C CNN
+F 0 "#PWR278" H 4500 10200 30  0001 C CNN
 F 1 "GND" H 4500 10130 30  0001 C CNN
 	1    4500 10200
 	1    0    0    -1  
@@ -3080,37 +3080,37 @@ NoConn ~ 6550 7450
 Text Label 6350 7750 1    40   ~ 0
 SD_POW
 $Comp
-L 1V8 #PWR203
+L 1V8 #PWR201
 U 1 1 4F835A68
 P 14450 3100
-F 0 "#PWR203" H 14450 3240 20  0001 C CNN
+F 0 "#PWR201" H 14450 3240 20  0001 C CNN
 F 1 "1V8" H 14450 3210 30  0000 C CNN
 	1    14450 3100
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR209
+L GND #PWR207
 U 1 1 4F835A62
 P 13450 3450
-F 0 "#PWR209" H 13450 3450 30  0001 C CNN
+F 0 "#PWR207" H 13450 3450 30  0001 C CNN
 F 1 "GND" H 13450 3380 30  0001 C CNN
 	1    13450 3450
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR201
+L VCC #PWR199
 U 1 1 4F835A55
 P 16150 3050
-F 0 "#PWR201" H 16150 3150 30  0001 C CNN
+F 0 "#PWR199" H 16150 3150 30  0001 C CNN
 F 1 "VCC" H 16150 3150 30  0000 C CNN
 	1    16150 3050
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR208
+L GND #PWR206
 U 1 1 4F835A49
 P 15150 3400
-F 0 "#PWR208" H 15150 3400 30  0001 C CNN
+F 0 "#PWR206" H 15150 3400 30  0001 C CNN
 F 1 "GND" H 15150 3330 30  0001 C CNN
 	1    15150 3400
 	1    0    0    -1  
@@ -3162,19 +3162,19 @@ CPLD_TDI
 Text Label 15600 9000 0    40   ~ 0
 CPLD_TMS
 $Comp
-L GND #PWR269
+L GND #PWR267
 U 1 1 4F82F4DF
 P 15750 9400
-F 0 "#PWR269" H 15750 9400 30  0001 C CNN
+F 0 "#PWR267" H 15750 9400 30  0001 C CNN
 F 1 "GND" H 15750 9330 30  0001 C CNN
 	1    15750 9400
 	0    1    1    0   
 $EndComp
 $Comp
-L VCC #PWR270
+L VCC #PWR268
 U 1 1 4F82F4D6
 P 15900 9500
-F 0 "#PWR270" H 15900 9600 30  0001 C CNN
+F 0 "#PWR268" H 15900 9600 30  0001 C CNN
 F 1 "VCC" H 15900 9600 30  0000 C CNN
 	1    15900 9500
 	0    -1   -1   0   
@@ -3210,10 +3210,10 @@ CTIN_2
 Text Label 4000 4400 0    40   ~ 0
 SGPIO13
 $Comp
-L GND #PWR268
+L GND #PWR266
 U 1 1 4F826461
 P 12900 9200
-F 0 "#PWR268" H 12900 9200 30  0001 C CNN
+F 0 "#PWR266" H 12900 9200 30  0001 C CNN
 F 1 "GND" H 12900 9130 30  0001 C CNN
 	1    12900 9200
 	1    0    0    -1  
@@ -3221,46 +3221,46 @@ $EndComp
 Text Label 11200 7350 0    40   ~ 0
 BANK1F2M4
 $Comp
-L GND #PWR228
+L GND #PWR226
 U 1 1 4F8263EE
 P 14000 4600
-F 0 "#PWR228" H 14000 4600 30  0001 C CNN
+F 0 "#PWR226" H 14000 4600 30  0001 C CNN
 F 1 "GND" H 14000 4530 30  0001 C CNN
 	1    14000 4600
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR229
+L GND #PWR227
 U 1 1 4F8263E6
 P 12400 4650
-F 0 "#PWR229" H 12400 4650 30  0001 C CNN
+F 0 "#PWR227" H 12400 4650 30  0001 C CNN
 F 1 "GND" H 12400 4580 30  0001 C CNN
 	1    12400 4650
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR256
+L GND #PWR254
 U 1 1 4F8263D9
 P 11350 7750
-F 0 "#PWR256" H 11350 7750 30  0001 C CNN
+F 0 "#PWR254" H 11350 7750 30  0001 C CNN
 F 1 "GND" H 11350 7680 30  0001 C CNN
 	1    11350 7750
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR248
+L GND #PWR246
 U 1 1 4F8263C5
 P 15950 7050
-F 0 "#PWR248" H 15950 7050 30  0001 C CNN
+F 0 "#PWR246" H 15950 7050 30  0001 C CNN
 F 1 "GND" H 15950 6980 30  0001 C CNN
 	1    15950 7050
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR243
+L GND #PWR241
 U 1 1 4F8263AD
 P 15950 6350
-F 0 "#PWR243" H 15950 6350 30  0001 C CNN
+F 0 "#PWR241" H 15950 6350 30  0001 C CNN
 F 1 "GND" H 15950 6280 30  0001 C CNN
 	1    15950 6350
 	0    -1   -1   0   
@@ -3282,28 +3282,28 @@ SGPIO15
 Text Label 14700 4650 3    40   ~ 0
 SGPIO7
 $Comp
-L VCC #PWR177
+L VCC #PWR175
 U 1 1 4F825E93
 P 11100 1350
-F 0 "#PWR177" H 11100 1450 30  0001 C CNN
+F 0 "#PWR175" H 11100 1450 30  0001 C CNN
 F 1 "VCC" H 11100 1450 30  0000 C CNN
 	1    11100 1350
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR195
+L GND #PWR193
 U 1 1 4F825E8A
 P 11100 2350
-F 0 "#PWR195" H 11100 2350 30  0001 C CNN
+F 0 "#PWR193" H 11100 2350 30  0001 C CNN
 F 1 "GND" H 11100 2280 30  0001 C CNN
 	1    11100 2350
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR180
+L GND #PWR178
 U 1 1 4F825E88
 P 9800 1850
-F 0 "#PWR180" H 9800 1850 30  0001 C CNN
+F 0 "#PWR178" H 9800 1850 30  0001 C CNN
 F 1 "GND" H 9800 1780 30  0001 C CNN
 	1    9800 1850
 	1    0    0    -1  
@@ -3349,10 +3349,10 @@ VREGMODE
 Text Label 11850 1550 0    40   ~ 0
 VREGMODE
 $Comp
-L GND #PWR175
+L GND #PWR173
 U 1 1 4F825023
 P 15800 1250
-F 0 "#PWR175" H 15800 1250 30  0001 C CNN
+F 0 "#PWR173" H 15800 1250 30  0001 C CNN
 F 1 "GND" H 15800 1180 30  0001 C CNN
 	1    15800 1250
 	1    0    0    -1  
@@ -3370,10 +3370,10 @@ F 6 "CAP CER 10UF 10V 10% X5R 0805" H 15800 950 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR189
+L GND #PWR187
 U 1 1 4F824FE5
 P 15800 2050
-F 0 "#PWR189" H 15800 2050 30  0001 C CNN
+F 0 "#PWR187" H 15800 2050 30  0001 C CNN
 F 1 "GND" H 15800 1980 30  0001 C CNN
 	1    15800 2050
 	-1   0    0    1   
@@ -3419,10 +3419,10 @@ EN1V8
 Text Label 16000 1750 2    40   ~ 0
 VBUS
 $Comp
-L GND #PWR193
+L GND #PWR191
 U 1 1 4F824A0E
 P 16150 2250
-F 0 "#PWR193" H 16150 2250 30  0001 C CNN
+F 0 "#PWR191" H 16150 2250 30  0001 C CNN
 F 1 "GND" H 16150 2180 30  0001 C CNN
 	1    16150 2250
 	1    0    0    -1  
@@ -3452,19 +3452,19 @@ F 6 "RES 10K OHM 1/10W 5% 0603 SMD" H 16150 1900 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR173
+L VCC #PWR171
 U 1 1 4F8215C6
 P 12800 850
-F 0 "#PWR173" H 12800 950 30  0001 C CNN
+F 0 "#PWR171" H 12800 950 30  0001 C CNN
 F 1 "VCC" H 12800 950 30  0000 C CNN
 	1    12800 850 
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR191
+L GND #PWR189
 U 1 1 4F8215BF
 P 12800 2250
-F 0 "#PWR191" H 12800 2250 30  0001 C CNN
+F 0 "#PWR189" H 12800 2250 30  0001 C CNN
 F 1 "GND" H 12800 2180 30  0001 C CNN
 	1    12800 2250
 	1    0    0    -1  
@@ -3490,46 +3490,46 @@ F 4 "DNP" H 12800 1900 60  0001 C CNN "Note"
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR179
+L VCC #PWR177
 U 1 1 4F820564
 P 13800 1750
-F 0 "#PWR179" H 13800 1850 30  0001 C CNN
+F 0 "#PWR177" H 13800 1850 30  0001 C CNN
 F 1 "VCC" H 13800 1850 30  0000 C CNN
 	1    13800 1750
 	0    -1   -1   0   
 $EndComp
 $Comp
-L 1V8 #PWR169
+L 1V8 #PWR167
 U 1 1 4F82054D
 P 15900 650
-F 0 "#PWR169" H 15900 790 20  0001 C CNN
+F 0 "#PWR167" H 15900 790 20  0001 C CNN
 F 1 "1V8" H 15900 760 30  0000 C CNN
 	1    15900 650 
 	0    1    1    0   
 $EndComp
 $Comp
-L VCC #PWR198
+L VCC #PWR196
 U 1 1 4F82053F
 P 15900 2650
-F 0 "#PWR198" H 15900 2750 30  0001 C CNN
+F 0 "#PWR196" H 15900 2750 30  0001 C CNN
 F 1 "VCC" H 15900 2750 30  0000 C CNN
 	1    15900 2650
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR174
+L GND #PWR172
 U 1 1 4F82044E
 P 15500 1250
-F 0 "#PWR174" H 15500 1250 30  0001 C CNN
+F 0 "#PWR172" H 15500 1250 30  0001 C CNN
 F 1 "GND" H 15500 1180 30  0001 C CNN
 	1    15500 1250
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR188
+L GND #PWR186
 U 1 1 4F820439
 P 15500 2050
-F 0 "#PWR188" H 15500 2050 30  0001 C CNN
+F 0 "#PWR186" H 15500 2050 30  0001 C CNN
 F 1 "GND" H 15500 1980 30  0001 C CNN
 	1    15500 2050
 	-1   0    0    1   
@@ -3547,19 +3547,19 @@ F 6 "CAP CER 22PF 50V 5% NP0 0603" H 14550 900 60  0001 C CNN "Description"
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR168
+L GND #PWR166
 U 1 1 4F8203E0
 P 13100 650
-F 0 "#PWR168" H 13100 650 30  0001 C CNN
+F 0 "#PWR166" H 13100 650 30  0001 C CNN
 F 1 "GND" H 13100 580 30  0001 C CNN
 	1    13100 650 
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR197
+L GND #PWR195
 U 1 1 4F8203DB
 P 13100 2650
-F 0 "#PWR197" H 13100 2650 30  0001 C CNN
+F 0 "#PWR195" H 13100 2650 30  0001 C CNN
 F 1 "GND" H 13100 2580 30  0001 C CNN
 	1    13100 2650
 	0    1    1    0   
@@ -3625,28 +3625,28 @@ F 6 "INDUCTOR 4.7UH 1.6A 20% SMD" V 15300 1050 60  0001 C CNN "Description"
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR178
+L GND #PWR176
 U 1 1 4F8202CC
 P 15300 1650
-F 0 "#PWR178" H 15300 1650 30  0001 C CNN
+F 0 "#PWR176" H 15300 1650 30  0001 C CNN
 F 1 "GND" H 15300 1580 30  0001 C CNN
 	1    15300 1650
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR196
+L GND #PWR194
 U 1 1 4F8202C7
 P 14550 2400
-F 0 "#PWR196" H 14550 2400 30  0001 C CNN
+F 0 "#PWR194" H 14550 2400 30  0001 C CNN
 F 1 "GND" H 14550 2330 30  0001 C CNN
 	1    14550 2400
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR192
+L GND #PWR190
 U 1 1 4F8202C2
 P 13550 2250
-F 0 "#PWR192" H 13550 2250 30  0001 C CNN
+F 0 "#PWR190" H 13550 2250 30  0001 C CNN
 F 1 "GND" H 13550 2180 30  0001 C CNN
 	1    13550 2250
 	1    0    0    -1  
@@ -3680,10 +3680,10 @@ $EndComp
 Text Label 13200 4400 2    40   ~ 0
 VCCIO1
 $Comp
-L VCC #PWR213
+L VCC #PWR211
 U 1 1 4F81F829
 P 13850 3800
-F 0 "#PWR213" H 13850 3900 30  0001 C CNN
+F 0 "#PWR211" H 13850 3900 30  0001 C CNN
 F 1 "VCC" H 13850 3900 30  0000 C CNN
 	1    13850 3800
 	1    0    0    -1  
@@ -3725,10 +3725,10 @@ F 6 "CAP CER 0.1UF 16V 10% X7R 0603" H 850 1000 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR219
+L GND #PWR217
 U 1 1 4F81F817
 P 13850 4350
-F 0 "#PWR219" H 13850 4350 30  0001 C CNN
+F 0 "#PWR217" H 13850 4350 30  0001 C CNN
 F 1 "GND" H 13850 4280 30  0001 C CNN
 	1    13850 4350
 	1    0    0    -1  
@@ -3760,28 +3760,28 @@ F 6 "CAP CER 0.1UF 16V 10% X7R 0603" H 850 1000 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR221
+L GND #PWR219
 U 1 1 4F81F7F0
 P 15650 4350
-F 0 "#PWR221" H 15650 4350 30  0001 C CNN
+F 0 "#PWR219" H 15650 4350 30  0001 C CNN
 F 1 "GND" H 15650 4280 30  0001 C CNN
 	1    15650 4350
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR220
+L GND #PWR218
 U 1 1 4F81F7DB
 P 14900 4350
-F 0 "#PWR220" H 14900 4350 30  0001 C CNN
+F 0 "#PWR218" H 14900 4350 30  0001 C CNN
 F 1 "GND" H 14900 4280 30  0001 C CNN
 	1    14900 4350
 	1    0    0    -1  
 $EndComp
 $Comp
-L 1V8 #PWR214
+L 1V8 #PWR212
 U 1 1 4F81F7CF
 P 14900 3800
-F 0 "#PWR214" H 14900 3940 20  0001 C CNN
+F 0 "#PWR212" H 14900 3940 20  0001 C CNN
 F 1 "1V8" H 14900 3910 30  0000 C CNN
 	1    14900 3800
 	1    0    0    -1  
@@ -3811,28 +3811,28 @@ F 6 "CAP CER 0.1UF 16V 10% X7R 0603" H 850 1000 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR241
+L VCC #PWR239
 U 1 1 4F81F785
 P 11500 6150
-F 0 "#PWR241" H 11500 6250 30  0001 C CNN
+F 0 "#PWR239" H 11500 6250 30  0001 C CNN
 F 1 "VCC" H 11500 6250 30  0000 C CNN
 	1    11500 6150
 	0    -1   -1   0   
 $EndComp
 $Comp
-L 1V8 #PWR267
+L 1V8 #PWR265
 U 1 1 4F81F5B6
 P 12400 9050
-F 0 "#PWR267" H 12400 9190 20  0001 C CNN
+F 0 "#PWR265" H 12400 9190 20  0001 C CNN
 F 1 "1V8" H 12400 9160 30  0000 C CNN
 	1    12400 9050
 	-1   0    0    1   
 $EndComp
 $Comp
-L 1V8 #PWR255
+L 1V8 #PWR253
 U 1 1 4F81F58C
 P 15700 7550
-F 0 "#PWR255" H 15700 7690 20  0001 C CNN
+F 0 "#PWR253" H 15700 7690 20  0001 C CNN
 F 1 "1V8" H 15700 7660 30  0000 C CNN
 	1    15700 7550
 	0    1    1    0   
@@ -3881,19 +3881,19 @@ F 6 "IC CR-II CPLD 64MCELL 100-VQFP" H 13600 6950 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR218
+L GND #PWR216
 U 1 1 4F787903
 P 2700 4350
-F 0 "#PWR218" H 2700 4350 30  0001 C CNN
+F 0 "#PWR216" H 2700 4350 30  0001 C CNN
 F 1 "GND" H 2700 4280 30  0001 C CNN
 	1    2700 4350
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR217
+L GND #PWR215
 U 1 1 4F787901
 P 2400 4350
-F 0 "#PWR217" H 2400 4350 30  0001 C CNN
+F 0 "#PWR215" H 2400 4350 30  0001 C CNN
 F 1 "GND" H 2400 4280 30  0001 C CNN
 	1    2400 4350
 	1    0    0    -1  
@@ -3947,10 +3947,10 @@ F 6 "IC USB DUAL ESD PROTECT 6TSOP" H 2450 3000 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR204
+L GND #PWR202
 U 1 1 4F766C2C
 P 1400 3250
-F 0 "#PWR204" H 1400 3250 30  0001 C CNN
+F 0 "#PWR202" H 1400 3250 30  0001 C CNN
 F 1 "GND" H 1400 3180 30  0001 C CNN
 	1    1400 3250
 	0    -1   -1   0   
@@ -3970,19 +3970,19 @@ $EndComp
 Text Label 7650 1750 3    40   ~ 0
 TRACECLK
 $Comp
-L GND #PWR226
+L GND #PWR224
 U 1 1 4F6357FF
 P 800 4600
-F 0 "#PWR226" H 800 4600 30  0001 C CNN
+F 0 "#PWR224" H 800 4600 30  0001 C CNN
 F 1 "GND" H 800 4530 30  0001 C CNN
 	1    800  4600
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR224
+L VCC #PWR222
 U 1 1 4F6357E9
 P 1500 4500
-F 0 "#PWR224" H 1500 4600 30  0001 C CNN
+F 0 "#PWR222" H 1500 4600 30  0001 C CNN
 F 1 "VCC" H 1500 4600 30  0000 C CNN
 	1    1500 4500
 	1    0    0    -1  
@@ -4005,10 +4005,10 @@ U0_RXD
 Text Label 12050 3900 0    40   ~ 0
 U0_TXD
 $Comp
-L VCC #PWR172
+L VCC #PWR170
 U 1 1 4F62D441
 P 6850 750
-F 0 "#PWR172" H 6850 850 30  0001 C CNN
+F 0 "#PWR170" H 6850 850 30  0001 C CNN
 F 1 "VCC" H 6850 850 30  0000 C CNN
 	1    6850 750 
 	1    0    0    -1  
@@ -4019,10 +4019,10 @@ Text Label 12050 4200 0    40   ~ 0
 ISP
 NoConn ~ 11950 4100
 $Comp
-L GND #PWR223
+L GND #PWR221
 U 1 1 4F62D2F7
 P 12050 4400
-F 0 "#PWR223" H 12050 4400 30  0001 C CNN
+F 0 "#PWR221" H 12050 4400 30  0001 C CNN
 F 1 "GND" H 12050 4330 30  0001 C CNN
 	1    12050 4400
 	1    0    0    -1  
@@ -4038,10 +4038,10 @@ F 4 "DNP" H 11600 3650 60  0000 C CNN "Note"
 	-1   0    0    1   
 $EndComp
 $Comp
-L VCC #PWR235
+L VCC #PWR233
 U 1 1 4F62D238
 P 2500 4850
-F 0 "#PWR235" H 2500 4950 30  0001 C CNN
+F 0 "#PWR233" H 2500 4950 30  0001 C CNN
 F 1 "VCC" H 2500 4950 30  0000 C CNN
 	1    2500 4850
 	1    0    0    -1  
@@ -4121,19 +4121,19 @@ U3_RXD
 Text Label 9950 5100 2    40   ~ 0
 U3_TXD
 $Comp
-L VCC #PWR234
+L VCC #PWR232
 U 1 1 4F62BC76
 P 2300 4850
-F 0 "#PWR234" H 2300 4950 30  0001 C CNN
+F 0 "#PWR232" H 2300 4950 30  0001 C CNN
 F 1 "VCC" H 2300 4950 30  0000 C CNN
 	1    2300 4850
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR233
+L VCC #PWR231
 U 1 1 4F62BC71
 P 2100 4850
-F 0 "#PWR233" H 2100 4950 30  0001 C CNN
+F 0 "#PWR231" H 2100 4950 30  0001 C CNN
 F 1 "VCC" H 2100 4950 30  0000 C CNN
 	1    2100 4850
 	1    0    0    -1  
@@ -4143,10 +4143,10 @@ U0_RXD
 Text Label 9950 6300 2    40   ~ 0
 U0_TXD
 $Comp
-L VCC #PWR210
+L VCC #PWR208
 U 1 1 4F62B8DD
 P 10350 3550
-F 0 "#PWR210" H 10350 3650 30  0001 C CNN
+F 0 "#PWR208" H 10350 3650 30  0001 C CNN
 F 1 "VCC" H 10350 3650 30  0000 C CNN
 	1    10350 3550
 	1    0    0    -1  
@@ -4154,19 +4154,19 @@ $EndComp
 Text Label 10500 4200 2    40   ~ 0
 ISP
 $Comp
-L VCC #PWR216
+L VCC #PWR214
 U 1 1 4F62B7D4
 P 10850 3850
-F 0 "#PWR216" H 10850 3950 30  0001 C CNN
+F 0 "#PWR214" H 10850 3950 30  0001 C CNN
 F 1 "VCC" H 10850 3950 30  0000 C CNN
 	1    10850 3850
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR215
+L VCC #PWR213
 U 1 1 4F62B79F
 P 10650 3850
-F 0 "#PWR215" H 10650 3950 30  0001 C CNN
+F 0 "#PWR213" H 10650 3950 30  0001 C CNN
 F 1 "VCC" H 10650 3950 30  0000 C CNN
 	1    10650 3850
 	1    0    0    -1  
@@ -4199,10 +4199,10 @@ NoConn ~ 5750 2050
 NoConn ~ 5850 2050
 NoConn ~ 6050 2050
 $Comp
-L VCC #PWR171
+L VCC #PWR169
 U 1 1 4F62B686
 P 6650 750
-F 0 "#PWR171" H 6650 850 30  0001 C CNN
+F 0 "#PWR169" H 6650 850 30  0001 C CNN
 F 1 "VCC" H 6650 850 30  0000 C CNN
 	1    6650 750 
 	1    0    0    -1  
@@ -4211,10 +4211,10 @@ NoConn ~ 6750 2050
 NoConn ~ 7150 2050
 NoConn ~ 7050 2050
 $Comp
-L VCC #PWR185
+L VCC #PWR183
 U 1 1 4F62B526
 P 6950 1950
-F 0 "#PWR185" H 6950 2050 30  0001 C CNN
+F 0 "#PWR183" H 6950 2050 30  0001 C CNN
 F 1 "VCC" H 6950 2050 30  0000 C CNN
 	1    6950 1950
 	1    0    0    -1  
@@ -4226,10 +4226,10 @@ TMS
 Text Label 4000 5500 0    40   ~ 0
 TDI
 $Comp
-L GND #PWR238
+L GND #PWR236
 U 1 1 4F62B3FC
 P 3400 5300
-F 0 "#PWR238" H 3400 5300 30  0001 C CNN
+F 0 "#PWR236" H 3400 5300 30  0001 C CNN
 F 1 "GND" H 3400 5230 30  0001 C CNN
 	1    3400 5300
 	0    1    1    0   
@@ -4255,19 +4255,19 @@ DP
 NoConn ~ 9700 4900
 NoConn ~ 9700 4800
 $Comp
-L GND #PWR176
+L GND #PWR174
 U 1 1 4F629931
 P 700 1300
-F 0 "#PWR176" H 700 1300 30  0001 C CNN
+F 0 "#PWR174" H 700 1300 30  0001 C CNN
 F 1 "GND" H 700 1230 30  0001 C CNN
 	1    700  1300
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR170
+L VCC #PWR168
 U 1 1 4F62992D
 P 700 750
-F 0 "#PWR170" H 700 850 30  0001 C CNN
+F 0 "#PWR168" H 700 850 30  0001 C CNN
 F 1 "VCC" H 700 850 30  0000 C CNN
 	1    700  750 
 	1    0    0    -1  
@@ -4453,199 +4453,199 @@ F 6 "CAP CER 0.1UF 16V 10% X7R 0603" H 850 1000 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR181
+L VCC #PWR179
 U 1 1 4F629520
 P 5550 1950
-F 0 "#PWR181" H 5550 2050 30  0001 C CNN
+F 0 "#PWR179" H 5550 2050 30  0001 C CNN
 F 1 "VCC" H 5550 2050 30  0000 C CNN
 	1    5550 1950
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR182
+L VCC #PWR180
 U 1 1 4F62951C
 P 5950 1950
-F 0 "#PWR182" H 5950 2050 30  0001 C CNN
+F 0 "#PWR180" H 5950 2050 30  0001 C CNN
 F 1 "VCC" H 5950 2050 30  0000 C CNN
 	1    5950 1950
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR184
+L VCC #PWR182
 U 1 1 4F62950C
 P 6550 1950
-F 0 "#PWR184" H 6550 2050 30  0001 C CNN
+F 0 "#PWR182" H 6550 2050 30  0001 C CNN
 F 1 "VCC" H 6550 2050 30  0000 C CNN
 	1    6550 1950
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR186
+L VCC #PWR184
 U 1 1 4F629507
 P 8550 1950
-F 0 "#PWR186" H 8550 2050 30  0001 C CNN
+F 0 "#PWR184" H 8550 2050 30  0001 C CNN
 F 1 "VCC" H 8550 2050 30  0000 C CNN
 	1    8550 1950
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR202
+L VCC #PWR200
 U 1 1 4F6294FC
 P 9800 3100
-F 0 "#PWR202" H 9800 3200 30  0001 C CNN
+F 0 "#PWR200" H 9800 3200 30  0001 C CNN
 F 1 "VCC" H 9800 3200 30  0000 C CNN
 	1    9800 3100
 	0    1    1    0   
 $EndComp
 $Comp
-L VCC #PWR222
+L VCC #PWR220
 U 1 1 4F6294ED
 P 9800 4400
-F 0 "#PWR222" H 9800 4500 30  0001 C CNN
+F 0 "#PWR220" H 9800 4500 30  0001 C CNN
 F 1 "VCC" H 9800 4500 30  0000 C CNN
 	1    9800 4400
 	0    1    1    0   
 $EndComp
 $Comp
-L VCC #PWR240
+L VCC #PWR238
 U 1 1 4F6294E6
 P 9800 6100
-F 0 "#PWR240" H 9800 6200 30  0001 C CNN
+F 0 "#PWR238" H 9800 6200 30  0001 C CNN
 F 1 "VCC" H 9800 6200 30  0000 C CNN
 	1    9800 6100
 	0    1    1    0   
 $EndComp
 $Comp
-L VCC #PWR254
+L VCC #PWR252
 U 1 1 4F6294D6
 P 8650 7550
-F 0 "#PWR254" H 8650 7650 30  0001 C CNN
+F 0 "#PWR252" H 8650 7650 30  0001 C CNN
 F 1 "VCC" H 8650 7650 30  0000 C CNN
 	1    8650 7550
 	-1   0    0    1   
 $EndComp
 $Comp
-L VCC #PWR253
+L VCC #PWR251
 U 1 1 4F6294C8
 P 7450 7550
-F 0 "#PWR253" H 7450 7650 30  0001 C CNN
+F 0 "#PWR251" H 7450 7650 30  0001 C CNN
 F 1 "VCC" H 7450 7650 30  0000 C CNN
 	1    7450 7550
 	-1   0    0    1   
 $EndComp
 $Comp
-L VCC #PWR252
+L VCC #PWR250
 U 1 1 4F6294BE
 P 5650 7550
-F 0 "#PWR252" H 5650 7650 30  0001 C CNN
+F 0 "#PWR250" H 5650 7650 30  0001 C CNN
 F 1 "VCC" H 5650 7650 30  0000 C CNN
 	1    5650 7550
 	-1   0    0    1   
 $EndComp
 $Comp
-L VCC #PWR244
+L VCC #PWR242
 U 1 1 4F6294B4
 P 4200 6500
-F 0 "#PWR244" H 4200 6600 30  0001 C CNN
+F 0 "#PWR242" H 4200 6600 30  0001 C CNN
 F 1 "VCC" H 4200 6600 30  0000 C CNN
 	1    4200 6500
 	0    -1   -1   0   
 $EndComp
 $Comp
-L VCC #PWR239
+L VCC #PWR237
 U 1 1 4F6294A9
 P 4200 5400
-F 0 "#PWR239" H 4200 5500 30  0001 C CNN
+F 0 "#PWR237" H 4200 5500 30  0001 C CNN
 F 1 "VCC" H 4200 5500 30  0000 C CNN
 	1    4200 5400
 	0    -1   -1   0   
 $EndComp
 $Comp
-L VCC #PWR227
+L VCC #PWR225
 U 1 1 4F6294A1
 P 4200 4600
-F 0 "#PWR227" H 4200 4700 30  0001 C CNN
+F 0 "#PWR225" H 4200 4700 30  0001 C CNN
 F 1 "VCC" H 4200 4700 30  0000 C CNN
 	1    4200 4600
 	0    -1   -1   0   
 $EndComp
 $Comp
-L VCC #PWR225
+L VCC #PWR223
 U 1 1 4F629489
 P 4200 4500
-F 0 "#PWR225" H 4200 4600 30  0001 C CNN
+F 0 "#PWR223" H 4200 4600 30  0001 C CNN
 F 1 "VCC" H 4200 4600 30  0000 C CNN
 	1    4200 4500
 	0    -1   -1   0   
 $EndComp
 $Comp
-L VCC #PWR207
+L VCC #PWR205
 U 1 1 4F629480
 P 4200 3400
-F 0 "#PWR207" H 4200 3500 30  0001 C CNN
+F 0 "#PWR205" H 4200 3500 30  0001 C CNN
 F 1 "VCC" H 4200 3500 30  0000 C CNN
 	1    4200 3400
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR183
+L GND #PWR181
 U 1 1 4F62944A
 P 6150 1950
-F 0 "#PWR183" H 6150 1950 30  0001 C CNN
+F 0 "#PWR181" H 6150 1950 30  0001 C CNN
 F 1 "GND" H 6150 1880 30  0001 C CNN
 	1    6150 1950
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR187
+L GND #PWR185
 U 1 1 4F62943D
 P 8750 1950
-F 0 "#PWR187" H 8750 1950 30  0001 C CNN
+F 0 "#PWR185" H 8750 1950 30  0001 C CNN
 F 1 "GND" H 8750 1880 30  0001 C CNN
 	1    8750 1950
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR242
+L GND #PWR240
 U 1 1 4F629430
 P 9800 6200
-F 0 "#PWR242" H 9800 6200 30  0001 C CNN
+F 0 "#PWR240" H 9800 6200 30  0001 C CNN
 F 1 "GND" H 9800 6130 30  0001 C CNN
 	1    9800 6200
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR251
+L GND #PWR249
 U 1 1 4F629425
 P 5550 7550
-F 0 "#PWR251" H 5550 7550 30  0001 C CNN
+F 0 "#PWR249" H 5550 7550 30  0001 C CNN
 F 1 "GND" H 5550 7480 30  0001 C CNN
 	1    5550 7550
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR237
+L GND #PWR235
 U 1 1 4F629416
 P 4200 5200
-F 0 "#PWR237" H 4200 5200 30  0001 C CNN
+F 0 "#PWR235" H 4200 5200 30  0001 C CNN
 F 1 "GND" H 4200 5130 30  0001 C CNN
 	1    4200 5200
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR232
+L GND #PWR230
 U 1 1 4F6293C1
 P 4200 4800
-F 0 "#PWR232" H 4200 4800 30  0001 C CNN
+F 0 "#PWR230" H 4200 4800 30  0001 C CNN
 F 1 "GND" H 4200 4730 30  0001 C CNN
 	1    4200 4800
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR205
+L GND #PWR203
 U 1 1 4F6293BA
 P 4200 3300
-F 0 "#PWR205" H 4200 3300 30  0001 C CNN
+F 0 "#PWR203" H 4200 3300 30  0001 C CNN
 F 1 "GND" H 4200 3230 30  0001 C CNN
 	1    4200 3300
 	0    1    1    0