From c042944bab5e833872df4a719e6beb1cb956df3e Mon Sep 17 00:00:00 2001
From: Kelvin Ly <kelvin.ly1618@gmail.com>
Date: Wed, 19 Jun 2019 10:49:32 -0400
Subject: [PATCH] Fix symbol tables I guess

---
 .../discrete-rf-board/diode_mixer.bak         |  4 +
 .../discrete-rf-board/diode_mixer.sch         |  4 +
 .../discrete-rf-board/discrete-rf-board.bak   | 11 ---
 .../discrete-rf-board/discrete-rf-board.sch   | 22 ++---
 pcb/discrete/discrete-rf-board/if_amp.bak     | 88 +++++++++----------
 pcb/discrete/discrete-rf-board/mixer.bak      |  6 ++
 pcb/discrete/discrete-rf-board/mixer.sch      |  6 ++
 pcb/discrete/discrete-rf-board/sym-lib-table  |  2 +-
 8 files changed, 76 insertions(+), 67 deletions(-)

diff --git a/pcb/discrete/discrete-rf-board/diode_mixer.bak b/pcb/discrete/discrete-rf-board/diode_mixer.bak
index 12fa98c..c11dbfb 100644
--- a/pcb/discrete/discrete-rf-board/diode_mixer.bak
+++ b/pcb/discrete/discrete-rf-board/diode_mixer.bak
@@ -182,6 +182,7 @@ U 1 1 5CC2572D
 P 4100 3600
 AR Path="/5CA6B0AA/5CC1CC09/5CC2572D" Ref="U?"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC2572D" Ref="U?"  Part="1" 
+AR Path="/5CC2572D" Ref="U?"  Part="1" 
 F 0 "U?" H 4100 3850 50  0000 C CNN
 F 1 "HHM17147A1" H 4100 3350 50  0000 C CNN
 F 2 "" H 4100 3850 50  0001 C CNN
@@ -196,6 +197,7 @@ U 1 1 5CC264D0
 P 7750 3600
 AR Path="/5CA6B0AA/5CC1CC09/5CC264D0" Ref="U?"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC264D0" Ref="U?"  Part="1" 
+AR Path="/5CC264D0" Ref="U?"  Part="1" 
 F 0 "U?" H 7750 3850 50  0000 C CNN
 F 1 "HHM17147A1" H 7750 3350 50  0000 C CNN
 F 2 "" H 7750 3850 50  0001 C CNN
@@ -317,6 +319,7 @@ U 1 1 5CC30B27
 P 3400 2900
 AR Path="/5CA6B0AA/5CC1CC09/5CC30B27" Ref="J?"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC30B27" Ref="J?"  Part="1" 
+AR Path="/5CC30B27" Ref="J?"  Part="1" 
 F 0 "J?" H 3410 3020 50  0000 C CNN
 F 1 "Conn_Coaxial" V 3515 2900 50  0000 C CNN
 F 2 "" H 3400 2900 50  0001 C CNN
@@ -330,6 +333,7 @@ U 1 1 5CC31787
 P 8600 3000
 AR Path="/5CA6B0AA/5CC1CC09/5CC31787" Ref="J?"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC31787" Ref="J?"  Part="1" 
+AR Path="/5CC31787" Ref="J?"  Part="1" 
 F 0 "J?" H 8610 3120 50  0000 C CNN
 F 1 "Conn_Coaxial" V 8715 3000 50  0000 C CNN
 F 2 "" H 8600 3000 50  0001 C CNN
diff --git a/pcb/discrete/discrete-rf-board/diode_mixer.sch b/pcb/discrete/discrete-rf-board/diode_mixer.sch
index 12fa98c..c11dbfb 100644
--- a/pcb/discrete/discrete-rf-board/diode_mixer.sch
+++ b/pcb/discrete/discrete-rf-board/diode_mixer.sch
@@ -182,6 +182,7 @@ U 1 1 5CC2572D
 P 4100 3600
 AR Path="/5CA6B0AA/5CC1CC09/5CC2572D" Ref="U?"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC2572D" Ref="U?"  Part="1" 
+AR Path="/5CC2572D" Ref="U?"  Part="1" 
 F 0 "U?" H 4100 3850 50  0000 C CNN
 F 1 "HHM17147A1" H 4100 3350 50  0000 C CNN
 F 2 "" H 4100 3850 50  0001 C CNN
@@ -196,6 +197,7 @@ U 1 1 5CC264D0
 P 7750 3600
 AR Path="/5CA6B0AA/5CC1CC09/5CC264D0" Ref="U?"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC264D0" Ref="U?"  Part="1" 
+AR Path="/5CC264D0" Ref="U?"  Part="1" 
 F 0 "U?" H 7750 3850 50  0000 C CNN
 F 1 "HHM17147A1" H 7750 3350 50  0000 C CNN
 F 2 "" H 7750 3850 50  0001 C CNN
@@ -317,6 +319,7 @@ U 1 1 5CC30B27
 P 3400 2900
 AR Path="/5CA6B0AA/5CC1CC09/5CC30B27" Ref="J?"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC30B27" Ref="J?"  Part="1" 
+AR Path="/5CC30B27" Ref="J?"  Part="1" 
 F 0 "J?" H 3410 3020 50  0000 C CNN
 F 1 "Conn_Coaxial" V 3515 2900 50  0000 C CNN
 F 2 "" H 3400 2900 50  0001 C CNN
@@ -330,6 +333,7 @@ U 1 1 5CC31787
 P 8600 3000
 AR Path="/5CA6B0AA/5CC1CC09/5CC31787" Ref="J?"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC31787" Ref="J?"  Part="1" 
+AR Path="/5CC31787" Ref="J?"  Part="1" 
 F 0 "J?" H 8610 3120 50  0000 C CNN
 F 1 "Conn_Coaxial" V 8715 3000 50  0000 C CNN
 F 2 "" H 8600 3000 50  0001 C CNN
diff --git a/pcb/discrete/discrete-rf-board/discrete-rf-board.bak b/pcb/discrete/discrete-rf-board/discrete-rf-board.bak
index e745824..7d579fb 100644
--- a/pcb/discrete/discrete-rf-board/discrete-rf-board.bak
+++ b/pcb/discrete/discrete-rf-board/discrete-rf-board.bak
@@ -52,17 +52,6 @@ F7 "3V3" I L 1825 3150 50
 F8 "LO" I R 3600 3350 50 
 F9 "5V0" I L 1825 2950 50 
 $EndSheet
-$Comp
-L power:GND #PWR?
-U 1 1 5CC42654
-P 4350 4100
-F 0 "#PWR?" H 4350 3850 50  0001 C CNN
-F 1 "GND" H 4350 3950 50  0000 C CNN
-F 2 "" H 4350 4100 50  0001 C CNN
-F 3 "" H 4350 4100 50  0001 C CNN
-	1    4350 4100
-	1    0    0    -1  
-$EndComp
 Wire Wire Line
 	4350 4100 4350 3950
 $Comp
diff --git a/pcb/discrete/discrete-rf-board/discrete-rf-board.sch b/pcb/discrete/discrete-rf-board/discrete-rf-board.sch
index e745824..d330f9b 100644
--- a/pcb/discrete/discrete-rf-board/discrete-rf-board.sch
+++ b/pcb/discrete/discrete-rf-board/discrete-rf-board.sch
@@ -52,17 +52,6 @@ F7 "3V3" I L 1825 3150 50
 F8 "LO" I R 3600 3350 50 
 F9 "5V0" I L 1825 2950 50 
 $EndSheet
-$Comp
-L power:GND #PWR?
-U 1 1 5CC42654
-P 4350 4100
-F 0 "#PWR?" H 4350 3850 50  0001 C CNN
-F 1 "GND" H 4350 3950 50  0000 C CNN
-F 2 "" H 4350 4100 50  0001 C CNN
-F 3 "" H 4350 4100 50  0001 C CNN
-	1    4350 4100
-	1    0    0    -1  
-$EndComp
 Wire Wire Line
 	4350 4100 4350 3950
 $Comp
@@ -103,4 +92,15 @@ Wire Wire Line
 	10000 3550 10000 3450
 Wire Wire Line
 	3600 3350 3850 3350
+$Comp
+L power:GND #PWR?
+U 1 1 5D0A60D6
+P 4350 4100
+F 0 "#PWR?" H 4350 3850 50  0001 C CNN
+F 1 "GND" H 4355 3927 50  0000 C CNN
+F 2 "" H 4350 4100 50  0001 C CNN
+F 3 "" H 4350 4100 50  0001 C CNN
+	1    4350 4100
+	1    0    0    -1  
+$EndComp
 $EndSCHEMATC
diff --git a/pcb/discrete/discrete-rf-board/if_amp.bak b/pcb/discrete/discrete-rf-board/if_amp.bak
index 6e91ef4..4246071 100644
--- a/pcb/discrete/discrete-rf-board/if_amp.bak
+++ b/pcb/discrete/discrete-rf-board/if_amp.bak
@@ -15,28 +15,6 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L Device:Q_NPN_BCE Q?
-U 1 1 5CC4E7E9
-P 1950 3000
-F 0 "Q?" H 2150 3050 50  0000 L CNN
-F 1 "Q_NPN_BCE" H 2150 2950 50  0000 L CNN
-F 2 "" H 2150 3100 50  0001 C CNN
-F 3 "~" H 1950 3000 50  0001 C CNN
-	1    1950 3000
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:Q_NPN_BCE Q?
-U 1 1 5CC4EAD4
-P 2950 2900
-F 0 "Q?" H 3150 2950 50  0000 L CNN
-F 1 "Q_NPN_BCE" H 3150 2850 50  0000 L CNN
-F 2 "" H 3150 3000 50  0001 C CNN
-F 3 "~" H 2950 2900 50  0001 C CNN
-	1    2950 2900
-	-1   0    0    -1  
-$EndComp
-$Comp
 L Device:R_Small R?
 U 1 1 5CC4F475
 P 2050 2250
@@ -270,28 +248,6 @@ Wire Wire Line
 Wire Wire Line
 	1300 4000 1300 4150
 $Comp
-L Device:Q_NPN_BCE Q?
-U 1 1 5CC71002
-P 6050 2750
-F 0 "Q?" H 6250 2800 50  0000 L CNN
-F 1 "Q_NPN_BCE" H 6250 2700 50  0000 L CNN
-F 2 "" H 6250 2850 50  0001 C CNN
-F 3 "~" H 6050 2750 50  0001 C CNN
-	1    6050 2750
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:Q_NPN_BCE Q?
-U 1 1 5CC71008
-P 7050 2650
-F 0 "Q?" H 7250 2700 50  0000 L CNN
-F 1 "Q_NPN_BCE" H 7250 2600 50  0000 L CNN
-F 2 "" H 7250 2750 50  0001 C CNN
-F 3 "~" H 7050 2650 50  0001 C CNN
-	1    7050 2650
-	-1   0    0    -1  
-$EndComp
-$Comp
 L Device:R_Small R?
 U 1 1 5CC7100E
 P 6150 2000
@@ -1076,4 +1032,48 @@ Wire Wire Line
 	5500 2750 5750 2750
 Wire Wire Line
 	6550 3350 6550 3450
+$Comp
+L Device:Q_DUAL_NPN_NPN_E1B1C2E2B2C1 Q?
+U 1 1 5CC8B3B3
+P 1950 3000
+F 0 "Q?" H 2150 3050 50  0000 L CNN
+F 1 "NSVT65011MW6T1G" H 2150 2950 50  0000 L CNN
+F 2 "" H 2150 3100 50  0001 C CNN
+F 3 "~" H 1950 3000 50  0001 C CNN
+	1    1950 3000
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:Q_DUAL_NPN_NPN_E1B1C2E2B2C1 Q?
+U 2 1 5CC8BBB5
+P 2950 2900
+F 0 "Q?" H 3150 2950 50  0000 L CNN
+F 1 "NSVT65011MW6T1G" H 3150 2850 50  0000 L CNN
+F 2 "" H 3150 3000 50  0001 C CNN
+F 3 "~" H 2950 2900 50  0001 C CNN
+	2    2950 2900
+	-1   0    0    -1  
+$EndComp
+$Comp
+L Device:Q_DUAL_NPN_NPN_E1B1C2E2B2C1 Q?
+U 1 1 5CC8C47F
+P 6050 2750
+F 0 "Q?" H 6250 2800 50  0000 L CNN
+F 1 "NSVT65011MW6T1G" H 6250 2700 50  0000 L CNN
+F 2 "" H 6250 2850 50  0001 C CNN
+F 3 "~" H 6050 2750 50  0001 C CNN
+	1    6050 2750
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:Q_DUAL_NPN_NPN_E1B1C2E2B2C1 Q?
+U 2 1 5CC8CC50
+P 7050 2650
+F 0 "Q?" H 7250 2700 50  0000 L CNN
+F 1 "NSVT65011MW6T1G" H 7250 2600 50  0000 L CNN
+F 2 "" H 7250 2750 50  0001 C CNN
+F 3 "~" H 7050 2650 50  0001 C CNN
+	2    7050 2650
+	-1   0    0    -1  
+$EndComp
 $EndSCHEMATC
diff --git a/pcb/discrete/discrete-rf-board/mixer.bak b/pcb/discrete/discrete-rf-board/mixer.bak
index a4cebcf..b503748 100644
--- a/pcb/discrete/discrete-rf-board/mixer.bak
+++ b/pcb/discrete/discrete-rf-board/mixer.bak
@@ -22,6 +22,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB33717" Ref="Q?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB33717" Ref="Q?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB33717" Ref="Q?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB33717" Ref="Q?"  Part="1" 
+AR Path="/5CB33717" Ref="Q?"  Part="1" 
 F 0 "Q?" H 6400 3300 50  0000 C CNN
 F 1 "BFU520XRR" H 6250 3200 50  0000 L CNN
 F 2 "" H 6450 2950 50  0001 C CNN
@@ -37,6 +38,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB33CBC" Ref="Q?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB33CBC" Ref="Q?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB33CBC" Ref="Q?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB33CBC" Ref="Q?"  Part="1" 
+AR Path="/5CB33CBC" Ref="Q?"  Part="1" 
 F 0 "Q?" H 7050 3400 50  0000 C CNN
 F 1 "BFU520XRR" H 6750 3300 50  0000 L CNN
 F 2 "" H 6950 3050 50  0001 C CNN
@@ -52,6 +54,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB37953" Ref="Q?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB37953" Ref="Q?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB37953" Ref="Q?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB37953" Ref="Q?"  Part="1" 
+AR Path="/5CB37953" Ref="Q?"  Part="1" 
 F 0 "Q?" H 4750 3250 50  0000 C CNN
 F 1 "BFU520XRR" H 4600 3150 50  0000 L CNN
 F 2 "" H 4750 2900 50  0001 C CNN
@@ -68,6 +71,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB37959" Ref="Q?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB37959" Ref="Q?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB37959" Ref="Q?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB37959" Ref="Q?"  Part="1" 
+AR Path="/5CB37959" Ref="Q?"  Part="1" 
 F 0 "Q?" H 5400 3350 50  0000 C CNN
 F 1 "BFU520XRR" H 5100 3250 50  0000 L CNN
 F 2 "" H 5300 3000 50  0001 C CNN
@@ -1083,6 +1087,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB462E3" Ref="U?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB462E3" Ref="U?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB462E3" Ref="U?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB462E3" Ref="U?"  Part="1" 
+AR Path="/5CB462E3" Ref="U?"  Part="1" 
 F 0 "U?" H 1200 4200 50  0000 C CNN
 F 1 "HHM1522E3" H 1200 3700 50  0000 C CNN
 F 2 "" H 1200 3950 50  0001 C CNN
@@ -1237,6 +1242,7 @@ AR Path="/5CA6B0AA/5CB33251/5CC489AE" Ref="J?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CC489AE" Ref="J?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CC489AE" Ref="J?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CC489AE" Ref="J?"  Part="1" 
+AR Path="/5CC489AE" Ref="J?"  Part="1" 
 F 0 "J?" H 9660 1870 50  0000 C CNN
 F 1 "Conn_Coaxial" V 9765 1750 50  0000 C CNN
 F 2 "" H 9650 1750 50  0001 C CNN
diff --git a/pcb/discrete/discrete-rf-board/mixer.sch b/pcb/discrete/discrete-rf-board/mixer.sch
index a4cebcf..b503748 100644
--- a/pcb/discrete/discrete-rf-board/mixer.sch
+++ b/pcb/discrete/discrete-rf-board/mixer.sch
@@ -22,6 +22,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB33717" Ref="Q?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB33717" Ref="Q?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB33717" Ref="Q?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB33717" Ref="Q?"  Part="1" 
+AR Path="/5CB33717" Ref="Q?"  Part="1" 
 F 0 "Q?" H 6400 3300 50  0000 C CNN
 F 1 "BFU520XRR" H 6250 3200 50  0000 L CNN
 F 2 "" H 6450 2950 50  0001 C CNN
@@ -37,6 +38,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB33CBC" Ref="Q?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB33CBC" Ref="Q?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB33CBC" Ref="Q?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB33CBC" Ref="Q?"  Part="1" 
+AR Path="/5CB33CBC" Ref="Q?"  Part="1" 
 F 0 "Q?" H 7050 3400 50  0000 C CNN
 F 1 "BFU520XRR" H 6750 3300 50  0000 L CNN
 F 2 "" H 6950 3050 50  0001 C CNN
@@ -52,6 +54,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB37953" Ref="Q?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB37953" Ref="Q?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB37953" Ref="Q?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB37953" Ref="Q?"  Part="1" 
+AR Path="/5CB37953" Ref="Q?"  Part="1" 
 F 0 "Q?" H 4750 3250 50  0000 C CNN
 F 1 "BFU520XRR" H 4600 3150 50  0000 L CNN
 F 2 "" H 4750 2900 50  0001 C CNN
@@ -68,6 +71,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB37959" Ref="Q?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB37959" Ref="Q?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB37959" Ref="Q?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB37959" Ref="Q?"  Part="1" 
+AR Path="/5CB37959" Ref="Q?"  Part="1" 
 F 0 "Q?" H 5400 3350 50  0000 C CNN
 F 1 "BFU520XRR" H 5100 3250 50  0000 L CNN
 F 2 "" H 5300 3000 50  0001 C CNN
@@ -1083,6 +1087,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB462E3" Ref="U?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB462E3" Ref="U?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB462E3" Ref="U?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB462E3" Ref="U?"  Part="1" 
+AR Path="/5CB462E3" Ref="U?"  Part="1" 
 F 0 "U?" H 1200 4200 50  0000 C CNN
 F 1 "HHM1522E3" H 1200 3700 50  0000 C CNN
 F 2 "" H 1200 3950 50  0001 C CNN
@@ -1237,6 +1242,7 @@ AR Path="/5CA6B0AA/5CB33251/5CC489AE" Ref="J?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CC489AE" Ref="J?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CC489AE" Ref="J?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CC489AE" Ref="J?"  Part="1" 
+AR Path="/5CC489AE" Ref="J?"  Part="1" 
 F 0 "J?" H 9660 1870 50  0000 C CNN
 F 1 "Conn_Coaxial" V 9765 1750 50  0000 C CNN
 F 2 "" H 9650 1750 50  0001 C CNN
diff --git a/pcb/discrete/discrete-rf-board/sym-lib-table b/pcb/discrete/discrete-rf-board/sym-lib-table
index f92869a..329eec2 100644
--- a/pcb/discrete/discrete-rf-board/sym-lib-table
+++ b/pcb/discrete/discrete-rf-board/sym-lib-table
@@ -1,3 +1,3 @@
 (sym_lib_table
-  (lib (name discrete-parts)(type Legacy)(uri /home/kelvin/repos/ism-915mhz-transceiver/pcb/discrete/discrete-rf-board/discrete-parts.lib)(options "")(descr ""))
+  (lib (name discrete-parts)(type Legacy)(uri ${KIPRJMOD}/discrete-parts.lib)(options "")(descr ""))
 )