Replace DIP ATMega with a TQFP

6 files changed, 1115 insertions, 911 deletions

diff --git a/kicad/anglian3l.sch b/kicad/anglian3l.sch
index 99d8ea5..6e87490 100644
--- a/kicad/anglian3l.sch
+++ b/kicad/anglian3l.sch
@@ -5,7 +5,7 @@ $Descr A4 11693 8268
 encoding utf-8
 Sheet 5 6
 Title "Picardy Anglian Mashup"
-Date ""
+Date "2020-02-24"
 Rev ""
 Comp "HB9EGM"
 Comment1 ""
diff --git a/kicad/baseband.sch b/kicad/baseband.sch
index cec59dc..c3324d3 100644
--- a/kicad/baseband.sch
+++ b/kicad/baseband.sch
@@ -5,7 +5,7 @@ $Descr A4 11693 8268
 encoding utf-8
 Sheet 3 6
 Title "Picardy Anglian Mashup"
-Date ""
+Date "2020-02-24"
 Rev ""
 Comp "HB9EGM"
 Comment1 ""
@@ -200,23 +200,23 @@ NoConn ~ 3050 2300
 $Comp
 L Device:C_Small C?
 U 1 1 5E324B86
-P 2850 2200
-F 0 "C?" V 2621 2200 50  0000 C CNN
-F 1 "2.2nF" V 2712 2200 50  0000 C CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 2850 2200 50  0001 C CNN
-F 3 "~" H 2850 2200 50  0001 C CNN
-F 4 "CBR" H 2850 2200 50  0001 C CNN "MPN"
-F 5 "0" H 2850 2200 50  0001 C CNN "Need_order"
-	1    2850 2200
-	0    1    1    0   
+P 2950 2800
+F 0 "C?" H 3042 2846 50  0000 L CNN
+F 1 "2.2nF" H 3042 2755 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 2950 2800 50  0001 C CNN
+F 3 "~" H 2950 2800 50  0001 C CNN
+F 4 "CBR" H 2950 2800 50  0001 C CNN "MPN"
+F 5 "0" H 2950 2800 50  0001 C CNN "Need_order"
+	1    2950 2800
+	1    0    0    -1  
 $EndComp
 Wire Wire Line
 	2950 2200 3050 2200
-Text HLabel 2600 2200 0    50   Input ~ 0
+Text HLabel 2950 3050 3    50   Input ~ 0
 LO1
 Wire Wire Line
-	2600 2200 2750 2200
-Text Notes 2400 2150 0    50   ~ 0
+	2950 3050 2950 2900
+Text Notes 3400 3200 2    50   ~ 0
 200mVpp
 $Comp
 L Device:C_Small C?
@@ -236,9 +236,9 @@ Wire Wire Line
 Text Notes 500  1200 0    50   ~ 0
 Freq = \nLO1 - 4.9152MHz
 Wire Wire Line
-	3050 1900 2250 1900
+	3050 1900 2850 1900
 Wire Wire Line
-	2250 1900 2250 2500
+	2850 1900 2850 2850
 $Comp
 L Device:C_Small C?
 U 1 1 5E348FC2
@@ -653,78 +653,59 @@ Wire Wire Line
 	5900 3350 6050 3350
 Connection ~ 6050 3350
 Wire Wire Line
-	6050 3650 6250 3650
+	6050 3650 6200 3650
 $Comp
 L Device:R R?
 U 1 1 5E3B5136
-P 6250 3850
-F 0 "R?" H 6100 3900 50  0000 L CNN
-F 1 "100" H 6050 3800 50  0000 L CNN
-F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 6180 3850 50  0001 C CNN
-F 3 "~" H 6250 3850 50  0001 C CNN
-F 4 "0" H 6250 3850 50  0001 C CNN "Need_order"
-	1    6250 3850
-	1    0    0    -1  
+P 6650 3750
+F 0 "R?" V 6535 3750 50  0000 C CNN
+F 1 "100" V 6444 3750 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 6580 3750 50  0001 C CNN
+F 3 "~" H 6650 3750 50  0001 C CNN
+F 4 "0" H 6650 3750 50  0001 C CNN "Need_order"
+	1    6650 3750
+	0    -1   -1   0   
 $EndComp
 Wire Wire Line
-	6250 3700 6250 3650
-Connection ~ 6250 3650
-Wire Wire Line
-	6250 3650 6400 3650
-Wire Wire Line
-	6250 4100 6250 4000
+	6800 3850 6800 3750
 $Comp
 L Device:C_Small C?
 U 1 1 5E3BB679
-P 6400 3850
-F 0 "C?" H 6308 3804 50  0000 R CNN
-F 1 "0.1uF" H 6308 3895 50  0000 R CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 6400 3850 50  0001 C CNN
-F 3 "~" H 6400 3850 50  0001 C CNN
-F 4 "GRM188R71H104KA93D" H 6400 3850 50  0001 C CNN "MPN"
-F 5 "0" H 6400 3850 50  0001 C CNN "Need_order"
-	1    6400 3850
+P 6200 3850
+F 0 "C?" H 6108 3804 50  0000 R CNN
+F 1 "0.1uF" H 6108 3895 50  0000 R CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 6200 3850 50  0001 C CNN
+F 3 "~" H 6200 3850 50  0001 C CNN
+F 4 "GRM188R71H104KA93D" H 6200 3850 50  0001 C CNN "MPN"
+F 5 "0" H 6200 3850 50  0001 C CNN "Need_order"
+	1    6200 3850
 	-1   0    0    1   
 $EndComp
-Wire Wire Line
-	6400 3750 6400 3650
-Connection ~ 6400 3650
 $Comp
 L power:GNDA #PWR?
 U 1 1 5E3BE9E7
-P 6400 3950
-F 0 "#PWR?" H 6400 3700 50  0001 C CNN
-F 1 "GNDA" H 6405 3777 50  0000 C CNN
-F 2 "" H 6400 3950 50  0001 C CNN
-F 3 "" H 6400 3950 50  0001 C CNN
-	1    6400 3950
+P 6200 3950
+F 0 "#PWR?" H 6200 3700 50  0001 C CNN
+F 1 "GNDA" H 6205 3777 50  0000 C CNN
+F 2 "" H 6200 3950 50  0001 C CNN
+F 3 "" H 6200 3950 50  0001 C CNN
+	1    6200 3950
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C_Small C?
 U 1 1 5E3BFB26
-P 6250 4200
-F 0 "C?" H 6341 4154 50  0000 L CNN
-F 1 "0.1uF" H 6341 4245 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 6250 4200 50  0001 C CNN
-F 3 "~" H 6250 4200 50  0001 C CNN
-F 4 "GRM188R71H104KA93D" H 6250 4200 50  0001 C CNN "MPN"
-F 5 "0" H 6250 4200 50  0001 C CNN "Need_order"
-	1    6250 4200
+P 6800 3950
+F 0 "C?" H 6708 3904 50  0000 R CNN
+F 1 "0.1uF" H 6708 3995 50  0000 R CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 6800 3950 50  0001 C CNN
+F 3 "~" H 6800 3950 50  0001 C CNN
+F 4 "GRM188R71H104KA93D" H 6800 3950 50  0001 C CNN "MPN"
+F 5 "0" H 6800 3950 50  0001 C CNN "Need_order"
+	1    6800 3950
 	-1   0    0    1   
 $EndComp
 $Comp
-L power:GNDA #PWR?
-U 1 1 5E3C03F0
-P 6250 4300
-F 0 "#PWR?" H 6250 4050 50  0001 C CNN
-F 1 "GNDA" H 6255 4127 50  0000 C CNN
-F 2 "" H 6250 4300 50  0001 C CNN
-F 3 "" H 6250 4300 50  0001 C CNN
-	1    6250 4300
-	1    0    0    -1  
-$EndComp
-$Comp
 L Device:C_Small C?
 U 1 1 5E3C120C
 P 6400 3150
@@ -840,101 +821,6 @@ Wire Wire Line
 Wire Wire Line
 	9250 4600 9250 3600
 $Comp
-L Device:Crystal_Small Y?
-U 1 1 5E3EAB00
-P 7700 3850
-F 0 "Y?" H 7700 4075 50  0000 C CNN
-F 1 "4.915MHz" H 7700 3984 50  0000 C CNN
-F 2 "Crystal:Crystal_SMD_HC49-SD" H 7700 3850 50  0001 C CNN
-F 3 "https://www.mouser.ch/datasheet/2/122/csm-12r-3004.pdf" H 7700 3850 50  0001 C CNN
-F 4 "ECS-49-20-5PX-TR" H 7700 3850 50  0001 C CNN "MPN"
-F 5 "1" H 7700 3850 50  0001 C CNN "Need_order"
-	1    7700 3850
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:C_Small C?
-U 1 1 5E3EB875
-P 7850 4000
-F 0 "C?" H 7758 3954 50  0000 R CNN
-F 1 "47pF" H 7758 4045 50  0000 R CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 7850 4000 50  0001 C CNN
-F 3 "~" H 7850 4000 50  0001 C CNN
-F 4 "CBR" H 7850 4000 50  0001 C CNN "MPN"
-F 5 "0" H 7850 4000 50  0001 C CNN "Need_order"
-	1    7850 4000
-	-1   0    0    1   
-$EndComp
-Wire Wire Line
-	7850 3900 7850 3850
-Wire Wire Line
-	7850 3850 7800 3850
-$Comp
-L Device:C_Small C?
-U 1 1 5E3F0037
-P 7700 4150
-F 0 "C?" V 7563 4150 50  0000 C CNN
-F 1 "270pF" V 7472 4150 50  0000 C CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 7700 4150 50  0001 C CNN
-F 3 "~" H 7700 4150 50  0001 C CNN
-F 4 "stash" H 7700 4150 50  0001 C CNN "MPN"
-F 5 "0" H 7700 4150 50  0001 C CNN "Need_order"
-	1    7700 4150
-	0    -1   -1   0   
-$EndComp
-Wire Wire Line
-	7800 4150 7850 4150
-Wire Wire Line
-	7850 4150 7850 4100
-Wire Wire Line
-	7850 4150 8250 4150
-Wire Wire Line
-	8250 4150 8250 3950
-Connection ~ 7850 4150
-Wire Wire Line
-	7850 3850 8250 3850
-Connection ~ 7850 3850
-$Comp
-L power:GNDA #PWR?
-U 1 1 5E3FC4ED
-P 7600 4150
-F 0 "#PWR?" H 7600 3900 50  0001 C CNN
-F 1 "GNDA" V 7605 4023 50  0000 R CNN
-F 2 "" H 7600 4150 50  0001 C CNN
-F 3 "" H 7600 4150 50  0001 C CNN
-	1    7600 4150
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:L_Core_Iron L?
-U 1 1 5E3FCED6
-P 7350 3850
-F 0 "L?" V 7169 3850 50  0000 C CNN
-F 1 "47uH" V 7260 3850 50  0000 C CNN
-F 2 "Inductor_SMD:L_1210_3225Metric_Pad1.42x2.65mm_HandSolder" H 7350 3850 50  0001 C CNN
-F 3 "~" H 7350 3850 50  0001 C CNN
-F 4 "To increase oscillation freq by 100Hz" V 7350 3850 50  0001 C CNN "Description"
-F 5 "LQW32FT470M0HL" H 7350 3850 50  0001 C CNN "MPN"
-F 6 "1" H 7350 3850 50  0001 C CNN "Need_order"
-	1    7350 3850
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	7500 3850 7600 3850
-$Comp
-L power:GNDA #PWR?
-U 1 1 5E401A01
-P 7150 4100
-F 0 "#PWR?" H 7150 3850 50  0001 C CNN
-F 1 "GNDA" H 7155 3927 50  0000 C CNN
-F 2 "" H 7150 4100 50  0001 C CNN
-F 3 "" H 7150 4100 50  0001 C CNN
-	1    7150 4100
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	7150 3850 7200 3850
-$Comp
 L power:GNDA #PWR?
 U 1 1 5E40635B
 P 8750 4150
@@ -1455,14 +1341,14 @@ $Comp
 L Device:CP_Small C?
 U 1 1 5E518D0F
 P 10500 4350
-F 0 "C?" V 10725 4350 50  0000 C CNN
-F 1 "1uF" V 10634 4350 50  0000 C CNN
+F 0 "C?" V 10275 4350 50  0000 C CNN
+F 1 "1uF" V 10366 4350 50  0000 C CNN
 F 2 "Capacitor_SMD:C_0805_2012Metric" H 10500 4350 50  0001 C CNN
 F 3 "~" H 10500 4350 50  0001 C CNN
 F 4 "08055C105JAT2A" H 10500 4350 50  0001 C CNN "MPN"
 F 5 "0" H 10500 4350 50  0001 C CNN "Need_order"
 	1    10500 4350
-	0    -1   -1   0   
+	0    1    1    0   
 $EndComp
 Wire Wire Line
 	10300 4350 10400 4350
@@ -1470,8 +1356,8 @@ $Comp
 L Amplifier_Audio:LM386 U?
 U 1 1 5E521CFD
 P 8250 5800
-F 0 "U?" H 8594 5846 50  0000 L CNN
-F 1 "LM386M-1" H 8594 5755 50  0000 L CNN
+F 0 "U?" H 8593 5846 50  0000 L CNN
+F 1 "LM386M-1" H 8593 5755 50  0000 L CNN
 F 2 "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" H 8350 5900 50  0001 C CNN
 F 3 "http://www.ti.com/lit/ds/symlink/lm386.pdf" H 8450 6000 50  0001 C CNN
 F 4 "LM386MX-1/NOPB" H 8250 5800 50  0001 C CNN "MPN"
@@ -1543,10 +1429,6 @@ F 5 "0" H 8150 6250 50  0001 C CNN "Need_order"
 $EndComp
 Wire Wire Line
 	8250 6250 8250 6100
-Wire Wire Line
-	8150 6100 8050 6100
-Wire Wire Line
-	8050 6100 8050 6250
 $Comp
 L Device:R R?
 U 1 1 5E567FE9
@@ -1594,85 +1476,70 @@ Wire Wire Line
 $Comp
 L Device:R R?
 U 1 1 5E5A82B1
-P 7500 5950
-F 0 "R?" H 7430 5904 50  0000 R CNN
-F 1 "10" H 7430 5995 50  0000 R CNN
-F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 7430 5950 50  0001 C CNN
-F 3 "~" H 7500 5950 50  0001 C CNN
-F 4 "0" H 7500 5950 50  0001 C CNN "Need_order"
-	1    7500 5950
+P 7200 6150
+F 0 "R?" H 7130 6104 50  0000 R CNN
+F 1 "10" H 7130 6195 50  0000 R CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 7130 6150 50  0001 C CNN
+F 3 "~" H 7200 6150 50  0001 C CNN
+F 4 "0" H 7200 6150 50  0001 C CNN "Need_order"
+	1    7200 6150
 	-1   0    0    1   
 $EndComp
 $Comp
 L Device:C_Small C?
 U 1 1 5E5A872F
-P 7500 6250
-F 0 "C?" H 7408 6204 50  0000 R CNN
-F 1 "0.1uF" H 7408 6295 50  0000 R CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 7500 6250 50  0001 C CNN
-F 3 "~" H 7500 6250 50  0001 C CNN
-F 4 "GRM188R71H104KA93D" H 7500 6250 50  0001 C CNN "MPN"
-F 5 "0" H 7500 6250 50  0001 C CNN "Need_order"
-	1    7500 6250
-	-1   0    0    1   
+P 7200 5900
+F 0 "C?" H 7292 5946 50  0000 L CNN
+F 1 "0.1uF" H 7292 5855 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 7200 5900 50  0001 C CNN
+F 3 "~" H 7200 5900 50  0001 C CNN
+F 4 "GRM188R71H104KA93D" H 7200 5900 50  0001 C CNN "MPN"
+F 5 "0" H 7200 5900 50  0001 C CNN "Need_order"
+	1    7200 5900
+	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	7500 6150 7500 6100
 $Comp
 L power:GNDA #PWR?
 U 1 1 5E5B1951
-P 7500 6350
-F 0 "#PWR?" H 7500 6100 50  0001 C CNN
-F 1 "GNDA" H 7505 6177 50  0000 C CNN
-F 2 "" H 7500 6350 50  0001 C CNN
-F 3 "" H 7500 6350 50  0001 C CNN
-	1    7500 6350
+P 7200 6300
+F 0 "#PWR?" H 7200 6050 50  0001 C CNN
+F 1 "GNDA" H 7205 6127 50  0000 C CNN
+F 2 "" H 7200 6300 50  0001 C CNN
+F 3 "" H 7200 6300 50  0001 C CNN
+	1    7200 6300
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	7500 5800 7950 5800
+	7200 5800 7950 5800
 $Comp
 L Device:CP_Small C?
 U 1 1 5E5BAD46
-P 7300 5800
-F 0 "C?" V 7075 5800 50  0000 C CNN
-F 1 "220uF" V 7166 5800 50  0000 C CNN
-F 2 "Capacitor_THT:CP_Radial_D8.0mm_P3.50mm" H 7300 5800 50  0001 C CNN
-F 3 "~" H 7300 5800 50  0001 C CNN
-F 4 "0" H 7300 5800 50  0001 C CNN "Need_order"
-	1    7300 5800
+P 7050 5800
+F 0 "C?" V 6825 5800 50  0000 C CNN
+F 1 "220uF" V 6916 5800 50  0000 C CNN
+F 2 "Capacitor_THT:CP_Radial_D8.0mm_P3.50mm" H 7050 5800 50  0001 C CNN
+F 3 "~" H 7050 5800 50  0001 C CNN
+F 4 "0" H 7050 5800 50  0001 C CNN "Need_order"
+	1    7050 5800
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	7500 5800 7400 5800
-Connection ~ 7500 5800
+	7200 5800 7150 5800
+Connection ~ 7200 5800
 Wire Wire Line
-	7000 5800 7200 5800
+	6750 5800 6950 5800
 $Comp
 L Device:R R?
 U 1 1 5E5DBA37
-P 10800 5200
-F 0 "R?" H 10730 5154 50  0000 R CNN
-F 1 "12k" H 10730 5245 50  0000 R CNN
-F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 10730 5200 50  0001 C CNN
-F 3 "~" H 10800 5200 50  0001 C CNN
-F 4 "0" H 10800 5200 50  0001 C CNN "Need_order"
-	1    10800 5200
-	-1   0    0    1   
-$EndComp
-$Comp
-L power:GNDA #PWR?
-U 1 1 5E5EF78B
-P 10800 5400
-F 0 "#PWR?" H 10800 5150 50  0001 C CNN
-F 1 "GNDA" H 10805 5227 50  0000 C CNN
-F 2 "" H 10800 5400 50  0001 C CNN
-F 3 "" H 10800 5400 50  0001 C CNN
-	1    10800 5400
+P 10750 5550
+F 0 "R?" H 10820 5596 50  0000 L CNN
+F 1 "12k" H 10820 5505 50  0000 L CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 10680 5550 50  0001 C CNN
+F 3 "~" H 10750 5550 50  0001 C CNN
+F 4 "0" H 10750 5550 50  0001 C CNN "Need_order"
+	1    10750 5550
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	10800 5400 10800 5350
 $Comp
 L power:GNDA #PWR?
 U 1 1 5E604089
@@ -1689,60 +1556,49 @@ Wire Wire Line
 $Comp
 L Device:CP_Small C?
 U 1 1 5E60DF50
-P 10200 6050
-F 0 "C?" H 10287 6096 50  0000 L CNN
-F 1 "10uF" H 10287 6005 50  0000 L CNN
-F 2 "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder" H 10200 6050 50  0001 C CNN
-F 3 "~" H 10200 6050 50  0001 C CNN
-F 4 "TAJA106K016RNJ" H 10200 6050 50  0001 C CNN "MPN"
-F 5 "0" H 10200 6050 50  0001 C CNN "Need_order"
-F 6 "47uF" H 10200 6050 50  0001 C CNN "OriginalValue"
-	1    10200 6050
+P 10300 6050
+F 0 "C?" H 10387 6096 50  0000 L CNN
+F 1 "10uF" H 10387 6005 50  0000 L CNN
+F 2 "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder" H 10300 6050 50  0001 C CNN
+F 3 "~" H 10300 6050 50  0001 C CNN
+F 4 "TAJA106K016RNJ" H 10300 6050 50  0001 C CNN "MPN"
+F 5 "0" H 10300 6050 50  0001 C CNN "Need_order"
+F 6 "47uF" H 10300 6050 50  0001 C CNN "OriginalValue"
+	1    10300 6050
 	-1   0    0    -1  
 $EndComp
 Wire Wire Line
-	10200 5950 10350 5950
+	10300 5950 10350 5950
 $Comp
 L power:GNDA #PWR?
 U 1 1 5E618850
-P 10200 6200
-F 0 "#PWR?" H 10200 5950 50  0001 C CNN
-F 1 "GNDA" H 10205 6027 50  0000 C CNN
-F 2 "" H 10200 6200 50  0001 C CNN
-F 3 "" H 10200 6200 50  0001 C CNN
-	1    10200 6200
+P 10300 6200
+F 0 "#PWR?" H 10300 5950 50  0001 C CNN
+F 1 "GNDA" H 10305 6027 50  0000 C CNN
+F 2 "" H 10300 6200 50  0001 C CNN
+F 3 "" H 10300 6200 50  0001 C CNN
+	1    10300 6200
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	10200 6200 10200 6150
+	10300 6200 10300 6150
 Wire Wire Line
-	10650 4350 10650 4800
-Wire Wire Line
-	9000 4800 10650 4800
-Wire Wire Line
-	9000 4800 9000 5700
-Connection ~ 10650 4800
-Wire Wire Line
-	10650 4800 10650 5750
-Wire Wire Line
-	10800 5050 10800 4800
-Wire Wire Line
-	10800 4800 10650 4800
+	9000 5200 9000 5700
 $Comp
 L Device:R R?
 U 1 1 5E64AC63
-P 10200 5750
-F 0 "R?" H 10270 5704 50  0000 L CNN
-F 1 "1.5k" H 10270 5795 50  0000 L CNN
-F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 10130 5750 50  0001 C CNN
-F 3 "~" H 10200 5750 50  0001 C CNN
-F 4 "0" H 10200 5750 50  0001 C CNN "Need_order"
-	1    10200 5750
+P 10300 5750
+F 0 "R?" H 10370 5704 50  0000 L CNN
+F 1 "1.5k" H 10370 5795 50  0000 L CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 10230 5750 50  0001 C CNN
+F 3 "~" H 10300 5750 50  0001 C CNN
+F 4 "0" H 10300 5750 50  0001 C CNN "Need_order"
+	1    10300 5750
 	-1   0    0    1   
 $EndComp
 Wire Wire Line
-	10200 5900 10200 5950
-Connection ~ 10200 5950
+	10300 5900 10300 5950
+Connection ~ 10300 5950
 $Comp
 L Device:R_POT RV?
 U 1 1 5E65FDD7
@@ -1787,61 +1643,61 @@ $EndComp
 Wire Wire Line
 	10900 3250 10900 3350
 Wire Wire Line
-	10900 3050 10900 2800
+	10900 3050 10900 2300
 Wire Wire Line
 	8950 1750 9000 1750
 $Comp
 L Device:R R?
 U 1 1 5E698692
-P 8950 1500
-F 0 "R?" H 8881 1546 50  0000 R CNN
-F 1 "390k" H 8881 1455 50  0000 R CNN
-F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 8880 1500 50  0001 C CNN
-F 3 "~" H 8950 1500 50  0001 C CNN
-F 4 "0" H 8950 1500 50  0001 C CNN "Need_order"
-	1    8950 1500
+P 8950 1250
+F 0 "R?" H 8881 1296 50  0000 R CNN
+F 1 "390k" H 8881 1205 50  0000 R CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 8880 1250 50  0001 C CNN
+F 3 "~" H 8950 1250 50  0001 C CNN
+F 4 "0" H 8950 1250 50  0001 C CNN "Need_order"
+	1    8950 1250
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	8950 1750 8950 1650
+	8950 1750 8950 1400
 Wire Wire Line
-	8950 1350 9300 1350
+	8950 1100 9300 1100
 Wire Wire Line
-	9300 1350 9300 1500
+	9300 1100 9300 1300
 $Comp
 L Device:R R?
 U 1 1 5E6AF3E2
-P 9300 1150
-F 0 "R?" H 9370 1196 50  0000 L CNN
-F 1 "4.7k" H 9370 1105 50  0000 L CNN
-F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 9230 1150 50  0001 C CNN
-F 3 "~" H 9300 1150 50  0001 C CNN
-F 4 "0" H 9300 1150 50  0001 C CNN "Need_order"
-	1    9300 1150
+P 9300 850
+F 0 "R?" H 9370 896 50  0000 L CNN
+F 1 "4.7k" H 9370 805 50  0000 L CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 9230 850 50  0001 C CNN
+F 3 "~" H 9300 850 50  0001 C CNN
+F 4 "0" H 9300 850 50  0001 C CNN "Need_order"
+	1    9300 850 
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	9300 1300 9300 1350
-Connection ~ 9300 1350
+	9300 1000 9300 1100
+Connection ~ 9300 1100
 $Comp
 L Device:CP_Small C?
 U 1 1 5E6BAD4B
-P 9450 1500
-F 0 "C?" V 9675 1500 50  0000 C CNN
-F 1 "2.2uF" V 9584 1500 50  0000 C CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric" H 9450 1500 50  0001 C CNN
-F 3 "~" H 9450 1500 50  0001 C CNN
-F 4 "08055C225JATA" H 9450 1500 50  0001 C CNN "MPN"
-F 5 "0" H 9450 1500 50  0001 C CNN "Need_order"
-F 6 "4.7uF" H 9450 1500 50  0001 C CNN "OriginalValue"
-	1    9450 1500
+P 9450 1300
+F 0 "C?" V 9675 1300 50  0000 C CNN
+F 1 "2.2uF" V 9584 1300 50  0000 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 9450 1300 50  0001 C CNN
+F 3 "~" H 9450 1300 50  0001 C CNN
+F 4 "08055C225JATA" H 9450 1300 50  0001 C CNN "MPN"
+F 5 "0" H 9450 1300 50  0001 C CNN "Need_order"
+F 6 "4.7uF" H 9450 1300 50  0001 C CNN "OriginalValue"
+	1    9450 1300
 	0    -1   -1   0   
 $EndComp
 Wire Wire Line
-	9350 1500 9300 1500
-Connection ~ 9300 1500
+	9350 1300 9300 1300
+Connection ~ 9300 1300
 Wire Wire Line
-	9300 1500 9300 1550
+	9300 1300 9300 1550
 $Comp
 L power:GNDA #PWR?
 U 1 1 5E6C7437
@@ -1856,44 +1712,30 @@ $EndComp
 Wire Wire Line
 	9300 2000 9300 1950
 $Comp
-L Diode:1N5711 D?
-U 1 1 5E6D7118
-P 9900 1500
-F 0 "D?" H 9900 1284 50  0000 C CNN
-F 1 "EP05Q03L" H 9900 1375 50  0000 C CNN
-F 2 "Diode_SMD:D_SOD-123F" H 9900 1325 50  0001 C CNN
-F 3 "https://www.mouser.ch/datasheet/2/115/ds11015-60335.pdf" H 9900 1500 50  0001 C CNN
-F 4 "1N5711W-7-F" H 9900 1500 50  0001 C CNN "MPN"
-F 5 "0" H 9900 1500 50  0001 C CNN "Need_order"
-F 6 "1N5711 or Ge" H 9900 1500 50  0001 C CNN "OriginalValue"
-	1    9900 1500
-	-1   0    0    1   
-$EndComp
-$Comp
-L Diode:1N5711 D?
+L Device:D_Schottky D?
 U 1 1 5E6D976F
-P 9700 1700
-F 0 "D?" V 9654 1779 50  0000 L CNN
-F 1 "EP05Q03L" V 9745 1779 50  0000 L CNN
-F 2 "Diode_SMD:D_SOD-123F" H 9700 1525 50  0001 C CNN
-F 3 "https://www.mouser.ch/datasheet/2/115/ds11015-60335.pdf" H 9700 1700 50  0001 C CNN
-F 4 "1N5711W-7-F" H 9700 1700 50  0001 C CNN "MPN"
-F 5 "0" H 9700 1700 50  0001 C CNN "Need_order"
-F 6 "1N5711 or Ge" H 9700 1700 50  0001 C CNN "OriginalValue"
-	1    9700 1700
+P 9700 1550
+F 0 "D?" V 9654 1629 50  0000 L CNN
+F 1 "EP05Q03L" V 9745 1629 50  0000 L CNN
+F 2 "Diode_SMD:D_SOD-123F" H 9700 1375 50  0001 C CNN
+F 3 "" H 9700 1550 50  0001 C CNN
+F 4 "EP05Q03L" H 9700 1550 50  0001 C CNN "MPN"
+F 5 "0" H 9700 1550 50  0001 C CNN "Need_order"
+F 6 "1N5711 or Ge" H 9700 1550 50  0001 C CNN "OriginalValue"
+	1    9700 1550
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	9550 1500 9700 1500
+	9550 1300 9700 1300
 Wire Wire Line
-	9700 1550 9700 1500
-Connection ~ 9700 1500
+	9700 1400 9700 1300
+Connection ~ 9700 1300
 Wire Wire Line
-	9700 1500 9750 1500
+	9700 1300 9750 1300
 Wire Wire Line
 	9300 2000 9550 2000
 Wire Wire Line
-	9700 1850 9700 2000
+	9700 1700 9700 2000
 Wire Wire Line
 	9700 2000 9550 2000
 Connection ~ 9550 2000
@@ -1933,58 +1775,57 @@ Wire Wire Line
 	8650 2850 8750 2850
 Connection ~ 8750 2850
 Wire Wire Line
-	8950 2800 8950 1750
+	8950 2300 8950 1750
 Wire Wire Line
-	8950 2800 10900 2800
+	8950 2300 10900 2300
 Connection ~ 8950 1750
 $Comp
 L Device:R R?
 U 1 1 5E7C6F0E
-P 10250 1500
-F 0 "R?" V 10043 1500 50  0000 C CNN
-F 1 "4.7k" V 10134 1500 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 10180 1500 50  0001 C CNN
-F 3 "~" H 10250 1500 50  0001 C CNN
-F 4 "0" H 10250 1500 50  0001 C CNN "Need_order"
-	1    10250 1500
+P 10250 1300
+F 0 "R?" V 10043 1300 50  0000 C CNN
+F 1 "4.7k" V 10134 1300 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 10180 1300 50  0001 C CNN
+F 3 "~" H 10250 1300 50  0001 C CNN
+F 4 "0" H 10250 1300 50  0001 C CNN "Need_order"
+	1    10250 1300
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	10050 1500 10100 1500
+	10050 1300 10100 1300
 Wire Wire Line
-	10400 1500 10450 1500
+	10400 1300 10450 1300
 $Comp
 L Device:CP_Small C?
 U 1 1 5E7E0C6C
-P 10050 1100
-F 0 "C?" H 9962 1054 50  0000 R CNN
-F 1 "10uF" H 9962 1145 50  0000 R CNN
-F 2 "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder" H 10050 1100 50  0001 C CNN
-F 3 "~" H 10050 1100 50  0001 C CNN
-F 4 "TAJA106K016RNJ" H 10050 1100 50  0001 C CNN "MPN"
-F 5 "0" H 10050 1100 50  0001 C CNN "Need_order"
-F 6 "47uF" H 10050 1100 50  0001 C CNN "OriginalValue"
-	1    10050 1100
-	-1   0    0    1   
+P 10050 1800
+F 0 "C?" H 10138 1846 50  0000 L CNN
+F 1 "10uF" H 10138 1755 50  0000 L CNN
+F 2 "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder" H 10050 1800 50  0001 C CNN
+F 3 "~" H 10050 1800 50  0001 C CNN
+F 4 "TAJA106K016RNJ" H 10050 1800 50  0001 C CNN "MPN"
+F 5 "0" H 10050 1800 50  0001 C CNN "Need_order"
+F 6 "47uF" H 10050 1800 50  0001 C CNN "OriginalValue"
+	1    10050 1800
+	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	10050 1500 10050 1200
-Connection ~ 10050 1500
+	10050 1300 10050 1700
 $Comp
 L power:GNDA #PWR?
 U 1 1 5E7EE5B3
-P 10050 950
-F 0 "#PWR?" H 10050 700 50  0001 C CNN
-F 1 "GNDA" H 10055 777 50  0000 C CNN
-F 2 "" H 10050 950 50  0001 C CNN
-F 3 "" H 10050 950 50  0001 C CNN
-	1    10050 950 
-	-1   0    0    1   
+P 10050 2000
+F 0 "#PWR?" H 10050 1750 50  0001 C CNN
+F 1 "GNDA" H 10055 1827 50  0000 C CNN
+F 2 "" H 10050 2000 50  0001 C CNN
+F 3 "" H 10050 2000 50  0001 C CNN
+	1    10050 2000
+	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	10050 1000 10050 950 
+	10050 1900 10050 2000
 Wire Wire Line
-	9300 600  9300 1000
+	9300 600  9300 700 
 Wire Wire Line
 	9300 600  10750 600 
 Wire Wire Line
@@ -1993,76 +1834,66 @@ Connection ~ 9300 600
 $Comp
 L Device:R R?
 U 1 1 5E86FCBF
-P 10750 1000
-F 0 "R?" H 10680 954 50  0000 R CNN
-F 1 "3.9k" H 10680 1045 50  0000 R CNN
-F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 10680 1000 50  0001 C CNN
-F 3 "~" H 10750 1000 50  0001 C CNN
-F 4 "0" H 10750 1000 50  0001 C CNN "Need_order"
-	1    10750 1000
+P 10750 850
+F 0 "R?" H 10680 804 50  0000 R CNN
+F 1 "3.9k" H 10680 895 50  0000 R CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 10680 850 50  0001 C CNN
+F 3 "~" H 10750 850 50  0001 C CNN
+F 4 "0" H 10750 850 50  0001 C CNN "Need_order"
+	1    10750 850 
 	-1   0    0    1   
 $EndComp
 Wire Wire Line
-	10750 850  10750 600 
+	10750 700  10750 600 
 Wire Wire Line
-	10750 1300 10750 1250
-Text Label 10850 1250 0    50   ~ 0
+	10750 1100 10750 1050
+Text Label 10850 1050 0    50   ~ 0
 CAG
 Wire Wire Line
-	10850 1250 10750 1250
-Connection ~ 10750 1250
+	10850 1050 10750 1050
+Connection ~ 10750 1050
 Wire Wire Line
-	10750 1250 10750 1150
+	10750 1050 10750 1000
 $Comp
 L Device:R_POT RV?
 U 1 1 5E897D70
-P 10250 2000
-F 0 "RV?" H 10181 2046 50  0000 R CNN
-F 1 "470" H 10181 1955 50  0000 R CNN
-F 2 "" H 10250 2000 50  0001 C CNN
-F 3 "~" H 10250 2000 50  0001 C CNN
-	1    10250 2000
+P 10750 1800
+F 0 "RV?" H 10681 1846 50  0000 R CNN
+F 1 "470" H 10681 1755 50  0000 R CNN
+F 2 "" H 10750 1800 50  0001 C CNN
+F 3 "~" H 10750 1800 50  0001 C CNN
+	1    10750 1800
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	10750 1800 10750 1700
+	10750 1650 10750 1500
 $Comp
 L power:GNDA #PWR?
 U 1 1 5E8A5CFD
-P 10250 2200
-F 0 "#PWR?" H 10250 1950 50  0001 C CNN
-F 1 "GNDA" H 10255 2027 50  0000 C CNN
-F 2 "" H 10250 2200 50  0001 C CNN
-F 3 "" H 10250 2200 50  0001 C CNN
-	1    10250 2200
+P 10750 2000
+F 0 "#PWR?" H 10750 1750 50  0001 C CNN
+F 1 "GNDA" H 10755 1827 50  0000 C CNN
+F 2 "" H 10750 2000 50  0001 C CNN
+F 3 "" H 10750 2000 50  0001 C CNN
+	1    10750 2000
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	10250 2200 10250 2150
-Wire Wire Line
-	10750 1800 10250 1800
-Wire Wire Line
-	10250 1800 10250 1850
-Wire Wire Line
-	10600 2000 10400 2000
+	10750 2000 10750 1950
 Text HLabel 800  1300 0    50   Input ~ 0
 HF_RX
-Text HLabel 7000 5800 0    50   Output ~ 0
+Text HLabel 6750 5800 0    50   Output ~ 0
 SPKR
-Text HLabel 10600 2000 2    50   Output ~ 0
+Text HLabel 10900 1800 2    50   Output ~ 0
 METER
 Text HLabel 6950 1000 0    50   Input ~ 0
 MIC
 Text HLabel 6300 1850 2    50   Output ~ 0
 HF_TX
-Text Notes 9450 5100 0    79   ~ 16
-TODO Handle CW
-Text HLabel 9850 5300 0    50   Input ~ 0
+Text HLabel 10300 5500 0    50   Input ~ 0
 MUTE_SPKR
 Wire Wire Line
-	9850 5300 10200 5300
-Wire Wire Line
-	10200 5300 10200 5600
+	10300 5500 10300 5600
 Text HLabel 1300 4500 0    50   Input ~ 0
 SWITCH_RELAYn
 Text Label 2800 900  1    50   ~ 0
@@ -2073,37 +1904,24 @@ Text Label 8900 600  0    50   ~ 0
 +8V_RX
 Text Label 4650 4300 2    50   ~ 0
 +8V_RX
-Text HLabel 1000 2550 0    50   Input ~ 0
+Text HLabel 1000 3550 0    50   Input ~ 0
 +8V_RX
-Text HLabel 1000 2650 0    50   Input ~ 0
+Text HLabel 1000 3650 0    50   Input ~ 0
 +8V_TX
-Text Label 6250 4050 2    50   ~ 0
+Text Label 6800 3750 0    50   ~ 0
 +8V_RX
 Text GLabel 8350 4900 1    50   Input ~ 0
 +8V
 Text GLabel 8150 2850 0    50   Input ~ 0
 +8V
 Wire Wire Line
-	1000 2550 1300 2550
-Text Label 1300 2550 2    50   ~ 0
+	1000 3550 1300 3550
+Text Label 1300 3550 2    50   ~ 0
 +8V_RX
-Text Label 1300 2650 2    50   ~ 0
+Text Label 1300 3650 2    50   ~ 0
 +8V_TX
 Wire Wire Line
-	1300 2650 1000 2650
-$Comp
-L Device:CTRIM_Small C?
-U 1 1 5E9DA7C6
-P 7150 4000
-F 0 "C?" H 7241 4046 50  0000 L CNN
-F 1 "60pF" H 7241 3955 50  0000 L CNN
-F 2 "" H 7150 4000 50  0001 C CNN
-F 3 "~" H 7150 4000 50  0001 C CNN
-	1    7150 4000
-	-1   0    0    -1  
-$EndComp
-Wire Wire Line
-	7150 3900 7150 3850
+	1300 3650 1000 3650
 $Comp
 L Diode:1N4148W D?
 U 1 1 5EA3288A
@@ -2151,21 +1969,21 @@ Wire Wire Line
 Wire Wire Line
 	4650 4300 4400 4300
 Wire Wire Line
-	4300 3550 4300 4450
+	4200 3550 4200 4450
 Wire Wire Line
-	4300 4450 3250 4450
+	4200 4450 3250 4450
 Wire Wire Line
 	3250 4450 3250 4700
 Wire Wire Line
-	4300 3550 4800 3550
+	4200 3550 4800 3550
 Wire Wire Line
-	3050 4700 3050 2500
+	3050 4700 3050 3950
 Wire Wire Line
 	2850 4700 2850 4300
 Wire Wire Line
 	2850 4300 4050 4300
 Wire Wire Line
-	2250 2500 3050 2500
+	2850 3950 3050 3950
 Wire Wire Line
 	4050 1950 4050 4300
 Wire Wire Line
@@ -2389,13 +2207,13 @@ $EndComp
 $Comp
 L Connector_Generic:Conn_01x03 J?
 U 1 1 5E814B0C
-P 6000 1350
-F 0 "J?" V 5964 1530 50  0000 L CNN
-F 1 "VX Filt out" V 5873 1530 50  0000 L CNN
-F 2 "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical" H 6000 1350 50  0001 C CNN
-F 3 "~" H 6000 1350 50  0001 C CNN
-F 4 "0" H 6000 1350 50  0001 C CNN "Need_order"
-	1    6000 1350
+P 6000 1250
+F 0 "J?" V 5964 1430 50  0000 L CNN
+F 1 "TX Filt out" V 5873 1430 50  0000 L CNN
+F 2 "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical" H 6000 1250 50  0001 C CNN
+F 3 "~" H 6000 1250 50  0001 C CNN
+F 4 "0" H 6000 1250 50  0001 C CNN "Need_order"
+	1    6000 1250
 	0    1    -1   0   
 $EndComp
 $Comp
@@ -2412,21 +2230,21 @@ $EndComp
 $Comp
 L power:GNDA #PWR?
 U 1 1 5E814B20
-P 6100 1600
-F 0 "#PWR?" H 6100 1350 50  0001 C CNN
-F 1 "GNDA" H 6105 1427 50  0000 C CNN
-F 2 "" H 6100 1600 50  0001 C CNN
-F 3 "" H 6100 1600 50  0001 C CNN
-	1    6100 1600
+P 6100 1500
+F 0 "#PWR?" H 6100 1250 50  0001 C CNN
+F 1 "GNDA" H 6105 1327 50  0000 C CNN
+F 2 "" H 6100 1500 50  0001 C CNN
+F 3 "" H 6100 1500 50  0001 C CNN
+	1    6100 1500
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	6100 1600 6100 1550
+	6100 1500 6100 1450
 Wire Wire Line
-	5900 1600 5900 1550
-Connection ~ 6100 1600
+	5900 1500 5900 1450
+Connection ~ 6100 1500
 Wire Wire Line
-	6100 1600 5900 1600
+	6100 1500 5900 1500
 Text Label 4150 1500 0    50   ~ 0
 +8V_TX
 Wire Wire Line
@@ -2441,7 +2259,7 @@ Connection ~ 4500 1850
 Wire Wire Line
 	4550 1450 4550 1850
 Wire Wire Line
-	6000 1550 6000 1850
+	6000 1450 6000 1850
 $Comp
 L mpb:BAT18 D?
 U 1 1 5E98708F
@@ -2642,14 +2460,14 @@ Does this\nneed\nhigher hFE?
 $Comp
 L Transistor_BJT:MMBT3904 Q?
 U 1 1 5E53D196
-P 10650 1500
-F 0 "Q?" H 10841 1546 50  0000 L CNN
-F 1 "MMBT3904" H 10841 1455 50  0000 L CNN
-F 2 "Package_TO_SOT_SMD:SOT-23" H 10850 1425 50  0001 L CIN
-F 3 "https://www.fairchildsemi.com/datasheets/2N/2N3904.pdf" H 10650 1500 50  0001 L CNN
-F 4 "MMBT3904LT1G" H 10650 1500 50  0001 C CNN "MPN"
-F 5 "1" H 10650 1500 50  0001 C CNN "Need_order"
-	1    10650 1500
+P 10650 1300
+F 0 "Q?" H 10841 1346 50  0000 L CNN
+F 1 "MMBT3904" H 10841 1255 50  0000 L CNN
+F 2 "Package_TO_SOT_SMD:SOT-23" H 10850 1225 50  0001 L CIN
+F 3 "https://www.fairchildsemi.com/datasheets/2N/2N3904.pdf" H 10650 1300 50  0001 L CNN
+F 4 "MMBT3904LT1G" H 10650 1300 50  0001 C CNN "MPN"
+F 5 "1" H 10650 1300 50  0001 C CNN "Need_order"
+	1    10650 1300
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -2873,6 +2691,216 @@ Connection ~ 4550 1850
 Connection ~ 4850 1850
 Wire Wire Line
 	4850 1850 4550 1850
-Text Notes 5300 2500 0    50   ~ 0
+Text Notes 4800 1150 0    50   ~ 0
 3rd order Elliptic Bandpass\n26MHz - 29.6MHz cutoff\n0.3dB ripple, -40dB stopband\nE12 values
+$Comp
+L Device:D_Schottky D?
+U 1 1 5E6E6457
+P 9900 1300
+F 0 "D?" H 9900 1084 50  0000 C CNN
+F 1 "EP05Q03L" H 9900 1175 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-123F" H 9900 1125 50  0001 C CNN
+F 3 "" H 9900 1300 50  0001 C CNN
+F 4 "EP05Q03L" H 9900 1300 50  0001 C CNN "MPN"
+F 5 "0" H 9900 1300 50  0001 C CNN "Need_order"
+F 6 "1N5711 or Ge" H 9900 1300 50  0001 C CNN "OriginalValue"
+	1    9900 1300
+	-1   0    0    1   
+$EndComp
+Connection ~ 10050 1300
+$Comp
+L Device:R R?
+U 1 1 5E7A6C94
+P 7850 6250
+F 0 "R?" V 7735 6250 50  0000 C CNN
+F 1 "0" V 7644 6250 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 7780 6250 50  0001 C CNN
+F 3 "~" H 7850 6250 50  0001 C CNN
+F 4 "0" H 7850 6250 50  0001 C CNN "Need_order"
+	1    7850 6250
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	8050 6250 8000 6250
+Wire Wire Line
+	7700 6100 7700 6250
+Wire Wire Line
+	7700 6100 8150 6100
+Text Notes 1700 7500 0    47   ~ 0
+Handle CW like the uBitx, in the 2nd mixer:\n The BFO as disabled\n The first oscillator is moved to the actual transmit frequency\n A DC bias is fed to the first mixer to upset the balance and allow the first oscillator to leak to the RF power chain.\n The CW sidetone is generated from the Arduino and injected into the audio amplifier\n
+$Comp
+L Device:C_Small C?
+U 1 1 5E55C918
+P 8150 3850
+F 0 "C?" V 7921 3850 50  0000 C CNN
+F 1 "2.2nF" V 8012 3850 50  0000 C CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 8150 3850 50  0001 C CNN
+F 3 "~" H 8150 3850 50  0001 C CNN
+F 4 "CBR" H 8150 3850 50  0001 C CNN "MPN"
+F 5 "0" H 8150 3850 50  0001 C CNN "Need_order"
+	1    8150 3850
+	0    1    1    0   
+$EndComp
+Text HLabel 7900 3850 0    50   Input ~ 0
+BFO
+Wire Wire Line
+	7900 3850 8050 3850
+Text Notes 7700 3800 0    50   ~ 0
+200mVpp
+NoConn ~ 8250 3950
+Text HLabel 950  2850 0    50   Input ~ 0
+CW_KEYn
+$Comp
+L Device:R R?
+U 1 1 5E5F41C8
+P 1100 2850
+F 0 "R?" V 893 2850 50  0000 C CNN
+F 1 "2.2k" V 984 2850 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 1030 2850 50  0001 C CNN
+F 3 "~" H 1100 2850 50  0001 C CNN
+F 4 "0" H 1100 2850 50  0001 C CNN "Need_order"
+	1    1100 2850
+	0    1    1    0   
+$EndComp
+$Comp
+L Device:R R?
+U 1 1 5E5F4CCC
+P 1400 2850
+F 0 "R?" V 1193 2850 50  0000 C CNN
+F 1 "1k" V 1284 2850 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 1330 2850 50  0001 C CNN
+F 3 "~" H 1400 2850 50  0001 C CNN
+F 4 "0" H 1400 2850 50  0001 C CNN "Need_order"
+	1    1400 2850
+	0    1    1    0   
+$EndComp
+$Comp
+L Device:C_Small C?
+U 1 1 5E5F51BC
+P 1250 3000
+F 0 "C?" H 1158 2954 50  0000 R CNN
+F 1 "0.1uF" H 1158 3045 50  0000 R CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 1250 3000 50  0001 C CNN
+F 3 "~" H 1250 3000 50  0001 C CNN
+F 4 "GRM188R71H104KA93D" H 1250 3000 50  0001 C CNN "MPN"
+F 5 "0" H 1250 3000 50  0001 C CNN "Need_order"
+	1    1250 3000
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	1250 2900 1250 2850
+Connection ~ 1250 2850
+$Comp
+L power:GNDA #PWR?
+U 1 1 5E620099
+P 1250 3100
+F 0 "#PWR?" H 1250 2850 50  0001 C CNN
+F 1 "GNDA" H 1255 2927 50  0000 C CNN
+F 2 "" H 1250 3100 50  0001 C CNN
+F 3 "" H 1250 3100 50  0001 C CNN
+	1    1250 3100
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2950 2700 2950 2200
+Text Notes 2400 2850 2    39   ~ 0
+DC bias to upset mixer\nbalance, to get LO leakage
+Wire Wire Line
+	1550 2850 2850 2850
+Connection ~ 2850 2850
+Wire Wire Line
+	2850 2850 2850 3950
+$Comp
+L Device:R_POT RV?
+U 1 1 5E6EE7AD
+P 9550 5700
+F 0 "RV?" H 9480 5746 50  0000 R CNN
+F 1 "10k" H 9480 5655 50  0000 R CNN
+F 2 "" H 9550 5700 50  0001 C CNN
+F 3 "~" H 9550 5700 50  0001 C CNN
+	1    9550 5700
+	-1   0    0    1   
+$EndComp
+Text HLabel 9550 5500 0    50   Input ~ 0
+CW_TONE
+Wire Wire Line
+	9550 5550 9550 5500
+$Comp
+L power:GNDA #PWR?
+U 1 1 5E706593
+P 9550 5850
+F 0 "#PWR?" H 9550 5600 50  0001 C CNN
+F 1 "GNDA" H 9555 5677 50  0000 C CNN
+F 2 "" H 9550 5850 50  0001 C CNN
+F 3 "" H 9550 5850 50  0001 C CNN
+	1    9550 5850
+	1    0    0    -1  
+$EndComp
+Connection ~ 9000 5700
+$Comp
+L Device:R R?
+U 1 1 5E71DB7D
+P 10450 5200
+F 0 "R?" V 10335 5200 50  0000 C CNN
+F 1 "1k" V 10244 5200 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 10380 5200 50  0001 C CNN
+F 3 "~" H 10450 5200 50  0001 C CNN
+F 4 "0" H 10450 5200 50  0001 C CNN "Need_order"
+	1    10450 5200
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	9000 5200 10300 5200
+Wire Wire Line
+	10650 4350 10650 5200
+Connection ~ 10650 5200
+Wire Wire Line
+	10650 5200 10650 5700
+$Comp
+L Device:CP_Small C?
+U 1 1 5E8D889D
+P 9200 5700
+F 0 "C?" V 9067 5700 50  0000 C CNN
+F 1 "1uF" V 8976 5700 50  0000 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 9200 5700 50  0001 C CNN
+F 3 "~" H 9200 5700 50  0001 C CNN
+F 4 "08055C105JAT2A" H 9200 5700 50  0001 C CNN "MPN"
+F 5 "0" H 9200 5700 50  0001 C CNN "Need_order"
+	1    9200 5700
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	9300 5700 9400 5700
+Wire Wire Line
+	9100 5700 9000 5700
+Text GLabel 10750 5400 1    50   Input ~ 0
++8V
+Wire Wire Line
+	10600 5200 10650 5200
+Wire Wire Line
+	10750 5700 10650 5700
+Connection ~ 10650 5700
+Wire Wire Line
+	10650 5700 10650 5750
+$Comp
+L power:GNDA #PWR?
+U 1 1 5E5EB15C
+P 6800 4050
+F 0 "#PWR?" H 6800 3800 50  0001 C CNN
+F 1 "GNDA" H 6805 3877 50  0000 C CNN
+F 2 "" H 6800 4050 50  0001 C CNN
+F 3 "" H 6800 4050 50  0001 C CNN
+	1    6800 4050
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6200 3650 6200 3750
+Wire Wire Line
+	6500 3750 6400 3750
+Wire Wire Line
+	6400 3750 6400 3650
+Connection ~ 6400 3650
+Connection ~ 6200 3650
+Wire Wire Line
+	6200 3650 6400 3650
 $EndSCHEMATC
diff --git a/kicad/clock.sch b/kicad/clock.sch
index 80c3223..5659c1d 100644
--- a/kicad/clock.sch
+++ b/kicad/clock.sch
@@ -5,7 +5,7 @@ $Descr A4 11693 8268
 encoding utf-8
 Sheet 4 6
 Title "Picardy Anglian Mashup"
-Date ""
+Date "2020-02-24"
 Rev ""
 Comp "HB9EGM"
 Comment1 ""
@@ -96,9 +96,6 @@ 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
@@ -319,7 +316,6 @@ 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
@@ -349,7 +345,7 @@ F 3 "" H 6150 4150 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 Text HLabel 6900 4600 2    50   Output ~ 0
-CLK_AUX
+BFO
 $Comp
 L Device:R R?
 U 1 1 5E59255D
@@ -399,9 +395,6 @@ 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
@@ -435,8 +428,6 @@ Wire Wire Line
 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
@@ -469,4 +460,64 @@ F 3 "" H 5100 3000 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 Connection ~ 5100 3000
+$Comp
+L Device:C_Small C?
+U 1 1 5E9FF535
+P 5950 3050
+AR Path="/5E3088F9/5E9FF535" Ref="C?"  Part="1" 
+AR Path="/5E4D247A/5E9FF535" Ref="C?"  Part="1" 
+F 0 "C?" V 6179 3050 50  0000 C CNN
+F 1 "0.1uF" V 6088 3050 50  0000 C CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 5950 3050 50  0001 C CNN
+F 3 "~" H 5950 3050 50  0001 C CNN
+F 4 "GRM188R71H104KA93D" H 5950 3050 50  0001 C CNN "MPN"
+F 5 "0" H 5950 3050 50  0001 C CNN "Need_order"
+	1    5950 3050
+	0    -1   -1   0   
+$EndComp
+$Comp
+L Device:C_Small C?
+U 1 1 5E9FFFB4
+P 5950 3850
+AR Path="/5E3088F9/5E9FFFB4" Ref="C?"  Part="1" 
+AR Path="/5E4D247A/5E9FFFB4" Ref="C?"  Part="1" 
+F 0 "C?" V 6179 3850 50  0000 C CNN
+F 1 "0.1uF" V 6088 3850 50  0000 C CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 5950 3850 50  0001 C CNN
+F 3 "~" H 5950 3850 50  0001 C CNN
+F 4 "GRM188R71H104KA93D" H 5950 3850 50  0001 C CNN "MPN"
+F 5 "0" H 5950 3850 50  0001 C CNN "Need_order"
+	1    5950 3850
+	0    -1   -1   0   
+$EndComp
+$Comp
+L Device:C_Small C?
+U 1 1 5EA002BA
+P 5950 4600
+AR Path="/5E3088F9/5EA002BA" Ref="C?"  Part="1" 
+AR Path="/5E4D247A/5EA002BA" Ref="C?"  Part="1" 
+F 0 "C?" V 6179 4600 50  0000 C CNN
+F 1 "0.1uF" V 6088 4600 50  0000 C CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 5950 4600 50  0001 C CNN
+F 3 "~" H 5950 4600 50  0001 C CNN
+F 4 "GRM188R71H104KA93D" H 5950 4600 50  0001 C CNN "MPN"
+F 5 "0" H 5950 4600 50  0001 C CNN "Need_order"
+	1    5950 4600
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	6050 4600 6150 4600
+Connection ~ 6150 4600
+Wire Wire Line
+	6150 3850 6050 3850
+Connection ~ 6150 3850
+Wire Wire Line
+	6150 3050 6050 3050
+Connection ~ 6150 3050
+Wire Wire Line
+	5850 3050 5500 3050
+Wire Wire Line
+	5350 3850 5850 3850
+Wire Wire Line
+	5850 4600 5500 4600
 $EndSCHEMATC
diff --git a/kicad/control.sch b/kicad/control.sch
index c55c12f..9e6a8b1 100644
--- a/kicad/control.sch
+++ b/kicad/control.sch
@@ -5,7 +5,7 @@ $Descr A4 11693 8268
 encoding utf-8
 Sheet 2 6
 Title "Picardy Anglian Mashup"
-Date ""
+Date "2020-02-24"
 Rev ""
 Comp "HB9EGM"
 Comment1 ""
@@ -14,12 +14,12 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L MCU_Microchip_ATmega:ATmega328P-PU U?
+L MCU_Microchip_ATmega:ATmega328P-AU U?
 U 1 1 5E2FA32D
 P 5250 3450
-F 0 "U?" H 4606 3496 50  0000 R CNN
-F 1 "ATmega328P-PU" H 4606 3405 50  0000 R CNN
-F 2 "Package_DIP:DIP-28_W7.62mm" H 5250 3450 50  0001 C CIN
+F 0 "U?" H 4600 2650 50  0000 C CNN
+F 1 "ATmega328P-AU" H 4350 2550 50  0000 C CNN
+F 2 "Package_QFP:TQFP-32_7x7mm_P0.8mm" H 5250 3450 50  0001 C CIN
 F 3 "http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega328_P%20AVR%20MCU%20with%20picoPower%20Technology%20Data%20Sheet%2040001984A.pdf" H 5250 3450 50  0001 C CNN
 F 4 "0" H 5250 3450 50  0001 C CNN "Need_order"
 	1    5250 3450
@@ -176,22 +176,7 @@ $EndComp
 Connection ~ 8100 3200
 Wire Wire Line
 	8100 3200 8250 3200
-$Comp
-L Device:Rotary_Encoder_Switch SW?
-U 1 1 5E4CA7A2
-P 2700 1550
-F 0 "SW?" H 2700 1917 50  0000 C CNN
-F 1 "PEC12R-4022F-S0024" H 2700 1826 50  0000 C CNN
-F 2 "Rotary_Encoder:RotaryEncoder_Alps_EC11E_Vertical_H20mm" H 2550 1710 50  0001 C CNN
-F 3 "~" H 2700 1810 50  0001 C CNN
-F 4 "PEC12R-4022F-S0024" H 2700 1550 50  0001 C CNN "MPN"
-F 5 "1" H 2700 1550 50  0001 C CNN "Need_order"
-	1    2700 1550
-	1    0    0    -1  
-$EndComp
-Text Notes 8150 4250 0    79   ~ 0
-TODO\nAudio filter
-Text HLabel 8850 4250 2    50   Output ~ 0
+Text HLabel 9500 4250 2    50   Output ~ 0
 CW_TONE
 $Comp
 L Diode:1N4148W D?
@@ -206,46 +191,14 @@ F 5 "1" H 9350 1600 50  0001 C CNN "Need_order"
 	1    9350 1600
 	0    1    1    0   
 $EndComp
-Text Notes 6200 2150 0    50   ~ 0
-Sequence:\nSEQ0: Baseband + Anglian\nSEQ1: External PA\nSEQ2: External Relay + Transverter
-Text Notes 500  750  0    50   ~ 0
-LCD, use a 5V character display,\nand Adafruit 292 backpack with\n3V3 I2C
-$Comp
-L Connector_Generic:Conn_01x04 J?
-U 1 1 5EF0CBA1
-P 900 1400
-F 0 "J?" H 980 1300 50  0000 L CNN
-F 1 "LCD" H 980 1391 50  0000 L CNN
-F 2 "Connector_PinHeader_2.54mm:PinHeader_1x04_P2.54mm_Vertical" H 900 1400 50  0001 C CNN
-F 3 "~" H 900 1400 50  0001 C CNN
-F 4 "Adafruit 292" H 900 1400 50  0001 C CNN "MPN"
-F 5 "1" H 900 1400 50  0001 C CNN "Need_order"
-	1    900  1400
-	-1   0    0    1   
-$EndComp
-Text GLabel 1100 1300 2    50   Input ~ 0
+Text Notes 650  2600 0    50   ~ 0
+LCD: use a 5V character display,\nand Adafruit 292 backpack with\n3V3 I2C\nButtons: floating when open, connect to GND when pressed\nCoder: connect as in datasheet PEC12R
+Text GLabel 1100 3500 2    50   Input ~ 0
 SDA
-Text GLabel 1100 1400 2    50   Input ~ 0
+Text GLabel 1100 3600 2    50   Input ~ 0
 SCL
-Text HLabel 900  1050 0    50   Input ~ 0
+Text HLabel 1100 3400 2    50   Input ~ 0
 LCD_5V
-Wire Wire Line
-	900  1050 1150 1050
-Wire Wire Line
-	1150 1050 1150 1200
-Wire Wire Line
-	1150 1200 1100 1200
-$Comp
-L power:GND #PWR?
-U 1 1 5EF0E08A
-P 1100 1500
-F 0 "#PWR?" H 1100 1250 50  0001 C CNN
-F 1 "GND" H 1105 1327 50  0000 C CNN
-F 2 "" H 1100 1500 50  0001 C CNN
-F 3 "" H 1100 1500 50  0001 C CNN
-	1    1100 1500
-	1    0    0    -1  
-$EndComp
 $Comp
 L Connector:AudioJack3 J?
 U 1 1 5EF19C71
@@ -257,239 +210,134 @@ F 3 "~" H 1300 6900 50  0001 C CNN
 	1    1300 6900
 	1    0    0    -1  
 $EndComp
-Text Label 1750 6900 0    50   ~ 0
-CW_DASH
-Text Label 1750 7000 0    50   ~ 0
-CW_DOT
+Text Label 2100 6950 0    50   ~ 0
+CW_INPUT
 $Comp
 L Device:R R?
 U 1 1 5EF1BE2B
-P 1550 7250
-F 0 "R?" H 1620 7204 50  0000 L CNN
-F 1 "4k7" H 1620 7295 50  0000 L CNN
-F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 1480 7250 50  0001 C CNN
-F 3 "~" H 1550 7250 50  0001 C CNN
-F 4 "0" H 1550 7250 50  0001 C CNN "Need_order"
-	1    1550 7250
-	-1   0    0    1   
+P 1900 6900
+F 0 "R?" V 2107 6900 50  0000 C CNN
+F 1 "10k" V 2016 6900 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 1830 6900 50  0001 C CNN
+F 3 "~" H 1900 6900 50  0001 C CNN
+F 4 "0" H 1900 6900 50  0001 C CNN "Need_order"
+	1    1900 6900
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Device:R R?
 U 1 1 5EF1CB84
-P 1700 7250
-F 0 "R?" H 1630 7204 50  0000 R CNN
-F 1 "4k7" H 1630 7295 50  0000 R CNN
-F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 1630 7250 50  0001 C CNN
-F 3 "~" H 1700 7250 50  0001 C CNN
-F 4 "0" H 1700 7250 50  0001 C CNN "Need_order"
-	1    1700 7250
-	-1   0    0    1   
+P 1900 7000
+F 0 "R?" V 1785 7000 50  0000 C CNN
+F 1 "2k2" V 1694 7000 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 1830 7000 50  0001 C CNN
+F 3 "~" H 1900 7000 50  0001 C CNN
+F 4 "0" H 1900 7000 50  0001 C CNN "Need_order"
+	1    1900 7000
+	0    -1   -1   0   
 $EndComp
-Wire Wire Line
-	1500 6900 1550 6900
-Wire Wire Line
-	1500 7000 1700 7000
-Wire Wire Line
-	1700 7100 1700 7000
-Connection ~ 1700 7000
-Wire Wire Line
-	1700 7000 1750 7000
-Wire Wire Line
-	1550 7100 1550 6900
-Connection ~ 1550 6900
-Wire Wire Line
-	1550 6900 1750 6900
 $Comp
 L power:GND #PWR?
 U 1 1 5EF1FE09
-P 1550 7400
-F 0 "#PWR?" H 1550 7150 50  0001 C CNN
-F 1 "GND" H 1555 7227 50  0000 C CNN
-F 2 "" H 1550 7400 50  0001 C CNN
-F 3 "" H 1550 7400 50  0001 C CNN
-	1    1550 7400
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	1550 7400 1700 7400
-Connection ~ 1550 7400
-$Comp
-L power:+3.3V #PWR?
-U 1 1 5EF21266
-P 1550 6750
-F 0 "#PWR?" H 1550 6600 50  0001 C CNN
-F 1 "+3.3V" H 1565 6923 50  0000 C CNN
-F 2 "" H 1550 6750 50  0001 C CNN
-F 3 "" H 1550 6750 50  0001 C CNN
-	1    1550 6750
-	1    0    0    -1  
+P 1500 6800
+F 0 "#PWR?" H 1500 6550 50  0001 C CNN
+F 1 "GND" V 1505 6672 50  0000 R CNN
+F 2 "" H 1500 6800 50  0001 C CNN
+F 3 "" H 1500 6800 50  0001 C CNN
+	1    1500 6800
+	0    -1   -1   0   
 $EndComp
-Wire Wire Line
-	1500 6800 1550 6800
-Wire Wire Line
-	1550 6800 1550 6750
-Text Label 6000 3350 0    50   ~ 0
-CW_DASH
-Text Label 6000 3450 0    50   ~ 0
-CW_DOT
 $Comp
 L Device:R R?
 U 1 1 5EF25F58
-P 3200 1650
-F 0 "R?" V 3085 1650 50  0000 C CNN
-F 1 "4k7" V 2994 1650 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 3130 1650 50  0001 C CNN
-F 3 "~" H 3200 1650 50  0001 C CNN
-F 4 "0" H 3200 1650 50  0001 C CNN "Need_order"
-	1    3200 1650
+P 1300 3900
+F 0 "R?" V 1185 3900 50  0000 C CNN
+F 1 "4k7" V 1094 3900 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 1230 3900 50  0001 C CNN
+F 3 "~" H 1300 3900 50  0001 C CNN
+F 4 "0" H 1300 3900 50  0001 C CNN "Need_order"
+	1    1300 3900
 	0    -1   -1   0   
 $EndComp
 Wire Wire Line
-	3000 1650 3050 1650
-$Comp
-L power:+3.3V #PWR?
-U 1 1 5EF26965
-P 3000 1450
-F 0 "#PWR?" H 3000 1300 50  0001 C CNN
-F 1 "+3.3V" V 3015 1578 50  0000 L CNN
-F 2 "" H 3000 1450 50  0001 C CNN
-F 3 "" H 3000 1450 50  0001 C CNN
-	1    3000 1450
-	0    1    1    0   
-$EndComp
-Text Label 3350 1650 0    50   ~ 0
+	1100 3900 1150 3900
+Text Label 1450 3900 0    50   ~ 0
 ENC_BTN
 $Comp
-L power:GND #PWR?
-U 1 1 5EF27A04
-P 2350 1550
-F 0 "#PWR?" H 2350 1300 50  0001 C CNN
-F 1 "GND" V 2355 1422 50  0000 R CNN
-F 2 "" H 2350 1550 50  0001 C CNN
-F 3 "" H 2350 1550 50  0001 C CNN
-	1    2350 1550
-	0    1    1    0   
-$EndComp
-$Comp
 L Device:R R?
 U 1 1 5EF2815A
-P 1850 1650
-F 0 "R?" V 1735 1650 50  0000 C CNN
-F 1 "4k7" V 1644 1650 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 1780 1650 50  0001 C CNN
-F 3 "~" H 1850 1650 50  0001 C CNN
-F 4 "0" H 1850 1650 50  0001 C CNN "Need_order"
-	1    1850 1650
-	0    -1   -1   0   
+P 1800 3350
+F 0 "R?" H 1730 3304 50  0000 R CNN
+F 1 "4k7" H 1730 3395 50  0000 R CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 1730 3350 50  0001 C CNN
+F 3 "~" H 1800 3350 50  0001 C CNN
+F 4 "0" H 1800 3350 50  0001 C CNN "Need_order"
+	1    1800 3350
+	-1   0    0    1   
 $EndComp
 $Comp
 L Device:R R?
 U 1 1 5EF2894E
-P 1850 1450
-F 0 "R?" V 2057 1450 50  0000 C CNN
-F 1 "4k7" V 1966 1450 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 1780 1450 50  0001 C CNN
-F 3 "~" H 1850 1450 50  0001 C CNN
-F 4 "0" H 1850 1450 50  0001 C CNN "Need_order"
-	1    1850 1450
-	0    -1   -1   0   
+P 1700 3350
+F 0 "R?" H 1770 3304 50  0000 L CNN
+F 1 "4k7" H 1770 3395 50  0000 L CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 1630 3350 50  0001 C CNN
+F 3 "~" H 1700 3350 50  0001 C CNN
+F 4 "0" H 1700 3350 50  0001 C CNN "Need_order"
+	1    1700 3350
+	-1   0    0    1   
 $EndComp
-Wire Wire Line
-	2000 1450 2050 1450
-Wire Wire Line
-	2000 1650 2050 1650
-Wire Wire Line
-	1700 1650 1700 1550
 $Comp
 L power:+3.3V #PWR?
 U 1 1 5EF2BF90
-P 1650 1550
-F 0 "#PWR?" H 1650 1400 50  0001 C CNN
-F 1 "+3.3V" V 1783 1587 50  0000 C CNN
-F 2 "" H 1650 1550 50  0001 C CNN
-F 3 "" H 1650 1550 50  0001 C CNN
-	1    1650 1550
-	0    -1   -1   0   
+P 1750 3200
+F 0 "#PWR?" H 1750 3050 50  0001 C CNN
+F 1 "+3.3V" H 1765 3373 50  0000 C CNN
+F 2 "" H 1750 3200 50  0001 C CNN
+F 3 "" H 1750 3200 50  0001 C CNN
+	1    1750 3200
+	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	1650 1550 1700 1550
-Connection ~ 1700 1550
-Wire Wire Line
-	1700 1550 1700 1450
 $Comp
 L Device:R R?
 U 1 1 5EF2CC5E
-P 2050 1850
-F 0 "R?" H 2120 1896 50  0000 L CNN
-F 1 "4k7" H 2120 1805 50  0000 L CNN
-F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 1980 1850 50  0001 C CNN
-F 3 "~" H 2050 1850 50  0001 C CNN
-F 4 "0" H 2050 1850 50  0001 C CNN "Need_order"
-	1    2050 1850
-	1    0    0    -1  
+P 1950 3700
+F 0 "R?" V 2157 3700 50  0000 C CNN
+F 1 "4k7" V 2066 3700 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 1880 3700 50  0001 C CNN
+F 3 "~" H 1950 3700 50  0001 C CNN
+F 4 "0" H 1950 3700 50  0001 C CNN "Need_order"
+	1    1950 3700
+	0    -1   -1   0   
 $EndComp
-Wire Wire Line
-	2050 1700 2050 1650
-Connection ~ 2050 1650
 $Comp
 L Device:R R?
 U 1 1 5EF2D7D8
-P 2050 1250
-F 0 "R?" H 2120 1296 50  0000 L CNN
-F 1 "4k7" H 2120 1205 50  0000 L CNN
-F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 1980 1250 50  0001 C CNN
-F 3 "~" H 2050 1250 50  0001 C CNN
-F 4 "0" H 2050 1250 50  0001 C CNN "Need_order"
-	1    2050 1250
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	2050 1450 2050 1400
-Connection ~ 2050 1450
-Wire Wire Line
-	2050 1450 2400 1450
-Wire Wire Line
-	2050 1650 2400 1650
-Wire Wire Line
-	2350 1550 2400 1550
-$Comp
-L Device:C C?
-U 1 1 5EF325CF
-P 2200 2050
-F 0 "C?" V 2360 2050 50  0000 C CNN
-F 1 "10nF" V 2451 2050 50  0000 C CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric" H 2238 1900 50  0001 C CNN
-F 3 "~" H 2200 2050 50  0001 C CNN
-F 4 "VJ0805A103KXJTBC" H 2200 2050 50  0001 C CNN "MPN"
-F 5 "1" H 2200 2050 50  0001 C CNN "Need_order"
-	1    2200 2050
+P 1950 3800
+F 0 "R?" V 2065 3800 50  0000 C CNN
+F 1 "4k7" V 2156 3800 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 1880 3800 50  0001 C CNN
+F 3 "~" H 1950 3800 50  0001 C CNN
+F 4 "0" H 1950 3800 50  0001 C CNN "Need_order"
+	1    1950 3800
 	0    1    1    0   
 $EndComp
 $Comp
 L Device:C C?
-U 1 1 5EF32F46
-P 2200 1050
-F 0 "C?" V 1948 1050 50  0000 C CNN
-F 1 "10nF" V 2039 1050 50  0000 C CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric" H 2238 900 50  0001 C CNN
-F 3 "~" H 2200 1050 50  0001 C CNN
-F 4 "VJ0805A103KXJTBC" H 2200 1050 50  0001 C CNN "MPN"
-F 5 "1" H 2200 1050 50  0001 C CNN "Need_order"
-	1    2200 1050
-	0    1    1    0   
+U 1 1 5EF325CF
+P 2150 3550
+F 0 "C?" H 2265 3596 50  0000 L CNN
+F 1 "10nF" H 2265 3505 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 2188 3400 50  0001 C CNN
+F 3 "~" H 2150 3550 50  0001 C CNN
+F 4 "VJ0805A103KXJTBC" H 2150 3550 50  0001 C CNN "MPN"
+F 5 "1" H 2150 3550 50  0001 C CNN "Need_order"
+	1    2150 3550
+	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	2050 1100 2050 1050
-Wire Wire Line
-	2050 2050 2050 2000
-Wire Wire Line
-	2350 2050 2350 1550
-Connection ~ 2350 1550
-Wire Wire Line
-	2350 1550 2350 1050
-Text Label 2100 1450 0    50   ~ 0
+Text Label 2500 3800 2    50   ~ 0
 ENC_A
-Text Label 2100 1650 0    50   ~ 0
+Text Label 2500 3700 2    50   ~ 0
 ENC_B
 Text Label 6200 4350 0    50   ~ 0
 ENC_A
@@ -509,30 +357,28 @@ F 3 "~" V 1450 5475 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 Text Label 1850 5650 0    50   ~ 0
-SW1
+MIC_SW1
 $Comp
 L power:GND #PWR?
 U 1 1 5EF3D0E7
-P 2050 5450
-F 0 "#PWR?" H 2050 5200 50  0001 C CNN
-F 1 "GND" V 2055 5322 50  0000 R CNN
-F 2 "" H 2050 5450 50  0001 C CNN
-F 3 "" H 2050 5450 50  0001 C CNN
-	1    2050 5450
+P 1800 5450
+F 0 "#PWR?" H 1800 5200 50  0001 C CNN
+F 1 "GND" V 1805 5322 50  0000 R CNN
+F 2 "" H 1800 5450 50  0001 C CNN
+F 3 "" H 1800 5450 50  0001 C CNN
+	1    1800 5450
 	0    -1   -1   0   
 $EndComp
 Wire Wire Line
-	2050 5450 1850 5450
+	1800 5450 1850 5450
 Text Label 1850 5350 0    50   ~ 0
 V_MIC
 NoConn ~ 1850 5250
 Text Label 1850 5150 0    50   ~ 0
-SW2
-Text HLabel 2100 5550 2    50   Output ~ 0
+MIC_SW2
+Text HLabel 1850 5550 2    50   Output ~ 0
 MIC
 Wire Wire Line
-	2100 5550 1850 5550
-Wire Wire Line
 	9350 1450 9600 1450
 $Comp
 L power:+3.3V #PWR?
@@ -551,13 +397,13 @@ Wire Wire Line
 Text HLabel 950  4800 0    50   Input ~ 0
 MIC_8V
 Text Notes 850  6000 0    50   ~ 10
-TODO\nDisassemble MH-42\nand check connection
+TODO\nDisassemble MH-42\nand check pinout
 Wire Wire Line
-	950  4800 2100 4800
+	950  4800 2200 4800
 Wire Wire Line
-	2100 4800 2100 5350
+	2200 4800 2200 5350
 Wire Wire Line
-	2100 5350 1850 5350
+	2200 5350 1850 5350
 Wire Wire Line
 	5350 1950 5350 1900
 Wire Wire Line
@@ -570,30 +416,27 @@ Wire Wire Line
 $Comp
 L Device:C C?
 U 1 1 5EF44469
-P 4450 2400
-F 0 "C?" H 4335 2354 50  0000 R CNN
-F 1 "10nF" H 4335 2445 50  0000 R CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric" H 4488 2250 50  0001 C CNN
-F 3 "~" H 4450 2400 50  0001 C CNN
-F 4 "VJ0805A103KXJTBC" H 4450 2400 50  0001 C CNN "MPN"
-F 5 "1" H 4450 2400 50  0001 C CNN "Need_order"
-	1    4450 2400
+P 4050 2050
+F 0 "C?" H 3935 2004 50  0000 R CNN
+F 1 "10nF" H 3935 2095 50  0000 R CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 4088 1900 50  0001 C CNN
+F 3 "~" H 4050 2050 50  0001 C CNN
+F 4 "VJ0805A103KXJTBC" H 4050 2050 50  0001 C CNN "MPN"
+F 5 "1" H 4050 2050 50  0001 C CNN "Need_order"
+	1    4050 2050
 	-1   0    0    1   
 $EndComp
 $Comp
 L power:GND #PWR?
 U 1 1 5EF44B15
-P 4450 2550
-F 0 "#PWR?" H 4450 2300 50  0001 C CNN
-F 1 "GND" H 4455 2377 50  0000 C CNN
-F 2 "" H 4450 2550 50  0001 C CNN
-F 3 "" H 4450 2550 50  0001 C CNN
-	1    4450 2550
+P 4050 2200
+F 0 "#PWR?" H 4050 1950 50  0001 C CNN
+F 1 "GND" H 4055 2027 50  0000 C CNN
+F 2 "" H 4050 2200 50  0001 C CNN
+F 3 "" H 4050 2200 50  0001 C CNN
+	1    4050 2200
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	4450 2250 4650 2250
-Connection ~ 4650 2250
 $Comp
 L Device:C C?
 U 1 1 5EF45D74
@@ -623,63 +466,37 @@ F 3 "" H 5550 1800 50  0001 C CNN
 	1    5550 1800
 	1    0    0    -1  
 $EndComp
-Text Label 6000 3150 0    50   ~ 0
-SW1
-Text Label 6000 3250 0    50   ~ 0
-SW2
+Text Label 6000 3950 0    50   ~ 0
+MIC_SW1
+Text Label 6000 4050 0    50   ~ 0
+MIC_SW2
 $Comp
 L power:GND #PWR?
 U 1 1 5EF49E5C
-P 1100 2350
-F 0 "#PWR?" H 1100 2100 50  0001 C CNN
-F 1 "GND" H 1105 2177 50  0000 C CNN
-F 2 "" H 1100 2350 50  0001 C CNN
-F 3 "" H 1100 2350 50  0001 C CNN
-	1    1100 2350
+P 1100 4000
+F 0 "#PWR?" H 1100 3750 50  0001 C CNN
+F 1 "GND" H 1105 3827 50  0000 C CNN
+F 2 "" H 1100 4000 50  0001 C CNN
+F 3 "" H 1100 4000 50  0001 C CNN
+	1    1100 4000
 	1    0    0    -1  
 $EndComp
-Text Label 1100 2050 0    50   ~ 0
-SW_FAST
-Text Label 1100 2150 0    50   ~ 0
-SW_RIT
-Text Label 1100 2250 0    50   ~ 0
-SW_MENU
+Text Label 1100 3000 0    50   ~ 0
+BTN0
 Text Label 6300 2550 0    50   ~ 0
-SW_FAST
+BTN0
 Text Label 6300 2650 0    50   ~ 0
-SW_RIT
+BTN1
 Text Label 6300 2750 0    50   ~ 0
-SW_MENU
-Text Label 5850 4150 0    50   ~ 0
-D2
+BTN2
 Text Label 5850 4250 0    50   ~ 0
 D3_PWM
-Text Label 5850 4350 0    50   ~ 0
-D4
-Text Label 5850 4450 0    50   ~ 0
-D5_PWM
-Text Label 5850 4550 0    50   ~ 0
-D6_PWM
-Text Label 5850 4650 0    50   ~ 0
-D7
-Text Label 5850 2250 0    50   ~ 0
-D8
-Text Label 5850 2350 0    50   ~ 0
-D9_PWM
-Text Label 5850 2450 0    50   ~ 0
-D10_PWM
 Wire Wire Line
 	5850 2550 6750 2550
 Wire Wire Line
 	5850 2650 6750 2650
 Wire Wire Line
 	5850 2750 6750 2750
-Text Label 5850 2550 0    50   ~ 0
-D11_PWM
-Text Label 5850 2650 0    50   ~ 0
-D12
-Text Label 5850 2750 0    50   ~ 0
-D13
 $Comp
 L mpb:CSTNE16M0V530000R0 Y?
 U 1 1 5EF516F7
@@ -726,14 +543,6 @@ Wire Wire Line
 	7350 2950 7400 2950
 Wire Wire Line
 	7050 2750 7400 2750
-Text Label 5850 3150 0    50   ~ 0
-A0
-Text Label 5850 3250 0    50   ~ 0
-A1
-Text Label 5850 3350 0    50   ~ 0
-A2
-Text Label 5850 3450 0    50   ~ 0
-A3
 Text Notes 5850 3550 0    50   ~ 0
 A4
 Text Notes 5850 3650 0    50   ~ 0
@@ -746,16 +555,6 @@ Wire Wire Line
 	6000 3350 5850 3350
 Wire Wire Line
 	6000 3450 5850 3450
-Wire Notes Line
-	8100 3950 8850 3950
-Wire Notes Line
-	8850 3950 8850 4300
-Wire Notes Line
-	8850 4300 8100 4300
-Wire Notes Line
-	8100 4300 8100 3950
-Wire Wire Line
-	8850 4250 5850 4250
 Wire Wire Line
 	5850 4350 6200 4350
 Wire Wire Line
@@ -815,27 +614,320 @@ Text HLabel 6750 2250 2    50   Output ~ 0
 SEQ0n
 Text HLabel 6200 4150 2    50   Output ~ 0
 MUTE_SPKR
-Text Label 5850 3950 0    50   ~ 0
-D0
-Text Label 5850 4050 0    50   ~ 0
-D1
-Text Notes 6000 3950 0    50   ~ 0
+Text Notes 6350 3950 0    50   ~ 0
 RXD
-Text Notes 6000 4050 0    50   ~ 0
+Text Notes 6350 4050 0    50   ~ 0
 TXD
 Wire Wire Line
 	6200 4150 5850 4150
 $Comp
-L Connector_Generic:Conn_01x04 J?
+L Connector_Generic:Conn_01x12 J?
 U 1 1 5E523241
-P 900 2250
-F 0 "J?" H 818 1825 50  0000 C CNN
-F 1 "BUTTONS" H 818 1916 50  0000 C CNN
-F 2 "Connector_PinHeader_2.54mm:PinHeader_1x04_P2.54mm_Vertical" H 900 2250 50  0001 C CNN
-F 3 "~" H 900 2250 50  0001 C CNN
-F 4 "Adafruit 292" H 900 2250 50  0001 C CNN "MPN"
-F 5 "1" H 900 2250 50  0001 C CNN "Need_order"
-	1    900  2250
+P 900 3500
+F 0 "J?" H 979 3400 50  0000 L CNN
+F 1 "UI" H 979 3491 50  0000 L CNN
+F 2 "Connector_PinHeader_2.54mm:PinHeader_1x12_P2.54mm_Horizontal" H 900 3500 50  0001 C CNN
+F 3 "~" H 900 3500 50  0001 C CNN
+F 4 "1" H 900 3500 50  0001 C CNN "Need_order"
+F 5 " Adafruit 292 and PEC12R-4022F-S0024" H 900 3500 50  0001 C CNN "MPN"
+	1    900  3500
 	-1   0    0    1   
 $EndComp
+$Comp
+L power:+3.3V #PWR?
+U 1 1 5E5452EA
+P 1100 2900
+F 0 "#PWR?" H 1100 2750 50  0001 C CNN
+F 1 "+3.3V" H 1115 3073 50  0000 C CNN
+F 2 "" H 1100 2900 50  0001 C CNN
+F 3 "" H 1100 2900 50  0001 C CNN
+	1    1100 2900
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR?
+U 1 1 5E566926
+P 2150 3400
+F 0 "#PWR?" H 2150 3150 50  0001 C CNN
+F 1 "GND" H 2155 3227 50  0000 C CNN
+F 2 "" H 2150 3400 50  0001 C CNN
+F 3 "" H 2150 3400 50  0001 C CNN
+	1    2150 3400
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	1100 3800 1700 3800
+Wire Wire Line
+	1800 3200 1750 3200
+Connection ~ 1750 3200
+Wire Wire Line
+	1750 3200 1700 3200
+Wire Wire Line
+	1100 3700 1800 3700
+Wire Wire Line
+	1700 3500 1700 3800
+Connection ~ 1700 3800
+Wire Wire Line
+	1700 3800 1800 3800
+Wire Wire Line
+	1800 3500 1800 3700
+Connection ~ 1800 3700
+$Comp
+L power:GND #PWR?
+U 1 1 5EF27A04
+P 2150 4100
+F 0 "#PWR?" H 2150 3850 50  0001 C CNN
+F 1 "GND" H 2155 3927 50  0000 C CNN
+F 2 "" H 2150 4100 50  0001 C CNN
+F 3 "" H 2150 4100 50  0001 C CNN
+	1    2150 4100
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C?
+U 1 1 5EF32F46
+P 2150 3950
+F 0 "C?" H 2265 3996 50  0000 L CNN
+F 1 "10nF" H 2265 3905 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 2188 3800 50  0001 C CNN
+F 3 "~" H 2150 3950 50  0001 C CNN
+F 4 "VJ0805A103KXJTBC" H 2150 3950 50  0001 C CNN "MPN"
+F 5 "1" H 2150 3950 50  0001 C CNN "Need_order"
+	1    2150 3950
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2100 3700 2150 3700
+Wire Wire Line
+	2100 3800 2150 3800
+Connection ~ 2150 3700
+Wire Wire Line
+	2150 3700 2500 3700
+Connection ~ 2150 3800
+Wire Wire Line
+	2150 3800 2500 3800
+Text HLabel 4650 2550 0    50   Input ~ 0
+S_METER
+Text Label 1100 3100 0    50   ~ 0
+BTN1
+Text Label 1100 3200 0    50   ~ 0
+BTN2
+Text Label 1100 3300 0    50   ~ 0
+BTN3
+Wire Wire Line
+	5850 3950 6000 3950
+Wire Wire Line
+	5850 4050 6000 4050
+Text Label 6000 3250 0    50   ~ 0
+BTN3
+Text Notes 5850 3250 0    50   ~ 0
+A1
+Text Notes 5850 3450 0    50   ~ 0
+A3
+Text Notes 5850 3950 0    50   ~ 0
+D0
+Text Notes 5850 4050 0    50   ~ 0
+D1
+Text Notes 5850 4150 0    50   ~ 0
+D2
+Text Notes 5850 4350 0    50   ~ 0
+D4
+Text Notes 5850 4450 0    50   ~ 0
+D5_PWM
+Text Notes 5850 4650 0    50   ~ 0
+D7
+Text Label 5850 4550 0    50   ~ 0
+D6_PWM
+Text Label 5850 2850 0    50   ~ 0
+XTAL1
+Text Label 5850 2950 0    50   ~ 0
+XTAL2
+Text Notes 5850 2750 0    50   ~ 0
+D13
+Text Notes 5850 2650 0    50   ~ 0
+D12
+Text Notes 5850 2550 0    50   ~ 0
+D11_PWM
+Text Notes 5850 2450 0    50   ~ 0
+D10_PWM
+Text Notes 5850 2350 0    50   ~ 0
+D9_PWM
+Text Notes 5850 2250 0    50   ~ 0
+D8
+Text Notes 6400 2100 0    50   ~ 0
+Sequence:\nSEQ0: Baseband + Anglian\nSEQ1: External PA\nSEQ2: External Relay + Transverter
+Wire Wire Line
+	1500 7000 1750 7000
+Wire Wire Line
+	1500 6900 1750 6900
+Wire Wire Line
+	2050 6900 2050 6950
+Wire Wire Line
+	2050 6950 2100 6950
+Connection ~ 2050 6950
+Wire Wire Line
+	2050 6950 2050 7000
+Text Label 4650 2450 2    50   ~ 0
+CW_INPUT
+Text HLabel 6000 3450 2    50   Output ~ 0
+CW_KEYn
+Text Label 5850 3350 0    50   ~ 0
+A2
+Text Label 5850 3150 0    50   ~ 0
+A0
+$Comp
+L Device:Ferrite_Bead FB?
+U 1 1 5E5709C5
+P 4450 1900
+F 0 "FB?" V 4176 1900 50  0000 C CNN
+F 1 "BLM18BB221SN1D" V 4267 1900 50  0000 C CNN
+F 2 "Inductor_SMD:L_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 4380 1900 50  0001 C CNN
+F 3 "~" H 4450 1900 50  0001 C CNN
+F 4 "BLM18BB221SN1D" V 4450 1900 50  0001 C CNN "MPN"
+F 5 "0" V 4450 1900 50  0001 C CNN "Need_order"
+	1    4450 1900
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	4650 1900 4600 1900
+Connection ~ 4650 1900
+Wire Wire Line
+	4300 1900 4050 1900
+$Comp
+L Device:C_Small C?
+U 1 1 5E5A72B6
+P 8850 4400
+AR Path="/5E3088F9/5E5A72B6" Ref="C?"  Part="1" 
+AR Path="/5E2FA006/5E5A72B6" Ref="C?"  Part="1" 
+F 0 "C?" H 8942 4446 50  0000 L CNN
+F 1 "0.1uF" H 8942 4355 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 8850 4400 50  0001 C CNN
+F 3 "~" H 8850 4400 50  0001 C CNN
+F 4 "GRM188R71H104KA93D" H 8850 4400 50  0001 C CNN "MPN"
+F 5 "0" H 8850 4400 50  0001 C CNN "Need_order"
+	1    8850 4400
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:R R?
+U 1 1 5E5A9B8E
+P 8650 4250
+F 0 "R?" V 8443 4250 50  0000 C CNN
+F 1 "1k" V 8534 4250 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 8580 4250 50  0001 C CNN
+F 3 "~" H 8650 4250 50  0001 C CNN
+F 4 "0" H 8650 4250 50  0001 C CNN "Need_order"
+	1    8650 4250
+	0    1    1    0   
+$EndComp
+$Comp
+L Device:C_Small C?
+U 1 1 5E5A9B9A
+P 8450 4400
+AR Path="/5E3088F9/5E5A9B9A" Ref="C?"  Part="1" 
+AR Path="/5E2FA006/5E5A9B9A" Ref="C?"  Part="1" 
+F 0 "C?" H 8542 4446 50  0000 L CNN
+F 1 "0.1uF" H 8542 4355 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 8450 4400 50  0001 C CNN
+F 3 "~" H 8450 4400 50  0001 C CNN
+F 4 "GRM188R71H104KA93D" H 8450 4400 50  0001 C CNN "MPN"
+F 5 "0" H 8450 4400 50  0001 C CNN "Need_order"
+	1    8450 4400
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C_Small C?
+U 1 1 5E5AF42D
+P 9250 4400
+AR Path="/5E3088F9/5E5AF42D" Ref="C?"  Part="1" 
+AR Path="/5E2FA006/5E5AF42D" Ref="C?"  Part="1" 
+F 0 "C?" H 9342 4446 50  0000 L CNN
+F 1 "0.1uF" H 9342 4355 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 9250 4400 50  0001 C CNN
+F 3 "~" H 9250 4400 50  0001 C CNN
+F 4 "GRM188R71H104KA93D" H 9250 4400 50  0001 C CNN "MPN"
+F 5 "0" H 9250 4400 50  0001 C CNN "Need_order"
+	1    9250 4400
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:R R?
+U 1 1 5E5AF438
+P 9050 4250
+F 0 "R?" V 8843 4250 50  0000 C CNN
+F 1 "1k" V 8934 4250 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 8980 4250 50  0001 C CNN
+F 3 "~" H 9050 4250 50  0001 C CNN
+F 4 "0" H 9050 4250 50  0001 C CNN "Need_order"
+	1    9050 4250
+	0    1    1    0   
+$EndComp
+$Comp
+L Device:C_Small C?
+U 1 1 5E5B4333
+P 9400 4250
+AR Path="/5E3088F9/5E5B4333" Ref="C?"  Part="1" 
+AR Path="/5E2FA006/5E5B4333" Ref="C?"  Part="1" 
+F 0 "C?" V 9629 4250 50  0000 C CNN
+F 1 "0.1uF" V 9538 4250 50  0000 C CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 9400 4250 50  0001 C CNN
+F 3 "~" H 9400 4250 50  0001 C CNN
+F 4 "GRM188R71H104KA93D" H 9400 4250 50  0001 C CNN "MPN"
+F 5 "0" H 9400 4250 50  0001 C CNN "Need_order"
+	1    9400 4250
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	8100 4250 5850 4250
+$Comp
+L Device:R R?
+U 1 1 5E58E428
+P 8250 4250
+F 0 "R?" V 8043 4250 50  0000 C CNN
+F 1 "10k" V 8134 4250 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 8180 4250 50  0001 C CNN
+F 3 "~" H 8250 4250 50  0001 C CNN
+F 4 "0" H 8250 4250 50  0001 C CNN "Need_order"
+	1    8250 4250
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	8400 4250 8450 4250
+Wire Wire Line
+	8450 4250 8450 4300
+Wire Wire Line
+	8450 4250 8500 4250
+Connection ~ 8450 4250
+Wire Wire Line
+	8800 4250 8850 4250
+Wire Wire Line
+	8850 4300 8850 4250
+Connection ~ 8850 4250
+Wire Wire Line
+	8850 4250 8900 4250
+Wire Wire Line
+	9200 4250 9250 4250
+Wire Wire Line
+	9250 4300 9250 4250
+Connection ~ 9250 4250
+Wire Wire Line
+	9250 4250 9300 4250
+Wire Wire Line
+	8450 4500 8850 4500
+Connection ~ 8850 4500
+Wire Wire Line
+	8850 4500 9250 4500
+$Comp
+L power:GND #PWR?
+U 1 1 5E5CEBAE
+P 8850 4500
+F 0 "#PWR?" H 8850 4250 50  0001 C CNN
+F 1 "GND" H 8855 4327 50  0000 C CNN
+F 2 "" H 8850 4500 50  0001 C CNN
+F 3 "" H 8850 4500 50  0001 C CNN
+	1    8850 4500
+	1    0    0    -1  
+$EndComp
+Text Notes 8200 3950 0    50   ~ 0
+Low pass filter for CW sidetone
 $EndSCHEMATC
diff --git a/kicad/picardy.sch b/kicad/picardy.sch
index b32d863..d0869c0 100644
--- a/kicad/picardy.sch
+++ b/kicad/picardy.sch
@@ -5,7 +5,7 @@ $Descr A4 11693 8268
 encoding utf-8
 Sheet 1 6
 Title "Picardy Anglian Mashup"
-Date ""
+Date "2020-02-24"
 Rev ""
 Comp "HB9EGM"
 Comment1 ""
@@ -26,58 +26,36 @@ F6 "LCD_5V" I L 3450 1750 50
 F7 "MIC" O R 4700 2300 50 
 F8 "MIC_8V" I L 3450 2250 50 
 F9 "MUTE_SPKR" O R 4700 2200 50 
+F10 "S_METER" I L 3450 2400 50 
 $EndSheet
 $Sheet
-S 4100 4300 1650 1050
+S 4100 4300 1650 1350
 U 5E3088F9
 F0 "Baseband" 50
 F1 "baseband.sch" 50
-F2 "LO1" I L 4100 4700 50 
-F3 "HF_RX" I L 4100 4850 50 
-F4 "MIC" I L 4100 5100 50 
-F5 "MUTE_SPKR" I L 4100 4950 50 
+F2 "LO1" I L 4100 5300 50 
+F3 "HF_RX" I L 4100 5500 50 
+F4 "MIC" I L 4100 5150 50 
+F5 "MUTE_SPKR" I L 4100 5050 50 
 F6 "+8V_RX" I L 4100 4550 50 
 F7 "+8V_TX" I L 4100 4450 50 
 F8 "SWITCH_RELAYn" I L 4100 4350 50 
 F9 "HF_TX" O R 5750 4750 50 
 F10 "SPKR" O R 5750 5100 50 
 F11 "METER" O R 5750 5200 50 
+F12 "CW_TONE" I L 4100 4800 50 
+F13 "BFO" I L 4100 5400 50 
+F14 "CW_KEYn" I L 4100 4950 50 
 $EndSheet
-$Comp
-L Connector:Conn_Coaxial J?
-U 1 1 5E4D239A
-P 3100 4850
-AR Path="/5E3088F9/5E4D239A" Ref="J?"  Part="1" 
-AR Path="/5E4D239A" Ref="J?"  Part="1" 
-F 0 "J?" H 3028 5088 50  0000 C CNN
-F 1 "HF_RX" H 3028 4997 50  0000 C CNN
-F 2 "Connector_Coaxial:SMA_Amphenol_132289_EdgeMount" H 3100 4850 50  0001 C CNN
-F 3 " ~" H 3100 4850 50  0001 C CNN
-	1    3100 4850
-	-1   0    0    -1  
-$EndComp
-$Comp
-L power:GNDA #PWR?
-U 1 1 5E4D23A0
-P 3100 5050
-AR Path="/5E3088F9/5E4D23A0" Ref="#PWR?"  Part="1" 
-AR Path="/5E4D23A0" Ref="#PWR?"  Part="1" 
-F 0 "#PWR?" H 3100 4800 50  0001 C CNN
-F 1 "GNDA" H 3105 4877 50  0000 C CNN
-F 2 "" H 3100 5050 50  0001 C CNN
-F 3 "" H 3100 5050 50  0001 C CNN
-	1    3100 5050
-	1    0    0    -1  
-$EndComp
 $Sheet
 S 1350 3250 1450 950 
 U 5E4D247A
 F0 "Clock" 50
 F1 "clock.sch" 50
-F2 "LO1" O R 2800 3450 50 
+F2 "LO1" O R 2800 4000 50 
 F3 "REF_25MHz" I L 1350 3450 50 
-F4 "LO_VHF" O R 2800 3600 50 
-F5 "CLK_AUX" O R 2800 3750 50 
+F4 "LO_VHF" O R 2800 3850 50 
+F5 "BFO" O R 2800 4100 50 
 $EndSheet
 $Comp
 L Connector_Generic:Conn_01x02 J?
@@ -144,27 +122,27 @@ Text Notes 6300 5800 0    50   ~ 0
 $Comp
 L Connector:Conn_Coaxial J?
 U 1 1 5E54529A
-P 6100 4800
+P 6650 4650
 AR Path="/5E3088F9/5E54529A" Ref="J?"  Part="1" 
 AR Path="/5E54529A" Ref="J?"  Part="1" 
-F 0 "J?" H 6200 4775 50  0000 L CNN
-F 1 "HF_TX" H 6200 4684 50  0000 L CNN
-F 2 "Connector_Coaxial:SMA_Amphenol_132289_EdgeMount" H 6100 4800 50  0001 C CNN
-F 3 " ~" H 6100 4800 50  0001 C CNN
-	1    6100 4800
+F 0 "J?" H 6750 4625 50  0000 L CNN
+F 1 "HF_TX" H 6750 4534 50  0000 L CNN
+F 2 "Connector_Coaxial:SMA_Amphenol_132289_EdgeMount" H 6650 4650 50  0001 C CNN
+F 3 " ~" H 6650 4650 50  0001 C CNN
+	1    6650 4650
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GNDA #PWR?
 U 1 1 5E5452A0
-P 6100 5000
+P 6650 4850
 AR Path="/5E3088F9/5E5452A0" Ref="#PWR?"  Part="1" 
 AR Path="/5E5452A0" Ref="#PWR?"  Part="1" 
-F 0 "#PWR?" H 6100 4750 50  0001 C CNN
-F 1 "GNDA" H 6105 4827 50  0000 C CNN
-F 2 "" H 6100 5000 50  0001 C CNN
-F 3 "" H 6100 5000 50  0001 C CNN
-	1    6100 5000
+F 0 "#PWR?" H 6650 4600 50  0001 C CNN
+F 1 "GNDA" H 6655 4677 50  0000 C CNN
+F 2 "" H 6650 4850 50  0001 C CNN
+F 3 "" H 6650 4850 50  0001 C CNN
+	1    6650 4850
 	-1   0    0    -1  
 $EndComp
 Wire Wire Line
@@ -174,13 +152,7 @@ Wire Wire Line
 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
+	5750 5100 6700 5100
 Text GLabel 2650 2350 2    50   Input ~ 0
 +8V
 $Comp
@@ -255,15 +227,11 @@ Needs +5VA
 Text Notes 4700 4500 0    50   ~ 0
 Needs +8V and +3.3V
 Wire Wire Line
-	4100 4700 3550 4700
-Wire Wire Line
-	2800 3450 3550 3450
-Wire Wire Line
-	3550 3450 3550 4700
+	2800 4000 3300 4000
 Wire Wire Line
-	2800 3600 7150 3600
+	2800 3850 7150 3850
 Wire Wire Line
-	7150 3600 7150 4950
+	7150 3850 7150 4950
 Wire Wire Line
 	7150 4950 7850 4950
 Text Notes 1700 3350 0    50   ~ 0
@@ -275,18 +243,11 @@ Needs +3V3
 Text Label 8950 4800 0    50   ~ 0
 HF_RX
 Wire Wire Line
-	5750 4750 5900 4750
+	5750 4750 6450 4750
 Wire Wire Line
-	5900 4750 5900 4800
-Wire Wire Line
-	5900 4750 5900 4650
-Wire Wire Line
-	5900 4650 6450 4650
-Wire Wire Line
-	6450 4650 6450 5050
+	6450 4750 6450 4650
 Wire Wire Line
 	6450 5050 7850 5050
-Connection ~ 5900 4750
 $Comp
 L Connector:Conn_Coaxial J?
 U 1 1 5E9CD1AA
@@ -381,28 +342,28 @@ Text GLabel 4100 4550 0    50   Input ~ 0
 Wire Wire Line
 	4700 1700 4950 1700
 Wire Wire Line
-	4950 1700 4950 2800
+	4950 1700 4950 3000
 Wire Wire Line
-	4950 2800 4050 2800
+	4950 3000 4050 3000
 Wire Wire Line
 	4050 4350 4100 4350
 Wire Wire Line
 	1400 2050 1250 2050
 Wire Wire Line
-	1250 2050 1250 2800
+	1250 2050 1250 3000
 Wire Wire Line
-	1250 2800 4050 2800
-Connection ~ 4050 2800
+	1250 3000 4050 3000
+Connection ~ 4050 3000
 Wire Wire Line
-	4050 2800 4050 4350
+	4050 3000 4050 4350
 Wire Wire Line
-	4700 1900 4850 1900
+	4700 1900 4900 1900
 Wire Wire Line
-	4850 1900 4850 2750
+	4900 1900 4900 2950
 Wire Wire Line
-	4850 2750 1300 2750
+	4900 2950 1300 2950
 Wire Wire Line
-	1300 2750 1300 2150
+	1300 2950 1300 2150
 Wire Wire Line
 	1300 2150 1400 2150
 $Comp
@@ -431,13 +392,11 @@ Wire Wire Line
 Wire Wire Line
 	4750 2300 4750 2650
 Wire Wire Line
-	4750 2650 3650 2650
-Wire Wire Line
-	3650 2650 3650 5100
+	4750 2650 3600 2650
 Wire Wire Line
-	3650 5100 4100 5100
+	3600 2650 3600 5150
 Wire Wire Line
-	3300 4850 3550 4850
+	3600 5150 4100 5150
 Wire Wire Line
 	8950 4800 9100 4800
 Wire Wire Line
@@ -445,10 +404,9 @@ Wire Wire Line
 Wire Wire Line
 	9100 6350 3550 6350
 Wire Wire Line
-	3550 6350 3550 4850
-Connection ~ 3550 4850
+	3550 6350 3550 5750
 Wire Wire Line
-	3550 4850 4100 4850
+	3550 5500 4100 5500
 Text Label 9150 5050 0    50   ~ 0
 VHF_TX
 Text Label 7500 4800 0    50   ~ 0
@@ -462,11 +420,11 @@ Wire Wire Line
 Wire Wire Line
 	4800 2200 4800 2700
 Wire Wire Line
-	4800 2700 3700 2700
+	4800 2700 3650 2700
 Wire Wire Line
-	3700 2700 3700 4950
+	3650 2700 3650 5050
 Wire Wire Line
-	3700 4950 4100 4950
+	3650 5050 4100 5050
 $Comp
 L power:+5VA #PWR?
 U 1 1 5EFD915C
@@ -534,4 +492,79 @@ Wire Wire Line
 Wire Wire Line
 	1150 1550 1400 1550
 Connection ~ 1150 1550
+Wire Wire Line
+	5850 5200 5850 4200
+Wire Wire Line
+	5850 4200 3350 4200
+Wire Wire Line
+	3350 4200 3350 2400
+Wire Wire Line
+	3350 2400 3450 2400
+Connection ~ 5850 5200
+Wire Wire Line
+	2800 4100 3250 4100
+Wire Wire Line
+	3300 5300 4100 5300
+Wire Wire Line
+	3300 4000 3300 5300
+Wire Wire Line
+	3250 5400 4100 5400
+Wire Wire Line
+	3250 4100 3250 5400
+Wire Wire Line
+	4100 4800 3750 4800
+Wire Wire Line
+	3750 4800 3750 3150
+Wire Wire Line
+	3750 3150 5100 3150
+Wire Wire Line
+	5100 3150 5100 1450
+Wire Wire Line
+	5100 1450 4700 1450
+Connection ~ 6450 4750
+Wire Wire Line
+	6450 4750 6450 5050
+Wire Wire Line
+	6700 5100 6700 5550
+$Comp
+L power:GNDA #PWR?
+U 1 1 5E4D23A0
+P 3200 5950
+AR Path="/5E3088F9/5E4D23A0" Ref="#PWR?"  Part="1" 
+AR Path="/5E4D23A0" Ref="#PWR?"  Part="1" 
+F 0 "#PWR?" H 3200 5700 50  0001 C CNN
+F 1 "GNDA" H 3205 5777 50  0000 C CNN
+F 2 "" H 3200 5950 50  0001 C CNN
+F 3 "" H 3200 5950 50  0001 C CNN
+	1    3200 5950
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector:Conn_Coaxial J?
+U 1 1 5E4D239A
+P 3200 5750
+AR Path="/5E3088F9/5E4D239A" Ref="J?"  Part="1" 
+AR Path="/5E4D239A" Ref="J?"  Part="1" 
+F 0 "J?" H 3128 5988 50  0000 C CNN
+F 1 "HF_RX" H 3128 5897 50  0000 C CNN
+F 2 "Connector_Coaxial:SMA_Amphenol_132289_EdgeMount" H 3200 5750 50  0001 C CNN
+F 3 " ~" H 3200 5750 50  0001 C CNN
+	1    3200 5750
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	3400 5750 3550 5750
+Connection ~ 3550 5750
+Wire Wire Line
+	3550 5750 3550 5500
+Wire Wire Line
+	4100 4950 3700 4950
+Wire Wire Line
+	3700 4950 3700 2750
+Wire Wire Line
+	3700 2750 4850 2750
+Wire Wire Line
+	4850 2750 4850 2100
+Text Notes 650  7650 0    50   ~ 0
+This project is inspired by F6FEO's Picardy, G4DDK's Anglian 3L, the uBitx, the KN-Q7, and LimeRFE
 $EndSCHEMATC
diff --git a/kicad/power.sch b/kicad/power.sch
index 22cf79b..cdc6fdf 100644
--- a/kicad/power.sch
+++ b/kicad/power.sch
@@ -5,7 +5,7 @@ $Descr A4 11693 8268
 encoding utf-8
 Sheet 6 6
 Title "Picardy Anglian Mashup"
-Date "2019-10-18"
+Date "2020-02-24"
 Rev ""
 Comp "HB9EGM"
 Comment1 ""
@@ -143,10 +143,10 @@ L Device:C C?
 U 1 1 5D86AC8A
 P 3950 2200
 F 0 "C?" V 3698 2200 50  0000 C CNN
-F 1 "100nF" V 3789 2200 50  0000 C CNN
+F 1 "0.1uF" V 3789 2200 50  0000 C CNN
 F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 3988 2050 50  0001 C CNN
 F 3 "~" H 3950 2200 50  0001 C CNN
-F 4 "stash" H 3950 2200 50  0001 C CNN "MPN"
+F 4 "GRM188R71H104KA93D" H 3950 2200 50  0001 C CNN "MPN"
 F 5 "0" H 3950 2200 50  0001 C CNN "Need_order"
 	1    3950 2200
 	0    1    1    0   
@@ -161,10 +161,10 @@ L Device:C C?
 U 1 1 5D86AC99
 P 3750 2900
 F 0 "C?" H 3635 2854 50  0000 R CNN
-F 1 "100nF" H 3635 2945 50  0000 R CNN
+F 1 "0.1uF" H 3635 2945 50  0000 R CNN
 F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 3788 2750 50  0001 C CNN
 F 3 "~" H 3750 2900 50  0001 C CNN
-F 4 "stash" H 3750 2900 50  0001 C CNN "MPN"
+F 4 "GRM188R71H104KA93D" H 3750 2900 50  0001 C CNN "MPN"
 F 5 "0" H 3750 2900 50  0001 C CNN "Need_order"
 	1    3750 2900
 	-1   0    0    1