More schematic work

8 files changed, 2050 insertions, 407 deletions

diff --git a/kicad/Clock.sch b/kicad/Clock.sch
new file mode 100644
index 0000000..f3184d4
--- /dev/null
+++ b/kicad/Clock.sch
@@ -0,0 +1,27 @@
+EESchema Schematic File Version 4
+EELAYER 30 0
+EELAYER END
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 6 6
+Title ""
+Date ""
+Rev ""
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+$Comp
+L Oscillator:Si5351A-B-GT U?
+U 1 1 5E4BE97C
+P 5300 3750
+F 0 "U?" H 5300 3161 50  0000 C CNN
+F 1 "Si5351A-B-GT" H 5300 3070 50  0000 C CNN
+F 2 "Package_SO:MSOP-10_3x3mm_P0.5mm" H 5300 2950 50  0001 C CNN
+F 3 "https://www.silabs.com/documents/public/data-sheets/Si5351-B.pdf" H 4950 3650 50  0001 C CNN
+	1    5300 3750
+	1    0    0    -1  
+$EndComp
+$EndSCHEMATC
diff --git a/kicad/anglian3l.sch b/kicad/anglian3l.sch
new file mode 100644
index 0000000..e505471
--- /dev/null
+++ b/kicad/anglian3l.sch
@@ -0,0 +1,702 @@
+EESchema Schematic File Version 4
+EELAYER 30 0
+EELAYER END
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 6 6
+Title ""
+Date ""
+Rev ""
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+$Comp
+L RF:ADE-6 MX?
+U 1 1 5E4C237E
+P 5450 3700
+F 0 "MX?" H 5450 4025 50  0000 C CNN
+F 1 "ADE-6 or MAMX-009239" H 5450 4116 50  0000 C CNN
+F 2 "RF_Mini-Circuits:Mini-Circuits_CD542_LandPatternPL-052" H 5525 3325 50  0001 C CNN
+F 3 "www.minicircuits.com/pdfs/ADE-6.pdf" H 5625 3425 50  0001 C CNN
+	1    5450 3700
+	-1   0    0    1   
+$EndComp
+$Comp
+L power:GNDA #PWR?
+U 1 1 5E4C2BCC
+P 5650 3300
+F 0 "#PWR?" H 5650 3050 50  0001 C CNN
+F 1 "GNDA" H 5655 3127 50  0000 C CNN
+F 2 "" H 5650 3300 50  0001 C CNN
+F 3 "" H 5650 3300 50  0001 C CNN
+	1    5650 3300
+	-1   0    0    1   
+$EndComp
+$Comp
+L Device:R R?
+U 1 1 5E4C2F93
+P 5450 2950
+F 0 "R?" H 5520 2996 50  0000 L CNN
+F 1 "0" H 5520 2905 50  0000 L CNN
+F 2 "" V 5380 2950 50  0001 C CNN
+F 3 "~" H 5450 2950 50  0001 C CNN
+	1    5450 2950
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5450 3100 5450 3300
+$Comp
+L Device:C C?
+U 1 1 5E4C31C3
+P 5450 2550
+F 0 "C?" H 5565 2596 50  0000 L CNN
+F 1 "1nF" H 5565 2505 50  0000 L CNN
+F 2 "" H 5488 2400 50  0001 C CNN
+F 3 "~" H 5450 2550 50  0001 C CNN
+	1    5450 2550
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5450 2800 5450 2700
+$Comp
+L Connector:TestPoint TP?
+U 1 1 5E4C3889
+P 5450 3300
+F 0 "TP?" V 5645 3372 50  0000 C CNN
+F 1 "MIX LO" V 5550 3450 50  0000 C CNN
+F 2 "" H 5650 3300 50  0001 C CNN
+F 3 "~" H 5650 3300 50  0001 C CNN
+	1    5450 3300
+	0    -1   -1   0   
+$EndComp
+Connection ~ 5450 3300
+$Comp
+L Device:C C?
+U 1 1 5E4C498F
+P 5450 1950
+F 0 "C?" H 5565 1996 50  0000 L CNN
+F 1 "1nF" H 5565 1905 50  0000 L CNN
+F 2 "" H 5488 1800 50  0001 C CNN
+F 3 "~" H 5450 1950 50  0001 C CNN
+	1    5450 1950
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:R R?
+U 1 1 5E4C4E3F
+P 5450 2250
+F 0 "R?" H 5520 2296 50  0000 L CNN
+F 1 "0" H 5520 2205 50  0000 L CNN
+F 2 "" V 5380 2250 50  0001 C CNN
+F 3 "~" H 5450 2250 50  0001 C CNN
+	1    5450 2250
+	1    0    0    -1  
+$EndComp
+$Comp
+L RF_Amplifier:SPF5189Z U?
+U 1 1 5E4C5E4B
+P 4950 1600
+F 0 "U?" H 4950 1967 50  0000 C CNN
+F 1 "SPF5189Z" H 4950 1876 50  0000 C CNN
+F 2 "Package_TO_SOT_SMD:SOT-89-3" H 5000 2000 50  0001 C CNN
+F 3 "www.qorvo.com/products/d/da001910" H 4950 1600 50  0001 C CNN
+	1    4950 1600
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5250 1600 5450 1600
+Wire Wire Line
+	5450 1600 5450 1800
+$Comp
+L Device:L L?
+U 1 1 5E4C6B51
+P 5450 1300
+F 0 "L?" H 5503 1346 50  0000 L CNN
+F 1 "1uH" H 5503 1255 50  0000 L CNN
+F 2 "" H 5450 1300 50  0001 C CNN
+F 3 "~" H 5450 1300 50  0001 C CNN
+	1    5450 1300
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5450 1450 5450 1600
+Connection ~ 5450 1600
+$Comp
+L Device:C C?
+U 1 1 5E4C6FC1
+P 5850 1300
+F 0 "C?" H 5965 1346 50  0000 L CNN
+F 1 "1nF" H 5965 1255 50  0000 L CNN
+F 2 "" H 5888 1150 50  0001 C CNN
+F 3 "~" H 5850 1300 50  0001 C CNN
+	1    5850 1300
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5450 1150 5650 1150
+$Comp
+L power:GNDA #PWR?
+U 1 1 5E4C79DC
+P 5850 1450
+F 0 "#PWR?" H 5850 1200 50  0001 C CNN
+F 1 "GNDA" H 5855 1277 50  0000 C CNN
+F 2 "" H 5850 1450 50  0001 C CNN
+F 3 "" H 5850 1450 50  0001 C CNN
+	1    5850 1450
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GNDA #PWR?
+U 1 1 5E4C7AE8
+P 4850 1900
+F 0 "#PWR?" H 4850 1650 50  0001 C CNN
+F 1 "GNDA" H 4855 1727 50  0000 C CNN
+F 2 "" H 4850 1900 50  0001 C CNN
+F 3 "" H 4850 1900 50  0001 C CNN
+	1    4850 1900
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+5VA #PWR?
+U 1 1 5E4C8917
+P 5650 1100
+F 0 "#PWR?" H 5650 950 50  0001 C CNN
+F 1 "+5VA" H 5665 1273 50  0000 C CNN
+F 2 "" H 5650 1100 50  0001 C CNN
+F 3 "" H 5650 1100 50  0001 C CNN
+	1    5650 1100
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5650 1100 5650 1150
+Connection ~ 5650 1150
+Wire Wire Line
+	5650 1150 5850 1150
+$Comp
+L Device:C C?
+U 1 1 5E4C9331
+P 4300 1850
+F 0 "C?" H 4415 1896 50  0000 L CNN
+F 1 "39pF" H 4415 1805 50  0000 L CNN
+F 2 "" H 4338 1700 50  0001 C CNN
+F 3 "~" H 4300 1850 50  0001 C CNN
+	1    4300 1850
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4300 1700 4300 1600
+Wire Wire Line
+	4300 1600 4650 1600
+$Comp
+L Device:C C?
+U 1 1 5E4C9D92
+P 4050 1600
+F 0 "C?" V 3798 1600 50  0000 C CNN
+F 1 "1nF" V 3889 1600 50  0000 C CNN
+F 2 "" H 4088 1450 50  0001 C CNN
+F 3 "~" H 4050 1600 50  0001 C CNN
+	1    4050 1600
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	4200 1600 4300 1600
+Connection ~ 4300 1600
+$Comp
+L Device:R R?
+U 1 1 5E4CA2ED
+P 3850 1850
+F 0 "R?" H 3920 1896 50  0000 L CNN
+F 1 "DNF" H 3920 1805 50  0000 L CNN
+F 2 "" V 3780 1850 50  0001 C CNN
+F 3 "~" H 3850 1850 50  0001 C CNN
+	1    3850 1850
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:R R?
+U 1 1 5E4CAA68
+P 3450 1850
+F 0 "R?" H 3520 1896 50  0000 L CNN
+F 1 "DNF" H 3520 1805 50  0000 L CNN
+F 2 "" V 3380 1850 50  0001 C CNN
+F 3 "~" H 3450 1850 50  0001 C CNN
+	1    3450 1850
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:R R?
+U 1 1 5E4CAD2A
+P 3650 1600
+F 0 "R?" V 3443 1600 50  0000 C CNN
+F 1 "0" V 3534 1600 50  0000 C CNN
+F 2 "" V 3580 1600 50  0001 C CNN
+F 3 "~" H 3650 1600 50  0001 C CNN
+	1    3650 1600
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	3850 1700 3850 1600
+Wire Wire Line
+	3850 1600 3800 1600
+Connection ~ 3850 1600
+Wire Wire Line
+	3450 1600 3450 1700
+Wire Wire Line
+	3500 1600 3450 1600
+Wire Wire Line
+	3900 1600 3850 1600
+Text HLabel 1650 1600 0    50   Input ~ 0
+LO
+Text Notes 2250 1100 0    79   ~ 16
+TODO low pass filter
+$Comp
+L Device:L L?
+U 1 1 5E4CD8E3
+P 2900 1600
+F 0 "L?" V 3090 1600 50  0000 C CNN
+F 1 "47uH" V 2999 1600 50  0000 C CNN
+F 2 "" H 2900 1600 50  0001 C CNN
+F 3 "~" H 2900 1600 50  0001 C CNN
+	1    2900 1600
+	0    -1   -1   0   
+$EndComp
+$Comp
+L Device:L L?
+U 1 1 5E4CDE00
+P 2500 1600
+F 0 "L?" V 2690 1600 50  0000 C CNN
+F 1 "47uH" V 2599 1600 50  0000 C CNN
+F 2 "" H 2500 1600 50  0001 C CNN
+F 3 "~" H 2500 1600 50  0001 C CNN
+	1    2500 1600
+	0    -1   -1   0   
+$EndComp
+$Comp
+L Device:C C?
+U 1 1 5E4CE0D9
+P 3100 1850
+F 0 "C?" H 3215 1896 50  0000 L CNN
+F 1 "39pF" H 3215 1805 50  0000 L CNN
+F 2 "" H 3138 1700 50  0001 C CNN
+F 3 "~" H 3100 1850 50  0001 C CNN
+	1    3100 1850
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C?
+U 1 1 5E4CE6C3
+P 2700 1850
+F 0 "C?" H 2815 1896 50  0000 L CNN
+F 1 "39pF" H 2815 1805 50  0000 L CNN
+F 2 "" H 2738 1700 50  0001 C CNN
+F 3 "~" H 2700 1850 50  0001 C CNN
+	1    2700 1850
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C?
+U 1 1 5E4CE8DE
+P 2250 1850
+F 0 "C?" H 2365 1896 50  0000 L CNN
+F 1 "39pF" H 2365 1805 50  0000 L CNN
+F 2 "" H 2288 1700 50  0001 C CNN
+F 3 "~" H 2250 1850 50  0001 C CNN
+	1    2250 1850
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3450 1600 3100 1600
+Connection ~ 3450 1600
+Wire Wire Line
+	3100 1700 3100 1600
+Connection ~ 3100 1600
+Wire Wire Line
+	3100 1600 3050 1600
+Wire Wire Line
+	2750 1600 2700 1600
+Wire Wire Line
+	2700 1600 2700 1700
+Connection ~ 2700 1600
+Wire Wire Line
+	2700 1600 2650 1600
+Wire Wire Line
+	2350 1600 2250 1600
+Wire Wire Line
+	2250 1600 2250 1700
+Wire Wire Line
+	2250 1600 1650 1600
+Connection ~ 2250 1600
+Wire Wire Line
+	4300 2000 3850 2000
+Connection ~ 2700 2000
+Wire Wire Line
+	2700 2000 2250 2000
+Connection ~ 3100 2000
+Wire Wire Line
+	3100 2000 2700 2000
+Connection ~ 3450 2000
+Wire Wire Line
+	3450 2000 3300 2000
+Connection ~ 3850 2000
+Wire Wire Line
+	3850 2000 3450 2000
+$Comp
+L power:GNDA #PWR?
+U 1 1 5E4D08F5
+P 3300 2000
+F 0 "#PWR?" H 3300 1750 50  0001 C CNN
+F 1 "GNDA" H 3305 1827 50  0000 C CNN
+F 2 "" H 3300 2000 50  0001 C CNN
+F 3 "" H 3300 2000 50  0001 C CNN
+	1    3300 2000
+	1    0    0    -1  
+$EndComp
+Connection ~ 3300 2000
+Wire Wire Line
+	3300 2000 3100 2000
+$Comp
+L Device:C C?
+U 1 1 5E4D0BBC
+P 4700 3900
+F 0 "C?" V 4952 3900 50  0000 C CNN
+F 1 "47pF" V 4861 3900 50  0000 C CNN
+F 2 "" H 4738 3750 50  0001 C CNN
+F 3 "~" H 4700 3900 50  0001 C CNN
+	1    4700 3900
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	4850 3900 4950 3900
+Wire Wire Line
+	4950 3900 4950 3700
+Wire Wire Line
+	4950 3700 5050 3700
+$Comp
+L Device:R R?
+U 1 1 5E4D1B30
+P 4400 4150
+F 0 "R?" H 4470 4196 50  0000 L CNN
+F 1 "47" H 4470 4105 50  0000 L CNN
+F 2 "" V 4330 4150 50  0001 C CNN
+F 3 "~" H 4400 4150 50  0001 C CNN
+	1    4400 4150
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:L L?
+U 1 1 5E4D20AF
+P 4200 4150
+F 0 "L?" H 4156 4196 50  0000 R CNN
+F 1 "220nH" H 4156 4105 50  0000 R CNN
+F 2 "" H 4200 4150 50  0001 C CNN
+F 3 "~" H 4200 4150 50  0001 C CNN
+	1    4200 4150
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4200 4000 4200 3900
+Wire Wire Line
+	4200 3900 4400 3900
+Wire Wire Line
+	4400 4000 4400 3900
+Connection ~ 4400 3900
+Wire Wire Line
+	4400 3900 4550 3900
+Wire Wire Line
+	4200 4300 4300 4300
+$Comp
+L power:GNDA #PWR?
+U 1 1 5E4D3F6B
+P 4300 4300
+F 0 "#PWR?" H 4300 4050 50  0001 C CNN
+F 1 "GNDA" H 4305 4127 50  0000 C CNN
+F 2 "" H 4300 4300 50  0001 C CNN
+F 3 "" H 4300 4300 50  0001 C CNN
+	1    4300 4300
+	1    0    0    -1  
+$EndComp
+Connection ~ 4300 4300
+Wire Wire Line
+	4300 4300 4400 4300
+$Comp
+L Device:L L?
+U 1 1 5E4D65F8
+P 4700 3500
+F 0 "L?" V 4890 3500 50  0000 C CNN
+F 1 "220nH" V 4799 3500 50  0000 C CNN
+F 2 "" H 4700 3500 50  0001 C CNN
+F 3 "~" H 4700 3500 50  0001 C CNN
+	1    4700 3500
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	4850 3500 4950 3500
+Wire Wire Line
+	4950 3500 4950 3700
+Connection ~ 4950 3700
+$Comp
+L Device:L L?
+U 1 1 5E4DA101
+P 4450 3250
+F 0 "L?" H 4503 3296 50  0000 L CNN
+F 1 "1uH" H 4503 3205 50  0000 L CNN
+F 2 "" H 4450 3250 50  0001 C CNN
+F 3 "~" H 4450 3250 50  0001 C CNN
+	1    4450 3250
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4450 3400 4450 3500
+Wire Wire Line
+	4450 3500 4550 3500
+$Comp
+L Device:C C?
+U 1 1 5E4DB208
+P 4250 3250
+F 0 "C?" H 4364 3204 50  0000 L CNN
+F 1 "47pF" H 4364 3295 50  0000 L CNN
+F 2 "" H 4288 3100 50  0001 C CNN
+F 3 "~" H 4250 3250 50  0001 C CNN
+	1    4250 3250
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	4250 3400 4250 3500
+Wire Wire Line
+	4250 3500 4450 3500
+Connection ~ 4450 3500
+Wire Wire Line
+	4250 3100 4350 3100
+$Comp
+L power:GNDA #PWR?
+U 1 1 5E4DD1CA
+P 4350 3100
+F 0 "#PWR?" H 4350 2850 50  0001 C CNN
+F 1 "GNDA" H 4355 2927 50  0000 C CNN
+F 2 "" H 4350 3100 50  0001 C CNN
+F 3 "" H 4350 3100 50  0001 C CNN
+	1    4350 3100
+	-1   0    0    1   
+$EndComp
+Connection ~ 4350 3100
+Wire Wire Line
+	4350 3100 4450 3100
+$Comp
+L Device:D_x2_KCom_AAK D?
+U 1 1 5E4DEAB5
+P 3750 3500
+F 0 "D?" V 3796 3579 50  0000 L CNN
+F 1 "BAP64-05W" V 3705 3579 50  0000 L CNN
+F 2 "Package_TO_SOT_SMD:SOT-23W_Handsoldering" H 3750 3500 50  0001 C CNN
+F 3 "~" H 3750 3500 50  0001 C CNN
+	1    3750 3500
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	3950 3500 4250 3500
+Connection ~ 4250 3500
+$Comp
+L Device:C C?
+U 1 1 5E4E2D19
+P 3350 3200
+F 0 "C?" V 3602 3200 50  0000 C CNN
+F 1 "1nF" V 3511 3200 50  0000 C CNN
+F 2 "" H 3388 3050 50  0001 C CNN
+F 3 "~" H 3350 3200 50  0001 C CNN
+	1    3350 3200
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	3500 3200 3750 3200
+$Comp
+L RF_Amplifier:SPF5189Z U?
+U 1 1 5E4E4229
+P 2800 3200
+F 0 "U?" H 2800 3567 50  0000 C CNN
+F 1 "SPF5189Z" H 2800 3476 50  0000 C CNN
+F 2 "Package_TO_SOT_SMD:SOT-89-3" H 2850 3600 50  0001 C CNN
+F 3 "www.qorvo.com/products/d/da001910" H 2800 3200 50  0001 C CNN
+	1    2800 3200
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	3100 3200 3200 3200
+$Comp
+L Device:L L?
+U 1 1 5E4E5AB8
+P 2050 2750
+F 0 "L?" H 2103 2796 50  0000 L CNN
+F 1 "1uH" H 2103 2705 50  0000 L CNN
+F 2 "" H 2050 2750 50  0001 C CNN
+F 3 "~" H 2050 2750 50  0001 C CNN
+	1    2050 2750
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C?
+U 1 1 5E4E60F3
+P 2400 2750
+F 0 "C?" H 2515 2796 50  0000 L CNN
+F 1 "1nF" H 2515 2705 50  0000 L CNN
+F 2 "" H 2438 2600 50  0001 C CNN
+F 3 "~" H 2400 2750 50  0001 C CNN
+	1    2400 2750
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GNDA #PWR?
+U 1 1 5E4E7721
+P 2900 3500
+F 0 "#PWR?" H 2900 3250 50  0001 C CNN
+F 1 "GNDA" H 2905 3327 50  0000 C CNN
+F 2 "" H 2900 3500 50  0001 C CNN
+F 3 "" H 2900 3500 50  0001 C CNN
+	1    2900 3500
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GNDA #PWR?
+U 1 1 5E4E7A1A
+P 2400 2900
+F 0 "#PWR?" H 2400 2650 50  0001 C CNN
+F 1 "GNDA" H 2405 2727 50  0000 C CNN
+F 2 "" H 2400 2900 50  0001 C CNN
+F 3 "" H 2400 2900 50  0001 C CNN
+	1    2400 2900
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2400 2600 2050 2600
+Wire Wire Line
+	2050 3200 2500 3200
+Wire Wire Line
+	2050 2900 2050 3200
+Text Label 2100 2600 0    50   ~ 0
+V_RX
+$Comp
+L Device:L L?
+U 1 1 5E4EC5D1
+P 1450 3200
+F 0 "L?" V 1640 3200 50  0000 C CNN
+F 1 "270nH" V 1549 3200 50  0000 C CNN
+F 2 "" H 1450 3200 50  0001 C CNN
+F 3 "~" H 1450 3200 50  0001 C CNN
+	1    1450 3200
+	0    -1   -1   0   
+$EndComp
+$Comp
+L Device:C C?
+U 1 1 5E4ECB4D
+P 1650 3400
+F 0 "C?" H 1765 3446 50  0000 L CNN
+F 1 "82pF" H 1765 3355 50  0000 L CNN
+F 2 "" H 1688 3250 50  0001 C CNN
+F 3 "~" H 1650 3400 50  0001 C CNN
+	1    1650 3400
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C?
+U 1 1 5E4EE6CF
+P 1850 3200
+F 0 "C?" V 1598 3200 50  0000 C CNN
+F 1 "68pF" V 1689 3200 50  0000 C CNN
+F 2 "" H 1888 3050 50  0001 C CNN
+F 3 "~" H 1850 3200 50  0001 C CNN
+	1    1850 3200
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	1650 3250 1650 3200
+Wire Wire Line
+	1650 3200 1700 3200
+Wire Wire Line
+	1650 3200 1600 3200
+Connection ~ 1650 3200
+Wire Wire Line
+	2000 3200 2050 3200
+Connection ~ 2050 3200
+$Comp
+L Device:L L?
+U 1 1 5E4F25DB
+P 1050 3200
+F 0 "L?" V 1240 3200 50  0000 C CNN
+F 1 "270nH" V 1149 3200 50  0000 C CNN
+F 2 "" H 1050 3200 50  0001 C CNN
+F 3 "~" H 1050 3200 50  0001 C CNN
+	1    1050 3200
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	1200 3200 1250 3200
+$Comp
+L Device:C C?
+U 1 1 5E4F3D9A
+P 850 3400
+F 0 "C?" H 965 3446 50  0000 L CNN
+F 1 "82pF" H 965 3355 50  0000 L CNN
+F 2 "" H 888 3250 50  0001 C CNN
+F 3 "~" H 850 3400 50  0001 C CNN
+	1    850  3400
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C?
+U 1 1 5E4F41ED
+P 1250 3400
+F 0 "C?" H 1365 3446 50  0000 L CNN
+F 1 "560pF" H 1365 3355 50  0000 L CNN
+F 2 "" H 1288 3250 50  0001 C CNN
+F 3 "~" H 1250 3400 50  0001 C CNN
+	1    1250 3400
+	1    0    0    -1  
+$EndComp
+Connection ~ 1250 3200
+Wire Wire Line
+	1250 3200 1300 3200
+Wire Wire Line
+	1250 3250 1250 3200
+Wire Wire Line
+	850  3250 850  3200
+Wire Wire Line
+	850  3200 900  3200
+$Comp
+L Device:C C?
+U 1 1 5E4F76F4
+P 850 2750
+F 0 "C?" H 735 2704 50  0000 R CNN
+F 1 "68pF" H 735 2795 50  0000 R CNN
+F 2 "" H 888 2600 50  0001 C CNN
+F 3 "~" H 850 2750 50  0001 C CNN
+	1    850  2750
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	850  2900 850  3200
+Connection ~ 850  3200
+Text HLabel 900  2500 2    50   Input ~ 0
+IFRX
+Wire Wire Line
+	850  2500 850  2600
+Wire Wire Line
+	850  2500 900  2500
+Wire Wire Line
+	850  3550 1250 3550
+Connection ~ 1250 3550
+Wire Wire Line
+	1250 3550 1650 3550
+$Comp
+L power:GNDA #PWR?
+U 1 1 5E4FF885
+P 1250 3550
+F 0 "#PWR?" H 1250 3300 50  0001 C CNN
+F 1 "GNDA" H 1255 3377 50  0000 C CNN
+F 2 "" H 1250 3550 50  0001 C CNN
+F 3 "" H 1250 3550 50  0001 C CNN
+	1    1250 3550
+	1    0    0    -1  
+$EndComp
+$EndSCHEMATC
diff --git a/kicad/baseband.sch b/kicad/baseband.sch
index 8d28abf..17d84e0 100644
--- a/kicad/baseband.sch
+++ b/kicad/baseband.sch
@@ -3,7 +3,7 @@ EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 5 5
+Sheet 4 6
 Title ""
 Date ""
 Rev ""
@@ -14,17 +14,6 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L Connector:Conn_Coaxial J?
-U 1 1 5E308E67
-P 800 1750
-F 0 "J?" H 728 1988 50  0000 C CNN
-F 1 "IF_RX" H 728 1897 50  0000 C CNN
-F 2 "" H 800 1750 50  0001 C CNN
-F 3 " ~" H 800 1750 50  0001 C CNN
-	1    800  1750
-	-1   0    0    -1  
-$EndComp
-$Comp
 L mpb:L_tapped L?
 U 1 1 5E30EBAD
 P 1200 1500
@@ -144,17 +133,6 @@ Wire Wire Line
 Connection ~ 2300 1200
 $Comp
 L power:GNDA #PWR?
-U 1 1 5E31695B
-P 800 1950
-F 0 "#PWR?" H 800 1700 50  0001 C CNN
-F 1 "GNDA" H 805 1777 50  0000 C CNN
-F 2 "" H 800 1950 50  0001 C CNN
-F 3 "" H 800 1950 50  0001 C CNN
-	1    800  1950
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:GNDA #PWR?
 U 1 1 5E316C0F
 P 1200 1650
 F 0 "#PWR?" H 1200 1400 50  0001 C CNN
@@ -400,7 +378,7 @@ $EndComp
 Wire Wire Line
 	2950 2200 3050 2200
 Text HLabel 2600 2200 0    50   Input ~ 0
-18MHz
+LO1
 Wire Wire Line
 	2600 2200 2750 2200
 Text Notes 2400 2150 0    50   ~ 0
@@ -600,32 +578,10 @@ F 3 "~" H 4350 1850 50  0001 C CNN
 $EndComp
 Wire Wire Line
 	4250 1850 4050 1850
-$Comp
-L Connector:Conn_Coaxial J?
-U 1 1 5E335664
-P 6300 1850
-F 0 "J?" H 6400 1825 50  0000 L CNN
-F 1 "IF_TX" H 6400 1734 50  0000 L CNN
-F 2 "" H 6300 1850 50  0001 C CNN
-F 3 " ~" H 6300 1850 50  0001 C CNN
-	1    6300 1850
-	1    0    0    -1  
-$EndComp
 Wire Wire Line
 	5950 1850 6100 1850
-$Comp
-L power:GNDA #PWR?
-U 1 1 5E33751D
-P 6300 2050
-F 0 "#PWR?" H 6300 1800 50  0001 C CNN
-F 1 "GNDA" H 6305 1877 50  0000 C CNN
-F 2 "" H 6300 2050 50  0001 C CNN
-F 3 "" H 6300 2050 50  0001 C CNN
-	1    6300 2050
-	-1   0    0    -1  
-$EndComp
-Text Notes 600  1450 0    50   ~ 0
-IF\n22.915MHz
+Text Notes 700  2000 0    50   ~ 0
+Freq = LO1 - 4.9152
 $Comp
 L Relay:G6E K?
 U 1 1 5E33D7FA
@@ -1509,17 +1465,6 @@ F 3 "" H 8350 3050 50  0001 C CNN
 $EndComp
 Text GLabel 8150 2850 0    50   Input ~ 0
 +8V
-$Comp
-L Connector:Conn_Coaxial J?
-U 1 1 5E40DA0A
-P 6750 1000
-F 0 "J?" H 6678 1238 50  0000 C CNN
-F 1 "Mic" H 6678 1147 50  0000 C CNN
-F 2 "" H 6750 1000 50  0001 C CNN
-F 3 " ~" H 6750 1000 50  0001 C CNN
-	1    6750 1000
-	-1   0    0    -1  
-$EndComp
 Text Notes 6650 700  0    50   ~ 0
 Dynamic microphone
 Wire Notes Line
@@ -1527,12 +1472,12 @@ Wire Notes Line
 $Comp
 L power:GNDA #PWR?
 U 1 1 5E417A69
-P 6750 1400
-F 0 "#PWR?" H 6750 1150 50  0001 C CNN
-F 1 "GNDA" H 6755 1227 50  0000 C CNN
-F 2 "" H 6750 1400 50  0001 C CNN
-F 3 "" H 6750 1400 50  0001 C CNN
-	1    6750 1400
+P 7050 1400
+F 0 "#PWR?" H 7050 1150 50  0001 C CNN
+F 1 "GNDA" H 7055 1227 50  0000 C CNN
+F 2 "" H 7050 1400 50  0001 C CNN
+F 3 "" H 7050 1400 50  0001 C CNN
+	1    7050 1400
 	-1   0    0    -1  
 $EndComp
 $Comp
@@ -1551,12 +1496,7 @@ Wire Wire Line
 Wire Wire Line
 	7050 1000 7050 1050
 Wire Wire Line
-	6750 1200 6750 1400
-Wire Wire Line
 	7050 1350 7050 1400
-Wire Wire Line
-	7050 1400 6750 1400
-Connection ~ 6750 1400
 $Comp
 L Device:C_Small C?
 U 1 1 5E426DBD
@@ -2141,34 +2081,8 @@ $EndComp
 Wire Wire Line
 	7500 5800 7400 5800
 Connection ~ 7500 5800
-$Comp
-L Connector_Generic:Conn_01x02 J?
-U 1 1 5E5C5715
-P 6800 5900
-F 0 "J?" H 6718 5575 50  0000 C CNN
-F 1 "SPKR" H 6718 5666 50  0000 C CNN
-F 2 "" H 6800 5900 50  0001 C CNN
-F 3 "~" H 6800 5900 50  0001 C CNN
-	1    6800 5900
-	-1   0    0    1   
-$EndComp
-$Comp
-L power:GNDA #PWR?
-U 1 1 5E5C5E3E
-P 7000 6000
-F 0 "#PWR?" H 7000 5750 50  0001 C CNN
-F 1 "GNDA" H 7005 5827 50  0000 C CNN
-F 2 "" H 7000 6000 50  0001 C CNN
-F 3 "" H 7000 6000 50  0001 C CNN
-	1    7000 6000
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	7000 6000 7000 5900
 Wire Wire Line
 	7000 5800 7200 5800
-Text Notes 6900 6050 2    50   ~ 0
-8 Ohm
 $Comp
 L Transistor_BJT:BC107 Q?
 U 1 1 5E5DA634
@@ -2583,32 +2497,20 @@ Wire Wire Line
 	10750 1800 10250 1800
 Wire Wire Line
 	10250 1800 10250 1850
-$Comp
-L Connector_Generic:Conn_01x02 J?
-U 1 1 5E8CFE5D
-P 10800 2100
-F 0 "J?" H 10718 1775 50  0000 C CNN
-F 1 "METER" H 10718 1866 50  0000 C CNN
-F 2 "" H 10800 2100 50  0001 C CNN
-F 3 "~" H 10800 2100 50  0001 C CNN
-	1    10800 2100
-	1    0    0    1   
-$EndComp
 Wire Wire Line
 	10600 2000 10400 2000
-$Comp
-L power:GNDA #PWR?
-U 1 1 5E8DE2F2
-P 10600 2150
-F 0 "#PWR?" H 10600 1900 50  0001 C CNN
-F 1 "GNDA" H 10605 1977 50  0000 C CNN
-F 2 "" H 10600 2150 50  0001 C CNN
-F 3 "" H 10600 2150 50  0001 C CNN
-	1    10600 2150
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	10600 2150 10600 2100
-Text Notes 10900 2250 0    50   ~ 0
-100uA
+Text HLabel 1000 1750 0    50   Input ~ 0
+HF_RX
+Text HLabel 7000 5800 0    50   Input ~ 0
+SPKR
+Text HLabel 10600 2000 2    50   Input ~ 0
+METER
+Text HLabel 6950 1000 0    50   Input ~ 0
+MIC
+Text HLabel 6100 1850 2    50   Input ~ 0
+HF_TX
+Text Notes 9450 5100 0    79   ~ 16
+TODO Handle CW
+Text Notes 1050 4500 0    79   ~ 16
+TODO Find appropriate relays
 $EndSCHEMATC
diff --git a/kicad/clock.sch b/kicad/clock.sch
new file mode 100644
index 0000000..9267fc1
--- /dev/null
+++ b/kicad/clock.sch
@@ -0,0 +1,448 @@
+EESchema Schematic File Version 4
+EELAYER 30 0
+EELAYER END
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 5 6
+Title ""
+Date ""
+Rev ""
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+$Comp
+L Oscillator:Si5351A-B-GT U?
+U 1 1 5E4D2B4D
+P 4850 3850
+AR Path="/5E4BDE97/5E4D2B4D" Ref="U?"  Part="1" 
+AR Path="/5E4D2B4D" Ref="U?"  Part="1" 
+AR Path="/5E4D247A/5E4D2B4D" Ref="U?"  Part="1" 
+F 0 "U?" H 4850 3261 50  0000 C CNN
+F 1 "Si5351A-B-GT" H 4850 3170 50  0000 C CNN
+F 2 "Package_SO:MSOP-10_3x3mm_P0.5mm" H 4850 3050 50  0001 C CNN
+F 3 "https://www.silabs.com/documents/public/data-sheets/Si5351-B.pdf" H 4500 3750 50  0001 C CNN
+	1    4850 3850
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GNDA #PWR?
+U 1 1 5E4D2B53
+P 4850 4650
+AR Path="/5E4BDE97/5E4D2B53" Ref="#PWR?"  Part="1" 
+AR Path="/5E4D2B53" Ref="#PWR?"  Part="1" 
+AR Path="/5E4D247A/5E4D2B53" Ref="#PWR?"  Part="1" 
+F 0 "#PWR?" H 4850 4400 50  0001 C CNN
+F 1 "GNDA" H 4855 4477 50  0000 C CNN
+F 2 "" H 4850 4650 50  0001 C CNN
+F 3 "" H 4850 4650 50  0001 C CNN
+	1    4850 4650
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4850 4350 4850 4650
+Text HLabel 6900 3050 2    50   Input ~ 0
+LO1
+$Comp
+L Device:R R?
+U 1 1 5E56947F
+P 6150 3200
+AR Path="/5E3088F9/5E56947F" Ref="R?"  Part="1" 
+AR Path="/5E4D247A/5E56947F" Ref="R?"  Part="1" 
+F 0 "R?" H 6220 3246 50  0000 L CNN
+F 1 "DNF" H 6220 3155 50  0000 L CNN
+F 2 "" V 6080 3200 50  0001 C CNN
+F 3 "~" H 6150 3200 50  0001 C CNN
+	1    6150 3200
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:R R?
+U 1 1 5E569495
+P 6450 3050
+AR Path="/5E3088F9/5E569495" Ref="R?"  Part="1" 
+AR Path="/5E4D247A/5E569495" Ref="R?"  Part="1" 
+F 0 "R?" H 6520 3096 50  0000 L CNN
+F 1 "0" H 6520 3005 50  0000 L CNN
+F 2 "" V 6380 3050 50  0001 C CNN
+F 3 "~" H 6450 3050 50  0001 C CNN
+	1    6450 3050
+	0    -1   -1   0   
+$EndComp
+$Comp
+L Device:R R?
+U 1 1 5E56A227
+P 6750 3200
+AR Path="/5E3088F9/5E56A227" Ref="R?"  Part="1" 
+AR Path="/5E4D247A/5E56A227" Ref="R?"  Part="1" 
+F 0 "R?" H 6820 3246 50  0000 L CNN
+F 1 "DNF" H 6820 3155 50  0000 L CNN
+F 2 "" V 6680 3200 50  0001 C CNN
+F 3 "~" H 6750 3200 50  0001 C CNN
+	1    6750 3200
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6900 3050 6750 3050
+Connection ~ 6750 3050
+Wire Wire Line
+	6750 3050 6600 3050
+Wire Wire Line
+	6300 3050 6150 3050
+Wire Wire Line
+	5500 3050 6150 3050
+Connection ~ 6150 3050
+$Comp
+L power:GNDA #PWR?
+U 1 1 5E56C487
+P 6750 3350
+AR Path="/5E4BDE97/5E56C487" Ref="#PWR?"  Part="1" 
+AR Path="/5E56C487" Ref="#PWR?"  Part="1" 
+AR Path="/5E4D247A/5E56C487" Ref="#PWR?"  Part="1" 
+F 0 "#PWR?" H 6750 3100 50  0001 C CNN
+F 1 "GNDA" H 6755 3177 50  0000 C CNN
+F 2 "" H 6750 3350 50  0001 C CNN
+F 3 "" H 6750 3350 50  0001 C CNN
+	1    6750 3350
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3650 3500 4350 3500
+Wire Wire Line
+	4350 3500 4350 3550
+Wire Wire Line
+	3650 3800 4350 3800
+Wire Wire Line
+	4350 3800 4350 3750
+$Comp
+L Device:Crystal_GND24 Y?
+U 1 1 5E56D94F
+P 3650 3650
+F 0 "Y?" V 3981 3650 50  0000 C CNN
+F 1 "CX3225SB25000D0FLJCC" V 3890 3650 50  0000 C CNN
+F 2 "" H 3650 3650 50  0001 C CNN
+F 3 "~" H 3650 3650 50  0001 C CNN
+	1    3650 3650
+	0    -1   -1   0   
+$EndComp
+$Comp
+L power:GNDA #PWR?
+U 1 1 5E56EE8C
+P 3850 3650
+AR Path="/5E4BDE97/5E56EE8C" Ref="#PWR?"  Part="1" 
+AR Path="/5E56EE8C" Ref="#PWR?"  Part="1" 
+AR Path="/5E4D247A/5E56EE8C" Ref="#PWR?"  Part="1" 
+F 0 "#PWR?" H 3850 3400 50  0001 C CNN
+F 1 "GNDA" V 3855 3522 50  0000 R CNN
+F 2 "" H 3850 3650 50  0001 C CNN
+F 3 "" H 3850 3650 50  0001 C CNN
+	1    3850 3650
+	0    -1   -1   0   
+$EndComp
+$Comp
+L power:GNDA #PWR?
+U 1 1 5E56FABB
+P 3450 3650
+AR Path="/5E4BDE97/5E56FABB" Ref="#PWR?"  Part="1" 
+AR Path="/5E56FABB" Ref="#PWR?"  Part="1" 
+AR Path="/5E4D247A/5E56FABB" Ref="#PWR?"  Part="1" 
+F 0 "#PWR?" H 3450 3400 50  0001 C CNN
+F 1 "GNDA" V 3455 3523 50  0000 R CNN
+F 2 "" H 3450 3650 50  0001 C CNN
+F 3 "" H 3450 3650 50  0001 C CNN
+	1    3450 3650
+	0    1    1    0   
+$EndComp
+Text GLabel 4350 4050 0    50   Input ~ 0
+SCL
+Text GLabel 4350 4150 0    50   Input ~ 0
+SDA
+$Comp
+L Device:C_Small C?
+U 1 1 5E57EA44
+P 5100 3100
+AR Path="/5E3088F9/5E57EA44" Ref="C?"  Part="1" 
+AR Path="/5E4D247A/5E57EA44" Ref="C?"  Part="1" 
+F 0 "C?" H 5008 3054 50  0000 R CNN
+F 1 "0.1uF" H 5008 3145 50  0000 R CNN
+F 2 "" H 5100 3100 50  0001 C CNN
+F 3 "~" H 5100 3100 50  0001 C CNN
+	1    5100 3100
+	-1   0    0    1   
+$EndComp
+$Comp
+L Device:C_Small C?
+U 1 1 5E57EAB6
+P 4600 3100
+AR Path="/5E3088F9/5E57EAB6" Ref="C?"  Part="1" 
+AR Path="/5E4D247A/5E57EAB6" Ref="C?"  Part="1" 
+F 0 "C?" H 4691 3054 50  0000 L CNN
+F 1 "0.1uF" H 4691 3145 50  0000 L CNN
+F 2 "" H 4600 3100 50  0001 C CNN
+F 3 "~" H 4600 3100 50  0001 C CNN
+	1    4600 3100
+	-1   0    0    1   
+$EndComp
+$Comp
+L power:GNDA #PWR?
+U 1 1 5E56C180
+P 6150 3350
+AR Path="/5E4BDE97/5E56C180" Ref="#PWR?"  Part="1" 
+AR Path="/5E56C180" Ref="#PWR?"  Part="1" 
+AR Path="/5E4D247A/5E56C180" Ref="#PWR?"  Part="1" 
+F 0 "#PWR?" H 6150 3100 50  0001 C CNN
+F 1 "GNDA" H 6155 3177 50  0000 C CNN
+F 2 "" H 6150 3350 50  0001 C CNN
+F 3 "" H 6150 3350 50  0001 C CNN
+	1    6150 3350
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GNDA #PWR?
+U 1 1 5E57F3D9
+P 5100 3200
+AR Path="/5E4BDE97/5E57F3D9" Ref="#PWR?"  Part="1" 
+AR Path="/5E57F3D9" Ref="#PWR?"  Part="1" 
+AR Path="/5E4D247A/5E57F3D9" Ref="#PWR?"  Part="1" 
+F 0 "#PWR?" H 5100 2950 50  0001 C CNN
+F 1 "GNDA" H 5105 3027 50  0000 C CNN
+F 2 "" H 5100 3200 50  0001 C CNN
+F 3 "" H 5100 3200 50  0001 C CNN
+	1    5100 3200
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GNDA #PWR?
+U 1 1 5E57F697
+P 4600 3200
+AR Path="/5E4BDE97/5E57F697" Ref="#PWR?"  Part="1" 
+AR Path="/5E57F697" Ref="#PWR?"  Part="1" 
+AR Path="/5E4D247A/5E57F697" Ref="#PWR?"  Part="1" 
+F 0 "#PWR?" H 4600 2950 50  0001 C CNN
+F 1 "GNDA" H 4605 3027 50  0000 C CNN
+F 2 "" H 4600 3200 50  0001 C CNN
+F 3 "" H 4600 3200 50  0001 C CNN
+	1    4600 3200
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4600 3000 4750 3000
+Wire Wire Line
+	4750 3000 4750 3350
+Wire Wire Line
+	5100 3000 4950 3000
+Wire Wire Line
+	4950 3000 4950 3350
+$Comp
+L power:+2V5 #PWR?
+U 1 1 5E581CE3
+P 4600 3000
+F 0 "#PWR?" H 4600 2850 50  0001 C CNN
+F 1 "+2V5" H 4615 3173 50  0000 C CNN
+F 2 "" H 4600 3000 50  0001 C CNN
+F 3 "" H 4600 3000 50  0001 C CNN
+	1    4600 3000
+	1    0    0    -1  
+$EndComp
+Connection ~ 4600 3000
+$Comp
+L power:+2V5 #PWR?
+U 1 1 5E582495
+P 5100 3000
+F 0 "#PWR?" H 5100 2850 50  0001 C CNN
+F 1 "+2V5" H 5115 3173 50  0000 C CNN
+F 2 "" H 5100 3000 50  0001 C CNN
+F 3 "" H 5100 3000 50  0001 C CNN
+	1    5100 3000
+	1    0    0    -1  
+$EndComp
+Connection ~ 5100 3000
+Text HLabel 2850 3500 0    50   Input ~ 0
+REF_25MHz
+$Comp
+L Device:C_Small C?
+U 1 1 5E584764
+P 3050 3500
+AR Path="/5E3088F9/5E584764" Ref="C?"  Part="1" 
+AR Path="/5E4D247A/5E584764" Ref="C?"  Part="1" 
+F 0 "C?" V 3279 3500 50  0000 C CNN
+F 1 "0.1uF" V 3188 3500 50  0000 C CNN
+F 2 "" H 3050 3500 50  0001 C CNN
+F 3 "~" H 3050 3500 50  0001 C CNN
+	1    3050 3500
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	3150 3500 3650 3500
+Connection ~ 3650 3500
+Wire Wire Line
+	2950 3500 2850 3500
+Text HLabel 6900 3850 2    50   Input ~ 0
+LO_VHF
+$Comp
+L Device:R R?
+U 1 1 5E58AC6E
+P 6150 4000
+AR Path="/5E3088F9/5E58AC6E" Ref="R?"  Part="1" 
+AR Path="/5E4D247A/5E58AC6E" Ref="R?"  Part="1" 
+F 0 "R?" H 6220 4046 50  0000 L CNN
+F 1 "DNF" H 6220 3955 50  0000 L CNN
+F 2 "" V 6080 4000 50  0001 C CNN
+F 3 "~" H 6150 4000 50  0001 C CNN
+	1    6150 4000
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:R R?
+U 1 1 5E58AC78
+P 6450 3850
+AR Path="/5E3088F9/5E58AC78" Ref="R?"  Part="1" 
+AR Path="/5E4D247A/5E58AC78" Ref="R?"  Part="1" 
+F 0 "R?" H 6520 3896 50  0000 L CNN
+F 1 "0" H 6520 3805 50  0000 L CNN
+F 2 "" V 6380 3850 50  0001 C CNN
+F 3 "~" H 6450 3850 50  0001 C CNN
+	1    6450 3850
+	0    -1   -1   0   
+$EndComp
+$Comp
+L Device:R R?
+U 1 1 5E58AC82
+P 6750 4000
+AR Path="/5E3088F9/5E58AC82" Ref="R?"  Part="1" 
+AR Path="/5E4D247A/5E58AC82" Ref="R?"  Part="1" 
+F 0 "R?" H 6820 4046 50  0000 L CNN
+F 1 "DNF" H 6820 3955 50  0000 L CNN
+F 2 "" V 6680 4000 50  0001 C CNN
+F 3 "~" H 6750 4000 50  0001 C CNN
+	1    6750 4000
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6900 3850 6750 3850
+Connection ~ 6750 3850
+Wire Wire Line
+	6750 3850 6600 3850
+Wire Wire Line
+	6300 3850 6150 3850
+Connection ~ 6150 3850
+$Comp
+L power:GNDA #PWR?
+U 1 1 5E58AC92
+P 6750 4150
+AR Path="/5E4BDE97/5E58AC92" Ref="#PWR?"  Part="1" 
+AR Path="/5E58AC92" Ref="#PWR?"  Part="1" 
+AR Path="/5E4D247A/5E58AC92" Ref="#PWR?"  Part="1" 
+F 0 "#PWR?" H 6750 3900 50  0001 C CNN
+F 1 "GNDA" H 6755 3977 50  0000 C CNN
+F 2 "" H 6750 4150 50  0001 C CNN
+F 3 "" H 6750 4150 50  0001 C CNN
+	1    6750 4150
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GNDA #PWR?
+U 1 1 5E58AC9C
+P 6150 4150
+AR Path="/5E4BDE97/5E58AC9C" Ref="#PWR?"  Part="1" 
+AR Path="/5E58AC9C" Ref="#PWR?"  Part="1" 
+AR Path="/5E4D247A/5E58AC9C" Ref="#PWR?"  Part="1" 
+F 0 "#PWR?" H 6150 3900 50  0001 C CNN
+F 1 "GNDA" H 6155 3977 50  0000 C CNN
+F 2 "" H 6150 4150 50  0001 C CNN
+F 3 "" H 6150 4150 50  0001 C CNN
+	1    6150 4150
+	1    0    0    -1  
+$EndComp
+Text HLabel 6900 4600 2    50   Input ~ 0
+CLK_AUX
+$Comp
+L Device:R R?
+U 1 1 5E59255D
+P 6150 4750
+AR Path="/5E3088F9/5E59255D" Ref="R?"  Part="1" 
+AR Path="/5E4D247A/5E59255D" Ref="R?"  Part="1" 
+F 0 "R?" H 6220 4796 50  0000 L CNN
+F 1 "DNF" H 6220 4705 50  0000 L CNN
+F 2 "" V 6080 4750 50  0001 C CNN
+F 3 "~" H 6150 4750 50  0001 C CNN
+	1    6150 4750
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:R R?
+U 1 1 5E592567
+P 6450 4600
+AR Path="/5E3088F9/5E592567" Ref="R?"  Part="1" 
+AR Path="/5E4D247A/5E592567" Ref="R?"  Part="1" 
+F 0 "R?" H 6520 4646 50  0000 L CNN
+F 1 "0" H 6520 4555 50  0000 L CNN
+F 2 "" V 6380 4600 50  0001 C CNN
+F 3 "~" H 6450 4600 50  0001 C CNN
+	1    6450 4600
+	0    -1   -1   0   
+$EndComp
+$Comp
+L Device:R R?
+U 1 1 5E592571
+P 6750 4750
+AR Path="/5E3088F9/5E592571" Ref="R?"  Part="1" 
+AR Path="/5E4D247A/5E592571" Ref="R?"  Part="1" 
+F 0 "R?" H 6820 4796 50  0000 L CNN
+F 1 "DNF" H 6820 4705 50  0000 L CNN
+F 2 "" V 6680 4750 50  0001 C CNN
+F 3 "~" H 6750 4750 50  0001 C CNN
+	1    6750 4750
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6900 4600 6750 4600
+Connection ~ 6750 4600
+Wire Wire Line
+	6750 4600 6600 4600
+Wire Wire Line
+	6300 4600 6150 4600
+Wire Wire Line
+	5500 4600 6150 4600
+Connection ~ 6150 4600
+$Comp
+L power:GNDA #PWR?
+U 1 1 5E592581
+P 6750 4900
+AR Path="/5E4BDE97/5E592581" Ref="#PWR?"  Part="1" 
+AR Path="/5E592581" Ref="#PWR?"  Part="1" 
+AR Path="/5E4D247A/5E592581" Ref="#PWR?"  Part="1" 
+F 0 "#PWR?" H 6750 4650 50  0001 C CNN
+F 1 "GNDA" H 6755 4727 50  0000 C CNN
+F 2 "" H 6750 4900 50  0001 C CNN
+F 3 "" H 6750 4900 50  0001 C CNN
+	1    6750 4900
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GNDA #PWR?
+U 1 1 5E59258B
+P 6150 4900
+AR Path="/5E4BDE97/5E59258B" Ref="#PWR?"  Part="1" 
+AR Path="/5E59258B" Ref="#PWR?"  Part="1" 
+AR Path="/5E4D247A/5E59258B" Ref="#PWR?"  Part="1" 
+F 0 "#PWR?" H 6150 4650 50  0001 C CNN
+F 1 "GNDA" H 6155 4727 50  0000 C CNN
+F 2 "" H 6150 4900 50  0001 C CNN
+F 3 "" H 6150 4900 50  0001 C CNN
+	1    6150 4900
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5500 3050 5500 3650
+Wire Wire Line
+	5500 3650 5350 3650
+Wire Wire Line
+	5350 3850 6150 3850
+Wire Wire Line
+	5500 4600 5500 4050
+Wire Wire Line
+	5500 4050 5350 4050
+$EndSCHEMATC
diff --git a/kicad/control.sch b/kicad/control.sch
index b70f158..0ac1f6e 100644
--- a/kicad/control.sch
+++ b/kicad/control.sch
@@ -3,7 +3,7 @@ EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 3 5
+Sheet 3 6
 Title ""
 Date ""
 Rev ""
@@ -75,17 +75,6 @@ $EndComp
 Connection ~ 9650 1450
 Wire Wire Line
 	9650 1450 9850 1450
-$Comp
-L power:VCC #PWR?
-U 1 1 5E305123
-P 5250 1950
-F 0 "#PWR?" H 5250 1800 50  0001 C CNN
-F 1 "VCC" H 5267 2123 50  0000 C CNN
-F 2 "" H 5250 1950 50  0001 C CNN
-F 3 "" H 5250 1950 50  0001 C CNN
-	1    5250 1950
-	1    0    0    -1  
-$EndComp
 Text Label 8800 1450 0    50   ~ 0
 MISO
 Text Label 8800 1550 0    50   ~ 0
@@ -110,17 +99,6 @@ RXD
 Text Label 5850 4050 0    50   ~ 0
 TXD
 $Comp
-L power:VCC #PWR?
-U 1 1 5E307A7D
-P 8300 1150
-F 0 "#PWR?" H 8300 1000 50  0001 C CNN
-F 1 "VCC" H 8317 1323 50  0000 C CNN
-F 2 "" H 8300 1150 50  0001 C CNN
-F 3 "" H 8300 1150 50  0001 C CNN
-	1    8300 1150
-	1    0    0    -1  
-$EndComp
-$Comp
 L power:GND #PWR?
 U 1 1 5E30808E
 P 8300 2050
@@ -142,4 +120,251 @@ F 3 "" H 5250 4950 50  0001 C CNN
 	1    5250 4950
 	1    0    0    -1  
 $EndComp
+Text GLabel 8300 4300 1    50   Input ~ 0
++8V_TX
+Text GLabel 8100 4300 1    50   Input ~ 0
++8V_RX
+Text GLabel 8200 4900 3    50   Input ~ 0
++8V
+Wire Wire Line
+	8300 1150 8300 950 
+Text HLabel 5250 1900 0    50   Input ~ 0
++3V3
+Text GLabel 8500 3650 2    50   Input ~ 0
+SCL
+Text GLabel 8500 3550 2    50   Input ~ 0
+SDA
+$Comp
+L Device:R R?
+U 1 1 5E60F832
+P 7950 3350
+F 0 "R?" H 8020 3396 50  0000 L CNN
+F 1 "4k7" H 8020 3305 50  0000 L CNN
+F 2 "" V 7880 3350 50  0001 C CNN
+F 3 "~" H 7950 3350 50  0001 C CNN
+	1    7950 3350
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5850 3550 8250 3550
+Wire Wire Line
+	5850 3650 7950 3650
+$Comp
+L Device:R R?
+U 1 1 5E61059E
+P 8250 3350
+F 0 "R?" H 8320 3396 50  0000 L CNN
+F 1 "4k7" H 8320 3305 50  0000 L CNN
+F 2 "" V 8180 3350 50  0001 C CNN
+F 3 "~" H 8250 3350 50  0001 C CNN
+	1    8250 3350
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	8250 3550 8250 3500
+Connection ~ 8250 3550
+Wire Wire Line
+	8250 3550 8500 3550
+Wire Wire Line
+	7950 3650 7950 3500
+Connection ~ 7950 3650
+Wire Wire Line
+	7950 3650 8500 3650
+Wire Wire Line
+	7950 3200 8100 3200
+$Comp
+L power:+3.3V #PWR?
+U 1 1 5E611AC9
+P 5250 1900
+F 0 "#PWR?" H 5250 1750 50  0001 C CNN
+F 1 "+3.3V" H 5265 2073 50  0000 C CNN
+F 2 "" H 5250 1900 50  0001 C CNN
+F 3 "" H 5250 1900 50  0001 C CNN
+	1    5250 1900
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5250 1900 5250 1950
+$Comp
+L power:+3.3V #PWR?
+U 1 1 5E612912
+P 8300 950
+F 0 "#PWR?" H 8300 800 50  0001 C CNN
+F 1 "+3.3V" H 8315 1123 50  0000 C CNN
+F 2 "" H 8300 950 50  0001 C CNN
+F 3 "" H 8300 950 50  0001 C CNN
+	1    8300 950 
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+3.3V #PWR?
+U 1 1 5E612C53
+P 8100 3200
+F 0 "#PWR?" H 8100 3050 50  0001 C CNN
+F 1 "+3.3V" H 8115 3373 50  0000 C CNN
+F 2 "" H 8100 3200 50  0001 C CNN
+F 3 "" H 8100 3200 50  0001 C CNN
+	1    8100 3200
+	1    0    0    -1  
+$EndComp
+Connection ~ 8100 3200
+Wire Wire Line
+	8100 3200 8250 3200
+$Comp
+L Device:R R?
+U 1 1 5E62F7FA
+P 7350 5350
+F 0 "R?" H 7420 5396 50  0000 L CNN
+F 1 "330" H 7420 5305 50  0000 L CNN
+F 2 "" V 7280 5350 50  0001 C CNN
+F 3 "~" H 7350 5350 50  0001 C CNN
+	1    7350 5350
+	0    -1   -1   0   
+$EndComp
+$Comp
+L Relay:G6K-2 K?
+U 1 1 5E4BAF0C
+P 8200 4600
+F 0 "K?" H 8830 4646 50  0000 L CNN
+F 1 "G6K-2F-Y-TR DC12" H 8830 4555 50  0000 L CNN
+F 2 "Relay_SMD:Relay_DPDT_Omron_G6K-2F-Y" H 8200 4600 50  0001 L CNN
+F 3 "http://omronfs.omron.com/en_US/ecb/products/pdf/en-g6k.pdf" H 8200 4600 50  0001 C CNN
+	1    8200 4600
+	1    0    0    -1  
+$EndComp
+$Comp
+L Transistor_BJT:BC817 Q?
+U 1 1 5E4BFAC4
+P 7700 5350
+F 0 "Q?" H 7891 5396 50  0000 L CNN
+F 1 "BC817" H 7891 5305 50  0000 L CNN
+F 2 "Package_TO_SOT_SMD:SOT-23" H 7900 5275 50  0001 L CIN
+F 3 "http://www.fairchildsemi.com/ds/BC/BC817.pdf" H 7700 5350 50  0001 L CNN
+	1    7700 5350
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5850 4150 7200 4150
+Wire Wire Line
+	7200 4150 7200 5350
+Wire Wire Line
+	7800 5150 7800 5050
+$Comp
+L power:+12V #PWR?
+U 1 1 5E4C2548
+P 7800 4200
+AR Path="/5E4C2548" Ref="#PWR?"  Part="1" 
+AR Path="/5E2FA006/5E4C2548" Ref="#PWR?"  Part="1" 
+F 0 "#PWR?" H 7800 4050 50  0001 C CNN
+F 1 "+12V" H 7815 4373 50  0000 C CNN
+F 2 "" H 7800 4200 50  0001 C CNN
+F 3 "" H 7800 4200 50  0001 C CNN
+	1    7800 4200
+	1    0    0    -1  
+$EndComp
+$Comp
+L Diode:1N4148 D?
+U 1 1 5E4C2946
+P 7450 4900
+F 0 "D?" V 7404 4979 50  0000 L CNN
+F 1 "1N4148" V 7495 4979 50  0000 L CNN
+F 2 "Diode_THT:D_DO-35_SOD27_P7.62mm_Horizontal" H 7450 4725 50  0001 C CNN
+F 3 "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" H 7450 4900 50  0001 C CNN
+	1    7450 4900
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	7800 4300 7450 4300
+Wire Wire Line
+	7450 4300 7450 4750
+Wire Wire Line
+	7800 5050 7450 5050
+Connection ~ 7800 5050
+Wire Wire Line
+	7800 5050 7800 4900
+Wire Wire Line
+	7800 4300 7800 4200
+Connection ~ 7800 4300
+$Comp
+L power:GND #PWR?
+U 1 1 5E4C64B8
+P 7800 5550
+F 0 "#PWR?" H 7800 5300 50  0001 C CNN
+F 1 "GND" H 7805 5377 50  0000 C CNN
+F 2 "" H 7800 5550 50  0001 C CNN
+F 3 "" H 7800 5550 50  0001 C CNN
+	1    7800 5550
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector:Screw_Terminal_01x04 J?
+U 1 1 5E4C6E60
+P 10000 4100
+F 0 "J?" H 10080 4092 50  0000 L CNN
+F 1 "CTRL" H 10080 4001 50  0000 L CNN
+F 2 "TerminalBlock_Phoenix:TerminalBlock_Phoenix_MPT-0,5-4-2.54_1x04_P2.54mm_Horizontal" H 10000 4100 50  0001 C CNN
+F 3 "~" H 10000 4100 50  0001 C CNN
+	1    10000 4100
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR?
+U 1 1 5E4C7CA8
+P 8600 4900
+F 0 "#PWR?" H 8600 4650 50  0001 C CNN
+F 1 "GND" H 8605 4727 50  0000 C CNN
+F 2 "" H 8600 4900 50  0001 C CNN
+F 3 "" H 8600 4900 50  0001 C CNN
+	1    8600 4900
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR?
+U 1 1 5E4C84F4
+P 9800 4300
+F 0 "#PWR?" H 9800 4050 50  0001 C CNN
+F 1 "GND" H 9805 4127 50  0000 C CNN
+F 2 "" H 9800 4300 50  0001 C CNN
+F 3 "" H 9800 4300 50  0001 C CNN
+	1    9800 4300
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	8500 4300 8500 4100
+Wire Wire Line
+	8500 4100 9800 4100
+Wire Wire Line
+	8700 4300 8700 4200
+Wire Wire Line
+	8700 4200 9800 4200
+$Comp
+L power:+12V #PWR?
+U 1 1 5E4C9524
+P 9800 4000
+AR Path="/5E4C9524" Ref="#PWR?"  Part="1" 
+AR Path="/5E2FA006/5E4C9524" Ref="#PWR?"  Part="1" 
+F 0 "#PWR?" H 9800 3850 50  0001 C CNN
+F 1 "+12V" H 9815 4173 50  0000 C CNN
+F 2 "" H 9800 4000 50  0001 C CNN
+F 3 "" H 9800 4000 50  0001 C CNN
+	1    9800 4000
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:Rotary_Encoder_Switch SW?
+U 1 1 5E4CA7A2
+P 2600 3350
+F 0 "SW?" H 2600 3717 50  0000 C CNN
+F 1 "PEC12R-4022F-S0024" H 2600 3626 50  0000 C CNN
+F 2 "Rotary_Encoder:RotaryEncoder_Alps_EC11E_Vertical_H20mm" H 2450 3510 50  0001 C CNN
+F 3 "~" H 2600 3610 50  0001 C CNN
+	1    2600 3350
+	1    0    0    -1  
+$EndComp
+Text Notes 1350 4300 0    50   ~ 0
+Buttons to add\nVFO\nFast/slow\nRIT\nMenu\nBand\nPTT\nCW Key
+Text Notes 6500 2650 0    50   ~ 0
+Arduino PWM for CW sidetone and TX?
+Text HLabel 9650 2550 2    50   Input ~ 0
+CW_TONE
 $EndSCHEMATC
diff --git a/kicad/gpsdo.sch b/kicad/gpsdo.sch
index ace1c73..61efe7e 100644
--- a/kicad/gpsdo.sch
+++ b/kicad/gpsdo.sch
@@ -3,7 +3,7 @@ EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 4 5
+Sheet 4 6
 Title ""
 Date ""
 Rev ""
diff --git a/kicad/picardy.sch b/kicad/picardy.sch
index f2e6b82..69a317e 100644
--- a/kicad/picardy.sch
+++ b/kicad/picardy.sch
@@ -3,7 +3,7 @@ EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 1 5
+Sheet 1 6
 Title ""
 Date ""
 Rev ""
@@ -20,25 +20,314 @@ F0 "Power" 50
 F1 "power.sch" 50
 F2 "IN_+12V" I L 1400 1650 50 
 F3 "IN_GND" I L 1400 1750 50 
-F4 "VREF" I R 2300 1650 50 
-F6 "+5V" I R 2300 1750 50 
+F4 "+8V" I R 2300 1750 50 
+F5 "+3V3" I R 2300 1650 50 
 $EndSheet
 $Sheet
-S 3000 1350 1250 650 
+S 2950 1350 1250 650 
 U 5E2FA006
 F0 "Control" 50
 F1 "control.sch" 50
+F2 "+3V3" I L 2950 1650 50 
+F3 "CW_TONE" I R 4200 1650 50 
 $EndSheet
 $Sheet
-S 4900 1350 1350 650 
-U 5E2FC142
-F0 "GPSDO" 50
-F1 "gpsdo.sch" 50
-$EndSheet
-$Sheet
-S 2100 4000 1650 1050
+S 4100 4300 1650 1050
 U 5E3088F9
 F0 "Baseband" 50
 F1 "baseband.sch" 50
+F2 "LO1" I L 4100 4450 50 
+F3 "HF_RX" I L 4100 4750 50 
+F4 "SPKR" I R 5750 5100 50 
+F5 "METER" I R 5750 5200 50 
+F6 "MIC" I L 4100 5100 50 
+F7 "HF_TX" I R 5750 4750 50 
+$EndSheet
+$Comp
+L Connector:Conn_Coaxial J?
+U 1 1 5E4D239A
+P 3800 4750
+AR Path="/5E3088F9/5E4D239A" Ref="J?"  Part="1" 
+AR Path="/5E4D239A" Ref="J?"  Part="1" 
+F 0 "J?" H 3728 4988 50  0000 C CNN
+F 1 "HF_RX" H 3728 4897 50  0000 C CNN
+F 2 "" H 3800 4750 50  0001 C CNN
+F 3 " ~" H 3800 4750 50  0001 C CNN
+	1    3800 4750
+	-1   0    0    -1  
+$EndComp
+$Comp
+L power:GNDA #PWR?
+U 1 1 5E4D23A0
+P 3800 4950
+AR Path="/5E3088F9/5E4D23A0" Ref="#PWR?"  Part="1" 
+AR Path="/5E4D23A0" Ref="#PWR?"  Part="1" 
+F 0 "#PWR?" H 3800 4700 50  0001 C CNN
+F 1 "GNDA" H 3805 4777 50  0000 C CNN
+F 2 "" H 3800 4950 50  0001 C CNN
+F 3 "" H 3800 4950 50  0001 C CNN
+	1    3800 4950
+	1    0    0    -1  
+$EndComp
+$Sheet
+S 1850 4250 1450 950 
+U 5E4D247A
+F0 "Clock" 50
+F1 "clock.sch" 50
+F2 "LO1" I R 3300 4450 50 
+F3 "REF_25MHz" I L 1850 4450 50 
+F4 "LO_VHF" I R 3300 4600 50 
+F5 "CLK_AUX" I R 3300 4750 50 
+$EndSheet
+$Comp
+L Connector_Generic:Conn_01x02 J?
+U 1 1 5E4FDBE2
+P 6900 5650
+AR Path="/5E3088F9/5E4FDBE2" Ref="J?"  Part="1" 
+AR Path="/5E4FDBE2" Ref="J?"  Part="1" 
+F 0 "J?" H 6818 5325 50  0000 C CNN
+F 1 "SPKR" H 6818 5416 50  0000 C CNN
+F 2 "" H 6900 5650 50  0001 C CNN
+F 3 "~" H 6900 5650 50  0001 C CNN
+	1    6900 5650
+	1    0    0    1   
+$EndComp
+$Comp
+L power:GNDA #PWR?
+U 1 1 5E4FDBE8
+P 6700 5750
+AR Path="/5E3088F9/5E4FDBE8" Ref="#PWR?"  Part="1" 
+AR Path="/5E4FDBE8" Ref="#PWR?"  Part="1" 
+F 0 "#PWR?" H 6700 5500 50  0001 C CNN
+F 1 "GNDA" H 6705 5577 50  0000 C CNN
+F 2 "" H 6700 5750 50  0001 C CNN
+F 3 "" H 6700 5750 50  0001 C CNN
+	1    6700 5750
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	6700 5750 6700 5650
+Text Notes 6800 5800 0    50   ~ 0
+8 Ohm
+$Comp
+L Connector_Generic:Conn_01x02 J?
+U 1 1 5E526B4A
+P 6300 5650
+AR Path="/5E3088F9/5E526B4A" Ref="J?"  Part="1" 
+AR Path="/5E526B4A" Ref="J?"  Part="1" 
+F 0 "J?" H 6218 5325 50  0000 C CNN
+F 1 "METER" H 6218 5416 50  0000 C CNN
+F 2 "" H 6300 5650 50  0001 C CNN
+F 3 "~" H 6300 5650 50  0001 C CNN
+	1    6300 5650
+	1    0    0    1   
+$EndComp
+$Comp
+L power:GNDA #PWR?
+U 1 1 5E526B50
+P 6100 5700
+AR Path="/5E3088F9/5E526B50" Ref="#PWR?"  Part="1" 
+AR Path="/5E526B50" Ref="#PWR?"  Part="1" 
+F 0 "#PWR?" H 6100 5450 50  0001 C CNN
+F 1 "GNDA" H 6105 5527 50  0000 C CNN
+F 2 "" H 6100 5700 50  0001 C CNN
+F 3 "" H 6100 5700 50  0001 C CNN
+	1    6100 5700
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6100 5700 6100 5650
+Text Notes 6300 5800 0    50   ~ 0
+100uA
+$Comp
+L Connector:Conn_Coaxial J?
+U 1 1 5E535D46
+P 3750 5450
+AR Path="/5E3088F9/5E535D46" Ref="J?"  Part="1" 
+AR Path="/5E535D46" Ref="J?"  Part="1" 
+F 0 "J?" H 3678 5688 50  0000 C CNN
+F 1 "Mic" H 3678 5597 50  0000 C CNN
+F 2 "" H 3750 5450 50  0001 C CNN
+F 3 " ~" H 3750 5450 50  0001 C CNN
+	1    3750 5450
+	-1   0    0    -1  
+$EndComp
+$Comp
+L power:GNDA #PWR?
+U 1 1 5E535D6B
+P 3750 5650
+AR Path="/5E3088F9/5E535D6B" Ref="#PWR?"  Part="1" 
+AR Path="/5E535D6B" Ref="#PWR?"  Part="1" 
+F 0 "#PWR?" H 3750 5400 50  0001 C CNN
+F 1 "GNDA" H 3755 5477 50  0000 C CNN
+F 2 "" H 3750 5650 50  0001 C CNN
+F 3 "" H 3750 5650 50  0001 C CNN
+	1    3750 5650
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector:Conn_Coaxial J?
+U 1 1 5E54529A
+P 6200 4750
+AR Path="/5E3088F9/5E54529A" Ref="J?"  Part="1" 
+AR Path="/5E54529A" Ref="J?"  Part="1" 
+F 0 "J?" H 6300 4725 50  0000 L CNN
+F 1 "HF_TX" H 6300 4634 50  0000 L CNN
+F 2 "" H 6200 4750 50  0001 C CNN
+F 3 " ~" H 6200 4750 50  0001 C CNN
+	1    6200 4750
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GNDA #PWR?
+U 1 1 5E5452A0
+P 6200 4950
+AR Path="/5E3088F9/5E5452A0" Ref="#PWR?"  Part="1" 
+AR Path="/5E5452A0" Ref="#PWR?"  Part="1" 
+F 0 "#PWR?" H 6200 4700 50  0001 C CNN
+F 1 "GNDA" H 6205 4777 50  0000 C CNN
+F 2 "" H 6200 4950 50  0001 C CNN
+F 3 "" H 6200 4950 50  0001 C CNN
+	1    6200 4950
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	4100 4750 4000 4750
+Wire Wire Line
+	3950 5450 3950 5100
+Wire Wire Line
+	3950 5100 4100 5100
+Wire Wire Line
+	5750 4750 6000 4750
+Wire Wire Line
+	5750 5200 5850 5200
+Wire Wire Line
+	5850 5200 5850 5550
+Wire Wire Line
+	5850 5550 6100 5550
+Wire Wire Line
+	5750 5100 5900 5100
+Wire Wire Line
+	5900 5100 5900 5250
+Wire Wire Line
+	5900 5250 6700 5250
+Wire Wire Line
+	6700 5250 6700 5550
+Text GLabel 2300 1750 2    50   Input ~ 0
++8V
+Wire Wire Line
+	3300 4450 4100 4450
+$Comp
+L Connector:Conn_Coaxial J?
+U 1 1 5E585BF6
+P 1500 4450
+AR Path="/5E3088F9/5E585BF6" Ref="J?"  Part="1" 
+AR Path="/5E585BF6" Ref="J?"  Part="1" 
+F 0 "J?" H 1428 4688 50  0000 C CNN
+F 1 "REF_25MHz" H 1428 4597 50  0000 C CNN
+F 2 "" H 1500 4450 50  0001 C CNN
+F 3 " ~" H 1500 4450 50  0001 C CNN
+	1    1500 4450
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	1700 4450 1850 4450
+$Comp
+L power:GNDA #PWR?
+U 1 1 5E5866E2
+P 1500 4650
+AR Path="/5E3088F9/5E5866E2" Ref="#PWR?"  Part="1" 
+AR Path="/5E5866E2" Ref="#PWR?"  Part="1" 
+F 0 "#PWR?" H 1500 4400 50  0001 C CNN
+F 1 "GNDA" H 1505 4477 50  0000 C CNN
+F 2 "" H 1500 4650 50  0001 C CNN
+F 3 "" H 1500 4650 50  0001 C CNN
+	1    1500 4650
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GNDA #PWR?
+U 1 1 5E60A2DE
+P 1200 2250
+AR Path="/5E3088F9/5E60A2DE" Ref="#PWR?"  Part="1" 
+AR Path="/5E60A2DE" Ref="#PWR?"  Part="1" 
+F 0 "#PWR?" H 1200 2000 50  0001 C CNN
+F 1 "GNDA" H 1205 2077 50  0000 C CNN
+F 2 "" H 1200 2250 50  0001 C CNN
+F 3 "" H 1200 2250 50  0001 C CNN
+	1    1200 2250
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR?
+U 1 1 5E60C77C
+P 950 2250
+AR Path="/5E2DC494/5E60C77C" Ref="#PWR?"  Part="1" 
+AR Path="/5E60C77C" Ref="#PWR?"  Part="1" 
+F 0 "#PWR?" H 950 2000 50  0001 C CNN
+F 1 "GND" H 955 2077 50  0000 C CNN
+F 2 "" H 950 2250 50  0001 C CNN
+F 3 "" H 950 2250 50  0001 C CNN
+	1    950  2250
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	1400 1750 950  1750
+Wire Wire Line
+	950  1750 950  2250
+$Comp
+L Connector_Generic:Conn_01x02 J?
+U 1 1 5E60CF70
+P 750 1350
+AR Path="/5E3088F9/5E60CF70" Ref="J?"  Part="1" 
+AR Path="/5E60CF70" Ref="J?"  Part="1" 
+F 0 "J?" H 668 1025 50  0000 C CNN
+F 1 "13V8" H 668 1116 50  0000 C CNN
+F 2 "" H 750 1350 50  0001 C CNN
+F 3 "~" H 750 1350 50  0001 C CNN
+	1    750  1350
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	950  1750 950  1450
+Connection ~ 950  1750
+Wire Wire Line
+	1150 1350 1150 1650
+Wire Wire Line
+	1150 1650 1400 1650
+Wire Wire Line
+	950  1350 1150 1350
+Wire Wire Line
+	2300 1650 2950 1650
+$Comp
+L power:+3.3V #PWR?
+U 1 1 5E61ED5A
+P 2600 1650
+AR Path="/5E2FA006/5E61ED5A" Ref="#PWR?"  Part="1" 
+AR Path="/5E61ED5A" Ref="#PWR?"  Part="1" 
+F 0 "#PWR?" H 2600 1500 50  0001 C CNN
+F 1 "+3.3V" H 2615 1823 50  0000 C CNN
+F 2 "" H 2600 1650 50  0001 C CNN
+F 3 "" H 2600 1650 50  0001 C CNN
+	1    2600 1650
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+12V #PWR?
+U 1 1 5E4C192F
+P 1150 1350
+F 0 "#PWR?" H 1150 1200 50  0001 C CNN
+F 1 "+12V" H 1165 1523 50  0000 C CNN
+F 2 "" H 1150 1350 50  0001 C CNN
+F 3 "" H 1150 1350 50  0001 C CNN
+	1    1150 1350
+	1    0    0    -1  
+$EndComp
+Connection ~ 1150 1350
+$Sheet
+S 6400 2650 2300 1000
+U 5E4C0E28
+F0 "Anglian3L" 50
+F1 "anglian3l.sch" 50
 $EndSheet
 $EndSCHEMATC
diff --git a/kicad/power.sch b/kicad/power.sch
index 0ff61fa..30b8264 100644
--- a/kicad/power.sch
+++ b/kicad/power.sch
@@ -3,7 +3,7 @@ EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 2 5
+Sheet 2 6
 Title "Coulomb meter for Glutte Battery"
 Date "2019-10-18"
 Rev ""
@@ -13,410 +13,460 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-NoConn ~ 4450 2350
-Text Notes 2000 1300 0    100  ~ 0
-POWER
-Text Notes 4350 2000 0    50   ~ 0
-5V Reference ADC
 $Comp
 L mpb:LT3433 U?
 U 1 1 5D86AC2A
-P 3750 4000
-F 0 "U?" H 3750 4815 50  0000 C CNN
-F 1 "LT3433" H 3750 4724 50  0000 C CNN
-F 2 "Package_SO:TSSOP-16-1EP_4.4x5mm_P0.65mm" H 3700 4000 50  0001 C CNN
-F 3 "" H 3700 4000 50  0001 C CNN
-F 4 "LT3433IFE" H 3750 4000 50  0001 C CNN "MPN"
-	1    3750 4000
+P 3800 2950
+F 0 "U?" H 3800 3765 50  0000 C CNN
+F 1 "LT3433" H 3800 3674 50  0000 C CNN
+F 2 "Package_SO:TSSOP-16-1EP_4.4x5mm_P0.65mm" H 3750 2950 50  0001 C CNN
+F 3 "" H 3750 2950 50  0001 C CNN
+F 4 "LT3433IFE" H 3800 2950 50  0001 C CNN "MPN"
+	1    3800 2950
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:CP1 C?
 U 1 1 5D86AC30
-P 1900 3150
-F 0 "C?" H 2015 3196 50  0000 L CNN
-F 1 "2.2u" H 2015 3105 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric" H 1900 3150 50  0001 C CNN
-F 3 "~" H 1900 3150 50  0001 C CNN
-	1    1900 3150
+P 1950 2100
+F 0 "C?" H 2065 2146 50  0000 L CNN
+F 1 "2.2u" H 2065 2055 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 1950 2100 50  0001 C CNN
+F 3 "~" H 1950 2100 50  0001 C CNN
+	1    1950 2100
 	1    0    0    -1  
 $EndComp
-Connection ~ 2650 2250
 Wire Wire Line
-	2650 2250 2950 2250
+	2700 1750 2700 1950
 Wire Wire Line
-	2650 2250 2650 3000
+	2700 1950 2700 2400
 Wire Wire Line
-	2650 3000 2650 3450
-Wire Wire Line
-	2650 3450 3100 3450
-Connection ~ 2650 3000
+	2700 2400 3150 2400
+Connection ~ 2700 1950
 $Comp
 L Device:C C?
 U 1 1 5D86AC50
-P 2200 4050
-F 0 "C?" H 2315 4096 50  0000 L CNN
-F 1 "330p" H 2315 4005 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric" H 2238 3900 50  0001 C CNN
-F 3 "~" H 2200 4050 50  0001 C CNN
-	1    2200 4050
+P 2250 3000
+F 0 "C?" H 2365 3046 50  0000 L CNN
+F 1 "330p" H 2365 2955 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 2288 2850 50  0001 C CNN
+F 3 "~" H 2250 3000 50  0001 C CNN
+	1    2250 3000
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:R R?
 U 1 1 5D86AC56
-P 2550 4050
-F 0 "R?" H 2480 4004 50  0000 R CNN
-F 1 "68k" H 2480 4095 50  0000 R CNN
-F 2 "Resistor_SMD:R_0805_2012Metric" V 2480 4050 50  0001 C CNN
-F 3 "~" H 2550 4050 50  0001 C CNN
-	1    2550 4050
+P 2600 3000
+F 0 "R?" H 2530 2954 50  0000 R CNN
+F 1 "68k" H 2530 3045 50  0000 R CNN
+F 2 "Resistor_SMD:R_0805_2012Metric" V 2530 3000 50  0001 C CNN
+F 3 "~" H 2600 3000 50  0001 C CNN
+	1    2600 3000
 	-1   0    0    1   
 $EndComp
 $Comp
 L Device:C C?
 U 1 1 5D86AC62
-P 2550 4350
-F 0 "C?" H 2665 4396 50  0000 L CNN
-F 1 "1000p" H 2665 4305 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric" H 2588 4200 50  0001 C CNN
-F 3 "~" H 2550 4350 50  0001 C CNN
-	1    2550 4350
+P 2600 3300
+F 0 "C?" H 2715 3346 50  0000 L CNN
+F 1 "1000p" H 2715 3255 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 2638 3150 50  0001 C CNN
+F 3 "~" H 2600 3300 50  0001 C CNN
+	1    2600 3300
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	2550 4500 2200 4500
+	2600 3450 2250 3450
 Wire Wire Line
-	2200 4200 2200 4500
+	2250 3150 2250 3450
 Wire Wire Line
-	2200 3900 2550 3900
-Connection ~ 2550 3900
+	2250 2850 2600 2850
+Connection ~ 2600 2850
 Wire Wire Line
-	2550 3900 3100 3900
+	2600 2850 3150 2850
 $Comp
 L Device:R R?
 U 1 1 5D86AC6E
-P 5500 4800
-F 0 "R?" H 5430 4754 50  0000 R CNN
-F 1 "97.6k" H 5430 4845 50  0000 R CNN
-F 2 "Resistor_SMD:R_0805_2012Metric" V 5430 4800 50  0001 C CNN
-F 3 "~" H 5500 4800 50  0001 C CNN
-	1    5500 4800
+P 5550 3750
+F 0 "R?" H 5480 3704 50  0000 R CNN
+F 1 "91k" H 5480 3795 50  0000 R CNN
+F 2 "Resistor_SMD:R_0805_2012Metric" V 5480 3750 50  0001 C CNN
+F 3 "~" H 5550 3750 50  0001 C CNN
+	1    5550 3750
 	-1   0    0    1   
 $EndComp
 $Comp
 L Device:R R?
 U 1 1 5D86AC7A
-P 5500 4500
-F 0 "R?" H 5430 4454 50  0000 R CNN
-F 1 "300k" H 5430 4545 50  0000 R CNN
-F 2 "Resistor_SMD:R_0805_2012Metric" V 5430 4500 50  0001 C CNN
-F 3 "~" H 5500 4500 50  0001 C CNN
-	1    5500 4500
+P 5550 3450
+F 0 "R?" H 5480 3404 50  0000 R CNN
+F 1 "510k" H 5480 3495 50  0000 R CNN
+F 2 "Resistor_SMD:R_0805_2012Metric" V 5480 3450 50  0001 C CNN
+F 3 "~" H 5550 3450 50  0001 C CNN
+	1    5550 3450
 	-1   0    0    1   
 $EndComp
 Wire Wire Line
-	5500 4350 5500 4000
+	5550 3300 5550 2950
 $Comp
 L Device:L L?
 U 1 1 5D86AC81
-P 4700 3850
-F 0 "L?" V 4519 3850 50  0000 C CNN
-F 1 "100uH" V 4610 3850 50  0000 C CNN
-F 2 "glutte-coulombcounter:Sumida_CDRH6D28" H 4700 3850 50  0001 C CNN
-F 3 "~" H 4700 3850 50  0001 C CNN
-F 4 "CDRH6D28-101" V 4700 3850 50  0001 C CNN "MPN"
-	1    4700 3850
+P 4750 2800
+F 0 "L?" V 4569 2800 50  0000 C CNN
+F 1 "100uH" V 4660 2800 50  0000 C CNN
+F 2 "glutte-coulombcounter:Sumida_CDRH6D28" H 4750 2800 50  0001 C CNN
+F 3 "~" H 4750 2800 50  0001 C CNN
+F 4 "CDRH6D28-101" V 4750 2800 50  0001 C CNN "MPN"
+	1    4750 2800
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	4400 3850 4450 3850
+	4450 2800 4500 2800
 Wire Wire Line
-	4400 3750 4450 3750
+	4450 2700 4500 2700
 Wire Wire Line
-	4850 3750 4850 3850
+	4900 2700 4900 2800
 $Comp
 L Device:C C?
 U 1 1 5D86AC8A
-P 5000 3750
-F 0 "C?" V 4748 3750 50  0000 C CNN
-F 1 "0.1u" V 4839 3750 50  0000 C CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric" H 5038 3600 50  0001 C CNN
-F 3 "~" H 5000 3750 50  0001 C CNN
-	1    5000 3750
+P 5050 2700
+F 0 "C?" V 4798 2700 50  0000 C CNN
+F 1 "0.1u" V 4889 2700 50  0000 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 5088 2550 50  0001 C CNN
+F 3 "~" H 5050 2700 50  0001 C CNN
+	1    5050 2700
 	0    1    1    0   
 $EndComp
-Connection ~ 4850 3750
+Connection ~ 4900 2700
 Wire Wire Line
-	5150 3750 5150 3600
+	5200 2700 5200 2550
 Wire Wire Line
-	5150 3600 4400 3600
+	5200 2550 4450 2550
 $Comp
 L Device:D_ALT D?
 U 1 1 5D86AC93
-P 5150 4300
-F 0 "D?" H 5150 4516 50  0000 C CNN
-F 1 "1N4148" H 5150 4425 50  0000 C CNN
-F 2 "Diode_SMD:D_SOD-123" H 5150 4300 50  0001 C CNN
-F 3 "~" H 5150 4300 50  0001 C CNN
-F 4 "1N4148W-7-F" H 5150 4300 50  0001 C CNN "MPN"
-	1    5150 4300
+P 5200 3250
+F 0 "D?" H 5200 3466 50  0000 C CNN
+F 1 "1N4148" H 5200 3375 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-123" H 5200 3250 50  0001 C CNN
+F 3 "~" H 5200 3250 50  0001 C CNN
+F 4 "1N4148W-7-F" H 5200 3250 50  0001 C CNN "MPN"
+	1    5200 3250
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C C?
 U 1 1 5D86AC99
-P 4800 4450
-F 0 "C?" H 4685 4404 50  0000 R CNN
-F 1 "0.1u" H 4685 4495 50  0000 R CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric" H 4838 4300 50  0001 C CNN
-F 3 "~" H 4800 4450 50  0001 C CNN
-	1    4800 4450
+P 4850 3400
+F 0 "C?" H 4735 3354 50  0000 R CNN
+F 1 "0.1u" H 4735 3445 50  0000 R CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 4888 3250 50  0001 C CNN
+F 3 "~" H 4850 3400 50  0001 C CNN
+	1    4850 3400
 	-1   0    0    1   
 $EndComp
 Wire Wire Line
-	4400 4000 5300 4000
+	4450 2950 5350 2950
 Wire Wire Line
-	4800 4300 5000 4300
-Connection ~ 5300 4000
+	4850 3250 5050 3250
+Connection ~ 5350 2950
 Wire Wire Line
-	5300 4000 5500 4000
+	5350 2950 5550 2950
 Wire Wire Line
-	4400 4650 4400 4350
-Connection ~ 5500 4650
+	4450 3600 4450 3300
+Connection ~ 5550 3600
 Wire Wire Line
-	4450 3850 4450 3900
+	4500 2800 4500 2850
 Wire Wire Line
-	4450 3900 5450 3900
-Connection ~ 4450 3850
+	4500 2850 5500 2850
+Connection ~ 4500 2800
 Wire Wire Line
-	4450 3850 4550 3850
+	4500 2800 4600 2800
 Wire Wire Line
-	5500 4000 5750 4000
+	5550 2950 5800 2950
 Wire Wire Line
-	5750 4000 5750 3900
-Connection ~ 5500 4000
+	5800 2950 5800 2850
+Connection ~ 5550 2950
 $Comp
 L Device:D_ALT D?
 U 1 1 5D86ACB9
-P 5950 3750
-F 0 "D?" V 5904 3829 50  0000 L CNN
-F 1 "1N4148" V 5995 3829 50  0000 L CNN
-F 2 "Diode_SMD:D_SOD-123" H 5950 3750 50  0001 C CNN
-F 3 "~" H 5950 3750 50  0001 C CNN
-F 4 "1N4148W-7-F" H 5950 3750 50  0001 C CNN "MPN"
-	1    5950 3750
+P 6000 2700
+F 0 "D?" V 5954 2779 50  0000 L CNN
+F 1 "1N4148" V 6045 2779 50  0000 L CNN
+F 2 "Diode_SMD:D_SOD-123" H 6000 2700 50  0001 C CNN
+F 3 "~" H 6000 2700 50  0001 C CNN
+F 4 "1N4148W-7-F" H 6000 2700 50  0001 C CNN "MPN"
+	1    6000 2700
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	5750 4000 5950 4000
+	5800 2950 6000 2950
 Wire Wire Line
-	5950 4000 5950 3900
-Connection ~ 5750 4000
+	6000 2950 6000 2850
+Connection ~ 5800 2950
 Wire Wire Line
-	5950 3600 5150 3600
-Connection ~ 5150 3600
+	6000 2550 5200 2550
+Connection ~ 5200 2550
 Wire Wire Line
-	4450 3350 4450 3750
-Connection ~ 4450 3750
+	4500 2300 4500 2700
+Connection ~ 4500 2700
 Wire Wire Line
-	4450 3750 4850 3750
+	4500 2700 4900 2700
 Wire Wire Line
-	3100 3600 3100 3450
+	3150 2550 3150 2400
 $Comp
 L Device:C C?
 U 1 1 5D86ACD5
-P 2800 3750
-F 0 "C?" V 2548 3750 50  0000 C CNN
-F 1 "0.01u" V 2639 3750 50  0000 C CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric" H 2838 3600 50  0001 C CNN
-F 3 "~" H 2800 3750 50  0001 C CNN
-	1    2800 3750
+P 2850 2700
+F 0 "C?" V 2598 2700 50  0000 C CNN
+F 1 "0.01u" V 2689 2700 50  0000 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 2888 2550 50  0001 C CNN
+F 3 "~" H 2850 2700 50  0001 C CNN
+	1    2850 2700
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	2950 3750 3100 3750
-Wire Wire Line
-	5950 4000 6150 4000
-Connection ~ 5950 4000
-Text Notes 4350 3050 0    50   ~ 0
-5V Alimentation
-$Comp
-L Device:CP1 C?
-U 1 1 5D86AD01
-P 2950 2400
-F 0 "C?" H 3065 2446 50  0000 L CNN
-F 1 "0.1u" H 3065 2355 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric" H 2950 2400 50  0001 C CNN
-F 3 "~" H 2950 2400 50  0001 C CNN
-	1    2950 2400
-	1    0    0    -1  
-$EndComp
-Connection ~ 2950 2250
+	3000 2700 3150 2700
 Wire Wire Line
-	2950 2250 3050 2250
-Connection ~ 3700 4950
+	6000 2950 6200 2950
+Connection ~ 6000 2950
+Connection ~ 3750 3900
 $Comp
 L Device:LED_ALT D?
 U 1 1 5D86AD14
-P 6150 4350
-F 0 "D?" V 6189 4232 50  0000 R CNN
-F 1 "LED_PWR" V 6098 4232 50  0000 R CNN
-F 2 "LED_SMD:LED_1206_3216Metric" H 6150 4350 50  0001 C CNN
-F 3 "~" H 6150 4350 50  0001 C CNN
-	1    6150 4350
+P 6200 3300
+F 0 "D?" V 6239 3182 50  0000 R CNN
+F 1 "LED_PWR" V 6148 3182 50  0000 R CNN
+F 2 "LED_SMD:LED_1206_3216Metric" H 6200 3300 50  0001 C CNN
+F 3 "~" H 6200 3300 50  0001 C CNN
+	1    6200 3300
 	0    -1   -1   0   
 $EndComp
 Wire Wire Line
-	6150 4200 6150 4000
-Connection ~ 6150 4000
-Wire Wire Line
-	6150 4000 6450 4000
+	6200 3150 6200 2950
+Connection ~ 6200 2950
 $Comp
 L Device:R R?
 U 1 1 5D86AD1D
-P 6150 4700
-F 0 "R?" H 6080 4654 50  0000 R CNN
-F 1 "330" H 6080 4745 50  0000 R CNN
-F 2 "Resistor_SMD:R_0805_2012Metric" V 6080 4700 50  0001 C CNN
-F 3 "~" H 6150 4700 50  0001 C CNN
-	1    6150 4700
+P 6200 3650
+F 0 "R?" H 6130 3604 50  0000 R CNN
+F 1 "330" H 6130 3695 50  0000 R CNN
+F 2 "Resistor_SMD:R_0805_2012Metric" V 6130 3650 50  0001 C CNN
+F 3 "~" H 6200 3650 50  0001 C CNN
+	1    6200 3650
 	-1   0    0    1   
 $EndComp
 Wire Wire Line
-	6150 4500 6150 4550
+	6200 3450 6200 3500
 $Comp
 L Diode:B160-E3 D?
 U 1 1 5D86AD31
-P 4600 3350
-F 0 "D?" H 4600 3566 50  0000 C CNN
-F 1 "B160-E3" H 4600 3475 50  0000 C CNN
-F 2 "Diode_SMD:D_SMA" H 4600 3175 50  0001 C CNN
-F 3 "http://www.vishay.com/docs/88946/b120.pdf" H 4600 3350 50  0001 C CNN
-F 4 "B160-E3/5AT" H 4600 3350 50  0001 C CNN "MPN"
-	1    4600 3350
+P 4650 2300
+F 0 "D?" H 4650 2516 50  0000 C CNN
+F 1 "B160-E3" H 4650 2425 50  0000 C CNN
+F 2 "Diode_SMD:D_SMA" H 4650 2125 50  0001 C CNN
+F 3 "http://www.vishay.com/docs/88946/b120.pdf" H 4650 2300 50  0001 C CNN
+F 4 "B160-E3/5AT" H 4650 2300 50  0001 C CNN "MPN"
+	1    4650 2300
 	1    0    0    -1  
 $EndComp
 $Comp
 L Diode:B120-E3 D?
 U 1 1 5D86AD37
-P 5600 3900
-F 0 "D?" H 5600 3684 50  0000 C CNN
-F 1 "B120-E3" H 5600 3775 50  0000 C CNN
-F 2 "Diode_SMD:D_SMA" H 5600 3725 50  0001 C CNN
-F 3 "http://www.vishay.com/docs/88946/b120.pdf" H 5600 3900 50  0001 C CNN
-F 4 "B120-E3/5AT " H 5600 3900 50  0001 C CNN "MPN"
-	1    5600 3900
+P 5650 2850
+F 0 "D?" H 5650 2634 50  0000 C CNN
+F 1 "B120-E3" H 5650 2725 50  0000 C CNN
+F 2 "Diode_SMD:D_SMA" H 5650 2675 50  0001 C CNN
+F 3 "http://www.vishay.com/docs/88946/b120.pdf" H 5650 2850 50  0001 C CNN
+F 4 "B120-E3/5AT " H 5650 2850 50  0001 C CNN "MPN"
+	1    5650 2850
 	-1   0    0    1   
 $EndComp
-Text HLabel 2300 2250 0    50   Input ~ 0
+Text HLabel 2700 1750 0    50   Input ~ 0
 IN_+12V
-Wire Wire Line
-	2300 2250 2650 2250
-Text HLabel 1900 4550 0    50   Input ~ 0
+Text HLabel 1950 3500 0    50   Input ~ 0
 IN_GND
-Text Notes 2000 1500 0    50   ~ 0
-Provides VREF and +5VA
 Wire Wire Line
-	4450 2250 4550 2250
+	3500 3900 3600 3900
 Wire Wire Line
-	3450 4950 3700 4950
-Wire Wire Line
-	3700 4950 3950 4950
-Text HLabel 4550 2250 2    50   Input ~ 0
-VREF
-Text HLabel 6450 4000 2    50   Input ~ 0
-+5V
+	3750 3900 3800 3900
+Text HLabel 9600 2350 2    50   Input ~ 0
++3V3
 $Comp
 L power:GND #PWR?
 U 1 1 5E2DE708
-P 3700 5400
-F 0 "#PWR?" H 3700 5150 50  0001 C CNN
-F 1 "GND" H 3705 5227 50  0000 C CNN
-F 2 "" H 3700 5400 50  0001 C CNN
-F 3 "" H 3700 5400 50  0001 C CNN
-	1    3700 5400
+P 3750 4350
+F 0 "#PWR?" H 3750 4100 50  0001 C CNN
+F 1 "GND" H 3755 4177 50  0000 C CNN
+F 2 "" H 3750 4350 50  0001 C CNN
+F 3 "" H 3750 4350 50  0001 C CNN
+	1    3750 4350
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	3700 4950 3700 5200
+	3750 3900 3750 4150
+Wire Wire Line
+	3150 3300 3150 3900
+Wire Wire Line
+	3150 3900 3500 3900
+Connection ~ 3500 3900
+Wire Wire Line
+	4850 3550 4850 4150
+Wire Wire Line
+	4850 4150 3750 4150
+Connection ~ 3750 4150
+Wire Wire Line
+	3750 4150 3750 4350
+Wire Wire Line
+	5550 3900 5550 4150
+Wire Wire Line
+	5550 4150 4850 4150
+Connection ~ 4850 4150
+Wire Wire Line
+	6200 4150 5550 4150
+Wire Wire Line
+	6200 3800 6200 4150
+Connection ~ 5550 4150
+Wire Wire Line
+	4800 2300 7250 2300
+Wire Wire Line
+	7250 2300 7250 4150
 Wire Wire Line
-	3100 4350 3100 4950
+	7250 4150 6800 4150
+Connection ~ 6200 4150
 Wire Wire Line
-	3100 4950 3450 4950
-Connection ~ 3450 4950
+	2700 2700 1950 2700
 Wire Wire Line
-	4800 4600 4800 5200
+	1950 2700 1950 4150
 Wire Wire Line
-	4800 5200 3700 5200
-Connection ~ 3700 5200
+	1950 4150 3750 4150
 Wire Wire Line
-	3700 5200 3700 5400
+	1950 1950 2700 1950
 Wire Wire Line
-	5500 4950 5500 5200
+	1950 2250 1950 2700
+Connection ~ 1950 2700
 Wire Wire Line
-	5500 5200 4800 5200
-Connection ~ 4800 5200
+	4450 3600 5550 3600
 Wire Wire Line
-	6150 5200 5500 5200
+	5350 2950 5350 3250
 Wire Wire Line
-	6150 4850 6150 5200
-Connection ~ 5500 5200
+	4450 3100 4850 3100
 Wire Wire Line
-	4750 3350 6900 3350
+	4850 3100 4850 3250
+Connection ~ 4850 3250
+Connection ~ 3150 2400
+Connection ~ 3600 3900
 Wire Wire Line
-	6900 3350 6900 5200
+	3600 3900 3700 3900
+Connection ~ 3700 3900
 Wire Wire Line
-	6900 5200 6150 5200
-Connection ~ 6150 5200
+	3700 3900 3750 3900
+Connection ~ 3800 3900
 Wire Wire Line
-	2650 3750 1900 3750
+	3800 3900 3900 3900
+Connection ~ 3900 3900
 Wire Wire Line
-	1900 3750 1900 5200
+	3900 3900 4000 3900
+Text HLabel 7900 2950 2    50   Input ~ 0
++8V
+Text Notes 5300 4450 0    50   ~ 0
+VOUT = 1.231 • (RFB1 + RFB2)/RFB2
 Wire Wire Line
-	1900 5200 3700 5200
+	6200 2950 6800 2950
 $Comp
-L power:GND #PWR?
-U 1 1 5E2E6B37
-P 3750 2800
-F 0 "#PWR?" H 3750 2550 50  0001 C CNN
-F 1 "GND" H 3755 2627 50  0000 C CNN
-F 2 "" H 3750 2800 50  0001 C CNN
-F 3 "" H 3750 2800 50  0001 C CNN
-	1    3750 2800
+L Device:CP1 C?
+U 1 1 5E5B47F7
+P 6800 3100
+F 0 "C?" H 6915 3146 50  0000 L CNN
+F 1 "47u" H 6915 3055 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 6800 3100 50  0001 C CNN
+F 3 "~" H 6800 3100 50  0001 C CNN
+	1    6800 3100
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	2950 2550 2950 2750
+	6800 4150 6800 3250
+Connection ~ 6800 2950
+Connection ~ 6800 4150
+Wire Wire Line
+	6800 4150 6200 4150
+$Comp
+L power:GND #PWR?
+U 1 1 5E5BEDE3
+P 9200 2650
+F 0 "#PWR?" H 9200 2400 50  0001 C CNN
+F 1 "GND" H 9205 2477 50  0000 C CNN
+F 2 "" H 9200 2650 50  0001 C CNN
+F 3 "" H 9200 2650 50  0001 C CNN
+	1    9200 2650
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:CP1 C?
+U 1 1 5E5BF22F
+P 8650 2500
+F 0 "C?" H 8765 2546 50  0000 L CNN
+F 1 "10u" H 8765 2455 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 8650 2500 50  0001 C CNN
+F 3 "~" H 8650 2500 50  0001 C CNN
+	1    8650 2500
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:CP1 C?
+U 1 1 5E5BF98C
+P 9600 2500
+F 0 "C?" H 9715 2546 50  0000 L CNN
+F 1 "47u" H 9715 2455 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 9600 2500 50  0001 C CNN
+F 3 "~" H 9600 2500 50  0001 C CNN
+	1    9600 2500
+	1    0    0    -1  
+$EndComp
 Wire Wire Line
-	2950 2750 3750 2750
+	8650 2650 9200 2650
+Connection ~ 9200 2650
 Wire Wire Line
-	3750 2750 3750 2800
+	9200 2650 9600 2650
 Wire Wire Line
-	1900 3000 2650 3000
+	8900 2350 8650 2350
 Wire Wire Line
-	1900 3300 1900 3750
-Connection ~ 1900 3750
-Connection ~ 3750 2750
+	9500 2350 9600 2350
 $Comp
-L mpb:LT1236 U?
-U 1 1 5D86AC0C
-P 3750 2250
-F 0 "U?" H 3750 2715 50  0000 C CNN
-F 1 "LT1236-5" H 3750 2624 50  0000 C CNN
-F 2 "Package_SO:SO-8_3.9x4.9mm_P1.27mm" H 3750 2600 50  0001 C CNN
-F 3 "" H 3650 2250 50  0001 C CNN
-F 4 "LT1236AIS8-5" H 3750 2250 50  0001 C CNN "MPN"
-	1    3750 2250
+L Jumper:Jumper_3_Bridged12 JP?
+U 1 1 5E5C4EF7
+P 7750 2350
+F 0 "JP?" V 7796 2417 50  0000 L CNN
+F 1 "SEL_3V3" V 7705 2417 50  0000 L CNN
+F 2 "" H 7750 2350 50  0001 C CNN
+F 3 "~" H 7750 2350 50  0001 C CNN
+	1    7750 2350
+	0    -1   -1   0   
+$EndComp
+$Comp
+L Regulator_Linear:LD1117S33TR_SOT223 U?
+U 1 1 5E616C9D
+P 9200 2350
+F 0 "U?" H 9200 2592 50  0000 C CNN
+F 1 "LD1117S33TR_SOT223" H 9200 2501 50  0000 C CNN
+F 2 "Package_TO_SOT_SMD:SOT-223-3_TabPin2" H 9200 2550 50  0001 C CNN
+F 3 "http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00000544.pdf" H 9300 2100 50  0001 C CNN
+	1    9200 2350
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	4400 4650 5500 4650
+	6800 2950 7750 2950
+Wire Wire Line
+	7750 1950 7750 2100
+Wire Wire Line
+	2700 1950 7750 1950
 Wire Wire Line
-	5300 4000 5300 4300
+	7900 2350 8650 2350
+Connection ~ 8650 2350
 Wire Wire Line
-	4400 4150 4800 4150
+	7750 2600 7750 2950
+Connection ~ 7750 2950
 Wire Wire Line
-	4800 4150 4800 4300
-Connection ~ 4800 4300
+	7750 2950 7900 2950
 $EndSCHEMATC