.pro changes in Subcircuits

5 files changed, 36 insertions, 15 deletions

diff --git a/library/SubcircuitLibrary/5_and/3_and.pro b/library/SubcircuitLibrary/5_and/3_and.pro
index 76df4655..da3e199e 100644
--- a/library/SubcircuitLibrary/5_and/3_and.pro
+++ b/library/SubcircuitLibrary/5_and/3_and.pro
@@ -1,4 +1,4 @@
-update=05/31/19 15:26:09
+update=Wed Mar 18 20:00:16 2020
 version=1
 last_client=eeschema
 [general]
@@ -38,7 +38,6 @@ LibName4=eSim_Hybrid
 LibName5=eSim_Miscellaneous
 LibName6=eSim_Plot
 LibName7=eSim_Power
-LibName8=eSim_PSpice
-LibName9=eSim_Sources
-LibName10=eSim_Subckt
-LibName11=eSim_User
+LibName8=eSim_Sources
+LibName9=eSim_Subckt
+LibName10=eSim_User
diff --git a/library/SubcircuitLibrary/5_and/5_and-cache.lib b/library/SubcircuitLibrary/5_and/5_and-cache.lib
index ac396288..fc177c1f 100644
--- a/library/SubcircuitLibrary/5_and/5_and-cache.lib
+++ b/library/SubcircuitLibrary/5_and/5_and-cache.lib
@@ -1,17 +1,17 @@
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
-# 3_and
+# 3_and-RESCUE-5_and
 #
-DEF 3_and X 0 40 Y Y 1 F N
+DEF 3_and-RESCUE-5_and X 0 40 Y Y 1 F N
 F0 "X" 900 300 60 H V C CNN
-F1 "3_and" 950 500 60 H V C CNN
+F1 "3_and-RESCUE-5_and" 950 500 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
 A 950 400 158 716 -716 0 1 0 N 1000 550 1000 250
-P 2 0 1 0  650 550  1000 550 N
-P 3 0 1 0  650 550  650 250  1000 250 N
+P 2 0 1 0 650 550 1000 550 N
+P 3 0 1 0 650 550 650 250 1000 250 N
 X in1 1 450 500 200 R 50 50 1 1 I
 X in2 2 450 400 200 R 50 50 1 1 I
 X in3 3 450 300 200 R 50 50 1 1 I
@@ -69,7 +69,7 @@ F3 "" 0 0 60 H V C CNN
 DRAW
 A 149 50 100 -894 0 0 1 0 N 150 -50 250 50
 A 150 49 100 6 900 0 1 0 N 250 50 150 150
-P 4 0 1 0  150 -50  -250 -50  -250 150  150 150 N
+P 4 0 1 0 150 -50 -250 -50 -250 150 150 150 N
 X IN1 1 -450 100 200 R 50 50 1 1 I
 X IN2 2 -450 0 200 R 50 50 1 1 I
 X OUT 3 450 50 200 L 50 50 1 1 O
diff --git a/library/SubcircuitLibrary/5_and/5_and-rescue.lib b/library/SubcircuitLibrary/5_and/5_and-rescue.lib
new file mode 100644
index 00000000..483b8efb
--- /dev/null
+++ b/library/SubcircuitLibrary/5_and/5_and-rescue.lib
@@ -0,0 +1,22 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# 3_and-RESCUE-5_and
+#
+DEF 3_and-RESCUE-5_and X 0 40 Y Y 1 F N
+F0 "X" 900 300 60 H V C CNN
+F1 "3_and-RESCUE-5_and" 950 500 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A 950 400 158 716 -716 0 1 0 N 1000 550 1000 250
+P 2 0 1 0 650 550 1000 550 N
+P 3 0 1 0 650 550 650 250 1000 250 N
+X in1 1 450 500 200 R 50 50 1 1 I
+X in2 2 450 400 200 R 50 50 1 1 I
+X in3 3 450 300 200 R 50 50 1 1 I
+X out 4 1300 400 200 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/library/SubcircuitLibrary/5_and/5_and.pro b/library/SubcircuitLibrary/5_and/5_and.pro
index b09b3dde..c16a3f85 100644
--- a/library/SubcircuitLibrary/5_and/5_and.pro
+++ b/library/SubcircuitLibrary/5_and/5_and.pro
@@ -1,4 +1,4 @@
-update=06/01/19 11:31:03
+update=Wed Mar 18 19:59:53 2020
 version=1
 last_client=eeschema
 [general]
diff --git a/library/SubcircuitLibrary/5_and/5_and.sch b/library/SubcircuitLibrary/5_and/5_and.sch
index e9eb58ee..aef3c043 100644
--- a/library/SubcircuitLibrary/5_and/5_and.sch
+++ b/library/SubcircuitLibrary/5_and/5_and.sch
@@ -1,4 +1,5 @@
 EESchema Schematic File Version 2
+LIBS:5_and-rescue
 LIBS:cypress
 LIBS:siliconi
 LIBS:opto
@@ -12,10 +13,9 @@ LIBS:eSim_Hybrid
 LIBS:eSim_Miscellaneous
 LIBS:eSim_Plot
 LIBS:eSim_Power
-LIBS:eSim_PSpice
+LIBS:eSim_User
 LIBS:eSim_Sources
 LIBS:eSim_Subckt
-LIBS:eSim_User
 LIBS:5_and-cache
 EELAYER 25 0
 EELAYER END
@@ -32,7 +32,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L 3_and X1
+L 3_and-RESCUE-5_and X1
 U 1 1 5C9A2741
 P 3800 3350
 F 0 "X1" H 4700 3650 60  0000 C CNN