Footprint some stuff

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 "R59" H 3580 2720 50  0000 L CNN
+F 0 "R49" 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 "R60" H 3580 3020 50  0000 L CNN
+F 0 "R50" 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 "R61" H 3580 3320 50  0000 L CNN
+F 0 "R51" 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 "R62" H 3580 3620 50  0000 L CNN
+F 0 "R52" 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 "R63" H 3580 3920 50  0000 L CNN
+F 0 "R53" 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 "R55" V 3450 2800 50  0000 L CNN
+F 0 "R45" 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 "R56" V 3450 3100 50  0000 L CNN
+F 0 "R46" 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 "R57" V 3450 3400 50  0000 L CNN
+F 0 "R47" 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 "R58" V 3450 3700 50  0000 L CNN
+F 0 "R48" 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 "Q21" H 4300 2900 50  0000 L CNN
+F 0 "Q20" 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 "R64" H 4230 3320 50  0000 L CNN
+F 0 "R54" 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 "C82" H 2960 2220 50  0000 L CNN
+F 0 "C74" 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,10 +252,11 @@ 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 "C81" H 2610 2220 50  0000 L CNN
+F 0 "C73" 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 2 "Capacitor_SMD:C_0402_1005Metric" H 2600 2150 50  0001 C CNN
 F 3 "~" H 2600 2150 50  0001 C CNN
+F 4 "963-JMK105BJ474MV-F" H 2600 2150 50  0001 C CNN "Mouser"
 	1    2600 2150
 	1    0    0    -1  
 $EndComp
@@ -265,7 +266,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 "C80" H 2210 2220 50  0000 L CNN
+F 0 "C72" 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 +279,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 "C79" H 1810 2220 50  0000 L CNN
+F 0 "C71" 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 +337,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 "C83" H 4760 2220 50  0000 L CNN
+F 0 "C75" 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 +350,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 "C84" H 5110 2220 50  0000 L CNN
+F 0 "C76" 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 +363,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 "C85" H 5510 2220 50  0000 L CNN
+F 0 "C77" 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 +376,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 "C86" H 5910 2220 50  0000 L CNN
+F 0 "C78" 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/dac.sch-bak

@@ -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 "R59" H 3580 2720 50  0000 L CNN
+F 0 "R49" 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 "R60" H 3580 3020 50  0000 L CNN
+F 0 "R50" 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 "R61" H 3580 3320 50  0000 L CNN
+F 0 "R51" 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 "R62" H 3580 3620 50  0000 L CNN
+F 0 "R52" 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 "R63" H 3580 3920 50  0000 L CNN
+F 0 "R53" 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 "R55" V 3450 2800 50  0000 L CNN
+F 0 "R45" 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 "R56" V 3450 3100 50  0000 L CNN
+F 0 "R46" 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 "R57" V 3450 3400 50  0000 L CNN
+F 0 "R47" 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 "R58" V 3450 3700 50  0000 L CNN
+F 0 "R48" 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 "Q21" H 4300 2900 50  0000 L CNN
+F 0 "Q20" 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 "R64" H 4230 3320 50  0000 L CNN
+F 0 "R54" 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 "C82" H 2960 2220 50  0000 L CNN
+F 0 "C74" 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,10 +252,11 @@ 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 "C81" H 2610 2220 50  0000 L CNN
+F 0 "C73" 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 2 "Capacitor_SMD:C_0402_1005Metric" H 2600 2150 50  0001 C CNN
 F 3 "~" H 2600 2150 50  0001 C CNN
+F 4 "963-JMK105BJ474MV-F" H 2600 2150 50  0001 C CNN "Mouser"
 	1    2600 2150
 	1    0    0    -1  
 $EndComp
@@ -265,7 +266,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 "C80" H 2210 2220 50  0000 L CNN
+F 0 "C72" 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 +279,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 "C79" H 1810 2220 50  0000 L CNN
+F 0 "C71" 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 +337,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 "C83" H 4760 2220 50  0000 L CNN
+F 0 "C75" 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 +350,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 "C84" H 5110 2220 50  0000 L CNN
+F 0 "C76" 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 +363,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 "C85" H 5510 2220 50  0000 L CNN
+F 0 "C77" 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 +376,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 "C86" H 5910 2220 50  0000 L CNN
+F 0 "C78" 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

@@ -36,8 +36,9 @@ AR Path="/5CA6B0AA/5CC1CC09/5CC1F89D" Ref="C205"  Part="1"
 AR Path="/5CA6B0AA/5CC4015A/5CC1F89D" Ref="C136"  Part="1" 
 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 2 "Capacitor_SMD:C_0402_1005Metric" H 6500 3600 50  0001 C CNN
 F 3 "~" H 6500 3600 50  0001 C CNN
+F 4 "791-RF15N1R1B500CT" H 6500 3600 50  0001 C CNN "Mouser"
 	1    6500 3600
 	1    0    0    -1  
 $EndComp
@@ -173,7 +174,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 +187,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
@@ -227,7 +228,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
@@ -240,7 +241,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

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

@@ -36,8 +36,9 @@ AR Path="/5CA6B0AA/5CC1CC09/5CC1F89D" Ref="C205"  Part="1"
 AR Path="/5CA6B0AA/5CC4015A/5CC1F89D" Ref="C136"  Part="1" 
 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 2 "Capacitor_SMD:C_0402_1005Metric" H 6500 3600 50  0001 C CNN
 F 3 "~" H 6500 3600 50  0001 C CNN
+F 4 "791-RF15N1R1B500CT" H 6500 3600 50  0001 C CNN "Mouser"
 	1    6500 3600
 	1    0    0    -1  
 $EndComp

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

@@ -198,8 +198,9 @@ U 1 1 5D87D0F9
 P 9150 3250
 F 0 "R1" H 9180 3270 50  0000 L CNN
 F 1 "0R" H 9180 3210 50  0000 L CNN
-F 2 "" H 9150 3250 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 9150 3250 50  0001 C CNN
 F 3 "~" H 9150 3250 50  0001 C CNN
+F 4 "71-CRCW04020000Z0EDC" H 9150 3250 50  0001 C CNN "Mouser"
 	1    9150 3250
 	0    -1   -1   0   
 $EndComp

pcb/discrete/discrete-rf-board/discrete_footprints.pretty/Maxim_TQFN28-EP.kicad_mod

@@ -0,0 +1,95 @@
+(module Maxim-TQFN-28-EP (layer F.Cu) (tedit 5D843DB8)
+  (fp_text reference REF** (at 0.0 0.0) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text user %R (at 0.0 0.0) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value %V (at 0 -0.5) (layer F.Fab) hide
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+
+  (fp_line (start -2.7 -1.8499999999999999) (end -1.8499999999999999 -2.7) (layer F.SilkS) (width 0.15))
+  (fp_line (start -2.7 2.7) (end -2.7 1.8499999999999999) (layer F.SilkS) (width 0.15))
+  (fp_line (start -1.8499999999999999 2.7) (end -2.7 2.7) (layer F.SilkS) (width 0.15))
+  (fp_line (start 1.8499999999999999 2.7) (end 2.7 2.7) (layer F.SilkS) (width 0.15))
+  (fp_line (start 2.7 2.7) (end 2.7 1.8499999999999999) (layer F.SilkS) (width 0.15))
+  (fp_line (start 2.7 -1.8499999999999999) (end 2.7 -2.7) (layer F.SilkS) (width 0.15))
+  (fp_line (start 2.7 -2.7) (end 1.8499999999999999 -2.7) (layer F.SilkS) (width 0.15))
+  (fp_circle (center -2.7 -2.7) (end -2.7 -2.85) (layer F.SilkS) (width 0.15))
+  (fp_line (start -2.25 -2.55) (end -2.55 -2.25) (layer F.Fab) (width 0.15))
+  (fp_line (start 2.55 -2.55) (end -2.25 -2.55) (layer F.Fab) (width 0.15))
+  (fp_line (start 2.55 2.55) (end 2.55 -2.55) (layer F.Fab) (width 0.15))
+  (fp_line (start -2.55 2.55) (end 2.55 2.55) (layer F.Fab) (width 0.15))
+  (fp_line (start -2.55 -2.25) (end -2.55 2.55) (layer F.Fab) (width 0.15))
+  (fp_line (start -2.8 -1.7999999999999998) (end -2.8 -2.8) (layer F.CrtYd) (width 0.15))
+  (fp_line (start -2.8 -2.8) (end 2.8 -2.8) (layer F.CrtYd) (width 0.15))
+  (fp_line (start 2.8 -2.8) (end 2.8 -1.7999999999999998) (layer F.CrtYd) (width 0.15))
+  (fp_line (start 2.8 -1.7999999999999998) (end 3.0349999999999997 -1.7999999999999998) (layer F.CrtYd) (width 0.15))
+  (fp_line (start 3.0349999999999997 -1.7999999999999998) (end 3.0349999999999997 1.7999999999999998) (layer F.CrtYd) (width 0.15))
+  (fp_line (start 3.0349999999999997 1.7999999999999998) (end 2.8 1.7999999999999998) (layer F.CrtYd) (width 0.15))
+  (fp_line (start 2.8 1.7999999999999998) (end 2.8 2.8) (layer F.CrtYd) (width 0.15))
+  (fp_line (start 2.8 2.8) (end -2.8 2.8) (layer F.CrtYd) (width 0.15))
+  (fp_line (start -2.8 2.8) (end -2.8 1.7999999999999998) (layer F.CrtYd) (width 0.15))
+  (fp_line (start -2.8 1.7999999999999998) (end -3.0349999999999997 1.7999999999999998) (layer F.CrtYd) (width 0.15))
+  (fp_line (start -3.0349999999999997 1.7999999999999998) (end -3.0349999999999997 -1.7999999999999998) (layer F.CrtYd) (width 0.15))
+  (fp_line (start -3.0349999999999997 -1.7999999999999998) (end -2.8 -1.7999999999999998) (layer F.CrtYd) (width 0.15))
+  (pad 1 smd rect (at -2.36 -1.5) (size 1.0499999999999998 0.3) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 2 smd rect (at -2.36 -1.0) (size 1.0499999999999998 0.3) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 3 smd rect (at -2.36 -0.5) (size 1.0499999999999998 0.3) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 4 smd rect (at -2.36 0.0) (size 1.0499999999999998 0.3) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 5 smd rect (at -2.36 0.5) (size 1.0499999999999998 0.3) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 6 smd rect (at -2.36 1.0) (size 1.0499999999999998 0.3) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 7 smd rect (at -2.36 1.5) (size 1.0499999999999998 0.3) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 8 smd rect (at -1.5 2.36) (size 0.3 1.0499999999999998) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 9 smd rect (at -1.0 2.36) (size 0.3 1.0499999999999998) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 10 smd rect (at -0.5 2.36) (size 0.3 1.0499999999999998) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 11 smd rect (at 0.0 2.36) (size 0.3 1.0499999999999998) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 12 smd rect (at 0.5 2.36) (size 0.3 1.0499999999999998) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 13 smd rect (at 1.0 2.36) (size 0.3 1.0499999999999998) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 14 smd rect (at 1.5 2.36) (size 0.3 1.0499999999999998) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 15 smd rect (at 2.36 1.5) (size 1.0499999999999998 0.3) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 16 smd rect (at 2.36 1.0) (size 1.0499999999999998 0.3) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 17 smd rect (at 2.36 0.5) (size 1.0499999999999998 0.3) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 18 smd rect (at 2.36 -0.0) (size 1.0499999999999998 0.3) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 19 smd rect (at 2.36 -0.5) (size 1.0499999999999998 0.3) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 20 smd rect (at 2.36 -1.0) (size 1.0499999999999998 0.3) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 21 smd rect (at 2.36 -1.5) (size 1.0499999999999998 0.3) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 22 smd rect (at 1.5 -2.36) (size 0.3 1.0499999999999998) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 23 smd rect (at 1.0 -2.36) (size 0.3 1.0499999999999998) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 24 smd rect (at 0.5 -2.36) (size 0.3 1.0499999999999998) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 25 smd rect (at -0.0 -2.36) (size 0.3 1.0499999999999998) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 26 smd rect (at -0.5 -2.36) (size 0.3 1.0499999999999998) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 27 smd rect (at -1.0 -2.36) (size 0.3 1.0499999999999998) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 28 smd rect (at -1.5 -2.36) (size 0.3 1.0499999999999998) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 0 smd rect (at 0 0) (size 3.19 3.19) (layers F.Cu F.Paste F.Mask)
+      (solder_mask_margin 0.05))
+)

pcb/discrete/discrete-rf-board/gen_maxim_tqfn28ep.py

@@ -0,0 +1,280 @@
+#!/usr/bin/env python3
+
+# QFN/QFP-style packages with ground plane
+# version 0.0.6
+
+# added solder mask parameter
+# added optional indicator circle
+# added ground pad
+# made ground pad optional
+# fix silkscreen pin 1 marker
+# added rounded pads option
+# added reference designator to fab layer
+# make fab layer pin drawing optional
+# added TI's weird ground pad extensions
+# v0.0.5
+# added indicator marker to fab layer
+# v0.0.6
+# removed TI extensions
+# converted for use in QFN/QFP packages
+# - add pads for QFN/QFP
+# - add fab pad drawings for QFN/QFP
+# - fix silkscreen
+
+PARTNAME = "Maxim-TQFN-28-EP"
+
+total_pins = 28
+num_per_edge = total_pins // 4
+
+M1 = 0.2 # silkscreen margin
+M2 = 0.05 # fab outline margin
+M3 = 0.3 # courtyard margin
+
+Z = 4.72 + 1.05 # distance across outer edges of pads
+G = 4.72 - 1.05  # distance across inner edges of pads
+
+X = (Z+G)/2. # distance between pad centers
+C = 0.5 # footprint pad spacing
+w = 0.30 # footprint pad width
+h = (Z-G)/2. # footprint pad length
+
+show_fab_pads = False
+H = 5.0 # distance from physical pad end to opposite pad end
+e = C    # physical pad spacing, same as above
+b = 0.30 # physical pad width
+L1 = -0.55 # physical pad length
+
+D1 = 5.0 # package width
+E1 = 5.0 # package height
+
+has_ground_pad = True
+G1 = 3.19  # ground pad width
+H1 = 3.19  # ground pad height
+ground_pad_num = 0
+
+# NOTE: need to test with SMD footprints
+# need to make sure pad size adjustment works
+# nsmd = positive
+solder_mask_margin = 0.05
+indicator_circle_dia = 0.3
+
+pad_radius = None
+
+if solder_mask_margin < 0.0:
+  w -= 2.0*solder_mask_margin
+  h -= 2.0*solder_mask_margin
+  G1 -= 2.0*solder_mask_margin
+  H1 -= 2.0*solder_mask_margin
+
+import math
+
+import time
+gen_time = hex(int(time.time()))[2:].upper()
+
+
+prologue = """(module {} (layer F.Cu) (tedit {})
+  (fp_text reference REF** (at 0.0 0.0) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text user %R (at 0.0 0.0) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value %V (at 0 -0.5) (layer F.Fab) hide
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+"""
+
+prologue = prologue.format(PARTNAME, gen_time, PARTNAME)
+epilogue = """)"""
+
+print(prologue)
+
+# print silkscreen outline
+inner_edge = C*(num_per_edge/2 - 0.5) + w/2 + M1
+x = D1/2 + M1
+y = E1/2 + M1
+for x, y, nx, ny in [
+    (-x, -inner_edge, -inner_edge, -y),
+
+    (-x, y, -x, inner_edge), (-inner_edge, y, -x, y), 
+    (inner_edge, y, x, y), (x, y, x, inner_edge),
+    (x, -inner_edge, x, -y), (x, -y, inner_edge, -y)]:
+  print("""  (fp_line (start {} {}) (end {} {}) (layer F.SilkS) (width 0.15))""".
+      format(x, y, nx, ny))
+
+if indicator_circle_dia is not None:
+  x = D1/2 + M1 #+ 0.5*indicator_circle_dia
+  y = E1/2 + M1 #+ 0.5*indicator_circle_dia
+  # add indicator circle
+  print("""  (fp_circle (center {} {}) (end {} {}) (layer F.SilkS) (width 0.15))""".
+      format(-x, -y, -x, -y - indicator_circle_dia/2.0))
+
+
+# draw package outline in fab layer
+FC = 0.3
+fab_points = [(-D1/2 - M2 + FC, -E1/2 - M2),
+              (D1/2 + M2, -E1/2 - M2),
+              (D1/2 + M2, E1/2 + M2),
+              (-D1/2 + -M2, E1/2 + M2),
+              (-D1/2 + -M2, -E1/2 - M2 + FC)]
+ 
+nx, ny = fab_points[-1]
+for x, y in fab_points:
+  print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+      format(x, y, nx, ny))
+  nx, ny = x, y
+
+if show_fab_pads:
+  for i in range(num_per_edge):
+    x_pos = -D1/2 - M2
+    y_pos = C*(i-(num_per_edge/2-0.5))
+    print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+        format(x_pos, y_pos - b/2 - M2, x_pos - L1, y_pos - b/2 - M2))
+    print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+        format(x_pos - L1, y_pos - b/2 - M2, x_pos - L1, y_pos + b/2 + M2))
+    print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+        format(x_pos - L1, y_pos + b/2 + M2, x_pos, y_pos + b/2 + M2))
+
+  for i in range(num_per_edge):
+    x_pos = C*(i-(num_per_edge/2-0.5))
+    y_pos = E1/2 + M2
+    print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+        format(x_pos - b/2 - M2, y_pos, x_pos - b/2 - M2, y_pos + L1))
+    print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+        format(x_pos - b/2 - M2, y_pos + L1, x_pos + b/2 + M2, y_pos + L1))
+    print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+        format(x_pos + b/2 + M2, y_pos + L1, x_pos + b/2 + M2, y_pos))
+
+  for i in range(num_per_edge):
+    x_pos = D1/2 + M2
+    y_pos = -C*(i-(num_per_edge/2-0.5))
+    print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+        format(x_pos, y_pos + b/2 + M2, x_pos + L1, y_pos + b/2 + M2))
+    print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+        format(x_pos + L1, y_pos + b/2 + M2, x_pos + L1, y_pos - b/2 - M2))
+    print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+        format(x_pos + L1, y_pos - b/2 - M2, x_pos, y_pos - b/2 - M2))
+
+  for i in range(num_per_edge):
+    x_pos = -C*(i-(num_per_edge/2-0.5))
+    y_pos = -E1/2 - M2
+    print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+        format(x_pos + b/2 + M2, y_pos, x_pos + b/2 + M2, y_pos - L1))
+    print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+        format(x_pos + b/2 + M2, y_pos - L1, x_pos - b/2 - M2, y_pos - L1))
+    print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+        format(x_pos - b/2 - M2, y_pos - L1, x_pos - b/2 - M2, y_pos))
+
+
+# print courtyard outline
+inner_x = D1/2 + M3
+outer_x = X/2 + h/2 + M3/2
+inner_y = C*(num_per_edge/2-0.5) + b/2 + M3/2
+outer_y = E1/2 + M3
+pts = [
+    (-inner_x, -outer_y),
+    (inner_x, -outer_y),
+    (inner_x, -inner_y),
+    (outer_x, -inner_y),
+    (outer_x, inner_y),
+    (inner_x, inner_y),
+    (inner_x, outer_y),
+    (-inner_x, outer_y),
+    (-inner_x, inner_y),
+    (-outer_x, inner_y),
+    (-outer_x, -inner_y),
+    (-inner_x, -inner_y)
+    ]
+nx, ny = pts[-1]
+for px, py in pts:
+  x, y, nx, ny = nx, ny, px, py
+  print("""  (fp_line (start {} {}) (end {} {}) (layer F.CrtYd) (width 0.15))""".
+      format(x, y, nx, ny))
+
+
+padtype = "rect"
+padext = ""
+if pad_radius is not None:
+  padtype = "roundrect"
+  padext = "(roundrect_rratio {})".format(pad_radius/min(h, w))
+
+for i in range(0, num_per_edge):
+  print("""  (pad {} smd {} (at {} {}) (size {} {}) (layers F.Cu F.Paste F.Mask)
+    {} (solder_mask_margin {}))""".
+        format(
+            i+1,
+            padtype,
+            -X/2,
+            C*(i-(num_per_edge/2-0.5)),
+            h,
+            w,
+            padext,
+            solder_mask_margin))
+
+for i in range(0, num_per_edge):
+  print("""  (pad {} smd {} (at {} {}) (size {} {}) (layers F.Cu F.Paste F.Mask)
+    {} (solder_mask_margin {}))""".
+        format(
+          i+1+1*num_per_edge,
+          padtype,
+          C*(i-(num_per_edge/2-0.5)),
+          X/2,
+          w,
+          h,
+          padext,
+          solder_mask_margin))
+
+for i in range(0, num_per_edge):
+  print("""  (pad {} smd {} (at {} {}) (size {} {}) (layers F.Cu F.Paste F.Mask)
+    {} (solder_mask_margin {}))""".
+        format(
+          i+1+2*num_per_edge,
+          padtype,
+          X/2,
+          -C*(i-(num_per_edge/2-0.5)),
+          h,
+          w,
+          padext,
+          solder_mask_margin))
+
+for i in range(0, num_per_edge):
+  print("""  (pad {} smd {} (at {} {}) (size {} {}) (layers F.Cu F.Paste F.Mask)
+    {} (solder_mask_margin {}))""".
+        format(
+          i+1+3*num_per_edge,
+          padtype,
+          -C*(i-(num_per_edge/2-0.5)),
+          -X/2,
+          w,
+          h,
+          padext,
+          solder_mask_margin))
+
+
+if has_ground_pad: 
+  if pad_radius is None:
+    # add ground pad
+    print("""  (pad {} smd {} (at {} {}) (size {} {}) (layers F.Cu F.Paste F.Mask)
+      (solder_mask_margin {}))""".
+          format(
+              ground_pad_num,
+              "rect",
+              0,
+              0,
+              G1,
+              H1,
+              solder_mask_margin))
+  else:
+    print("""  (pad {} smd {} (at {} {}) (size {} {}) (layers F.Cu F.Paste F.Mask)
+      (roundrect_rratio {}) (solder_mask_margin {}))""".
+          format(
+              ground_pad_num,
+              "roundrect",
+              0,
+              0,
+              G1,
+              H1,
+              pad_radius/min(G1, H1),
+              solder_mask_margin))
+
+print(epilogue)

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

@@ -156,7 +156,7 @@ U 1 1 5CC541C5
 P 3250 3350
 AR Path="/5CA6B0AA/5CC4DFC2/5CC541C5" Ref="#PWR0154"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC541C5" Ref="#PWR0177"  Part="1" 
-F 0 "#PWR0177" H 3250 3100 50  0001 C CNN
+F 0 "#PWR0154" H 3250 3100 50  0001 C CNN
 F 1 "GND" H 3250 3200 50  0000 C CNN
 F 2 "" H 3250 3350 50  0001 C CNN
 F 3 "" H 3250 3350 50  0001 C CNN
@@ -169,7 +169,7 @@ U 1 1 5CC543E7
 P 1650 3350
 AR Path="/5CA6B0AA/5CC4DFC2/5CC543E7" Ref="#PWR0150"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC543E7" Ref="#PWR0173"  Part="1" 
-F 0 "#PWR0173" H 1650 3100 50  0001 C CNN
+F 0 "#PWR0150" H 1650 3100 50  0001 C CNN
 F 1 "GND" H 1650 3200 50  0000 C CNN
 F 2 "" H 1650 3350 50  0001 C CNN
 F 3 "" H 1650 3350 50  0001 C CNN
@@ -182,7 +182,7 @@ U 1 1 5CC54945
 P 2450 4300
 AR Path="/5CA6B0AA/5CC4DFC2/5CC54945" Ref="#PWR0151"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC54945" Ref="#PWR0174"  Part="1" 
-F 0 "#PWR0174" H 2450 4050 50  0001 C CNN
+F 0 "#PWR0151" H 2450 4050 50  0001 C CNN
 F 1 "GND" H 2450 4150 50  0000 C CNN
 F 2 "" H 2450 4300 50  0001 C CNN
 F 3 "" H 2450 4300 50  0001 C CNN
@@ -247,7 +247,7 @@ U 1 1 5CC64E30
 P 1300 4150
 AR Path="/5CA6B0AA/5CC4DFC2/5CC64E30" Ref="#PWR0149"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC64E30" Ref="#PWR0172"  Part="1" 
-F 0 "#PWR0172" H 1300 3900 50  0001 C CNN
+F 0 "#PWR0149" H 1300 3900 50  0001 C CNN
 F 1 "GND" H 1300 4000 50  0000 C CNN
 F 2 "" H 1300 4150 50  0001 C CNN
 F 3 "" H 1300 4150 50  0001 C CNN
@@ -383,7 +383,7 @@ U 1 1 5CC71057
 P 7350 3100
 AR Path="/5CA6B0AA/5CC4DFC2/5CC71057" Ref="#PWR0165"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC71057" Ref="#PWR0188"  Part="1" 
-F 0 "#PWR0188" H 7350 2850 50  0001 C CNN
+F 0 "#PWR0165" H 7350 2850 50  0001 C CNN
 F 1 "GND" H 7350 2950 50  0000 C CNN
 F 2 "" H 7350 3100 50  0001 C CNN
 F 3 "" H 7350 3100 50  0001 C CNN
@@ -396,7 +396,7 @@ U 1 1 5CC7105D
 P 5750 3100
 AR Path="/5CA6B0AA/5CC4DFC2/5CC7105D" Ref="#PWR0163"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC7105D" Ref="#PWR0186"  Part="1" 
-F 0 "#PWR0186" H 5750 2850 50  0001 C CNN
+F 0 "#PWR0163" H 5750 2850 50  0001 C CNN
 F 1 "GND" H 5750 2950 50  0000 C CNN
 F 2 "" H 5750 3100 50  0001 C CNN
 F 3 "" H 5750 3100 50  0001 C CNN
@@ -446,7 +446,7 @@ U 1 1 5CC7911F
 P 6550 3900
 AR Path="/5CA6B0AA/5CC4DFC2/5CC7911F" Ref="#PWR0164"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC7911F" Ref="#PWR0187"  Part="1" 
-F 0 "#PWR0187" H 6550 3650 50  0001 C CNN
+F 0 "#PWR0164" H 6550 3650 50  0001 C CNN
 F 1 "GND" H 6550 3750 50  0000 C CNN
 F 2 "" H 6550 3900 50  0001 C CNN
 F 3 "" H 6550 3900 50  0001 C CNN
@@ -824,7 +824,7 @@ U 1 1 5CC9F407
 P 2500 6800
 AR Path="/5CA6B0AA/5CC4DFC2/5CC9F407" Ref="#PWR0152"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC9F407" Ref="#PWR0175"  Part="1" 
-F 0 "#PWR0175" H 2500 6550 50  0001 C CNN
+F 0 "#PWR0152" H 2500 6550 50  0001 C CNN
 F 1 "GND" H 2500 6650 50  0000 C CNN
 F 2 "" H 2500 6800 50  0001 C CNN
 F 3 "" H 2500 6800 50  0001 C CNN
@@ -837,7 +837,7 @@ U 1 1 5CC9FAC5
 P 3350 6800
 AR Path="/5CA6B0AA/5CC4DFC2/5CC9FAC5" Ref="#PWR0155"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC9FAC5" Ref="#PWR0178"  Part="1" 
-F 0 "#PWR0178" H 3350 6550 50  0001 C CNN
+F 0 "#PWR0155" H 3350 6550 50  0001 C CNN
 F 1 "GND" H 3350 6650 50  0000 C CNN
 F 2 "" H 3350 6800 50  0001 C CNN
 F 3 "" H 3350 6800 50  0001 C CNN
@@ -850,7 +850,7 @@ U 1 1 5CC9FD6D
 P 4300 6800
 AR Path="/5CA6B0AA/5CC4DFC2/5CC9FD6D" Ref="#PWR0160"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC9FD6D" Ref="#PWR0183"  Part="1" 
-F 0 "#PWR0183" H 4300 6550 50  0001 C CNN
+F 0 "#PWR0160" H 4300 6550 50  0001 C CNN
 F 1 "GND" H 4300 6650 50  0000 C CNN
 F 2 "" H 4300 6800 50  0001 C CNN
 F 3 "" H 4300 6800 50  0001 C CNN
@@ -863,7 +863,7 @@ U 1 1 5CCA0195
 P 5050 6800
 AR Path="/5CA6B0AA/5CC4DFC2/5CCA0195" Ref="#PWR0162"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCA0195" Ref="#PWR0185"  Part="1" 
-F 0 "#PWR0185" H 5050 6550 50  0001 C CNN
+F 0 "#PWR0162" H 5050 6550 50  0001 C CNN
 F 1 "GND" H 5050 6650 50  0000 C CNN
 F 2 "" H 5050 6800 50  0001 C CNN
 F 3 "" H 5050 6800 50  0001 C CNN
@@ -876,7 +876,7 @@ U 1 1 5CCA0420
 P 3050 5900
 AR Path="/5CA6B0AA/5CC4DFC2/5CCA0420" Ref="#PWR0153"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCA0420" Ref="#PWR0176"  Part="1" 
-F 0 "#PWR0176" H 3050 5650 50  0001 C CNN
+F 0 "#PWR0153" H 3050 5650 50  0001 C CNN
 F 1 "GND" H 3050 5750 50  0000 C CNN
 F 2 "" H 3050 5900 50  0001 C CNN
 F 3 "" H 3050 5900 50  0001 C CNN
@@ -889,7 +889,7 @@ U 1 1 5CCA07DE
 P 3550 5900
 AR Path="/5CA6B0AA/5CC4DFC2/5CCA07DE" Ref="#PWR0156"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCA07DE" Ref="#PWR0179"  Part="1" 
-F 0 "#PWR0179" H 3550 5650 50  0001 C CNN
+F 0 "#PWR0156" H 3550 5650 50  0001 C CNN
 F 1 "GND" H 3550 5750 50  0000 C CNN
 F 2 "" H 3550 5900 50  0001 C CNN
 F 3 "" H 3550 5900 50  0001 C CNN
@@ -902,7 +902,7 @@ U 1 1 5CCA0A90
 P 4000 5900
 AR Path="/5CA6B0AA/5CC4DFC2/5CCA0A90" Ref="#PWR0158"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCA0A90" Ref="#PWR0181"  Part="1" 
-F 0 "#PWR0181" H 4000 5650 50  0001 C CNN
+F 0 "#PWR0158" H 4000 5650 50  0001 C CNN
 F 1 "GND" H 4000 5750 50  0000 C CNN
 F 2 "" H 4000 5900 50  0001 C CNN
 F 3 "" H 4000 5900 50  0001 C CNN
@@ -915,7 +915,7 @@ U 1 1 5CCA0D69
 P 4450 5900
 AR Path="/5CA6B0AA/5CC4DFC2/5CCA0D69" Ref="#PWR0161"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCA0D69" Ref="#PWR0184"  Part="1" 
-F 0 "#PWR0184" H 4450 5650 50  0001 C CNN
+F 0 "#PWR0161" H 4450 5650 50  0001 C CNN
 F 1 "GND" H 4450 5750 50  0000 C CNN
 F 2 "" H 4450 5900 50  0001 C CNN
 F 3 "" H 4450 5900 50  0001 C CNN
@@ -978,8 +978,9 @@ AR Path="/5CA6B0AA/5CC4DFC2/5CCEE151" Ref="TP7"  Part="1"
 AR Path="/5CA6B0AA/5CC9409A/5CCEE151" Ref="TP17"  Part="1" 
 F 0 "TP7" H 5850 2420 50  0000 C CNN
 F 1 "TestPoint" H 5850 2350 50  0000 C CNN
-F 2 "" H 6050 2150 50  0001 C CNN
+F 2 "TestPoint:TestPoint_Pad_D1.0mm" H 6050 2150 50  0001 C CNN
 F 3 "~" H 6050 2150 50  0001 C CNN
+F 4 "NoPart" H 5850 2150 50  0001 C CNN "Mouser"
 	1    5850 2150
 	1    0    0    -1  
 $EndComp
@@ -1225,7 +1226,7 @@ U 1 1 5D57AB69
 P 3650 2150
 AR Path="/5CA6B0AA/5CC4DFC2/5D57AB69" Ref="#PWR0157"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5D57AB69" Ref="#PWR0180"  Part="1" 
-F 0 "#PWR0180" H 3650 1900 50  0001 C CNN
+F 0 "#PWR0157" H 3650 1900 50  0001 C CNN
 F 1 "GND" H 3650 2000 50  0000 C CNN
 F 2 "" H 3650 2150 50  0001 C CNN
 F 3 "" H 3650 2150 50  0001 C CNN
@@ -1238,7 +1239,7 @@ U 1 1 5D57AB6F
 P 4100 2150
 AR Path="/5CA6B0AA/5CC4DFC2/5D57AB6F" Ref="#PWR0159"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5D57AB6F" Ref="#PWR0182"  Part="1" 
-F 0 "#PWR0182" H 4100 1900 50  0001 C CNN
+F 0 "#PWR0159" H 4100 1900 50  0001 C CNN
 F 1 "GND" H 4100 2000 50  0000 C CNN
 F 2 "" H 4100 2150 50  0001 C CNN
 F 3 "" H 4100 2150 50  0001 C CNN
@@ -1288,7 +1289,7 @@ U 1 1 5D580ADA
 P 7850 1900
 AR Path="/5CA6B0AA/5CC4DFC2/5D580ADA" Ref="#PWR0166"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5D580ADA" Ref="#PWR0189"  Part="1" 
-F 0 "#PWR0189" H 7850 1650 50  0001 C CNN
+F 0 "#PWR0166" H 7850 1650 50  0001 C CNN
 F 1 "GND" H 7850 1750 50  0000 C CNN
 F 2 "" H 7850 1900 50  0001 C CNN
 F 3 "" H 7850 1900 50  0001 C CNN
@@ -1301,7 +1302,7 @@ U 1 1 5D580AE0
 P 8300 1900
 AR Path="/5CA6B0AA/5CC4DFC2/5D580AE0" Ref="#PWR0167"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5D580AE0" Ref="#PWR0190"  Part="1" 
-F 0 "#PWR0190" H 8300 1650 50  0001 C CNN
+F 0 "#PWR0167" H 8300 1650 50  0001 C CNN
 F 1 "GND" H 8300 1750 50  0000 C CNN
 F 2 "" H 8300 1900 50  0001 C CNN
 F 3 "" H 8300 1900 50  0001 C CNN

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 12 19
+Sheet 10 19
 Title ""
 Date ""
 Rev ""
@@ -20,7 +20,7 @@ U 1 1 5CC4F99A
 P 2850 2250
 AR Path="/5CA6B0AA/5CC4DFC2/5CC4F99A" Ref="R97"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC4F99A" Ref="R121"  Part="1" 
-F 0 "R121" H 2880 2270 50  0000 L CNN
+F 0 "R97" H 2880 2270 50  0000 L CNN
 F 1 "25R" H 2880 2210 50  0000 L CNN
 F 2 "" H 2850 2250 50  0001 C CNN
 F 3 "~" H 2850 2250 50  0001 C CNN
@@ -33,7 +33,7 @@ U 1 1 5CC4FF85
 P 2350 3650
 AR Path="/5CA6B0AA/5CC4DFC2/5CC4FF85" Ref="Q24"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC4FF85" Ref="Q27"  Part="1" 
-F 0 "Q27" H 2550 3700 50  0000 L CNN
+F 0 "Q24" H 2550 3700 50  0000 L CNN
 F 1 "Q_NPN_BCE" H 2550 3600 50  0000 L CNN
 F 2 "" H 2550 3750 50  0001 C CNN
 F 3 "~" H 2350 3650 50  0001 C CNN
@@ -46,7 +46,7 @@ U 1 1 5CC50F59
 P 2450 4100
 AR Path="/5CA6B0AA/5CC4DFC2/5CC50F59" Ref="R96"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC50F59" Ref="R120"  Part="1" 
-F 0 "R120" H 2480 4120 50  0000 L CNN
+F 0 "R96" H 2480 4120 50  0000 L CNN
 F 1 "22R" H 2480 4060 50  0000 L CNN
 F 2 "" H 2450 4100 50  0001 C CNN
 F 3 "~" H 2450 4100 50  0001 C CNN
@@ -59,7 +59,7 @@ U 1 1 5CC5132A
 P 1650 2700
 AR Path="/5CA6B0AA/5CC4DFC2/5CC5132A" Ref="R93"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC5132A" Ref="R117"  Part="1" 
-F 0 "R117" H 1680 2720 50  0000 L CNN
+F 0 "R93" H 1680 2720 50  0000 L CNN
 F 1 "10kR" H 1680 2660 50  0000 L CNN
 F 2 "" H 1650 2700 50  0001 C CNN
 F 3 "~" H 1650 2700 50  0001 C CNN
@@ -72,7 +72,7 @@ U 1 1 5CC51AB5
 P 1650 3150
 AR Path="/5CA6B0AA/5CC4DFC2/5CC51AB5" Ref="R94"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC51AB5" Ref="R118"  Part="1" 
-F 0 "R118" H 1680 3170 50  0000 L CNN
+F 0 "R94" H 1680 3170 50  0000 L CNN
 F 1 "10kR" H 1680 3110 50  0000 L CNN
 F 2 "" H 1650 3150 50  0001 C CNN
 F 3 "~" H 1650 3150 50  0001 C CNN
@@ -85,7 +85,7 @@ U 1 1 5CC51E44
 P 3250 3150
 AR Path="/5CA6B0AA/5CC4DFC2/5CC51E44" Ref="R99"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC51E44" Ref="R123"  Part="1" 
-F 0 "R123" H 3280 3170 50  0000 L CNN
+F 0 "R99" H 3280 3170 50  0000 L CNN
 F 1 "10kR" H 3280 3110 50  0000 L CNN
 F 2 "" H 3250 3150 50  0001 C CNN
 F 3 "~" H 3250 3150 50  0001 C CNN
@@ -98,7 +98,7 @@ U 1 1 5CC52920
 P 3250 2650
 AR Path="/5CA6B0AA/5CC4DFC2/5CC52920" Ref="R98"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC52920" Ref="R122"  Part="1" 
-F 0 "R122" H 3280 2670 50  0000 L CNN
+F 0 "R98" H 3280 2670 50  0000 L CNN
 F 1 "10kR" H 3280 2610 50  0000 L CNN
 F 2 "" H 3250 2650 50  0001 C CNN
 F 3 "~" H 3250 2650 50  0001 C CNN
@@ -156,7 +156,7 @@ U 1 1 5CC541C5
 P 3250 3350
 AR Path="/5CA6B0AA/5CC4DFC2/5CC541C5" Ref="#PWR0154"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC541C5" Ref="#PWR0177"  Part="1" 
-F 0 "#PWR0177" H 3250 3100 50  0001 C CNN
+F 0 "#PWR0154" H 3250 3100 50  0001 C CNN
 F 1 "GND" H 3250 3200 50  0000 C CNN
 F 2 "" H 3250 3350 50  0001 C CNN
 F 3 "" H 3250 3350 50  0001 C CNN
@@ -169,7 +169,7 @@ U 1 1 5CC543E7
 P 1650 3350
 AR Path="/5CA6B0AA/5CC4DFC2/5CC543E7" Ref="#PWR0150"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC543E7" Ref="#PWR0173"  Part="1" 
-F 0 "#PWR0173" H 1650 3100 50  0001 C CNN
+F 0 "#PWR0150" H 1650 3100 50  0001 C CNN
 F 1 "GND" H 1650 3200 50  0000 C CNN
 F 2 "" H 1650 3350 50  0001 C CNN
 F 3 "" H 1650 3350 50  0001 C CNN
@@ -182,7 +182,7 @@ U 1 1 5CC54945
 P 2450 4300
 AR Path="/5CA6B0AA/5CC4DFC2/5CC54945" Ref="#PWR0151"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC54945" Ref="#PWR0174"  Part="1" 
-F 0 "#PWR0174" H 2450 4050 50  0001 C CNN
+F 0 "#PWR0151" H 2450 4050 50  0001 C CNN
 F 1 "GND" H 2450 4150 50  0000 C CNN
 F 2 "" H 2450 4300 50  0001 C CNN
 F 3 "" H 2450 4300 50  0001 C CNN
@@ -234,7 +234,7 @@ U 1 1 5CC63FED
 P 1300 3900
 AR Path="/5CA6B0AA/5CC4DFC2/5CC63FED" Ref="C118"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC63FED" Ref="C142"  Part="1" 
-F 0 "C142" H 1310 3970 50  0000 L CNN
+F 0 "C118" H 1310 3970 50  0000 L CNN
 F 1 "0.1 uF" H 1310 3820 50  0000 L CNN
 F 2 "" H 1300 3900 50  0001 C CNN
 F 3 "~" H 1300 3900 50  0001 C CNN
@@ -247,7 +247,7 @@ U 1 1 5CC64E30
 P 1300 4150
 AR Path="/5CA6B0AA/5CC4DFC2/5CC64E30" Ref="#PWR0149"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC64E30" Ref="#PWR0172"  Part="1" 
-F 0 "#PWR0172" H 1300 3900 50  0001 C CNN
+F 0 "#PWR0149" H 1300 3900 50  0001 C CNN
 F 1 "GND" H 1300 4000 50  0000 C CNN
 F 2 "" H 1300 4150 50  0001 C CNN
 F 3 "" H 1300 4150 50  0001 C CNN
@@ -266,7 +266,7 @@ U 1 1 5CC7100E
 P 6150 2000
 AR Path="/5CA6B0AA/5CC4DFC2/5CC7100E" Ref="R102"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC7100E" Ref="R126"  Part="1" 
-F 0 "R126" H 6180 2020 50  0000 L CNN
+F 0 "R102" H 6180 2020 50  0000 L CNN
 F 1 "110R" H 6180 1960 50  0000 L CNN
 F 2 "" H 6150 2000 50  0001 C CNN
 F 3 "~" H 6150 2000 50  0001 C CNN
@@ -279,7 +279,7 @@ U 1 1 5CC71014
 P 6950 2000
 AR Path="/5CA6B0AA/5CC4DFC2/5CC71014" Ref="R105"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC71014" Ref="R129"  Part="1" 
-F 0 "R129" H 6980 2020 50  0000 L CNN
+F 0 "R105" H 6980 2020 50  0000 L CNN
 F 1 "110R" H 6980 1960 50  0000 L CNN
 F 2 "" H 6950 2000 50  0001 C CNN
 F 3 "~" H 6950 2000 50  0001 C CNN
@@ -292,7 +292,7 @@ U 1 1 5CC71026
 P 5750 2450
 AR Path="/5CA6B0AA/5CC4DFC2/5CC71026" Ref="R100"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC71026" Ref="R124"  Part="1" 
-F 0 "R124" H 5780 2470 50  0000 L CNN
+F 0 "R100" H 5780 2470 50  0000 L CNN
 F 1 "10kR" H 5780 2410 50  0000 L CNN
 F 2 "" H 5750 2450 50  0001 C CNN
 F 3 "~" H 5750 2450 50  0001 C CNN
@@ -305,7 +305,7 @@ U 1 1 5CC7102C
 P 5750 2900
 AR Path="/5CA6B0AA/5CC4DFC2/5CC7102C" Ref="R101"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC7102C" Ref="R125"  Part="1" 
-F 0 "R125" H 5780 2920 50  0000 L CNN
+F 0 "R101" H 5780 2920 50  0000 L CNN
 F 1 "10kR" H 5780 2860 50  0000 L CNN
 F 2 "" H 5750 2900 50  0001 C CNN
 F 3 "~" H 5750 2900 50  0001 C CNN
@@ -318,7 +318,7 @@ U 1 1 5CC71032
 P 7350 2900
 AR Path="/5CA6B0AA/5CC4DFC2/5CC71032" Ref="R108"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC71032" Ref="R132"  Part="1" 
-F 0 "R132" H 7380 2920 50  0000 L CNN
+F 0 "R108" H 7380 2920 50  0000 L CNN
 F 1 "10kR" H 7380 2860 50  0000 L CNN
 F 2 "" H 7350 2900 50  0001 C CNN
 F 3 "~" H 7350 2900 50  0001 C CNN
@@ -331,7 +331,7 @@ U 1 1 5CC71038
 P 7350 2400
 AR Path="/5CA6B0AA/5CC4DFC2/5CC71038" Ref="R107"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC71038" Ref="R131"  Part="1" 
-F 0 "R131" H 7380 2420 50  0000 L CNN
+F 0 "R107" H 7380 2420 50  0000 L CNN
 F 1 "10kR" H 7380 2360 50  0000 L CNN
 F 2 "" H 7350 2400 50  0001 C CNN
 F 3 "~" H 7350 2400 50  0001 C CNN
@@ -383,7 +383,7 @@ U 1 1 5CC71057
 P 7350 3100
 AR Path="/5CA6B0AA/5CC4DFC2/5CC71057" Ref="#PWR0165"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC71057" Ref="#PWR0188"  Part="1" 
-F 0 "#PWR0188" H 7350 2850 50  0001 C CNN
+F 0 "#PWR0165" H 7350 2850 50  0001 C CNN
 F 1 "GND" H 7350 2950 50  0000 C CNN
 F 2 "" H 7350 3100 50  0001 C CNN
 F 3 "" H 7350 3100 50  0001 C CNN
@@ -396,7 +396,7 @@ U 1 1 5CC7105D
 P 5750 3100
 AR Path="/5CA6B0AA/5CC4DFC2/5CC7105D" Ref="#PWR0163"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC7105D" Ref="#PWR0186"  Part="1" 
-F 0 "#PWR0186" H 5750 2850 50  0001 C CNN
+F 0 "#PWR0163" H 5750 2850 50  0001 C CNN
 F 1 "GND" H 5750 2950 50  0000 C CNN
 F 2 "" H 5750 3100 50  0001 C CNN
 F 3 "" H 5750 3100 50  0001 C CNN
@@ -433,7 +433,7 @@ U 1 1 5CC78AA9
 P 6550 3700
 AR Path="/5CA6B0AA/5CC4DFC2/5CC78AA9" Ref="R104"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC78AA9" Ref="R128"  Part="1" 
-F 0 "R128" H 6580 3720 50  0000 L CNN
+F 0 "R104" H 6580 3720 50  0000 L CNN
 F 1 "330R" H 6580 3660 50  0000 L CNN
 F 2 "" H 6550 3700 50  0001 C CNN
 F 3 "~" H 6550 3700 50  0001 C CNN
@@ -446,7 +446,7 @@ U 1 1 5CC7911F
 P 6550 3900
 AR Path="/5CA6B0AA/5CC4DFC2/5CC7911F" Ref="#PWR0164"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC7911F" Ref="#PWR0187"  Part="1" 
-F 0 "#PWR0187" H 6550 3650 50  0001 C CNN
+F 0 "#PWR0164" H 6550 3650 50  0001 C CNN
 F 1 "GND" H 6550 3750 50  0000 C CNN
 F 2 "" H 6550 3900 50  0001 C CNN
 F 3 "" H 6550 3900 50  0001 C CNN
@@ -461,7 +461,7 @@ U 1 1 5CC7FE22
 P 6150 3200
 AR Path="/5CA6B0AA/5CC4DFC2/5CC7FE22" Ref="R103"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC7FE22" Ref="R127"  Part="1" 
-F 0 "R127" H 6180 3220 50  0000 L CNN
+F 0 "R103" H 6180 3220 50  0000 L CNN
 F 1 "22R" H 6180 3160 50  0000 L CNN
 F 2 "" H 6150 3200 50  0001 C CNN
 F 3 "~" H 6150 3200 50  0001 C CNN
@@ -474,7 +474,7 @@ U 1 1 5CC80169
 P 6950 3150
 AR Path="/5CA6B0AA/5CC4DFC2/5CC80169" Ref="R106"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC80169" Ref="R130"  Part="1" 
-F 0 "R130" H 6980 3170 50  0000 L CNN
+F 0 "R106" H 6980 3170 50  0000 L CNN
 F 1 "22R" H 6980 3110 50  0000 L CNN
 F 2 "" H 6950 3150 50  0001 C CNN
 F 3 "~" H 6950 3150 50  0001 C CNN
@@ -504,7 +504,7 @@ U 1 1 5CC9409E
 P 4500 2650
 AR Path="/5CA6B0AA/5CC4DFC2/5CC9409E" Ref="C126"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC9409E" Ref="C150"  Part="1" 
-F 0 "C150" H 4510 2720 50  0000 L CNN
+F 0 "C126" H 4510 2720 50  0000 L CNN
 F 1 "0.1 uF" H 4510 2570 50  0000 L CNN
 F 2 "" H 4500 2650 50  0001 C CNN
 F 3 "~" H 4500 2650 50  0001 C CNN
@@ -519,7 +519,7 @@ U 1 1 5CC959FD
 P 8750 2550
 AR Path="/5CA6B0AA/5CC4DFC2/5CC959FD" Ref="C131"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC959FD" Ref="C155"  Part="1" 
-F 0 "C155" H 8760 2620 50  0000 L CNN
+F 0 "C131" H 8760 2620 50  0000 L CNN
 F 1 "0.1 uF" H 8760 2470 50  0000 L CNN
 F 2 "" H 8750 2550 50  0001 C CNN
 F 3 "~" H 8750 2550 50  0001 C CNN
@@ -536,7 +536,7 @@ U 1 1 5CC3C53E
 P 9700 4450
 AR Path="/5CA6B0AA/5CC4DFC2/5CC3C53E" Ref="U10"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC3C53E" Ref="U15"  Part="1" 
-F 0 "U15" H 9700 4800 50  0000 C CNN
+F 0 "U10" H 9700 4800 50  0000 C CNN
 F 1 "NLAS4157DFT2G" H 9700 4700 50  0000 C CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 9700 4700 50  0001 C CNN
 F 3 "" H 9700 4700 50  0001 C CNN
@@ -550,7 +550,7 @@ U 2 1 5CC40584
 P 2800 6600
 AR Path="/5CA6B0AA/5CC4DFC2/5CC40584" Ref="U8"  Part="2" 
 AR Path="/5CA6B0AA/5CC9409A/5CC40584" Ref="U13"  Part="2" 
-F 0 "U13" H 2800 6950 50  0000 C CNN
+F 0 "U8" H 2800 6950 50  0000 C CNN
 F 1 "NLAS4157DFT2G" H 2800 6850 50  0000 C CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 2800 6850 50  0001 C CNN
 F 3 "" H 2800 6850 50  0001 C CNN
@@ -564,7 +564,7 @@ U 1 1 5CC415CE
 P 9700 5650
 AR Path="/5CA6B0AA/5CC4DFC2/5CC415CE" Ref="U11"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC415CE" Ref="U16"  Part="1" 
-F 0 "U16" H 9700 6000 50  0000 C CNN
+F 0 "U11" H 9700 6000 50  0000 C CNN
 F 1 "NLAS4157DFT2G" H 9700 5900 50  0000 C CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 9700 5900 50  0001 C CNN
 F 3 "" H 9700 5900 50  0001 C CNN
@@ -578,7 +578,7 @@ U 1 1 5CC4409B
 P 8200 2650
 AR Path="/5CA6B0AA/5CC4DFC2/5CC4409B" Ref="U9"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC4409B" Ref="U14"  Part="1" 
-F 0 "U14" H 8200 3000 50  0000 C CNN
+F 0 "U9" H 8200 3000 50  0000 C CNN
 F 1 "NLAS4157DFT2G" H 8200 2900 50  0000 C CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 8200 2900 50  0001 C CNN
 F 3 "" H 8200 2900 50  0001 C CNN
@@ -592,7 +592,7 @@ U 1 1 5CC46970
 P 5050 2750
 AR Path="/5CA6B0AA/5CC4DFC2/5CC46970" Ref="U8"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC46970" Ref="U13"  Part="1" 
-F 0 "U13" H 5050 3100 50  0000 C CNN
+F 0 "U8" H 5050 3100 50  0000 C CNN
 F 1 "NLAS4157DFT2G" H 5050 3000 50  0000 C CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 5050 3000 50  0001 C CNN
 F 3 "" H 5050 3000 50  0001 C CNN
@@ -606,7 +606,7 @@ U 2 1 5CC47B5C
 P 3650 6600
 AR Path="/5CA6B0AA/5CC4DFC2/5CC47B5C" Ref="U9"  Part="2" 
 AR Path="/5CA6B0AA/5CC9409A/5CC47B5C" Ref="U14"  Part="2" 
-F 0 "U14" H 3650 6950 50  0000 C CNN
+F 0 "U9" H 3650 6950 50  0000 C CNN
 F 1 "NLAS4157DFT2G" H 3650 6850 50  0000 C CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 3650 6850 50  0001 C CNN
 F 3 "" H 3650 6850 50  0001 C CNN
@@ -620,7 +620,7 @@ U 2 1 5CC48C49
 P 4600 6600
 AR Path="/5CA6B0AA/5CC4DFC2/5CC48C49" Ref="U10"  Part="2" 
 AR Path="/5CA6B0AA/5CC9409A/5CC48C49" Ref="U15"  Part="2" 
-F 0 "U15" H 4600 6950 50  0000 C CNN
+F 0 "U10" H 4600 6950 50  0000 C CNN
 F 1 "NLAS4157DFT2G" H 4600 6850 50  0000 C CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 4600 6850 50  0001 C CNN
 F 3 "" H 4600 6850 50  0001 C CNN
@@ -634,7 +634,7 @@ U 2 1 5CC49F9F
 P 5350 6600
 AR Path="/5CA6B0AA/5CC4DFC2/5CC49F9F" Ref="U11"  Part="2" 
 AR Path="/5CA6B0AA/5CC9409A/5CC49F9F" Ref="U16"  Part="2" 
-F 0 "U16" H 5350 6950 50  0000 C CNN
+F 0 "U11" H 5350 6950 50  0000 C CNN
 F 1 "NLAS4157DFT2G" H 5350 6850 50  0000 C CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 5350 6850 50  0001 C CNN
 F 3 "" H 5350 6850 50  0001 C CNN
@@ -656,7 +656,7 @@ U 1 1 5CC5931A
 P 4550 2850
 AR Path="/5CA6B0AA/5CC4DFC2/5CC5931A" Ref="C127"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC5931A" Ref="C151"  Part="1" 
-F 0 "C151" H 4560 2920 50  0000 L CNN
+F 0 "C127" H 4560 2920 50  0000 L CNN
 F 1 "0.1 uF" H 4560 2770 50  0000 L CNN
 F 2 "" H 4550 2850 50  0001 C CNN
 F 3 "~" H 4550 2850 50  0001 C CNN
@@ -677,7 +677,7 @@ U 1 1 5CC646BF
 P 8850 2750
 AR Path="/5CA6B0AA/5CC4DFC2/5CC646BF" Ref="C132"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC646BF" Ref="C156"  Part="1" 
-F 0 "C156" H 8860 2820 50  0000 L CNN
+F 0 "C132" H 8860 2820 50  0000 L CNN
 F 1 "0.1 uF" H 8860 2670 50  0000 L CNN
 F 2 "" H 8850 2750 50  0001 C CNN
 F 3 "~" H 8850 2750 50  0001 C CNN
@@ -772,7 +772,7 @@ U 1 1 5CC9DCE4
 P 3050 5700
 AR Path="/5CA6B0AA/5CC4DFC2/5CC9DCE4" Ref="C120"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC9DCE4" Ref="C144"  Part="1" 
-F 0 "C144" H 3060 5770 50  0000 L CNN
+F 0 "C120" H 3060 5770 50  0000 L CNN
 F 1 "0.1 uF" H 3060 5620 50  0000 L CNN
 F 2 "" H 3050 5700 50  0001 C CNN
 F 3 "~" H 3050 5700 50  0001 C CNN
@@ -785,7 +785,7 @@ U 1 1 5CC9E1ED
 P 3550 5700
 AR Path="/5CA6B0AA/5CC4DFC2/5CC9E1ED" Ref="C121"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC9E1ED" Ref="C145"  Part="1" 
-F 0 "C145" H 3560 5770 50  0000 L CNN
+F 0 "C121" H 3560 5770 50  0000 L CNN
 F 1 "0.1 uF" H 3560 5620 50  0000 L CNN
 F 2 "" H 3550 5700 50  0001 C CNN
 F 3 "~" H 3550 5700 50  0001 C CNN
@@ -798,7 +798,7 @@ U 1 1 5CC9E6BF
 P 4000 5700
 AR Path="/5CA6B0AA/5CC4DFC2/5CC9E6BF" Ref="C123"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC9E6BF" Ref="C147"  Part="1" 
-F 0 "C147" H 4010 5770 50  0000 L CNN
+F 0 "C123" H 4010 5770 50  0000 L CNN
 F 1 "0.1 uF" H 4010 5620 50  0000 L CNN
 F 2 "" H 4000 5700 50  0001 C CNN
 F 3 "~" H 4000 5700 50  0001 C CNN
@@ -811,7 +811,7 @@ U 1 1 5CC9EAA6
 P 4450 5700
 AR Path="/5CA6B0AA/5CC4DFC2/5CC9EAA6" Ref="C125"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC9EAA6" Ref="C149"  Part="1" 
-F 0 "C149" H 4460 5770 50  0000 L CNN
+F 0 "C125" H 4460 5770 50  0000 L CNN
 F 1 "0.1 uF" H 4460 5620 50  0000 L CNN
 F 2 "" H 4450 5700 50  0001 C CNN
 F 3 "~" H 4450 5700 50  0001 C CNN
@@ -824,7 +824,7 @@ U 1 1 5CC9F407
 P 2500 6800
 AR Path="/5CA6B0AA/5CC4DFC2/5CC9F407" Ref="#PWR0152"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC9F407" Ref="#PWR0175"  Part="1" 
-F 0 "#PWR0175" H 2500 6550 50  0001 C CNN
+F 0 "#PWR0152" H 2500 6550 50  0001 C CNN
 F 1 "GND" H 2500 6650 50  0000 C CNN
 F 2 "" H 2500 6800 50  0001 C CNN
 F 3 "" H 2500 6800 50  0001 C CNN
@@ -837,7 +837,7 @@ U 1 1 5CC9FAC5
 P 3350 6800
 AR Path="/5CA6B0AA/5CC4DFC2/5CC9FAC5" Ref="#PWR0155"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC9FAC5" Ref="#PWR0178"  Part="1" 
-F 0 "#PWR0178" H 3350 6550 50  0001 C CNN
+F 0 "#PWR0155" H 3350 6550 50  0001 C CNN
 F 1 "GND" H 3350 6650 50  0000 C CNN
 F 2 "" H 3350 6800 50  0001 C CNN
 F 3 "" H 3350 6800 50  0001 C CNN
@@ -850,7 +850,7 @@ U 1 1 5CC9FD6D
 P 4300 6800
 AR Path="/5CA6B0AA/5CC4DFC2/5CC9FD6D" Ref="#PWR0160"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC9FD6D" Ref="#PWR0183"  Part="1" 
-F 0 "#PWR0183" H 4300 6550 50  0001 C CNN
+F 0 "#PWR0160" H 4300 6550 50  0001 C CNN
 F 1 "GND" H 4300 6650 50  0000 C CNN
 F 2 "" H 4300 6800 50  0001 C CNN
 F 3 "" H 4300 6800 50  0001 C CNN
@@ -863,7 +863,7 @@ U 1 1 5CCA0195
 P 5050 6800
 AR Path="/5CA6B0AA/5CC4DFC2/5CCA0195" Ref="#PWR0162"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCA0195" Ref="#PWR0185"  Part="1" 
-F 0 "#PWR0185" H 5050 6550 50  0001 C CNN
+F 0 "#PWR0162" H 5050 6550 50  0001 C CNN
 F 1 "GND" H 5050 6650 50  0000 C CNN
 F 2 "" H 5050 6800 50  0001 C CNN
 F 3 "" H 5050 6800 50  0001 C CNN
@@ -876,7 +876,7 @@ U 1 1 5CCA0420
 P 3050 5900
 AR Path="/5CA6B0AA/5CC4DFC2/5CCA0420" Ref="#PWR0153"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCA0420" Ref="#PWR0176"  Part="1" 
-F 0 "#PWR0176" H 3050 5650 50  0001 C CNN
+F 0 "#PWR0153" H 3050 5650 50  0001 C CNN
 F 1 "GND" H 3050 5750 50  0000 C CNN
 F 2 "" H 3050 5900 50  0001 C CNN
 F 3 "" H 3050 5900 50  0001 C CNN
@@ -889,7 +889,7 @@ U 1 1 5CCA07DE
 P 3550 5900
 AR Path="/5CA6B0AA/5CC4DFC2/5CCA07DE" Ref="#PWR0156"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCA07DE" Ref="#PWR0179"  Part="1" 
-F 0 "#PWR0179" H 3550 5650 50  0001 C CNN
+F 0 "#PWR0156" H 3550 5650 50  0001 C CNN
 F 1 "GND" H 3550 5750 50  0000 C CNN
 F 2 "" H 3550 5900 50  0001 C CNN
 F 3 "" H 3550 5900 50  0001 C CNN
@@ -902,7 +902,7 @@ U 1 1 5CCA0A90
 P 4000 5900
 AR Path="/5CA6B0AA/5CC4DFC2/5CCA0A90" Ref="#PWR0158"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCA0A90" Ref="#PWR0181"  Part="1" 
-F 0 "#PWR0181" H 4000 5650 50  0001 C CNN
+F 0 "#PWR0158" H 4000 5650 50  0001 C CNN
 F 1 "GND" H 4000 5750 50  0000 C CNN
 F 2 "" H 4000 5900 50  0001 C CNN
 F 3 "" H 4000 5900 50  0001 C CNN
@@ -915,7 +915,7 @@ U 1 1 5CCA0D69
 P 4450 5900
 AR Path="/5CA6B0AA/5CC4DFC2/5CCA0D69" Ref="#PWR0161"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCA0D69" Ref="#PWR0184"  Part="1" 
-F 0 "#PWR0184" H 4450 5650 50  0001 C CNN
+F 0 "#PWR0161" H 4450 5650 50  0001 C CNN
 F 1 "GND" H 4450 5750 50  0000 C CNN
 F 2 "" H 4450 5900 50  0001 C CNN
 F 3 "" H 4450 5900 50  0001 C CNN
@@ -976,10 +976,11 @@ U 1 1 5CCEE151
 P 5850 2150
 AR Path="/5CA6B0AA/5CC4DFC2/5CCEE151" Ref="TP7"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCEE151" Ref="TP17"  Part="1" 
-F 0 "TP17" H 5850 2420 50  0000 C CNN
+F 0 "TP7" H 5850 2420 50  0000 C CNN
 F 1 "TestPoint" H 5850 2350 50  0000 C CNN
-F 2 "" H 6050 2150 50  0001 C CNN
+F 2 "TestPoint:TestPoint_Pad_D1.0mm" H 6050 2150 50  0001 C CNN
 F 3 "~" H 6050 2150 50  0001 C CNN
+F 4 "NoPart" H 5850 2150 50  0001 C CNN "Mouser"
 	1    5850 2150
 	1    0    0    -1  
 $EndComp
@@ -989,7 +990,7 @@ U 1 1 5CCEEC53
 P 7300 2100
 AR Path="/5CA6B0AA/5CC4DFC2/5CCEEC53" Ref="TP9"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCEEC53" Ref="TP19"  Part="1" 
-F 0 "TP19" H 7300 2370 50  0000 C CNN
+F 0 "TP9" H 7300 2370 50  0000 C CNN
 F 1 "TestPoint" H 7300 2300 50  0000 C CNN
 F 2 "" H 7500 2100 50  0001 C CNN
 F 3 "~" H 7500 2100 50  0001 C CNN
@@ -1002,7 +1003,7 @@ U 1 1 5CCEF073
 P 6550 3350
 AR Path="/5CA6B0AA/5CC4DFC2/5CCEF073" Ref="TP8"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCEF073" Ref="TP18"  Part="1" 
-F 0 "TP18" H 6550 3620 50  0000 C CNN
+F 0 "TP8" H 6550 3620 50  0000 C CNN
 F 1 "TestPoint" H 6550 3550 50  0000 C CNN
 F 2 "" H 6750 3350 50  0001 C CNN
 F 3 "~" H 6750 3350 50  0001 C CNN
@@ -1015,7 +1016,7 @@ U 1 1 5CCEF9C3
 P 2050 3300
 AR Path="/5CA6B0AA/5CC4DFC2/5CCEF9C3" Ref="TP2"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCEF9C3" Ref="TP12"  Part="1" 
-F 0 "TP12" H 2050 3570 50  0000 C CNN
+F 0 "TP2" H 2050 3570 50  0000 C CNN
 F 1 "TestPoint" H 2050 3500 50  0000 C CNN
 F 2 "" H 2250 3300 50  0001 C CNN
 F 3 "~" H 2250 3300 50  0001 C CNN
@@ -1029,7 +1030,7 @@ U 1 1 5CCF05BD
 P 1650 2400
 AR Path="/5CA6B0AA/5CC4DFC2/5CCF05BD" Ref="TP1"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCF05BD" Ref="TP11"  Part="1" 
-F 0 "TP11" H 1650 2670 50  0000 C CNN
+F 0 "TP1" H 1650 2670 50  0000 C CNN
 F 1 "TestPoint" H 1650 2600 50  0000 C CNN
 F 2 "" H 1850 2400 50  0001 C CNN
 F 3 "~" H 1850 2400 50  0001 C CNN
@@ -1042,7 +1043,7 @@ U 1 1 5CCF0F27
 P 3250 2350
 AR Path="/5CA6B0AA/5CC4DFC2/5CCF0F27" Ref="TP5"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCF0F27" Ref="TP15"  Part="1" 
-F 0 "TP15" H 3250 2620 50  0000 C CNN
+F 0 "TP5" H 3250 2620 50  0000 C CNN
 F 1 "TestPoint" H 3250 2550 50  0000 C CNN
 F 2 "" H 3450 2350 50  0001 C CNN
 F 3 "~" H 3450 2350 50  0001 C CNN
@@ -1059,7 +1060,7 @@ U 1 1 5CCF9A96
 P 2350 3950
 AR Path="/5CA6B0AA/5CC4DFC2/5CCF9A96" Ref="TP4"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCF9A96" Ref="TP14"  Part="1" 
-F 0 "TP14" H 2350 4220 50  0000 C CNN
+F 0 "TP4" H 2350 4220 50  0000 C CNN
 F 1 "TestPoint" H 2350 4150 50  0000 C CNN
 F 2 "" H 2550 3950 50  0001 C CNN
 F 3 "~" H 2550 3950 50  0001 C CNN
@@ -1077,7 +1078,7 @@ U 1 1 5CCFE98E
 P 2100 1650
 AR Path="/5CA6B0AA/5CC4DFC2/5CCFE98E" Ref="TP3"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCFE98E" Ref="TP13"  Part="1" 
-F 0 "TP13" H 2100 1920 50  0000 C CNN
+F 0 "TP3" H 2100 1920 50  0000 C CNN
 F 1 "TestPoint" H 2100 1850 50  0000 C CNN
 F 2 "" H 2300 1650 50  0001 C CNN
 F 3 "~" H 2300 1650 50  0001 C CNN
@@ -1105,7 +1106,7 @@ U 1 1 5CD0C7EE
 P 5500 2900
 AR Path="/5CA6B0AA/5CC4DFC2/5CD0C7EE" Ref="TP6"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CD0C7EE" Ref="TP16"  Part="1" 
-F 0 "TP16" H 5500 3170 50  0000 C CNN
+F 0 "TP6" H 5500 3170 50  0000 C CNN
 F 1 "TestPoint" H 5500 3100 50  0000 C CNN
 F 2 "" H 5700 2900 50  0001 C CNN
 F 3 "~" H 5700 2900 50  0001 C CNN
@@ -1118,7 +1119,7 @@ U 1 1 5CD0DAA4
 P 7750 2850
 AR Path="/5CA6B0AA/5CC4DFC2/5CD0DAA4" Ref="TP10"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CD0DAA4" Ref="TP20"  Part="1" 
-F 0 "TP20" H 7750 3120 50  0000 C CNN
+F 0 "TP10" H 7750 3120 50  0000 C CNN
 F 1 "TestPoint" H 7750 3050 50  0000 C CNN
 F 2 "" H 7950 2850 50  0001 C CNN
 F 3 "~" H 7950 2850 50  0001 C CNN
@@ -1143,7 +1144,7 @@ U 1 1 5CC8B3B3
 P 1950 3000
 AR Path="/5CA6B0AA/5CC4DFC2/5CC8B3B3" Ref="Q23"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC8B3B3" Ref="Q26"  Part="1" 
-F 0 "Q26" H 2150 3050 50  0000 L CNN
+F 0 "Q23" H 2150 3050 50  0000 L CNN
 F 1 "NSVT65011MW6T1G" H 2150 2950 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 2150 3100 50  0001 C CNN
 F 3 "~" H 1950 3000 50  0001 C CNN
@@ -1157,7 +1158,7 @@ U 2 1 5CC8BBB5
 P 2950 2900
 AR Path="/5CA6B0AA/5CC4DFC2/5CC8BBB5" Ref="Q23"  Part="2" 
 AR Path="/5CA6B0AA/5CC9409A/5CC8BBB5" Ref="Q26"  Part="2" 
-F 0 "Q26" H 3150 2950 50  0000 L CNN
+F 0 "Q23" H 3150 2950 50  0000 L CNN
 F 1 "NSVT65011MW6T1G" H 3150 2850 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 3150 3000 50  0001 C CNN
 F 3 "~" H 2950 2900 50  0001 C CNN
@@ -1171,7 +1172,7 @@ U 1 1 5CC8C47F
 P 6050 2750
 AR Path="/5CA6B0AA/5CC4DFC2/5CC8C47F" Ref="Q25"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC8C47F" Ref="Q28"  Part="1" 
-F 0 "Q28" H 6250 2800 50  0000 L CNN
+F 0 "Q25" H 6250 2800 50  0000 L CNN
 F 1 "NSVT65011MW6T1G" H 6250 2700 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 6250 2850 50  0001 C CNN
 F 3 "~" H 6050 2750 50  0001 C CNN
@@ -1185,7 +1186,7 @@ U 2 1 5CC8CC50
 P 7050 2650
 AR Path="/5CA6B0AA/5CC4DFC2/5CC8CC50" Ref="Q25"  Part="2" 
 AR Path="/5CA6B0AA/5CC9409A/5CC8CC50" Ref="Q28"  Part="2" 
-F 0 "Q28" H 7250 2700 50  0000 L CNN
+F 0 "Q25" H 7250 2700 50  0000 L CNN
 F 1 "NSVT65011MW6T1G" H 7250 2600 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 7250 2750 50  0001 C CNN
 F 3 "~" H 7050 2650 50  0001 C CNN
@@ -1199,7 +1200,7 @@ U 1 1 5D57AB5D
 P 3650 1950
 AR Path="/5CA6B0AA/5CC4DFC2/5D57AB5D" Ref="C122"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5D57AB5D" Ref="C146"  Part="1" 
-F 0 "C146" H 3660 2020 50  0000 L CNN
+F 0 "C122" H 3660 2020 50  0000 L CNN
 F 1 "0.1 uF" H 3660 1870 50  0000 L CNN
 F 2 "" H 3650 1950 50  0001 C CNN
 F 3 "~" H 3650 1950 50  0001 C CNN
@@ -1212,7 +1213,7 @@ U 1 1 5D57AB63
 P 4100 1950
 AR Path="/5CA6B0AA/5CC4DFC2/5D57AB63" Ref="C124"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5D57AB63" Ref="C148"  Part="1" 
-F 0 "C148" H 4110 2020 50  0000 L CNN
+F 0 "C124" H 4110 2020 50  0000 L CNN
 F 1 "0.1 uF" H 4110 1870 50  0000 L CNN
 F 2 "" H 4100 1950 50  0001 C CNN
 F 3 "~" H 4100 1950 50  0001 C CNN
@@ -1225,7 +1226,7 @@ U 1 1 5D57AB69
 P 3650 2150
 AR Path="/5CA6B0AA/5CC4DFC2/5D57AB69" Ref="#PWR0157"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5D57AB69" Ref="#PWR0180"  Part="1" 
-F 0 "#PWR0180" H 3650 1900 50  0001 C CNN
+F 0 "#PWR0157" H 3650 1900 50  0001 C CNN
 F 1 "GND" H 3650 2000 50  0000 C CNN
 F 2 "" H 3650 2150 50  0001 C CNN
 F 3 "" H 3650 2150 50  0001 C CNN
@@ -1238,7 +1239,7 @@ U 1 1 5D57AB6F
 P 4100 2150
 AR Path="/5CA6B0AA/5CC4DFC2/5D57AB6F" Ref="#PWR0159"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5D57AB6F" Ref="#PWR0182"  Part="1" 
-F 0 "#PWR0182" H 4100 1900 50  0001 C CNN
+F 0 "#PWR0159" H 4100 1900 50  0001 C CNN
 F 1 "GND" H 4100 2000 50  0000 C CNN
 F 2 "" H 4100 2150 50  0001 C CNN
 F 3 "" H 4100 2150 50  0001 C CNN
@@ -1262,7 +1263,7 @@ U 1 1 5D580ACE
 P 7850 1700
 AR Path="/5CA6B0AA/5CC4DFC2/5D580ACE" Ref="C129"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5D580ACE" Ref="C153"  Part="1" 
-F 0 "C153" H 7860 1770 50  0000 L CNN
+F 0 "C129" H 7860 1770 50  0000 L CNN
 F 1 "0.1 uF" H 7860 1620 50  0000 L CNN
 F 2 "" H 7850 1700 50  0001 C CNN
 F 3 "~" H 7850 1700 50  0001 C CNN
@@ -1275,7 +1276,7 @@ U 1 1 5D580AD4
 P 8300 1700
 AR Path="/5CA6B0AA/5CC4DFC2/5D580AD4" Ref="C130"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5D580AD4" Ref="C154"  Part="1" 
-F 0 "C154" H 8310 1770 50  0000 L CNN
+F 0 "C130" H 8310 1770 50  0000 L CNN
 F 1 "0.1 uF" H 8310 1620 50  0000 L CNN
 F 2 "" H 8300 1700 50  0001 C CNN
 F 3 "~" H 8300 1700 50  0001 C CNN
@@ -1288,7 +1289,7 @@ U 1 1 5D580ADA
 P 7850 1900
 AR Path="/5CA6B0AA/5CC4DFC2/5D580ADA" Ref="#PWR0166"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5D580ADA" Ref="#PWR0189"  Part="1" 
-F 0 "#PWR0189" H 7850 1650 50  0001 C CNN
+F 0 "#PWR0166" H 7850 1650 50  0001 C CNN
 F 1 "GND" H 7850 1750 50  0000 C CNN
 F 2 "" H 7850 1900 50  0001 C CNN
 F 3 "" H 7850 1900 50  0001 C CNN
@@ -1301,7 +1302,7 @@ U 1 1 5D580AE0
 P 8300 1900
 AR Path="/5CA6B0AA/5CC4DFC2/5D580AE0" Ref="#PWR0167"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5D580AE0" Ref="#PWR0190"  Part="1" 
-F 0 "#PWR0190" H 8300 1650 50  0001 C CNN
+F 0 "#PWR0167" H 8300 1650 50  0001 C CNN
 F 1 "GND" H 8300 1750 50  0000 C CNN
 F 2 "" H 8300 1900 50  0001 C CNN
 F 3 "" H 8300 1900 50  0001 C CNN
@@ -1331,7 +1332,7 @@ U 1 1 5DA03B3D
 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 0 "C119" H 2510 2520 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
@@ -1351,7 +1352,7 @@ U 1 1 5DA0FE44
 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 0 "C128" H 6610 2270 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
@@ -1379,7 +1380,7 @@ 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 0 "R95" 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

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

@@ -157,7 +157,7 @@ L Device:R_Small R133
 U 1 1 5D1B2D1C
 P 3900 4250
 F 0 "R133" H 3930 4270 50  0000 L CNN
-F 1 "R_Small" H 3930 4210 50  0000 L CNN
+F 1 "10kR" H 3930 4210 50  0000 L CNN
 F 2 "" H 3900 4250 50  0001 C CNN
 F 3 "~" H 3900 4250 50  0001 C CNN
 	1    3900 4250
@@ -168,7 +168,7 @@ L Device:R_Small R134
 U 1 1 5D1B32F5
 P 6900 4250
 F 0 "R134" H 6930 4270 50  0000 L CNN
-F 1 "R_Small" H 6930 4210 50  0000 L CNN
+F 1 "10kR" H 6930 4210 50  0000 L CNN
 F 2 "" H 6900 4250 50  0001 C CNN
 F 3 "~" H 6900 4250 50  0001 C CNN
 	1    6900 4250

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

@@ -157,7 +157,7 @@ L Device:R_Small R133
 U 1 1 5D1B2D1C
 P 3900 4250
 F 0 "R133" H 3930 4270 50  0000 L CNN
-F 1 "R_Small" H 3930 4210 50  0000 L CNN
+F 1 "10kR" H 3930 4210 50  0000 L CNN
 F 2 "" H 3900 4250 50  0001 C CNN
 F 3 "~" H 3900 4250 50  0001 C CNN
 	1    3900 4250
@@ -168,7 +168,7 @@ L Device:R_Small R134
 U 1 1 5D1B32F5
 P 6900 4250
 F 0 "R134" H 6930 4270 50  0000 L CNN
-F 1 "R_Small" H 6930 4210 50  0000 L CNN
+F 1 "10kR" H 6930 4210 50  0000 L CNN
 F 2 "" H 6900 4250 50  0001 C CNN
 F 3 "~" H 6900 4250 50  0001 C CNN
 	1    6900 4250
@@ -228,8 +228,9 @@ U 1 1 5D1BAD0A
 P 2850 4600
 F 0 "J20" H 2860 4720 50  0000 C CNN
 F 1 "UFL" V 2965 4600 50  0000 C CNN
-F 2 "" H 2850 4600 50  0001 C CNN
+F 2 "discrete_footprints:2337019-1" H 2850 4600 50  0001 C CNN
 F 3 " ~" H 2850 4600 50  0001 C CNN
+F 4 " 571-2337019-1" H 2850 4600 50  0001 C CNN "Mouser"
 	1    2850 4600
 	1    0    0    -1  
 $EndComp
@@ -239,8 +240,9 @@ U 1 1 5D1BB7C4
 P 5750 4500
 F 0 "J21" H 5760 4620 50  0000 C CNN
 F 1 "UFL" V 5865 4500 50  0000 C CNN
-F 2 "" H 5750 4500 50  0001 C CNN
+F 2 "discrete_footprints:2337019-1" H 5750 4500 50  0001 C CNN
 F 3 " ~" H 5750 4500 50  0001 C CNN
+F 4 " 571-2337019-1" H 5750 4500 50  0001 C CNN "Mouser"
 	1    5750 4500
 	1    0    0    -1  
 $EndComp
@@ -250,8 +252,9 @@ U 1 1 5D1BC003
 P 8800 4450
 F 0 "J23" H 8810 4570 50  0000 C CNN
 F 1 "UFL" V 8915 4450 50  0000 C CNN
-F 2 "" H 8800 4450 50  0001 C CNN
+F 2 "discrete_footprints:2337019-1" H 8800 4450 50  0001 C CNN
 F 3 " ~" H 8800 4450 50  0001 C CNN
+F 4 " 571-2337019-1" H 8800 4450 50  0001 C CNN "Mouser"
 	1    8800 4450
 	1    0    0    -1  
 $EndComp
@@ -261,8 +264,9 @@ U 1 1 5D1BCC67
 P 7150 2100
 F 0 "J22" H 7160 2220 50  0000 C CNN
 F 1 "UFL" V 7265 2100 50  0000 C CNN
-F 2 "" H 7150 2100 50  0001 C CNN
+F 2 "discrete_footprints:2337019-1" H 7150 2100 50  0001 C CNN
 F 3 " ~" H 7150 2100 50  0001 C CNN
+F 4 " 571-2337019-1" H 7150 2100 50  0001 C CNN "Mouser"
 	1    7150 2100
 	1    0    0    -1  
 $EndComp

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

@@ -24,7 +24,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF638" Ref="R?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF638" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF638" Ref="R142"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF638" Ref="R146"  Part="1" 
-F 0 "R146" H 6041 3404 50  0000 R CNN
+F 0 "R138" H 6041 3404 50  0000 R CNN
 F 1 "75R" H 6041 3495 50  0000 R CNN
 F 2 "" H 6100 3450 50  0001 C CNN
 F 3 "~" H 6100 3450 50  0001 C CNN
@@ -43,7 +43,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF640" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF640" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF640" Ref="C178"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF640" Ref="C189"  Part="1" 
-F 0 "C189" V 7129 3250 50  0000 C CNN
+F 0 "C167" V 7129 3250 50  0000 C CNN
 F 1 "100 pF RF" V 7038 3250 50  0000 C CNN
 F 2 "" H 6900 3250 50  0001 C CNN
 F 3 "~" H 6900 3250 50  0001 C CNN
@@ -65,7 +65,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF649" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF649" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF649" Ref="#PWR0214"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF649" Ref="#PWR0227"  Part="1" 
-F 0 "#PWR0227" H 4500 3800 50  0001 C CNN
+F 0 "#PWR0201" H 4500 3800 50  0001 C CNN
 F 1 "GND" H 4505 3877 50  0000 C CNN
 F 2 "" H 4500 4050 50  0001 C CNN
 F 3 "" H 4500 4050 50  0001 C CNN
@@ -84,7 +84,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF650" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF650" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF650" Ref="#PWR0224"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF650" Ref="#PWR0237"  Part="1" 
-F 0 "#PWR0237" H 6700 3550 50  0001 C CNN
+F 0 "#PWR0211" H 6700 3550 50  0001 C CNN
 F 1 "GND" H 6705 3627 50  0000 C CNN
 F 2 "" H 6700 3800 50  0001 C CNN
 F 3 "" H 6700 3800 50  0001 C CNN
@@ -103,7 +103,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF659" Ref="R?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF659" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF659" Ref="R139"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF659" Ref="R143"  Part="1" 
-F 0 "R143" H 4441 3354 50  0000 R CNN
+F 0 "R135" H 4441 3354 50  0000 R CNN
 F 1 "8k2R" H 4441 3445 50  0000 R CNN
 F 2 "" H 4500 3400 50  0001 C CNN
 F 3 "~" H 4500 3400 50  0001 C CNN
@@ -125,7 +125,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF668" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF668" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF668" Ref="C177"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF668" Ref="C188"  Part="1" 
-F 0 "C188" H 6792 3696 50  0000 L CNN
+F 0 "C166" H 6792 3696 50  0000 L CNN
 F 1 "3.0 pF RF" H 6792 3605 50  0000 L CNN
 F 2 "" H 6700 3650 50  0001 C CNN
 F 3 "~" H 6700 3650 50  0001 C CNN
@@ -144,7 +144,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF670" Ref="L?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF670" Ref="L?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF670" Ref="L32"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF670" Ref="L35"  Part="1" 
-F 0 "L35" V 6485 3250 50  0000 C CNN
+F 0 "L29" V 6485 3250 50  0000 C CNN
 F 1 "10.0 nH" V 6394 3250 50  0000 C CNN
 F 2 "" H 6300 3250 50  0001 C CNN
 F 3 "~" H 6300 3250 50  0001 C CNN
@@ -161,7 +161,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF693" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF693" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF693" Ref="C169"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF693" Ref="C180"  Part="1" 
-F 0 "C180" V 4529 3700 50  0000 C CNN
+F 0 "C158" V 4529 3700 50  0000 C CNN
 F 1 "100 pF RF" V 4438 3700 50  0000 C CNN
 F 2 "" H 4300 3700 50  0001 C CNN
 F 3 "~" H 4300 3700 50  0001 C CNN
@@ -178,7 +178,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF699" Ref="L?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF699" Ref="L?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF699" Ref="L30"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF699" Ref="L33"  Part="1" 
-F 0 "L33" V 4885 3700 50  0000 C CNN
+F 0 "L27" V 4885 3700 50  0000 C CNN
 F 1 "9.5 nH" V 4794 3700 50  0000 C CNN
 F 2 "" H 4700 3700 50  0001 C CNN
 F 3 "~" H 4700 3700 50  0001 C CNN
@@ -195,7 +195,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF69F" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF69F" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF69F" Ref="C171"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF69F" Ref="C182"  Part="1" 
-F 0 "C182" H 4592 3946 50  0000 L CNN
+F 0 "C160" H 4592 3946 50  0000 L CNN
 F 1 "5.45 pF RF" H 4592 3855 50  0000 L CNN
 F 2 "" H 4500 3900 50  0001 C CNN
 F 3 "~" H 4500 3900 50  0001 C CNN
@@ -212,7 +212,7 @@ 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 4550 50  0001 C CNN
+F 0 "#PWR0208" H 5550 4550 50  0001 C CNN
 F 1 "GND" H 5555 4627 50  0000 C CNN
 F 2 "" H 5550 4800 50  0001 C CNN
 F 3 "" H 5550 4800 50  0001 C CNN
@@ -229,7 +229,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B01" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B01" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B01" Ref="C170"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B01" Ref="C181"  Part="1" 
-F 0 "C181" H 4410 2620 50  0000 L CNN
+F 0 "C159" H 4410 2620 50  0000 L CNN
 F 1 "1 nF" H 4410 2470 50  0000 L CNN
 F 2 "" H 4400 2550 50  0001 C CNN
 F 3 "~" H 4400 2550 50  0001 C CNN
@@ -246,7 +246,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B07" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B07" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B07" Ref="C173"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B07" Ref="C184"  Part="1" 
-F 0 "C184" H 4810 2620 50  0000 L CNN
+F 0 "C162" H 4810 2620 50  0000 L CNN
 F 1 "100 pF RF" H 4810 2470 50  0000 L CNN
 F 2 "" H 4800 2550 50  0001 C CNN
 F 3 "~" H 4800 2550 50  0001 C CNN
@@ -263,7 +263,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B0D" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B0D" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B0D" Ref="C175"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B0D" Ref="C186"  Part="1" 
-F 0 "C186" H 5210 2620 50  0000 L CNN
+F 0 "C164" H 5210 2620 50  0000 L CNN
 F 1 "100 pF RF" H 5210 2470 50  0000 L CNN
 F 2 "" H 5200 2550 50  0001 C CNN
 F 3 "~" H 5200 2550 50  0001 C CNN
@@ -280,7 +280,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B13" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B13" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B13" Ref="#PWR0213"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B13" Ref="#PWR0226"  Part="1" 
-F 0 "#PWR0226" H 4400 2500 50  0001 C CNN
+F 0 "#PWR0200" H 4400 2500 50  0001 C CNN
 F 1 "GND" H 4400 2600 50  0000 C CNN
 F 2 "" H 4400 2750 50  0001 C CNN
 F 3 "" H 4400 2750 50  0001 C CNN
@@ -297,7 +297,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B19" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B19" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B19" Ref="#PWR0216"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B19" Ref="#PWR0229"  Part="1" 
-F 0 "#PWR0229" H 4800 2500 50  0001 C CNN
+F 0 "#PWR0203" H 4800 2500 50  0001 C CNN
 F 1 "GND" H 4800 2600 50  0000 C CNN
 F 2 "" H 4800 2750 50  0001 C CNN
 F 3 "" H 4800 2750 50  0001 C CNN
@@ -314,7 +314,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B1F" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B1F" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B1F" Ref="#PWR0220"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B1F" Ref="#PWR0233"  Part="1" 
-F 0 "#PWR0233" H 5200 2500 50  0001 C CNN
+F 0 "#PWR0207" H 5200 2500 50  0001 C CNN
 F 1 "GND" H 5200 2600 50  0000 C CNN
 F 2 "" H 5200 2750 50  0001 C CNN
 F 3 "" H 5200 2750 50  0001 C CNN
@@ -331,7 +331,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B25" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B25" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B25" Ref="C174"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B25" Ref="C185"  Part="1" 
-F 0 "C185" H 5160 1920 50  0000 L CNN
+F 0 "C163" H 5160 1920 50  0000 L CNN
 F 1 "100 pF RF" H 5160 1770 50  0000 L CNN
 F 2 "" H 5150 1850 50  0001 C CNN
 F 3 "~" H 5150 1850 50  0001 C CNN
@@ -348,7 +348,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B2B" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B2B" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B2B" Ref="#PWR0219"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B2B" Ref="#PWR0232"  Part="1" 
-F 0 "#PWR0232" H 5150 1800 50  0001 C CNN
+F 0 "#PWR0206" H 5150 1800 50  0001 C CNN
 F 1 "GND" H 5150 1900 50  0000 C CNN
 F 2 "" H 5150 2050 50  0001 C CNN
 F 3 "" H 5150 2050 50  0001 C CNN
@@ -365,7 +365,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B31" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B31" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B31" Ref="C172"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B31" Ref="C183"  Part="1" 
-F 0 "C183" H 4760 1920 50  0000 L CNN
+F 0 "C161" H 4760 1920 50  0000 L CNN
 F 1 "1 nF" H 4760 1770 50  0000 L CNN
 F 2 "" H 4750 1850 50  0001 C CNN
 F 3 "~" H 4750 1850 50  0001 C CNN
@@ -382,7 +382,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B37" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B37" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B37" Ref="#PWR0215"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B37" Ref="#PWR0228"  Part="1" 
-F 0 "#PWR0228" H 4750 1800 50  0001 C CNN
+F 0 "#PWR0202" H 4750 1800 50  0001 C CNN
 F 1 "GND" H 4750 1900 50  0000 C CNN
 F 2 "" H 4750 2050 50  0001 C CNN
 F 3 "" H 4750 2050 50  0001 C CNN
@@ -441,7 +441,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3F1C48" Ref="R?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3F1C48" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3F1C48" Ref="R141"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3F1C48" Ref="R145"  Part="1" 
-F 0 "R145" H 5580 2120 50  0000 L CNN
+F 0 "R137" H 5580 2120 50  0000 L CNN
 F 1 "22R" H 5580 2060 50  0000 L CNN
 F 2 "" H 5550 2100 50  0001 C CNN
 F 3 "~" H 5550 2100 50  0001 C CNN
@@ -466,7 +466,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3FEB6E" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3FEB6E" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3FEB6E" Ref="C168"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3FEB6E" Ref="C179"  Part="1" 
-F 0 "C179" H 4010 2620 50  0000 L CNN
+F 0 "C157" H 4010 2620 50  0000 L CNN
 F 1 "1 nF" H 4010 2470 50  0000 L CNN
 F 2 "" H 4000 2550 50  0001 C CNN
 F 3 "~" H 4000 2550 50  0001 C CNN
@@ -483,7 +483,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3FEB74" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3FEB74" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3FEB74" Ref="#PWR0212"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3FEB74" Ref="#PWR0225"  Part="1" 
-F 0 "#PWR0225" H 4000 2500 50  0001 C CNN
+F 0 "#PWR0199" H 4000 2500 50  0001 C CNN
 F 1 "GND" H 4000 2600 50  0000 C CNN
 F 2 "" H 4000 2750 50  0001 C CNN
 F 3 "" H 4000 2750 50  0001 C CNN
@@ -503,7 +503,7 @@ P 5550 3050
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D40D244" Ref="L28"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D40D244" Ref="L31"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D40D244" Ref="L34"  Part="1" 
-F 0 "L34" H 5580 3090 50  0000 L CNN
+F 0 "L28" H 5580 3090 50  0000 L CNN
 F 1 "220 nH" H 5580 3010 50  0000 L CNN
 F 2 "" H 5550 3050 50  0001 C CNN
 F 3 "~" H 5550 3050 50  0001 C CNN
@@ -534,7 +534,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D435867" Ref="R?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D435867" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D435867" Ref="R140"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D435867" Ref="R144"  Part="1" 
-F 0 "R144" H 4941 3254 50  0000 R CNN
+F 0 "R136" H 4941 3254 50  0000 R CNN
 F 1 "1k8R" H 4941 3345 50  0000 R CNN
 F 2 "" H 5000 3300 50  0001 C CNN
 F 3 "~" H 5000 3300 50  0001 C CNN
@@ -548,7 +548,7 @@ P 5000 3500
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D43681D" Ref="#PWR0230"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D43681D" Ref="#PWR0204"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D43681D" Ref="#PWR0217"  Part="1" 
-F 0 "#PWR0230" H 5000 3250 50  0001 C CNN
+F 0 "#PWR0204" H 5000 3250 50  0001 C CNN
 F 1 "GND" H 5000 3350 50  0000 C CNN
 F 2 "" H 5000 3500 50  0001 C CNN
 F 3 "" H 5000 3500 50  0001 C CNN
@@ -582,7 +582,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D1F8CDE" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D1F8CDE" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D1F8CDE" Ref="C176"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D1F8CDE" Ref="C187"  Part="1" 
-F 0 "C187" H 6192 4046 50  0000 L CNN
+F 0 "C165" H 6192 4046 50  0000 L CNN
 F 1 "100 pF RF" H 6192 3955 50  0000 L CNN
 F 2 "" H 6100 4000 50  0001 C CNN
 F 3 "~" H 6100 4000 50  0001 C CNN
@@ -605,7 +605,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D1FE4A0" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D1FE4A0" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D1FE4A0" Ref="#PWR0223"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D1FE4A0" Ref="#PWR0236"  Part="1" 
-F 0 "#PWR0236" H 6100 3950 50  0001 C CNN
+F 0 "#PWR0210" H 6100 3950 50  0001 C CNN
 F 1 "GND" H 6105 4027 50  0000 C CNN
 F 2 "" H 6100 4200 50  0001 C CNN
 F 3 "" H 6100 4200 50  0001 C CNN
@@ -639,7 +639,7 @@ P 5900 2650
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D8FE9AD" Ref="J25"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D8FE9AD" Ref="J29"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D8FE9AD" Ref="J27"  Part="1" 
-F 0 "J29" H 5910 2770 50  0000 C CNN
+F 0 "J25" H 5910 2770 50  0000 C CNN
 F 1 "UFL" V 6015 2650 50  0000 C CNN
 F 2 "discrete_footprints:2337019-1" H 5900 2650 50  0001 C CNN
 F 3 " ~" H 5900 2650 50  0001 C CNN
@@ -654,7 +654,7 @@ P 5000 4000
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D8FF402" Ref="J24"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D8FF402" Ref="J28"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D8FF402" Ref="J26"  Part="1" 
-F 0 "J28" H 5010 4120 50  0000 C CNN
+F 0 "J24" H 5010 4120 50  0000 C CNN
 F 1 "UFL" V 5115 4000 50  0000 C CNN
 F 2 "discrete_footprints:2337019-1" H 5000 4000 50  0001 C CNN
 F 3 " ~" H 5000 4000 50  0001 C CNN
@@ -680,7 +680,7 @@ P 5000 4300
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D9050FA" Ref="#PWR0205"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D9050FA" Ref="#PWR0231"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D9050FA" Ref="#PWR0218"  Part="1" 
-F 0 "#PWR0231" H 5000 4050 50  0001 C CNN
+F 0 "#PWR0205" H 5000 4050 50  0001 C CNN
 F 1 "GND" H 5000 4150 50  0000 C CNN
 F 2 "" H 5000 4300 50  0001 C CNN
 F 3 "" H 5000 4300 50  0001 C CNN
@@ -703,7 +703,7 @@ P 5900 2950
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D90C0F7" Ref="#PWR0209"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D90C0F7" Ref="#PWR0235"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D90C0F7" Ref="#PWR0222"  Part="1" 
-F 0 "#PWR0235" H 5900 2700 50  0001 C CNN
+F 0 "#PWR0209" H 5900 2700 50  0001 C CNN
 F 1 "GND" H 5900 2800 50  0000 C CNN
 F 2 "" H 5900 2950 50  0001 C CNN
 F 3 "" H 5900 2950 50  0001 C CNN
@@ -719,7 +719,7 @@ P 5500 3700
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5DA42F7F" Ref="Q15"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5DA42F7F" Ref="Q13"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5DA42F7F" Ref="Q14"  Part="1" 
-F 0 "Q15" H 5800 3700 50  0000 C CNN
+F 0 "Q13" H 5800 3700 50  0000 C CNN
 F 1 "BFU520R" H 5700 3600 50  0000 L CNN
 F 2 "discrete_footprints:NXP_SOT143B" H 5500 3700 50  0001 C CNN
 F 3 "" H 5500 3700 50  0001 C CNN
@@ -743,7 +743,7 @@ 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 0 "C212" 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
@@ -765,7 +765,7 @@ 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 0 "R162" 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

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

@@ -24,7 +24,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF638" Ref="R?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF638" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF638" Ref="R142"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF638" Ref="R146"  Part="1" 
-F 0 "R146" H 6041 3404 50  0000 R CNN
+F 0 "R138" H 6041 3404 50  0000 R CNN
 F 1 "75R" H 6041 3495 50  0000 R CNN
 F 2 "" H 6100 3450 50  0001 C CNN
 F 3 "~" H 6100 3450 50  0001 C CNN
@@ -43,7 +43,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF640" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF640" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF640" Ref="C178"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF640" Ref="C189"  Part="1" 
-F 0 "C189" V 7129 3250 50  0000 C CNN
+F 0 "C167" V 7129 3250 50  0000 C CNN
 F 1 "100 pF RF" V 7038 3250 50  0000 C CNN
 F 2 "" H 6900 3250 50  0001 C CNN
 F 3 "~" H 6900 3250 50  0001 C CNN
@@ -65,7 +65,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF649" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF649" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF649" Ref="#PWR0214"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF649" Ref="#PWR0227"  Part="1" 
-F 0 "#PWR0227" H 4500 3800 50  0001 C CNN
+F 0 "#PWR0201" H 4500 3800 50  0001 C CNN
 F 1 "GND" H 4505 3877 50  0000 C CNN
 F 2 "" H 4500 4050 50  0001 C CNN
 F 3 "" H 4500 4050 50  0001 C CNN
@@ -84,7 +84,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF650" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF650" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF650" Ref="#PWR0224"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF650" Ref="#PWR0237"  Part="1" 
-F 0 "#PWR0237" H 6700 3550 50  0001 C CNN
+F 0 "#PWR0211" H 6700 3550 50  0001 C CNN
 F 1 "GND" H 6705 3627 50  0000 C CNN
 F 2 "" H 6700 3800 50  0001 C CNN
 F 3 "" H 6700 3800 50  0001 C CNN
@@ -103,7 +103,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF659" Ref="R?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF659" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF659" Ref="R139"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF659" Ref="R143"  Part="1" 
-F 0 "R143" H 4441 3354 50  0000 R CNN
+F 0 "R135" H 4441 3354 50  0000 R CNN
 F 1 "8k2R" H 4441 3445 50  0000 R CNN
 F 2 "" H 4500 3400 50  0001 C CNN
 F 3 "~" H 4500 3400 50  0001 C CNN
@@ -125,7 +125,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF668" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF668" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF668" Ref="C177"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF668" Ref="C188"  Part="1" 
-F 0 "C188" H 6792 3696 50  0000 L CNN
+F 0 "C166" H 6792 3696 50  0000 L CNN
 F 1 "3.0 pF RF" H 6792 3605 50  0000 L CNN
 F 2 "" H 6700 3650 50  0001 C CNN
 F 3 "~" H 6700 3650 50  0001 C CNN
@@ -144,7 +144,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF670" Ref="L?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF670" Ref="L?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF670" Ref="L32"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF670" Ref="L35"  Part="1" 
-F 0 "L35" V 6485 3250 50  0000 C CNN
+F 0 "L29" V 6485 3250 50  0000 C CNN
 F 1 "10.0 nH" V 6394 3250 50  0000 C CNN
 F 2 "" H 6300 3250 50  0001 C CNN
 F 3 "~" H 6300 3250 50  0001 C CNN
@@ -161,7 +161,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF693" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF693" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF693" Ref="C169"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF693" Ref="C180"  Part="1" 
-F 0 "C180" V 4529 3700 50  0000 C CNN
+F 0 "C158" V 4529 3700 50  0000 C CNN
 F 1 "100 pF RF" V 4438 3700 50  0000 C CNN
 F 2 "" H 4300 3700 50  0001 C CNN
 F 3 "~" H 4300 3700 50  0001 C CNN
@@ -178,7 +178,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF699" Ref="L?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF699" Ref="L?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF699" Ref="L30"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF699" Ref="L33"  Part="1" 
-F 0 "L33" V 4885 3700 50  0000 C CNN
+F 0 "L27" V 4885 3700 50  0000 C CNN
 F 1 "9.5 nH" V 4794 3700 50  0000 C CNN
 F 2 "" H 4700 3700 50  0001 C CNN
 F 3 "~" H 4700 3700 50  0001 C CNN
@@ -195,7 +195,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF69F" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF69F" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF69F" Ref="C171"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF69F" Ref="C182"  Part="1" 
-F 0 "C182" H 4592 3946 50  0000 L CNN
+F 0 "C160" H 4592 3946 50  0000 L CNN
 F 1 "5.45 pF RF" H 4592 3855 50  0000 L CNN
 F 2 "" H 4500 3900 50  0001 C CNN
 F 3 "~" H 4500 3900 50  0001 C CNN
@@ -212,7 +212,7 @@ 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 4550 50  0001 C CNN
+F 0 "#PWR0208" H 5550 4550 50  0001 C CNN
 F 1 "GND" H 5555 4627 50  0000 C CNN
 F 2 "" H 5550 4800 50  0001 C CNN
 F 3 "" H 5550 4800 50  0001 C CNN
@@ -229,7 +229,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B01" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B01" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B01" Ref="C170"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B01" Ref="C181"  Part="1" 
-F 0 "C181" H 4410 2620 50  0000 L CNN
+F 0 "C159" H 4410 2620 50  0000 L CNN
 F 1 "1 nF" H 4410 2470 50  0000 L CNN
 F 2 "" H 4400 2550 50  0001 C CNN
 F 3 "~" H 4400 2550 50  0001 C CNN
@@ -246,7 +246,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B07" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B07" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B07" Ref="C173"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B07" Ref="C184"  Part="1" 
-F 0 "C184" H 4810 2620 50  0000 L CNN
+F 0 "C162" H 4810 2620 50  0000 L CNN
 F 1 "100 pF RF" H 4810 2470 50  0000 L CNN
 F 2 "" H 4800 2550 50  0001 C CNN
 F 3 "~" H 4800 2550 50  0001 C CNN
@@ -263,7 +263,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B0D" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B0D" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B0D" Ref="C175"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B0D" Ref="C186"  Part="1" 
-F 0 "C186" H 5210 2620 50  0000 L CNN
+F 0 "C164" H 5210 2620 50  0000 L CNN
 F 1 "100 pF RF" H 5210 2470 50  0000 L CNN
 F 2 "" H 5200 2550 50  0001 C CNN
 F 3 "~" H 5200 2550 50  0001 C CNN
@@ -280,7 +280,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B13" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B13" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B13" Ref="#PWR0213"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B13" Ref="#PWR0226"  Part="1" 
-F 0 "#PWR0226" H 4400 2500 50  0001 C CNN
+F 0 "#PWR0200" H 4400 2500 50  0001 C CNN
 F 1 "GND" H 4400 2600 50  0000 C CNN
 F 2 "" H 4400 2750 50  0001 C CNN
 F 3 "" H 4400 2750 50  0001 C CNN
@@ -297,7 +297,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B19" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B19" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B19" Ref="#PWR0216"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B19" Ref="#PWR0229"  Part="1" 
-F 0 "#PWR0229" H 4800 2500 50  0001 C CNN
+F 0 "#PWR0203" H 4800 2500 50  0001 C CNN
 F 1 "GND" H 4800 2600 50  0000 C CNN
 F 2 "" H 4800 2750 50  0001 C CNN
 F 3 "" H 4800 2750 50  0001 C CNN
@@ -314,7 +314,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B1F" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B1F" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B1F" Ref="#PWR0220"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B1F" Ref="#PWR0233"  Part="1" 
-F 0 "#PWR0233" H 5200 2500 50  0001 C CNN
+F 0 "#PWR0207" H 5200 2500 50  0001 C CNN
 F 1 "GND" H 5200 2600 50  0000 C CNN
 F 2 "" H 5200 2750 50  0001 C CNN
 F 3 "" H 5200 2750 50  0001 C CNN
@@ -331,7 +331,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B25" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B25" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B25" Ref="C174"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B25" Ref="C185"  Part="1" 
-F 0 "C185" H 5160 1920 50  0000 L CNN
+F 0 "C163" H 5160 1920 50  0000 L CNN
 F 1 "100 pF RF" H 5160 1770 50  0000 L CNN
 F 2 "" H 5150 1850 50  0001 C CNN
 F 3 "~" H 5150 1850 50  0001 C CNN
@@ -348,7 +348,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B2B" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B2B" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B2B" Ref="#PWR0219"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B2B" Ref="#PWR0232"  Part="1" 
-F 0 "#PWR0232" H 5150 1800 50  0001 C CNN
+F 0 "#PWR0206" H 5150 1800 50  0001 C CNN
 F 1 "GND" H 5150 1900 50  0000 C CNN
 F 2 "" H 5150 2050 50  0001 C CNN
 F 3 "" H 5150 2050 50  0001 C CNN
@@ -365,7 +365,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B31" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B31" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B31" Ref="C172"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B31" Ref="C183"  Part="1" 
-F 0 "C183" H 4760 1920 50  0000 L CNN
+F 0 "C161" H 4760 1920 50  0000 L CNN
 F 1 "1 nF" H 4760 1770 50  0000 L CNN
 F 2 "" H 4750 1850 50  0001 C CNN
 F 3 "~" H 4750 1850 50  0001 C CNN
@@ -382,7 +382,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B37" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B37" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B37" Ref="#PWR0215"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B37" Ref="#PWR0228"  Part="1" 
-F 0 "#PWR0228" H 4750 1800 50  0001 C CNN
+F 0 "#PWR0202" H 4750 1800 50  0001 C CNN
 F 1 "GND" H 4750 1900 50  0000 C CNN
 F 2 "" H 4750 2050 50  0001 C CNN
 F 3 "" H 4750 2050 50  0001 C CNN
@@ -441,7 +441,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3F1C48" Ref="R?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3F1C48" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3F1C48" Ref="R141"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3F1C48" Ref="R145"  Part="1" 
-F 0 "R145" H 5580 2120 50  0000 L CNN
+F 0 "R137" H 5580 2120 50  0000 L CNN
 F 1 "22R" H 5580 2060 50  0000 L CNN
 F 2 "" H 5550 2100 50  0001 C CNN
 F 3 "~" H 5550 2100 50  0001 C CNN
@@ -466,7 +466,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3FEB6E" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3FEB6E" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3FEB6E" Ref="C168"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3FEB6E" Ref="C179"  Part="1" 
-F 0 "C179" H 4010 2620 50  0000 L CNN
+F 0 "C157" H 4010 2620 50  0000 L CNN
 F 1 "1 nF" H 4010 2470 50  0000 L CNN
 F 2 "" H 4000 2550 50  0001 C CNN
 F 3 "~" H 4000 2550 50  0001 C CNN
@@ -483,7 +483,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3FEB74" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3FEB74" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3FEB74" Ref="#PWR0212"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3FEB74" Ref="#PWR0225"  Part="1" 
-F 0 "#PWR0225" H 4000 2500 50  0001 C CNN
+F 0 "#PWR0199" H 4000 2500 50  0001 C CNN
 F 1 "GND" H 4000 2600 50  0000 C CNN
 F 2 "" H 4000 2750 50  0001 C CNN
 F 3 "" H 4000 2750 50  0001 C CNN
@@ -503,7 +503,7 @@ P 5550 3050
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D40D244" Ref="L28"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D40D244" Ref="L31"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D40D244" Ref="L34"  Part="1" 
-F 0 "L34" H 5580 3090 50  0000 L CNN
+F 0 "L28" H 5580 3090 50  0000 L CNN
 F 1 "220 nH" H 5580 3010 50  0000 L CNN
 F 2 "" H 5550 3050 50  0001 C CNN
 F 3 "~" H 5550 3050 50  0001 C CNN
@@ -534,7 +534,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D435867" Ref="R?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D435867" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D435867" Ref="R140"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D435867" Ref="R144"  Part="1" 
-F 0 "R144" H 4941 3254 50  0000 R CNN
+F 0 "R136" H 4941 3254 50  0000 R CNN
 F 1 "1k8R" H 4941 3345 50  0000 R CNN
 F 2 "" H 5000 3300 50  0001 C CNN
 F 3 "~" H 5000 3300 50  0001 C CNN
@@ -548,7 +548,7 @@ P 5000 3500
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D43681D" Ref="#PWR0230"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D43681D" Ref="#PWR0204"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D43681D" Ref="#PWR0217"  Part="1" 
-F 0 "#PWR0230" H 5000 3250 50  0001 C CNN
+F 0 "#PWR0204" H 5000 3250 50  0001 C CNN
 F 1 "GND" H 5000 3350 50  0000 C CNN
 F 2 "" H 5000 3500 50  0001 C CNN
 F 3 "" H 5000 3500 50  0001 C CNN
@@ -582,7 +582,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D1F8CDE" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D1F8CDE" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D1F8CDE" Ref="C176"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D1F8CDE" Ref="C187"  Part="1" 
-F 0 "C187" H 6192 4046 50  0000 L CNN
+F 0 "C165" H 6192 4046 50  0000 L CNN
 F 1 "100 pF RF" H 6192 3955 50  0000 L CNN
 F 2 "" H 6100 4000 50  0001 C CNN
 F 3 "~" H 6100 4000 50  0001 C CNN
@@ -605,7 +605,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D1FE4A0" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D1FE4A0" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D1FE4A0" Ref="#PWR0223"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D1FE4A0" Ref="#PWR0236"  Part="1" 
-F 0 "#PWR0236" H 6100 3950 50  0001 C CNN
+F 0 "#PWR0210" H 6100 3950 50  0001 C CNN
 F 1 "GND" H 6105 4027 50  0000 C CNN
 F 2 "" H 6100 4200 50  0001 C CNN
 F 3 "" H 6100 4200 50  0001 C CNN
@@ -639,7 +639,7 @@ P 5900 2650
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D8FE9AD" Ref="J25"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D8FE9AD" Ref="J29"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D8FE9AD" Ref="J27"  Part="1" 
-F 0 "J29" H 5910 2770 50  0000 C CNN
+F 0 "J25" H 5910 2770 50  0000 C CNN
 F 1 "UFL" V 6015 2650 50  0000 C CNN
 F 2 "discrete_footprints:2337019-1" H 5900 2650 50  0001 C CNN
 F 3 " ~" H 5900 2650 50  0001 C CNN
@@ -654,7 +654,7 @@ P 5000 4000
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D8FF402" Ref="J24"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D8FF402" Ref="J28"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D8FF402" Ref="J26"  Part="1" 
-F 0 "J28" H 5010 4120 50  0000 C CNN
+F 0 "J24" H 5010 4120 50  0000 C CNN
 F 1 "UFL" V 5115 4000 50  0000 C CNN
 F 2 "discrete_footprints:2337019-1" H 5000 4000 50  0001 C CNN
 F 3 " ~" H 5000 4000 50  0001 C CNN
@@ -680,7 +680,7 @@ P 5000 4300
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D9050FA" Ref="#PWR0205"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D9050FA" Ref="#PWR0231"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D9050FA" Ref="#PWR0218"  Part="1" 
-F 0 "#PWR0231" H 5000 4050 50  0001 C CNN
+F 0 "#PWR0205" H 5000 4050 50  0001 C CNN
 F 1 "GND" H 5000 4150 50  0000 C CNN
 F 2 "" H 5000 4300 50  0001 C CNN
 F 3 "" H 5000 4300 50  0001 C CNN
@@ -703,7 +703,7 @@ P 5900 2950
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D90C0F7" Ref="#PWR0209"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D90C0F7" Ref="#PWR0235"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D90C0F7" Ref="#PWR0222"  Part="1" 
-F 0 "#PWR0235" H 5900 2700 50  0001 C CNN
+F 0 "#PWR0209" H 5900 2700 50  0001 C CNN
 F 1 "GND" H 5900 2800 50  0000 C CNN
 F 2 "" H 5900 2950 50  0001 C CNN
 F 3 "" H 5900 2950 50  0001 C CNN
@@ -719,7 +719,7 @@ P 5500 3700
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5DA42F7F" Ref="Q15"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5DA42F7F" Ref="Q13"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5DA42F7F" Ref="Q14"  Part="1" 
-F 0 "Q15" H 5800 3700 50  0000 C CNN
+F 0 "Q13" H 5800 3700 50  0000 C CNN
 F 1 "BFU520R" H 5700 3600 50  0000 L CNN
 F 2 "discrete_footprints:NXP_SOT143B" H 5500 3700 50  0001 C CNN
 F 3 "" H 5500 3700 50  0001 C CNN
@@ -743,7 +743,7 @@ 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 0 "C212" 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
@@ -765,7 +765,7 @@ 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 0 "R162" 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

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

@@ -921,7 +921,7 @@ L Device:R_Small R76
 U 1 1 5CB71150
 P 8650 3250
 F 0 "R76" H 8680 3270 50  0000 L CNN
-F 1 "8.2kR" H 8680 3210 50  0000 L CNN
+F 1 "8k2R" H 8680 3210 50  0000 L CNN
 F 2 "" H 8650 3250 50  0001 C CNN
 F 3 "~" H 8650 3250 50  0001 C CNN
 	1    8650 3250
@@ -1081,8 +1081,9 @@ U 1 1 5DC21B1E
 P 5800 2250
 F 0 "C97" H 5810 2320 50  0000 L CNN
 F 1 "100 pF" H 5810 2170 50  0000 L CNN
-F 2 "" H 5800 2250 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 5800 2250 50  0001 C CNN
 F 3 "~" H 5800 2250 50  0001 C CNN
+F 4 "791-RF15N101J250CT " H 5800 2250 50  0001 C CNN "Mouser"
 	1    5800 2250
 	1    0    0    -1  
 $EndComp

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

@@ -921,7 +921,7 @@ L Device:R_Small R76
 U 1 1 5CB71150
 P 8650 3250
 F 0 "R76" H 8680 3270 50  0000 L CNN
-F 1 "8.2kR" H 8680 3210 50  0000 L CNN
+F 1 "8k2R" H 8680 3210 50  0000 L CNN
 F 2 "" H 8650 3250 50  0001 C CNN
 F 3 "~" H 8650 3250 50  0001 C CNN
 	1    8650 3250
@@ -1081,8 +1081,9 @@ U 1 1 5DC21B1E
 P 5800 2250
 F 0 "C97" H 5810 2320 50  0000 L CNN
 F 1 "100 pF" H 5810 2170 50  0000 L CNN
-F 2 "" H 5800 2250 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 5800 2250 50  0001 C CNN
 F 3 "~" H 5800 2250 50  0001 C CNN
+F 4 "791-RF15N101J250CT " H 5800 2250 50  0001 C CNN "Mouser"
 	1    5800 2250
 	1    0    0    -1  
 $EndComp

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

@@ -34,8 +34,9 @@ AR Path="/5CA6B0B3/5CC199E0/5D0F3E9F" Ref="C29"  Part="1"
 AR Path="/5CA6B0B3/5CC199E2/5D0F3E9F" Ref="C53"  Part="1" 
 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 2 "Capacitor_SMD:C_0402_1005Metric" H 7350 3950 50  0001 C CNN
 F 3 "~" H 7350 3950 50  0001 C CNN
+F 4 "791-RF15N101J250CT " H 7350 3950 50  0001 C CNN "Mouser"
 	1    7350 3950
 	-1   0    0    1   
 $EndComp
@@ -45,7 +46,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
@@ -79,8 +80,9 @@ AR Path="/5CA6B0B3/5CC199E0/5D101264" Ref="C28"  Part="1"
 AR Path="/5CA6B0B3/5CC199E2/5D101264" Ref="C52"  Part="1" 
 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 2 "Capacitor_SMD:C_0402_1005Metric" H 6300 3200 50  0001 C CNN
 F 3 "~" H 6300 3200 50  0001 C CNN
+F 4 "NoPart" H 6300 3200 50  0001 C CNN "Mouser"
 	1    6300 3200
 	1    0    0    -1  
 $EndComp
@@ -103,7 +105,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 +118,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
@@ -164,7 +166,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
@@ -196,7 +198,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
@@ -217,7 +219,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
@@ -249,7 +251,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
@@ -316,7 +318,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
@@ -331,7 +333,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
@@ -346,7 +348,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
@@ -361,7 +363,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
@@ -594,7 +596,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
@@ -618,7 +620,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
@@ -750,7 +752,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
@@ -763,7 +765,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
@@ -776,7 +778,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
@@ -915,7 +917,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
@@ -928,7 +930,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
@@ -941,7 +943,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
@@ -993,7 +995,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
@@ -1243,7 +1245,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
@@ -1266,7 +1268,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
@@ -1298,7 +1300,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
@@ -1336,7 +1338,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
@@ -1372,7 +1374,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
@@ -1407,7 +1409,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

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

@@ -34,8 +34,9 @@ AR Path="/5CA6B0B3/5CC199E0/5D0F3E9F" Ref="C29"  Part="1"
 AR Path="/5CA6B0B3/5CC199E2/5D0F3E9F" Ref="C53"  Part="1" 
 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 2 "Capacitor_SMD:C_0402_1005Metric" H 7350 3950 50  0001 C CNN
 F 3 "~" H 7350 3950 50  0001 C CNN
+F 4 "791-RF15N101J250CT " H 7350 3950 50  0001 C CNN "Mouser"
 	1    7350 3950
 	-1   0    0    1   
 $EndComp
@@ -79,8 +80,9 @@ AR Path="/5CA6B0B3/5CC199E0/5D101264" Ref="C28"  Part="1"
 AR Path="/5CA6B0B3/5CC199E2/5D101264" Ref="C52"  Part="1" 
 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 2 "Capacitor_SMD:C_0402_1005Metric" H 6300 3200 50  0001 C CNN
 F 3 "~" H 6300 3200 50  0001 C CNN
+F 4 "NoPart" H 6300 3200 50  0001 C CNN "Mouser"
 	1    6300 3200
 	1    0    0    -1  
 $EndComp

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

@@ -229,7 +229,7 @@ U 1 1 5D9B4F0B
 P 9550 3400
 F 0 "U7" H 9550 3450 50  0000 C CNN
 F 1 "MAX1193" H 9550 2600 50  0000 C CNN
-F 2 "" H 9550 3400 50  0001 C CNN
+F 2 "discrete_footprints:Maxim_TQFN28-EP" H 9550 3400 50  0001 C CNN
 F 3 "" H 9550 3400 50  0001 C CNN
 F 4 " 700-MAX1193ETI+T " H 9550 2500 50  0000 C CNN "Mouser"
 	1    9550 3400
@@ -427,8 +427,9 @@ U 1 1 5DA20E43
 P 8600 5100
 F 0 "C113" H 8610 5170 50  0000 L CNN
 F 1 "0.33 uF" H 8610 5020 50  0000 L CNN
-F 2 "" H 8600 5100 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 8600 5100 50  0001 C CNN
 F 3 "~" H 8600 5100 50  0001 C CNN
+F 4 "710-885012106014" H 8600 5100 50  0001 C CNN "Mouser"
 	1    8600 5100
 	0    1    1    0   
 $EndComp
@@ -877,6 +878,7 @@ F 0 "D1" H 3650 5800 50  0000 C CNN
 F 1 "BAV99" H 3650 5600 50  0000 C CNN
 F 2 "Package_TO_SOT_SMD:SOT-23" H 3650 5550 50  0001 C CNN
 F 3 "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" H 3650 5800 50  0001 C CNN
+F 4 " 863-BAV99RWT1G" H 3650 5700 50  0001 C CNN "Mouser"
 	2    3650 5700
 	0    1    1    0   
 $EndComp

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

@@ -229,7 +229,7 @@ U 1 1 5D9B4F0B
 P 9550 3400
 F 0 "U7" H 9550 3450 50  0000 C CNN
 F 1 "MAX1193" H 9550 2600 50  0000 C CNN
-F 2 "" H 9550 3400 50  0001 C CNN
+F 2 "discrete_footprints:Maxim_TQFN28-EP" H 9550 3400 50  0001 C CNN
 F 3 "" H 9550 3400 50  0001 C CNN
 F 4 " 700-MAX1193ETI+T " H 9550 2500 50  0000 C CNN "Mouser"
 	1    9550 3400
@@ -427,8 +427,9 @@ U 1 1 5DA20E43
 P 8600 5100
 F 0 "C113" H 8610 5170 50  0000 L CNN
 F 1 "0.33 uF" H 8610 5020 50  0000 L CNN
-F 2 "" H 8600 5100 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 8600 5100 50  0001 C CNN
 F 3 "~" H 8600 5100 50  0001 C CNN
+F 4 "710-885012106014" H 8600 5100 50  0001 C CNN "Mouser"
 	1    8600 5100
 	0    1    1    0   
 $EndComp
@@ -872,23 +873,24 @@ $EndComp
 $Comp
 L Diode:BAV99 D1
 U 2 1 5DD008E8
-P 3650 6200
-F 0 "D1" H 3650 6300 50  0000 C CNN
-F 1 "BAV99" H 3650 6100 50  0000 C CNN
-F 2 "Package_TO_SOT_SMD:SOT-23" H 3650 6050 50  0001 C CNN
-F 3 "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" H 3650 6300 50  0001 C CNN
-	2    3650 6200
-	0    1    1    0   
-$EndComp
-$Comp
-L Diode:BAV99 D1
-U 1 1 5DD008EE
 P 3650 5700
 F 0 "D1" H 3650 5800 50  0000 C CNN
 F 1 "BAV99" H 3650 5600 50  0000 C CNN
 F 2 "Package_TO_SOT_SMD:SOT-23" H 3650 5550 50  0001 C CNN
 F 3 "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" H 3650 5800 50  0001 C CNN
-	1    3650 5700
+F 4 " 863-BAV99RWT1G" H 3650 5700 50  0001 C CNN "Mouser"
+	2    3650 5700
+	0    1    1    0   
+$EndComp
+$Comp
+L Diode:BAV99 D1
+U 1 1 5DD008EE
+P 3650 6200
+F 0 "D1" H 3650 6300 50  0000 C CNN
+F 1 "BAV99" H 3650 6100 50  0000 C CNN
+F 2 "Package_TO_SOT_SMD:SOT-23" H 3650 6050 50  0001 C CNN
+F 3 "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" H 3650 6300 50  0001 C CNN
+	1    3650 6200
 	0    1    1    0   
 $EndComp
 Text Label 4000 6450 2    50   ~ 0
@@ -930,23 +932,23 @@ Wire Wire Line
 $Comp
 L Diode:BAV99 D3
 U 2 1 5DD2A865
-P 4350 6200
-F 0 "D3" H 4350 6300 50  0000 C CNN
-F 1 "BAV99" H 4350 6100 50  0000 C CNN
-F 2 "Package_TO_SOT_SMD:SOT-23" H 4350 6050 50  0001 C CNN
-F 3 "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" H 4350 6300 50  0001 C CNN
-	2    4350 6200
-	0    1    1    0   
-$EndComp
-$Comp
-L Diode:BAV99 D3
-U 1 1 5DD2A86B
 P 4350 5700
 F 0 "D3" H 4350 5800 50  0000 C CNN
 F 1 "BAV99" H 4350 5600 50  0000 C CNN
 F 2 "Package_TO_SOT_SMD:SOT-23" H 4350 5550 50  0001 C CNN
 F 3 "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" H 4350 5800 50  0001 C CNN
-	1    4350 5700
+	2    4350 5700
+	0    1    1    0   
+$EndComp
+$Comp
+L Diode:BAV99 D3
+U 1 1 5DD2A86B
+P 4350 6200
+F 0 "D3" H 4350 6300 50  0000 C CNN
+F 1 "BAV99" H 4350 6100 50  0000 C CNN
+F 2 "Package_TO_SOT_SMD:SOT-23" H 4350 6050 50  0001 C CNN
+F 3 "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" H 4350 6300 50  0001 C CNN
+	1    4350 6200
 	0    1    1    0   
 $EndComp
 Wire Wire Line

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

@@ -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 "#PWR0238" H 3950 3650 50  0001 C CNN
+F 0 "#PWR0247" 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 "#PWR0242" H 5050 3650 50  0001 C CNN
+F 0 "#PWR0251" 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 "#PWR0243" H 6000 3650 50  0001 C CNN
+F 0 "#PWR0252" 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
@@ -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 "#PWR0246" H 6950 2150 50  0001 C CNN
+F 0 "#PWR0255" 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 "#PWR0245" H 6600 2150 50  0001 C CNN
+F 0 "#PWR0254" 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 "#PWR0244" H 6250 2150 50  0001 C CNN
+F 0 "#PWR0253" 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 "#PWR0241" H 4900 2100 50  0001 C CNN
+F 0 "#PWR0250" 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 "#PWR0240" H 4550 2100 50  0001 C CNN
+F 0 "#PWR0249" 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 "#PWR0239" H 4200 2100 50  0001 C CNN
+F 0 "#PWR0248" 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

@@ -157,8 +157,9 @@ U 1 1 5D8C4C7E
 P 1350 3700
 F 0 "R4" H 1380 3720 50  0000 L CNN
 F 1 "TBD 0402" H 1380 3660 50  0000 L CNN
-F 2 "" H 1350 3700 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 1350 3700 50  0001 C CNN
 F 3 "~" H 1350 3700 50  0001 C CNN
+F 4 "NoPart" H 1350 3700 50  0001 C CNN "Mouser"
 	1    1350 3700
 	0    -1   -1   0   
 $EndComp
@@ -197,7 +198,7 @@ L Device:R_Small R6
 U 1 1 5D8C70E2
 P 1950 4100
 F 0 "R6" H 1980 4120 50  0000 L CNN
-F 1 "51R" H 1980 4060 50  0000 L CNN
+F 1 "50R" H 1980 4060 50  0000 L CNN
 F 2 "" H 1950 4100 50  0001 C CNN
 F 3 "~" H 1950 4100 50  0001 C CNN
 	1    1950 4100

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

@@ -157,8 +157,9 @@ U 1 1 5D8C4C7E
 P 1350 3700
 F 0 "R4" H 1380 3720 50  0000 L CNN
 F 1 "TBD 0402" H 1380 3660 50  0000 L CNN
-F 2 "" H 1350 3700 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 1350 3700 50  0001 C CNN
 F 3 "~" H 1350 3700 50  0001 C CNN
+F 4 "NoPart" H 1350 3700 50  0001 C CNN "Mouser"
 	1    1350 3700
 	0    -1   -1   0   
 $EndComp
@@ -197,7 +198,7 @@ L Device:R_Small R6
 U 1 1 5D8C70E2
 P 1950 4100
 F 0 "R6" H 1980 4120 50  0000 L CNN
-F 1 "51R" H 1980 4060 50  0000 L CNN
+F 1 "50R" H 1980 4060 50  0000 L CNN
 F 2 "" H 1950 4100 50  0001 C CNN
 F 3 "~" H 1950 4100 50  0001 C CNN
 	1    1950 4100