6 files changed, 54 insertions, 47 deletions
diff --git a/library/SubcircuitLibrary/4to16_demux/3_and.pro b/library/SubcircuitLibrary/4to16_demux/3_and.pro
index 76df4655..117e4cb6 100644
--- a/library/SubcircuitLibrary/4to16_demux/3_and.pro
+++ b/library/SubcircuitLibrary/4to16_demux/3_and.pro
@@ -1,4 +1,4 @@
-update=05/31/19 15:26:09
+update=Wed Mar 18 19:57: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/4to16_demux/5_and-cache.lib b/library/SubcircuitLibrary/4to16_demux/5_and-cache.lib
index ac396288..fc177c1f 100644
--- a/library/SubcircuitLibrary/4to16_demux/5_and-cache.lib
+++ b/library/SubcircuitLibrary/4to16_demux/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/4to16_demux/5_and-rescue.lib b/library/SubcircuitLibrary/4to16_demux/5_and-rescue.lib
new file mode 100644
index 00000000..483b8efb
--- /dev/null
+++ b/library/SubcircuitLibrary/4to16_demux/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/4to16_demux/5_and.pro b/library/SubcircuitLibrary/4to16_demux/5_and.pro
index 7a2f090e..42b50b1e 100644
--- a/library/SubcircuitLibrary/4to16_demux/5_and.pro
+++ b/library/SubcircuitLibrary/4to16_demux/5_and.pro
@@ -1,4 +1,4 @@
-update=06/01/19 11:31:03
+update=Wed Mar 18 19:57:51 2020
 version=1
 last_client=eeschema
 [general]
@@ -44,7 +44,6 @@ LibName10=eSim_Hybrid
 LibName11=eSim_Miscellaneous
 LibName12=eSim_Plot
 LibName13=eSim_Power
-LibName14=eSim_PSpice
-LibName15=eSim_Sources
-LibName16=eSim_Subckt
-LibName17=eSim_User
+LibName14=eSim_Sources
+LibName15=eSim_Subckt
+LibName16=eSim_User
diff --git a/library/SubcircuitLibrary/4to16_demux/5_and.sch b/library/SubcircuitLibrary/4to16_demux/5_and.sch
index e9eb58ee..89cee816 100644
--- a/library/SubcircuitLibrary/4to16_demux/5_and.sch
+++ b/library/SubcircuitLibrary/4to16_demux/5_and.sch
@@ -1,4 +1,5 @@
 EESchema Schematic File Version 2
+LIBS:5_and-rescue
 LIBS:cypress
 LIBS:siliconi
 LIBS:opto
@@ -12,7 +13,6 @@ LIBS:eSim_Hybrid
 LIBS:eSim_Miscellaneous
 LIBS:eSim_Plot
 LIBS:eSim_Power
-LIBS:eSim_PSpice
 LIBS:eSim_Sources
 LIBS:eSim_Subckt
 LIBS:eSim_User
@@ -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
diff --git a/library/SubcircuitLibrary/4to16_demux/5_nand.pro b/library/SubcircuitLibrary/4to16_demux/5_nand.pro
index b7d23f44..55cad11e 100644
--- a/library/SubcircuitLibrary/4to16_demux/5_nand.pro
+++ b/library/SubcircuitLibrary/4to16_demux/5_nand.pro
@@ -1,4 +1,4 @@
-update=Fri Jun 21 16:46:10 2019
+update=Wed Mar 18 19:59:08 2020
 version=1
 last_client=eeschema
 [general]
@@ -52,32 +52,19 @@ LibName18=opto
 LibName19=atmel
 LibName20=contrib
 LibName21=power
-LibName22=device
-LibName23=transistors
-LibName24=conn
-LibName25=linear
-LibName26=regul
-LibName27=74xx
-LibName28=cmos4000
-LibName29=eSim_Analog
-LibName30=eSim_Devices
-LibName31=eSim_Digital
-LibName32=eSim_Hybrid
-LibName33=eSim_Miscellaneous
-LibName34=eSim_Power
-LibName35=eSim_Sources
-LibName36=eSim_Subckt
-LibName37=eSim_User
-LibName38=eSim_Plot
-LibName39=eSim_PSpice
-LibName40=/home/mallikarjuna/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Analog
-LibName41=/home/mallikarjuna/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Devices
-LibName42=/home/mallikarjuna/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Digital
-LibName43=/home/mallikarjuna/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Hybrid
-LibName44=/home/mallikarjuna/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Miscellaneous
-LibName45=/home/mallikarjuna/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Plot
-LibName46=/home/mallikarjuna/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Power
-LibName47=/home/mallikarjuna/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Sources
-LibName48=/home/mallikarjuna/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Subckt
-LibName49=/home/mallikarjuna/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_User
+LibName22=transistors
+LibName23=conn
+LibName24=regul
+LibName25=74xx
+LibName26=cmos4000
+LibName27=eSim_Analog
+LibName28=eSim_Devices
+LibName29=eSim_Digital
+LibName30=eSim_Hybrid
+LibName31=eSim_Miscellaneous
+LibName32=eSim_Power
+LibName33=eSim_Sources
+LibName34=eSim_Subckt
+LibName35=eSim_User
+LibName36=eSim_Plot