Move schematic library entries and delete rescue lib

1 files changed, 196 insertions, 208 deletions

diff --git a/kicad/renard.sch b/kicad/renard.sch
index c3d687d..664a127 100644
--- a/kicad/renard.sch
+++ b/kicad/renard.sch
@@ -1,20 +1,4 @@
 EESchema Schematic File Version 2
-LIBS:renard-rescue
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:interface
-LIBS:display
-LIBS:atmel
-LIBS:contrib
 LIBS:renard
 LIBS:renard-cache
 EELAYER 25 0
@@ -54,7 +38,7 @@ F 3 "~" H 2950 4050 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R-RESCUE-renard R4
+L R R4
 U 1 1 5362666C
 P 3500 3700
 F 0 "R4" V 3580 3700 40  0000 C CNN
@@ -65,29 +49,29 @@ F 3 "~" H 3500 3700 30  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L C-RESCUE-renard C2
+L C C2
 U 1 1 5362667B
-P 2650 4450
-F 0 "C2" H 2650 4550 40  0000 L CNN
-F 1 "33pF" H 2656 4365 40  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 2650 4250 30  0001 C CNN
-F 3 "~" H 2650 4450 60  0000 C CNN
-	1    2650 4450
+P 2650 4500
+F 0 "C2" H 2650 4600 40  0000 L CNN
+F 1 "33pF" H 2656 4415 40  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 2650 4300 30  0001 C CNN
+F 3 "~" H 2650 4500 60  0000 C CNN
+	1    2650 4500
 	1    0    0    -1  
 $EndComp
 $Comp
-L C-RESCUE-renard C6
+L C C6
 U 1 1 5362668A
-P 3250 4450
-F 0 "C6" H 3250 4550 40  0000 L CNN
-F 1 "33pF" H 3256 4365 40  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 3288 4300 30  0001 C CNN
-F 3 "~" H 3250 4450 60  0000 C CNN
-	1    3250 4450
+P 3250 4500
+F 0 "C6" H 3250 4600 40  0000 L CNN
+F 1 "33pF" H 3256 4415 40  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 3288 4350 30  0001 C CNN
+F 3 "~" H 3250 4500 60  0000 C CNN
+	1    3250 4500
 	1    0    0    -1  
 $EndComp
 $Comp
-L C-RESCUE-renard C4
+L C C4
 U 1 1 53626699
 P 3150 3450
 F 0 "C4" H 3150 3550 40  0000 L CNN
@@ -98,25 +82,25 @@ F 3 "~" H 3150 3450 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND-RESCUE-renard #PWR01
+L GND #PWR01
 U 1 1 536266D2
-P 2650 4650
-F 0 "#PWR01" H 2650 4650 30  0001 C CNN
-F 1 "GND" H 2650 4580 30  0001 C CNN
-F 2 "" H 2650 4650 60  0000 C CNN
-F 3 "" H 2650 4650 60  0000 C CNN
-	1    2650 4650
+P 2650 4700
+F 0 "#PWR01" H 2650 4700 30  0001 C CNN
+F 1 "GND" H 2650 4630 30  0001 C CNN
+F 2 "" H 2650 4700 60  0000 C CNN
+F 3 "" H 2650 4700 60  0000 C CNN
+	1    2650 4700
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND-RESCUE-renard #PWR02
+L GND #PWR02
 U 1 1 536266EB
-P 3250 4650
-F 0 "#PWR02" H 3250 4650 30  0001 C CNN
-F 1 "GND" H 3250 4580 30  0001 C CNN
-F 2 "" H 3250 4650 60  0000 C CNN
-F 3 "" H 3250 4650 60  0000 C CNN
-	1    3250 4650
+P 3250 4700
+F 0 "#PWR02" H 3250 4700 30  0001 C CNN
+F 1 "GND" H 3250 4630 30  0001 C CNN
+F 2 "" H 3250 4700 60  0000 C CNN
+F 3 "" H 3250 4700 60  0000 C CNN
+	1    3250 4700
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -153,29 +137,29 @@ F 3 "" H 5000 4550 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C-RESCUE-renard C7
+L C C7
 U 1 1 536268A8
-P 3950 5100
-F 0 "C7" H 3950 5200 40  0000 L CNN
-F 1 "22nF" H 3956 5015 40  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 3988 4950 30  0001 C CNN
-F 3 "~" H 3950 5100 60  0000 C CNN
-	1    3950 5100
+P 3950 5150
+F 0 "C7" H 3950 5250 40  0000 L CNN
+F 1 "22nF" H 3956 5065 40  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 3988 5000 30  0001 C CNN
+F 3 "~" H 3950 5150 60  0000 C CNN
+	1    3950 5150
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND-RESCUE-renard #PWR03
+L GND #PWR03
 U 1 1 536268B7
-P 3950 5300
-F 0 "#PWR03" H 3950 5300 30  0001 C CNN
-F 1 "GND" H 3950 5230 30  0001 C CNN
-F 2 "" H 3950 5300 60  0000 C CNN
-F 3 "" H 3950 5300 60  0000 C CNN
-	1    3950 5300
+P 3950 5350
+F 0 "#PWR03" H 3950 5350 30  0001 C CNN
+F 1 "GND" H 3950 5280 30  0001 C CNN
+F 2 "" H 3950 5350 60  0000 C CNN
+F 3 "" H 3950 5350 60  0000 C CNN
+	1    3950 5350
 	1    0    0    -1  
 $EndComp
 $Comp
-L R-RESCUE-renard R5
+L R R5
 U 1 1 536268C6
 P 3700 4900
 F 0 "R5" V 3780 4900 40  0000 C CNN
@@ -193,13 +177,13 @@ U 5 1 536269E4
 P 700 5900
 F 0 "IC1" H 800 6025 50  0000 L BNN
 F 1 "4011D" H 800 5700 50  0000 L BNN
-F 2 "SMD_Packages:SOIC-14_N" H 700 6050 50  0001 C CNN
+F 2 "renard:SOIC-14_N" H 700 6050 50  0001 C CNN
 F 3 "" H 700 5900 60  0000 C CNN
 	5    700  5900
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND-RESCUE-renard #PWR04
+L GND #PWR04
 U 1 1 536269F6
 P 700 6200
 F 0 "#PWR04" H 700 6200 30  0001 C CNN
@@ -221,14 +205,14 @@ F 3 "" H 700 5600 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND-RESCUE-renard #PWR06
+L GND #PWR06
 U 1 1 53626A20
-P 6350 5600
-F 0 "#PWR06" H 6350 5600 30  0001 C CNN
-F 1 "GND" H 6350 5530 30  0001 C CNN
-F 2 "" H 6350 5600 60  0000 C CNN
-F 3 "" H 6350 5600 60  0000 C CNN
-	1    6350 5600
+P 6350 5550
+F 0 "#PWR06" H 6350 5550 30  0001 C CNN
+F 1 "GND" H 6350 5480 30  0001 C CNN
+F 2 "" H 6350 5550 60  0000 C CNN
+F 3 "" H 6350 5550 60  0000 C CNN
+	1    6350 5550
 	1    0    0    -1  
 $EndComp
 $Sheet
@@ -253,7 +237,7 @@ F 3 "~" H 2100 4700 60  0000 C CNN
 	1    0    0    1   
 $EndComp
 $Comp
-L R-RESCUE-renard R3
+L R R3
 U 1 1 53627360
 P 2200 5150
 F 0 "R3" V 2280 5150 40  0000 C CNN
@@ -264,7 +248,7 @@ F 3 "~" H 2200 5150 30  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND-RESCUE-renard #PWR07
+L GND #PWR07
 U 1 1 5362737F
 P 2200 5400
 F 0 "#PWR07" H 2200 5400 30  0001 C CNN
@@ -274,7 +258,7 @@ F 3 "" H 2200 5400 60  0000 C CNN
 	1    2200 5400
 	1    0    0    -1  
 $EndComp
-Text Label 1150 4700 0    60   ~ 0
+Text Label 1150 4450 0    60   ~ 0
 PTT_n
 $Comp
 L VCC #PWR08
@@ -288,7 +272,7 @@ F 3 "" H 2200 4100 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R-RESCUE-renard R2
+L R R2
 U 1 1 53627698
 P 1900 4450
 F 0 "R2" V 1980 4450 40  0000 C CNN
@@ -299,7 +283,7 @@ F 3 "~" H 1900 4450 30  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R-RESCUE-renard R1
+L R R1
 U 1 1 53627716
 P 1650 4700
 F 0 "R1" V 1730 4700 40  0000 C CNN
@@ -310,14 +294,14 @@ F 3 "~" H 1650 4700 30  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L C-RESCUE-renard C1
+L C C1
 U 1 1 5362780F
-P 1150 5850
-F 0 "C1" H 1150 5950 40  0000 L CNN
-F 1 "100nF" H 1156 5765 40  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 1188 5700 30  0000 C CNN
-F 3 "~" H 1150 5850 60  0000 C CNN
-	1    1150 5850
+P 1150 5800
+F 0 "C1" H 1150 5900 40  0000 L CNN
+F 1 "100nF" H 1156 5715 40  0000 L CNN
+F 2 "renard:C_0805_HandSoldering" H 1188 5650 30  0000 C CNN
+F 3 "~" H 1150 5800 60  0000 C CNN
+	1    1150 5800
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -332,7 +316,7 @@ F 3 "" H 5600 2200 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C-RESCUE-renard C10
+L C C10
 U 1 1 53627898
 P 5600 2400
 F 0 "C10" H 5600 2500 40  0000 L CNN
@@ -343,7 +327,7 @@ F 3 "~" H 5600 2400 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND-RESCUE-renard #PWR010
+L GND #PWR010
 U 1 1 5362789E
 P 5600 2600
 F 0 "#PWR010" H 5600 2600 30  0001 C CNN
@@ -365,7 +349,7 @@ F 3 "" H 5950 2200 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND-RESCUE-renard #PWR012
+L GND #PWR012
 U 1 1 5362795E
 P 5950 2600
 F 0 "#PWR012" H 5950 2600 30  0001 C CNN
@@ -376,7 +360,7 @@ F 3 "" H 5950 2600 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CP1-RESCUE-renard C13
+L CP1 C13
 U 1 1 53627972
 P 5950 2400
 F 0 "C13" H 6000 2500 50  0000 L CNN
@@ -420,19 +404,13 @@ F 3 "~" H 6300 2650 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	2650 3450 2650 4250
-Wire Wire Line
-	2650 3450 2950 3450
+	2650 3450 2650 4300
 Connection ~ 2650 4050
 Wire Wire Line
-	3350 3450 3850 3450
-Wire Wire Line
 	3850 3450 3850 4150
-Wire Wire Line
-	3750 3700 4350 3700
 Connection ~ 3850 3700
 Wire Wire Line
-	3250 3700 3250 4250
+	3250 3700 3250 4300
 Connection ~ 3250 4050
 Wire Wire Line
 	3850 4150 3950 4150
@@ -444,7 +422,7 @@ Connection ~ 4700 4050
 Connection ~ 4700 4250
 Connection ~ 4700 4450
 Wire Wire Line
-	3950 4900 3950 4350
+	3950 4350 3950 4950
 Wire Wire Line
 	5300 3950 5650 3950
 Wire Wire Line
@@ -454,8 +432,6 @@ Wire Wire Line
 Wire Wire Line
 	4350 2550 1750 2550
 Wire Wire Line
-	2200 4900 3450 4900
-Wire Wire Line
 	1750 3050 2000 3050
 Wire Wire Line
 	2200 4100 2200 4500
@@ -463,20 +439,14 @@ Wire Wire Line
 	1900 4200 2200 4200
 Connection ~ 2200 4200
 Wire Wire Line
-	1400 4700 1150 4700
-Wire Wire Line
-	1150 5650 1150 5600
-Wire Wire Line
 	1150 5600 700  5600
 Wire Wire Line
-	700  6200 1150 6200
+	1150 6200 700  6200
 Wire Wire Line
-	1150 6200 1150 6050
+	1150 6000 1150 6200
 Wire Wire Line
 	5950 4750 6350 4750
 Wire Wire Line
-	6350 4150 6350 5050
-Wire Wire Line
 	5950 4150 6350 4150
 Connection ~ 6350 4750
 Wire Wire Line
@@ -496,7 +466,7 @@ $EndComp
 Wire Wire Line
 	6300 2200 6300 2400
 $Comp
-L C-RESCUE-renard C8
+L C C8
 U 1 1 5399FBC9
 P 5150 3100
 F 0 "C8" H 5150 3200 40  0000 L CNN
@@ -507,7 +477,7 @@ F 3 "~" H 5150 3100 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C-RESCUE-renard C9
+L C C9
 U 1 1 5399FBCF
 P 5400 3100
 F 0 "C9" H 5400 3200 40  0000 L CNN
@@ -518,7 +488,7 @@ F 3 "~" H 5400 3100 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C-RESCUE-renard C11
+L C C11
 U 1 1 5399FBD5
 P 5650 3100
 F 0 "C11" H 5650 3200 40  0000 L CNN
@@ -529,7 +499,7 @@ F 3 "~" H 5650 3100 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C-RESCUE-renard C12
+L C C12
 U 1 1 5399FBDB
 P 5900 3100
 F 0 "C12" H 5900 3200 40  0000 L CNN
@@ -539,23 +509,18 @@ F 3 "~" H 5900 3100 60  0000 C CNN
 	1    5900 3100
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	5150 3300 5900 3300
 $Comp
-L GND-RESCUE-renard #PWR014
+L GND #PWR014
 U 1 1 5399FC3D
-P 5400 3350
-F 0 "#PWR014" H 5400 3350 30  0001 C CNN
-F 1 "GND" H 5400 3280 30  0001 C CNN
-F 2 "" H 5400 3350 60  0000 C CNN
-F 3 "" H 5400 3350 60  0000 C CNN
-	1    5400 3350
+P 5400 3300
+F 0 "#PWR014" H 5400 3300 30  0001 C CNN
+F 1 "GND" H 5400 3230 30  0001 C CNN
+F 2 "" H 5400 3300 60  0000 C CNN
+F 3 "" H 5400 3300 60  0000 C CNN
+	1    5400 3300
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	5400 3350 5400 3300
-Connection ~ 5400 3300
-Wire Wire Line
 	6300 2900 6300 4350
 Wire Wire Line
 	5950 3750 6300 3750
@@ -566,16 +531,15 @@ Wire Wire Line
 	5400 2900 5900 2900
 Connection ~ 5650 2900
 Connection ~ 5900 2900
-Connection ~ 5650 3300
 $Comp
-L C-RESCUE-renard C15
+L C C15
 U 1 1 539A0037
-P 7200 3400
-F 0 "C15" H 7200 3500 40  0000 L CNN
-F 1 "910pF" H 7206 3315 40  0000 L CNN
-F 2 "Capacitors_ThroughHole:C_Disc_D4.3mm_W1.9mm_P5.00mm" H 7200 3200 30  0001 C CNN
-F 3 "~" H 7200 3400 60  0000 C CNN
-	1    7200 3400
+P 7200 3450
+F 0 "C15" H 7200 3550 40  0000 L CNN
+F 1 "910pF" H 7206 3365 40  0000 L CNN
+F 2 "Capacitors_ThroughHole:C_Disc_D4.3mm_W1.9mm_P5.00mm" H 7200 3250 30  0001 C CNN
+F 3 "~" H 7200 3450 60  0000 C CNN
+	1    7200 3450
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -590,7 +554,7 @@ F 3 "~" H 6950 3200 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C-RESCUE-renard C16
+L C C16
 U 1 1 539A0091
 P 6500 3400
 F 0 "C16" H 6500 3500 40  0000 L CNN
@@ -601,14 +565,14 @@ F 3 "~" H 6500 3400 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND-RESCUE-renard #PWR015
+L GND #PWR015
 U 1 1 539A0198
-P 7200 3600
-F 0 "#PWR015" H 7200 3600 30  0001 C CNN
-F 1 "GND" H 7200 3530 30  0001 C CNN
-F 2 "" H 7200 3600 60  0000 C CNN
-F 3 "" H 7200 3600 60  0000 C CNN
-	1    7200 3600
+P 7200 3650
+F 0 "#PWR015" H 7200 3650 30  0001 C CNN
+F 1 "GND" H 7200 3580 30  0001 C CNN
+F 2 "" H 7200 3650 60  0000 C CNN
+F 3 "" H 7200 3650 60  0000 C CNN
+	1    7200 3650
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -669,7 +633,7 @@ F 3 "~" H 10650 3400 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L C-RESCUE-renard C21
+L C C21
 U 1 1 539A1196
 P 10450 3200
 F 0 "C21" H 10450 3300 40  0000 L CNN
@@ -680,18 +644,18 @@ F 3 "~" H 10450 3200 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L POT-RESCUE-renard RV1
+L POT RV1
 U 1 1 539A11ED
 P 10250 2650
-F 0 "RV1" H 10250 2550 50  0000 C CNN
-F 1 "2k" H 10250 2650 50  0000 C CNN
+F 0 "RV1" H 10100 2550 50  0000 C CNN
+F 1 "2k" H 10100 2650 50  0000 C CNN
 F 2 "Potentiometers:Potentiometer_Alps-RK16-single_largePads" H 10250 2650 60  0001 C CNN
 F 3 "~" H 10250 2650 60  0000 C CNN
 	1    10250 2650
 	0    1    1    0   
 $EndComp
 $Comp
-L LED-RESCUE-renard D1
+L LED D1
 U 1 1 539A12D0
 P 10450 2900
 F 0 "D1" H 10450 3000 50  0000 C CNN
@@ -702,18 +666,13 @@ F 3 "~" H 10450 2900 60  0000 C CNN
 	-1   0    0    1   
 $EndComp
 Wire Wire Line
-	10250 2900 10250 3600
-Connection ~ 10250 3200
-Wire Wire Line
 	10650 2400 10650 3200
-Wire Wire Line
-	10650 2650 10400 2650
 Connection ~ 10650 2900
 Wire Wire Line
 	10650 2400 10250 2400
 Connection ~ 10650 2650
 $Comp
-L GND-RESCUE-renard #PWR016
+L GND #PWR016
 U 1 1 539A14B2
 P 10100 2950
 F 0 "#PWR016" H 10100 2950 30  0001 C CNN
@@ -725,10 +684,8 @@ F 3 "" H 10100 2950 60  0000 C CNN
 $EndComp
 Wire Wire Line
 	10100 2950 10100 2900
-Wire Wire Line
-	10100 2900 10250 2900
 $Comp
-L R-RESCUE-renard R6
+L R R6
 U 1 1 539A1B1D
 P 6350 5300
 F 0 "R6" V 6430 5300 40  0000 C CNN
@@ -739,7 +696,7 @@ F 3 "~" H 6350 5300 30  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C-RESCUE-renard C14
+L C C14
 U 1 1 539A1B2C
 P 6050 5300
 F 0 "C14" H 6050 5400 40  0000 L CNN
@@ -753,27 +710,21 @@ Wire Wire Line
 	6050 5100 6050 5050
 Wire Wire Line
 	6050 5050 6350 5050
-Wire Wire Line
-	6050 5500 6050 5550
-Wire Wire Line
-	6050 5550 6350 5550
-Wire Wire Line
-	6350 5550 6350 5600
 Text Notes 2600 2500 0    60   ~ 0
 CPU clock = TX frequency
 $Comp
 L VCC #PWR017
 U 1 1 539A2069
-P 2850 5250
-F 0 "#PWR017" H 2850 5350 30  0001 C CNN
-F 1 "VCC" H 2850 5350 30  0000 C CNN
-F 2 "" H 2850 5250 60  0000 C CNN
-F 3 "" H 2850 5250 60  0000 C CNN
-	1    2850 5250
+P 2850 5300
+F 0 "#PWR017" H 2850 5400 30  0001 C CNN
+F 1 "VCC" H 2850 5400 30  0000 C CNN
+F 2 "" H 2850 5300 60  0000 C CNN
+F 3 "" H 2850 5300 60  0000 C CNN
+	1    2850 5300
 	1    0    0    -1  
 $EndComp
 $Comp
-L C-RESCUE-renard C3
+L C C3
 U 1 1 539A206F
 P 2850 5450
 F 0 "C3" H 2850 5550 40  0000 L CNN
@@ -784,40 +735,40 @@ F 3 "~" H 2850 5450 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND-RESCUE-renard #PWR018
+L GND #PWR018
 U 1 1 539A2075
-P 2850 5650
-F 0 "#PWR018" H 2850 5650 30  0001 C CNN
-F 1 "GND" H 2850 5580 30  0001 C CNN
-F 2 "" H 2850 5650 60  0000 C CNN
-F 3 "" H 2850 5650 60  0000 C CNN
-	1    2850 5650
+P 2850 5600
+F 0 "#PWR018" H 2850 5600 30  0001 C CNN
+F 1 "GND" H 2850 5530 30  0001 C CNN
+F 2 "" H 2850 5600 60  0000 C CNN
+F 3 "" H 2850 5600 60  0000 C CNN
+	1    2850 5600
 	1    0    0    -1  
 $EndComp
 $Comp
 L VCC #PWR019
 U 1 1 539A207B
-P 3200 5250
-F 0 "#PWR019" H 3200 5350 30  0001 C CNN
-F 1 "VCC" H 3200 5350 30  0000 C CNN
-F 2 "" H 3200 5250 60  0000 C CNN
-F 3 "" H 3200 5250 60  0000 C CNN
-	1    3200 5250
+P 3200 5300
+F 0 "#PWR019" H 3200 5400 30  0001 C CNN
+F 1 "VCC" H 3200 5400 30  0000 C CNN
+F 2 "" H 3200 5300 60  0000 C CNN
+F 3 "" H 3200 5300 60  0000 C CNN
+	1    3200 5300
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND-RESCUE-renard #PWR020
+L GND #PWR020
 U 1 1 539A2081
-P 3200 5650
-F 0 "#PWR020" H 3200 5650 30  0001 C CNN
-F 1 "GND" H 3200 5580 30  0001 C CNN
-F 2 "" H 3200 5650 60  0000 C CNN
-F 3 "" H 3200 5650 60  0000 C CNN
-	1    3200 5650
+P 3200 5600
+F 0 "#PWR020" H 3200 5600 30  0001 C CNN
+F 1 "GND" H 3200 5530 30  0001 C CNN
+F 2 "" H 3200 5600 60  0000 C CNN
+F 3 "" H 3200 5600 60  0000 C CNN
+	1    3200 5600
 	1    0    0    -1  
 $EndComp
 $Comp
-L CP1-RESCUE-renard C5
+L CP1 C5
 U 1 1 539A2087
 P 3200 5450
 F 0 "C5" H 3250 5550 50  0000 L CNN
@@ -873,7 +824,7 @@ F 3 "" H 3100 1200 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND-RESCUE-renard #PWR023
+L GND #PWR023
 U 1 1 5623214F
 P 3100 1350
 F 0 "#PWR023" H 3100 1350 30  0001 C CNN
@@ -899,7 +850,7 @@ F 3 "" H 2750 2850 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND-RESCUE-renard #PWR024
+L GND #PWR024
 U 1 1 5623AF3F
 P 2550 2950
 F 0 "#PWR024" H 2550 2950 30  0001 C CNN
@@ -912,7 +863,7 @@ $EndComp
 Wire Wire Line
 	2550 2950 2550 2900
 $Comp
-L C-RESCUE-renard C25
+L C C25
 U 1 1 563F68EF
 P 6500 3000
 F 0 "C25" H 6500 3100 40  0000 L CNN
@@ -925,22 +876,20 @@ $EndComp
 Connection ~ 6300 3400
 Connection ~ 6300 3000
 $Comp
-L C-RESCUE-renard C28
+L C C28
 U 1 1 563F790C
-P 10800 4600
-F 0 "C28" H 10800 4700 40  0000 L CNN
-F 1 "910pF" H 10806 4515 40  0000 L CNN
-F 2 "Capacitors_ThroughHole:C_Disc_D4.3mm_W1.9mm_P5.00mm" H 10800 4300 30  0000 C CNN
-F 3 "~" H 10800 4600 60  0000 C CNN
-	1    10800 4600
+P 10650 4600
+F 0 "C28" H 10650 4700 40  0000 L CNN
+F 1 "910pF" H 10656 4515 40  0000 L CNN
+F 2 "Capacitors_ThroughHole:C_Disc_D4.3mm_W1.9mm_P5.00mm" H 10650 4300 30  0000 C CNN
+F 3 "~" H 10650 4600 60  0000 C CNN
+	1    10650 4600
 	1    0    0    -1  
 $EndComp
 Text Label 6350 4750 0    60   ~ 0
 PA_EMITTER
 Text Label 6300 3900 0    60   ~ 0
 PA_COLLECTOR
-Wire Wire Line
-	6700 3000 6700 3400
 Connection ~ 6700 3200
 Text Notes 6800 3000 0    60   ~ 0
 L2: 4.6uH\nT44-2\n30T, 50cm\nX=100 Ohm
@@ -955,24 +904,63 @@ Wire Wire Line
 Text Notes 8200 4450 0    60   ~ 0
 T2: T44-2\n65T 500 Ohm\n3T 1 Ohm
 $Comp
-L C-RESCUE-renard C19
+L C C19
 U 1 1 5917F023
-P 9750 4600
-F 0 "C19" H 9750 4700 40  0000 L CNN
-F 1 "90pF" H 9756 4515 40  0000 L CNN
-F 2 "Capacitors_ThroughHole:C_Disc_D4.3mm_W1.9mm_P5.00mm" H 9750 4400 30  0001 C CNN
-F 3 "~" H 9750 4600 60  0000 C CNN
-	1    9750 4600
+P 9600 4600
+F 0 "C19" H 9600 4700 40  0000 L CNN
+F 1 "90pF" H 9606 4515 40  0000 L CNN
+F 2 "Capacitors_ThroughHole:C_Disc_D4.3mm_W1.9mm_P5.00mm" H 9600 4400 30  0001 C CNN
+F 3 "~" H 9600 4600 60  0000 C CNN
+	1    9600 4600
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
 	9500 4400 10250 4400
 Wire Wire Line
 	9500 4800 10800 4800
-Connection ~ 9750 4400
-Connection ~ 9750 4800
 Text Notes 9400 3950 0    60   ~ 0
 T3: wrapped\non small tube
-Text Notes 5350 5400 0    60   ~ 0
+Text Notes 5350 5350 0    60   ~ 0
 0.5uF at f_0:\n0.1 Ohm
+Connection ~ 3250 4250
+Connection ~ 3950 4900
+Wire Wire Line
+	7200 3250 7200 3200
+Connection ~ 6350 5050
+Connection ~ 6350 5550
+Connection ~ 10250 2900
+Wire Wire Line
+	10400 2650 10650 2650
+Wire Wire Line
+	10250 2900 10250 3600
+Connection ~ 9600 4800
+Connection ~ 9600 4400
+Connection ~ 10250 3200
+Wire Wire Line
+	10100 2900 10250 2900
+Connection ~ 10650 4800
+Wire Wire Line
+	6700 3000 6700 3400
+Wire Wire Line
+	5150 3300 5900 3300
+Wire Wire Line
+	5650 3300 5400 3300
+Connection ~ 5400 3300
+Connection ~ 5650 3300
+Wire Wire Line
+	6350 5050 6350 4150
+Wire Wire Line
+	6050 5500 6050 5550
+Wire Wire Line
+	6050 5550 6350 5550
+Wire Wire Line
+	2200 4900 3450 4900
+Wire Wire Line
+	1150 4700 1400 4700
+Wire Wire Line
+	3750 3700 4350 3700
+Wire Wire Line
+	3850 3450 3350 3450
+Wire Wire Line
+	2950 3450 2650 3450
 $EndSCHEMATC