11 files changed, 206 insertions, 73 deletions
diff --git a/library/SubcircuitLibrary/74153/3_and.pro b/library/SubcircuitLibrary/74153/3_and.pro
index 2c9ac554..2ed02922 100644
--- a/library/SubcircuitLibrary/74153/3_and.pro
+++ b/library/SubcircuitLibrary/74153/3_and.pro
@@ -1,4 +1,4 @@
-update=03/26/19 18:40:23
+update=Wed Mar 18 20:09:49 2020
 version=1
 last_client=eeschema
 [general]
@@ -52,7 +52,6 @@ LibName18=eSim_Hybrid
 LibName19=eSim_Miscellaneous
 LibName20=eSim_Plot
 LibName21=eSim_Power
-LibName22=eSim_PSpice
-LibName23=eSim_Sources
-LibName24=eSim_Subckt
-LibName25=eSim_User
+LibName22=eSim_Sources
+LibName23=eSim_Subckt
+LibName24=eSim_User
diff --git a/library/SubcircuitLibrary/74153/4_OR.pro b/library/SubcircuitLibrary/74153/4_OR.pro
index 2c258cec..82ea8876 100644
--- a/library/SubcircuitLibrary/74153/4_OR.pro
+++ b/library/SubcircuitLibrary/74153/4_OR.pro
@@ -1,4 +1,4 @@
-update=03/28/19 22:43:48
+update=Wed Mar 18 20:10:33 2020
 version=1
 last_client=eeschema
 [general]
@@ -39,7 +39,6 @@ LibName5=eSim_Hybrid
 LibName6=eSim_Miscellaneous
 LibName7=eSim_Plot
 LibName8=eSim_Power
-LibName9=eSim_PSpice
-LibName10=eSim_Sources
-LibName11=eSim_Subckt
-LibName12=eSim_User
+LibName9=eSim_Sources
+LibName10=eSim_Subckt
+LibName11=eSim_User
diff --git a/library/SubcircuitLibrary/74153/4_and-cache.lib b/library/SubcircuitLibrary/74153/4_and-cache.lib
index ac396288..e7636dd5 100644
--- a/library/SubcircuitLibrary/74153/4_and-cache.lib
+++ b/library/SubcircuitLibrary/74153/4_and-cache.lib
@@ -1,17 +1,17 @@
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
-# 3_and
+# 3_and-RESCUE-4_and
 #
-DEF 3_and X 0 40 Y Y 1 F N
+DEF 3_and-RESCUE-4_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-4_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/74153/4_and-rescue.lib b/library/SubcircuitLibrary/74153/4_and-rescue.lib
new file mode 100644
index 00000000..49f649ad
--- /dev/null
+++ b/library/SubcircuitLibrary/74153/4_and-rescue.lib
@@ -0,0 +1,22 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# 3_and-RESCUE-4_and
+#
+DEF 3_and-RESCUE-4_and X 0 40 Y Y 1 F N
+F0 "X" 900 300 60 H V C CNN
+F1 "3_and-RESCUE-4_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/74153/4_and.pro b/library/SubcircuitLibrary/74153/4_and.pro
index 6eb77fff..55a70ef1 100644
--- a/library/SubcircuitLibrary/74153/4_and.pro
+++ b/library/SubcircuitLibrary/74153/4_and.pro
@@ -1,4 +1,4 @@
-update=03/26/19 18:58:33
+update=Wed Mar 18 20:10:11 2020
 version=1
 last_client=eeschema
 [general]
@@ -51,7 +51,6 @@ LibName17=eSim_Hybrid
 LibName18=eSim_Miscellaneous
 LibName19=eSim_Plot
 LibName20=eSim_Power
-LibName21=eSim_PSpice
-LibName22=eSim_Sources
-LibName23=eSim_Subckt
-LibName24=eSim_User
+LibName21=eSim_Sources
+LibName22=eSim_Subckt
+LibName23=eSim_User
diff --git a/library/SubcircuitLibrary/74153/4_and.sch b/library/SubcircuitLibrary/74153/4_and.sch
index 883458e1..87b2bf51 100644
--- a/library/SubcircuitLibrary/74153/4_and.sch
+++ b/library/SubcircuitLibrary/74153/4_and.sch
@@ -1,4 +1,5 @@
 EESchema Schematic File Version 2
+LIBS:4_and-rescue
 LIBS:texas
 LIBS:intel
 LIBS:audio
@@ -19,10 +20,10 @@ LIBS:eSim_Hybrid
 LIBS:eSim_Miscellaneous
 LIBS:eSim_Plot
 LIBS:eSim_Power
-LIBS:eSim_PSpice
 LIBS:eSim_Sources
 LIBS:eSim_Subckt
 LIBS:eSim_User
+LIBS:4_and-cache
 EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
@@ -38,7 +39,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L 3_and X1
+L 3_and-RESCUE-4_and X1
 U 1 1 5C9A2915
 P 3700 3500
 F 0 "X1" H 4600 3800 60  0000 C CNN
diff --git a/library/SubcircuitLibrary/74153/74153-cache.lib b/library/SubcircuitLibrary/74153/74153-cache.lib
index 1e85854e..0c4adc4e 100644
--- a/library/SubcircuitLibrary/74153/74153-cache.lib
+++ b/library/SubcircuitLibrary/74153/74153-cache.lib
@@ -1,19 +1,19 @@
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
-# 4_OR
+# 4_OR-RESCUE-74153
 #
-DEF 4_OR X 0 40 Y Y 1 F N
+DEF 4_OR-RESCUE-74153 X 0 40 Y Y 1 F N
 F0 "X" 3900 3050 60 H V C CNN
-F1 "4_OR" 3900 3250 60 H V C CNN
+F1 "4_OR-RESCUE-74153" 3900 3250 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
 A 2950 3150 650 226 -226 0 1 0 N 3550 3400 3550 2900
 A 3677 3284 444 -599 -176 0 1 0 N 3900 2900 4100 3150
 A 3720 3051 393 627 146 0 1 0 N 3900 3400 4100 3150
-P 2 0 1 0  3550 2900  3900 2900 N
-P 2 0 1 0  3550 3400  3900 3400 N
+P 2 0 1 0 3550 2900 3900 2900 N
+P 2 0 1 0 3550 3400 3900 3400 N
 X in1 1 3400 3300 200 R 50 50 1 1 I
 X in2 2 3400 3200 200 R 50 50 1 1 I
 X in3 3 3400 3100 200 R 50 50 1 1 I
@@ -22,17 +22,17 @@ X out 5 4300 3150 200 L 50 50 1 1 O
 ENDDRAW
 ENDDEF
 #
-# 4_and
+# 4_and-RESCUE-74153
 #
-DEF 4_and X 0 40 Y Y 1 F N
+DEF 4_and-RESCUE-74153 X 0 40 Y Y 1 F N
 F0 "X" 1500 1050 60 H V C CNN
-F1 "4_and" 1550 1200 60 H V C CNN
+F1 "4_and-RESCUE-74153" 1550 1200 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
 A 1550 1100 206 760 -760 0 1 0 N 1600 1300 1600 900
-P 2 0 1 0  1250 1300  1600 1300 N
-P 4 0 1 0  1250 1300  1250 900  1500 900  1600 900 N
+P 2 0 1 0 1250 1300 1600 1300 N
+P 4 0 1 0 1250 1300 1250 900 1500 900 1600 900 N
 X in1 1 1050 1250 200 R 50 50 1 1 I
 X in2 2 1050 1150 200 R 50 50 1 1 I
 X in3 3 1050 1050 200 R 50 50 1 1 I
@@ -89,7 +89,7 @@ F1 "d_inverter" 0 150 60 H V C CNN
 F2 "" 50 -50 60 H V C CNN
 F3 "" 50 -50 60 H V C CNN
 DRAW
-P 4 0 1 0  -100 50  -100 -50  100 0  -100 50 N
+P 4 0 1 0 -100 50 -100 -50 100 0 -100 50 N
 X ~ 1 -300 0 200 R 50 50 1 1 I
 X ~ 2 300 0 200 L 50 50 1 1 O I
 ENDDRAW
diff --git a/library/SubcircuitLibrary/74153/74153-rescue.lib b/library/SubcircuitLibrary/74153/74153-rescue.lib
new file mode 100644
index 00000000..825bc5e2
--- /dev/null
+++ b/library/SubcircuitLibrary/74153/74153-rescue.lib
@@ -0,0 +1,44 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# 4_OR-RESCUE-74153
+#
+DEF 4_OR-RESCUE-74153 X 0 40 Y Y 1 F N
+F0 "X" 3900 3050 60 H V C CNN
+F1 "4_OR-RESCUE-74153" 3900 3250 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A 2950 3150 650 226 -226 0 1 0 N 3550 3400 3550 2900
+A 3677 3284 444 -599 -176 0 1 0 N 3900 2900 4100 3150
+A 3720 3051 393 627 146 0 1 0 N 3900 3400 4100 3150
+P 2 0 1 0 3550 2900 3900 2900 N
+P 2 0 1 0 3550 3400 3900 3400 N
+X in1 1 3400 3300 200 R 50 50 1 1 I
+X in2 2 3400 3200 200 R 50 50 1 1 I
+X in3 3 3400 3100 200 R 50 50 1 1 I
+X in4 4 3400 3000 200 R 50 50 1 1 I
+X out 5 4300 3150 200 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+# 4_and-RESCUE-74153
+#
+DEF 4_and-RESCUE-74153 X 0 40 Y Y 1 F N
+F0 "X" 1500 1050 60 H V C CNN
+F1 "4_and-RESCUE-74153" 1550 1200 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A 1550 1100 206 760 -760 0 1 0 N 1600 1300 1600 900
+P 2 0 1 0 1250 1300 1600 1300 N
+P 4 0 1 0 1250 1300 1250 900 1500 900 1600 900 N
+X in1 1 1050 1250 200 R 50 50 1 1 I
+X in2 2 1050 1150 200 R 50 50 1 1 I
+X in3 3 1050 1050 200 R 50 50 1 1 I
+X in4 4 1050 950 200 R 50 50 1 1 I
+X out 5 1950 1100 200 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/library/SubcircuitLibrary/74153/74153.pro b/library/SubcircuitLibrary/74153/74153.pro
index a4d6d3bb..6a74248c 100644
--- a/library/SubcircuitLibrary/74153/74153.pro
+++ b/library/SubcircuitLibrary/74153/74153.pro
@@ -1,4 +1,4 @@
-update=03/28/19 23:27:36
+update=Wed Mar 18 20:10:59 2020
 version=1
 last_client=eeschema
 [general]
@@ -31,27 +31,28 @@ NetIExt=net
 version=1
 LibDir=
 [eeschema/libraries]
-LibName1=power
-LibName2=eSim_User
-LibName3=texas
-LibName4=intel
-LibName5=audio
-LibName6=interface
-LibName7=digital-audio
-LibName8=philips
-LibName9=display
-LibName10=cypress
-LibName11=siliconi
-LibName12=opto
-LibName13=atmel
-LibName14=contrib
-LibName15=valves
-LibName16=eSim_Analog
-LibName17=eSim_Devices
-LibName18=eSim_Digital
-LibName19=eSim_Hybrid
-LibName20=eSim_Miscellaneous
-LibName21=eSim_Plot
-LibName22=eSim_Power
-LibName23=eSim_Subckt
-LibName24=eSim_Sources
+LibName1=74153-rescue
+LibName2=power
+LibName3=eSim_User
+LibName4=texas
+LibName5=intel
+LibName6=audio
+LibName7=interface
+LibName8=digital-audio
+LibName9=philips
+LibName10=display
+LibName11=cypress
+LibName12=siliconi
+LibName13=opto
+LibName14=atmel
+LibName15=contrib
+LibName16=valves
+LibName17=eSim_Analog
+LibName18=eSim_Devices
+LibName19=eSim_Digital
+LibName20=eSim_Hybrid
+LibName21=eSim_Miscellaneous
+LibName22=eSim_Plot
+LibName23=eSim_Power
+LibName24=eSim_Subckt
+LibName25=eSim_Sources
diff --git a/library/SubcircuitLibrary/74153/74153.sch b/library/SubcircuitLibrary/74153/74153.sch
index e0bcf950..470aab71 100644
--- a/library/SubcircuitLibrary/74153/74153.sch
+++ b/library/SubcircuitLibrary/74153/74153.sch
@@ -1,6 +1,7 @@
 EESchema Schematic File Version 2
+LIBS:74153-rescue
 LIBS:power
-LIBS:device
+LIBS:eSim_User
 LIBS:texas
 LIBS:intel
 LIBS:audio
@@ -21,10 +22,8 @@ LIBS:eSim_Hybrid
 LIBS:eSim_Miscellaneous
 LIBS:eSim_Plot
 LIBS:eSim_Power
-LIBS:eSim_PSpice
-LIBS:eSim_Sources
-LIBS:eSim_User
 LIBS:eSim_Subckt
+LIBS:eSim_Sources
 LIBS:74153-cache
 EELAYER 25 0
 EELAYER END
@@ -267,7 +266,7 @@ YA
 Text Notes 7400 5250 0    60   ~ 12
 YB
 $Comp
-L 4_and X8
+L 4_and-RESCUE-74153 X8
 U 1 1 5C9D0C22
 P 2750 3050
 F 0 "X8" H 4250 4100 60  0000 C CNN
@@ -278,7 +277,7 @@ F 3 "" H 2750 3050 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 4_and X9
+L 4_and-RESCUE-74153 X9
 U 1 1 5C9D0CA2
 P 2750 3600
 F 0 "X9" H 4250 4650 60  0000 C CNN
@@ -289,7 +288,7 @@ F 3 "" H 2750 3600 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 4_and X4
+L 4_and-RESCUE-74153 X4
 U 1 1 5C9D0D16
 P 2700 4200
 F 0 "X4" H 4200 5250 60  0000 C CNN
@@ -300,7 +299,7 @@ F 3 "" H 2700 4200 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 4_and X10
+L 4_and-RESCUE-74153 X10
 U 1 1 5C9D0D93
 P 2750 4700
 F 0 "X10" H 4250 5750 60  0000 C CNN
@@ -311,7 +310,7 @@ F 3 "" H 2750 4700 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 4_and X5
+L 4_and-RESCUE-74153 X5
 U 1 1 5C9D182A
 P 2700 5700
 F 0 "X5" H 4200 6750 60  0000 C CNN
@@ -322,7 +321,7 @@ F 3 "" H 2700 5700 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 4_and X6
+L 4_and-RESCUE-74153 X6
 U 1 1 5C9D1830
 P 2700 6250
 F 0 "X6" H 4200 7300 60  0000 C CNN
@@ -333,7 +332,7 @@ F 3 "" H 2700 6250 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 4_and X3
+L 4_and-RESCUE-74153 X3
 U 1 1 5C9D1836
 P 2650 6850
 F 0 "X3" H 4150 7900 60  0000 C CNN
@@ -344,7 +343,7 @@ F 3 "" H 2650 6850 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 4_and X7
+L 4_and-RESCUE-74153 X7
 U 1 1 5C9D183C
 P 2700 7350
 F 0 "X7" H 4200 8400 60  0000 C CNN
@@ -512,7 +511,7 @@ Wire Wire Line
 Wire Wire Line
 	3750 6450 3750 6400
 $Comp
-L 4_OR X1
+L 4_OR-RESCUE-74153 X1
 U 1 1 5C9D22F7
 P 2150 8400
 F 0 "X1" H 6050 11450 60  0000 C CNN
@@ -539,7 +538,7 @@ Wire Wire Line
 Wire Wire Line
 	4650 5400 5550 5400
 $Comp
-L 4_OR X2
+L 4_OR-RESCUE-74153 X2
 U 1 1 5C9D28DE
 P 2250 5750
 F 0 "X2" H 6150 8800 60  0000 C CNN
diff --git a/library/SubcircuitLibrary/74153/Dual4to1MUX.pro b/library/SubcircuitLibrary/74153/Dual4to1MUX.pro
new file mode 100644
index 00000000..f63b751e
--- /dev/null
+++ b/library/SubcircuitLibrary/74153/Dual4to1MUX.pro
@@ -0,0 +1,69 @@
+update=22/05/2015 07:44:53
+version=1
+last_client=kicad
+[general]
+version=1
+RootSch=
+BoardNm=
+[pcbnew]
+version=1
+LastNetListRead=
+UseCmpFile=1
+PadDrill=0.600000000000
+PadDrillOvalY=0.600000000000
+PadSizeH=1.500000000000
+PadSizeV=1.500000000000
+PcbTextSizeV=1.500000000000
+PcbTextSizeH=1.500000000000
+PcbTextThickness=0.300000000000
+ModuleTextSizeV=1.000000000000
+ModuleTextSizeH=1.000000000000
+ModuleTextSizeThickness=0.150000000000
+SolderMaskClearance=0.000000000000
+SolderMaskMinWidth=0.000000000000
+DrawSegmentWidth=0.200000000000
+BoardOutlineThickness=0.100000000000
+ModuleOutlineThickness=0.150000000000
+[cvpcb]
+version=1
+NetIExt=net
+[eeschema]
+version=1
+LibDir=
+[eeschema/libraries]
+LibName1=adc-dac
+LibName2=memory
+LibName3=xilinx
+LibName4=microcontrollers
+LibName5=dsp
+LibName6=microchip
+LibName7=analog_switches
+LibName8=motorola
+LibName9=texas
+LibName10=intel
+LibName11=audio
+LibName12=interface
+LibName13=digital-audio
+LibName14=philips
+LibName15=display
+LibName16=cypress
+LibName17=siliconi
+LibName18=opto
+LibName19=atmel
+LibName20=contrib
+LibName21=power
+LibName22=eSim_Plot
+LibName23=transistors
+LibName24=conn
+LibName25=eSim_User
+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