part2/3 - .pro cleanup

4 files changed, 27 insertions, 30 deletions

diff --git a/Examples/FullAdder/FullAdder-cache.lib b/Examples/FullAdder/FullAdder-cache.lib
index 5669fdaf..581e1c29 100644
--- a/Examples/FullAdder/FullAdder-cache.lib
+++ b/Examples/FullAdder/FullAdder-cache.lib
@@ -1,11 +1,11 @@
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
-# DC
+# DC-RESCUE-FullAdder
 #
-DEF DC v 0 40 Y Y 1 F N
+DEF DC-RESCUE-FullAdder v 0 40 Y Y 1 F N
 F0 "v" -200 100 60 H V C CNN
-F1 "DC" -200 -50 60 H V C CNN
+F1 "DC-RESCUE-FullAdder" -200 -50 60 H V C CNN
 F2 "R1" -300 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 $FPLIST
@@ -23,10 +23,10 @@ ENDDEF
 DEF GND #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -250 50 H I C CNN
 F1 "GND" 0 -150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 DRAW
-P 6 0 1 0  0 0  0 -50  50 -50  0 -100  -50 -50  0 -50 N
+P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
 X GND 1 0 0 0 D 50 50 1 1 W N
 ENDDRAW
 ENDDEF
diff --git a/Examples/FullAdder/FullAdder-rescue.lib b/Examples/FullAdder/FullAdder-rescue.lib
index a724787d..2ddb7bd6 100644
--- a/Examples/FullAdder/FullAdder-rescue.lib
+++ b/Examples/FullAdder/FullAdder-rescue.lib
@@ -1,21 +1,20 @@
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
-# R-RESCUE-FullAdder
+# DC-RESCUE-FullAdder
 #
-DEF R-RESCUE-FullAdder R 0 0 N Y 1 F N
-F0 "R" 50 130 50 H V C CNN
-F1 "R-RESCUE-FullAdder" 50 50 50 H V C CNN
-F2 "" 50 -20 30 H V C CNN
-F3 "" 50 50 30 V V C CNN
+DEF DC-RESCUE-FullAdder v 0 40 Y Y 1 F N
+F0 "v" -200 100 60 H V C CNN
+F1 "DC-RESCUE-FullAdder" -200 -50 60 H V C CNN
+F2 "R1" -300 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 $FPLIST
- R_*
- Resistor_*
+ 1_pin
 $ENDFPLIST
 DRAW
-S 150 10 -50 90 0 1 10 N
-X ~ 1 -100 50 50 R 60 60 1 1 P
-X ~ 2 200 50 50 L 60 60 1 1 P
+C 0 0 150 0 1 0 N
+X + 1 0 450 300 D 50 50 1 1 P
+X - 2 0 -450 300 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
diff --git a/Examples/FullAdder/FullAdder.pro b/Examples/FullAdder/FullAdder.pro
index 3a4fb370..9e65fa13 100644
--- a/Examples/FullAdder/FullAdder.pro
+++ b/Examples/FullAdder/FullAdder.pro
@@ -1,4 +1,4 @@
-update=Mon Mar 11 11:26:25 2019
+update=Wed Mar 11 16:17:06 2020
 version=1
 last_client=eeschema
 [general]
@@ -63,10 +63,8 @@ LibName29=opto
 LibName30=atmel
 LibName31=contrib
 LibName32=power
-LibName33=device
-LibName34=transistors
-LibName35=conn
-LibName36=linear
-LibName37=regul
-LibName38=74xx
-LibName39=cmos4000
+LibName33=transistors
+LibName34=conn
+LibName35=regul
+LibName36=74xx
+LibName37=cmos4000
diff --git a/Examples/FullAdder/FullAdder.sch b/Examples/FullAdder/FullAdder.sch
index 7e0995aa..10ab7c95 100644
--- a/Examples/FullAdder/FullAdder.sch
+++ b/Examples/FullAdder/FullAdder.sch
@@ -1,4 +1,5 @@
 EESchema Schematic File Version 2
+LIBS:FullAdder-rescue
 LIBS:eSim_Analog
 LIBS:eSim_Devices
 LIBS:eSim_Digital
@@ -30,13 +31,12 @@ LIBS:opto
 LIBS:atmel
 LIBS:contrib
 LIBS:power
-LIBS:device
 LIBS:transistors
 LIBS:conn
-LIBS:linear
 LIBS:regul
 LIBS:74xx
 LIBS:cmos4000
+LIBS:FullAdder-cache
 EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
@@ -63,7 +63,7 @@ F 3 "" H 4350 4050 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L DC v1
+L DC-RESCUE-FullAdder v1
 U 1 1 56D58CB2
 P 1300 3550
 F 0 "v1" H 1100 3650 60  0000 C CNN
@@ -74,7 +74,7 @@ F 3 "" H 1300 3550 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L DC v2
+L DC-RESCUE-FullAdder v2
 U 1 1 56D58D3D
 P 1950 3950
 F 0 "v2" H 1750 4050 60  0000 C CNN
@@ -85,7 +85,7 @@ F 3 "" H 1950 3950 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L DC v3
+L DC-RESCUE-FullAdder v3
 U 1 1 56D58D84
 P 2700 4350
 F 0 "v3" H 2500 4450 60  0000 C CNN