All component values set (TODO change transistor gain stages to match values from experimentation

pcb/discrete/discrete-rf-board/dac.sch

@@ -20,7 +20,7 @@ U 1 1 5D9928CB
 P 3550 2700
 AR Path="/5CA6B0B3/5D83265A/5D9928CB" Ref="R49"  Part="1" 
 AR Path="/5CA6B0B3/5D9A8CAE/5D9928CB" Ref="R59"  Part="1" 
-F 0 "R49" H 3580 2720 50  0000 L CNN
+F 0 "R59" H 3580 2720 50  0000 L CNN
 F 1 "2kR" H 3580 2660 50  0000 L CNN
 F 2 "" H 3550 2700 50  0001 C CNN
 F 3 "~" H 3550 2700 50  0001 C CNN
@@ -33,7 +33,7 @@ U 1 1 5D992BF1
 P 3550 3000
 AR Path="/5CA6B0B3/5D83265A/5D992BF1" Ref="R50"  Part="1" 
 AR Path="/5CA6B0B3/5D9A8CAE/5D992BF1" Ref="R60"  Part="1" 
-F 0 "R50" H 3580 3020 50  0000 L CNN
+F 0 "R60" H 3580 3020 50  0000 L CNN
 F 1 "7.5kR 1%" H 3580 2960 50  0000 L CNN
 F 2 "" H 3550 3000 50  0001 C CNN
 F 3 "~" H 3550 3000 50  0001 C CNN
@@ -46,7 +46,7 @@ U 1 1 5D9933B9
 P 3550 3300
 AR Path="/5CA6B0B3/5D83265A/5D9933B9" Ref="R51"  Part="1" 
 AR Path="/5CA6B0B3/5D9A8CAE/5D9933B9" Ref="R61"  Part="1" 
-F 0 "R51" H 3580 3320 50  0000 L CNN
+F 0 "R61" H 3580 3320 50  0000 L CNN
 F 1 "7.5kR 1%" H 3580 3260 50  0000 L CNN
 F 2 "" H 3550 3300 50  0001 C CNN
 F 3 "~" H 3550 3300 50  0001 C CNN
@@ -59,7 +59,7 @@ U 1 1 5D993558
 P 3550 3600
 AR Path="/5CA6B0B3/5D83265A/5D993558" Ref="R52"  Part="1" 
 AR Path="/5CA6B0B3/5D9A8CAE/5D993558" Ref="R62"  Part="1" 
-F 0 "R52" H 3580 3620 50  0000 L CNN
+F 0 "R62" H 3580 3620 50  0000 L CNN
 F 1 "7.5kR 1%" H 3580 3560 50  0000 L CNN
 F 2 "" H 3550 3600 50  0001 C CNN
 F 3 "~" H 3550 3600 50  0001 C CNN
@@ -72,7 +72,7 @@ U 1 1 5D993922
 P 3550 3900
 AR Path="/5CA6B0B3/5D83265A/5D993922" Ref="R53"  Part="1" 
 AR Path="/5CA6B0B3/5D9A8CAE/5D993922" Ref="R63"  Part="1" 
-F 0 "R53" H 3580 3920 50  0000 L CNN
+F 0 "R63" H 3580 3920 50  0000 L CNN
 F 1 "15kR 1%" H 3580 3860 50  0000 L CNN
 F 2 "" H 3550 3900 50  0001 C CNN
 F 3 "~" H 3550 3900 50  0001 C CNN
@@ -85,7 +85,7 @@ U 1 1 5D994F7A
 P 3350 2850
 AR Path="/5CA6B0B3/5D83265A/5D994F7A" Ref="R45"  Part="1" 
 AR Path="/5CA6B0B3/5D9A8CAE/5D994F7A" Ref="R55"  Part="1" 
-F 0 "R45" V 3450 2800 50  0000 L CNN
+F 0 "R55" V 3450 2800 50  0000 L CNN
 F 1 "15kR 1%" V 3550 2750 50  0000 L CNN
 F 2 "" H 3350 2850 50  0001 C CNN
 F 3 "~" H 3350 2850 50  0001 C CNN
@@ -98,7 +98,7 @@ U 1 1 5D996451
 P 3350 3150
 AR Path="/5CA6B0B3/5D83265A/5D996451" Ref="R46"  Part="1" 
 AR Path="/5CA6B0B3/5D9A8CAE/5D996451" Ref="R56"  Part="1" 
-F 0 "R46" V 3450 3100 50  0000 L CNN
+F 0 "R56" V 3450 3100 50  0000 L CNN
 F 1 "15kR 1%" V 3550 3050 50  0000 L CNN
 F 2 "" H 3350 3150 50  0001 C CNN
 F 3 "~" H 3350 3150 50  0001 C CNN
@@ -111,7 +111,7 @@ U 1 1 5D99666E
 P 3350 3450
 AR Path="/5CA6B0B3/5D83265A/5D99666E" Ref="R47"  Part="1" 
 AR Path="/5CA6B0B3/5D9A8CAE/5D99666E" Ref="R57"  Part="1" 
-F 0 "R47" V 3450 3400 50  0000 L CNN
+F 0 "R57" V 3450 3400 50  0000 L CNN
 F 1 "15kR 1%" V 3550 3350 50  0000 L CNN
 F 2 "" H 3350 3450 50  0001 C CNN
 F 3 "~" H 3350 3450 50  0001 C CNN
@@ -124,7 +124,7 @@ U 1 1 5D99690F
 P 3350 3750
 AR Path="/5CA6B0B3/5D83265A/5D99690F" Ref="R48"  Part="1" 
 AR Path="/5CA6B0B3/5D9A8CAE/5D99690F" Ref="R58"  Part="1" 
-F 0 "R48" V 3450 3700 50  0000 L CNN
+F 0 "R58" V 3450 3700 50  0000 L CNN
 F 1 "15kR 1%" V 3550 3650 50  0000 L CNN
 F 2 "" H 3350 3750 50  0001 C CNN
 F 3 "~" H 3350 3750 50  0001 C CNN
@@ -167,7 +167,7 @@ U 1 1 5D998D16
 P 4100 2850
 AR Path="/5CA6B0B3/5D83265A/5D998D16" Ref="Q20"  Part="1" 
 AR Path="/5CA6B0B3/5D9A8CAE/5D998D16" Ref="Q21"  Part="1" 
-F 0 "Q20" H 4300 2900 50  0000 L CNN
+F 0 "Q21" H 4300 2900 50  0000 L CNN
 F 1 "Q_NPN_BCE" H 4300 2800 50  0000 L CNN
 F 2 "" H 4300 2950 50  0001 C CNN
 F 3 "~" H 4100 2850 50  0001 C CNN
@@ -192,7 +192,7 @@ U 1 1 5D99E2FA
 P 4200 3300
 AR Path="/5CA6B0B3/5D83265A/5D99E2FA" Ref="R54"  Part="1" 
 AR Path="/5CA6B0B3/5D9A8CAE/5D99E2FA" Ref="R64"  Part="1" 
-F 0 "R54" H 4230 3320 50  0000 L CNN
+F 0 "R64" H 4230 3320 50  0000 L CNN
 F 1 "470R" H 4230 3260 50  0000 L CNN
 F 2 "" H 4200 3300 50  0001 C CNN
 F 3 "~" H 4200 3300 50  0001 C CNN
@@ -239,7 +239,7 @@ U 1 1 5DC04556
 P 2950 2150
 AR Path="/5CA6B0B3/5D83265A/5DC04556" Ref="C74"  Part="1" 
 AR Path="/5CA6B0B3/5D9A8CAE/5DC04556" Ref="C82"  Part="1" 
-F 0 "C74" H 2960 2220 50  0000 L CNN
+F 0 "C82" H 2960 2220 50  0000 L CNN
 F 1 "1 uF" H 2960 2070 50  0000 L CNN
 F 2 "" H 2950 2150 50  0001 C CNN
 F 3 "~" H 2950 2150 50  0001 C CNN
@@ -252,7 +252,7 @@ U 1 1 5DC04C84
 P 2600 2150
 AR Path="/5CA6B0B3/5D83265A/5DC04C84" Ref="C73"  Part="1" 
 AR Path="/5CA6B0B3/5D9A8CAE/5DC04C84" Ref="C81"  Part="1" 
-F 0 "C73" H 2610 2220 50  0000 L CNN
+F 0 "C81" H 2610 2220 50  0000 L CNN
 F 1 "0.47 uF" H 2610 2070 50  0000 L CNN
 F 2 "" H 2600 2150 50  0001 C CNN
 F 3 "~" H 2600 2150 50  0001 C CNN
@@ -265,7 +265,7 @@ U 1 1 5DC04F33
 P 2200 2150
 AR Path="/5CA6B0B3/5D83265A/5DC04F33" Ref="C72"  Part="1" 
 AR Path="/5CA6B0B3/5D9A8CAE/5DC04F33" Ref="C80"  Part="1" 
-F 0 "C72" H 2210 2220 50  0000 L CNN
+F 0 "C80" H 2210 2220 50  0000 L CNN
 F 1 "0.1 uF" H 2210 2070 50  0000 L CNN
 F 2 "" H 2200 2150 50  0001 C CNN
 F 3 "~" H 2200 2150 50  0001 C CNN
@@ -278,7 +278,7 @@ U 1 1 5DC05279
 P 1800 2150
 AR Path="/5CA6B0B3/5D83265A/5DC05279" Ref="C71"  Part="1" 
 AR Path="/5CA6B0B3/5D9A8CAE/5DC05279" Ref="C79"  Part="1" 
-F 0 "C71" H 1810 2220 50  0000 L CNN
+F 0 "C79" H 1810 2220 50  0000 L CNN
 F 1 "10 nF" H 1810 2070 50  0000 L CNN
 F 2 "" H 1800 2150 50  0001 C CNN
 F 3 "~" H 1800 2150 50  0001 C CNN
@@ -336,7 +336,7 @@ U 1 1 5DC0F871
 P 4750 2150
 AR Path="/5CA6B0B3/5D83265A/5DC0F871" Ref="C75"  Part="1" 
 AR Path="/5CA6B0B3/5D9A8CAE/5DC0F871" Ref="C83"  Part="1" 
-F 0 "C75" H 4760 2220 50  0000 L CNN
+F 0 "C83" H 4760 2220 50  0000 L CNN
 F 1 "1 uF" H 4760 2070 50  0000 L CNN
 F 2 "" H 4750 2150 50  0001 C CNN
 F 3 "~" H 4750 2150 50  0001 C CNN
@@ -349,7 +349,7 @@ U 1 1 5DC0F877
 P 5100 2150
 AR Path="/5CA6B0B3/5D83265A/5DC0F877" Ref="C76"  Part="1" 
 AR Path="/5CA6B0B3/5D9A8CAE/5DC0F877" Ref="C84"  Part="1" 
-F 0 "C76" H 5110 2220 50  0000 L CNN
+F 0 "C84" H 5110 2220 50  0000 L CNN
 F 1 "0.47 uF" H 5110 2070 50  0000 L CNN
 F 2 "" H 5100 2150 50  0001 C CNN
 F 3 "~" H 5100 2150 50  0001 C CNN
@@ -362,7 +362,7 @@ U 1 1 5DC0F87D
 P 5500 2150
 AR Path="/5CA6B0B3/5D83265A/5DC0F87D" Ref="C77"  Part="1" 
 AR Path="/5CA6B0B3/5D9A8CAE/5DC0F87D" Ref="C85"  Part="1" 
-F 0 "C77" H 5510 2220 50  0000 L CNN
+F 0 "C85" H 5510 2220 50  0000 L CNN
 F 1 "0.1 uF" H 5510 2070 50  0000 L CNN
 F 2 "" H 5500 2150 50  0001 C CNN
 F 3 "~" H 5500 2150 50  0001 C CNN
@@ -375,7 +375,7 @@ U 1 1 5DC0F883
 P 5900 2150
 AR Path="/5CA6B0B3/5D83265A/5DC0F883" Ref="C78"  Part="1" 
 AR Path="/5CA6B0B3/5D9A8CAE/5DC0F883" Ref="C86"  Part="1" 
-F 0 "C78" H 5910 2220 50  0000 L CNN
+F 0 "C86" H 5910 2220 50  0000 L CNN
 F 1 "10 nF" H 5910 2070 50  0000 L CNN
 F 2 "" H 5900 2150 50  0001 C CNN
 F 3 "~" H 5900 2150 50  0001 C CNN

pcb/discrete/discrete-rf-board/diode_mixer.sch

@@ -4,7 +4,7 @@ EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 19 19
+Sheet 11 19
 Title ""
 Date ""
 Rev ""
@@ -20,7 +20,7 @@ U 1 1 5CC1E322
 P 5900 3600
 AR Path="/5CA6B0AA/5CC1CC09/5CC1E322" Ref="U22"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC1E322" Ref="U12"  Part="1" 
-F 0 "U22" H 5900 3900 50  0000 C CNN
+F 0 "U12" H 5900 3900 50  0000 C CNN
 F 1 "BAT15-099R" H 5900 3300 50  0000 C CNN
 F 2 "discrete_footprints:Infineon_SOT143" H 5900 3900 50  0001 C CNN
 F 3 "" H 5900 3900 50  0001 C CNN
@@ -34,7 +34,7 @@ U 1 1 5CC1F89D
 P 6500 3600
 AR Path="/5CA6B0AA/5CC1CC09/5CC1F89D" Ref="C205"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC1F89D" Ref="C136"  Part="1" 
-F 0 "C205" H 6510 3670 50  0000 L CNN
+F 0 "C136" H 6510 3670 50  0000 L CNN
 F 1 "1.1 pF" H 6510 3520 50  0000 L CNN
 F 2 "" H 6500 3600 50  0001 C CNN
 F 3 "~" H 6500 3600 50  0001 C CNN
@@ -47,7 +47,7 @@ U 1 1 5CC20238
 P 7100 3600
 AR Path="/5CA6B0AA/5CC1CC09/5CC20238" Ref="C206"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC20238" Ref="C137"  Part="1" 
-F 0 "C206" H 7110 3670 50  0000 L CNN
+F 0 "C137" H 7110 3670 50  0000 L CNN
 F 1 "2.5 pF" H 7110 3520 50  0000 L CNN
 F 2 "" H 7100 3600 50  0001 C CNN
 F 3 "~" H 7100 3600 50  0001 C CNN
@@ -60,7 +60,7 @@ U 1 1 5CC208EE
 P 6850 3750
 AR Path="/5CA6B0AA/5CC1CC09/5CC208EE" Ref="L39"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC208EE" Ref="L24"  Part="1" 
-F 0 "L39" H 6880 3790 50  0000 L CNN
+F 0 "L24" H 6880 3790 50  0000 L CNN
 F 1 "14 nH" H 6880 3710 50  0000 L CNN
 F 2 "" H 6850 3750 50  0001 C CNN
 F 3 "~" H 6850 3750 50  0001 C CNN
@@ -73,7 +73,7 @@ U 1 1 5CC2101C
 P 6850 3450
 AR Path="/5CA6B0AA/5CC1CC09/5CC2101C" Ref="L38"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC2101C" Ref="L23"  Part="1" 
-F 0 "L38" H 6880 3490 50  0000 L CNN
+F 0 "L23" H 6880 3490 50  0000 L CNN
 F 1 "14 nH" H 6880 3410 50  0000 L CNN
 F 2 "" H 6850 3450 50  0001 C CNN
 F 3 "~" H 6850 3450 50  0001 C CNN
@@ -106,7 +106,7 @@ U 1 1 5CC289D9
 P 8300 4100
 AR Path="/5CA6B0AA/5CC1CC09/5CC289D9" Ref="L40"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC289D9" Ref="L25"  Part="1" 
-F 0 "L40" H 8330 4140 50  0000 L CNN
+F 0 "L25" H 8330 4140 50  0000 L CNN
 F 1 "220 nH" H 8330 4060 50  0000 L CNN
 F 2 "" H 8300 4100 50  0001 C CNN
 F 3 "~" H 8300 4100 50  0001 C CNN
@@ -123,7 +123,7 @@ U 1 1 5CC29B4E
 P 8300 4450
 AR Path="/5CA6B0AA/5CC1CC09/5CC29B4E" Ref="R157"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC29B4E" Ref="R113"  Part="1" 
-F 0 "R157" H 8330 4470 50  0000 L CNN
+F 0 "R113" H 8330 4470 50  0000 L CNN
 F 1 "200R" H 8330 4410 50  0000 L CNN
 F 2 "" H 8300 4450 50  0001 C CNN
 F 3 "~" H 8300 4450 50  0001 C CNN
@@ -136,7 +136,7 @@ U 1 1 5CC29F9D
 P 8550 4300
 AR Path="/5CA6B0AA/5CC1CC09/5CC29F9D" Ref="R158"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC29F9D" Ref="R114"  Part="1" 
-F 0 "R158" H 8580 4320 50  0000 L CNN
+F 0 "R114" H 8580 4320 50  0000 L CNN
 F 1 "100R" H 8580 4260 50  0000 L CNN
 F 2 "" H 8550 4300 50  0001 C CNN
 F 3 "~" H 8550 4300 50  0001 C CNN
@@ -149,7 +149,7 @@ U 1 1 5CC2B0AC
 P 8750 4450
 AR Path="/5CA6B0AA/5CC1CC09/5CC2B0AC" Ref="C208"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC2B0AC" Ref="C139"  Part="1" 
-F 0 "C208" H 8760 4520 50  0000 L CNN
+F 0 "C139" H 8760 4520 50  0000 L CNN
 F 1 "47 pF" H 8760 4370 50  0000 L CNN
 F 2 "" H 8750 4450 50  0001 C CNN
 F 3 "~" H 8750 4450 50  0001 C CNN
@@ -173,7 +173,7 @@ U 1 1 5CC2FA5E
 P 2750 3950
 AR Path="/5CA6B0AA/5CC1CC09/5CC2FA5E" Ref="#PWR0257"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC2FA5E" Ref="#PWR0169"  Part="1" 
-F 0 "#PWR0257" H 2750 3700 50  0001 C CNN
+F 0 "#PWR0169" H 2750 3700 50  0001 C CNN
 F 1 "GND" H 2750 3800 50  0000 C CNN
 F 2 "" H 2750 3950 50  0001 C CNN
 F 3 "" H 2750 3950 50  0001 C CNN
@@ -186,7 +186,7 @@ U 1 1 5CC3011D
 P 9150 3950
 AR Path="/5CA6B0AA/5CC1CC09/5CC3011D" Ref="#PWR0258"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC3011D" Ref="#PWR0170"  Part="1" 
-F 0 "#PWR0258" H 9150 3700 50  0001 C CNN
+F 0 "#PWR0170" H 9150 3700 50  0001 C CNN
 F 1 "GND" H 9150 3800 50  0000 C CNN
 F 2 "" H 9150 3950 50  0001 C CNN
 F 3 "" H 9150 3950 50  0001 C CNN
@@ -199,7 +199,7 @@ U 1 1 5CC30B27
 P 2450 2900
 AR Path="/5CA6B0AA/5CC1CC09/5CC30B27" Ref="J30"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC30B27" Ref="J16"  Part="1" 
-F 0 "J30" H 2460 3020 50  0000 C CNN
+F 0 "J16" H 2460 3020 50  0000 C CNN
 F 1 "UFL" V 2565 2900 50  0000 C CNN
 F 2 "" H 2450 2900 50  0001 C CNN
 F 3 " ~" H 2450 2900 50  0001 C CNN
@@ -212,7 +212,7 @@ U 1 1 5CC31787
 P 9600 3000
 AR Path="/5CA6B0AA/5CC1CC09/5CC31787" Ref="J33"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC31787" Ref="J19"  Part="1" 
-F 0 "J33" H 9610 3120 50  0000 C CNN
+F 0 "J19" H 9610 3120 50  0000 C CNN
 F 1 "UFL" V 9715 3000 50  0000 C CNN
 F 2 "" H 9600 3000 50  0001 C CNN
 F 3 " ~" H 9600 3000 50  0001 C CNN
@@ -225,7 +225,7 @@ U 1 1 5CC33186
 P 9600 3250
 AR Path="/5CA6B0AA/5CC1CC09/5CC33186" Ref="#PWR0259"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC33186" Ref="#PWR0171"  Part="1" 
-F 0 "#PWR0259" H 9600 3000 50  0001 C CNN
+F 0 "#PWR0171" H 9600 3000 50  0001 C CNN
 F 1 "GND" H 9600 3100 50  0000 C CNN
 F 2 "" H 9600 3250 50  0001 C CNN
 F 3 "" H 9600 3250 50  0001 C CNN
@@ -238,7 +238,7 @@ U 1 1 5CC33A73
 P 2450 3200
 AR Path="/5CA6B0AA/5CC1CC09/5CC33A73" Ref="#PWR0256"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC33A73" Ref="#PWR0168"  Part="1" 
-F 0 "#PWR0256" H 2450 2950 50  0001 C CNN
+F 0 "#PWR0168" H 2450 2950 50  0001 C CNN
 F 1 "GND" H 2450 3050 50  0000 C CNN
 F 2 "" H 2450 3200 50  0001 C CNN
 F 3 "" H 2450 3200 50  0001 C CNN
@@ -289,7 +289,7 @@ U 1 1 5CC5AE0B
 P 8300 4750
 AR Path="/5CA6B0AA/5CC1CC09/5CC5AE0B" Ref="L41"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC5AE0B" Ref="L26"  Part="1" 
-F 0 "L41" H 8330 4790 50  0000 L CNN
+F 0 "L26" H 8330 4790 50  0000 L CNN
 F 1 "220 nH" H 8330 4710 50  0000 L CNN
 F 2 "" H 8300 4750 50  0001 C CNN
 F 3 "~" H 8300 4750 50  0001 C CNN
@@ -306,7 +306,7 @@ U 1 1 5CC5DD55
 P 8550 4600
 AR Path="/5CA6B0AA/5CC1CC09/5CC5DD55" Ref="R159"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC5DD55" Ref="R115"  Part="1" 
-F 0 "R159" H 8580 4620 50  0000 L CNN
+F 0 "R115" H 8580 4620 50  0000 L CNN
 F 1 "100R" H 8580 4560 50  0000 L CNN
 F 2 "" H 8550 4600 50  0001 C CNN
 F 3 "~" H 8550 4600 50  0001 C CNN
@@ -343,7 +343,7 @@ U 1 1 5CC22010
 P 5000 3750
 AR Path="/5CA6B0AA/5CC1CC09/5CC22010" Ref="L37"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC22010" Ref="L22"  Part="1" 
-F 0 "L37" H 5030 3790 50  0000 L CNN
+F 0 "L22" H 5030 3790 50  0000 L CNN
 F 1 "12 nH" H 5030 3710 50  0000 L CNN
 F 2 "" H 5000 3750 50  0001 C CNN
 F 3 "~" H 5000 3750 50  0001 C CNN
@@ -356,7 +356,7 @@ U 1 1 5CC1F7BA
 P 4750 3600
 AR Path="/5CA6B0AA/5CC1CC09/5CC1F7BA" Ref="C203"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC1F7BA" Ref="C134"  Part="1" 
-F 0 "C203" H 4760 3670 50  0000 L CNN
+F 0 "C134" H 4760 3670 50  0000 L CNN
 F 1 "3.3 pF" H 4760 3520 50  0000 L CNN
 F 2 "" H 4750 3600 50  0001 C CNN
 F 3 "~" H 4750 3600 50  0001 C CNN
@@ -369,7 +369,7 @@ U 1 1 5CC1E94D
 P 5200 3600
 AR Path="/5CA6B0AA/5CC1CC09/5CC1E94D" Ref="C204"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC1E94D" Ref="C135"  Part="1" 
-F 0 "C204" H 5210 3670 50  0000 L CNN
+F 0 "C135" H 5210 3670 50  0000 L CNN
 F 1 "1.3 pF" H 5210 3520 50  0000 L CNN
 F 2 "" H 5200 3600 50  0001 C CNN
 F 3 "~" H 5200 3600 50  0001 C CNN
@@ -391,7 +391,7 @@ U 1 1 5CC22016
 P 5000 3450
 AR Path="/5CA6B0AA/5CC1CC09/5CC22016" Ref="L36"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC22016" Ref="L21"  Part="1" 
-F 0 "L36" H 5030 3490 50  0000 L CNN
+F 0 "L21" H 5030 3490 50  0000 L CNN
 F 1 "12 nH" H 5030 3410 50  0000 L CNN
 F 2 "" H 5000 3450 50  0001 C CNN
 F 3 "~" H 5000 3450 50  0001 C CNN
@@ -412,7 +412,7 @@ U 1 1 5D51EF09
 P 4150 3600
 AR Path="/5CA6B0AA/5CC1CC09/5D51EF09" Ref="C202"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5D51EF09" Ref="C133"  Part="1" 
-F 0 "C202" H 4160 3670 50  0000 L CNN
+F 0 "C133" H 4160 3670 50  0000 L CNN
 F 1 "DNP" H 4160 3520 50  0000 L CNN
 F 2 "" H 4150 3600 50  0001 C CNN
 F 3 "~" H 4150 3600 50  0001 C CNN
@@ -425,7 +425,7 @@ U 1 1 5D51FC82
 P 4400 3450
 AR Path="/5CA6B0AA/5CC1CC09/5D51FC82" Ref="R153"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5D51FC82" Ref="R109"  Part="1" 
-F 0 "R153" H 4430 3470 50  0000 L CNN
+F 0 "R109" H 4430 3470 50  0000 L CNN
 F 1 "0R" H 4430 3410 50  0000 L CNN
 F 2 "" H 4400 3450 50  0001 C CNN
 F 3 "~" H 4400 3450 50  0001 C CNN
@@ -438,7 +438,7 @@ U 1 1 5D5221DB
 P 4400 3750
 AR Path="/5CA6B0AA/5CC1CC09/5D5221DB" Ref="R154"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5D5221DB" Ref="R110"  Part="1" 
-F 0 "R154" H 4430 3770 50  0000 L CNN
+F 0 "R110" H 4430 3770 50  0000 L CNN
 F 1 "0R" H 4430 3710 50  0000 L CNN
 F 2 "" H 4400 3750 50  0001 C CNN
 F 3 "~" H 4400 3750 50  0001 C CNN
@@ -459,7 +459,7 @@ U 1 1 5D52D7BD
 P 7750 3600
 AR Path="/5CA6B0AA/5CC1CC09/5D52D7BD" Ref="C207"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5D52D7BD" Ref="C138"  Part="1" 
-F 0 "C207" H 7760 3670 50  0000 L CNN
+F 0 "C138" H 7760 3670 50  0000 L CNN
 F 1 "DNP" H 7760 3520 50  0000 L CNN
 F 2 "" H 7750 3600 50  0001 C CNN
 F 3 "~" H 7750 3600 50  0001 C CNN
@@ -472,7 +472,7 @@ U 1 1 5D52D7C3
 P 7500 3450
 AR Path="/5CA6B0AA/5CC1CC09/5D52D7C3" Ref="R155"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5D52D7C3" Ref="R111"  Part="1" 
-F 0 "R155" H 7530 3470 50  0000 L CNN
+F 0 "R111" H 7530 3470 50  0000 L CNN
 F 1 "0R" H 7530 3410 50  0000 L CNN
 F 2 "" H 7500 3450 50  0001 C CNN
 F 3 "~" H 7500 3450 50  0001 C CNN
@@ -485,7 +485,7 @@ U 1 1 5D52D7C9
 P 7500 3750
 AR Path="/5CA6B0AA/5CC1CC09/5D52D7C9" Ref="R156"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5D52D7C9" Ref="R112"  Part="1" 
-F 0 "R156" H 7530 3770 50  0000 L CNN
+F 0 "R112" H 7530 3770 50  0000 L CNN
 F 1 "0R" H 7530 3710 50  0000 L CNN
 F 2 "" H 7500 3750 50  0001 C CNN
 F 3 "~" H 7500 3750 50  0001 C CNN
@@ -532,7 +532,7 @@ U 1 1 5D1B92FB
 P 3150 3600
 AR Path="/5CA6B0AA/5CC1CC09/5D1B92FB" Ref="T5"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5D1B92FB" Ref="T3"  Part="1" 
-F 0 "T5" H 3150 3850 50  0000 C CNN
+F 0 "T3" H 3150 3850 50  0000 C CNN
 F 1 "HHM17147A1" H 3150 3350 50  0000 C CNN
 F 2 "" H 3150 3850 50  0001 C CNN
 F 3 "" H 3150 3850 50  0001 C CNN
@@ -546,9 +546,9 @@ U 1 1 5D1C03F7
 P 8750 3600
 AR Path="/5CA6B0AA/5CC1CC09/5D1C03F7" Ref="T6"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5D1C03F7" Ref="T4"  Part="1" 
-F 0 "T6" H 8750 3850 50  0000 C CNN
+F 0 "T4" H 8750 3850 50  0000 C CNN
 F 1 "HHM17147A1" H 8750 3350 50  0000 C CNN
-F 2 "" H 8750 3850 50  0001 C CNN
+F 2 "discrete_footprints:TDK_HHM17147A1" H 8750 3850 50  0001 C CNN
 F 3 "" H 8750 3850 50  0001 C CNN
 F 4 "810-HHM17147A1" H 8750 3250 50  0000 C CNN "Mouser"
 	1    8750 3600
@@ -560,7 +560,7 @@ U 1 1 5D264607
 P 5150 2650
 AR Path="/5CA6B0AA/5CC1CC09/5D264607" Ref="J31"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5D264607" Ref="J17"  Part="1" 
-F 0 "J31" H 5160 2770 50  0000 C CNN
+F 0 "J17" H 5160 2770 50  0000 C CNN
 F 1 "UFL" V 5265 2650 50  0000 C CNN
 F 2 "" H 5150 2650 50  0001 C CNN
 F 3 " ~" H 5150 2650 50  0001 C CNN
@@ -573,7 +573,7 @@ U 1 1 5D264D0A
 P 6600 2850
 AR Path="/5CA6B0AA/5CC1CC09/5D264D0A" Ref="J32"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5D264D0A" Ref="J18"  Part="1" 
-F 0 "J32" H 6610 2970 50  0000 C CNN
+F 0 "J18" H 6610 2970 50  0000 C CNN
 F 1 "UFL" V 6715 2850 50  0000 C CNN
 F 2 "" H 6600 2850 50  0001 C CNN
 F 3 " ~" H 6600 2850 50  0001 C CNN
@@ -618,7 +618,7 @@ U 1 1 5D979A64
 P 9500 4450
 AR Path="/5CA6B0AA/5CC1CC09/5D979A64" Ref="R160"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5D979A64" Ref="R116"  Part="1" 
-F 0 "R160" H 9530 4470 50  0000 L CNN
+F 0 "R116" H 9530 4470 50  0000 L CNN
 F 1 "DNP 0402" H 9530 4410 50  0000 L CNN
 F 2 "" H 9500 4450 50  0001 C CNN
 F 3 "~" H 9500 4450 50  0001 C CNN
@@ -643,7 +643,7 @@ U 1 1 5DDA2DE4
 P 9150 4300
 AR Path="/5CA6B0AA/5CC4015A/5DDA2DE4" Ref="C140"  Part="1" 
 AR Path="/5CA6B0AA/5CC1CC09/5DDA2DE4" Ref="C209"  Part="1" 
-F 0 "C209" H 9160 4370 50  0000 L CNN
+F 0 "C140" H 9160 4370 50  0000 L CNN
 F 1 "0.1 uF" H 9160 4220 50  0000 L CNN
 F 2 "" H 9150 4300 50  0001 C CNN
 F 3 "~" H 9150 4300 50  0001 C CNN
@@ -656,7 +656,7 @@ U 1 1 5DDA597D
 P 9150 4600
 AR Path="/5CA6B0AA/5CC4015A/5DDA597D" Ref="C141"  Part="1" 
 AR Path="/5CA6B0AA/5CC1CC09/5DDA597D" Ref="C210"  Part="1" 
-F 0 "C210" H 9160 4670 50  0000 L CNN
+F 0 "C141" H 9160 4670 50  0000 L CNN
 F 1 "0.1 uF" H 9160 4520 50  0000 L CNN
 F 2 "" H 9150 4600 50  0001 C CNN
 F 3 "~" H 9150 4600 50  0001 C CNN

pcb/discrete/discrete-rf-board/diode_mixer.sch-bak

@@ -4,7 +4,7 @@ EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 19 19
+Sheet 11 19
 Title ""
 Date ""
 Rev ""
@@ -20,7 +20,7 @@ U 1 1 5CC1E322
 P 5900 3600
 AR Path="/5CA6B0AA/5CC1CC09/5CC1E322" Ref="U22"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC1E322" Ref="U12"  Part="1" 
-F 0 "U22" H 5900 3900 50  0000 C CNN
+F 0 "U12" H 5900 3900 50  0000 C CNN
 F 1 "BAT15-099R" H 5900 3300 50  0000 C CNN
 F 2 "discrete_footprints:Infineon_SOT143" H 5900 3900 50  0001 C CNN
 F 3 "" H 5900 3900 50  0001 C CNN
@@ -34,7 +34,7 @@ U 1 1 5CC1F89D
 P 6500 3600
 AR Path="/5CA6B0AA/5CC1CC09/5CC1F89D" Ref="C205"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC1F89D" Ref="C136"  Part="1" 
-F 0 "C205" H 6510 3670 50  0000 L CNN
+F 0 "C136" H 6510 3670 50  0000 L CNN
 F 1 "1.1 pF" H 6510 3520 50  0000 L CNN
 F 2 "" H 6500 3600 50  0001 C CNN
 F 3 "~" H 6500 3600 50  0001 C CNN
@@ -47,7 +47,7 @@ U 1 1 5CC20238
 P 7100 3600
 AR Path="/5CA6B0AA/5CC1CC09/5CC20238" Ref="C206"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC20238" Ref="C137"  Part="1" 
-F 0 "C206" H 7110 3670 50  0000 L CNN
+F 0 "C137" H 7110 3670 50  0000 L CNN
 F 1 "2.5 pF" H 7110 3520 50  0000 L CNN
 F 2 "" H 7100 3600 50  0001 C CNN
 F 3 "~" H 7100 3600 50  0001 C CNN
@@ -60,7 +60,7 @@ U 1 1 5CC208EE
 P 6850 3750
 AR Path="/5CA6B0AA/5CC1CC09/5CC208EE" Ref="L39"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC208EE" Ref="L24"  Part="1" 
-F 0 "L39" H 6880 3790 50  0000 L CNN
+F 0 "L24" H 6880 3790 50  0000 L CNN
 F 1 "14 nH" H 6880 3710 50  0000 L CNN
 F 2 "" H 6850 3750 50  0001 C CNN
 F 3 "~" H 6850 3750 50  0001 C CNN
@@ -73,7 +73,7 @@ U 1 1 5CC2101C
 P 6850 3450
 AR Path="/5CA6B0AA/5CC1CC09/5CC2101C" Ref="L38"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC2101C" Ref="L23"  Part="1" 
-F 0 "L38" H 6880 3490 50  0000 L CNN
+F 0 "L23" H 6880 3490 50  0000 L CNN
 F 1 "14 nH" H 6880 3410 50  0000 L CNN
 F 2 "" H 6850 3450 50  0001 C CNN
 F 3 "~" H 6850 3450 50  0001 C CNN
@@ -106,7 +106,7 @@ U 1 1 5CC289D9
 P 8300 4100
 AR Path="/5CA6B0AA/5CC1CC09/5CC289D9" Ref="L40"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC289D9" Ref="L25"  Part="1" 
-F 0 "L40" H 8330 4140 50  0000 L CNN
+F 0 "L25" H 8330 4140 50  0000 L CNN
 F 1 "220 nH" H 8330 4060 50  0000 L CNN
 F 2 "" H 8300 4100 50  0001 C CNN
 F 3 "~" H 8300 4100 50  0001 C CNN
@@ -123,7 +123,7 @@ U 1 1 5CC29B4E
 P 8300 4450
 AR Path="/5CA6B0AA/5CC1CC09/5CC29B4E" Ref="R157"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC29B4E" Ref="R113"  Part="1" 
-F 0 "R157" H 8330 4470 50  0000 L CNN
+F 0 "R113" H 8330 4470 50  0000 L CNN
 F 1 "200R" H 8330 4410 50  0000 L CNN
 F 2 "" H 8300 4450 50  0001 C CNN
 F 3 "~" H 8300 4450 50  0001 C CNN
@@ -136,7 +136,7 @@ U 1 1 5CC29F9D
 P 8550 4300
 AR Path="/5CA6B0AA/5CC1CC09/5CC29F9D" Ref="R158"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC29F9D" Ref="R114"  Part="1" 
-F 0 "R158" H 8580 4320 50  0000 L CNN
+F 0 "R114" H 8580 4320 50  0000 L CNN
 F 1 "100R" H 8580 4260 50  0000 L CNN
 F 2 "" H 8550 4300 50  0001 C CNN
 F 3 "~" H 8550 4300 50  0001 C CNN
@@ -149,7 +149,7 @@ U 1 1 5CC2B0AC
 P 8750 4450
 AR Path="/5CA6B0AA/5CC1CC09/5CC2B0AC" Ref="C208"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC2B0AC" Ref="C139"  Part="1" 
-F 0 "C208" H 8760 4520 50  0000 L CNN
+F 0 "C139" H 8760 4520 50  0000 L CNN
 F 1 "47 pF" H 8760 4370 50  0000 L CNN
 F 2 "" H 8750 4450 50  0001 C CNN
 F 3 "~" H 8750 4450 50  0001 C CNN
@@ -173,7 +173,7 @@ U 1 1 5CC2FA5E
 P 2750 3950
 AR Path="/5CA6B0AA/5CC1CC09/5CC2FA5E" Ref="#PWR0257"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC2FA5E" Ref="#PWR0169"  Part="1" 
-F 0 "#PWR0257" H 2750 3700 50  0001 C CNN
+F 0 "#PWR0169" H 2750 3700 50  0001 C CNN
 F 1 "GND" H 2750 3800 50  0000 C CNN
 F 2 "" H 2750 3950 50  0001 C CNN
 F 3 "" H 2750 3950 50  0001 C CNN
@@ -186,7 +186,7 @@ U 1 1 5CC3011D
 P 9150 3950
 AR Path="/5CA6B0AA/5CC1CC09/5CC3011D" Ref="#PWR0258"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC3011D" Ref="#PWR0170"  Part="1" 
-F 0 "#PWR0258" H 9150 3700 50  0001 C CNN
+F 0 "#PWR0170" H 9150 3700 50  0001 C CNN
 F 1 "GND" H 9150 3800 50  0000 C CNN
 F 2 "" H 9150 3950 50  0001 C CNN
 F 3 "" H 9150 3950 50  0001 C CNN
@@ -199,7 +199,7 @@ U 1 1 5CC30B27
 P 2450 2900
 AR Path="/5CA6B0AA/5CC1CC09/5CC30B27" Ref="J30"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC30B27" Ref="J16"  Part="1" 
-F 0 "J30" H 2460 3020 50  0000 C CNN
+F 0 "J16" H 2460 3020 50  0000 C CNN
 F 1 "UFL" V 2565 2900 50  0000 C CNN
 F 2 "" H 2450 2900 50  0001 C CNN
 F 3 " ~" H 2450 2900 50  0001 C CNN
@@ -212,7 +212,7 @@ U 1 1 5CC31787
 P 9600 3000
 AR Path="/5CA6B0AA/5CC1CC09/5CC31787" Ref="J33"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC31787" Ref="J19"  Part="1" 
-F 0 "J33" H 9610 3120 50  0000 C CNN
+F 0 "J19" H 9610 3120 50  0000 C CNN
 F 1 "UFL" V 9715 3000 50  0000 C CNN
 F 2 "" H 9600 3000 50  0001 C CNN
 F 3 " ~" H 9600 3000 50  0001 C CNN
@@ -225,7 +225,7 @@ U 1 1 5CC33186
 P 9600 3250
 AR Path="/5CA6B0AA/5CC1CC09/5CC33186" Ref="#PWR0259"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC33186" Ref="#PWR0171"  Part="1" 
-F 0 "#PWR0259" H 9600 3000 50  0001 C CNN
+F 0 "#PWR0171" H 9600 3000 50  0001 C CNN
 F 1 "GND" H 9600 3100 50  0000 C CNN
 F 2 "" H 9600 3250 50  0001 C CNN
 F 3 "" H 9600 3250 50  0001 C CNN
@@ -238,7 +238,7 @@ U 1 1 5CC33A73
 P 2450 3200
 AR Path="/5CA6B0AA/5CC1CC09/5CC33A73" Ref="#PWR0256"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC33A73" Ref="#PWR0168"  Part="1" 
-F 0 "#PWR0256" H 2450 2950 50  0001 C CNN
+F 0 "#PWR0168" H 2450 2950 50  0001 C CNN
 F 1 "GND" H 2450 3050 50  0000 C CNN
 F 2 "" H 2450 3200 50  0001 C CNN
 F 3 "" H 2450 3200 50  0001 C CNN
@@ -289,7 +289,7 @@ U 1 1 5CC5AE0B
 P 8300 4750
 AR Path="/5CA6B0AA/5CC1CC09/5CC5AE0B" Ref="L41"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC5AE0B" Ref="L26"  Part="1" 
-F 0 "L41" H 8330 4790 50  0000 L CNN
+F 0 "L26" H 8330 4790 50  0000 L CNN
 F 1 "220 nH" H 8330 4710 50  0000 L CNN
 F 2 "" H 8300 4750 50  0001 C CNN
 F 3 "~" H 8300 4750 50  0001 C CNN
@@ -306,7 +306,7 @@ U 1 1 5CC5DD55
 P 8550 4600
 AR Path="/5CA6B0AA/5CC1CC09/5CC5DD55" Ref="R159"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC5DD55" Ref="R115"  Part="1" 
-F 0 "R159" H 8580 4620 50  0000 L CNN
+F 0 "R115" H 8580 4620 50  0000 L CNN
 F 1 "100R" H 8580 4560 50  0000 L CNN
 F 2 "" H 8550 4600 50  0001 C CNN
 F 3 "~" H 8550 4600 50  0001 C CNN
@@ -343,7 +343,7 @@ U 1 1 5CC22010
 P 5000 3750
 AR Path="/5CA6B0AA/5CC1CC09/5CC22010" Ref="L37"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC22010" Ref="L22"  Part="1" 
-F 0 "L37" H 5030 3790 50  0000 L CNN
+F 0 "L22" H 5030 3790 50  0000 L CNN
 F 1 "12 nH" H 5030 3710 50  0000 L CNN
 F 2 "" H 5000 3750 50  0001 C CNN
 F 3 "~" H 5000 3750 50  0001 C CNN
@@ -356,7 +356,7 @@ U 1 1 5CC1F7BA
 P 4750 3600
 AR Path="/5CA6B0AA/5CC1CC09/5CC1F7BA" Ref="C203"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC1F7BA" Ref="C134"  Part="1" 
-F 0 "C203" H 4760 3670 50  0000 L CNN
+F 0 "C134" H 4760 3670 50  0000 L CNN
 F 1 "3.3 pF" H 4760 3520 50  0000 L CNN
 F 2 "" H 4750 3600 50  0001 C CNN
 F 3 "~" H 4750 3600 50  0001 C CNN
@@ -369,7 +369,7 @@ U 1 1 5CC1E94D
 P 5200 3600
 AR Path="/5CA6B0AA/5CC1CC09/5CC1E94D" Ref="C204"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC1E94D" Ref="C135"  Part="1" 
-F 0 "C204" H 5210 3670 50  0000 L CNN
+F 0 "C135" H 5210 3670 50  0000 L CNN
 F 1 "1.3 pF" H 5210 3520 50  0000 L CNN
 F 2 "" H 5200 3600 50  0001 C CNN
 F 3 "~" H 5200 3600 50  0001 C CNN
@@ -391,7 +391,7 @@ U 1 1 5CC22016
 P 5000 3450
 AR Path="/5CA6B0AA/5CC1CC09/5CC22016" Ref="L36"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC22016" Ref="L21"  Part="1" 
-F 0 "L36" H 5030 3490 50  0000 L CNN
+F 0 "L21" H 5030 3490 50  0000 L CNN
 F 1 "12 nH" H 5030 3410 50  0000 L CNN
 F 2 "" H 5000 3450 50  0001 C CNN
 F 3 "~" H 5000 3450 50  0001 C CNN
@@ -412,7 +412,7 @@ U 1 1 5D51EF09
 P 4150 3600
 AR Path="/5CA6B0AA/5CC1CC09/5D51EF09" Ref="C202"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5D51EF09" Ref="C133"  Part="1" 
-F 0 "C202" H 4160 3670 50  0000 L CNN
+F 0 "C133" H 4160 3670 50  0000 L CNN
 F 1 "DNP" H 4160 3520 50  0000 L CNN
 F 2 "" H 4150 3600 50  0001 C CNN
 F 3 "~" H 4150 3600 50  0001 C CNN
@@ -425,7 +425,7 @@ U 1 1 5D51FC82
 P 4400 3450
 AR Path="/5CA6B0AA/5CC1CC09/5D51FC82" Ref="R153"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5D51FC82" Ref="R109"  Part="1" 
-F 0 "R153" H 4430 3470 50  0000 L CNN
+F 0 "R109" H 4430 3470 50  0000 L CNN
 F 1 "0R" H 4430 3410 50  0000 L CNN
 F 2 "" H 4400 3450 50  0001 C CNN
 F 3 "~" H 4400 3450 50  0001 C CNN
@@ -438,7 +438,7 @@ U 1 1 5D5221DB
 P 4400 3750
 AR Path="/5CA6B0AA/5CC1CC09/5D5221DB" Ref="R154"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5D5221DB" Ref="R110"  Part="1" 
-F 0 "R154" H 4430 3770 50  0000 L CNN
+F 0 "R110" H 4430 3770 50  0000 L CNN
 F 1 "0R" H 4430 3710 50  0000 L CNN
 F 2 "" H 4400 3750 50  0001 C CNN
 F 3 "~" H 4400 3750 50  0001 C CNN
@@ -459,7 +459,7 @@ U 1 1 5D52D7BD
 P 7750 3600
 AR Path="/5CA6B0AA/5CC1CC09/5D52D7BD" Ref="C207"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5D52D7BD" Ref="C138"  Part="1" 
-F 0 "C207" H 7760 3670 50  0000 L CNN
+F 0 "C138" H 7760 3670 50  0000 L CNN
 F 1 "DNP" H 7760 3520 50  0000 L CNN
 F 2 "" H 7750 3600 50  0001 C CNN
 F 3 "~" H 7750 3600 50  0001 C CNN
@@ -472,7 +472,7 @@ U 1 1 5D52D7C3
 P 7500 3450
 AR Path="/5CA6B0AA/5CC1CC09/5D52D7C3" Ref="R155"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5D52D7C3" Ref="R111"  Part="1" 
-F 0 "R155" H 7530 3470 50  0000 L CNN
+F 0 "R111" H 7530 3470 50  0000 L CNN
 F 1 "0R" H 7530 3410 50  0000 L CNN
 F 2 "" H 7500 3450 50  0001 C CNN
 F 3 "~" H 7500 3450 50  0001 C CNN
@@ -485,7 +485,7 @@ U 1 1 5D52D7C9
 P 7500 3750
 AR Path="/5CA6B0AA/5CC1CC09/5D52D7C9" Ref="R156"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5D52D7C9" Ref="R112"  Part="1" 
-F 0 "R156" H 7530 3770 50  0000 L CNN
+F 0 "R112" H 7530 3770 50  0000 L CNN
 F 1 "0R" H 7530 3710 50  0000 L CNN
 F 2 "" H 7500 3750 50  0001 C CNN
 F 3 "~" H 7500 3750 50  0001 C CNN
@@ -532,7 +532,7 @@ U 1 1 5D1B92FB
 P 3150 3600
 AR Path="/5CA6B0AA/5CC1CC09/5D1B92FB" Ref="T5"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5D1B92FB" Ref="T3"  Part="1" 
-F 0 "T5" H 3150 3850 50  0000 C CNN
+F 0 "T3" H 3150 3850 50  0000 C CNN
 F 1 "HHM17147A1" H 3150 3350 50  0000 C CNN
 F 2 "" H 3150 3850 50  0001 C CNN
 F 3 "" H 3150 3850 50  0001 C CNN
@@ -546,9 +546,9 @@ U 1 1 5D1C03F7
 P 8750 3600
 AR Path="/5CA6B0AA/5CC1CC09/5D1C03F7" Ref="T6"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5D1C03F7" Ref="T4"  Part="1" 
-F 0 "T6" H 8750 3850 50  0000 C CNN
+F 0 "T4" H 8750 3850 50  0000 C CNN
 F 1 "HHM17147A1" H 8750 3350 50  0000 C CNN
-F 2 "" H 8750 3850 50  0001 C CNN
+F 2 "discrete_footprints:TDK_HHM17147A1" H 8750 3850 50  0001 C CNN
 F 3 "" H 8750 3850 50  0001 C CNN
 F 4 "810-HHM17147A1" H 8750 3250 50  0000 C CNN "Mouser"
 	1    8750 3600
@@ -560,7 +560,7 @@ U 1 1 5D264607
 P 5150 2650
 AR Path="/5CA6B0AA/5CC1CC09/5D264607" Ref="J31"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5D264607" Ref="J17"  Part="1" 
-F 0 "J31" H 5160 2770 50  0000 C CNN
+F 0 "J17" H 5160 2770 50  0000 C CNN
 F 1 "UFL" V 5265 2650 50  0000 C CNN
 F 2 "" H 5150 2650 50  0001 C CNN
 F 3 " ~" H 5150 2650 50  0001 C CNN
@@ -573,7 +573,7 @@ U 1 1 5D264D0A
 P 6600 2850
 AR Path="/5CA6B0AA/5CC1CC09/5D264D0A" Ref="J32"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5D264D0A" Ref="J18"  Part="1" 
-F 0 "J32" H 6610 2970 50  0000 C CNN
+F 0 "J18" H 6610 2970 50  0000 C CNN
 F 1 "UFL" V 6715 2850 50  0000 C CNN
 F 2 "" H 6600 2850 50  0001 C CNN
 F 3 " ~" H 6600 2850 50  0001 C CNN
@@ -618,7 +618,7 @@ U 1 1 5D979A64
 P 9500 4450
 AR Path="/5CA6B0AA/5CC1CC09/5D979A64" Ref="R160"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5D979A64" Ref="R116"  Part="1" 
-F 0 "R160" H 9530 4470 50  0000 L CNN
+F 0 "R116" H 9530 4470 50  0000 L CNN
 F 1 "DNP 0402" H 9530 4410 50  0000 L CNN
 F 2 "" H 9500 4450 50  0001 C CNN
 F 3 "~" H 9500 4450 50  0001 C CNN
@@ -643,7 +643,7 @@ U 1 1 5DDA2DE4
 P 9150 4300
 AR Path="/5CA6B0AA/5CC4015A/5DDA2DE4" Ref="C140"  Part="1" 
 AR Path="/5CA6B0AA/5CC1CC09/5DDA2DE4" Ref="C209"  Part="1" 
-F 0 "C209" H 9160 4370 50  0000 L CNN
+F 0 "C140" H 9160 4370 50  0000 L CNN
 F 1 "0.1 uF" H 9160 4220 50  0000 L CNN
 F 2 "" H 9150 4300 50  0001 C CNN
 F 3 "~" H 9150 4300 50  0001 C CNN
@@ -656,7 +656,7 @@ U 1 1 5DDA597D
 P 9150 4600
 AR Path="/5CA6B0AA/5CC4015A/5DDA597D" Ref="C141"  Part="1" 
 AR Path="/5CA6B0AA/5CC1CC09/5DDA597D" Ref="C210"  Part="1" 
-F 0 "C210" H 9160 4670 50  0000 L CNN
+F 0 "C141" H 9160 4670 50  0000 L CNN
 F 1 "0.1 uF" H 9160 4520 50  0000 L CNN
 F 2 "" H 9150 4600 50  0001 C CNN
 F 3 "~" H 9150 4600 50  0001 C CNN

pcb/discrete/discrete-rf-board/if_amp.sch

@@ -4,7 +4,7 @@ EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 10 19
+Sheet 12 19
 Title ""
 Date ""
 Rev ""
@@ -15,19 +15,6 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L Device:R_Small R95
-U 1 1 5CC4F475
-P 2050 2250
-AR Path="/5CA6B0AA/5CC4DFC2/5CC4F475" Ref="R95"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC4F475" Ref="R119"  Part="1" 
-F 0 "R119" H 2080 2270 50  0000 L CNN
-F 1 "25R" H 2080 2210 50  0000 L CNN
-F 2 "" H 2050 2250 50  0001 C CNN
-F 3 "~" H 2050 2250 50  0001 C CNN
-	1    2050 2250
-	1    0    0    -1  
-$EndComp
-$Comp
 L Device:R_Small R97
 U 1 1 5CC4F99A
 P 2850 2250
@@ -1342,7 +1329,7 @@ P 2500 2450
 AR Path="/5CA6B0AA/5CC4DFC2/5DA03B3D" Ref="C119"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5DA03B3D" Ref="C143"  Part="1" 
 F 0 "C143" H 2510 2520 50  0000 L CNN
-F 1 "C_Small" H 2510 2370 50  0000 L CNN
+F 1 "2.5 nF" H 2510 2370 50  0000 L CNN
 F 2 "" H 2500 2450 50  0001 C CNN
 F 3 "~" H 2500 2450 50  0001 C CNN
 	1    2500 2450
@@ -1362,7 +1349,7 @@ P 6600 2200
 AR Path="/5CA6B0AA/5CC4DFC2/5DA0FE44" Ref="C128"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5DA0FE44" Ref="C152"  Part="1" 
 F 0 "C152" H 6610 2270 50  0000 L CNN
-F 1 "C_Small" H 6610 2120 50  0000 L CNN
+F 1 "470 pF" H 6610 2120 50  0000 L CNN
 F 2 "" H 6600 2200 50  0001 C CNN
 F 3 "~" H 6600 2200 50  0001 C CNN
 	1    6600 2200
@@ -1383,6 +1370,19 @@ Text Notes 1300 3600 0    50   ~ 0
 1.4 V max
 Text Notes 2500 3950 0    50   ~ 0
 0.7 V max\n30 mA max
-Text Notes 3200 1100 0    50   ~ 0
+$Comp
-TODO figure out shunt cap values
+L Device:R_Small R95
+U 1 1 5CC4F475
+P 2050 2250
+AR Path="/5CA6B0AA/5CC4DFC2/5CC4F475" Ref="R95"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC4F475" Ref="R119"  Part="1" 
+F 0 "R119" H 2080 2270 50  0000 L CNN
+F 1 "25R" H 2080 2210 50  0000 L CNN
+F 2 "" H 2050 2250 50  0001 C CNN
+F 3 "~" H 2050 2250 50  0001 C CNN
+	1    2050 2250
+	1    0    0    -1  
+$EndComp
+Text Notes 1500 1050 0    50   ~ 0
+NOTE maybe swap out resistors to match design on left; maybe too much gain?
 $EndSCHEMATC

pcb/discrete/discrete-rf-board/if_amp.sch-bak

@@ -4,7 +4,7 @@ EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 10 19
+Sheet 12 19
 Title ""
 Date ""
 Rev ""
@@ -15,19 +15,6 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L Device:R_Small R95
-U 1 1 5CC4F475
-P 2050 2250
-AR Path="/5CA6B0AA/5CC4DFC2/5CC4F475" Ref="R95"  Part="1" 
-AR Path="/5CA6B0AA/5CC9409A/5CC4F475" Ref="R119"  Part="1" 
-F 0 "R119" H 2080 2270 50  0000 L CNN
-F 1 "25R" H 2080 2210 50  0000 L CNN
-F 2 "" H 2050 2250 50  0001 C CNN
-F 3 "~" H 2050 2250 50  0001 C CNN
-	1    2050 2250
-	1    0    0    -1  
-$EndComp
-$Comp
 L Device:R_Small R97
 U 1 1 5CC4F99A
 P 2850 2250
@@ -1342,7 +1329,7 @@ P 2500 2450
 AR Path="/5CA6B0AA/5CC4DFC2/5DA03B3D" Ref="C119"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5DA03B3D" Ref="C143"  Part="1" 
 F 0 "C143" H 2510 2520 50  0000 L CNN
-F 1 "C_Small" H 2510 2370 50  0000 L CNN
+F 1 "2.5 nF" H 2510 2370 50  0000 L CNN
 F 2 "" H 2500 2450 50  0001 C CNN
 F 3 "~" H 2500 2450 50  0001 C CNN
 	1    2500 2450
@@ -1362,7 +1349,7 @@ P 6600 2200
 AR Path="/5CA6B0AA/5CC4DFC2/5DA0FE44" Ref="C128"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5DA0FE44" Ref="C152"  Part="1" 
 F 0 "C152" H 6610 2270 50  0000 L CNN
-F 1 "C_Small" H 6610 2120 50  0000 L CNN
+F 1 "470 pF" H 6610 2120 50  0000 L CNN
 F 2 "" H 6600 2200 50  0001 C CNN
 F 3 "~" H 6600 2200 50  0001 C CNN
 	1    6600 2200
@@ -1383,6 +1370,19 @@ Text Notes 1300 3600 0    50   ~ 0
 1.4 V max
 Text Notes 2500 3950 0    50   ~ 0
 0.7 V max\n30 mA max
-Text Notes 3200 1100 0    50   ~ 0
+$Comp
-TODO figure out shunt cap values
+L Device:R_Small R95
+U 1 1 5CC4F475
+P 2050 2250
+AR Path="/5CA6B0AA/5CC4DFC2/5CC4F475" Ref="R95"  Part="1" 
+AR Path="/5CA6B0AA/5CC9409A/5CC4F475" Ref="R119"  Part="1" 
+F 0 "R119" H 2080 2270 50  0000 L CNN
+F 1 "25R" H 2080 2210 50  0000 L CNN
+F 2 "" H 2050 2250 50  0001 C CNN
+F 3 "~" H 2050 2250 50  0001 C CNN
+	1    2050 2250
+	1    0    0    -1  
+$EndComp
+Text Notes 1500 1050 0    50   ~ 0
+NOTE maybe swap out resistors to match design on left; maybe too much gain?
 $EndSCHEMATC

pcb/discrete/discrete-rf-board/lna_gain_block.sch

@@ -205,18 +205,18 @@ $EndComp
 $Comp
 L power:GND #PWR?
 U 1 1 5D3CF6A6
-P 5550 4200
+P 5550 4800
 AR Path="/5CA6B0AA/5CE74EBE/5D3CF6A6" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3CF6A6" Ref="#PWR0208"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF6A6" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF6A6" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF6A6" Ref="#PWR0221"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF6A6" Ref="#PWR0234"  Part="1" 
-F 0 "#PWR0234" H 5550 3950 50  0001 C CNN
+F 0 "#PWR0234" H 5550 4550 50  0001 C CNN
-F 1 "GND" H 5555 4027 50  0000 C CNN
+F 1 "GND" H 5555 4627 50  0000 C CNN
-F 2 "" H 5550 4200 50  0001 C CNN
+F 2 "" H 5550 4800 50  0001 C CNN
-F 3 "" H 5550 4200 50  0001 C CNN
+F 3 "" H 5550 4800 50  0001 C CNN
-	1    5550 4200
+	1    5550 4800
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -566,18 +566,12 @@ Wire Wire Line
 Wire Wire Line
 	5000 3150 5000 3200
 Wire Wire Line
-	5550 3900 5550 4050
+	5650 4650 5550 4650
+Connection ~ 5550 4650
 Wire Wire Line
-	5650 3900 5650 4050
+	5550 4650 5550 4800
-Wire Wire Line
-	5650 4050 5550 4050
-Connection ~ 5550 4050
-Wire Wire Line
-	5550 4050 5550 4200
 Text Notes 4250 4750 0    50   ~ 0
 Vbe=~~0.827V, ib=~~0.05mA, ic=5mA\nNF=1.5 dB, K=~~16dB
-Text Notes 6100 2650 0    50   ~ 0
-TODO make sure the matching circuit values are\ncalculated for Vce=5V
 $Comp
 L Device:C_Small C?
 U 1 1 5D1F8CDE
@@ -730,4 +724,56 @@ F 3 "" H 5500 3700 50  0001 C CNN
 	1    5500 3700
 	1    0    0    -1  
 $EndComp
+Wire Wire Line
+	5550 3900 5550 4000
+Wire Wire Line
+	5550 4000 5650 4000
+Wire Wire Line
+	5650 4000 5650 3900
+$Comp
+L Device:C_Small C?
+U 1 1 5DAA0359
+P 5650 4300
+AR Path="/5CA6B0AA/5CE74EBE/5DAA0359" Ref="C?"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5DAA0359" Ref="C212"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5DAA0359" Ref="C?"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5DAA0359" Ref="C?"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5DAA0359" Ref="C213"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5DAA0359" Ref="C214"  Part="1" 
+F 0 "C214" H 5742 4346 50  0000 L CNN
+F 1 "100 pF RF" H 5742 4255 50  0000 L CNN
+F 2 "" H 5650 4300 50  0001 C CNN
+F 3 "~" H 5650 4300 50  0001 C CNN
+	1    5650 4300
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5650 4400 5650 4650
+Wire Wire Line
+	5650 4200 5650 4000
+Connection ~ 5650 4000
+$Comp
+L Device:R_Small R?
+U 1 1 5DAA3BBB
+P 5550 4150
+AR Path="/5CA6B0AA/5CE74EBE/5DAA3BBB" Ref="R?"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5DAA3BBB" Ref="R162"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5DAA3BBB" Ref="R?"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5DAA3BBB" Ref="R?"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5DAA3BBB" Ref="R163"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5DAA3BBB" Ref="R164"  Part="1" 
+F 0 "R164" H 5491 4104 50  0000 R CNN
+F 1 "75R" H 5491 4195 50  0000 R CNN
+F 2 "" H 5550 4150 50  0001 C CNN
+F 3 "~" H 5550 4150 50  0001 C CNN
+	1    5550 4150
+	1    0    0    1   
+$EndComp
+Wire Wire Line
+	5550 4250 5550 4650
+Wire Wire Line
+	5550 4050 5550 4000
+Connection ~ 5550 4000
+Text Notes 6200 4800 0    50   ~ 0
+TODO copy values from test setup
 $EndSCHEMATC

pcb/discrete/discrete-rf-board/lna_gain_block.sch-bak

@@ -205,18 +205,18 @@ $EndComp
 $Comp
 L power:GND #PWR?
 U 1 1 5D3CF6A6
-P 5550 4200
+P 5550 4800
 AR Path="/5CA6B0AA/5CE74EBE/5D3CF6A6" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D3CF6A6" Ref="#PWR0208"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF6A6" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF6A6" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF6A6" Ref="#PWR0221"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF6A6" Ref="#PWR0234"  Part="1" 
-F 0 "#PWR0234" H 5550 3950 50  0001 C CNN
+F 0 "#PWR0234" H 5550 4550 50  0001 C CNN
-F 1 "GND" H 5555 4027 50  0000 C CNN
+F 1 "GND" H 5555 4627 50  0000 C CNN
-F 2 "" H 5550 4200 50  0001 C CNN
+F 2 "" H 5550 4800 50  0001 C CNN
-F 3 "" H 5550 4200 50  0001 C CNN
+F 3 "" H 5550 4800 50  0001 C CNN
-	1    5550 4200
+	1    5550 4800
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -566,18 +566,12 @@ Wire Wire Line
 Wire Wire Line
 	5000 3150 5000 3200
 Wire Wire Line
-	5550 3900 5550 4050
+	5650 4650 5550 4650
+Connection ~ 5550 4650
 Wire Wire Line
-	5650 3900 5650 4050
+	5550 4650 5550 4800
-Wire Wire Line
-	5650 4050 5550 4050
-Connection ~ 5550 4050
-Wire Wire Line
-	5550 4050 5550 4200
 Text Notes 4250 4750 0    50   ~ 0
 Vbe=~~0.827V, ib=~~0.05mA, ic=5mA\nNF=1.5 dB, K=~~16dB
-Text Notes 6100 2650 0    50   ~ 0
-TODO make sure the matching circuit values are\ncalculated for Vce=5V
 $Comp
 L Device:C_Small C?
 U 1 1 5D1F8CDE
@@ -730,4 +724,56 @@ F 3 "" H 5500 3700 50  0001 C CNN
 	1    5500 3700
 	1    0    0    -1  
 $EndComp
+Wire Wire Line
+	5550 3900 5550 4000
+Wire Wire Line
+	5550 4000 5650 4000
+Wire Wire Line
+	5650 4000 5650 3900
+$Comp
+L Device:C_Small C?
+U 1 1 5DAA0359
+P 5650 4300
+AR Path="/5CA6B0AA/5CE74EBE/5DAA0359" Ref="C?"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5DAA0359" Ref="C212"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5DAA0359" Ref="C?"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5DAA0359" Ref="C?"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5DAA0359" Ref="C213"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5DAA0359" Ref="C214"  Part="1" 
+F 0 "C214" H 5742 4346 50  0000 L CNN
+F 1 "100 pF RF" H 5742 4255 50  0000 L CNN
+F 2 "" H 5650 4300 50  0001 C CNN
+F 3 "~" H 5650 4300 50  0001 C CNN
+	1    5650 4300
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5650 4400 5650 4650
+Wire Wire Line
+	5650 4200 5650 4000
+Connection ~ 5650 4000
+$Comp
+L Device:R_Small R?
+U 1 1 5DAA3BBB
+P 5550 4150
+AR Path="/5CA6B0AA/5CE74EBE/5DAA3BBB" Ref="R?"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5DAA3BBB" Ref="R162"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5DAA3BBB" Ref="R?"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5DAA3BBB" Ref="R?"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5DAA3BBB" Ref="R163"  Part="1" 
+AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5DAA3BBB" Ref="R164"  Part="1" 
+F 0 "R164" H 5491 4104 50  0000 R CNN
+F 1 "75R" H 5491 4195 50  0000 R CNN
+F 2 "" H 5550 4150 50  0001 C CNN
+F 3 "~" H 5550 4150 50  0001 C CNN
+	1    5550 4150
+	1    0    0    1   
+$EndComp
+Wire Wire Line
+	5550 4250 5550 4650
+Wire Wire Line
+	5550 4050 5550 4000
+Connection ~ 5550 4000
+Text Notes 6200 4800 0    50   ~ 0
+TODO copy values from test setup
 $EndSCHEMATC

pcb/discrete/discrete-rf-board/lo.sch

@@ -623,23 +623,19 @@ LO
 $Comp
 L power:GND #PWR0127
 U 1 1 5CB0CCE1
-P 9450 4500
+P 9450 5000
-F 0 "#PWR0127" H 9450 4250 50  0001 C CNN
+F 0 "#PWR0127" H 9450 4750 50  0001 C CNN
-F 1 "GND" H 9450 4350 50  0000 C CNN
+F 1 "GND" H 9450 4850 50  0000 C CNN
-F 2 "" H 9450 4500 50  0001 C CNN
+F 2 "" H 9450 5000 50  0001 C CNN
-F 3 "" H 9450 4500 50  0001 C CNN
+F 3 "" H 9450 5000 50  0001 C CNN
-	1    9450 4500
+	1    9450 5000
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	9450 4400 9450 4450
+	9550 4950 9450 4950
+Connection ~ 9450 4950
 Wire Wire Line
-	9550 4400 9550 4450
+	9450 4950 9450 5000
-Wire Wire Line
-	9550 4450 9450 4450
-Connection ~ 9450 4450
-Wire Wire Line
-	9450 4450 9450 4500
 $Comp
 L Connector:Conn_Coaxial J14
 U 1 1 5CB11865
@@ -963,13 +959,13 @@ Wire Wire Line
 Connection ~ 9450 3200
 Wire Wire Line
 	9450 3200 9450 3250
-Text Notes 9050 4850 0    50   ~ 0
+Text Notes 9050 5350 0    50   ~ 0
 ~~20 dB gain according to SPICE model,\n~~17 dB gain to S parameter model in scikit-rf
 Text Label 9450 2750 0    50   ~ 0
 5V
 Text Notes 9600 2550 0    50   ~ 0
 20 mA bias current
-Text Notes 8550 5150 0    50   ~ 0
+Text Notes 8550 5650 0    50   ~ 0
 Compression point should at ~~-10dBm (~~+10 dBm at output)
 Text HLabel 9450 2650 1    50   Input ~ 0
 5V0
@@ -1389,4 +1385,42 @@ F 3 "" H 9400 4200 50  0001 C CNN
 	1    9400 4200
 	1    0    0    -1  
 $EndComp
+Wire Wire Line
+	9450 4500 9550 4500
+Wire Wire Line
+	9550 4500 9550 4400
+$Comp
+L Device:R_Small R161
+U 1 1 5DAD826A
+P 9450 4700
+F 0 "R161" H 9480 4720 50  0000 L CNN
+F 1 "10R" H 9480 4660 50  0000 L CNN
+F 2 "" H 9450 4700 50  0001 C CNN
+F 3 "~" H 9450 4700 50  0001 C CNN
+	1    9450 4700
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	9550 4800 9550 4950
+Wire Wire Line
+	9450 4800 9450 4950
+Wire Wire Line
+	9450 4400 9450 4500
+Connection ~ 9450 4500
+Wire Wire Line
+	9450 4500 9450 4600
+Wire Wire Line
+	9550 4500 9550 4600
+Connection ~ 9550 4500
+$Comp
+L Device:C_Small C211
+U 1 1 5DAD73DC
+P 9550 4700
+F 0 "C211" H 9560 4770 50  0000 L CNN
+F 1 "100 pF" H 9560 4620 50  0000 L CNN
+F 2 "" H 9550 4700 50  0001 C CNN
+F 3 "~" H 9550 4700 50  0001 C CNN
+	1    9550 4700
+	1    0    0    -1  
+$EndComp
 $EndSCHEMATC

pcb/discrete/discrete-rf-board/lo.sch-bak

@@ -623,23 +623,19 @@ LO
 $Comp
 L power:GND #PWR0127
 U 1 1 5CB0CCE1
-P 9450 4500
+P 9450 5000
-F 0 "#PWR0127" H 9450 4250 50  0001 C CNN
+F 0 "#PWR0127" H 9450 4750 50  0001 C CNN
-F 1 "GND" H 9450 4350 50  0000 C CNN
+F 1 "GND" H 9450 4850 50  0000 C CNN
-F 2 "" H 9450 4500 50  0001 C CNN
+F 2 "" H 9450 5000 50  0001 C CNN
-F 3 "" H 9450 4500 50  0001 C CNN
+F 3 "" H 9450 5000 50  0001 C CNN
-	1    9450 4500
+	1    9450 5000
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	9450 4400 9450 4450
+	9550 4950 9450 4950
+Connection ~ 9450 4950
 Wire Wire Line
-	9550 4400 9550 4450
+	9450 4950 9450 5000
-Wire Wire Line
-	9550 4450 9450 4450
-Connection ~ 9450 4450
-Wire Wire Line
-	9450 4450 9450 4500
 $Comp
 L Connector:Conn_Coaxial J14
 U 1 1 5CB11865
@@ -963,13 +959,13 @@ Wire Wire Line
 Connection ~ 9450 3200
 Wire Wire Line
 	9450 3200 9450 3250
-Text Notes 9050 4850 0    50   ~ 0
+Text Notes 9050 5350 0    50   ~ 0
 ~~20 dB gain according to SPICE model,\n~~17 dB gain to S parameter model in scikit-rf
 Text Label 9450 2750 0    50   ~ 0
 5V
 Text Notes 9600 2550 0    50   ~ 0
 20 mA bias current
-Text Notes 8550 5150 0    50   ~ 0
+Text Notes 8550 5650 0    50   ~ 0
 Compression point should at ~~-10dBm (~~+10 dBm at output)
 Text HLabel 9450 2650 1    50   Input ~ 0
 5V0
@@ -1389,4 +1385,42 @@ F 3 "" H 9400 4200 50  0001 C CNN
 	1    9400 4200
 	1    0    0    -1  
 $EndComp
+Wire Wire Line
+	9450 4500 9550 4500
+Wire Wire Line
+	9550 4500 9550 4400
+$Comp
+L Device:R_Small R161
+U 1 1 5DAD826A
+P 9450 4700
+F 0 "R161" H 9480 4720 50  0000 L CNN
+F 1 "10R" H 9480 4660 50  0000 L CNN
+F 2 "" H 9450 4700 50  0001 C CNN
+F 3 "~" H 9450 4700 50  0001 C CNN
+	1    9450 4700
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	9550 4800 9550 4950
+Wire Wire Line
+	9450 4800 9450 4950
+Wire Wire Line
+	9450 4400 9450 4500
+Connection ~ 9450 4500
+Wire Wire Line
+	9450 4500 9450 4600
+Wire Wire Line
+	9550 4500 9550 4600
+Connection ~ 9550 4500
+$Comp
+L Device:C_Small C211
+U 1 1 5DAD73DC
+P 9550 4700
+F 0 "C211" H 9560 4770 50  0000 L CNN
+F 1 "100 pF" H 9560 4620 50  0000 L CNN
+F 2 "" H 9550 4700 50  0001 C CNN
+F 3 "~" H 9550 4700 50  0001 C CNN
+	1    9550 4700
+	1    0    0    -1  
+$EndComp
 $EndSCHEMATC

pcb/discrete/discrete-rf-board/mixer.sch

@@ -32,7 +32,7 @@ U 1 1 5D0F3E9F
 P 7350 3950
 AR Path="/5CA6B0B3/5CC199E0/5D0F3E9F" Ref="C29"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D0F3E9F" Ref="C53"  Part="1" 
-F 0 "C53" H 7258 3904 50  0000 R CNN
+F 0 "C29" H 7258 3904 50  0000 R CNN
 F 1 "100 pF RF" H 7258 3995 50  0000 R CNN
 F 2 "" H 7350 3950 50  0001 C CNN
 F 3 "~" H 7350 3950 50  0001 C CNN
@@ -45,7 +45,7 @@ U 1 1 5D0F4BFE
 P 7350 4150
 AR Path="/5CA6B0B3/5CC199E0/5D0F4BFE" Ref="#PWR048"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D0F4BFE" Ref="#PWR074"  Part="1" 
-F 0 "#PWR074" H 7350 3900 50  0001 C CNN
+F 0 "#PWR048" H 7350 3900 50  0001 C CNN
 F 1 "GND" H 7355 3977 50  0000 C CNN
 F 2 "" H 7350 4150 50  0001 C CNN
 F 3 "" H 7350 4150 50  0001 C CNN
@@ -60,7 +60,7 @@ U 1 1 5D0F5E6D
 P 5500 2950
 AR Path="/5CA6B0B3/5CC199E0/5D0F5E6D" Ref="C26"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D0F5E6D" Ref="C50"  Part="1" 
-F 0 "C50" H 5408 2996 50  0000 R CNN
+F 0 "C26" H 5408 2996 50  0000 R CNN
 F 1 "100 pF RF" H 5408 2905 50  0000 R CNN
 F 2 "" H 5500 2950 50  0001 C CNN
 F 3 "~" H 5500 2950 50  0001 C CNN
@@ -77,7 +77,7 @@ U 1 1 5D101264
 P 6300 3200
 AR Path="/5CA6B0B3/5CC199E0/5D101264" Ref="C28"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D101264" Ref="C52"  Part="1" 
-F 0 "C52" H 6310 3270 50  0000 L CNN
+F 0 "C28" H 6310 3270 50  0000 L CNN
 F 1 "DNP 0402" H 6310 3120 50  0000 L CNN
 F 2 "" H 6300 3200 50  0001 C CNN
 F 3 "~" H 6300 3200 50  0001 C CNN
@@ -90,7 +90,7 @@ U 1 1 5D1017A0
 P 6050 2950
 AR Path="/5CA6B0B3/5CC199E0/5D1017A0" Ref="L2"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1017A0" Ref="L6"  Part="1" 
-F 0 "L6" H 6080 2990 50  0000 L CNN
+F 0 "L2" H 6080 2990 50  0000 L CNN
 F 1 "6.8 nH" H 6080 2910 50  0000 L CNN
 F 2 "" H 6050 2950 50  0001 C CNN
 F 3 "~" H 6050 2950 50  0001 C CNN
@@ -103,7 +103,7 @@ U 1 1 5D101EA1
 P 5750 3450
 AR Path="/5CA6B0B3/5CC199E0/5D101EA1" Ref="#PWR045"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D101EA1" Ref="#PWR071"  Part="1" 
-F 0 "#PWR071" H 5750 3200 50  0001 C CNN
+F 0 "#PWR045" H 5750 3200 50  0001 C CNN
 F 1 "GND" H 5750 3300 50  0000 C CNN
 F 2 "" H 5750 3450 50  0001 C CNN
 F 3 "" H 5750 3450 50  0001 C CNN
@@ -116,7 +116,7 @@ U 1 1 5D1020F7
 P 6300 3450
 AR Path="/5CA6B0B3/5CC199E0/5D1020F7" Ref="#PWR046"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1020F7" Ref="#PWR072"  Part="1" 
-F 0 "#PWR072" H 6300 3200 50  0001 C CNN
+F 0 "#PWR046" H 6300 3200 50  0001 C CNN
 F 1 "GND" H 6300 3300 50  0000 C CNN
 F 2 "" H 6300 3450 50  0001 C CNN
 F 3 "" H 6300 3450 50  0001 C CNN
@@ -148,7 +148,7 @@ AR Path="/5CA6B0AA/5CB33251/5CC489AE" Ref="J?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CC489AE" Ref="J?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CC489AE" Ref="J8"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CC489AE" Ref="J10"  Part="1" 
-F 0 "J10" H 9810 4170 50  0000 C CNN
+F 0 "J8" H 9810 4170 50  0000 C CNN
 F 1 "UFL" V 9915 4050 50  0000 C CNN
 F 2 "" H 9800 4050 50  0001 C CNN
 F 3 " ~" H 9800 4050 50  0001 C CNN
@@ -163,7 +163,7 @@ AR Path="/5CA6B0AA/5CB33251/5CC49A0F" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CC49A0F" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CC49A0F" Ref="#PWR055"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CC49A0F" Ref="#PWR081"  Part="1" 
-F 0 "#PWR081" H 9800 4100 50  0001 C CNN
+F 0 "#PWR055" H 9800 4100 50  0001 C CNN
 F 1 "GND" H 9800 4200 50  0000 C CNN
 F 2 "" H 9800 4350 50  0001 C CNN
 F 3 "" H 9800 4350 50  0001 C CNN
@@ -195,7 +195,7 @@ AR Path="/5CA6B0AA/5CB33251/5CBC9FE3" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CBC9FE3" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CBC9FE3" Ref="#PWR052"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CBC9FE3" Ref="#PWR078"  Part="1" 
-F 0 "#PWR078" H 9050 4700 50  0001 C CNN
+F 0 "#PWR052" H 9050 4700 50  0001 C CNN
 F 1 "GND" H 9050 4800 50  0000 C CNN
 F 2 "" H 9050 4950 50  0001 C CNN
 F 3 "" H 9050 4950 50  0001 C CNN
@@ -216,7 +216,7 @@ U 1 1 5D125BFA
 P 7750 5450
 AR Path="/5CA6B0B3/5CC199E0/5D125BFA" Ref="#PWR049"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D125BFA" Ref="#PWR075"  Part="1" 
-F 0 "#PWR075" H 7750 5200 50  0001 C CNN
+F 0 "#PWR049" H 7750 5200 50  0001 C CNN
 F 1 "GND" H 7750 5300 50  0000 C CNN
 F 2 "" H 7750 5450 50  0001 C CNN
 F 3 "" H 7750 5450 50  0001 C CNN
@@ -229,7 +229,7 @@ U 1 1 5D125420
 P 7750 5250
 AR Path="/5CA6B0B3/5CC199E0/5D125420" Ref="C30"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D125420" Ref="C54"  Part="1" 
-F 0 "C54" H 7760 5320 50  0000 L CNN
+F 0 "C30" H 7760 5320 50  0000 L CNN
 F 1 "1 nF" H 7760 5170 50  0000 L CNN
 F 2 "" H 7750 5250 50  0001 C CNN
 F 3 "~" H 7750 5250 50  0001 C CNN
@@ -248,7 +248,7 @@ U 1 1 5D0D0BEF
 P 6450 5150
 AR Path="/5CA6B0B3/5CC199E0/5D0D0BEF" Ref="#PWR047"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D0D0BEF" Ref="#PWR073"  Part="1" 
-F 0 "#PWR073" H 6450 4900 50  0001 C CNN
+F 0 "#PWR047" H 6450 4900 50  0001 C CNN
 F 1 "GND" H 6455 4977 50  0000 C CNN
 F 2 "" H 6450 5150 50  0001 C CNN
 F 3 "" H 6450 5150 50  0001 C CNN
@@ -261,7 +261,7 @@ U 1 1 5D01A78D
 P 7050 4750
 AR Path="/5CA6B0B3/5CC199E0/5D01A78D" Ref="U3"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D01A78D" Ref="U4"  Part="1" 
-F 0 "U4" H 7050 4200 50  0000 C CNN
+F 0 "U3" H 7050 4200 50  0000 C CNN
 F 1 "LT5560EDD#PBF" H 7050 4100 50  0000 C CNN
 F 2 "discrete_footprints:Analog_DFN8-EP" H 7050 4200 50  0001 C CNN
 F 3 "" H 7050 4200 50  0001 C CNN
@@ -315,7 +315,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB6E137" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB6E137" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB6E137" Ref="#PWR054"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB6E137" Ref="#PWR080"  Part="1" 
-F 0 "#PWR080" H 9450 3000 50  0001 C CNN
+F 0 "#PWR054" H 9450 3000 50  0001 C CNN
 F 1 "GND" H 9450 3100 50  0000 C CNN
 F 2 "" H 9450 3250 50  0001 C CNN
 F 3 "" H 9450 3250 50  0001 C CNN
@@ -330,7 +330,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB6DF60" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB6DF60" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB6DF60" Ref="#PWR053"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB6DF60" Ref="#PWR079"  Part="1" 
-F 0 "#PWR079" H 9100 3000 50  0001 C CNN
+F 0 "#PWR053" H 9100 3000 50  0001 C CNN
 F 1 "GND" H 9100 3100 50  0000 C CNN
 F 2 "" H 9100 3250 50  0001 C CNN
 F 3 "" H 9100 3250 50  0001 C CNN
@@ -345,7 +345,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB6DBAF" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB6DBAF" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB6DBAF" Ref="#PWR051"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB6DBAF" Ref="#PWR077"  Part="1" 
-F 0 "#PWR077" H 8700 3000 50  0001 C CNN
+F 0 "#PWR051" H 8700 3000 50  0001 C CNN
 F 1 "GND" H 8700 3100 50  0000 C CNN
 F 2 "" H 8700 3250 50  0001 C CNN
 F 3 "" H 8700 3250 50  0001 C CNN
@@ -360,7 +360,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB6D892" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB6D892" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB6D892" Ref="#PWR050"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB6D892" Ref="#PWR076"  Part="1" 
-F 0 "#PWR076" H 8350 3000 50  0001 C CNN
+F 0 "#PWR050" H 8350 3000 50  0001 C CNN
 F 1 "GND" H 8350 3100 50  0000 C CNN
 F 2 "" H 8350 3250 50  0001 C CNN
 F 3 "" H 8350 3250 50  0001 C CNN
@@ -375,7 +375,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB6B125" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB6B125" Ref="C?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB6B125" Ref="C35"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB6B125" Ref="C59"  Part="1" 
-F 0 "C59" H 9460 3120 50  0000 L CNN
+F 0 "C35" H 9460 3120 50  0000 L CNN
 F 1 "1 nF" H 9460 2970 50  0000 L CNN
 F 2 "" H 9450 3050 50  0001 C CNN
 F 3 "~" H 9450 3050 50  0001 C CNN
@@ -390,7 +390,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB6AE2E" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB6AE2E" Ref="C?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB6AE2E" Ref="C34"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB6AE2E" Ref="C58"  Part="1" 
-F 0 "C58" H 9110 3120 50  0000 L CNN
+F 0 "C34" H 9110 3120 50  0000 L CNN
 F 1 "100 pF" H 9110 2970 50  0000 L CNN
 F 2 "" H 9100 3050 50  0001 C CNN
 F 3 "~" H 9100 3050 50  0001 C CNN
@@ -405,7 +405,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB6AABA" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB6AABA" Ref="C?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB6AABA" Ref="C32"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB6AABA" Ref="C56"  Part="1" 
-F 0 "C56" H 8710 3120 50  0000 L CNN
+F 0 "C32" H 8710 3120 50  0000 L CNN
 F 1 "100 pF" H 8710 2970 50  0000 L CNN
 F 2 "" H 8700 3050 50  0001 C CNN
 F 3 "~" H 8700 3050 50  0001 C CNN
@@ -420,7 +420,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB6A8A7" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB6A8A7" Ref="C?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB6A8A7" Ref="C31"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB6A8A7" Ref="C55"  Part="1" 
-F 0 "C55" H 8360 3120 50  0000 L CNN
+F 0 "C31" H 8360 3120 50  0000 L CNN
 F 1 "100 pF" H 8360 2970 50  0000 L CNN
 F 2 "" H 8350 3050 50  0001 C CNN
 F 3 "~" H 8350 3050 50  0001 C CNN
@@ -437,7 +437,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB40E92" Ref="R?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB40E92" Ref="R?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB40E92" Ref="R21"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB40E92" Ref="R35"  Part="1" 
-F 0 "R35" H 7530 3220 50  0000 L CNN
+F 0 "R21" H 7530 3220 50  0000 L CNN
 F 1 "10R" H 7530 3160 50  0000 L CNN
 F 2 "" H 7500 3200 50  0001 C CNN
 F 3 "~" H 7500 3200 50  0001 C CNN
@@ -452,7 +452,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB3C1D2" Ref="L?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB3C1D2" Ref="L?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB3C1D2" Ref="L3"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB3C1D2" Ref="L7"  Part="1" 
-F 0 "L7" H 8080 3540 50  0000 L CNN
+F 0 "L3" H 8080 3540 50  0000 L CNN
 F 1 "330 nH" H 8080 3460 50  0000 L CNN
 F 2 "" H 8050 3500 50  0001 C CNN
 F 3 "~" H 8050 3500 50  0001 C CNN
@@ -474,7 +474,7 @@ U 1 1 5D15BCFB
 P 8150 4800
 AR Path="/5CA6B0B3/5CC199E0/5D15BCFB" Ref="L5"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D15BCFB" Ref="L9"  Part="1" 
-F 0 "L9" H 8180 4840 50  0000 L CNN
+F 0 "L5" H 8180 4840 50  0000 L CNN
 F 1 "27 nH" H 8180 4760 50  0000 L CNN
 F 2 "" H 8150 4800 50  0001 C CNN
 F 3 "~" H 8150 4800 50  0001 C CNN
@@ -487,7 +487,7 @@ U 1 1 5D15EADF
 P 8150 4500
 AR Path="/5CA6B0B3/5CC199E0/5D15EADF" Ref="L4"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D15EADF" Ref="L8"  Part="1" 
-F 0 "L8" H 8180 4540 50  0000 L CNN
+F 0 "L4" H 8180 4540 50  0000 L CNN
 F 1 "27 nH" H 8180 4460 50  0000 L CNN
 F 2 "" H 8150 4500 50  0001 C CNN
 F 3 "~" H 8150 4500 50  0001 C CNN
@@ -510,7 +510,7 @@ U 1 1 5D169258
 P 9050 4650
 AR Path="/5CA6B0B3/5CC199E0/5D169258" Ref="C33"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D169258" Ref="C57"  Part="1" 
-F 0 "C57" H 9060 4720 50  0000 L CNN
+F 0 "C33" H 9060 4720 50  0000 L CNN
 F 1 "2.2 pF RF" H 9060 4570 50  0000 L CNN
 F 2 "" H 9050 4650 50  0001 C CNN
 F 3 "~" H 9050 4650 50  0001 C CNN
@@ -541,7 +541,7 @@ U 1 1 5D18C9DE
 P 4950 4700
 AR Path="/5CA6B0B3/5CC199E0/5D18C9DE" Ref="R19"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D18C9DE" Ref="R33"  Part="1" 
-F 0 "R33" H 4980 4720 50  0000 L CNN
+F 0 "R19" H 4980 4720 50  0000 L CNN
 F 1 "100k" H 4980 4660 50  0000 L CNN
 F 2 "" H 4950 4700 50  0001 C CNN
 F 3 "~" H 4950 4700 50  0001 C CNN
@@ -554,7 +554,7 @@ U 1 1 5D18CEC8
 P 4950 4800
 AR Path="/5CA6B0B3/5CC199E0/5D18CEC8" Ref="R20"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D18CEC8" Ref="R34"  Part="1" 
-F 0 "R34" H 4980 4820 50  0000 L CNN
+F 0 "R20" H 4980 4820 50  0000 L CNN
 F 1 "100k" H 4980 4760 50  0000 L CNN
 F 2 "" H 4950 4800 50  0001 C CNN
 F 3 "~" H 4950 4800 50  0001 C CNN
@@ -571,7 +571,7 @@ U 1 1 5D19065F
 P 4600 5050
 AR Path="/5CA6B0B3/5CC199E0/5D19065F" Ref="C23"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D19065F" Ref="C47"  Part="1" 
-F 0 "C47" H 4610 5120 50  0000 L CNN
+F 0 "C23" H 4610 5120 50  0000 L CNN
 F 1 "1 nF" H 4610 4970 50  0000 L CNN
 F 2 "" H 4600 5050 50  0001 C CNN
 F 3 "~" H 4600 5050 50  0001 C CNN
@@ -593,7 +593,7 @@ U 1 1 5D193951
 P 4600 5250
 AR Path="/5CA6B0B3/5CC199E0/5D193951" Ref="#PWR041"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D193951" Ref="#PWR067"  Part="1" 
-F 0 "#PWR067" H 4600 5000 50  0001 C CNN
+F 0 "#PWR041" H 4600 5000 50  0001 C CNN
 F 1 "GND" H 4600 5100 50  0000 C CNN
 F 2 "" H 4600 5250 50  0001 C CNN
 F 3 "" H 4600 5250 50  0001 C CNN
@@ -617,7 +617,7 @@ U 1 1 5D1B2EB0
 P 3000 5000
 AR Path="/5CA6B0B3/5CC199E0/5D1B2EB0" Ref="#PWR033"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1B2EB0" Ref="#PWR059"  Part="1" 
-F 0 "#PWR059" H 3000 4750 50  0001 C CNN
+F 0 "#PWR033" H 3000 4750 50  0001 C CNN
 F 1 "GND" H 3000 4850 50  0000 C CNN
 F 2 "" H 3000 5000 50  0001 C CNN
 F 3 "" H 3000 5000 50  0001 C CNN
@@ -637,7 +637,7 @@ U 1 1 5D1B6E50
 P 3700 4100
 AR Path="/5CA6B0B3/5CC199E0/5D1B6E50" Ref="R18"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1B6E50" Ref="R32"  Part="1" 
-F 0 "R32" H 3730 4120 50  0000 L CNN
+F 0 "R18" H 3730 4120 50  0000 L CNN
 F 1 "10kR" H 3730 4060 50  0000 L CNN
 F 2 "" H 3700 4100 50  0001 C CNN
 F 3 "~" H 3700 4100 50  0001 C CNN
@@ -661,7 +661,7 @@ U 1 1 5D1CE967
 P 3400 5450
 AR Path="/5CA6B0B3/5CC199E0/5D1CE967" Ref="R17"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1CE967" Ref="R31"  Part="1" 
-F 0 "R31" H 3430 5470 50  0000 L CNN
+F 0 "R17" H 3430 5470 50  0000 L CNN
 F 1 "4k7R" H 3430 5410 50  0000 L CNN
 F 2 "" H 3400 5450 50  0001 C CNN
 F 3 "~" H 3400 5450 50  0001 C CNN
@@ -710,8 +710,8 @@ U 1 1 5D1EB863
 P 3500 6400
 AR Path="/5CA6B0B3/5CC199E0/5D1EB863" Ref="C17"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1EB863" Ref="C41"  Part="1" 
-F 0 "C41" H 3510 6470 50  0000 L CNN
+F 0 "C17" H 3510 6470 50  0000 L CNN
-F 1 "C_Small" H 3510 6320 50  0000 L CNN
+F 1 "100 pF" H 3510 6320 50  0000 L CNN
 F 2 "" H 3500 6400 50  0001 C CNN
 F 3 "~" H 3500 6400 50  0001 C CNN
 	1    3500 6400
@@ -723,8 +723,8 @@ U 1 1 5D1EBDD5
 P 3850 6400
 AR Path="/5CA6B0B3/5CC199E0/5D1EBDD5" Ref="C19"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1EBDD5" Ref="C43"  Part="1" 
-F 0 "C43" H 3860 6470 50  0000 L CNN
+F 0 "C19" H 3860 6470 50  0000 L CNN
-F 1 "C_Small" H 3860 6320 50  0000 L CNN
+F 1 "1 nF" H 3860 6320 50  0000 L CNN
 F 2 "" H 3850 6400 50  0001 C CNN
 F 3 "~" H 3850 6400 50  0001 C CNN
 	1    3850 6400
@@ -736,8 +736,8 @@ U 1 1 5D1EC2AA
 P 4250 6400
 AR Path="/5CA6B0B3/5CC199E0/5D1EC2AA" Ref="C21"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1EC2AA" Ref="C45"  Part="1" 
-F 0 "C45" H 4260 6470 50  0000 L CNN
+F 0 "C21" H 4260 6470 50  0000 L CNN
-F 1 "C_Small" H 4260 6320 50  0000 L CNN
+F 1 "10 nF" H 4260 6320 50  0000 L CNN
 F 2 "" H 4250 6400 50  0001 C CNN
 F 3 "~" H 4250 6400 50  0001 C CNN
 	1    4250 6400
@@ -749,7 +749,7 @@ U 1 1 5D1F5C64
 P 4250 6600
 AR Path="/5CA6B0B3/5CC199E0/5D1F5C64" Ref="#PWR039"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1F5C64" Ref="#PWR065"  Part="1" 
-F 0 "#PWR065" H 4250 6350 50  0001 C CNN
+F 0 "#PWR039" H 4250 6350 50  0001 C CNN
 F 1 "GND" H 4250 6450 50  0000 C CNN
 F 2 "" H 4250 6600 50  0001 C CNN
 F 3 "" H 4250 6600 50  0001 C CNN
@@ -762,7 +762,7 @@ U 1 1 5D1F5F88
 P 3850 6600
 AR Path="/5CA6B0B3/5CC199E0/5D1F5F88" Ref="#PWR037"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1F5F88" Ref="#PWR063"  Part="1" 
-F 0 "#PWR063" H 3850 6350 50  0001 C CNN
+F 0 "#PWR037" H 3850 6350 50  0001 C CNN
 F 1 "GND" H 3850 6450 50  0000 C CNN
 F 2 "" H 3850 6600 50  0001 C CNN
 F 3 "" H 3850 6600 50  0001 C CNN
@@ -775,7 +775,7 @@ U 1 1 5D1F629A
 P 3500 6600
 AR Path="/5CA6B0B3/5CC199E0/5D1F629A" Ref="#PWR035"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1F629A" Ref="#PWR061"  Part="1" 
-F 0 "#PWR061" H 3500 6350 50  0001 C CNN
+F 0 "#PWR035" H 3500 6350 50  0001 C CNN
 F 1 "GND" H 3500 6450 50  0000 C CNN
 F 2 "" H 3500 6600 50  0001 C CNN
 F 3 "" H 3500 6600 50  0001 C CNN
@@ -810,7 +810,7 @@ U 1 1 5D11C60F
 P 2050 3450
 AR Path="/5CA6B0B3/5CC199E0/5D11C60F" Ref="Q3"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D11C60F" Ref="Q12"  Part="1" 
-F 0 "Q12" H 2241 3496 50  0000 L CNN
+F 0 "Q3" H 2241 3496 50  0000 L CNN
 F 1 "Q_NPN_BCE" H 2241 3405 50  0000 L CNN
 F 2 "" H 2250 3550 50  0001 C CNN
 F 3 "~" H 2050 3450 50  0001 C CNN
@@ -823,7 +823,7 @@ U 1 1 5D1A4BF9
 P 1800 2950
 AR Path="/5CA6B0B3/5CC199E0/5D1A4BF9" Ref="R11"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A4BF9" Ref="R25"  Part="1" 
-F 0 "R25" H 1859 2996 50  0000 L CNN
+F 0 "R11" H 1859 2996 50  0000 L CNN
 F 1 "22R" H 1859 2905 50  0000 L CNN
 F 2 "" H 1800 2950 50  0001 C CNN
 F 3 "~" H 1800 2950 50  0001 C CNN
@@ -836,7 +836,7 @@ U 1 1 5D1A519D
 P 2750 2900
 AR Path="/5CA6B0B3/5CC199E0/5D1A519D" Ref="R15"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A519D" Ref="R29"  Part="1" 
-F 0 "R29" H 2809 2946 50  0000 L CNN
+F 0 "R15" H 2809 2946 50  0000 L CNN
 F 1 "22R" H 2809 2855 50  0000 L CNN
 F 2 "" H 2750 2900 50  0001 C CNN
 F 3 "~" H 2750 2900 50  0001 C CNN
@@ -849,7 +849,7 @@ U 1 1 5D1A606E
 P 1400 2250
 AR Path="/5CA6B0B3/5CC199E0/5D1A606E" Ref="R10"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A606E" Ref="R24"  Part="1" 
-F 0 "R24" H 1459 2296 50  0000 L CNN
+F 0 "R10" H 1459 2296 50  0000 L CNN
 F 1 "4k7R" H 1459 2205 50  0000 L CNN
 F 2 "" H 1400 2250 50  0001 C CNN
 F 3 "~" H 1400 2250 50  0001 C CNN
@@ -862,7 +862,7 @@ U 1 1 5D1A670A
 P 3200 2200
 AR Path="/5CA6B0B3/5CC199E0/5D1A670A" Ref="R16"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A670A" Ref="R30"  Part="1" 
-F 0 "R30" H 3259 2246 50  0000 L CNN
+F 0 "R16" H 3259 2246 50  0000 L CNN
 F 1 "4k7R" H 3259 2155 50  0000 L CNN
 F 2 "" H 3200 2200 50  0001 C CNN
 F 3 "~" H 3200 2200 50  0001 C CNN
@@ -875,7 +875,7 @@ U 1 1 5D1A740A
 P 2150 3900
 AR Path="/5CA6B0B3/5CC199E0/5D1A740A" Ref="R13"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A740A" Ref="R27"  Part="1" 
-F 0 "R27" H 2209 3946 50  0000 L CNN
+F 0 "R13" H 2209 3946 50  0000 L CNN
 F 1 "25R" H 2209 3855 50  0000 L CNN
 F 2 "" H 2150 3900 50  0001 C CNN
 F 3 "~" H 2150 3900 50  0001 C CNN
@@ -888,7 +888,7 @@ U 1 1 5D1A78D7
 P 1250 3250
 AR Path="/5CA6B0B3/5CC199E0/5D1A78D7" Ref="R8"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A78D7" Ref="R22"  Part="1" 
-F 0 "R22" H 1309 3296 50  0000 L CNN
+F 0 "R8" H 1309 3296 50  0000 L CNN
 F 1 "2k5R" H 1309 3205 50  0000 L CNN
 F 2 "" H 1250 3250 50  0001 C CNN
 F 3 "~" H 1250 3250 50  0001 C CNN
@@ -901,7 +901,7 @@ U 1 1 5D1A7E71
 P 1250 3700
 AR Path="/5CA6B0B3/5CC199E0/5D1A7E71" Ref="R9"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A7E71" Ref="R23"  Part="1" 
-F 0 "R23" H 1309 3746 50  0000 L CNN
+F 0 "R9" H 1309 3746 50  0000 L CNN
 F 1 "1kR" H 1309 3655 50  0000 L CNN
 F 2 "" H 1250 3700 50  0001 C CNN
 F 3 "~" H 1250 3700 50  0001 C CNN
@@ -914,7 +914,7 @@ U 1 1 5D1A89A5
 P 2150 4100
 AR Path="/5CA6B0B3/5CC199E0/5D1A89A5" Ref="#PWR032"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A89A5" Ref="#PWR058"  Part="1" 
-F 0 "#PWR058" H 2150 3850 50  0001 C CNN
+F 0 "#PWR032" 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
@@ -927,7 +927,7 @@ U 1 1 5D1A9311
 P 1250 3900
 AR Path="/5CA6B0B3/5CC199E0/5D1A9311" Ref="#PWR030"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A9311" Ref="#PWR056"  Part="1" 
-F 0 "#PWR056" H 1250 3650 50  0001 C CNN
+F 0 "#PWR030" H 1250 3650 50  0001 C CNN
 F 1 "GND" H 1255 3727 50  0000 C CNN
 F 2 "" H 1250 3900 50  0001 C CNN
 F 3 "" H 1250 3900 50  0001 C CNN
@@ -940,7 +940,7 @@ U 1 1 5D1ABF37
 P 1750 3900
 AR Path="/5CA6B0B3/5CC199E0/5D1ABF37" Ref="#PWR031"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1ABF37" Ref="#PWR057"  Part="1" 
-F 0 "#PWR057" H 1750 3650 50  0001 C CNN
+F 0 "#PWR031" H 1750 3650 50  0001 C CNN
 F 1 "GND" H 1755 3727 50  0000 C CNN
 F 2 "" H 1750 3900 50  0001 C CNN
 F 3 "" H 1750 3900 50  0001 C CNN
@@ -953,7 +953,7 @@ U 1 1 5D1AC551
 P 1750 3700
 AR Path="/5CA6B0B3/5CC199E0/5D1AC551" Ref="C14"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1AC551" Ref="C38"  Part="1" 
-F 0 "C38" H 1760 3770 50  0000 L CNN
+F 0 "C14" H 1760 3770 50  0000 L CNN
 F 1 "0.1 uF" H 1760 3620 50  0000 L CNN
 F 2 "" H 1750 3700 50  0001 C CNN
 F 3 "~" H 1750 3700 50  0001 C CNN
@@ -966,7 +966,7 @@ U 1 1 5D1AD1B8
 P 1200 2550
 AR Path="/5CA6B0B3/5CC199E0/5D1AD1B8" Ref="C13"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1AD1B8" Ref="C37"  Part="1" 
-F 0 "C37" V 971 2550 50  0000 C CNN
+F 0 "C13" V 971 2550 50  0000 C CNN
 F 1 "0.1 uF" V 1062 2550 50  0000 C CNN
 F 2 "" H 1200 2550 50  0001 C CNN
 F 3 "~" H 1200 2550 50  0001 C CNN
@@ -979,7 +979,7 @@ U 1 1 5D1ADA21
 P 3200 2650
 AR Path="/5CA6B0B3/5CC199E0/5D1ADA21" Ref="C15"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1ADA21" Ref="C39"  Part="1" 
-F 0 "C39" H 3108 2604 50  0000 R CNN
+F 0 "C15" H 3108 2604 50  0000 R CNN
 F 1 "0.1 uF" H 3108 2695 50  0000 R CNN
 F 2 "" H 3200 2650 50  0001 C CNN
 F 3 "~" H 3200 2650 50  0001 C CNN
@@ -992,7 +992,7 @@ U 1 1 5D1AE084
 P 3200 2850
 AR Path="/5CA6B0B3/5CC199E0/5D1AE084" Ref="#PWR034"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1AE084" Ref="#PWR060"  Part="1" 
-F 0 "#PWR060" H 3200 2600 50  0001 C CNN
+F 0 "#PWR034" H 3200 2600 50  0001 C CNN
 F 1 "GND" H 3205 2677 50  0000 C CNN
 F 2 "" H 3200 2850 50  0001 C CNN
 F 3 "" H 3200 2850 50  0001 C CNN
@@ -1084,7 +1084,7 @@ U 1 1 5D271283
 P 1200 2000
 AR Path="/5CA6B0B3/5CC199E0/5D271283" Ref="C12"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D271283" Ref="C36"  Part="1" 
-F 0 "C36" V 971 2000 50  0000 C CNN
+F 0 "C12" V 971 2000 50  0000 C CNN
 F 1 "0.1 uF" V 1062 2000 50  0000 C CNN
 F 2 "" H 1200 2000 50  0001 C CNN
 F 3 "~" H 1200 2000 50  0001 C CNN
@@ -1097,7 +1097,7 @@ U 1 1 5D271572
 P 3450 2000
 AR Path="/5CA6B0B3/5CC199E0/5D271572" Ref="C16"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D271572" Ref="C40"  Part="1" 
-F 0 "C40" V 3221 2000 50  0000 C CNN
+F 0 "C16" V 3221 2000 50  0000 C CNN
 F 1 "0.1 uF" V 3312 2000 50  0000 C CNN
 F 2 "" H 3450 2000 50  0001 C CNN
 F 3 "~" H 3450 2000 50  0001 C CNN
@@ -1138,7 +1138,7 @@ U 1 1 5D1CC964
 P 8700 4650
 AR Path="/5CA6B0B3/5CC199E0/5D1CC964" Ref="T1"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1CC964" Ref="T2"  Part="1" 
-F 0 "T2" H 8700 4900 50  0000 C CNN
+F 0 "T1" H 8700 4900 50  0000 C CNN
 F 1 "HHM1515B2" H 8700 4400 50  0000 C CNN
 F 2 "discrete_footprints:TDK_HHM1515B2" H 8700 4650 50  0001 C CNN
 F 3 "" H 8700 4650 50  0001 C CNN
@@ -1158,7 +1158,7 @@ U 1 1 5D21806D
 P 2000 1900
 AR Path="/5CA6B0B3/5CC199E0/5D21806D" Ref="R12"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D21806D" Ref="R26"  Part="1" 
-F 0 "R26" H 2059 1946 50  0000 L CNN
+F 0 "R12" H 2059 1946 50  0000 L CNN
 F 1 "1kR" H 2059 1855 50  0000 L CNN
 F 2 "" H 2000 1900 50  0001 C CNN
 F 3 "~" H 2000 1900 50  0001 C CNN
@@ -1171,7 +1171,7 @@ U 1 1 5D218880
 P 2550 1900
 AR Path="/5CA6B0B3/5CC199E0/5D218880" Ref="R14"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D218880" Ref="R28"  Part="1" 
-F 0 "R28" H 2609 1946 50  0000 L CNN
+F 0 "R14" H 2609 1946 50  0000 L CNN
 F 1 "1kR" H 2609 1855 50  0000 L CNN
 F 2 "" H 2550 1900 50  0001 C CNN
 F 3 "~" H 2550 1900 50  0001 C CNN
@@ -1206,7 +1206,7 @@ U 1 1 5D100E2B
 P 5750 3200
 AR Path="/5CA6B0B3/5CC199E0/5D100E2B" Ref="C27"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D100E2B" Ref="C51"  Part="1" 
-F 0 "C51" H 5760 3270 50  0000 L CNN
+F 0 "C27" H 5760 3270 50  0000 L CNN
 F 1 "DNP 0402" H 5760 3120 50  0000 L CNN
 F 2 "" H 5750 3200 50  0001 C CNN
 F 3 "~" H 5750 3200 50  0001 C CNN
@@ -1223,7 +1223,7 @@ AR Path="/5CA6B0AA/5CB33251/5D84EA74" Ref="J?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5D84EA74" Ref="J?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5D84EA74" Ref="J7"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D84EA74" Ref="J9"  Part="1" 
-F 0 "J9" H 4860 3320 50  0000 C CNN
+F 0 "J7" H 4860 3320 50  0000 C CNN
 F 1 "UFL" V 4965 3200 50  0000 C CNN
 F 2 "" H 4850 3200 50  0001 C CNN
 F 3 " ~" H 4850 3200 50  0001 C CNN
@@ -1241,7 +1241,7 @@ U 1 1 5D85A260
 P 4850 3500
 AR Path="/5CA6B0B3/5CC199E0/5D85A260" Ref="#PWR043"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D85A260" Ref="#PWR069"  Part="1" 
-F 0 "#PWR069" H 4850 3250 50  0001 C CNN
+F 0 "#PWR043" H 4850 3250 50  0001 C CNN
 F 1 "GND" H 4850 3350 50  0000 C CNN
 F 2 "" H 4850 3500 50  0001 C CNN
 F 3 "" H 4850 3500 50  0001 C CNN
@@ -1264,7 +1264,7 @@ AR Path="/5CA6B0AA/5CB33251/5DADE110" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5DADE110" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5DADE110" Ref="#PWR036"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5DADE110" Ref="#PWR062"  Part="1" 
-F 0 "#PWR062" H 3800 1400 50  0001 C CNN
+F 0 "#PWR036" H 3800 1400 50  0001 C CNN
 F 1 "GND" H 3800 1500 50  0000 C CNN
 F 2 "" H 3800 1650 50  0001 C CNN
 F 3 "" H 3800 1650 50  0001 C CNN
@@ -1279,7 +1279,7 @@ AR Path="/5CA6B0AA/5CB33251/5DADE116" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5DADE116" Ref="C?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5DADE116" Ref="C18"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5DADE116" Ref="C42"  Part="1" 
-F 0 "C42" H 3810 1520 50  0000 L CNN
+F 0 "C18" H 3810 1520 50  0000 L CNN
 F 1 "1 nF" H 3810 1370 50  0000 L CNN
 F 2 "" H 3800 1450 50  0001 C CNN
 F 3 "~" H 3800 1450 50  0001 C CNN
@@ -1296,7 +1296,7 @@ AR Path="/5CA6B0AA/5CB33251/5DAE8BF5" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5DAE8BF5" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5DAE8BF5" Ref="#PWR038"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5DAE8BF5" Ref="#PWR064"  Part="1" 
-F 0 "#PWR064" H 4150 1400 50  0001 C CNN
+F 0 "#PWR038" H 4150 1400 50  0001 C CNN
 F 1 "GND" H 4150 1500 50  0000 C CNN
 F 2 "" H 4150 1650 50  0001 C CNN
 F 3 "" H 4150 1650 50  0001 C CNN
@@ -1311,7 +1311,7 @@ AR Path="/5CA6B0AA/5CB33251/5DAE8BFB" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5DAE8BFB" Ref="C?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5DAE8BFB" Ref="C20"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5DAE8BFB" Ref="C44"  Part="1" 
-F 0 "C44" H 4160 1520 50  0000 L CNN
+F 0 "C20" H 4160 1520 50  0000 L CNN
 F 1 "10 nF" H 4160 1370 50  0000 L CNN
 F 2 "" H 4150 1450 50  0001 C CNN
 F 3 "~" H 4150 1450 50  0001 C CNN
@@ -1334,7 +1334,7 @@ AR Path="/5CA6B0AA/5CB33251/5DB0FBEB" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5DB0FBEB" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5DB0FBEB" Ref="#PWR042"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5DB0FBEB" Ref="#PWR068"  Part="1" 
-F 0 "#PWR068" H 4750 4050 50  0001 C CNN
+F 0 "#PWR042" H 4750 4050 50  0001 C CNN
 F 1 "GND" H 4750 4150 50  0000 C CNN
 F 2 "" H 4750 4300 50  0001 C CNN
 F 3 "" H 4750 4300 50  0001 C CNN
@@ -1349,7 +1349,7 @@ AR Path="/5CA6B0AA/5CB33251/5DB0FBF1" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5DB0FBF1" Ref="C?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5DB0FBF1" Ref="C24"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5DB0FBF1" Ref="C48"  Part="1" 
-F 0 "C48" H 4760 4170 50  0000 L CNN
+F 0 "C24" H 4760 4170 50  0000 L CNN
 F 1 "0.1 uF" H 4760 4020 50  0000 L CNN
 F 2 "" H 4750 4100 50  0001 C CNN
 F 3 "~" H 4750 4100 50  0001 C CNN
@@ -1370,7 +1370,7 @@ AR Path="/5CA6B0AA/5CB33251/5DB0FBFA" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5DB0FBFA" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5DB0FBFA" Ref="#PWR044"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5DB0FBFA" Ref="#PWR070"  Part="1" 
-F 0 "#PWR070" H 5100 4050 50  0001 C CNN
+F 0 "#PWR044" H 5100 4050 50  0001 C CNN
 F 1 "GND" H 5100 4150 50  0000 C CNN
 F 2 "" H 5100 4300 50  0001 C CNN
 F 3 "" H 5100 4300 50  0001 C CNN
@@ -1385,7 +1385,7 @@ AR Path="/5CA6B0AA/5CB33251/5DB0FC00" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5DB0FC00" Ref="C?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5DB0FC00" Ref="C25"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5DB0FC00" Ref="C49"  Part="1" 
-F 0 "C49" H 5110 4170 50  0000 L CNN
+F 0 "C25" H 5110 4170 50  0000 L CNN
 F 1 "0.1 uF" H 5110 4020 50  0000 L CNN
 F 2 "" H 5100 4100 50  0001 C CNN
 F 3 "~" H 5100 4100 50  0001 C CNN
@@ -1405,7 +1405,7 @@ AR Path="/5CA6B0AA/5CB33251/5DB1C7E1" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5DB1C7E1" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5DB1C7E1" Ref="#PWR040"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5DB1C7E1" Ref="#PWR066"  Part="1" 
-F 0 "#PWR066" H 4450 1400 50  0001 C CNN
+F 0 "#PWR040" H 4450 1400 50  0001 C CNN
 F 1 "GND" H 4450 1500 50  0000 C CNN
 F 2 "" H 4450 1650 50  0001 C CNN
 F 3 "" H 4450 1650 50  0001 C CNN
@@ -1420,7 +1420,7 @@ AR Path="/5CA6B0AA/5CB33251/5DB1C7E7" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5DB1C7E7" Ref="C?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5DB1C7E7" Ref="C22"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5DB1C7E7" Ref="C46"  Part="1" 
-F 0 "C46" H 4460 1520 50  0000 L CNN
+F 0 "C22" H 4460 1520 50  0000 L CNN
 F 1 "0.1 uF" H 4460 1370 50  0000 L CNN
 F 2 "" H 4450 1450 50  0001 C CNN
 F 3 "~" H 4450 1450 50  0001 C CNN
@@ -1442,7 +1442,7 @@ AR Path="/5CA6B0AA/5CC4DFC2/5D95D727" Ref="Q?"  Part="1"
 AR Path="/5CA6B0AA/5CC9409A/5D95D727" Ref="Q?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5D95D727" Ref="Q1"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D95D727" Ref="Q6"  Part="1" 
-F 0 "Q6" H 1900 2600 50  0000 L CNN
+F 0 "Q1" H 1900 2600 50  0000 L CNN
 F 1 "NSVT65011MW6T1G" H 1900 2500 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 1900 2650 50  0001 C CNN
 F 3 "~" H 1700 2550 50  0001 C CNN
@@ -1458,7 +1458,7 @@ AR Path="/5CA6B0AA/5CC4DFC2/5D95D72D" Ref="Q?"  Part="2"
 AR Path="/5CA6B0AA/5CC9409A/5D95D72D" Ref="Q?"  Part="2" 
 AR Path="/5CA6B0B3/5CC199E0/5D95D72D" Ref="Q1"  Part="2" 
 AR Path="/5CA6B0B3/5CC199E2/5D95D72D" Ref="Q6"  Part="2" 
-F 0 "Q6" H 3050 2500 50  0000 L CNN
+F 0 "Q1" H 3050 2500 50  0000 L CNN
 F 1 "NSVT65011MW6T1G" H 3050 2400 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 3050 2550 50  0001 C CNN
 F 3 "~" H 2850 2450 50  0001 C CNN
@@ -1473,7 +1473,7 @@ AR Path="/5CA6B0AA/5CC4DFC2/5D987D02" Ref="Q?"  Part="1"
 AR Path="/5CA6B0AA/5CC9409A/5D987D02" Ref="Q?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5D987D02" Ref="Q5"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D987D02" Ref="Q9"  Part="1" 
-F 0 "Q9" H 5500 5600 50  0000 L CNN
+F 0 "Q5" H 5500 5600 50  0000 L CNN
 F 1 "NSVT65011MW6T1G" H 5500 5500 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 5500 5650 50  0001 C CNN
 F 3 "~" H 5300 5550 50  0001 C CNN
@@ -1489,7 +1489,7 @@ AR Path="/5CA6B0AA/5CC4DFC2/5D988714" Ref="Q?"  Part="2"
 AR Path="/5CA6B0AA/5CC9409A/5D988714" Ref="Q?"  Part="2" 
 AR Path="/5CA6B0B3/5CC199E0/5D988714" Ref="Q5"  Part="2" 
 AR Path="/5CA6B0B3/5CC199E2/5D988714" Ref="Q9"  Part="2" 
-F 0 "Q9" H 6200 5600 50  0000 L CNN
+F 0 "Q5" H 6200 5600 50  0000 L CNN
 F 1 "NSVT65011MW6T1G" H 6200 5500 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 6200 5650 50  0001 C CNN
 F 3 "~" H 6000 5550 50  0001 C CNN
@@ -1502,7 +1502,7 @@ U 1 1 5D991933
 P 1900 1650
 AR Path="/5CA6B0B3/5CC199E0/5D991933" Ref="Q2"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D991933" Ref="Q7"  Part="1" 
-F 0 "Q7" H 2100 1700 50  0000 L CNN
+F 0 "Q2" H 2100 1700 50  0000 L CNN
 F 1 "BCM857BS-7-F" H 2100 1600 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 2100 1750 50  0001 C CNN
 F 3 "~" H 1900 1650 50  0001 C CNN
@@ -1516,7 +1516,7 @@ U 2 1 5D992D74
 P 2650 1650
 AR Path="/5CA6B0B3/5CC199E0/5D992D74" Ref="Q2"  Part="2" 
 AR Path="/5CA6B0B3/5CC199E2/5D992D74" Ref="Q7"  Part="2" 
-F 0 "Q7" H 2850 1700 50  0000 L CNN
+F 0 "Q2" H 2850 1700 50  0000 L CNN
 F 1 "BCM857BS-7-F" H 2850 1600 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 2850 1750 50  0001 C CNN
 F 3 "~" H 2650 1650 50  0001 C CNN
@@ -1529,7 +1529,7 @@ U 1 1 5D9CC5B4
 P 4250 4700
 AR Path="/5CA6B0B3/5CC199E0/5D9CC5B4" Ref="Q4"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D9CC5B4" Ref="Q8"  Part="1" 
-F 0 "Q8" H 4450 4750 50  0000 L CNN
+F 0 "Q4" H 4450 4750 50  0000 L CNN
 F 1 "BCM857BS-7-F" H 4450 4650 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 4450 4800 50  0001 C CNN
 F 3 "~" H 4250 4700 50  0001 C CNN
@@ -1543,7 +1543,7 @@ U 2 1 5D9CE704
 P 3300 4950
 AR Path="/5CA6B0B3/5CC199E0/5D9CE704" Ref="Q4"  Part="2" 
 AR Path="/5CA6B0B3/5CC199E2/5D9CE704" Ref="Q8"  Part="2" 
-F 0 "Q8" H 3500 5000 50  0000 L CNN
+F 0 "Q4" H 3500 5000 50  0000 L CNN
 F 1 "BCM857BS-7-F" H 3500 4900 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 3500 5050 50  0001 C CNN
 F 3 "~" H 3300 4950 50  0001 C CNN

pcb/discrete/discrete-rf-board/mixer.sch-bak

@@ -4,7 +4,7 @@ EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 3 19
+Sheet 4 19
 Title ""
 Date ""
 Rev ""
@@ -32,7 +32,7 @@ U 1 1 5D0F3E9F
 P 7350 3950
 AR Path="/5CA6B0B3/5CC199E0/5D0F3E9F" Ref="C29"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D0F3E9F" Ref="C53"  Part="1" 
-F 0 "C53" H 7258 3904 50  0000 R CNN
+F 0 "C29" H 7258 3904 50  0000 R CNN
 F 1 "100 pF RF" H 7258 3995 50  0000 R CNN
 F 2 "" H 7350 3950 50  0001 C CNN
 F 3 "~" H 7350 3950 50  0001 C CNN
@@ -45,7 +45,7 @@ U 1 1 5D0F4BFE
 P 7350 4150
 AR Path="/5CA6B0B3/5CC199E0/5D0F4BFE" Ref="#PWR048"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D0F4BFE" Ref="#PWR074"  Part="1" 
-F 0 "#PWR074" H 7350 3900 50  0001 C CNN
+F 0 "#PWR048" H 7350 3900 50  0001 C CNN
 F 1 "GND" H 7355 3977 50  0000 C CNN
 F 2 "" H 7350 4150 50  0001 C CNN
 F 3 "" H 7350 4150 50  0001 C CNN
@@ -60,7 +60,7 @@ U 1 1 5D0F5E6D
 P 5500 2950
 AR Path="/5CA6B0B3/5CC199E0/5D0F5E6D" Ref="C26"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D0F5E6D" Ref="C50"  Part="1" 
-F 0 "C50" H 5408 2996 50  0000 R CNN
+F 0 "C26" H 5408 2996 50  0000 R CNN
 F 1 "100 pF RF" H 5408 2905 50  0000 R CNN
 F 2 "" H 5500 2950 50  0001 C CNN
 F 3 "~" H 5500 2950 50  0001 C CNN
@@ -77,7 +77,7 @@ U 1 1 5D101264
 P 6300 3200
 AR Path="/5CA6B0B3/5CC199E0/5D101264" Ref="C28"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D101264" Ref="C52"  Part="1" 
-F 0 "C52" H 6310 3270 50  0000 L CNN
+F 0 "C28" H 6310 3270 50  0000 L CNN
 F 1 "DNP 0402" H 6310 3120 50  0000 L CNN
 F 2 "" H 6300 3200 50  0001 C CNN
 F 3 "~" H 6300 3200 50  0001 C CNN
@@ -90,7 +90,7 @@ U 1 1 5D1017A0
 P 6050 2950
 AR Path="/5CA6B0B3/5CC199E0/5D1017A0" Ref="L2"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1017A0" Ref="L6"  Part="1" 
-F 0 "L6" H 6080 2990 50  0000 L CNN
+F 0 "L2" H 6080 2990 50  0000 L CNN
 F 1 "6.8 nH" H 6080 2910 50  0000 L CNN
 F 2 "" H 6050 2950 50  0001 C CNN
 F 3 "~" H 6050 2950 50  0001 C CNN
@@ -103,7 +103,7 @@ U 1 1 5D101EA1
 P 5750 3450
 AR Path="/5CA6B0B3/5CC199E0/5D101EA1" Ref="#PWR045"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D101EA1" Ref="#PWR071"  Part="1" 
-F 0 "#PWR071" H 5750 3200 50  0001 C CNN
+F 0 "#PWR045" H 5750 3200 50  0001 C CNN
 F 1 "GND" H 5750 3300 50  0000 C CNN
 F 2 "" H 5750 3450 50  0001 C CNN
 F 3 "" H 5750 3450 50  0001 C CNN
@@ -116,7 +116,7 @@ U 1 1 5D1020F7
 P 6300 3450
 AR Path="/5CA6B0B3/5CC199E0/5D1020F7" Ref="#PWR046"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1020F7" Ref="#PWR072"  Part="1" 
-F 0 "#PWR072" H 6300 3200 50  0001 C CNN
+F 0 "#PWR046" H 6300 3200 50  0001 C CNN
 F 1 "GND" H 6300 3300 50  0000 C CNN
 F 2 "" H 6300 3450 50  0001 C CNN
 F 3 "" H 6300 3450 50  0001 C CNN
@@ -148,7 +148,7 @@ AR Path="/5CA6B0AA/5CB33251/5CC489AE" Ref="J?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CC489AE" Ref="J?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CC489AE" Ref="J8"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CC489AE" Ref="J10"  Part="1" 
-F 0 "J10" H 9810 4170 50  0000 C CNN
+F 0 "J8" H 9810 4170 50  0000 C CNN
 F 1 "UFL" V 9915 4050 50  0000 C CNN
 F 2 "" H 9800 4050 50  0001 C CNN
 F 3 " ~" H 9800 4050 50  0001 C CNN
@@ -163,7 +163,7 @@ AR Path="/5CA6B0AA/5CB33251/5CC49A0F" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CC49A0F" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CC49A0F" Ref="#PWR055"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CC49A0F" Ref="#PWR081"  Part="1" 
-F 0 "#PWR081" H 9800 4100 50  0001 C CNN
+F 0 "#PWR055" H 9800 4100 50  0001 C CNN
 F 1 "GND" H 9800 4200 50  0000 C CNN
 F 2 "" H 9800 4350 50  0001 C CNN
 F 3 "" H 9800 4350 50  0001 C CNN
@@ -195,7 +195,7 @@ AR Path="/5CA6B0AA/5CB33251/5CBC9FE3" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CBC9FE3" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CBC9FE3" Ref="#PWR052"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CBC9FE3" Ref="#PWR078"  Part="1" 
-F 0 "#PWR078" H 9050 4700 50  0001 C CNN
+F 0 "#PWR052" H 9050 4700 50  0001 C CNN
 F 1 "GND" H 9050 4800 50  0000 C CNN
 F 2 "" H 9050 4950 50  0001 C CNN
 F 3 "" H 9050 4950 50  0001 C CNN
@@ -216,7 +216,7 @@ U 1 1 5D125BFA
 P 7750 5450
 AR Path="/5CA6B0B3/5CC199E0/5D125BFA" Ref="#PWR049"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D125BFA" Ref="#PWR075"  Part="1" 
-F 0 "#PWR075" H 7750 5200 50  0001 C CNN
+F 0 "#PWR049" H 7750 5200 50  0001 C CNN
 F 1 "GND" H 7750 5300 50  0000 C CNN
 F 2 "" H 7750 5450 50  0001 C CNN
 F 3 "" H 7750 5450 50  0001 C CNN
@@ -229,7 +229,7 @@ U 1 1 5D125420
 P 7750 5250
 AR Path="/5CA6B0B3/5CC199E0/5D125420" Ref="C30"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D125420" Ref="C54"  Part="1" 
-F 0 "C54" H 7760 5320 50  0000 L CNN
+F 0 "C30" H 7760 5320 50  0000 L CNN
 F 1 "1 nF" H 7760 5170 50  0000 L CNN
 F 2 "" H 7750 5250 50  0001 C CNN
 F 3 "~" H 7750 5250 50  0001 C CNN
@@ -248,7 +248,7 @@ U 1 1 5D0D0BEF
 P 6450 5150
 AR Path="/5CA6B0B3/5CC199E0/5D0D0BEF" Ref="#PWR047"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D0D0BEF" Ref="#PWR073"  Part="1" 
-F 0 "#PWR073" H 6450 4900 50  0001 C CNN
+F 0 "#PWR047" H 6450 4900 50  0001 C CNN
 F 1 "GND" H 6455 4977 50  0000 C CNN
 F 2 "" H 6450 5150 50  0001 C CNN
 F 3 "" H 6450 5150 50  0001 C CNN
@@ -261,7 +261,7 @@ U 1 1 5D01A78D
 P 7050 4750
 AR Path="/5CA6B0B3/5CC199E0/5D01A78D" Ref="U3"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D01A78D" Ref="U4"  Part="1" 
-F 0 "U4" H 7050 4200 50  0000 C CNN
+F 0 "U3" H 7050 4200 50  0000 C CNN
 F 1 "LT5560EDD#PBF" H 7050 4100 50  0000 C CNN
 F 2 "discrete_footprints:Analog_DFN8-EP" H 7050 4200 50  0001 C CNN
 F 3 "" H 7050 4200 50  0001 C CNN
@@ -315,7 +315,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB6E137" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB6E137" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB6E137" Ref="#PWR054"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB6E137" Ref="#PWR080"  Part="1" 
-F 0 "#PWR080" H 9450 3000 50  0001 C CNN
+F 0 "#PWR054" H 9450 3000 50  0001 C CNN
 F 1 "GND" H 9450 3100 50  0000 C CNN
 F 2 "" H 9450 3250 50  0001 C CNN
 F 3 "" H 9450 3250 50  0001 C CNN
@@ -330,7 +330,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB6DF60" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB6DF60" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB6DF60" Ref="#PWR053"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB6DF60" Ref="#PWR079"  Part="1" 
-F 0 "#PWR079" H 9100 3000 50  0001 C CNN
+F 0 "#PWR053" H 9100 3000 50  0001 C CNN
 F 1 "GND" H 9100 3100 50  0000 C CNN
 F 2 "" H 9100 3250 50  0001 C CNN
 F 3 "" H 9100 3250 50  0001 C CNN
@@ -345,7 +345,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB6DBAF" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB6DBAF" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB6DBAF" Ref="#PWR051"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB6DBAF" Ref="#PWR077"  Part="1" 
-F 0 "#PWR077" H 8700 3000 50  0001 C CNN
+F 0 "#PWR051" H 8700 3000 50  0001 C CNN
 F 1 "GND" H 8700 3100 50  0000 C CNN
 F 2 "" H 8700 3250 50  0001 C CNN
 F 3 "" H 8700 3250 50  0001 C CNN
@@ -360,7 +360,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB6D892" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB6D892" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB6D892" Ref="#PWR050"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB6D892" Ref="#PWR076"  Part="1" 
-F 0 "#PWR076" H 8350 3000 50  0001 C CNN
+F 0 "#PWR050" H 8350 3000 50  0001 C CNN
 F 1 "GND" H 8350 3100 50  0000 C CNN
 F 2 "" H 8350 3250 50  0001 C CNN
 F 3 "" H 8350 3250 50  0001 C CNN
@@ -375,7 +375,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB6B125" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB6B125" Ref="C?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB6B125" Ref="C35"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB6B125" Ref="C59"  Part="1" 
-F 0 "C59" H 9460 3120 50  0000 L CNN
+F 0 "C35" H 9460 3120 50  0000 L CNN
 F 1 "1 nF" H 9460 2970 50  0000 L CNN
 F 2 "" H 9450 3050 50  0001 C CNN
 F 3 "~" H 9450 3050 50  0001 C CNN
@@ -390,7 +390,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB6AE2E" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB6AE2E" Ref="C?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB6AE2E" Ref="C34"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB6AE2E" Ref="C58"  Part="1" 
-F 0 "C58" H 9110 3120 50  0000 L CNN
+F 0 "C34" H 9110 3120 50  0000 L CNN
 F 1 "100 pF" H 9110 2970 50  0000 L CNN
 F 2 "" H 9100 3050 50  0001 C CNN
 F 3 "~" H 9100 3050 50  0001 C CNN
@@ -405,7 +405,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB6AABA" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB6AABA" Ref="C?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB6AABA" Ref="C32"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB6AABA" Ref="C56"  Part="1" 
-F 0 "C56" H 8710 3120 50  0000 L CNN
+F 0 "C32" H 8710 3120 50  0000 L CNN
 F 1 "100 pF" H 8710 2970 50  0000 L CNN
 F 2 "" H 8700 3050 50  0001 C CNN
 F 3 "~" H 8700 3050 50  0001 C CNN
@@ -420,7 +420,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB6A8A7" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB6A8A7" Ref="C?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB6A8A7" Ref="C31"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB6A8A7" Ref="C55"  Part="1" 
-F 0 "C55" H 8360 3120 50  0000 L CNN
+F 0 "C31" H 8360 3120 50  0000 L CNN
 F 1 "100 pF" H 8360 2970 50  0000 L CNN
 F 2 "" H 8350 3050 50  0001 C CNN
 F 3 "~" H 8350 3050 50  0001 C CNN
@@ -437,7 +437,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB40E92" Ref="R?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB40E92" Ref="R?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB40E92" Ref="R21"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB40E92" Ref="R35"  Part="1" 
-F 0 "R35" H 7530 3220 50  0000 L CNN
+F 0 "R21" H 7530 3220 50  0000 L CNN
 F 1 "10R" H 7530 3160 50  0000 L CNN
 F 2 "" H 7500 3200 50  0001 C CNN
 F 3 "~" H 7500 3200 50  0001 C CNN
@@ -452,7 +452,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB3C1D2" Ref="L?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB3C1D2" Ref="L?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB3C1D2" Ref="L3"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB3C1D2" Ref="L7"  Part="1" 
-F 0 "L7" H 8080 3540 50  0000 L CNN
+F 0 "L3" H 8080 3540 50  0000 L CNN
 F 1 "330 nH" H 8080 3460 50  0000 L CNN
 F 2 "" H 8050 3500 50  0001 C CNN
 F 3 "~" H 8050 3500 50  0001 C CNN
@@ -474,7 +474,7 @@ U 1 1 5D15BCFB
 P 8150 4800
 AR Path="/5CA6B0B3/5CC199E0/5D15BCFB" Ref="L5"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D15BCFB" Ref="L9"  Part="1" 
-F 0 "L9" H 8180 4840 50  0000 L CNN
+F 0 "L5" H 8180 4840 50  0000 L CNN
 F 1 "27 nH" H 8180 4760 50  0000 L CNN
 F 2 "" H 8150 4800 50  0001 C CNN
 F 3 "~" H 8150 4800 50  0001 C CNN
@@ -487,7 +487,7 @@ U 1 1 5D15EADF
 P 8150 4500
 AR Path="/5CA6B0B3/5CC199E0/5D15EADF" Ref="L4"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D15EADF" Ref="L8"  Part="1" 
-F 0 "L8" H 8180 4540 50  0000 L CNN
+F 0 "L4" H 8180 4540 50  0000 L CNN
 F 1 "27 nH" H 8180 4460 50  0000 L CNN
 F 2 "" H 8150 4500 50  0001 C CNN
 F 3 "~" H 8150 4500 50  0001 C CNN
@@ -510,7 +510,7 @@ U 1 1 5D169258
 P 9050 4650
 AR Path="/5CA6B0B3/5CC199E0/5D169258" Ref="C33"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D169258" Ref="C57"  Part="1" 
-F 0 "C57" H 9060 4720 50  0000 L CNN
+F 0 "C33" H 9060 4720 50  0000 L CNN
 F 1 "2.2 pF RF" H 9060 4570 50  0000 L CNN
 F 2 "" H 9050 4650 50  0001 C CNN
 F 3 "~" H 9050 4650 50  0001 C CNN
@@ -541,7 +541,7 @@ U 1 1 5D18C9DE
 P 4950 4700
 AR Path="/5CA6B0B3/5CC199E0/5D18C9DE" Ref="R19"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D18C9DE" Ref="R33"  Part="1" 
-F 0 "R33" H 4980 4720 50  0000 L CNN
+F 0 "R19" H 4980 4720 50  0000 L CNN
 F 1 "100k" H 4980 4660 50  0000 L CNN
 F 2 "" H 4950 4700 50  0001 C CNN
 F 3 "~" H 4950 4700 50  0001 C CNN
@@ -554,7 +554,7 @@ U 1 1 5D18CEC8
 P 4950 4800
 AR Path="/5CA6B0B3/5CC199E0/5D18CEC8" Ref="R20"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D18CEC8" Ref="R34"  Part="1" 
-F 0 "R34" H 4980 4820 50  0000 L CNN
+F 0 "R20" H 4980 4820 50  0000 L CNN
 F 1 "100k" H 4980 4760 50  0000 L CNN
 F 2 "" H 4950 4800 50  0001 C CNN
 F 3 "~" H 4950 4800 50  0001 C CNN
@@ -571,7 +571,7 @@ U 1 1 5D19065F
 P 4600 5050
 AR Path="/5CA6B0B3/5CC199E0/5D19065F" Ref="C23"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D19065F" Ref="C47"  Part="1" 
-F 0 "C47" H 4610 5120 50  0000 L CNN
+F 0 "C23" H 4610 5120 50  0000 L CNN
 F 1 "1 nF" H 4610 4970 50  0000 L CNN
 F 2 "" H 4600 5050 50  0001 C CNN
 F 3 "~" H 4600 5050 50  0001 C CNN
@@ -593,7 +593,7 @@ U 1 1 5D193951
 P 4600 5250
 AR Path="/5CA6B0B3/5CC199E0/5D193951" Ref="#PWR041"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D193951" Ref="#PWR067"  Part="1" 
-F 0 "#PWR067" H 4600 5000 50  0001 C CNN
+F 0 "#PWR041" H 4600 5000 50  0001 C CNN
 F 1 "GND" H 4600 5100 50  0000 C CNN
 F 2 "" H 4600 5250 50  0001 C CNN
 F 3 "" H 4600 5250 50  0001 C CNN
@@ -617,7 +617,7 @@ U 1 1 5D1B2EB0
 P 3000 5000
 AR Path="/5CA6B0B3/5CC199E0/5D1B2EB0" Ref="#PWR033"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1B2EB0" Ref="#PWR059"  Part="1" 
-F 0 "#PWR059" H 3000 4750 50  0001 C CNN
+F 0 "#PWR033" H 3000 4750 50  0001 C CNN
 F 1 "GND" H 3000 4850 50  0000 C CNN
 F 2 "" H 3000 5000 50  0001 C CNN
 F 3 "" H 3000 5000 50  0001 C CNN
@@ -637,7 +637,7 @@ U 1 1 5D1B6E50
 P 3700 4100
 AR Path="/5CA6B0B3/5CC199E0/5D1B6E50" Ref="R18"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1B6E50" Ref="R32"  Part="1" 
-F 0 "R32" H 3730 4120 50  0000 L CNN
+F 0 "R18" H 3730 4120 50  0000 L CNN
 F 1 "10kR" H 3730 4060 50  0000 L CNN
 F 2 "" H 3700 4100 50  0001 C CNN
 F 3 "~" H 3700 4100 50  0001 C CNN
@@ -661,7 +661,7 @@ U 1 1 5D1CE967
 P 3400 5450
 AR Path="/5CA6B0B3/5CC199E0/5D1CE967" Ref="R17"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1CE967" Ref="R31"  Part="1" 
-F 0 "R31" H 3430 5470 50  0000 L CNN
+F 0 "R17" H 3430 5470 50  0000 L CNN
 F 1 "4k7R" H 3430 5410 50  0000 L CNN
 F 2 "" H 3400 5450 50  0001 C CNN
 F 3 "~" H 3400 5450 50  0001 C CNN
@@ -710,8 +710,8 @@ U 1 1 5D1EB863
 P 3500 6400
 AR Path="/5CA6B0B3/5CC199E0/5D1EB863" Ref="C17"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1EB863" Ref="C41"  Part="1" 
-F 0 "C41" H 3510 6470 50  0000 L CNN
+F 0 "C17" H 3510 6470 50  0000 L CNN
-F 1 "C_Small" H 3510 6320 50  0000 L CNN
+F 1 "100 pF" H 3510 6320 50  0000 L CNN
 F 2 "" H 3500 6400 50  0001 C CNN
 F 3 "~" H 3500 6400 50  0001 C CNN
 	1    3500 6400
@@ -723,8 +723,8 @@ U 1 1 5D1EBDD5
 P 3850 6400
 AR Path="/5CA6B0B3/5CC199E0/5D1EBDD5" Ref="C19"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1EBDD5" Ref="C43"  Part="1" 
-F 0 "C43" H 3860 6470 50  0000 L CNN
+F 0 "C19" H 3860 6470 50  0000 L CNN
-F 1 "C_Small" H 3860 6320 50  0000 L CNN
+F 1 "1 nF" H 3860 6320 50  0000 L CNN
 F 2 "" H 3850 6400 50  0001 C CNN
 F 3 "~" H 3850 6400 50  0001 C CNN
 	1    3850 6400
@@ -736,8 +736,8 @@ U 1 1 5D1EC2AA
 P 4250 6400
 AR Path="/5CA6B0B3/5CC199E0/5D1EC2AA" Ref="C21"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1EC2AA" Ref="C45"  Part="1" 
-F 0 "C45" H 4260 6470 50  0000 L CNN
+F 0 "C21" H 4260 6470 50  0000 L CNN
-F 1 "C_Small" H 4260 6320 50  0000 L CNN
+F 1 "10 nF" H 4260 6320 50  0000 L CNN
 F 2 "" H 4250 6400 50  0001 C CNN
 F 3 "~" H 4250 6400 50  0001 C CNN
 	1    4250 6400
@@ -749,7 +749,7 @@ U 1 1 5D1F5C64
 P 4250 6600
 AR Path="/5CA6B0B3/5CC199E0/5D1F5C64" Ref="#PWR039"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1F5C64" Ref="#PWR065"  Part="1" 
-F 0 "#PWR065" H 4250 6350 50  0001 C CNN
+F 0 "#PWR039" H 4250 6350 50  0001 C CNN
 F 1 "GND" H 4250 6450 50  0000 C CNN
 F 2 "" H 4250 6600 50  0001 C CNN
 F 3 "" H 4250 6600 50  0001 C CNN
@@ -762,7 +762,7 @@ U 1 1 5D1F5F88
 P 3850 6600
 AR Path="/5CA6B0B3/5CC199E0/5D1F5F88" Ref="#PWR037"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1F5F88" Ref="#PWR063"  Part="1" 
-F 0 "#PWR063" H 3850 6350 50  0001 C CNN
+F 0 "#PWR037" H 3850 6350 50  0001 C CNN
 F 1 "GND" H 3850 6450 50  0000 C CNN
 F 2 "" H 3850 6600 50  0001 C CNN
 F 3 "" H 3850 6600 50  0001 C CNN
@@ -775,7 +775,7 @@ U 1 1 5D1F629A
 P 3500 6600
 AR Path="/5CA6B0B3/5CC199E0/5D1F629A" Ref="#PWR035"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1F629A" Ref="#PWR061"  Part="1" 
-F 0 "#PWR061" H 3500 6350 50  0001 C CNN
+F 0 "#PWR035" H 3500 6350 50  0001 C CNN
 F 1 "GND" H 3500 6450 50  0000 C CNN
 F 2 "" H 3500 6600 50  0001 C CNN
 F 3 "" H 3500 6600 50  0001 C CNN
@@ -810,7 +810,7 @@ U 1 1 5D11C60F
 P 2050 3450
 AR Path="/5CA6B0B3/5CC199E0/5D11C60F" Ref="Q3"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D11C60F" Ref="Q12"  Part="1" 
-F 0 "Q12" H 2241 3496 50  0000 L CNN
+F 0 "Q3" H 2241 3496 50  0000 L CNN
 F 1 "Q_NPN_BCE" H 2241 3405 50  0000 L CNN
 F 2 "" H 2250 3550 50  0001 C CNN
 F 3 "~" H 2050 3450 50  0001 C CNN
@@ -823,7 +823,7 @@ U 1 1 5D1A4BF9
 P 1800 2950
 AR Path="/5CA6B0B3/5CC199E0/5D1A4BF9" Ref="R11"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A4BF9" Ref="R25"  Part="1" 
-F 0 "R25" H 1859 2996 50  0000 L CNN
+F 0 "R11" H 1859 2996 50  0000 L CNN
 F 1 "22R" H 1859 2905 50  0000 L CNN
 F 2 "" H 1800 2950 50  0001 C CNN
 F 3 "~" H 1800 2950 50  0001 C CNN
@@ -836,7 +836,7 @@ U 1 1 5D1A519D
 P 2750 2900
 AR Path="/5CA6B0B3/5CC199E0/5D1A519D" Ref="R15"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A519D" Ref="R29"  Part="1" 
-F 0 "R29" H 2809 2946 50  0000 L CNN
+F 0 "R15" H 2809 2946 50  0000 L CNN
 F 1 "22R" H 2809 2855 50  0000 L CNN
 F 2 "" H 2750 2900 50  0001 C CNN
 F 3 "~" H 2750 2900 50  0001 C CNN
@@ -849,7 +849,7 @@ U 1 1 5D1A606E
 P 1400 2250
 AR Path="/5CA6B0B3/5CC199E0/5D1A606E" Ref="R10"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A606E" Ref="R24"  Part="1" 
-F 0 "R24" H 1459 2296 50  0000 L CNN
+F 0 "R10" H 1459 2296 50  0000 L CNN
 F 1 "4k7R" H 1459 2205 50  0000 L CNN
 F 2 "" H 1400 2250 50  0001 C CNN
 F 3 "~" H 1400 2250 50  0001 C CNN
@@ -862,7 +862,7 @@ U 1 1 5D1A670A
 P 3200 2200
 AR Path="/5CA6B0B3/5CC199E0/5D1A670A" Ref="R16"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A670A" Ref="R30"  Part="1" 
-F 0 "R30" H 3259 2246 50  0000 L CNN
+F 0 "R16" H 3259 2246 50  0000 L CNN
 F 1 "4k7R" H 3259 2155 50  0000 L CNN
 F 2 "" H 3200 2200 50  0001 C CNN
 F 3 "~" H 3200 2200 50  0001 C CNN
@@ -875,7 +875,7 @@ U 1 1 5D1A740A
 P 2150 3900
 AR Path="/5CA6B0B3/5CC199E0/5D1A740A" Ref="R13"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A740A" Ref="R27"  Part="1" 
-F 0 "R27" H 2209 3946 50  0000 L CNN
+F 0 "R13" H 2209 3946 50  0000 L CNN
 F 1 "25R" H 2209 3855 50  0000 L CNN
 F 2 "" H 2150 3900 50  0001 C CNN
 F 3 "~" H 2150 3900 50  0001 C CNN
@@ -888,7 +888,7 @@ U 1 1 5D1A78D7
 P 1250 3250
 AR Path="/5CA6B0B3/5CC199E0/5D1A78D7" Ref="R8"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A78D7" Ref="R22"  Part="1" 
-F 0 "R22" H 1309 3296 50  0000 L CNN
+F 0 "R8" H 1309 3296 50  0000 L CNN
 F 1 "2k5R" H 1309 3205 50  0000 L CNN
 F 2 "" H 1250 3250 50  0001 C CNN
 F 3 "~" H 1250 3250 50  0001 C CNN
@@ -901,7 +901,7 @@ U 1 1 5D1A7E71
 P 1250 3700
 AR Path="/5CA6B0B3/5CC199E0/5D1A7E71" Ref="R9"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A7E71" Ref="R23"  Part="1" 
-F 0 "R23" H 1309 3746 50  0000 L CNN
+F 0 "R9" H 1309 3746 50  0000 L CNN
 F 1 "1kR" H 1309 3655 50  0000 L CNN
 F 2 "" H 1250 3700 50  0001 C CNN
 F 3 "~" H 1250 3700 50  0001 C CNN
@@ -914,7 +914,7 @@ U 1 1 5D1A89A5
 P 2150 4100
 AR Path="/5CA6B0B3/5CC199E0/5D1A89A5" Ref="#PWR032"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A89A5" Ref="#PWR058"  Part="1" 
-F 0 "#PWR058" H 2150 3850 50  0001 C CNN
+F 0 "#PWR032" 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
@@ -927,7 +927,7 @@ U 1 1 5D1A9311
 P 1250 3900
 AR Path="/5CA6B0B3/5CC199E0/5D1A9311" Ref="#PWR030"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A9311" Ref="#PWR056"  Part="1" 
-F 0 "#PWR056" H 1250 3650 50  0001 C CNN
+F 0 "#PWR030" H 1250 3650 50  0001 C CNN
 F 1 "GND" H 1255 3727 50  0000 C CNN
 F 2 "" H 1250 3900 50  0001 C CNN
 F 3 "" H 1250 3900 50  0001 C CNN
@@ -940,7 +940,7 @@ U 1 1 5D1ABF37
 P 1750 3900
 AR Path="/5CA6B0B3/5CC199E0/5D1ABF37" Ref="#PWR031"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1ABF37" Ref="#PWR057"  Part="1" 
-F 0 "#PWR057" H 1750 3650 50  0001 C CNN
+F 0 "#PWR031" H 1750 3650 50  0001 C CNN
 F 1 "GND" H 1755 3727 50  0000 C CNN
 F 2 "" H 1750 3900 50  0001 C CNN
 F 3 "" H 1750 3900 50  0001 C CNN
@@ -953,7 +953,7 @@ U 1 1 5D1AC551
 P 1750 3700
 AR Path="/5CA6B0B3/5CC199E0/5D1AC551" Ref="C14"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1AC551" Ref="C38"  Part="1" 
-F 0 "C38" H 1760 3770 50  0000 L CNN
+F 0 "C14" H 1760 3770 50  0000 L CNN
 F 1 "0.1 uF" H 1760 3620 50  0000 L CNN
 F 2 "" H 1750 3700 50  0001 C CNN
 F 3 "~" H 1750 3700 50  0001 C CNN
@@ -966,7 +966,7 @@ U 1 1 5D1AD1B8
 P 1200 2550
 AR Path="/5CA6B0B3/5CC199E0/5D1AD1B8" Ref="C13"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1AD1B8" Ref="C37"  Part="1" 
-F 0 "C37" V 971 2550 50  0000 C CNN
+F 0 "C13" V 971 2550 50  0000 C CNN
 F 1 "0.1 uF" V 1062 2550 50  0000 C CNN
 F 2 "" H 1200 2550 50  0001 C CNN
 F 3 "~" H 1200 2550 50  0001 C CNN
@@ -979,7 +979,7 @@ U 1 1 5D1ADA21
 P 3200 2650
 AR Path="/5CA6B0B3/5CC199E0/5D1ADA21" Ref="C15"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1ADA21" Ref="C39"  Part="1" 
-F 0 "C39" H 3108 2604 50  0000 R CNN
+F 0 "C15" H 3108 2604 50  0000 R CNN
 F 1 "0.1 uF" H 3108 2695 50  0000 R CNN
 F 2 "" H 3200 2650 50  0001 C CNN
 F 3 "~" H 3200 2650 50  0001 C CNN
@@ -992,7 +992,7 @@ U 1 1 5D1AE084
 P 3200 2850
 AR Path="/5CA6B0B3/5CC199E0/5D1AE084" Ref="#PWR034"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1AE084" Ref="#PWR060"  Part="1" 
-F 0 "#PWR060" H 3200 2600 50  0001 C CNN
+F 0 "#PWR034" H 3200 2600 50  0001 C CNN
 F 1 "GND" H 3205 2677 50  0000 C CNN
 F 2 "" H 3200 2850 50  0001 C CNN
 F 3 "" H 3200 2850 50  0001 C CNN
@@ -1084,7 +1084,7 @@ U 1 1 5D271283
 P 1200 2000
 AR Path="/5CA6B0B3/5CC199E0/5D271283" Ref="C12"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D271283" Ref="C36"  Part="1" 
-F 0 "C36" V 971 2000 50  0000 C CNN
+F 0 "C12" V 971 2000 50  0000 C CNN
 F 1 "0.1 uF" V 1062 2000 50  0000 C CNN
 F 2 "" H 1200 2000 50  0001 C CNN
 F 3 "~" H 1200 2000 50  0001 C CNN
@@ -1097,7 +1097,7 @@ U 1 1 5D271572
 P 3450 2000
 AR Path="/5CA6B0B3/5CC199E0/5D271572" Ref="C16"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D271572" Ref="C40"  Part="1" 
-F 0 "C40" V 3221 2000 50  0000 C CNN
+F 0 "C16" V 3221 2000 50  0000 C CNN
 F 1 "0.1 uF" V 3312 2000 50  0000 C CNN
 F 2 "" H 3450 2000 50  0001 C CNN
 F 3 "~" H 3450 2000 50  0001 C CNN
@@ -1138,7 +1138,7 @@ U 1 1 5D1CC964
 P 8700 4650
 AR Path="/5CA6B0B3/5CC199E0/5D1CC964" Ref="T1"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1CC964" Ref="T2"  Part="1" 
-F 0 "T2" H 8700 4900 50  0000 C CNN
+F 0 "T1" H 8700 4900 50  0000 C CNN
 F 1 "HHM1515B2" H 8700 4400 50  0000 C CNN
 F 2 "discrete_footprints:TDK_HHM1515B2" H 8700 4650 50  0001 C CNN
 F 3 "" H 8700 4650 50  0001 C CNN
@@ -1158,7 +1158,7 @@ U 1 1 5D21806D
 P 2000 1900
 AR Path="/5CA6B0B3/5CC199E0/5D21806D" Ref="R12"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D21806D" Ref="R26"  Part="1" 
-F 0 "R26" H 2059 1946 50  0000 L CNN
+F 0 "R12" H 2059 1946 50  0000 L CNN
 F 1 "1kR" H 2059 1855 50  0000 L CNN
 F 2 "" H 2000 1900 50  0001 C CNN
 F 3 "~" H 2000 1900 50  0001 C CNN
@@ -1171,7 +1171,7 @@ U 1 1 5D218880
 P 2550 1900
 AR Path="/5CA6B0B3/5CC199E0/5D218880" Ref="R14"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D218880" Ref="R28"  Part="1" 
-F 0 "R28" H 2609 1946 50  0000 L CNN
+F 0 "R14" H 2609 1946 50  0000 L CNN
 F 1 "1kR" H 2609 1855 50  0000 L CNN
 F 2 "" H 2550 1900 50  0001 C CNN
 F 3 "~" H 2550 1900 50  0001 C CNN
@@ -1206,7 +1206,7 @@ U 1 1 5D100E2B
 P 5750 3200
 AR Path="/5CA6B0B3/5CC199E0/5D100E2B" Ref="C27"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D100E2B" Ref="C51"  Part="1" 
-F 0 "C51" H 5760 3270 50  0000 L CNN
+F 0 "C27" H 5760 3270 50  0000 L CNN
 F 1 "DNP 0402" H 5760 3120 50  0000 L CNN
 F 2 "" H 5750 3200 50  0001 C CNN
 F 3 "~" H 5750 3200 50  0001 C CNN
@@ -1223,7 +1223,7 @@ AR Path="/5CA6B0AA/5CB33251/5D84EA74" Ref="J?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5D84EA74" Ref="J?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5D84EA74" Ref="J7"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D84EA74" Ref="J9"  Part="1" 
-F 0 "J9" H 4860 3320 50  0000 C CNN
+F 0 "J7" H 4860 3320 50  0000 C CNN
 F 1 "UFL" V 4965 3200 50  0000 C CNN
 F 2 "" H 4850 3200 50  0001 C CNN
 F 3 " ~" H 4850 3200 50  0001 C CNN
@@ -1241,7 +1241,7 @@ U 1 1 5D85A260
 P 4850 3500
 AR Path="/5CA6B0B3/5CC199E0/5D85A260" Ref="#PWR043"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D85A260" Ref="#PWR069"  Part="1" 
-F 0 "#PWR069" H 4850 3250 50  0001 C CNN
+F 0 "#PWR043" H 4850 3250 50  0001 C CNN
 F 1 "GND" H 4850 3350 50  0000 C CNN
 F 2 "" H 4850 3500 50  0001 C CNN
 F 3 "" H 4850 3500 50  0001 C CNN
@@ -1264,7 +1264,7 @@ AR Path="/5CA6B0AA/5CB33251/5DADE110" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5DADE110" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5DADE110" Ref="#PWR036"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5DADE110" Ref="#PWR062"  Part="1" 
-F 0 "#PWR062" H 3800 1400 50  0001 C CNN
+F 0 "#PWR036" H 3800 1400 50  0001 C CNN
 F 1 "GND" H 3800 1500 50  0000 C CNN
 F 2 "" H 3800 1650 50  0001 C CNN
 F 3 "" H 3800 1650 50  0001 C CNN
@@ -1279,7 +1279,7 @@ AR Path="/5CA6B0AA/5CB33251/5DADE116" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5DADE116" Ref="C?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5DADE116" Ref="C18"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5DADE116" Ref="C42"  Part="1" 
-F 0 "C42" H 3810 1520 50  0000 L CNN
+F 0 "C18" H 3810 1520 50  0000 L CNN
 F 1 "1 nF" H 3810 1370 50  0000 L CNN
 F 2 "" H 3800 1450 50  0001 C CNN
 F 3 "~" H 3800 1450 50  0001 C CNN
@@ -1296,7 +1296,7 @@ AR Path="/5CA6B0AA/5CB33251/5DAE8BF5" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5DAE8BF5" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5DAE8BF5" Ref="#PWR038"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5DAE8BF5" Ref="#PWR064"  Part="1" 
-F 0 "#PWR064" H 4150 1400 50  0001 C CNN
+F 0 "#PWR038" H 4150 1400 50  0001 C CNN
 F 1 "GND" H 4150 1500 50  0000 C CNN
 F 2 "" H 4150 1650 50  0001 C CNN
 F 3 "" H 4150 1650 50  0001 C CNN
@@ -1311,7 +1311,7 @@ AR Path="/5CA6B0AA/5CB33251/5DAE8BFB" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5DAE8BFB" Ref="C?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5DAE8BFB" Ref="C20"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5DAE8BFB" Ref="C44"  Part="1" 
-F 0 "C44" H 4160 1520 50  0000 L CNN
+F 0 "C20" H 4160 1520 50  0000 L CNN
 F 1 "10 nF" H 4160 1370 50  0000 L CNN
 F 2 "" H 4150 1450 50  0001 C CNN
 F 3 "~" H 4150 1450 50  0001 C CNN
@@ -1334,7 +1334,7 @@ AR Path="/5CA6B0AA/5CB33251/5DB0FBEB" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5DB0FBEB" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5DB0FBEB" Ref="#PWR042"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5DB0FBEB" Ref="#PWR068"  Part="1" 
-F 0 "#PWR068" H 4750 4050 50  0001 C CNN
+F 0 "#PWR042" H 4750 4050 50  0001 C CNN
 F 1 "GND" H 4750 4150 50  0000 C CNN
 F 2 "" H 4750 4300 50  0001 C CNN
 F 3 "" H 4750 4300 50  0001 C CNN
@@ -1349,7 +1349,7 @@ AR Path="/5CA6B0AA/5CB33251/5DB0FBF1" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5DB0FBF1" Ref="C?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5DB0FBF1" Ref="C24"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5DB0FBF1" Ref="C48"  Part="1" 
-F 0 "C48" H 4760 4170 50  0000 L CNN
+F 0 "C24" H 4760 4170 50  0000 L CNN
 F 1 "0.1 uF" H 4760 4020 50  0000 L CNN
 F 2 "" H 4750 4100 50  0001 C CNN
 F 3 "~" H 4750 4100 50  0001 C CNN
@@ -1370,7 +1370,7 @@ AR Path="/5CA6B0AA/5CB33251/5DB0FBFA" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5DB0FBFA" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5DB0FBFA" Ref="#PWR044"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5DB0FBFA" Ref="#PWR070"  Part="1" 
-F 0 "#PWR070" H 5100 4050 50  0001 C CNN
+F 0 "#PWR044" H 5100 4050 50  0001 C CNN
 F 1 "GND" H 5100 4150 50  0000 C CNN
 F 2 "" H 5100 4300 50  0001 C CNN
 F 3 "" H 5100 4300 50  0001 C CNN
@@ -1385,7 +1385,7 @@ AR Path="/5CA6B0AA/5CB33251/5DB0FC00" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5DB0FC00" Ref="C?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5DB0FC00" Ref="C25"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5DB0FC00" Ref="C49"  Part="1" 
-F 0 "C49" H 5110 4170 50  0000 L CNN
+F 0 "C25" H 5110 4170 50  0000 L CNN
 F 1 "0.1 uF" H 5110 4020 50  0000 L CNN
 F 2 "" H 5100 4100 50  0001 C CNN
 F 3 "~" H 5100 4100 50  0001 C CNN
@@ -1405,7 +1405,7 @@ AR Path="/5CA6B0AA/5CB33251/5DB1C7E1" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5DB1C7E1" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5DB1C7E1" Ref="#PWR040"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5DB1C7E1" Ref="#PWR066"  Part="1" 
-F 0 "#PWR066" H 4450 1400 50  0001 C CNN
+F 0 "#PWR040" H 4450 1400 50  0001 C CNN
 F 1 "GND" H 4450 1500 50  0000 C CNN
 F 2 "" H 4450 1650 50  0001 C CNN
 F 3 "" H 4450 1650 50  0001 C CNN
@@ -1420,7 +1420,7 @@ AR Path="/5CA6B0AA/5CB33251/5DB1C7E7" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5DB1C7E7" Ref="C?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5DB1C7E7" Ref="C22"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5DB1C7E7" Ref="C46"  Part="1" 
-F 0 "C46" H 4460 1520 50  0000 L CNN
+F 0 "C22" H 4460 1520 50  0000 L CNN
 F 1 "0.1 uF" H 4460 1370 50  0000 L CNN
 F 2 "" H 4450 1450 50  0001 C CNN
 F 3 "~" H 4450 1450 50  0001 C CNN
@@ -1442,7 +1442,7 @@ AR Path="/5CA6B0AA/5CC4DFC2/5D95D727" Ref="Q?"  Part="1"
 AR Path="/5CA6B0AA/5CC9409A/5D95D727" Ref="Q?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5D95D727" Ref="Q1"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D95D727" Ref="Q6"  Part="1" 
-F 0 "Q6" H 1900 2600 50  0000 L CNN
+F 0 "Q1" H 1900 2600 50  0000 L CNN
 F 1 "NSVT65011MW6T1G" H 1900 2500 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 1900 2650 50  0001 C CNN
 F 3 "~" H 1700 2550 50  0001 C CNN
@@ -1458,7 +1458,7 @@ AR Path="/5CA6B0AA/5CC4DFC2/5D95D72D" Ref="Q?"  Part="2"
 AR Path="/5CA6B0AA/5CC9409A/5D95D72D" Ref="Q?"  Part="2" 
 AR Path="/5CA6B0B3/5CC199E0/5D95D72D" Ref="Q1"  Part="2" 
 AR Path="/5CA6B0B3/5CC199E2/5D95D72D" Ref="Q6"  Part="2" 
-F 0 "Q6" H 3050 2500 50  0000 L CNN
+F 0 "Q1" H 3050 2500 50  0000 L CNN
 F 1 "NSVT65011MW6T1G" H 3050 2400 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 3050 2550 50  0001 C CNN
 F 3 "~" H 2850 2450 50  0001 C CNN
@@ -1473,7 +1473,7 @@ AR Path="/5CA6B0AA/5CC4DFC2/5D987D02" Ref="Q?"  Part="1"
 AR Path="/5CA6B0AA/5CC9409A/5D987D02" Ref="Q?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5D987D02" Ref="Q5"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D987D02" Ref="Q9"  Part="1" 
-F 0 "Q9" H 5500 5600 50  0000 L CNN
+F 0 "Q5" H 5500 5600 50  0000 L CNN
 F 1 "NSVT65011MW6T1G" H 5500 5500 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 5500 5650 50  0001 C CNN
 F 3 "~" H 5300 5550 50  0001 C CNN
@@ -1489,7 +1489,7 @@ AR Path="/5CA6B0AA/5CC4DFC2/5D988714" Ref="Q?"  Part="2"
 AR Path="/5CA6B0AA/5CC9409A/5D988714" Ref="Q?"  Part="2" 
 AR Path="/5CA6B0B3/5CC199E0/5D988714" Ref="Q5"  Part="2" 
 AR Path="/5CA6B0B3/5CC199E2/5D988714" Ref="Q9"  Part="2" 
-F 0 "Q9" H 6200 5600 50  0000 L CNN
+F 0 "Q5" H 6200 5600 50  0000 L CNN
 F 1 "NSVT65011MW6T1G" H 6200 5500 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 6200 5650 50  0001 C CNN
 F 3 "~" H 6000 5550 50  0001 C CNN
@@ -1502,7 +1502,7 @@ U 1 1 5D991933
 P 1900 1650
 AR Path="/5CA6B0B3/5CC199E0/5D991933" Ref="Q2"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D991933" Ref="Q7"  Part="1" 
-F 0 "Q7" H 2100 1700 50  0000 L CNN
+F 0 "Q2" H 2100 1700 50  0000 L CNN
 F 1 "BCM857BS-7-F" H 2100 1600 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 2100 1750 50  0001 C CNN
 F 3 "~" H 1900 1650 50  0001 C CNN
@@ -1516,7 +1516,7 @@ U 2 1 5D992D74
 P 2650 1650
 AR Path="/5CA6B0B3/5CC199E0/5D992D74" Ref="Q2"  Part="2" 
 AR Path="/5CA6B0B3/5CC199E2/5D992D74" Ref="Q7"  Part="2" 
-F 0 "Q7" H 2850 1700 50  0000 L CNN
+F 0 "Q2" H 2850 1700 50  0000 L CNN
 F 1 "BCM857BS-7-F" H 2850 1600 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 2850 1750 50  0001 C CNN
 F 3 "~" H 2650 1650 50  0001 C CNN
@@ -1529,7 +1529,7 @@ U 1 1 5D9CC5B4
 P 4250 4700
 AR Path="/5CA6B0B3/5CC199E0/5D9CC5B4" Ref="Q4"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D9CC5B4" Ref="Q8"  Part="1" 
-F 0 "Q8" H 4450 4750 50  0000 L CNN
+F 0 "Q4" H 4450 4750 50  0000 L CNN
 F 1 "BCM857BS-7-F" H 4450 4650 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 4450 4800 50  0001 C CNN
 F 3 "~" H 4250 4700 50  0001 C CNN
@@ -1543,7 +1543,7 @@ U 2 1 5D9CE704
 P 3300 4950
 AR Path="/5CA6B0B3/5CC199E0/5D9CE704" Ref="Q4"  Part="2" 
 AR Path="/5CA6B0B3/5CC199E2/5D9CE704" Ref="Q8"  Part="2" 
-F 0 "Q8" H 3500 5000 50  0000 L CNN
+F 0 "Q4" H 3500 5000 50  0000 L CNN
 F 1 "BCM857BS-7-F" H 3500 4900 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 3500 5050 50  0001 C CNN
 F 3 "~" H 3300 4950 50  0001 C CNN

pcb/discrete/discrete-rf-board/pa.sch

@@ -598,8 +598,6 @@ Wire Wire Line
 	5650 4600 5650 4750
 Text Notes 4350 5300 0    50   ~ 0
 Vbe=~~0.827V, ib=~~0.05mA, ic=5mA\nNF=1.5 dB, K=~~16dB
-Text Notes 6200 3200 0    50   ~ 0
-TODO make sure the matching circuit values are\ncalculated for Vce=5V
 $Comp
 L Device:C_Small C?
 U 1 1 5D91A996

pcb/discrete/discrete-rf-board/pa.sch-bak

@@ -598,8 +598,6 @@ Wire Wire Line
 	5650 4600 5650 4750
 Text Notes 4350 5300 0    50   ~ 0
 Vbe=~~0.827V, ib=~~0.05mA, ic=5mA\nNF=1.5 dB, K=~~16dB
-Text Notes 6200 3200 0    50   ~ 0
-TODO make sure the matching circuit values are\ncalculated for Vce=5V
 $Comp
 L Device:C_Small C?
 U 1 1 5D91A996
@@ -883,8 +881,9 @@ U 1 1 5DA49B97
 P 5600 4250
 F 0 "Q10" H 5900 4250 50  0000 C CNN
 F 1 "BFU520R" H 5800 4150 50  0000 L CNN
-F 2 "" H 5600 4250 50  0001 C CNN
+F 2 "discrete_footprints:NXP_SOT143B" H 5600 4250 50  0001 C CNN
 F 3 "" H 5600 4250 50  0001 C CNN
+F 4 " 771-BFU520R " H 5600 4250 50  0001 C CNN "Mouser"
 	1    5600 4250
 	1    0    0    -1  
 $EndComp

pcb/discrete/discrete-rf-board/receiver.sch

@@ -69,7 +69,7 @@ U 1 1 5D1C604E
 P 2750 3600
 F 0 "FL4" H 2500 3900 50  0000 C CNN
 F 1 "SF2098H" H 3000 3900 50  0000 C CNN
-F 2 "" H 2750 3150 50  0001 C CNN
+F 2 "discrete_footprints:Murata_SM2016-4" H 2750 3150 50  0001 C CNN
 F 3 "" H 2750 4000 50  0001 C CNN
 F 4 "719-SF2098H " H 2750 3600 50  0001 C CNN "Mouser"
 	1    2750 3600
@@ -240,7 +240,7 @@ L Device:R_Small R82
 U 1 1 5D9C48D2
 P 7550 3850
 F 0 "R82" H 7580 3870 50  0000 L CNN
-F 1 "R_Small" H 7580 3810 50  0000 L CNN
+F 1 "10kR" H 7580 3810 50  0000 L CNN
 F 2 "" H 7550 3850 50  0001 C CNN
 F 3 "~" H 7550 3850 50  0001 C CNN
 	1    7550 3850
@@ -251,7 +251,7 @@ L Device:R_Small R84
 U 1 1 5D9C9C4F
 P 7950 3850
 F 0 "R84" H 7980 3870 50  0000 L CNN
-F 1 "R_Small" H 7980 3810 50  0000 L CNN
+F 1 "10kR" H 7980 3810 50  0000 L CNN
 F 2 "" H 7950 3850 50  0001 C CNN
 F 3 "~" H 7950 3850 50  0001 C CNN
 	1    7950 3850
@@ -262,7 +262,7 @@ L Device:C_Small C110
 U 1 1 5D9CB2FC
 P 7750 4300
 F 0 "C110" H 7760 4370 50  0000 L CNN
-F 1 "C_Small" H 7760 4220 50  0000 L CNN
+F 1 "470 pF" H 7760 4220 50  0000 L CNN
 F 2 "" H 7750 4300 50  0001 C CNN
 F 3 "~" H 7750 4300 50  0001 C CNN
 	1    7750 4300
@@ -315,7 +315,7 @@ L Device:R_Small R81
 U 1 1 5D9D617C
 P 7550 2450
 F 0 "R81" H 7580 2470 50  0000 L CNN
-F 1 "R_Small" H 7580 2410 50  0000 L CNN
+F 1 "10kR" H 7580 2410 50  0000 L CNN
 F 2 "" H 7550 2450 50  0001 C CNN
 F 3 "~" H 7550 2450 50  0001 C CNN
 	1    7550 2450
@@ -326,7 +326,7 @@ L Device:R_Small R83
 U 1 1 5D9D6182
 P 7950 2450
 F 0 "R83" H 7980 2470 50  0000 L CNN
-F 1 "R_Small" H 7980 2410 50  0000 L CNN
+F 1 "10kR" H 7980 2410 50  0000 L CNN
 F 2 "" H 7950 2450 50  0001 C CNN
 F 3 "~" H 7950 2450 50  0001 C CNN
 	1    7950 2450
@@ -337,7 +337,7 @@ L Device:C_Small C109
 U 1 1 5D9D6188
 P 7750 2900
 F 0 "C109" H 7760 2970 50  0000 L CNN
-F 1 "C_Small" H 7760 2820 50  0000 L CNN
+F 1 "470 pF" H 7760 2820 50  0000 L CNN
 F 2 "" H 7750 2900 50  0001 C CNN
 F 3 "~" H 7750 2900 50  0001 C CNN
 	1    7750 2900
@@ -751,8 +751,6 @@ Text Label 8550 4800 0    50   ~ 0
 REF_N
 Text Label 8550 4900 0    50   ~ 0
 REF_P
-Text Notes 8150 2100 0    50   ~ 0
-TODO figure out resistor and capacitor values
 Text Label 9150 2400 0    50   ~ 0
 ADC_VDD
 Text Label 10150 2400 0    50   ~ 0
@@ -1095,7 +1093,7 @@ L Device:R_Small R80
 U 1 1 5DC881F5
 P 4350 3600
 F 0 "R80" H 4380 3620 50  0000 L CNN
-F 1 "51R 0603" H 4380 3560 50  0000 L CNN
+F 1 "50R 0603" H 4380 3560 50  0000 L CNN
 F 2 "" H 4350 3600 50  0001 C CNN
 F 3 "~" H 4350 3600 50  0001 C CNN
 	1    4350 3600

pcb/discrete/discrete-rf-board/receiver.sch-bak

@@ -69,7 +69,7 @@ U 1 1 5D1C604E
 P 2750 3600
 F 0 "FL4" H 2500 3900 50  0000 C CNN
 F 1 "SF2098H" H 3000 3900 50  0000 C CNN
-F 2 "" H 2750 3150 50  0001 C CNN
+F 2 "discrete_footprints:Murata_SM2016-4" H 2750 3150 50  0001 C CNN
 F 3 "" H 2750 4000 50  0001 C CNN
 F 4 "719-SF2098H " H 2750 3600 50  0001 C CNN "Mouser"
 	1    2750 3600
@@ -240,7 +240,7 @@ L Device:R_Small R82
 U 1 1 5D9C48D2
 P 7550 3850
 F 0 "R82" H 7580 3870 50  0000 L CNN
-F 1 "R_Small" H 7580 3810 50  0000 L CNN
+F 1 "10kR" H 7580 3810 50  0000 L CNN
 F 2 "" H 7550 3850 50  0001 C CNN
 F 3 "~" H 7550 3850 50  0001 C CNN
 	1    7550 3850
@@ -251,7 +251,7 @@ L Device:R_Small R84
 U 1 1 5D9C9C4F
 P 7950 3850
 F 0 "R84" H 7980 3870 50  0000 L CNN
-F 1 "R_Small" H 7980 3810 50  0000 L CNN
+F 1 "10kR" H 7980 3810 50  0000 L CNN
 F 2 "" H 7950 3850 50  0001 C CNN
 F 3 "~" H 7950 3850 50  0001 C CNN
 	1    7950 3850
@@ -262,7 +262,7 @@ L Device:C_Small C110
 U 1 1 5D9CB2FC
 P 7750 4300
 F 0 "C110" H 7760 4370 50  0000 L CNN
-F 1 "C_Small" H 7760 4220 50  0000 L CNN
+F 1 "470 pF" H 7760 4220 50  0000 L CNN
 F 2 "" H 7750 4300 50  0001 C CNN
 F 3 "~" H 7750 4300 50  0001 C CNN
 	1    7750 4300
@@ -315,7 +315,7 @@ L Device:R_Small R81
 U 1 1 5D9D617C
 P 7550 2450
 F 0 "R81" H 7580 2470 50  0000 L CNN
-F 1 "R_Small" H 7580 2410 50  0000 L CNN
+F 1 "10kR" H 7580 2410 50  0000 L CNN
 F 2 "" H 7550 2450 50  0001 C CNN
 F 3 "~" H 7550 2450 50  0001 C CNN
 	1    7550 2450
@@ -326,7 +326,7 @@ L Device:R_Small R83
 U 1 1 5D9D6182
 P 7950 2450
 F 0 "R83" H 7980 2470 50  0000 L CNN
-F 1 "R_Small" H 7980 2410 50  0000 L CNN
+F 1 "10kR" H 7980 2410 50  0000 L CNN
 F 2 "" H 7950 2450 50  0001 C CNN
 F 3 "~" H 7950 2450 50  0001 C CNN
 	1    7950 2450
@@ -337,7 +337,7 @@ L Device:C_Small C109
 U 1 1 5D9D6188
 P 7750 2900
 F 0 "C109" H 7760 2970 50  0000 L CNN
-F 1 "C_Small" H 7760 2820 50  0000 L CNN
+F 1 "470 pF" H 7760 2820 50  0000 L CNN
 F 2 "" H 7750 2900 50  0001 C CNN
 F 3 "~" H 7750 2900 50  0001 C CNN
 	1    7750 2900
@@ -751,8 +751,6 @@ Text Label 8550 4800 0    50   ~ 0
 REF_N
 Text Label 8550 4900 0    50   ~ 0
 REF_P
-Text Notes 8150 2100 0    50   ~ 0
-TODO figure out resistor and capacitor values
 Text Label 9150 2400 0    50   ~ 0
 ADC_VDD
 Text Label 10150 2400 0    50   ~ 0
@@ -1095,7 +1093,7 @@ L Device:R_Small R80
 U 1 1 5DC881F5
 P 4350 3600
 F 0 "R80" H 4380 3620 50  0000 L CNN
-F 1 "51R 0603" H 4380 3560 50  0000 L CNN
+F 1 "50R 0603" H 4380 3560 50  0000 L CNN
 F 2 "" H 4350 3600 50  0001 C CNN
 F 3 "~" H 4350 3600 50  0001 C CNN
 	1    4350 3600

pcb/discrete/discrete-rf-board/switchable-attenuator.sch

@@ -22,7 +22,7 @@ AR Path="/5D4B1FC3" Ref="U?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D4B1FC3" Ref="U?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FC3" Ref="U18"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FC3" Ref="U20"  Part="1" 
-F 0 "U20" H 4000 3750 50  0000 C CNN
+F 0 "U18" H 4000 3750 50  0000 C CNN
 F 1 "BGS12PL6E6327XTSA1" H 4400 2850 50  0000 C CNN
 F 2 "discrete_footprints:Infineon_TSLP-6-4" H 3950 3300 50  0001 C CNN
 F 3 "" H 3950 3300 50  0001 C CNN
@@ -37,7 +37,7 @@ P 4850 3300
 AR Path="/5CA6B0AA/5CE74EBE/5D4B1FCA" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FCA" Ref="R147"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FCA" Ref="R150"  Part="1" 
-F 0 "R150" H 4880 3320 50  0000 L CNN
+F 0 "R147" H 4880 3320 50  0000 L CNN
 F 1 "R_Small" H 4880 3260 50  0000 L CNN
 F 2 "" H 4850 3300 50  0001 C CNN
 F 3 "~" H 4850 3300 50  0001 C CNN
@@ -51,7 +51,7 @@ P 5200 3300
 AR Path="/5CA6B0AA/5CE74EBE/5D4B1FD0" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FD0" Ref="R149"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FD0" Ref="R152"  Part="1" 
-F 0 "R152" H 5230 3320 50  0000 L CNN
+F 0 "R149" H 5230 3320 50  0000 L CNN
 F 1 "R_Small" H 5230 3260 50  0000 L CNN
 F 2 "" H 5200 3300 50  0001 C CNN
 F 3 "~" H 5200 3300 50  0001 C CNN
@@ -65,7 +65,7 @@ P 5050 3700
 AR Path="/5CA6B0AA/5CE74EBE/5D4B1FD6" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FD6" Ref="R148"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FD6" Ref="R151"  Part="1" 
-F 0 "R151" H 5080 3720 50  0000 L CNN
+F 0 "R148" H 5080 3720 50  0000 L CNN
 F 1 "R_Small" H 5080 3660 50  0000 L CNN
 F 2 "" H 5050 3700 50  0001 C CNN
 F 3 "~" H 5050 3700 50  0001 C CNN
@@ -81,7 +81,7 @@ P 3950 3900
 AR Path="/5CA6B0AA/5CE74EBE/5D4B1FDD" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FDD" Ref="#PWR0238"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FDD" Ref="#PWR0247"  Part="1" 
-F 0 "#PWR0247" H 3950 3650 50  0001 C CNN
+F 0 "#PWR0238" H 3950 3650 50  0001 C CNN
 F 1 "GND" H 3950 3750 50  0000 C CNN
 F 2 "" H 3950 3900 50  0001 C CNN
 F 3 "" H 3950 3900 50  0001 C CNN
@@ -99,7 +99,7 @@ P 5050 3900
 AR Path="/5CA6B0AA/5CE74EBE/5D4B1FE5" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FE5" Ref="#PWR0242"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FE5" Ref="#PWR0251"  Part="1" 
-F 0 "#PWR0251" H 5050 3650 50  0001 C CNN
+F 0 "#PWR0242" H 5050 3650 50  0001 C CNN
 F 1 "GND" H 5050 3750 50  0000 C CNN
 F 2 "" H 5050 3900 50  0001 C CNN
 F 3 "" H 5050 3900 50  0001 C CNN
@@ -126,7 +126,7 @@ P 6000 3900
 AR Path="/5CA6B0AA/5CE74EBE/5D4B2001" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B2001" Ref="#PWR0243"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B2001" Ref="#PWR0252"  Part="1" 
-F 0 "#PWR0252" H 6000 3650 50  0001 C CNN
+F 0 "#PWR0243" H 6000 3650 50  0001 C CNN
 F 1 "GND" H 6000 3750 50  0000 C CNN
 F 2 "" H 6000 3900 50  0001 C CNN
 F 3 "" H 6000 3900 50  0001 C CNN
@@ -143,7 +143,7 @@ AR Path="/5D4B1FF8" Ref="U?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D4B1FF8" Ref="U?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FF8" Ref="U19"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FF8" Ref="U21"  Part="1" 
-F 0 "U21" H 6050 3750 50  0000 C CNN
+F 0 "U19" H 6050 3750 50  0000 C CNN
 F 1 "BGS12PL6E6327XTSA1" H 6450 2850 50  0000 C CNN
 F 2 "" H 6000 3300 50  0001 C CNN
 F 3 "" H 6000 3300 50  0001 C CNN
@@ -188,8 +188,8 @@ U 1 1 5D4BC42E
 P 4200 2150
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BC42E" Ref="C190"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BC42E" Ref="C196"  Part="1" 
-F 0 "C196" H 4210 2220 50  0000 L CNN
+F 0 "C190" H 4210 2220 50  0000 L CNN
-F 1 "C_Small" H 4210 2070 50  0000 L CNN
+F 1 "100 pF" H 4210 2070 50  0000 L CNN
 F 2 "" H 4200 2150 50  0001 C CNN
 F 3 "~" H 4200 2150 50  0001 C CNN
 	1    4200 2150
@@ -201,8 +201,8 @@ U 1 1 5D4BC853
 P 4550 2150
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BC853" Ref="C191"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BC853" Ref="C197"  Part="1" 
-F 0 "C197" H 4560 2220 50  0000 L CNN
+F 0 "C191" H 4560 2220 50  0000 L CNN
-F 1 "C_Small" H 4560 2070 50  0000 L CNN
+F 1 "1 nF" H 4560 2070 50  0000 L CNN
 F 2 "" H 4550 2150 50  0001 C CNN
 F 3 "~" H 4550 2150 50  0001 C CNN
 	1    4550 2150
@@ -214,8 +214,8 @@ U 1 1 5D4BCC70
 P 4900 2150
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BCC70" Ref="C192"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BCC70" Ref="C198"  Part="1" 
-F 0 "C198" H 4910 2220 50  0000 L CNN
+F 0 "C192" H 4910 2220 50  0000 L CNN
-F 1 "C_Small" H 4910 2070 50  0000 L CNN
+F 1 "10 nF" H 4910 2070 50  0000 L CNN
 F 2 "" H 4900 2150 50  0001 C CNN
 F 3 "~" H 4900 2150 50  0001 C CNN
 	1    4900 2150
@@ -227,8 +227,8 @@ U 1 1 5D4BED00
 P 6250 2200
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BED00" Ref="C193"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BED00" Ref="C199"  Part="1" 
-F 0 "C199" H 6260 2270 50  0000 L CNN
+F 0 "C193" H 6260 2270 50  0000 L CNN
-F 1 "C_Small" H 6260 2120 50  0000 L CNN
+F 1 "100 pF" H 6260 2120 50  0000 L CNN
 F 2 "" H 6250 2200 50  0001 C CNN
 F 3 "~" H 6250 2200 50  0001 C CNN
 	1    6250 2200
@@ -240,8 +240,8 @@ U 1 1 5D4BED06
 P 6600 2200
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BED06" Ref="C194"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BED06" Ref="C200"  Part="1" 
-F 0 "C200" H 6610 2270 50  0000 L CNN
+F 0 "C194" H 6610 2270 50  0000 L CNN
-F 1 "C_Small" H 6610 2120 50  0000 L CNN
+F 1 "1 nF" H 6610 2120 50  0000 L CNN
 F 2 "" H 6600 2200 50  0001 C CNN
 F 3 "~" H 6600 2200 50  0001 C CNN
 	1    6600 2200
@@ -253,8 +253,8 @@ U 1 1 5D4BED0C
 P 6950 2200
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BED0C" Ref="C195"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BED0C" Ref="C201"  Part="1" 
-F 0 "C201" H 6960 2270 50  0000 L CNN
+F 0 "C195" H 6960 2270 50  0000 L CNN
-F 1 "C_Small" H 6960 2120 50  0000 L CNN
+F 1 "10 nF" H 6960 2120 50  0000 L CNN
 F 2 "" H 6950 2200 50  0001 C CNN
 F 3 "~" H 6950 2200 50  0001 C CNN
 	1    6950 2200
@@ -266,7 +266,7 @@ U 1 1 5D4BF277
 P 6950 2400
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BF277" Ref="#PWR0246"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BF277" Ref="#PWR0255"  Part="1" 
-F 0 "#PWR0255" H 6950 2150 50  0001 C CNN
+F 0 "#PWR0246" H 6950 2150 50  0001 C CNN
 F 1 "GND" H 6950 2250 50  0000 C CNN
 F 2 "" H 6950 2400 50  0001 C CNN
 F 3 "" H 6950 2400 50  0001 C CNN
@@ -279,7 +279,7 @@ U 1 1 5D4BF7E8
 P 6600 2400
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BF7E8" Ref="#PWR0245"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BF7E8" Ref="#PWR0254"  Part="1" 
-F 0 "#PWR0254" H 6600 2150 50  0001 C CNN
+F 0 "#PWR0245" H 6600 2150 50  0001 C CNN
 F 1 "GND" H 6600 2250 50  0000 C CNN
 F 2 "" H 6600 2400 50  0001 C CNN
 F 3 "" H 6600 2400 50  0001 C CNN
@@ -292,7 +292,7 @@ U 1 1 5D4BFA67
 P 6250 2400
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BFA67" Ref="#PWR0244"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BFA67" Ref="#PWR0253"  Part="1" 
-F 0 "#PWR0253" H 6250 2150 50  0001 C CNN
+F 0 "#PWR0244" H 6250 2150 50  0001 C CNN
 F 1 "GND" H 6250 2250 50  0000 C CNN
 F 2 "" H 6250 2400 50  0001 C CNN
 F 3 "" H 6250 2400 50  0001 C CNN
@@ -328,7 +328,7 @@ U 1 1 5D4C425B
 P 4900 2350
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4C425B" Ref="#PWR0241"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4C425B" Ref="#PWR0250"  Part="1" 
-F 0 "#PWR0250" H 4900 2100 50  0001 C CNN
+F 0 "#PWR0241" H 4900 2100 50  0001 C CNN
 F 1 "GND" H 4900 2200 50  0000 C CNN
 F 2 "" H 4900 2350 50  0001 C CNN
 F 3 "" H 4900 2350 50  0001 C CNN
@@ -341,7 +341,7 @@ U 1 1 5D4C4261
 P 4550 2350
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4C4261" Ref="#PWR0240"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4C4261" Ref="#PWR0249"  Part="1" 
-F 0 "#PWR0249" H 4550 2100 50  0001 C CNN
+F 0 "#PWR0240" H 4550 2100 50  0001 C CNN
 F 1 "GND" H 4550 2200 50  0000 C CNN
 F 2 "" H 4550 2350 50  0001 C CNN
 F 3 "" H 4550 2350 50  0001 C CNN
@@ -354,7 +354,7 @@ U 1 1 5D4C4267
 P 4200 2350
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4C4267" Ref="#PWR0239"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4C4267" Ref="#PWR0248"  Part="1" 
-F 0 "#PWR0248" H 4200 2100 50  0001 C CNN
+F 0 "#PWR0239" H 4200 2100 50  0001 C CNN
 F 1 "GND" H 4200 2200 50  0000 C CNN
 F 2 "" H 4200 2350 50  0001 C CNN
 F 3 "" H 4200 2350 50  0001 C CNN

pcb/discrete/discrete-rf-board/transmitter.sch

@@ -68,7 +68,7 @@ L Device:R_Small R7
 U 1 1 5D7F54C0
 P 6750 3550
 F 0 "R7" H 6780 3570 50  0000 L CNN
-F 1 "51R 0603" H 6780 3510 50  0000 L CNN
+F 1 "50R 0603" H 6780 3510 50  0000 L CNN
 F 2 "" H 6750 3550 50  0001 C CNN
 F 3 "~" H 6750 3550 50  0001 C CNN
 	1    6750 3550

pcb/discrete/discrete-rf-board/transmitter.sch-bak

@@ -68,7 +68,7 @@ L Device:R_Small R7
 U 1 1 5D7F54C0
 P 6750 3550
 F 0 "R7" H 6780 3570 50  0000 L CNN
-F 1 "51R 0603" H 6780 3510 50  0000 L CNN
+F 1 "50R 0603" H 6780 3510 50  0000 L CNN
 F 2 "" H 6750 3550 50  0001 C CNN
 F 3 "~" H 6750 3550 50  0001 C CNN
 	1    6750 3550