From cb55e59de7ee4383c04edfae7c39ad9ae9552b36 Mon Sep 17 00:00:00 2001
From: rahulp13
Date: Fri, 14 Feb 2020 15:16:35 +0530
Subject: common code for Win and Linux, merged py2 changes
---
src/SubcircuitLibrary/74153/3_and-cache.lib | 122 +-
src/SubcircuitLibrary/74153/3_and.cir | 26 +-
src/SubcircuitLibrary/74153/3_and.cir.out | 40 +-
src/SubcircuitLibrary/74153/3_and.pro | 102 +-
src/SubcircuitLibrary/74153/3_and.sch | 251 ++-
src/SubcircuitLibrary/74153/3_and.sub | 26 +-
src/SubcircuitLibrary/74153/4_OR-cache.lib | 126 +-
src/SubcircuitLibrary/74153/4_OR.cir | 28 +-
src/SubcircuitLibrary/74153/4_OR.cir.out | 48 +-
src/SubcircuitLibrary/74153/4_OR.pro | 90 +-
src/SubcircuitLibrary/74153/4_OR.sch | 300 ++--
src/SubcircuitLibrary/74153/4_OR.sub | 34 +-
.../74153/4_OR_Previous_Values.xml | 2 +-
src/SubcircuitLibrary/74153/4_and-cache.lib | 158 +-
src/SubcircuitLibrary/74153/4_and.cir | 26 +-
src/SubcircuitLibrary/74153/4_and.cir.out | 36 +-
src/SubcircuitLibrary/74153/4_and.pro | 115 +-
src/SubcircuitLibrary/74153/4_and.sch | 290 ++--
src/SubcircuitLibrary/74153/4_and.sub | 22 +-
src/SubcircuitLibrary/74153/74153-cache.lib | 46 +-
src/SubcircuitLibrary/74153/74153.cir | 34 +-
src/SubcircuitLibrary/74153/74153.cir.out | 42 +-
src/SubcircuitLibrary/74153/74153.pro | 40 +-
src/SubcircuitLibrary/74153/74153.sch | 218 ++-
src/SubcircuitLibrary/74153/74153.sub | 40 +-
.../74153/74153_Previous_Values.xml | 2 +-
src/SubcircuitLibrary/74153/Dual4to1MUX-cache.lib | 188 +--
src/SubcircuitLibrary/74153/Dual4to1MUX.cir | 90 +-
src/SubcircuitLibrary/74153/Dual4to1MUX.sch | 1628 ++++++++++----------
src/SubcircuitLibrary/74153/analysis | 2 +-
30 files changed, 2086 insertions(+), 2086 deletions(-)
(limited to 'src/SubcircuitLibrary/74153')
diff --git a/src/SubcircuitLibrary/74153/3_and-cache.lib b/src/SubcircuitLibrary/74153/3_and-cache.lib
index 0a3ccf7f..af058641 100644
--- a/src/SubcircuitLibrary/74153/3_and-cache.lib
+++ b/src/SubcircuitLibrary/74153/3_and-cache.lib
@@ -1,61 +1,61 @@
-EESchema-LIBRARY Version 2.3
-#encoding utf-8
-#
-# PORT
-#
-DEF PORT U 0 40 Y Y 26 F N
-F0 "U" 50 100 30 H V C CNN
-F1 "PORT" 0 0 30 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-A 325 225 285 -1421 -1278 0 1 0 N 100 50 150 0
-A 376 -275 356 1294 1408 0 1 0 N 150 0 100 -50
-S -100 50 100 -50 0 1 0 N
-X ~ 1 250 0 100 L 30 30 1 1 B
-X ~ 2 250 0 100 L 30 30 2 1 B
-X ~ 3 250 0 100 L 30 30 3 1 B
-X ~ 4 250 0 100 L 30 30 4 1 B
-X ~ 5 250 0 100 L 30 30 5 1 B
-X ~ 6 250 0 100 L 30 30 6 1 B
-X ~ 7 250 0 100 L 30 30 7 1 B
-X ~ 8 250 0 100 L 30 30 8 1 B
-X ~ 9 250 0 100 L 30 30 9 1 B
-X ~ 10 250 0 100 L 30 30 10 1 B
-X ~ 11 250 0 100 L 30 30 11 1 B
-X ~ 12 250 0 100 L 30 30 12 1 B
-X ~ 13 250 0 100 L 30 30 13 1 B
-X ~ 14 250 0 100 L 30 30 14 1 B
-X ~ 15 250 0 100 L 30 30 15 1 B
-X ~ 16 250 0 100 L 30 30 16 1 B
-X ~ 17 250 0 100 L 30 30 17 1 B
-X ~ 18 250 0 100 L 30 30 18 1 B
-X ~ 19 250 0 100 L 30 30 19 1 B
-X ~ 20 250 0 100 L 30 30 20 1 B
-X ~ 21 250 0 100 L 30 30 21 1 B
-X ~ 22 250 0 100 L 30 30 22 1 B
-X ~ 23 250 0 100 L 30 30 23 1 B
-X ~ 24 250 0 100 L 30 30 24 1 B
-X ~ 25 250 0 100 L 30 30 25 1 B
-X ~ 26 250 0 100 L 30 30 26 1 B
-ENDDRAW
-ENDDEF
-#
-# d_and
-#
-DEF d_and U 0 40 Y Y 1 F N
-F0 "U" 0 0 60 H V C CNN
-F1 "d_and" 50 100 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-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
-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
-ENDDRAW
-ENDDEF
-#
-#End Library
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# PORT
+#
+DEF PORT U 0 40 Y Y 26 F N
+F0 "U" 50 100 30 H V C CNN
+F1 "PORT" 0 0 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A 325 225 285 -1421 -1278 0 1 0 N 100 50 150 0
+A 376 -275 356 1294 1408 0 1 0 N 150 0 100 -50
+S -100 50 100 -50 0 1 0 N
+X ~ 1 250 0 100 L 30 30 1 1 B
+X ~ 2 250 0 100 L 30 30 2 1 B
+X ~ 3 250 0 100 L 30 30 3 1 B
+X ~ 4 250 0 100 L 30 30 4 1 B
+X ~ 5 250 0 100 L 30 30 5 1 B
+X ~ 6 250 0 100 L 30 30 6 1 B
+X ~ 7 250 0 100 L 30 30 7 1 B
+X ~ 8 250 0 100 L 30 30 8 1 B
+X ~ 9 250 0 100 L 30 30 9 1 B
+X ~ 10 250 0 100 L 30 30 10 1 B
+X ~ 11 250 0 100 L 30 30 11 1 B
+X ~ 12 250 0 100 L 30 30 12 1 B
+X ~ 13 250 0 100 L 30 30 13 1 B
+X ~ 14 250 0 100 L 30 30 14 1 B
+X ~ 15 250 0 100 L 30 30 15 1 B
+X ~ 16 250 0 100 L 30 30 16 1 B
+X ~ 17 250 0 100 L 30 30 17 1 B
+X ~ 18 250 0 100 L 30 30 18 1 B
+X ~ 19 250 0 100 L 30 30 19 1 B
+X ~ 20 250 0 100 L 30 30 20 1 B
+X ~ 21 250 0 100 L 30 30 21 1 B
+X ~ 22 250 0 100 L 30 30 22 1 B
+X ~ 23 250 0 100 L 30 30 23 1 B
+X ~ 24 250 0 100 L 30 30 24 1 B
+X ~ 25 250 0 100 L 30 30 25 1 B
+X ~ 26 250 0 100 L 30 30 26 1 B
+ENDDRAW
+ENDDEF
+#
+# d_and
+#
+DEF d_and U 0 40 Y Y 1 F N
+F0 "U" 0 0 60 H V C CNN
+F1 "d_and" 50 100 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+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
+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
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/src/SubcircuitLibrary/74153/3_and.cir b/src/SubcircuitLibrary/74153/3_and.cir
index 15f8954d..ba296cf0 100644
--- a/src/SubcircuitLibrary/74153/3_and.cir
+++ b/src/SubcircuitLibrary/74153/3_and.cir
@@ -1,13 +1,13 @@
-* C:\Users\malli\eSim\src\SubcircuitLibrary\3_and\3_and.cir
-
-* EESchema Netlist Version 1.1 (Spice format) creation date: 03/26/19 18:42:57
-
-* To exclude a component from the Spice Netlist add [Spice_Netlist_Enabled] user FIELD set to: N
-* To reorder the component spice node sequence add [Spice_Node_Sequence] user FIELD and define sequence: 2,1,0
-
-* Sheet Name: /
-U2 Net-_U1-Pad1_ Net-_U1-Pad2_ Net-_U2-Pad3_ d_and
-U3 Net-_U2-Pad3_ Net-_U1-Pad3_ Net-_U1-Pad4_ d_and
-U1 Net-_U1-Pad1_ Net-_U1-Pad2_ Net-_U1-Pad3_ Net-_U1-Pad4_ PORT
-
-.end
+* C:\Users\malli\eSim\src\SubcircuitLibrary\3_and\3_and.cir
+
+* EESchema Netlist Version 1.1 (Spice format) creation date: 03/26/19 18:42:57
+
+* To exclude a component from the Spice Netlist add [Spice_Netlist_Enabled] user FIELD set to: N
+* To reorder the component spice node sequence add [Spice_Node_Sequence] user FIELD and define sequence: 2,1,0
+
+* Sheet Name: /
+U2 Net-_U1-Pad1_ Net-_U1-Pad2_ Net-_U2-Pad3_ d_and
+U3 Net-_U2-Pad3_ Net-_U1-Pad3_ Net-_U1-Pad4_ d_and
+U1 Net-_U1-Pad1_ Net-_U1-Pad2_ Net-_U1-Pad3_ Net-_U1-Pad4_ PORT
+
+.end
diff --git a/src/SubcircuitLibrary/74153/3_and.cir.out b/src/SubcircuitLibrary/74153/3_and.cir.out
index e3c96645..d7cf79a0 100644
--- a/src/SubcircuitLibrary/74153/3_and.cir.out
+++ b/src/SubcircuitLibrary/74153/3_and.cir.out
@@ -1,20 +1,20 @@
-* c:\users\malli\esim\src\subcircuitlibrary\3_and\3_and.cir
-
-* u2 net-_u1-pad1_ net-_u1-pad2_ net-_u2-pad3_ d_and
-* u3 net-_u2-pad3_ net-_u1-pad3_ net-_u1-pad4_ d_and
-* u1 net-_u1-pad1_ net-_u1-pad2_ net-_u1-pad3_ net-_u1-pad4_ port
-a1 [net-_u1-pad1_ net-_u1-pad2_ ] net-_u2-pad3_ u2
-a2 [net-_u2-pad3_ net-_u1-pad3_ ] net-_u1-pad4_ u3
-* Schematic Name: d_and, NgSpice Name: d_and
-.model u2 d_and(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
-* Schematic Name: d_and, NgSpice Name: d_and
-.model u3 d_and(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
-.tran 0e-00 0e-00 0e-00
-
-* Control Statements
-.control
-run
-print allv > plot_data_v.txt
-print alli > plot_data_i.txt
-.endc
-.end
+* c:\users\malli\esim\src\subcircuitlibrary\3_and\3_and.cir
+
+* u2 net-_u1-pad1_ net-_u1-pad2_ net-_u2-pad3_ d_and
+* u3 net-_u2-pad3_ net-_u1-pad3_ net-_u1-pad4_ d_and
+* u1 net-_u1-pad1_ net-_u1-pad2_ net-_u1-pad3_ net-_u1-pad4_ port
+a1 [net-_u1-pad1_ net-_u1-pad2_ ] net-_u2-pad3_ u2
+a2 [net-_u2-pad3_ net-_u1-pad3_ ] net-_u1-pad4_ u3
+* Schematic Name: d_and, NgSpice Name: d_and
+.model u2 d_and(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
+* Schematic Name: d_and, NgSpice Name: d_and
+.model u3 d_and(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
+.tran 0e-00 0e-00 0e-00
+
+* Control Statements
+.control
+run
+print allv > plot_data_v.txt
+print alli > plot_data_i.txt
+.endc
+.end
diff --git a/src/SubcircuitLibrary/74153/3_and.pro b/src/SubcircuitLibrary/74153/3_and.pro
index 0fdf4d25..2c9ac554 100644
--- a/src/SubcircuitLibrary/74153/3_and.pro
+++ b/src/SubcircuitLibrary/74153/3_and.pro
@@ -1,44 +1,58 @@
-update=05/31/19 15:26:09
-version=1
-last_client=eeschema
-[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=../../../kicadSchematicLibrary
-[eeschema/libraries]
-LibName1=eSim_Analog
-LibName2=eSim_Devices
-LibName3=eSim_Digital
-LibName4=eSim_Hybrid
-LibName5=eSim_Miscellaneous
-LibName6=eSim_Plot
-LibName7=eSim_Power
-LibName8=eSim_PSpice
-LibName9=eSim_Sources
-LibName10=eSim_Subckt
-LibName11=eSim_User
+update=03/26/19 18:40:23
+version=1
+last_client=eeschema
+[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=power
+LibName2=texas
+LibName3=intel
+LibName4=audio
+LibName5=interface
+LibName6=digital-audio
+LibName7=philips
+LibName8=display
+LibName9=cypress
+LibName10=siliconi
+LibName11=opto
+LibName12=atmel
+LibName13=contrib
+LibName14=valves
+LibName15=eSim_Analog
+LibName16=eSim_Devices
+LibName17=eSim_Digital
+LibName18=eSim_Hybrid
+LibName19=eSim_Miscellaneous
+LibName20=eSim_Plot
+LibName21=eSim_Power
+LibName22=eSim_PSpice
+LibName23=eSim_Sources
+LibName24=eSim_Subckt
+LibName25=eSim_User
diff --git a/src/SubcircuitLibrary/74153/3_and.sch b/src/SubcircuitLibrary/74153/3_and.sch
index c853bf49..86be0215 100644
--- a/src/SubcircuitLibrary/74153/3_and.sch
+++ b/src/SubcircuitLibrary/74153/3_and.sch
@@ -1,130 +1,121 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:eSim_Analog
-LIBS:eSim_Devices
-LIBS:eSim_Digital
-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:3_and-cache
-EELAYER 25 0
-EELAYER END
-$Descr A4 11693 8268
-encoding utf-8
-Sheet 1 1
-Title ""
-Date ""
-Rev ""
-Comp ""
-Comment1 ""
-Comment2 ""
-Comment3 ""
-Comment4 ""
-$EndDescr
-$Comp
-L d_and U2
-U 1 1 5C9A24D8
-P 4250 2700
-F 0 "U2" H 4250 2700 60 0000 C CNN
-F 1 "d_and" H 4300 2800 60 0000 C CNN
-F 2 "" H 4250 2700 60 0000 C CNN
-F 3 "" H 4250 2700 60 0000 C CNN
- 1 4250 2700
- 1 0 0 -1
-$EndComp
-$Comp
-L d_and U3
-U 1 1 5C9A2538
-P 5150 2900
-F 0 "U3" H 5150 2900 60 0000 C CNN
-F 1 "d_and" H 5200 3000 60 0000 C CNN
-F 2 "" H 5150 2900 60 0000 C CNN
-F 3 "" H 5150 2900 60 0000 C CNN
- 1 5150 2900
- 1 0 0 -1
-$EndComp
-$Comp
-L PORT U1
-U 1 1 5C9A259A
-P 3050 2600
-F 0 "U1" H 3100 2700 30 0000 C CNN
-F 1 "PORT" H 3050 2600 30 0000 C CNN
-F 2 "" H 3050 2600 60 0000 C CNN
-F 3 "" H 3050 2600 60 0000 C CNN
- 1 3050 2600
- 1 0 0 -1
-$EndComp
-$Comp
-L PORT U1
-U 2 1 5C9A25D9
-P 3050 2800
-F 0 "U1" H 3100 2900 30 0000 C CNN
-F 1 "PORT" H 3050 2800 30 0000 C CNN
-F 2 "" H 3050 2800 60 0000 C CNN
-F 3 "" H 3050 2800 60 0000 C CNN
- 2 3050 2800
- 1 0 0 -1
-$EndComp
-$Comp
-L PORT U1
-U 3 1 5C9A260A
-P 3050 3100
-F 0 "U1" H 3100 3200 30 0000 C CNN
-F 1 "PORT" H 3050 3100 30 0000 C CNN
-F 2 "" H 3050 3100 60 0000 C CNN
-F 3 "" H 3050 3100 60 0000 C CNN
- 3 3050 3100
- 1 0 0 -1
-$EndComp
-$Comp
-L PORT U1
-U 4 1 5C9A2637
-P 6900 2850
-F 0 "U1" H 6950 2950 30 0000 C CNN
-F 1 "PORT" H 6900 2850 30 0000 C CNN
-F 2 "" H 6900 2850 60 0000 C CNN
-F 3 "" H 6900 2850 60 0000 C CNN
- 4 6900 2850
- -1 0 0 1
-$EndComp
-Wire Wire Line
- 4700 2650 4700 2800
-Wire Wire Line
- 5600 2850 6650 2850
-Wire Wire Line
- 3800 2600 3300 2600
-Wire Wire Line
- 3800 2700 3300 2700
-Wire Wire Line
- 3300 2700 3300 2800
-Wire Wire Line
- 3300 3100 4700 3100
-Wire Wire Line
- 4700 3100 4700 2900
-Text Notes 3500 2600 0 60 ~ 12
-in1
-Text Notes 3450 2800 0 60 ~ 12
-in2\n
-Text Notes 3500 3100 0 60 ~ 12
-in3
-Text Notes 6100 2850 0 60 ~ 12
-out
-$EndSCHEMATC
+EESchema Schematic File Version 2
+LIBS:power
+LIBS:texas
+LIBS:intel
+LIBS:audio
+LIBS:interface
+LIBS:digital-audio
+LIBS:philips
+LIBS:display
+LIBS:cypress
+LIBS:siliconi
+LIBS:opto
+LIBS:atmel
+LIBS:contrib
+LIBS:valves
+LIBS:eSim_Analog
+LIBS:eSim_Devices
+LIBS:eSim_Digital
+LIBS:eSim_Hybrid
+LIBS:eSim_Miscellaneous
+LIBS:eSim_Plot
+LIBS:eSim_Power
+LIBS:eSim_PSpice
+LIBS:eSim_Sources
+LIBS:eSim_Subckt
+LIBS:eSim_User
+EELAYER 25 0
+EELAYER END
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 1 1
+Title ""
+Date ""
+Rev ""
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+$Comp
+L d_and U2
+U 1 1 5C9A24D8
+P 4250 2700
+F 0 "U2" H 4250 2700 60 0000 C CNN
+F 1 "d_and" H 4300 2800 60 0000 C CNN
+F 2 "" H 4250 2700 60 0000 C CNN
+F 3 "" H 4250 2700 60 0000 C CNN
+ 1 4250 2700
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_and U3
+U 1 1 5C9A2538
+P 5150 2900
+F 0 "U3" H 5150 2900 60 0000 C CNN
+F 1 "d_and" H 5200 3000 60 0000 C CNN
+F 2 "" H 5150 2900 60 0000 C CNN
+F 3 "" H 5150 2900 60 0000 C CNN
+ 1 5150 2900
+ 1 0 0 -1
+$EndComp
+$Comp
+L PORT U1
+U 1 1 5C9A259A
+P 3050 2600
+F 0 "U1" H 3100 2700 30 0000 C CNN
+F 1 "PORT" H 3050 2600 30 0000 C CNN
+F 2 "" H 3050 2600 60 0000 C CNN
+F 3 "" H 3050 2600 60 0000 C CNN
+ 1 3050 2600
+ 1 0 0 -1
+$EndComp
+$Comp
+L PORT U1
+U 2 1 5C9A25D9
+P 3050 2800
+F 0 "U1" H 3100 2900 30 0000 C CNN
+F 1 "PORT" H 3050 2800 30 0000 C CNN
+F 2 "" H 3050 2800 60 0000 C CNN
+F 3 "" H 3050 2800 60 0000 C CNN
+ 2 3050 2800
+ 1 0 0 -1
+$EndComp
+$Comp
+L PORT U1
+U 3 1 5C9A260A
+P 3050 3100
+F 0 "U1" H 3100 3200 30 0000 C CNN
+F 1 "PORT" H 3050 3100 30 0000 C CNN
+F 2 "" H 3050 3100 60 0000 C CNN
+F 3 "" H 3050 3100 60 0000 C CNN
+ 3 3050 3100
+ 1 0 0 -1
+$EndComp
+$Comp
+L PORT U1
+U 4 1 5C9A2637
+P 6900 2850
+F 0 "U1" H 6950 2950 30 0000 C CNN
+F 1 "PORT" H 6900 2850 30 0000 C CNN
+F 2 "" H 6900 2850 60 0000 C CNN
+F 3 "" H 6900 2850 60 0000 C CNN
+ 4 6900 2850
+ -1 0 0 1
+$EndComp
+Wire Wire Line
+ 4700 2650 4700 2800
+Wire Wire Line
+ 5600 2850 6650 2850
+Wire Wire Line
+ 3800 2600 3300 2600
+Wire Wire Line
+ 3800 2700 3300 2700
+Wire Wire Line
+ 3300 2700 3300 2800
+Wire Wire Line
+ 3300 3100 4700 3100
+Wire Wire Line
+ 4700 3100 4700 2900
+$EndSCHEMATC
diff --git a/src/SubcircuitLibrary/74153/3_and.sub b/src/SubcircuitLibrary/74153/3_and.sub
index b949ae4f..3d9120bb 100644
--- a/src/SubcircuitLibrary/74153/3_and.sub
+++ b/src/SubcircuitLibrary/74153/3_and.sub
@@ -1,14 +1,14 @@
-* Subcircuit 3_and
-.subckt 3_and net-_u1-pad1_ net-_u1-pad2_ net-_u1-pad3_ net-_u1-pad4_
-* c:\users\malli\esim\src\subcircuitlibrary\3_and\3_and.cir
-* u2 net-_u1-pad1_ net-_u1-pad2_ net-_u2-pad3_ d_and
-* u3 net-_u2-pad3_ net-_u1-pad3_ net-_u1-pad4_ d_and
-a1 [net-_u1-pad1_ net-_u1-pad2_ ] net-_u2-pad3_ u2
-a2 [net-_u2-pad3_ net-_u1-pad3_ ] net-_u1-pad4_ u3
-* Schematic Name: d_and, NgSpice Name: d_and
-.model u2 d_and(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
-* Schematic Name: d_and, NgSpice Name: d_and
-.model u3 d_and(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
-* Control Statements
-
+* Subcircuit 3_and
+.subckt 3_and net-_u1-pad1_ net-_u1-pad2_ net-_u1-pad3_ net-_u1-pad4_
+* c:\users\malli\esim\src\subcircuitlibrary\3_and\3_and.cir
+* u2 net-_u1-pad1_ net-_u1-pad2_ net-_u2-pad3_ d_and
+* u3 net-_u2-pad3_ net-_u1-pad3_ net-_u1-pad4_ d_and
+a1 [net-_u1-pad1_ net-_u1-pad2_ ] net-_u2-pad3_ u2
+a2 [net-_u2-pad3_ net-_u1-pad3_ ] net-_u1-pad4_ u3
+* Schematic Name: d_and, NgSpice Name: d_and
+.model u2 d_and(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
+* Schematic Name: d_and, NgSpice Name: d_and
+.model u3 d_and(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
+* Control Statements
+
.ends 3_and
\ No newline at end of file
diff --git a/src/SubcircuitLibrary/74153/4_OR-cache.lib b/src/SubcircuitLibrary/74153/4_OR-cache.lib
index a3c1c972..155f5e60 100644
--- a/src/SubcircuitLibrary/74153/4_OR-cache.lib
+++ b/src/SubcircuitLibrary/74153/4_OR-cache.lib
@@ -1,63 +1,63 @@
-EESchema-LIBRARY Version 2.3
-#encoding utf-8
-#
-# PORT
-#
-DEF PORT U 0 40 Y Y 26 F N
-F0 "U" 50 100 30 H V C CNN
-F1 "PORT" 0 0 30 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-A 325 225 285 -1421 -1278 0 1 0 N 100 50 150 0
-A 376 -275 356 1294 1408 0 1 0 N 150 0 100 -50
-S -100 50 100 -50 0 1 0 N
-X ~ 1 250 0 100 L 30 30 1 1 B
-X ~ 2 250 0 100 L 30 30 2 1 B
-X ~ 3 250 0 100 L 30 30 3 1 B
-X ~ 4 250 0 100 L 30 30 4 1 B
-X ~ 5 250 0 100 L 30 30 5 1 B
-X ~ 6 250 0 100 L 30 30 6 1 B
-X ~ 7 250 0 100 L 30 30 7 1 B
-X ~ 8 250 0 100 L 30 30 8 1 B
-X ~ 9 250 0 100 L 30 30 9 1 B
-X ~ 10 250 0 100 L 30 30 10 1 B
-X ~ 11 250 0 100 L 30 30 11 1 B
-X ~ 12 250 0 100 L 30 30 12 1 B
-X ~ 13 250 0 100 L 30 30 13 1 B
-X ~ 14 250 0 100 L 30 30 14 1 B
-X ~ 15 250 0 100 L 30 30 15 1 B
-X ~ 16 250 0 100 L 30 30 16 1 B
-X ~ 17 250 0 100 L 30 30 17 1 B
-X ~ 18 250 0 100 L 30 30 18 1 B
-X ~ 19 250 0 100 L 30 30 19 1 B
-X ~ 20 250 0 100 L 30 30 20 1 B
-X ~ 21 250 0 100 L 30 30 21 1 B
-X ~ 22 250 0 100 L 30 30 22 1 B
-X ~ 23 250 0 100 L 30 30 23 1 B
-X ~ 24 250 0 100 L 30 30 24 1 B
-X ~ 25 250 0 100 L 30 30 25 1 B
-X ~ 26 250 0 100 L 30 30 26 1 B
-ENDDRAW
-ENDDEF
-#
-# d_or
-#
-DEF d_or U 0 40 Y Y 1 F N
-F0 "U" 0 0 60 H V C CNN
-F1 "d_or" 0 100 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-A -450 50 224 266 -266 0 1 0 N -250 150 -250 -50
-A -25 -124 325 574 323 0 1 0 N 150 150 250 50
-A 74 125 191 -665 -231 0 1 0 N 150 -50 250 50
-P 2 0 1 0 -250 -50 150 -50 N
-P 2 0 1 0 -250 150 150 150 N
-X IN1 1 -450 100 215 R 50 50 1 1 I
-X IN2 2 -450 0 215 R 50 50 1 1 I
-X OUT 3 450 50 200 L 50 50 1 1 O
-ENDDRAW
-ENDDEF
-#
-#End Library
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# PORT
+#
+DEF PORT U 0 40 Y Y 26 F N
+F0 "U" 50 100 30 H V C CNN
+F1 "PORT" 0 0 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A 325 225 285 -1421 -1278 0 1 0 N 100 50 150 0
+A 376 -275 356 1294 1408 0 1 0 N 150 0 100 -50
+S -100 50 100 -50 0 1 0 N
+X ~ 1 250 0 100 L 30 30 1 1 B
+X ~ 2 250 0 100 L 30 30 2 1 B
+X ~ 3 250 0 100 L 30 30 3 1 B
+X ~ 4 250 0 100 L 30 30 4 1 B
+X ~ 5 250 0 100 L 30 30 5 1 B
+X ~ 6 250 0 100 L 30 30 6 1 B
+X ~ 7 250 0 100 L 30 30 7 1 B
+X ~ 8 250 0 100 L 30 30 8 1 B
+X ~ 9 250 0 100 L 30 30 9 1 B
+X ~ 10 250 0 100 L 30 30 10 1 B
+X ~ 11 250 0 100 L 30 30 11 1 B
+X ~ 12 250 0 100 L 30 30 12 1 B
+X ~ 13 250 0 100 L 30 30 13 1 B
+X ~ 14 250 0 100 L 30 30 14 1 B
+X ~ 15 250 0 100 L 30 30 15 1 B
+X ~ 16 250 0 100 L 30 30 16 1 B
+X ~ 17 250 0 100 L 30 30 17 1 B
+X ~ 18 250 0 100 L 30 30 18 1 B
+X ~ 19 250 0 100 L 30 30 19 1 B
+X ~ 20 250 0 100 L 30 30 20 1 B
+X ~ 21 250 0 100 L 30 30 21 1 B
+X ~ 22 250 0 100 L 30 30 22 1 B
+X ~ 23 250 0 100 L 30 30 23 1 B
+X ~ 24 250 0 100 L 30 30 24 1 B
+X ~ 25 250 0 100 L 30 30 25 1 B
+X ~ 26 250 0 100 L 30 30 26 1 B
+ENDDRAW
+ENDDEF
+#
+# d_or
+#
+DEF d_or U 0 40 Y Y 1 F N
+F0 "U" 0 0 60 H V C CNN
+F1 "d_or" 0 100 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A -450 50 224 266 -266 0 1 0 N -250 150 -250 -50
+A -25 -124 325 574 323 0 1 0 N 150 150 250 50
+A 74 125 191 -665 -231 0 1 0 N 150 -50 250 50
+P 2 0 1 0 -250 -50 150 -50 N
+P 2 0 1 0 -250 150 150 150 N
+X IN1 1 -450 100 215 R 50 50 1 1 I
+X IN2 2 -450 0 215 R 50 50 1 1 I
+X OUT 3 450 50 200 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/src/SubcircuitLibrary/74153/4_OR.cir b/src/SubcircuitLibrary/74153/4_OR.cir
index 7adbf177..b338b7b5 100644
--- a/src/SubcircuitLibrary/74153/4_OR.cir
+++ b/src/SubcircuitLibrary/74153/4_OR.cir
@@ -1,14 +1,14 @@
-* C:\Users\malli\eSim\src\SubcircuitLibrary\4_OR\4_OR.cir
-
-* EESchema Netlist Version 1.1 (Spice format) creation date: 03/28/19 22:47:12
-
-* To exclude a component from the Spice Netlist add [Spice_Netlist_Enabled] user FIELD set to: N
-* To reorder the component spice node sequence add [Spice_Node_Sequence] user FIELD and define sequence: 2,1,0
-
-* Sheet Name: /
-U2 Net-_U1-Pad1_ Net-_U1-Pad2_ Net-_U2-Pad3_ d_or
-U3 Net-_U1-Pad3_ Net-_U1-Pad4_ Net-_U3-Pad3_ d_or
-U4 Net-_U2-Pad3_ Net-_U3-Pad3_ Net-_U1-Pad5_ d_or
-U1 Net-_U1-Pad1_ Net-_U1-Pad2_ Net-_U1-Pad3_ Net-_U1-Pad4_ Net-_U1-Pad5_ PORT
-
-.end
+* C:\Users\malli\eSim\src\SubcircuitLibrary\4_OR\4_OR.cir
+
+* EESchema Netlist Version 1.1 (Spice format) creation date: 03/28/19 22:47:12
+
+* To exclude a component from the Spice Netlist add [Spice_Netlist_Enabled] user FIELD set to: N
+* To reorder the component spice node sequence add [Spice_Node_Sequence] user FIELD and define sequence: 2,1,0
+
+* Sheet Name: /
+U2 Net-_U1-Pad1_ Net-_U1-Pad2_ Net-_U2-Pad3_ d_or
+U3 Net-_U1-Pad3_ Net-_U1-Pad4_ Net-_U3-Pad3_ d_or
+U4 Net-_U2-Pad3_ Net-_U3-Pad3_ Net-_U1-Pad5_ d_or
+U1 Net-_U1-Pad1_ Net-_U1-Pad2_ Net-_U1-Pad3_ Net-_U1-Pad4_ Net-_U1-Pad5_ PORT
+
+.end
diff --git a/src/SubcircuitLibrary/74153/4_OR.cir.out b/src/SubcircuitLibrary/74153/4_OR.cir.out
index 4388b975..adb6b01b 100644
--- a/src/SubcircuitLibrary/74153/4_OR.cir.out
+++ b/src/SubcircuitLibrary/74153/4_OR.cir.out
@@ -1,24 +1,24 @@
-* c:\users\malli\esim\src\subcircuitlibrary\4_or\4_or.cir
-
-* u2 net-_u1-pad1_ net-_u1-pad2_ net-_u2-pad3_ d_or
-* u3 net-_u1-pad3_ net-_u1-pad4_ net-_u3-pad3_ d_or
-* u4 net-_u2-pad3_ net-_u3-pad3_ net-_u1-pad5_ d_or
-* u1 net-_u1-pad1_ net-_u1-pad2_ net-_u1-pad3_ net-_u1-pad4_ net-_u1-pad5_ port
-a1 [net-_u1-pad1_ net-_u1-pad2_ ] net-_u2-pad3_ u2
-a2 [net-_u1-pad3_ net-_u1-pad4_ ] net-_u3-pad3_ u3
-a3 [net-_u2-pad3_ net-_u3-pad3_ ] net-_u1-pad5_ u4
-* Schematic Name: d_or, NgSpice Name: d_or
-.model u2 d_or(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
-* Schematic Name: d_or, NgSpice Name: d_or
-.model u3 d_or(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
-* Schematic Name: d_or, NgSpice Name: d_or
-.model u4 d_or(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
-.tran 0e-00 0e-00 0e-00
-
-* Control Statements
-.control
-run
-print allv > plot_data_v.txt
-print alli > plot_data_i.txt
-.endc
-.end
+* c:\users\malli\esim\src\subcircuitlibrary\4_or\4_or.cir
+
+* u2 net-_u1-pad1_ net-_u1-pad2_ net-_u2-pad3_ d_or
+* u3 net-_u1-pad3_ net-_u1-pad4_ net-_u3-pad3_ d_or
+* u4 net-_u2-pad3_ net-_u3-pad3_ net-_u1-pad5_ d_or
+* u1 net-_u1-pad1_ net-_u1-pad2_ net-_u1-pad3_ net-_u1-pad4_ net-_u1-pad5_ port
+a1 [net-_u1-pad1_ net-_u1-pad2_ ] net-_u2-pad3_ u2
+a2 [net-_u1-pad3_ net-_u1-pad4_ ] net-_u3-pad3_ u3
+a3 [net-_u2-pad3_ net-_u3-pad3_ ] net-_u1-pad5_ u4
+* Schematic Name: d_or, NgSpice Name: d_or
+.model u2 d_or(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
+* Schematic Name: d_or, NgSpice Name: d_or
+.model u3 d_or(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
+* Schematic Name: d_or, NgSpice Name: d_or
+.model u4 d_or(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
+.tran 0e-00 0e-00 0e-00
+
+* Control Statements
+.control
+run
+print allv > plot_data_v.txt
+print alli > plot_data_i.txt
+.endc
+.end
diff --git a/src/SubcircuitLibrary/74153/4_OR.pro b/src/SubcircuitLibrary/74153/4_OR.pro
index 1e19b3a7..2c258cec 100644
--- a/src/SubcircuitLibrary/74153/4_OR.pro
+++ b/src/SubcircuitLibrary/74153/4_OR.pro
@@ -1,45 +1,45 @@
-update=06/01/19 12:36:09
-version=1
-last_client=eeschema
-[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=../../../kicadSchematicLibrary
-[eeschema/libraries]
-LibName1=power
-LibName2=eSim_Analog
-LibName3=eSim_Devices
-LibName4=eSim_Digital
-LibName5=eSim_Hybrid
-LibName6=eSim_Miscellaneous
-LibName7=eSim_Plot
-LibName8=eSim_Power
-LibName9=eSim_PSpice
-LibName10=eSim_Sources
-LibName11=eSim_Subckt
-LibName12=eSim_User
+update=03/28/19 22:43:48
+version=1
+last_client=eeschema
+[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=power
+LibName2=eSim_Analog
+LibName3=eSim_Devices
+LibName4=eSim_Digital
+LibName5=eSim_Hybrid
+LibName6=eSim_Miscellaneous
+LibName7=eSim_Plot
+LibName8=eSim_Power
+LibName9=eSim_PSpice
+LibName10=eSim_Sources
+LibName11=eSim_Subckt
+LibName12=eSim_User
diff --git a/src/SubcircuitLibrary/74153/4_OR.sch b/src/SubcircuitLibrary/74153/4_OR.sch
index 2f28896c..11896865 100644
--- a/src/SubcircuitLibrary/74153/4_OR.sch
+++ b/src/SubcircuitLibrary/74153/4_OR.sch
@@ -1,150 +1,150 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:eSim_Analog
-LIBS:eSim_Devices
-LIBS:eSim_Digital
-LIBS:eSim_Hybrid
-LIBS:eSim_Miscellaneous
-LIBS:eSim_Plot
-LIBS:eSim_Power
-LIBS:eSim_PSpice
-LIBS:eSim_Sources
-LIBS:eSim_Subckt
-LIBS:eSim_User
-EELAYER 25 0
-EELAYER END
-$Descr A4 11693 8268
-encoding utf-8
-Sheet 1 1
-Title ""
-Date ""
-Rev ""
-Comp ""
-Comment1 ""
-Comment2 ""
-Comment3 ""
-Comment4 ""
-$EndDescr
-$Comp
-L d_or U2
-U 1 1 5C9D00E1
-P 4300 2950
-F 0 "U2" H 4300 2950 60 0000 C CNN
-F 1 "d_or" H 4300 3050 60 0000 C CNN
-F 2 "" H 4300 2950 60 0000 C CNN
-F 3 "" H 4300 2950 60 0000 C CNN
- 1 4300 2950
- 1 0 0 -1
-$EndComp
-$Comp
-L d_or U3
-U 1 1 5C9D011F
-P 4300 3350
-F 0 "U3" H 4300 3350 60 0000 C CNN
-F 1 "d_or" H 4300 3450 60 0000 C CNN
-F 2 "" H 4300 3350 60 0000 C CNN
-F 3 "" H 4300 3350 60 0000 C CNN
- 1 4300 3350
- 1 0 0 -1
-$EndComp
-$Comp
-L d_or U4
-U 1 1 5C9D0141
-P 5250 3150
-F 0 "U4" H 5250 3150 60 0000 C CNN
-F 1 "d_or" H 5250 3250 60 0000 C CNN
-F 2 "" H 5250 3150 60 0000 C CNN
-F 3 "" H 5250 3150 60 0000 C CNN
- 1 5250 3150
- 1 0 0 -1
-$EndComp
-Wire Wire Line
- 4800 3050 4800 2900
-Wire Wire Line
- 4800 2900 4750 2900
-Wire Wire Line
- 4800 3150 4800 3300
-Wire Wire Line
- 4800 3300 4750 3300
-Wire Wire Line
- 3350 2850 3850 2850
-Wire Wire Line
- 3850 2950 3600 2950
-Wire Wire Line
- 3850 3250 3350 3250
-Wire Wire Line
- 3600 2950 3600 3000
-Wire Wire Line
- 3600 3000 3350 3000
-Wire Wire Line
- 3850 3350 3850 3400
-Wire Wire Line
- 3850 3400 3350 3400
-Wire Wire Line
- 5700 3100 6200 3100
-$Comp
-L PORT U1
-U 1 1 5C9D01F4
-P 3100 2850
-F 0 "U1" H 3150 2950 30 0000 C CNN
-F 1 "PORT" H 3100 2850 30 0000 C CNN
-F 2 "" H 3100 2850 60 0000 C CNN
-F 3 "" H 3100 2850 60 0000 C CNN
- 1 3100 2850
- 1 0 0 -1
-$EndComp
-$Comp
-L PORT U1
-U 2 1 5C9D022F
-P 3100 3000
-F 0 "U1" H 3150 3100 30 0000 C CNN
-F 1 "PORT" H 3100 3000 30 0000 C CNN
-F 2 "" H 3100 3000 60 0000 C CNN
-F 3 "" H 3100 3000 60 0000 C CNN
- 2 3100 3000
- 1 0 0 -1
-$EndComp
-$Comp
-L PORT U1
-U 3 1 5C9D0271
-P 3100 3250
-F 0 "U1" H 3150 3350 30 0000 C CNN
-F 1 "PORT" H 3100 3250 30 0000 C CNN
-F 2 "" H 3100 3250 60 0000 C CNN
-F 3 "" H 3100 3250 60 0000 C CNN
- 3 3100 3250
- 1 0 0 -1
-$EndComp
-$Comp
-L PORT U1
-U 4 1 5C9D0299
-P 3100 3400
-F 0 "U1" H 3150 3500 30 0000 C CNN
-F 1 "PORT" H 3100 3400 30 0000 C CNN
-F 2 "" H 3100 3400 60 0000 C CNN
-F 3 "" H 3100 3400 60 0000 C CNN
- 4 3100 3400
- 1 0 0 -1
-$EndComp
-$Comp
-L PORT U1
-U 5 1 5C9D02C2
-P 6450 3100
-F 0 "U1" H 6500 3200 30 0000 C CNN
-F 1 "PORT" H 6450 3100 30 0000 C CNN
-F 2 "" H 6450 3100 60 0000 C CNN
-F 3 "" H 6450 3100 60 0000 C CNN
- 5 6450 3100
- -1 0 0 1
-$EndComp
-Text Notes 3450 2850 0 60 ~ 12
-in1
-Text Notes 3450 3000 0 60 ~ 12
-in2
-Text Notes 3450 3250 0 60 ~ 12
-in3
-Text Notes 3450 3400 0 60 ~ 12
-in4
-Text Notes 5800 3100 0 60 ~ 12
-out
-$EndSCHEMATC
+EESchema Schematic File Version 2
+LIBS:power
+LIBS:eSim_Analog
+LIBS:eSim_Devices
+LIBS:eSim_Digital
+LIBS:eSim_Hybrid
+LIBS:eSim_Miscellaneous
+LIBS:eSim_Plot
+LIBS:eSim_Power
+LIBS:eSim_PSpice
+LIBS:eSim_Sources
+LIBS:eSim_Subckt
+LIBS:eSim_User
+EELAYER 25 0
+EELAYER END
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 1 1
+Title ""
+Date ""
+Rev ""
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+$Comp
+L d_or U2
+U 1 1 5C9D00E1
+P 4300 2950
+F 0 "U2" H 4300 2950 60 0000 C CNN
+F 1 "d_or" H 4300 3050 60 0000 C CNN
+F 2 "" H 4300 2950 60 0000 C CNN
+F 3 "" H 4300 2950 60 0000 C CNN
+ 1 4300 2950
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_or U3
+U 1 1 5C9D011F
+P 4300 3350
+F 0 "U3" H 4300 3350 60 0000 C CNN
+F 1 "d_or" H 4300 3450 60 0000 C CNN
+F 2 "" H 4300 3350 60 0000 C CNN
+F 3 "" H 4300 3350 60 0000 C CNN
+ 1 4300 3350
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_or U4
+U 1 1 5C9D0141
+P 5250 3150
+F 0 "U4" H 5250 3150 60 0000 C CNN
+F 1 "d_or" H 5250 3250 60 0000 C CNN
+F 2 "" H 5250 3150 60 0000 C CNN
+F 3 "" H 5250 3150 60 0000 C CNN
+ 1 5250 3150
+ 1 0 0 -1
+$EndComp
+Wire Wire Line
+ 4800 3050 4800 2900
+Wire Wire Line
+ 4800 2900 4750 2900
+Wire Wire Line
+ 4800 3150 4800 3300
+Wire Wire Line
+ 4800 3300 4750 3300
+Wire Wire Line
+ 3350 2850 3850 2850
+Wire Wire Line
+ 3850 2950 3600 2950
+Wire Wire Line
+ 3850 3250 3350 3250
+Wire Wire Line
+ 3600 2950 3600 3000
+Wire Wire Line
+ 3600 3000 3350 3000
+Wire Wire Line
+ 3850 3350 3850 3400
+Wire Wire Line
+ 3850 3400 3350 3400
+Wire Wire Line
+ 5700 3100 6200 3100
+$Comp
+L PORT U1
+U 1 1 5C9D01F4
+P 3100 2850
+F 0 "U1" H 3150 2950 30 0000 C CNN
+F 1 "PORT" H 3100 2850 30 0000 C CNN
+F 2 "" H 3100 2850 60 0000 C CNN
+F 3 "" H 3100 2850 60 0000 C CNN
+ 1 3100 2850
+ 1 0 0 -1
+$EndComp
+$Comp
+L PORT U1
+U 2 1 5C9D022F
+P 3100 3000
+F 0 "U1" H 3150 3100 30 0000 C CNN
+F 1 "PORT" H 3100 3000 30 0000 C CNN
+F 2 "" H 3100 3000 60 0000 C CNN
+F 3 "" H 3100 3000 60 0000 C CNN
+ 2 3100 3000
+ 1 0 0 -1
+$EndComp
+$Comp
+L PORT U1
+U 3 1 5C9D0271
+P 3100 3250
+F 0 "U1" H 3150 3350 30 0000 C CNN
+F 1 "PORT" H 3100 3250 30 0000 C CNN
+F 2 "" H 3100 3250 60 0000 C CNN
+F 3 "" H 3100 3250 60 0000 C CNN
+ 3 3100 3250
+ 1 0 0 -1
+$EndComp
+$Comp
+L PORT U1
+U 4 1 5C9D0299
+P 3100 3400
+F 0 "U1" H 3150 3500 30 0000 C CNN
+F 1 "PORT" H 3100 3400 30 0000 C CNN
+F 2 "" H 3100 3400 60 0000 C CNN
+F 3 "" H 3100 3400 60 0000 C CNN
+ 4 3100 3400
+ 1 0 0 -1
+$EndComp
+$Comp
+L PORT U1
+U 5 1 5C9D02C2
+P 6450 3100
+F 0 "U1" H 6500 3200 30 0000 C CNN
+F 1 "PORT" H 6450 3100 30 0000 C CNN
+F 2 "" H 6450 3100 60 0000 C CNN
+F 3 "" H 6450 3100 60 0000 C CNN
+ 5 6450 3100
+ -1 0 0 1
+$EndComp
+Text Notes 3450 2850 0 60 ~ 12
+in1
+Text Notes 3450 3000 0 60 ~ 12
+in2
+Text Notes 3450 3250 0 60 ~ 12
+in3
+Text Notes 3450 3400 0 60 ~ 12
+in4
+Text Notes 5800 3100 0 60 ~ 12
+out
+$EndSCHEMATC
diff --git a/src/SubcircuitLibrary/74153/4_OR.sub b/src/SubcircuitLibrary/74153/4_OR.sub
index 53fc8b33..d1fd3a24 100644
--- a/src/SubcircuitLibrary/74153/4_OR.sub
+++ b/src/SubcircuitLibrary/74153/4_OR.sub
@@ -1,18 +1,18 @@
-* Subcircuit 4_OR
-.subckt 4_OR net-_u1-pad1_ net-_u1-pad2_ net-_u1-pad3_ net-_u1-pad4_ net-_u1-pad5_
-* c:\users\malli\esim\src\subcircuitlibrary\4_or\4_or.cir
-* u2 net-_u1-pad1_ net-_u1-pad2_ net-_u2-pad3_ d_or
-* u3 net-_u1-pad3_ net-_u1-pad4_ net-_u3-pad3_ d_or
-* u4 net-_u2-pad3_ net-_u3-pad3_ net-_u1-pad5_ d_or
-a1 [net-_u1-pad1_ net-_u1-pad2_ ] net-_u2-pad3_ u2
-a2 [net-_u1-pad3_ net-_u1-pad4_ ] net-_u3-pad3_ u3
-a3 [net-_u2-pad3_ net-_u3-pad3_ ] net-_u1-pad5_ u4
-* Schematic Name: d_or, NgSpice Name: d_or
-.model u2 d_or(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
-* Schematic Name: d_or, NgSpice Name: d_or
-.model u3 d_or(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
-* Schematic Name: d_or, NgSpice Name: d_or
-.model u4 d_or(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
-* Control Statements
-
+* Subcircuit 4_OR
+.subckt 4_OR net-_u1-pad1_ net-_u1-pad2_ net-_u1-pad3_ net-_u1-pad4_ net-_u1-pad5_
+* c:\users\malli\esim\src\subcircuitlibrary\4_or\4_or.cir
+* u2 net-_u1-pad1_ net-_u1-pad2_ net-_u2-pad3_ d_or
+* u3 net-_u1-pad3_ net-_u1-pad4_ net-_u3-pad3_ d_or
+* u4 net-_u2-pad3_ net-_u3-pad3_ net-_u1-pad5_ d_or
+a1 [net-_u1-pad1_ net-_u1-pad2_ ] net-_u2-pad3_ u2
+a2 [net-_u1-pad3_ net-_u1-pad4_ ] net-_u3-pad3_ u3
+a3 [net-_u2-pad3_ net-_u3-pad3_ ] net-_u1-pad5_ u4
+* Schematic Name: d_or, NgSpice Name: d_or
+.model u2 d_or(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
+* Schematic Name: d_or, NgSpice Name: d_or
+.model u3 d_or(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
+* Schematic Name: d_or, NgSpice Name: d_or
+.model u4 d_or(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
+* Control Statements
+
.ends 4_OR
\ No newline at end of file
diff --git a/src/SubcircuitLibrary/74153/4_OR_Previous_Values.xml b/src/SubcircuitLibrary/74153/4_OR_Previous_Values.xml
index 0683d9eb..23698d37 100644
--- a/src/SubcircuitLibrary/74153/4_OR_Previous_Values.xml
+++ b/src/SubcircuitLibrary/74153/4_OR_Previous_Values.xml
@@ -1 +1 @@
-d_ord_ord_ortruefalsefalseHzHz0Volts or AmperesVolts or AmperesVolts or AmperesVolts or AmperesVolts or AmperesVolts or AmperesSecSecSec
\ No newline at end of file
+truefalsefalseHzHz0Volts or AmperesVolts or AmperesVolts or AmperesVolts or AmperesVolts or AmperesVolts or AmperesSecSecSecd_ord_ord_or
\ No newline at end of file
diff --git a/src/SubcircuitLibrary/74153/4_and-cache.lib b/src/SubcircuitLibrary/74153/4_and-cache.lib
index cb84d8f2..ac396288 100644
--- a/src/SubcircuitLibrary/74153/4_and-cache.lib
+++ b/src/SubcircuitLibrary/74153/4_and-cache.lib
@@ -1,79 +1,79 @@
-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
-#
-# PORT
-#
-DEF PORT U 0 40 Y Y 26 F N
-F0 "U" 50 100 30 H V C CNN
-F1 "PORT" 0 0 30 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-A 325 225 285 -1421 -1278 0 1 0 N 100 50 150 0
-A 376 -275 356 1294 1408 0 1 0 N 150 0 100 -50
-S -100 50 100 -50 0 1 0 N
-X ~ 1 250 0 100 L 30 30 1 1 B
-X ~ 2 250 0 100 L 30 30 2 1 B
-X ~ 3 250 0 100 L 30 30 3 1 B
-X ~ 4 250 0 100 L 30 30 4 1 B
-X ~ 5 250 0 100 L 30 30 5 1 B
-X ~ 6 250 0 100 L 30 30 6 1 B
-X ~ 7 250 0 100 L 30 30 7 1 B
-X ~ 8 250 0 100 L 30 30 8 1 B
-X ~ 9 250 0 100 L 30 30 9 1 B
-X ~ 10 250 0 100 L 30 30 10 1 B
-X ~ 11 250 0 100 L 30 30 11 1 B
-X ~ 12 250 0 100 L 30 30 12 1 B
-X ~ 13 250 0 100 L 30 30 13 1 B
-X ~ 14 250 0 100 L 30 30 14 1 B
-X ~ 15 250 0 100 L 30 30 15 1 B
-X ~ 16 250 0 100 L 30 30 16 1 B
-X ~ 17 250 0 100 L 30 30 17 1 B
-X ~ 18 250 0 100 L 30 30 18 1 B
-X ~ 19 250 0 100 L 30 30 19 1 B
-X ~ 20 250 0 100 L 30 30 20 1 B
-X ~ 21 250 0 100 L 30 30 21 1 B
-X ~ 22 250 0 100 L 30 30 22 1 B
-X ~ 23 250 0 100 L 30 30 23 1 B
-X ~ 24 250 0 100 L 30 30 24 1 B
-X ~ 25 250 0 100 L 30 30 25 1 B
-X ~ 26 250 0 100 L 30 30 26 1 B
-ENDDRAW
-ENDDEF
-#
-# d_and
-#
-DEF d_and U 0 40 Y Y 1 F N
-F0 "U" 0 0 60 H V C CNN
-F1 "d_and" 50 100 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-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
-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
-ENDDRAW
-ENDDEF
-#
-#End Library
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# 3_and
+#
+DEF 3_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
+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
+#
+# PORT
+#
+DEF PORT U 0 40 Y Y 26 F N
+F0 "U" 50 100 30 H V C CNN
+F1 "PORT" 0 0 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A 325 225 285 -1421 -1278 0 1 0 N 100 50 150 0
+A 376 -275 356 1294 1408 0 1 0 N 150 0 100 -50
+S -100 50 100 -50 0 1 0 N
+X ~ 1 250 0 100 L 30 30 1 1 B
+X ~ 2 250 0 100 L 30 30 2 1 B
+X ~ 3 250 0 100 L 30 30 3 1 B
+X ~ 4 250 0 100 L 30 30 4 1 B
+X ~ 5 250 0 100 L 30 30 5 1 B
+X ~ 6 250 0 100 L 30 30 6 1 B
+X ~ 7 250 0 100 L 30 30 7 1 B
+X ~ 8 250 0 100 L 30 30 8 1 B
+X ~ 9 250 0 100 L 30 30 9 1 B
+X ~ 10 250 0 100 L 30 30 10 1 B
+X ~ 11 250 0 100 L 30 30 11 1 B
+X ~ 12 250 0 100 L 30 30 12 1 B
+X ~ 13 250 0 100 L 30 30 13 1 B
+X ~ 14 250 0 100 L 30 30 14 1 B
+X ~ 15 250 0 100 L 30 30 15 1 B
+X ~ 16 250 0 100 L 30 30 16 1 B
+X ~ 17 250 0 100 L 30 30 17 1 B
+X ~ 18 250 0 100 L 30 30 18 1 B
+X ~ 19 250 0 100 L 30 30 19 1 B
+X ~ 20 250 0 100 L 30 30 20 1 B
+X ~ 21 250 0 100 L 30 30 21 1 B
+X ~ 22 250 0 100 L 30 30 22 1 B
+X ~ 23 250 0 100 L 30 30 23 1 B
+X ~ 24 250 0 100 L 30 30 24 1 B
+X ~ 25 250 0 100 L 30 30 25 1 B
+X ~ 26 250 0 100 L 30 30 26 1 B
+ENDDRAW
+ENDDEF
+#
+# d_and
+#
+DEF d_and U 0 40 Y Y 1 F N
+F0 "U" 0 0 60 H V C CNN
+F1 "d_and" 50 100 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+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
+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
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/src/SubcircuitLibrary/74153/4_and.cir b/src/SubcircuitLibrary/74153/4_and.cir
index 35e46097..50d490fa 100644
--- a/src/SubcircuitLibrary/74153/4_and.cir
+++ b/src/SubcircuitLibrary/74153/4_and.cir
@@ -1,13 +1,13 @@
-* C:\Users\malli\eSim\src\SubcircuitLibrary\4_and\4_and.cir
-
-* EESchema Netlist Version 1.1 (Spice format) creation date: 06/01/19 13:09:58
-
-* To exclude a component from the Spice Netlist add [Spice_Netlist_Enabled] user FIELD set to: N
-* To reorder the component spice node sequence add [Spice_Node_Sequence] user FIELD and define sequence: 2,1,0
-
-* Sheet Name: /
-X1 Net-_U1-Pad1_ Net-_U1-Pad2_ Net-_U1-Pad3_ Net-_U2-Pad1_ 3_and
-U2 Net-_U2-Pad1_ Net-_U1-Pad4_ Net-_U1-Pad5_ d_and
-U1 Net-_U1-Pad1_ Net-_U1-Pad2_ Net-_U1-Pad3_ Net-_U1-Pad4_ Net-_U1-Pad5_ PORT
-
-.end
+* C:\Users\malli\eSim\src\SubcircuitLibrary\4_and\4_and.cir
+
+* EESchema Netlist Version 1.1 (Spice format) creation date: 03/26/19 19:01:09
+
+* To exclude a component from the Spice Netlist add [Spice_Netlist_Enabled] user FIELD set to: N
+* To reorder the component spice node sequence add [Spice_Node_Sequence] user FIELD and define sequence: 2,1,0
+
+* Sheet Name: /
+X1 Net-_U1-Pad1_ Net-_U1-Pad2_ Net-_U1-Pad3_ Net-_U2-Pad1_ 3_and
+U2 Net-_U2-Pad1_ Net-_U1-Pad4_ Net-_U1-Pad5_ d_and
+U1 Net-_U1-Pad1_ Net-_U1-Pad2_ Net-_U1-Pad3_ Net-_U1-Pad4_ Net-_U1-Pad5_ PORT
+
+.end
diff --git a/src/SubcircuitLibrary/74153/4_and.cir.out b/src/SubcircuitLibrary/74153/4_and.cir.out
index 6e35b18a..f40e5bc6 100644
--- a/src/SubcircuitLibrary/74153/4_and.cir.out
+++ b/src/SubcircuitLibrary/74153/4_and.cir.out
@@ -1,18 +1,18 @@
-* c:\users\malli\esim\src\subcircuitlibrary\4_and\4_and.cir
-
-.include 3_and.sub
-x1 net-_u1-pad1_ net-_u1-pad2_ net-_u1-pad3_ net-_u2-pad1_ 3_and
-* u2 net-_u2-pad1_ net-_u1-pad4_ net-_u1-pad5_ d_and
-* u1 net-_u1-pad1_ net-_u1-pad2_ net-_u1-pad3_ net-_u1-pad4_ net-_u1-pad5_ port
-a1 [net-_u2-pad1_ net-_u1-pad4_ ] net-_u1-pad5_ u2
-* Schematic Name: d_and, NgSpice Name: d_and
-.model u2 d_and(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
-.tran 0e-00 0e-00 0e-00
-
-* Control Statements
-.control
-run
-print allv > plot_data_v.txt
-print alli > plot_data_i.txt
-.endc
-.end
+* c:\users\malli\esim\src\subcircuitlibrary\4_and\4_and.cir
+
+.include 3_and.sub
+x1 net-_u1-pad1_ net-_u1-pad2_ net-_u1-pad3_ net-_u2-pad1_ 3_and
+* u2 net-_u2-pad1_ net-_u1-pad4_ net-_u1-pad5_ d_and
+* u1 net-_u1-pad1_ net-_u1-pad2_ net-_u1-pad3_ net-_u1-pad4_ net-_u1-pad5_ port
+a1 [net-_u2-pad1_ net-_u1-pad4_ ] net-_u1-pad5_ u2
+* Schematic Name: d_and, NgSpice Name: d_and
+.model u2 d_and(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
+.tran 0e-00 0e-00 0e-00
+
+* Control Statements
+.control
+run
+print allv > plot_data_v.txt
+print alli > plot_data_i.txt
+.endc
+.end
diff --git a/src/SubcircuitLibrary/74153/4_and.pro b/src/SubcircuitLibrary/74153/4_and.pro
index 814ad76a..6eb77fff 100644
--- a/src/SubcircuitLibrary/74153/4_and.pro
+++ b/src/SubcircuitLibrary/74153/4_and.pro
@@ -1,58 +1,57 @@
-update=06/01/19 15:08:42
-version=1
-last_client=eeschema
-[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=../../../kicadSchematicLibrary
-[eeschema/libraries]
-LibName1=4_and-rescue
-LibName2=texas
-LibName3=intel
-LibName4=audio
-LibName5=interface
-LibName6=digital-audio
-LibName7=philips
-LibName8=display
-LibName9=cypress
-LibName10=siliconi
-LibName11=opto
-LibName12=atmel
-LibName13=contrib
-LibName14=valves
-LibName15=eSim_Analog
-LibName16=eSim_Devices
-LibName17=eSim_Digital
-LibName18=eSim_Hybrid
-LibName19=eSim_Miscellaneous
-LibName20=eSim_Plot
-LibName21=eSim_Power
-LibName22=eSim_PSpice
-LibName23=eSim_Sources
-LibName24=eSim_Subckt
-LibName25=eSim_User
+update=03/26/19 18:58:33
+version=1
+last_client=eeschema
+[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=texas
+LibName2=intel
+LibName3=audio
+LibName4=interface
+LibName5=digital-audio
+LibName6=philips
+LibName7=display
+LibName8=cypress
+LibName9=siliconi
+LibName10=opto
+LibName11=atmel
+LibName12=contrib
+LibName13=valves
+LibName14=eSim_Analog
+LibName15=eSim_Devices
+LibName16=eSim_Digital
+LibName17=eSim_Hybrid
+LibName18=eSim_Miscellaneous
+LibName19=eSim_Plot
+LibName20=eSim_Power
+LibName21=eSim_PSpice
+LibName22=eSim_Sources
+LibName23=eSim_Subckt
+LibName24=eSim_User
diff --git a/src/SubcircuitLibrary/74153/4_and.sch b/src/SubcircuitLibrary/74153/4_and.sch
index 2d8296d4..883458e1 100644
--- a/src/SubcircuitLibrary/74153/4_and.sch
+++ b/src/SubcircuitLibrary/74153/4_and.sch
@@ -1,151 +1,139 @@
-EESchema Schematic File Version 2
-LIBS:4_and-rescue
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:eSim_Analog
-LIBS:eSim_Devices
-LIBS:eSim_Digital
-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
-encoding utf-8
-Sheet 1 1
-Title ""
-Date ""
-Rev ""
-Comp ""
-Comment1 ""
-Comment2 ""
-Comment3 ""
-Comment4 ""
-$EndDescr
-$Comp
-L 3_and-RESCUE-4_and X1
-U 1 1 5C9A2915
-P 3700 3500
-F 0 "X1" H 4600 3800 60 0000 C CNN
-F 1 "3_and" H 4650 4000 60 0000 C CNN
-F 2 "" H 3700 3500 60 0000 C CNN
-F 3 "" H 3700 3500 60 0000 C CNN
- 1 3700 3500
- 1 0 0 -1
-$EndComp
-$Comp
-L d_and U2
-U 1 1 5C9A2940
-P 5450 3400
-F 0 "U2" H 5450 3400 60 0000 C CNN
-F 1 "d_and" H 5500 3500 60 0000 C CNN
-F 2 "" H 5450 3400 60 0000 C CNN
-F 3 "" H 5450 3400 60 0000 C CNN
- 1 5450 3400
- 1 0 0 -1
-$EndComp
-Wire Wire Line
- 5000 3100 5000 3300
-Wire Wire Line
- 4150 3000 4150 2700
-Wire Wire Line
- 4150 2700 3200 2700
-Wire Wire Line
- 4150 3100 4000 3100
-Wire Wire Line
- 4000 3100 4000 3000
-Wire Wire Line
- 4000 3000 3200 3000
-Wire Wire Line
- 4150 3200 4150 3300
-Wire Wire Line
- 4150 3300 3250 3300
-Wire Wire Line
- 5000 3400 5000 3550
-Wire Wire Line
- 5000 3550 3250 3550
-Wire Wire Line
- 5900 3350 6500 3350
-$Comp
-L PORT U1
-U 1 1 5C9A29B1
-P 2950 2700
-F 0 "U1" H 3000 2800 30 0000 C CNN
-F 1 "PORT" H 2950 2700 30 0000 C CNN
-F 2 "" H 2950 2700 60 0000 C CNN
-F 3 "" H 2950 2700 60 0000 C CNN
- 1 2950 2700
- 1 0 0 -1
-$EndComp
-$Comp
-L PORT U1
-U 2 1 5C9A29E9
-P 2950 3000
-F 0 "U1" H 3000 3100 30 0000 C CNN
-F 1 "PORT" H 2950 3000 30 0000 C CNN
-F 2 "" H 2950 3000 60 0000 C CNN
-F 3 "" H 2950 3000 60 0000 C CNN
- 2 2950 3000
- 1 0 0 -1
-$EndComp
-$Comp
-L PORT U1
-U 3 1 5C9A2A0D
-P 3000 3300
-F 0 "U1" H 3050 3400 30 0000 C CNN
-F 1 "PORT" H 3000 3300 30 0000 C CNN
-F 2 "" H 3000 3300 60 0000 C CNN
-F 3 "" H 3000 3300 60 0000 C CNN
- 3 3000 3300
- 1 0 0 -1
-$EndComp
-$Comp
-L PORT U1
-U 4 1 5C9A2A3C
-P 3000 3550
-F 0 "U1" H 3050 3650 30 0000 C CNN
-F 1 "PORT" H 3000 3550 30 0000 C CNN
-F 2 "" H 3000 3550 60 0000 C CNN
-F 3 "" H 3000 3550 60 0000 C CNN
- 4 3000 3550
- 1 0 0 -1
-$EndComp
-$Comp
-L PORT U1
-U 5 1 5C9A2A68
-P 6750 3350
-F 0 "U1" H 6800 3450 30 0000 C CNN
-F 1 "PORT" H 6750 3350 30 0000 C CNN
-F 2 "" H 6750 3350 60 0000 C CNN
-F 3 "" H 6750 3350 60 0000 C CNN
- 5 6750 3350
- -1 0 0 1
-$EndComp
-Text Notes 3450 2650 0 60 ~ 12
-in1
-Text Notes 3450 2950 0 60 ~ 12
-in2
-Text Notes 3500 3300 0 60 ~ 12
-in3
-Text Notes 3500 3550 0 60 ~ 12
-in4
-Text Notes 6150 3350 0 60 ~ 12
-out
-$EndSCHEMATC
+EESchema Schematic File Version 2
+LIBS:texas
+LIBS:intel
+LIBS:audio
+LIBS:interface
+LIBS:digital-audio
+LIBS:philips
+LIBS:display
+LIBS:cypress
+LIBS:siliconi
+LIBS:opto
+LIBS:atmel
+LIBS:contrib
+LIBS:valves
+LIBS:eSim_Analog
+LIBS:eSim_Devices
+LIBS:eSim_Digital
+LIBS:eSim_Hybrid
+LIBS:eSim_Miscellaneous
+LIBS:eSim_Plot
+LIBS:eSim_Power
+LIBS:eSim_PSpice
+LIBS:eSim_Sources
+LIBS:eSim_Subckt
+LIBS:eSim_User
+EELAYER 25 0
+EELAYER END
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 1 1
+Title ""
+Date ""
+Rev ""
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+$Comp
+L 3_and X1
+U 1 1 5C9A2915
+P 3700 3500
+F 0 "X1" H 4600 3800 60 0000 C CNN
+F 1 "3_and" H 4650 4000 60 0000 C CNN
+F 2 "" H 3700 3500 60 0000 C CNN
+F 3 "" H 3700 3500 60 0000 C CNN
+ 1 3700 3500
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_and U2
+U 1 1 5C9A2940
+P 5450 3400
+F 0 "U2" H 5450 3400 60 0000 C CNN
+F 1 "d_and" H 5500 3500 60 0000 C CNN
+F 2 "" H 5450 3400 60 0000 C CNN
+F 3 "" H 5450 3400 60 0000 C CNN
+ 1 5450 3400
+ 1 0 0 -1
+$EndComp
+Wire Wire Line
+ 5000 3100 5000 3300
+Wire Wire Line
+ 4150 3000 4150 2700
+Wire Wire Line
+ 4150 2700 3200 2700
+Wire Wire Line
+ 4150 3100 4000 3100
+Wire Wire Line
+ 4000 3100 4000 3000
+Wire Wire Line
+ 4000 3000 3200 3000
+Wire Wire Line
+ 4150 3200 4150 3300
+Wire Wire Line
+ 4150 3300 3250 3300
+Wire Wire Line
+ 5000 3400 5000 3550
+Wire Wire Line
+ 5000 3550 3250 3550
+Wire Wire Line
+ 5900 3350 6500 3350
+$Comp
+L PORT U1
+U 1 1 5C9A29B1
+P 2950 2700
+F 0 "U1" H 3000 2800 30 0000 C CNN
+F 1 "PORT" H 2950 2700 30 0000 C CNN
+F 2 "" H 2950 2700 60 0000 C CNN
+F 3 "" H 2950 2700 60 0000 C CNN
+ 1 2950 2700
+ 1 0 0 -1
+$EndComp
+$Comp
+L PORT U1
+U 2 1 5C9A29E9
+P 2950 3000
+F 0 "U1" H 3000 3100 30 0000 C CNN
+F 1 "PORT" H 2950 3000 30 0000 C CNN
+F 2 "" H 2950 3000 60 0000 C CNN
+F 3 "" H 2950 3000 60 0000 C CNN
+ 2 2950 3000
+ 1 0 0 -1
+$EndComp
+$Comp
+L PORT U1
+U 3 1 5C9A2A0D
+P 3000 3300
+F 0 "U1" H 3050 3400 30 0000 C CNN
+F 1 "PORT" H 3000 3300 30 0000 C CNN
+F 2 "" H 3000 3300 60 0000 C CNN
+F 3 "" H 3000 3300 60 0000 C CNN
+ 3 3000 3300
+ 1 0 0 -1
+$EndComp
+$Comp
+L PORT U1
+U 4 1 5C9A2A3C
+P 3000 3550
+F 0 "U1" H 3050 3650 30 0000 C CNN
+F 1 "PORT" H 3000 3550 30 0000 C CNN
+F 2 "" H 3000 3550 60 0000 C CNN
+F 3 "" H 3000 3550 60 0000 C CNN
+ 4 3000 3550
+ 1 0 0 -1
+$EndComp
+$Comp
+L PORT U1
+U 5 1 5C9A2A68
+P 6750 3350
+F 0 "U1" H 6800 3450 30 0000 C CNN
+F 1 "PORT" H 6750 3350 30 0000 C CNN
+F 2 "" H 6750 3350 60 0000 C CNN
+F 3 "" H 6750 3350 60 0000 C CNN
+ 5 6750 3350
+ -1 0 0 1
+$EndComp
+$EndSCHEMATC
diff --git a/src/SubcircuitLibrary/74153/4_and.sub b/src/SubcircuitLibrary/74153/4_and.sub
index bf20b628..8663f37e 100644
--- a/src/SubcircuitLibrary/74153/4_and.sub
+++ b/src/SubcircuitLibrary/74153/4_and.sub
@@ -1,12 +1,12 @@
-* Subcircuit 4_and
-.subckt 4_and net-_u1-pad1_ net-_u1-pad2_ net-_u1-pad3_ net-_u1-pad4_ net-_u1-pad5_
-* c:\users\malli\esim\src\subcircuitlibrary\4_and\4_and.cir
-.include 3_and.sub
-x1 net-_u1-pad1_ net-_u1-pad2_ net-_u1-pad3_ net-_u2-pad1_ 3_and
-* u2 net-_u2-pad1_ net-_u1-pad4_ net-_u1-pad5_ d_and
-a1 [net-_u2-pad1_ net-_u1-pad4_ ] net-_u1-pad5_ u2
-* Schematic Name: d_and, NgSpice Name: d_and
-.model u2 d_and(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
-* Control Statements
-
+* Subcircuit 4_and
+.subckt 4_and net-_u1-pad1_ net-_u1-pad2_ net-_u1-pad3_ net-_u1-pad4_ net-_u1-pad5_
+* c:\users\malli\esim\src\subcircuitlibrary\4_and\4_and.cir
+.include 3_and.sub
+x1 net-_u1-pad1_ net-_u1-pad2_ net-_u1-pad3_ net-_u2-pad1_ 3_and
+* u2 net-_u2-pad1_ net-_u1-pad4_ net-_u1-pad5_ d_and
+a1 [net-_u2-pad1_ net-_u1-pad4_ ] net-_u1-pad5_ u2
+* Schematic Name: d_and, NgSpice Name: d_and
+.model u2 d_and(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
+* Control Statements
+
.ends 4_and
\ No newline at end of file
diff --git a/src/SubcircuitLibrary/74153/74153-cache.lib b/src/SubcircuitLibrary/74153/74153-cache.lib
index 4f81c933..1e85854e 100644
--- a/src/SubcircuitLibrary/74153/74153-cache.lib
+++ b/src/SubcircuitLibrary/74153/74153-cache.lib
@@ -4,40 +4,40 @@ EESchema-LIBRARY Version 2.3
# 4_OR
#
DEF 4_OR X 0 40 Y Y 1 F N
-F0 "X" 150 -100 60 H V C CNN
-F1 "4_OR" 150 100 60 H V C CNN
+F0 "X" 3900 3050 60 H V C CNN
+F1 "4_OR" 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 -800 0 650 226 -226 0 1 0 N -200 250 -200 -250
-A -73 134 444 -599 -176 0 1 0 N 150 -250 350 0
-A -30 -99 393 627 146 0 1 0 N 150 250 350 0
-P 2 0 1 0 -200 -250 150 -250 N
-P 2 0 1 0 -200 250 150 250 N
-X in1 1 -350 150 200 R 50 50 1 1 I
-X in2 2 -350 50 200 R 50 50 1 1 I
-X in3 3 -350 -50 200 R 50 50 1 1 I
-X in4 4 -350 -150 200 R 50 50 1 1 I
-X out 5 550 0 200 L 50 50 1 1 O
+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
#
DEF 4_and X 0 40 Y Y 1 F N
-F0 "X" 50 -50 60 H V C CNN
-F1 "4_and" 100 100 60 H V C CNN
+F0 "X" 1500 1050 60 H V C CNN
+F1 "4_and" 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 100 0 206 760 -760 0 1 0 N 150 200 150 -200
-P 2 0 1 0 -200 200 150 200 N
-P 4 0 1 0 -200 200 -200 -200 50 -200 150 -200 N
-X in1 1 -400 150 200 R 50 50 1 1 I
-X in2 2 -400 50 200 R 50 50 1 1 I
-X in3 3 -400 -50 200 R 50 50 1 1 I
-X in4 4 -400 -150 200 R 50 50 1 1 I
-X out 5 500 0 200 L 50 50 1 1 O
+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
#
@@ -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/src/SubcircuitLibrary/74153/74153.cir b/src/SubcircuitLibrary/74153/74153.cir
index 955b30b1..b20e6858 100644
--- a/src/SubcircuitLibrary/74153/74153.cir
+++ b/src/SubcircuitLibrary/74153/74153.cir
@@ -1,25 +1,25 @@
-* /home/mallikarjuna/Downloads/eSim-1.1.2/src/SubcircuitLibrary/74153/74153.cir
+* C:\Users\malli\eSim\src\SubcircuitLibrary\74153\74153.cir
-* EESchema Netlist Version 1.1 (Spice format) creation date: Wed Jun 26 15:19:41 2019
+* EESchema Netlist Version 1.1 (Spice format) creation date: 03/28/19 23:33:11
* To exclude a component from the Spice Netlist add [Spice_Netlist_Enabled] user FIELD set to: N
* To reorder the component spice node sequence add [Spice_Node_Sequence] user FIELD and define sequence: 2,1,0
* Sheet Name: /
-U2 Net-_U1-Pad14_ Net-_U2-Pad2_ d_inverter
-U3 Net-_U1-Pad2_ Net-_U3-Pad2_ d_inverter
-U1 Net-_U1-Pad1_ Net-_U1-Pad2_ Net-_U1-Pad3_ Net-_U1-Pad4_ Net-_U1-Pad5_ Net-_U1-Pad6_ Net-_U1-Pad7_ ? Net-_U1-Pad9_ Net-_U1-Pad10_ Net-_U1-Pad11_ Net-_U1-Pad12_ Net-_U1-Pad13_ Net-_U1-Pad14_ Net-_U1-Pad15_ ? PORT
-U35 Net-_U1-Pad1_ Net-_U35-Pad2_ d_inverter
-U34 Net-_U1-Pad15_ Net-_U34-Pad2_ d_inverter
-X8 Net-_U2-Pad2_ Net-_U3-Pad2_ Net-_U1-Pad6_ Net-_U35-Pad2_ Net-_X2-Pad1_ 4_and
-X9 Net-_U1-Pad14_ Net-_U3-Pad2_ Net-_U1-Pad5_ Net-_U35-Pad2_ Net-_X2-Pad2_ 4_and
-X4 Net-_U2-Pad2_ Net-_U1-Pad2_ Net-_U1-Pad4_ Net-_U35-Pad2_ Net-_X2-Pad3_ 4_and
-X10 Net-_U1-Pad14_ Net-_U1-Pad2_ Net-_U1-Pad3_ Net-_U35-Pad2_ Net-_X10-Pad5_ 4_and
-X5 Net-_U2-Pad2_ Net-_U3-Pad2_ Net-_U1-Pad10_ Net-_U34-Pad2_ Net-_X1-Pad1_ 4_and
-X6 Net-_U1-Pad14_ Net-_U3-Pad2_ Net-_U1-Pad11_ Net-_U34-Pad2_ Net-_X1-Pad2_ 4_and
-X3 Net-_U2-Pad2_ Net-_U1-Pad2_ Net-_U1-Pad12_ Net-_U34-Pad2_ Net-_X1-Pad3_ 4_and
-X7 Net-_U1-Pad14_ Net-_U1-Pad2_ Net-_U1-Pad13_ Net-_U34-Pad2_ Net-_X1-Pad4_ 4_and
-X1 Net-_X1-Pad1_ Net-_X1-Pad2_ Net-_X1-Pad3_ Net-_X1-Pad4_ Net-_U1-Pad9_ 4_OR
-X2 Net-_X2-Pad1_ Net-_X2-Pad2_ Net-_X2-Pad3_ Net-_X10-Pad5_ Net-_U1-Pad7_ 4_OR
+U2 Net-_U1-Pad12_ Net-_U2-Pad2_ d_inverter
+U3 Net-_U1-Pad11_ Net-_U3-Pad2_ d_inverter
+U1 Net-_U1-Pad1_ Net-_U1-Pad2_ Net-_U1-Pad3_ Net-_U1-Pad4_ Net-_U1-Pad5_ Net-_U1-Pad6_ Net-_U1-Pad7_ Net-_U1-Pad8_ Net-_U1-Pad9_ Net-_U1-Pad10_ Net-_U1-Pad11_ Net-_U1-Pad12_ Net-_U1-Pad13_ Net-_U1-Pad14_ PORT
+U35 Net-_U1-Pad5_ Net-_U35-Pad2_ d_inverter
+U34 Net-_U1-Pad10_ Net-_U34-Pad2_ d_inverter
+X8 Net-_U2-Pad2_ Net-_U3-Pad2_ Net-_U1-Pad1_ Net-_U35-Pad2_ Net-_X2-Pad1_ 4_and
+X9 Net-_U1-Pad12_ Net-_U3-Pad2_ Net-_U1-Pad2_ Net-_U35-Pad2_ Net-_X2-Pad2_ 4_and
+X4 Net-_U2-Pad2_ Net-_U1-Pad11_ Net-_U1-Pad3_ Net-_U35-Pad2_ Net-_X2-Pad3_ 4_and
+X10 Net-_U1-Pad12_ Net-_U1-Pad11_ Net-_U1-Pad4_ Net-_U35-Pad2_ Net-_X10-Pad5_ 4_and
+X5 Net-_U2-Pad2_ Net-_U3-Pad2_ Net-_U1-Pad6_ Net-_U34-Pad2_ Net-_X1-Pad1_ 4_and
+X6 Net-_U1-Pad12_ Net-_U3-Pad2_ Net-_U1-Pad7_ Net-_U34-Pad2_ Net-_X1-Pad2_ 4_and
+X3 Net-_U2-Pad2_ Net-_U1-Pad11_ Net-_U1-Pad8_ Net-_U34-Pad2_ Net-_X1-Pad3_ 4_and
+X7 Net-_U1-Pad12_ Net-_U1-Pad11_ Net-_U1-Pad9_ Net-_U34-Pad2_ Net-_X1-Pad4_ 4_and
+X1 Net-_X1-Pad1_ Net-_X1-Pad2_ Net-_X1-Pad3_ Net-_X1-Pad4_ Net-_U1-Pad14_ 4_OR
+X2 Net-_X2-Pad1_ Net-_X2-Pad2_ Net-_X2-Pad3_ Net-_X10-Pad5_ Net-_U1-Pad13_ 4_OR
.end
diff --git a/src/SubcircuitLibrary/74153/74153.cir.out b/src/SubcircuitLibrary/74153/74153.cir.out
index 93b8fdd1..c95e5ad9 100644
--- a/src/SubcircuitLibrary/74153/74153.cir.out
+++ b/src/SubcircuitLibrary/74153/74153.cir.out
@@ -1,26 +1,26 @@
-* /home/mallikarjuna/downloads/esim-1.1.2/src/subcircuitlibrary/74153/74153.cir
+* c:\users\malli\esim\src\subcircuitlibrary\74153\74153.cir
.include 4_and.sub
.include 4_OR.sub
-* u2 net-_u1-pad14_ net-_u2-pad2_ d_inverter
-* u3 net-_u1-pad2_ net-_u3-pad2_ d_inverter
-* u1 net-_u1-pad1_ net-_u1-pad2_ net-_u1-pad3_ net-_u1-pad4_ net-_u1-pad5_ net-_u1-pad6_ net-_u1-pad7_ ? net-_u1-pad9_ net-_u1-pad10_ net-_u1-pad11_ net-_u1-pad12_ net-_u1-pad13_ net-_u1-pad14_ net-_u1-pad15_ ? port
-* u35 net-_u1-pad1_ net-_u35-pad2_ d_inverter
-* u34 net-_u1-pad15_ net-_u34-pad2_ d_inverter
-x8 net-_u2-pad2_ net-_u3-pad2_ net-_u1-pad6_ net-_u35-pad2_ net-_x2-pad1_ 4_and
-x9 net-_u1-pad14_ net-_u3-pad2_ net-_u1-pad5_ net-_u35-pad2_ net-_x2-pad2_ 4_and
-x4 net-_u2-pad2_ net-_u1-pad2_ net-_u1-pad4_ net-_u35-pad2_ net-_x2-pad3_ 4_and
-x10 net-_u1-pad14_ net-_u1-pad2_ net-_u1-pad3_ net-_u35-pad2_ net-_x10-pad5_ 4_and
-x5 net-_u2-pad2_ net-_u3-pad2_ net-_u1-pad10_ net-_u34-pad2_ net-_x1-pad1_ 4_and
-x6 net-_u1-pad14_ net-_u3-pad2_ net-_u1-pad11_ net-_u34-pad2_ net-_x1-pad2_ 4_and
-x3 net-_u2-pad2_ net-_u1-pad2_ net-_u1-pad12_ net-_u34-pad2_ net-_x1-pad3_ 4_and
-x7 net-_u1-pad14_ net-_u1-pad2_ net-_u1-pad13_ net-_u34-pad2_ net-_x1-pad4_ 4_and
-x1 net-_x1-pad1_ net-_x1-pad2_ net-_x1-pad3_ net-_x1-pad4_ net-_u1-pad9_ 4_OR
-x2 net-_x2-pad1_ net-_x2-pad2_ net-_x2-pad3_ net-_x10-pad5_ net-_u1-pad7_ 4_OR
-a1 net-_u1-pad14_ net-_u2-pad2_ u2
-a2 net-_u1-pad2_ net-_u3-pad2_ u3
-a3 net-_u1-pad1_ net-_u35-pad2_ u35
-a4 net-_u1-pad15_ net-_u34-pad2_ u34
+* u2 net-_u1-pad12_ net-_u2-pad2_ d_inverter
+* u3 net-_u1-pad11_ net-_u3-pad2_ d_inverter
+* u1 net-_u1-pad1_ net-_u1-pad2_ net-_u1-pad3_ net-_u1-pad4_ net-_u1-pad5_ net-_u1-pad6_ net-_u1-pad7_ net-_u1-pad8_ net-_u1-pad9_ net-_u1-pad10_ net-_u1-pad11_ net-_u1-pad12_ net-_u1-pad13_ net-_u1-pad14_ port
+* u35 net-_u1-pad5_ net-_u35-pad2_ d_inverter
+* u34 net-_u1-pad10_ net-_u34-pad2_ d_inverter
+x8 net-_u2-pad2_ net-_u3-pad2_ net-_u1-pad1_ net-_u35-pad2_ net-_x2-pad1_ 4_and
+x9 net-_u1-pad12_ net-_u3-pad2_ net-_u1-pad2_ net-_u35-pad2_ net-_x2-pad2_ 4_and
+x4 net-_u2-pad2_ net-_u1-pad11_ net-_u1-pad3_ net-_u35-pad2_ net-_x2-pad3_ 4_and
+x10 net-_u1-pad12_ net-_u1-pad11_ net-_u1-pad4_ net-_u35-pad2_ net-_x10-pad5_ 4_and
+x5 net-_u2-pad2_ net-_u3-pad2_ net-_u1-pad6_ net-_u34-pad2_ net-_x1-pad1_ 4_and
+x6 net-_u1-pad12_ net-_u3-pad2_ net-_u1-pad7_ net-_u34-pad2_ net-_x1-pad2_ 4_and
+x3 net-_u2-pad2_ net-_u1-pad11_ net-_u1-pad8_ net-_u34-pad2_ net-_x1-pad3_ 4_and
+x7 net-_u1-pad12_ net-_u1-pad11_ net-_u1-pad9_ net-_u34-pad2_ net-_x1-pad4_ 4_and
+x1 net-_x1-pad1_ net-_x1-pad2_ net-_x1-pad3_ net-_x1-pad4_ net-_u1-pad14_ 4_OR
+x2 net-_x2-pad1_ net-_x2-pad2_ net-_x2-pad3_ net-_x10-pad5_ net-_u1-pad13_ 4_OR
+a1 net-_u1-pad12_ net-_u2-pad2_ u2
+a2 net-_u1-pad11_ net-_u3-pad2_ u3
+a3 net-_u1-pad5_ net-_u35-pad2_ u35
+a4 net-_u1-pad10_ net-_u34-pad2_ u34
* Schematic Name: d_inverter, NgSpice Name: d_inverter
.model u2 d_inverter(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
* Schematic Name: d_inverter, NgSpice Name: d_inverter
@@ -29,7 +29,7 @@ a4 net-_u1-pad15_ net-_u34-pad2_ u34
.model u35 d_inverter(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
* Schematic Name: d_inverter, NgSpice Name: d_inverter
.model u34 d_inverter(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
-.tran 0e-03 0e-00 0e-03
+.tran 0e-00 0e-00 0e-00
* Control Statements
.control
diff --git a/src/SubcircuitLibrary/74153/74153.pro b/src/SubcircuitLibrary/74153/74153.pro
index 78440d11..ed8b8bf2 100644
--- a/src/SubcircuitLibrary/74153/74153.pro
+++ b/src/SubcircuitLibrary/74153/74153.pro
@@ -1,4 +1,4 @@
-update=Tue Jun 25 16:51:16 2019
+update=03/28/19 23:27:36
version=1
last_client=eeschema
[general]
@@ -29,15 +29,31 @@ version=1
NetIExt=net
[eeschema]
version=1
-LibDir=../../../kicadSchematicLibrary
+LibDir=
[eeschema/libraries]
-LibName1=/home/mallikarjuna/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Analog
-LibName2=/home/mallikarjuna/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Devices
-LibName3=/home/mallikarjuna/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Digital
-LibName4=/home/mallikarjuna/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Hybrid
-LibName5=/home/mallikarjuna/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Miscellaneous
-LibName6=/home/mallikarjuna/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Plot
-LibName7=/home/mallikarjuna/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Power
-LibName8=/home/mallikarjuna/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Sources
-LibName9=/home/mallikarjuna/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Subckt
-LibName10=/home/mallikarjuna/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_User
+LibName1=power
+LibName2=device
+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_PSpice
+LibName24=eSim_Sources
+LibName25=eSim_User
+LibName26=eSim_Subckt
diff --git a/src/SubcircuitLibrary/74153/74153.sch b/src/SubcircuitLibrary/74153/74153.sch
index fc9b4516..e0bcf950 100644
--- a/src/SubcircuitLibrary/74153/74153.sch
+++ b/src/SubcircuitLibrary/74153/74153.sch
@@ -1,4 +1,19 @@
EESchema Schematic File Version 2
+LIBS:power
+LIBS:device
+LIBS:texas
+LIBS:intel
+LIBS:audio
+LIBS:interface
+LIBS:digital-audio
+LIBS:philips
+LIBS:display
+LIBS:cypress
+LIBS:siliconi
+LIBS:opto
+LIBS:atmel
+LIBS:contrib
+LIBS:valves
LIBS:eSim_Analog
LIBS:eSim_Devices
LIBS:eSim_Digital
@@ -6,9 +21,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:eSim_Subckt
LIBS:74153-cache
EELAYER 25 0
EELAYER END
@@ -48,156 +64,156 @@ F 3 "" H 2750 900 60 0000 C CNN
$EndComp
$Comp
L PORT U1
-U 6 1 5C93A0F9
+U 1 1 5C93A0F9
P 1350 2050
F 0 "U1" H 1400 2150 30 0000 C CNN
F 1 "PORT" H 1350 2050 30 0000 C CNN
F 2 "" H 1350 2050 60 0000 C CNN
F 3 "" H 1350 2050 60 0000 C CNN
- 6 1350 2050
+ 1 1350 2050
1 0 0 -1
$EndComp
$Comp
L PORT U1
-U 10 1 5C93A174
+U 6 1 5C93A174
P 1350 4700
F 0 "U1" H 1400 4800 30 0000 C CNN
F 1 "PORT" H 1350 4700 30 0000 C CNN
F 2 "" H 1350 4700 60 0000 C CNN
F 3 "" H 1350 4700 60 0000 C CNN
- 10 1350 4700
+ 6 1350 4700
1 0 0 -1
$EndComp
$Comp
L PORT U1
-U 5 1 5C93AA3C
+U 2 1 5C93AA3C
P 1350 2600
F 0 "U1" H 1400 2700 30 0000 C CNN
F 1 "PORT" H 1350 2600 30 0000 C CNN
F 2 "" H 1350 2600 60 0000 C CNN
F 3 "" H 1350 2600 60 0000 C CNN
- 5 1350 2600
+ 2 1350 2600
1 0 0 -1
$EndComp
$Comp
L PORT U1
-U 4 1 5C93AACB
+U 3 1 5C93AACB
P 1350 3200
F 0 "U1" H 1400 3300 30 0000 C CNN
F 1 "PORT" H 1350 3200 30 0000 C CNN
F 2 "" H 1350 3200 60 0000 C CNN
F 3 "" H 1350 3200 60 0000 C CNN
- 4 1350 3200
+ 3 1350 3200
1 0 0 -1
$EndComp
$Comp
L PORT U1
-U 3 1 5C93AB5F
+U 4 1 5C93AB5F
P 1350 3700
F 0 "U1" H 1400 3800 30 0000 C CNN
F 1 "PORT" H 1350 3700 30 0000 C CNN
F 2 "" H 1350 3700 60 0000 C CNN
F 3 "" H 1350 3700 60 0000 C CNN
- 3 1350 3700
+ 4 1350 3700
1 0 0 -1
$EndComp
$Comp
L PORT U1
-U 11 1 5C93AD97
+U 7 1 5C93AD97
P 1350 5250
F 0 "U1" H 1400 5350 30 0000 C CNN
F 1 "PORT" H 1350 5250 30 0000 C CNN
F 2 "" H 1350 5250 60 0000 C CNN
F 3 "" H 1350 5250 60 0000 C CNN
- 11 1350 5250
+ 7 1350 5250
1 0 0 -1
$EndComp
$Comp
L PORT U1
-U 12 1 5C93ADFC
+U 8 1 5C93ADFC
P 1350 5850
F 0 "U1" H 1400 5950 30 0000 C CNN
F 1 "PORT" H 1350 5850 30 0000 C CNN
F 2 "" H 1350 5850 60 0000 C CNN
F 3 "" H 1350 5850 60 0000 C CNN
- 12 1350 5850
+ 8 1350 5850
1 0 0 -1
$EndComp
$Comp
L PORT U1
-U 13 1 5C93AE63
+U 9 1 5C93AE63
P 1350 6350
F 0 "U1" H 1400 6450 30 0000 C CNN
F 1 "PORT" H 1350 6350 30 0000 C CNN
F 2 "" H 1350 6350 60 0000 C CNN
F 3 "" H 1350 6350 60 0000 C CNN
- 13 1350 6350
+ 9 1350 6350
1 0 0 -1
$EndComp
$Comp
L PORT U1
-U 1 1 5C93AECA
+U 5 1 5C93AECA
P 1350 3950
F 0 "U1" H 1400 4050 30 0000 C CNN
F 1 "PORT" H 1350 3950 30 0000 C CNN
F 2 "" H 1350 3950 60 0000 C CNN
F 3 "" H 1350 3950 60 0000 C CNN
- 1 1350 3950
+ 5 1350 3950
1 0 0 -1
$EndComp
$Comp
L PORT U1
-U 15 1 5C93AF79
+U 10 1 5C93AF79
P 1350 6600
F 0 "U1" H 1400 6700 30 0000 C CNN
F 1 "PORT" H 1350 6600 30 0000 C CNN
F 2 "" H 1350 6600 60 0000 C CNN
F 3 "" H 1350 6600 60 0000 C CNN
- 15 1350 6600
+ 10 1350 6600
1 0 0 -1
$EndComp
$Comp
L PORT U1
-U 2 1 5C93B10A
+U 11 1 5C93B10A
P 1550 950
F 0 "U1" H 1600 1050 30 0000 C CNN
F 1 "PORT" H 1550 950 30 0000 C CNN
F 2 "" H 1550 950 60 0000 C CNN
F 3 "" H 1550 950 60 0000 C CNN
- 2 1550 950
+ 11 1550 950
1 0 0 -1
$EndComp
$Comp
L PORT U1
-U 14 1 5C93B179
+U 12 1 5C93B179
P 1550 1350
F 0 "U1" H 1600 1450 30 0000 C CNN
F 1 "PORT" H 1550 1350 30 0000 C CNN
F 2 "" H 1550 1350 60 0000 C CNN
F 3 "" H 1550 1350 60 0000 C CNN
- 14 1550 1350
+ 12 1550 1350
1 0 0 -1
$EndComp
$Comp
L PORT U1
-U 7 1 5C93B567
+U 13 1 5C93B567
P 7850 2600
F 0 "U1" H 7900 2700 30 0000 C CNN
F 1 "PORT" H 7850 2600 30 0000 C CNN
F 2 "" H 7850 2600 60 0000 C CNN
F 3 "" H 7850 2600 60 0000 C CNN
- 7 7850 2600
+ 13 7850 2600
-1 0 0 1
$EndComp
$Comp
L PORT U1
-U 9 1 5C93B5DA
+U 14 1 5C93B5DA
P 7900 5250
F 0 "U1" H 7950 5350 30 0000 C CNN
F 1 "PORT" H 7900 5250 30 0000 C CNN
F 2 "" H 7900 5250 60 0000 C CNN
F 3 "" H 7900 5250 60 0000 C CNN
- 9 7900 5250
+ 14 7900 5250
-1 0 0 1
$EndComp
$Comp
@@ -253,89 +269,89 @@ YB
$Comp
L 4_and X8
U 1 1 5C9D0C22
-P 4200 1950
-F 0 "X8" H 4250 1950 60 0000 C CNN
-F 1 "4_and" H 4300 2050 60 0000 C CNN
-F 2 "" H 4200 1950 60 0000 C CNN
-F 3 "" H 4200 1950 60 0000 C CNN
- 1 4200 1950
+P 2750 3050
+F 0 "X8" H 4250 4100 60 0000 C CNN
+F 1 "4_and" H 4300 4250 60 0000 C CNN
+F 2 "" H 2750 3050 60 0000 C CNN
+F 3 "" H 2750 3050 60 0000 C CNN
+ 1 2750 3050
1 0 0 -1
$EndComp
$Comp
L 4_and X9
U 1 1 5C9D0CA2
-P 4200 2500
-F 0 "X9" H 4250 2500 60 0000 C CNN
-F 1 "4_and" H 4300 2600 60 0000 C CNN
-F 2 "" H 4200 2500 60 0000 C CNN
-F 3 "" H 4200 2500 60 0000 C CNN
- 1 4200 2500
+P 2750 3600
+F 0 "X9" H 4250 4650 60 0000 C CNN
+F 1 "4_and" H 4300 4800 60 0000 C CNN
+F 2 "" H 2750 3600 60 0000 C CNN
+F 3 "" H 2750 3600 60 0000 C CNN
+ 1 2750 3600
1 0 0 -1
$EndComp
$Comp
L 4_and X4
U 1 1 5C9D0D16
-P 4150 3100
-F 0 "X4" H 4200 3100 60 0000 C CNN
-F 1 "4_and" H 4250 3200 60 0000 C CNN
-F 2 "" H 4150 3100 60 0000 C CNN
-F 3 "" H 4150 3100 60 0000 C CNN
- 1 4150 3100
+P 2700 4200
+F 0 "X4" H 4200 5250 60 0000 C CNN
+F 1 "4_and" H 4250 5400 60 0000 C CNN
+F 2 "" H 2700 4200 60 0000 C CNN
+F 3 "" H 2700 4200 60 0000 C CNN
+ 1 2700 4200
1 0 0 -1
$EndComp
$Comp
L 4_and X10
U 1 1 5C9D0D93
-P 4200 3600
-F 0 "X10" H 4250 3600 60 0000 C CNN
-F 1 "4_and" H 4300 3700 60 0000 C CNN
-F 2 "" H 4200 3600 60 0000 C CNN
-F 3 "" H 4200 3600 60 0000 C CNN
- 1 4200 3600
+P 2750 4700
+F 0 "X10" H 4250 5750 60 0000 C CNN
+F 1 "4_and" H 4300 5900 60 0000 C CNN
+F 2 "" H 2750 4700 60 0000 C CNN
+F 3 "" H 2750 4700 60 0000 C CNN
+ 1 2750 4700
1 0 0 -1
$EndComp
$Comp
L 4_and X5
U 1 1 5C9D182A
-P 4150 4600
-F 0 "X5" H 4200 4600 60 0000 C CNN
-F 1 "4_and" H 4250 4700 60 0000 C CNN
-F 2 "" H 4150 4600 60 0000 C CNN
-F 3 "" H 4150 4600 60 0000 C CNN
- 1 4150 4600
+P 2700 5700
+F 0 "X5" H 4200 6750 60 0000 C CNN
+F 1 "4_and" H 4250 6900 60 0000 C CNN
+F 2 "" H 2700 5700 60 0000 C CNN
+F 3 "" H 2700 5700 60 0000 C CNN
+ 1 2700 5700
1 0 0 -1
$EndComp
$Comp
L 4_and X6
U 1 1 5C9D1830
-P 4150 5150
-F 0 "X6" H 4200 5150 60 0000 C CNN
-F 1 "4_and" H 4250 5250 60 0000 C CNN
-F 2 "" H 4150 5150 60 0000 C CNN
-F 3 "" H 4150 5150 60 0000 C CNN
- 1 4150 5150
+P 2700 6250
+F 0 "X6" H 4200 7300 60 0000 C CNN
+F 1 "4_and" H 4250 7450 60 0000 C CNN
+F 2 "" H 2700 6250 60 0000 C CNN
+F 3 "" H 2700 6250 60 0000 C CNN
+ 1 2700 6250
1 0 0 -1
$EndComp
$Comp
L 4_and X3
U 1 1 5C9D1836
-P 4100 5750
-F 0 "X3" H 4150 5750 60 0000 C CNN
-F 1 "4_and" H 4200 5850 60 0000 C CNN
-F 2 "" H 4100 5750 60 0000 C CNN
-F 3 "" H 4100 5750 60 0000 C CNN
- 1 4100 5750
+P 2650 6850
+F 0 "X3" H 4150 7900 60 0000 C CNN
+F 1 "4_and" H 4200 8050 60 0000 C CNN
+F 2 "" H 2650 6850 60 0000 C CNN
+F 3 "" H 2650 6850 60 0000 C CNN
+ 1 2650 6850
1 0 0 -1
$EndComp
$Comp
L 4_and X7
U 1 1 5C9D183C
-P 4150 6250
-F 0 "X7" H 4200 6250 60 0000 C CNN
-F 1 "4_and" H 4250 6350 60 0000 C CNN
-F 2 "" H 4150 6250 60 0000 C CNN
-F 3 "" H 4150 6250 60 0000 C CNN
- 1 4150 6250
+P 2700 7350
+F 0 "X7" H 4200 8400 60 0000 C CNN
+F 1 "4_and" H 4250 8550 60 0000 C CNN
+F 2 "" H 2700 7350 60 0000 C CNN
+F 3 "" H 2700 7350 60 0000 C CNN
+ 1 2700 7350
1 0 0 -1
$EndComp
Wire Wire Line
@@ -498,12 +514,12 @@ Wire Wire Line
$Comp
L 4_OR X1
U 1 1 5C9D22F7
-P 5900 5250
-F 0 "X1" H 6000 5250 60 0000 C CNN
-F 1 "4_OR" H 6050 5350 60 0000 C CNN
-F 2 "" H 5900 5250 60 0000 C CNN
-F 3 "" H 5900 5250 60 0000 C CNN
- 1 5900 5250
+P 2150 8400
+F 0 "X1" H 6050 11450 60 0000 C CNN
+F 1 "4_OR" H 6050 11650 60 0000 C CNN
+F 2 "" H 2150 8400 60 0000 C CNN
+F 3 "" H 2150 8400 60 0000 C CNN
+ 1 2150 8400
1 0 0 -1
$EndComp
Wire Wire Line
@@ -525,12 +541,12 @@ Wire Wire Line
$Comp
L 4_OR X2
U 1 1 5C9D28DE
-P 6000 2600
-F 0 "X2" H 6100 2600 60 0000 C CNN
-F 1 "4_OR" H 6150 2700 60 0000 C CNN
-F 2 "" H 6000 2600 60 0000 C CNN
-F 3 "" H 6000 2600 60 0000 C CNN
- 1 6000 2600
+P 2250 5750
+F 0 "X2" H 6150 8800 60 0000 C CNN
+F 1 "4_OR" H 6150 9000 60 0000 C CNN
+F 2 "" H 2250 5750 60 0000 C CNN
+F 3 "" H 2250 5750 60 0000 C CNN
+ 1 2250 5750
1 0 0 -1
$EndComp
Wire Wire Line
@@ -549,28 +565,4 @@ Wire Wire Line
4700 3600 4700 2750
Wire Wire Line
4700 2750 5650 2750
-$Comp
-L PORT U1
-U 16 1 5D11F8AE
-P 7450 1200
-F 0 "U1" H 7500 1300 30 0000 C CNN
-F 1 "PORT" H 7450 1200 30 0000 C CNN
-F 2 "" H 7450 1200 60 0000 C CNN
-F 3 "" H 7450 1200 60 0000 C CNN
- 16 7450 1200
- -1 0 0 1
-$EndComp
-$Comp
-L PORT U1
-U 8 1 5D11F97A
-P 7400 1550
-F 0 "U1" H 7450 1650 30 0000 C CNN
-F 1 "PORT" H 7400 1550 30 0000 C CNN
-F 2 "" H 7400 1550 60 0000 C CNN
-F 3 "" H 7400 1550 60 0000 C CNN
- 8 7400 1550
- -1 0 0 1
-$EndComp
-NoConn ~ 7200 1200
-NoConn ~ 7150 1550
$EndSCHEMATC
diff --git a/src/SubcircuitLibrary/74153/74153.sub b/src/SubcircuitLibrary/74153/74153.sub
index 0bbdea00..6e00261f 100644
--- a/src/SubcircuitLibrary/74153/74153.sub
+++ b/src/SubcircuitLibrary/74153/74153.sub
@@ -1,26 +1,26 @@
* Subcircuit 74153
-.subckt 74153 net-_u1-pad1_ net-_u1-pad2_ net-_u1-pad3_ net-_u1-pad4_ net-_u1-pad5_ net-_u1-pad6_ net-_u1-pad7_ ? net-_u1-pad9_ net-_u1-pad10_ net-_u1-pad11_ net-_u1-pad12_ net-_u1-pad13_ net-_u1-pad14_ net-_u1-pad15_ ?
-* /home/mallikarjuna/downloads/esim-1.1.2/src/subcircuitlibrary/74153/74153.cir
+.subckt 74153 net-_u1-pad1_ net-_u1-pad2_ net-_u1-pad3_ net-_u1-pad4_ net-_u1-pad5_ net-_u1-pad6_ net-_u1-pad7_ net-_u1-pad8_ net-_u1-pad9_ net-_u1-pad10_ net-_u1-pad11_ net-_u1-pad12_ net-_u1-pad13_ net-_u1-pad14_
+* c:\users\malli\esim\src\subcircuitlibrary\74153\74153.cir
.include 4_and.sub
.include 4_OR.sub
-* u2 net-_u1-pad14_ net-_u2-pad2_ d_inverter
-* u3 net-_u1-pad2_ net-_u3-pad2_ d_inverter
-* u35 net-_u1-pad1_ net-_u35-pad2_ d_inverter
-* u34 net-_u1-pad15_ net-_u34-pad2_ d_inverter
-x8 net-_u2-pad2_ net-_u3-pad2_ net-_u1-pad6_ net-_u35-pad2_ net-_x2-pad1_ 4_and
-x9 net-_u1-pad14_ net-_u3-pad2_ net-_u1-pad5_ net-_u35-pad2_ net-_x2-pad2_ 4_and
-x4 net-_u2-pad2_ net-_u1-pad2_ net-_u1-pad4_ net-_u35-pad2_ net-_x2-pad3_ 4_and
-x10 net-_u1-pad14_ net-_u1-pad2_ net-_u1-pad3_ net-_u35-pad2_ net-_x10-pad5_ 4_and
-x5 net-_u2-pad2_ net-_u3-pad2_ net-_u1-pad10_ net-_u34-pad2_ net-_x1-pad1_ 4_and
-x6 net-_u1-pad14_ net-_u3-pad2_ net-_u1-pad11_ net-_u34-pad2_ net-_x1-pad2_ 4_and
-x3 net-_u2-pad2_ net-_u1-pad2_ net-_u1-pad12_ net-_u34-pad2_ net-_x1-pad3_ 4_and
-x7 net-_u1-pad14_ net-_u1-pad2_ net-_u1-pad13_ net-_u34-pad2_ net-_x1-pad4_ 4_and
-x1 net-_x1-pad1_ net-_x1-pad2_ net-_x1-pad3_ net-_x1-pad4_ net-_u1-pad9_ 4_OR
-x2 net-_x2-pad1_ net-_x2-pad2_ net-_x2-pad3_ net-_x10-pad5_ net-_u1-pad7_ 4_OR
-a1 net-_u1-pad14_ net-_u2-pad2_ u2
-a2 net-_u1-pad2_ net-_u3-pad2_ u3
-a3 net-_u1-pad1_ net-_u35-pad2_ u35
-a4 net-_u1-pad15_ net-_u34-pad2_ u34
+* u2 net-_u1-pad12_ net-_u2-pad2_ d_inverter
+* u3 net-_u1-pad11_ net-_u3-pad2_ d_inverter
+* u35 net-_u1-pad5_ net-_u35-pad2_ d_inverter
+* u34 net-_u1-pad10_ net-_u34-pad2_ d_inverter
+x8 net-_u2-pad2_ net-_u3-pad2_ net-_u1-pad1_ net-_u35-pad2_ net-_x2-pad1_ 4_and
+x9 net-_u1-pad12_ net-_u3-pad2_ net-_u1-pad2_ net-_u35-pad2_ net-_x2-pad2_ 4_and
+x4 net-_u2-pad2_ net-_u1-pad11_ net-_u1-pad3_ net-_u35-pad2_ net-_x2-pad3_ 4_and
+x10 net-_u1-pad12_ net-_u1-pad11_ net-_u1-pad4_ net-_u35-pad2_ net-_x10-pad5_ 4_and
+x5 net-_u2-pad2_ net-_u3-pad2_ net-_u1-pad6_ net-_u34-pad2_ net-_x1-pad1_ 4_and
+x6 net-_u1-pad12_ net-_u3-pad2_ net-_u1-pad7_ net-_u34-pad2_ net-_x1-pad2_ 4_and
+x3 net-_u2-pad2_ net-_u1-pad11_ net-_u1-pad8_ net-_u34-pad2_ net-_x1-pad3_ 4_and
+x7 net-_u1-pad12_ net-_u1-pad11_ net-_u1-pad9_ net-_u34-pad2_ net-_x1-pad4_ 4_and
+x1 net-_x1-pad1_ net-_x1-pad2_ net-_x1-pad3_ net-_x1-pad4_ net-_u1-pad14_ 4_OR
+x2 net-_x2-pad1_ net-_x2-pad2_ net-_x2-pad3_ net-_x10-pad5_ net-_u1-pad13_ 4_OR
+a1 net-_u1-pad12_ net-_u2-pad2_ u2
+a2 net-_u1-pad11_ net-_u3-pad2_ u3
+a3 net-_u1-pad5_ net-_u35-pad2_ u35
+a4 net-_u1-pad10_ net-_u34-pad2_ u34
* Schematic Name: d_inverter, NgSpice Name: d_inverter
.model u2 d_inverter(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
* Schematic Name: d_inverter, NgSpice Name: d_inverter
diff --git a/src/SubcircuitLibrary/74153/74153_Previous_Values.xml b/src/SubcircuitLibrary/74153/74153_Previous_Values.xml
index 028f2d75..ea70e6f3 100644
--- a/src/SubcircuitLibrary/74153/74153_Previous_Values.xml
+++ b/src/SubcircuitLibrary/74153/74153_Previous_Values.xml
@@ -1 +1 @@
-d_andd_andd_andd_andd_andd_andd_andd_andd_ord_ord_ord_inverterd_inverterd_andd_andd_andd_andd_andd_andd_andd_andd_andd_andd_andd_andd_ord_ord_ord_andd_andd_andd_andd_inverterd_inverter/home/mallikarjuna/Downloads/eSim-1.1.2/src/SubcircuitLibrary/4_OR/home/mallikarjuna/Downloads/eSim-1.1.2/src/SubcircuitLibrary/4_and/home/mallikarjuna/Downloads/eSim-1.1.2/src/SubcircuitLibrary/4_and/home/mallikarjuna/Downloads/eSim-1.1.2/src/SubcircuitLibrary/4_and/home/mallikarjuna/Downloads/eSim-1.1.2/src/SubcircuitLibrary/4_and/home/mallikarjuna/Downloads/eSim-1.1.2/src/SubcircuitLibrary/4_OR/home/mallikarjuna/Downloads/eSim-1.1.2/src/SubcircuitLibrary/4_and/home/mallikarjuna/Downloads/eSim-1.1.2/src/SubcircuitLibrary/4_and/home/mallikarjuna/Downloads/eSim-1.1.2/src/SubcircuitLibrary/4_and/home/mallikarjuna/Downloads/eSim-1.1.2/src/SubcircuitLibrary/4_andtruefalsefalseHzHz0Volts or AmperesVolts or AmperesVolts or AmperesVolts or AmperesVolts or AmperesVolts or AmperesmsmsSec
\ No newline at end of file
+d_andd_andd_andd_andd_andd_andd_andd_andd_ord_ord_ord_inverterd_inverterd_andd_andd_andd_andd_andd_andd_andd_andd_andd_andd_andd_andd_ord_ord_ord_andd_andd_andd_andd_inverterd_inverterC:\Users\malli\eSim\src\SubcircuitLibrary\4_ORC:\Users\malli\eSim\src\SubcircuitLibrary\4_andC:\Users\malli\eSim\src\SubcircuitLibrary\4_andC:\Users\malli\eSim\src\SubcircuitLibrary\4_andC:\Users\malli\eSim\src\SubcircuitLibrary\4_andC:\Users\malli\eSim\src\SubcircuitLibrary\4_ORC:\Users\malli\eSim\src\SubcircuitLibrary\4_andC:\Users\malli\eSim\src\SubcircuitLibrary\4_andC:\Users\malli\eSim\src\SubcircuitLibrary\4_andC:\Users\malli\eSim\src\SubcircuitLibrary\4_andtruefalsefalseHzHz0Volts or AmperesVolts or AmperesVolts or AmperesVolts or AmperesVolts or AmperesVolts or AmperesSecSecSec
\ No newline at end of file
diff --git a/src/SubcircuitLibrary/74153/Dual4to1MUX-cache.lib b/src/SubcircuitLibrary/74153/Dual4to1MUX-cache.lib
index 32c8b38f..10496d63 100644
--- a/src/SubcircuitLibrary/74153/Dual4to1MUX-cache.lib
+++ b/src/SubcircuitLibrary/74153/Dual4to1MUX-cache.lib
@@ -1,94 +1,94 @@
-EESchema-LIBRARY Version 2.3
-#encoding utf-8
-#
-# PORT
-#
-DEF PORT U 0 40 Y Y 26 F N
-F0 "U" 50 100 30 H V C CNN
-F1 "PORT" 0 0 30 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-A 325 225 285 -1421 -1278 0 1 0 N 100 50 150 0
-A 376 -275 356 1294 1408 0 1 0 N 150 0 100 -50
-S -100 50 100 -50 0 1 0 N
-X ~ 1 250 0 100 L 30 30 1 1 B
-X ~ 2 250 0 100 L 30 30 2 1 B
-X ~ 3 250 0 100 L 30 30 3 1 B
-X ~ 4 250 0 100 L 30 30 4 1 B
-X ~ 5 250 0 100 L 30 30 5 1 B
-X ~ 6 250 0 100 L 30 30 6 1 B
-X ~ 7 250 0 100 L 30 30 7 1 B
-X ~ 8 250 0 100 L 30 30 8 1 B
-X ~ 9 250 0 100 L 30 30 9 1 B
-X ~ 10 250 0 100 L 30 30 10 1 B
-X ~ 11 250 0 100 L 30 30 11 1 B
-X ~ 12 250 0 100 L 30 30 12 1 B
-X ~ 13 250 0 100 L 30 30 13 1 B
-X ~ 14 250 0 100 L 30 30 14 1 B
-X ~ 15 250 0 100 L 30 30 15 1 B
-X ~ 16 250 0 100 L 30 30 16 1 B
-X ~ 17 250 0 100 L 30 30 17 1 B
-X ~ 18 250 0 100 L 30 30 18 1 B
-X ~ 19 250 0 100 L 30 30 19 1 B
-X ~ 20 250 0 100 L 30 30 20 1 B
-X ~ 21 250 0 100 L 30 30 21 1 B
-X ~ 22 250 0 100 L 30 30 22 1 B
-X ~ 23 250 0 100 L 30 30 23 1 B
-X ~ 24 250 0 100 L 30 30 24 1 B
-X ~ 25 250 0 100 L 30 30 25 1 B
-X ~ 26 250 0 100 L 30 30 26 1 B
-ENDDRAW
-ENDDEF
-#
-# d_and
-#
-DEF d_and U 0 40 Y Y 1 F N
-F0 "U" 0 0 60 H V C CNN
-F1 "d_and" 50 100 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-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
-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
-ENDDRAW
-ENDDEF
-#
-# d_inverter
-#
-DEF d_inverter U 0 40 Y Y 1 F N
-F0 "U" 0 -100 60 H V C CNN
-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
-X ~ 1 -300 0 200 R 50 50 1 1 I
-X ~ 2 300 0 200 L 50 50 1 1 O I
-ENDDRAW
-ENDDEF
-#
-# d_or
-#
-DEF d_or U 0 40 Y Y 1 F N
-F0 "U" 0 0 60 H V C CNN
-F1 "d_or" 0 100 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-A -450 50 224 266 -266 0 1 0 N -250 150 -250 -50
-A -25 -124 325 574 323 0 1 0 N 150 150 250 50
-A 74 125 191 -665 -231 0 1 0 N 150 -50 250 50
-P 2 0 1 0 -250 -50 150 -50 N
-P 2 0 1 0 -250 150 150 150 N
-X IN1 1 -450 100 215 R 50 50 1 1 I
-X IN2 2 -450 0 215 R 50 50 1 1 I
-X OUT 3 450 50 200 L 50 50 1 1 O
-ENDDRAW
-ENDDEF
-#
-#End Library
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# PORT
+#
+DEF PORT U 0 40 Y Y 26 F N
+F0 "U" 50 100 30 H V C CNN
+F1 "PORT" 0 0 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A 325 225 285 -1421 -1278 0 1 0 N 100 50 150 0
+A 376 -275 356 1294 1408 0 1 0 N 150 0 100 -50
+S -100 50 100 -50 0 1 0 N
+X ~ 1 250 0 100 L 30 30 1 1 B
+X ~ 2 250 0 100 L 30 30 2 1 B
+X ~ 3 250 0 100 L 30 30 3 1 B
+X ~ 4 250 0 100 L 30 30 4 1 B
+X ~ 5 250 0 100 L 30 30 5 1 B
+X ~ 6 250 0 100 L 30 30 6 1 B
+X ~ 7 250 0 100 L 30 30 7 1 B
+X ~ 8 250 0 100 L 30 30 8 1 B
+X ~ 9 250 0 100 L 30 30 9 1 B
+X ~ 10 250 0 100 L 30 30 10 1 B
+X ~ 11 250 0 100 L 30 30 11 1 B
+X ~ 12 250 0 100 L 30 30 12 1 B
+X ~ 13 250 0 100 L 30 30 13 1 B
+X ~ 14 250 0 100 L 30 30 14 1 B
+X ~ 15 250 0 100 L 30 30 15 1 B
+X ~ 16 250 0 100 L 30 30 16 1 B
+X ~ 17 250 0 100 L 30 30 17 1 B
+X ~ 18 250 0 100 L 30 30 18 1 B
+X ~ 19 250 0 100 L 30 30 19 1 B
+X ~ 20 250 0 100 L 30 30 20 1 B
+X ~ 21 250 0 100 L 30 30 21 1 B
+X ~ 22 250 0 100 L 30 30 22 1 B
+X ~ 23 250 0 100 L 30 30 23 1 B
+X ~ 24 250 0 100 L 30 30 24 1 B
+X ~ 25 250 0 100 L 30 30 25 1 B
+X ~ 26 250 0 100 L 30 30 26 1 B
+ENDDRAW
+ENDDEF
+#
+# d_and
+#
+DEF d_and U 0 40 Y Y 1 F N
+F0 "U" 0 0 60 H V C CNN
+F1 "d_and" 50 100 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+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
+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
+ENDDRAW
+ENDDEF
+#
+# d_inverter
+#
+DEF d_inverter U 0 40 Y Y 1 F N
+F0 "U" 0 -100 60 H V C CNN
+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
+X ~ 1 -300 0 200 R 50 50 1 1 I
+X ~ 2 300 0 200 L 50 50 1 1 O I
+ENDDRAW
+ENDDEF
+#
+# d_or
+#
+DEF d_or U 0 40 Y Y 1 F N
+F0 "U" 0 0 60 H V C CNN
+F1 "d_or" 0 100 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A -450 50 224 266 -266 0 1 0 N -250 150 -250 -50
+A -25 -124 325 574 323 0 1 0 N 150 150 250 50
+A 74 125 191 -665 -231 0 1 0 N 150 -50 250 50
+P 2 0 1 0 -250 -50 150 -50 N
+P 2 0 1 0 -250 150 150 150 N
+X IN1 1 -450 100 215 R 50 50 1 1 I
+X IN2 2 -450 0 215 R 50 50 1 1 I
+X OUT 3 450 50 200 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/src/SubcircuitLibrary/74153/Dual4to1MUX.cir b/src/SubcircuitLibrary/74153/Dual4to1MUX.cir
index 5dddad23..583c4a00 100644
--- a/src/SubcircuitLibrary/74153/Dual4to1MUX.cir
+++ b/src/SubcircuitLibrary/74153/Dual4to1MUX.cir
@@ -1,45 +1,45 @@
-* C:\Users\malli\eSim\src\SubcircuitLibrary\74153\Dual4to1MUX.cir
-
-* EESchema Netlist Version 1.1 (Spice format) creation date: 03/23/19 11:18:42
-
-* To exclude a component from the Spice Netlist add [Spice_Netlist_Enabled] user FIELD set to: N
-* To reorder the component spice node sequence add [Spice_Node_Sequence] user FIELD and define sequence: 2,1,0
-
-* Sheet Name: /
-U14 Net-_U1-Pad12_ Net-_U14-Pad2_ Net-_U14-Pad3_ d_and
-U25 Net-_U14-Pad3_ Net-_U15-Pad3_ Net-_U25-Pad3_ d_and
-U5 Net-_U10-Pad1_ Net-_U1-Pad11_ Net-_U20-Pad1_ d_and
-U20 Net-_U20-Pad1_ Net-_U20-Pad2_ Net-_U20-Pad3_ d_and
-U7 Net-_U1-Pad12_ Net-_U1-Pad11_ Net-_U21-Pad1_ d_and
-U21 Net-_U21-Pad1_ Net-_U21-Pad2_ Net-_U21-Pad3_ d_and
-U18 Net-_U10-Pad1_ Net-_U14-Pad2_ Net-_U18-Pad3_ d_and
-U24 Net-_U18-Pad3_ Net-_U24-Pad2_ Net-_U24-Pad3_ d_and
-U28 Net-_U24-Pad3_ Net-_U25-Pad3_ Net-_U28-Pad3_ d_or
-U29 Net-_U20-Pad3_ Net-_U21-Pad3_ Net-_U29-Pad3_ d_or
-U32 Net-_U28-Pad3_ Net-_U29-Pad3_ Net-_U1-Pad13_ d_or
-U2 Net-_U1-Pad12_ Net-_U10-Pad1_ d_inverter
-U3 Net-_U1-Pad11_ Net-_U14-Pad2_ d_inverter
-U15 Net-_U1-Pad2_ Net-_U15-Pad2_ Net-_U15-Pad3_ d_and
-U6 Net-_U1-Pad3_ Net-_U15-Pad2_ Net-_U20-Pad2_ d_and
-U8 Net-_U1-Pad4_ Net-_U15-Pad2_ Net-_U21-Pad2_ d_and
-U4 Net-_U1-Pad1_ Net-_U15-Pad2_ Net-_U24-Pad2_ d_and
-U16 Net-_U1-Pad12_ Net-_U14-Pad2_ Net-_U16-Pad3_ d_and
-U27 Net-_U16-Pad3_ Net-_U17-Pad3_ Net-_U27-Pad3_ d_and
-U10 Net-_U10-Pad1_ Net-_U1-Pad11_ Net-_U10-Pad3_ d_and
-U22 Net-_U10-Pad3_ Net-_U11-Pad3_ Net-_U22-Pad3_ d_and
-U12 Net-_U1-Pad12_ Net-_U1-Pad11_ Net-_U12-Pad3_ d_and
-U23 Net-_U12-Pad3_ Net-_U13-Pad3_ Net-_U23-Pad3_ d_and
-U19 Net-_U10-Pad1_ Net-_U14-Pad2_ Net-_U19-Pad3_ d_and
-U26 Net-_U19-Pad3_ Net-_U26-Pad2_ Net-_U26-Pad3_ d_and
-U30 Net-_U26-Pad3_ Net-_U27-Pad3_ Net-_U30-Pad3_ d_or
-U31 Net-_U22-Pad3_ Net-_U23-Pad3_ Net-_U31-Pad3_ d_or
-U33 Net-_U30-Pad3_ Net-_U31-Pad3_ Net-_U1-Pad14_ d_or
-U17 Net-_U1-Pad7_ Net-_U11-Pad2_ Net-_U17-Pad3_ d_and
-U11 Net-_U1-Pad8_ Net-_U11-Pad2_ Net-_U11-Pad3_ d_and
-U13 Net-_U1-Pad9_ Net-_U11-Pad2_ Net-_U13-Pad3_ d_and
-U9 Net-_U1-Pad6_ Net-_U11-Pad2_ Net-_U26-Pad2_ d_and
-U1 Net-_U1-Pad1_ Net-_U1-Pad2_ Net-_U1-Pad3_ Net-_U1-Pad4_ Net-_U1-Pad5_ Net-_U1-Pad6_ Net-_U1-Pad7_ Net-_U1-Pad8_ Net-_U1-Pad9_ Net-_U1-Pad10_ Net-_U1-Pad11_ Net-_U1-Pad12_ Net-_U1-Pad13_ Net-_U1-Pad14_ PORT
-U34 Net-_U1-Pad5_ Net-_U15-Pad2_ d_inverter
-U35 Net-_U1-Pad10_ Net-_U11-Pad2_ d_inverter
-
-.end
+* C:\Users\malli\eSim\src\SubcircuitLibrary\74153\Dual4to1MUX.cir
+
+* EESchema Netlist Version 1.1 (Spice format) creation date: 03/23/19 11:18:42
+
+* To exclude a component from the Spice Netlist add [Spice_Netlist_Enabled] user FIELD set to: N
+* To reorder the component spice node sequence add [Spice_Node_Sequence] user FIELD and define sequence: 2,1,0
+
+* Sheet Name: /
+U14 Net-_U1-Pad12_ Net-_U14-Pad2_ Net-_U14-Pad3_ d_and
+U25 Net-_U14-Pad3_ Net-_U15-Pad3_ Net-_U25-Pad3_ d_and
+U5 Net-_U10-Pad1_ Net-_U1-Pad11_ Net-_U20-Pad1_ d_and
+U20 Net-_U20-Pad1_ Net-_U20-Pad2_ Net-_U20-Pad3_ d_and
+U7 Net-_U1-Pad12_ Net-_U1-Pad11_ Net-_U21-Pad1_ d_and
+U21 Net-_U21-Pad1_ Net-_U21-Pad2_ Net-_U21-Pad3_ d_and
+U18 Net-_U10-Pad1_ Net-_U14-Pad2_ Net-_U18-Pad3_ d_and
+U24 Net-_U18-Pad3_ Net-_U24-Pad2_ Net-_U24-Pad3_ d_and
+U28 Net-_U24-Pad3_ Net-_U25-Pad3_ Net-_U28-Pad3_ d_or
+U29 Net-_U20-Pad3_ Net-_U21-Pad3_ Net-_U29-Pad3_ d_or
+U32 Net-_U28-Pad3_ Net-_U29-Pad3_ Net-_U1-Pad13_ d_or
+U2 Net-_U1-Pad12_ Net-_U10-Pad1_ d_inverter
+U3 Net-_U1-Pad11_ Net-_U14-Pad2_ d_inverter
+U15 Net-_U1-Pad2_ Net-_U15-Pad2_ Net-_U15-Pad3_ d_and
+U6 Net-_U1-Pad3_ Net-_U15-Pad2_ Net-_U20-Pad2_ d_and
+U8 Net-_U1-Pad4_ Net-_U15-Pad2_ Net-_U21-Pad2_ d_and
+U4 Net-_U1-Pad1_ Net-_U15-Pad2_ Net-_U24-Pad2_ d_and
+U16 Net-_U1-Pad12_ Net-_U14-Pad2_ Net-_U16-Pad3_ d_and
+U27 Net-_U16-Pad3_ Net-_U17-Pad3_ Net-_U27-Pad3_ d_and
+U10 Net-_U10-Pad1_ Net-_U1-Pad11_ Net-_U10-Pad3_ d_and
+U22 Net-_U10-Pad3_ Net-_U11-Pad3_ Net-_U22-Pad3_ d_and
+U12 Net-_U1-Pad12_ Net-_U1-Pad11_ Net-_U12-Pad3_ d_and
+U23 Net-_U12-Pad3_ Net-_U13-Pad3_ Net-_U23-Pad3_ d_and
+U19 Net-_U10-Pad1_ Net-_U14-Pad2_ Net-_U19-Pad3_ d_and
+U26 Net-_U19-Pad3_ Net-_U26-Pad2_ Net-_U26-Pad3_ d_and
+U30 Net-_U26-Pad3_ Net-_U27-Pad3_ Net-_U30-Pad3_ d_or
+U31 Net-_U22-Pad3_ Net-_U23-Pad3_ Net-_U31-Pad3_ d_or
+U33 Net-_U30-Pad3_ Net-_U31-Pad3_ Net-_U1-Pad14_ d_or
+U17 Net-_U1-Pad7_ Net-_U11-Pad2_ Net-_U17-Pad3_ d_and
+U11 Net-_U1-Pad8_ Net-_U11-Pad2_ Net-_U11-Pad3_ d_and
+U13 Net-_U1-Pad9_ Net-_U11-Pad2_ Net-_U13-Pad3_ d_and
+U9 Net-_U1-Pad6_ Net-_U11-Pad2_ Net-_U26-Pad2_ d_and
+U1 Net-_U1-Pad1_ Net-_U1-Pad2_ Net-_U1-Pad3_ Net-_U1-Pad4_ Net-_U1-Pad5_ Net-_U1-Pad6_ Net-_U1-Pad7_ Net-_U1-Pad8_ Net-_U1-Pad9_ Net-_U1-Pad10_ Net-_U1-Pad11_ Net-_U1-Pad12_ Net-_U1-Pad13_ Net-_U1-Pad14_ PORT
+U34 Net-_U1-Pad5_ Net-_U15-Pad2_ d_inverter
+U35 Net-_U1-Pad10_ Net-_U11-Pad2_ d_inverter
+
+.end
diff --git a/src/SubcircuitLibrary/74153/Dual4to1MUX.sch b/src/SubcircuitLibrary/74153/Dual4to1MUX.sch
index bb19bb7d..340b1a31 100644
--- a/src/SubcircuitLibrary/74153/Dual4to1MUX.sch
+++ b/src/SubcircuitLibrary/74153/Dual4to1MUX.sch
@@ -1,814 +1,814 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:eSim_Analog
-LIBS:eSim_Devices
-LIBS:eSim_Digital
-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:74153-cache
-EELAYER 25 0
-EELAYER END
-$Descr A4 11693 8268
-encoding utf-8
-Sheet 1 1
-Title ""
-Date ""
-Rev ""
-Comp ""
-Comment1 ""
-Comment2 ""
-Comment3 ""
-Comment4 ""
-$EndDescr
-$Comp
-L d_and U14
-U 1 1 5C936BFE
-P 3850 2450
-F 0 "U14" H 3850 2450 60 0000 C CNN
-F 1 "d_and" H 3900 2550 60 0000 C CNN
-F 2 "" H 3850 2450 60 0000 C CNN
-F 3 "" H 3850 2450 60 0000 C CNN
- 1 3850 2450
- 1 0 0 -1
-$EndComp
-$Comp
-L d_and U25
-U 1 1 5C936C8A
-P 4850 2600
-F 0 "U25" H 4850 2600 60 0000 C CNN
-F 1 "d_and" H 4900 2700 60 0000 C CNN
-F 2 "" H 4850 2600 60 0000 C CNN
-F 3 "" H 4850 2600 60 0000 C CNN
- 1 4850 2600
- 1 0 0 -1
-$EndComp
-$Comp
-L d_and U5
-U 1 1 5C936E84
-P 3800 3050
-F 0 "U5" H 3800 3050 60 0000 C CNN
-F 1 "d_and" H 3850 3150 60 0000 C CNN
-F 2 "" H 3800 3050 60 0000 C CNN
-F 3 "" H 3800 3050 60 0000 C CNN
- 1 3800 3050
- 1 0 0 -1
-$EndComp
-$Comp
-L d_and U20
-U 1 1 5C936E8A
-P 4800 3200
-F 0 "U20" H 4800 3200 60 0000 C CNN
-F 1 "d_and" H 4850 3300 60 0000 C CNN
-F 2 "" H 4800 3200 60 0000 C CNN
-F 3 "" H 4800 3200 60 0000 C CNN
- 1 4800 3200
- 1 0 0 -1
-$EndComp
-$Comp
-L d_and U7
-U 1 1 5C936EF6
-P 3800 3550
-F 0 "U7" H 3800 3550 60 0000 C CNN
-F 1 "d_and" H 3850 3650 60 0000 C CNN
-F 2 "" H 3800 3550 60 0000 C CNN
-F 3 "" H 3800 3550 60 0000 C CNN
- 1 3800 3550
- 1 0 0 -1
-$EndComp
-$Comp
-L d_and U21
-U 1 1 5C936EFC
-P 4800 3700
-F 0 "U21" H 4800 3700 60 0000 C CNN
-F 1 "d_and" H 4850 3800 60 0000 C CNN
-F 2 "" H 4800 3700 60 0000 C CNN
-F 3 "" H 4800 3700 60 0000 C CNN
- 1 4800 3700
- 1 0 0 -1
-$EndComp
-$Comp
-L d_and U18
-U 1 1 5C936F88
-P 3950 1900
-F 0 "U18" H 3950 1900 60 0000 C CNN
-F 1 "d_and" H 4000 2000 60 0000 C CNN
-F 2 "" H 3950 1900 60 0000 C CNN
-F 3 "" H 3950 1900 60 0000 C CNN
- 1 3950 1900
- 1 0 0 -1
-$EndComp
-$Comp
-L d_and U24
-U 1 1 5C936F8E
-P 4850 2150
-F 0 "U24" H 4850 2150 60 0000 C CNN
-F 1 "d_and" H 4900 2250 60 0000 C CNN
-F 2 "" H 4850 2150 60 0000 C CNN
-F 3 "" H 4850 2150 60 0000 C CNN
- 1 4850 2150
- 1 0 0 -1
-$EndComp
-$Comp
-L d_or U28
-U 1 1 5C937316
-P 5900 2550
-F 0 "U28" H 5900 2550 60 0000 C CNN
-F 1 "d_or" H 5900 2650 60 0000 C CNN
-F 2 "" H 5900 2550 60 0000 C CNN
-F 3 "" H 5900 2550 60 0000 C CNN
- 1 5900 2550
- 1 0 0 -1
-$EndComp
-$Comp
-L d_or U29
-U 1 1 5C9373A8
-P 5900 2800
-F 0 "U29" H 5900 2800 60 0000 C CNN
-F 1 "d_or" H 5900 2900 60 0000 C CNN
-F 2 "" H 5900 2800 60 0000 C CNN
-F 3 "" H 5900 2800 60 0000 C CNN
- 1 5900 2800
- 1 0 0 -1
-$EndComp
-$Comp
-L d_or U32
-U 1 1 5C9373FC
-P 6850 2650
-F 0 "U32" H 6850 2650 60 0000 C CNN
-F 1 "d_or" H 6850 2750 60 0000 C CNN
-F 2 "" H 6850 2650 60 0000 C CNN
-F 3 "" H 6850 2650 60 0000 C CNN
- 1 6850 2650
- 1 0 0 -1
-$EndComp
-Wire Wire Line
- 4400 1850 4400 2050
-Wire Wire Line
- 4400 2500 4400 2400
-Wire Wire Line
- 4400 2400 4300 2400
-Wire Wire Line
- 4350 3100 4350 3000
-Wire Wire Line
- 4350 3000 4250 3000
-Wire Wire Line
- 4350 3600 4350 3500
-Wire Wire Line
- 4350 3500 4250 3500
-Wire Wire Line
- 6400 2550 6400 2500
-Wire Wire Line
- 6400 2500 6350 2500
-Wire Wire Line
- 6400 2650 6400 2750
-Wire Wire Line
- 6400 2750 6350 2750
-Wire Wire Line
- 5450 2450 5350 2450
-Wire Wire Line
- 5350 2450 5350 2100
-Wire Wire Line
- 5350 2100 5300 2100
-Wire Wire Line
- 5300 2550 5450 2550
-Wire Wire Line
- 5450 2700 5300 2700
-Wire Wire Line
- 5300 2700 5300 3150
-Wire Wire Line
- 5300 3150 5250 3150
-Wire Wire Line
- 5250 3650 5400 3650
-Wire Wire Line
- 5400 3650 5400 2800
-Wire Wire Line
- 5400 2800 5450 2800
-$Comp
-L d_inverter U2
-U 1 1 5C9378F6
-P 2650 1350
-F 0 "U2" H 2650 1250 60 0000 C CNN
-F 1 "d_inverter" H 2650 1500 60 0000 C CNN
-F 2 "" H 2700 1300 60 0000 C CNN
-F 3 "" H 2700 1300 60 0000 C CNN
- 1 2650 1350
- 1 0 0 -1
-$EndComp
-$Comp
-L d_inverter U3
-U 1 1 5C93798D
-P 2700 950
-F 0 "U3" H 2700 850 60 0000 C CNN
-F 1 "d_inverter" H 2700 1100 60 0000 C CNN
-F 2 "" H 2750 900 60 0000 C CNN
-F 3 "" H 2750 900 60 0000 C CNN
- 1 2700 950
- 1 0 0 -1
-$EndComp
-Wire Wire Line
- 3500 1800 3100 1800
-Wire Wire Line
- 3100 1350 3100 5600
-Wire Wire Line
- 3500 1900 3200 1900
-Wire Wire Line
- 3200 950 3200 5100
-Wire Wire Line
- 2950 1350 3100 1350
-Connection ~ 3100 1800
-Wire Wire Line
- 3000 950 3200 950
-Connection ~ 3200 1900
-Wire Wire Line
- 1800 950 2400 950
-Wire Wire Line
- 1800 1350 2350 1350
-Wire Wire Line
- 2200 950 2200 6200
-Connection ~ 2200 950
-Wire Wire Line
- 2300 1350 2300 6100
-$Comp
-L d_and U15
-U 1 1 5C937C96
-P 3850 2700
-F 0 "U15" H 3850 2700 60 0000 C CNN
-F 1 "d_and" H 3900 2800 60 0000 C CNN
-F 2 "" H 3850 2700 60 0000 C CNN
-F 3 "" H 3850 2700 60 0000 C CNN
- 1 3850 2700
- 1 0 0 -1
-$EndComp
-$Comp
-L d_and U6
-U 1 1 5C937CEE
-P 3800 3300
-F 0 "U6" H 3800 3300 60 0000 C CNN
-F 1 "d_and" H 3850 3400 60 0000 C CNN
-F 2 "" H 3800 3300 60 0000 C CNN
-F 3 "" H 3800 3300 60 0000 C CNN
- 1 3800 3300
- 1 0 0 -1
-$EndComp
-$Comp
-L d_and U8
-U 1 1 5C937D35
-P 3800 3800
-F 0 "U8" H 3800 3800 60 0000 C CNN
-F 1 "d_and" H 3850 3900 60 0000 C CNN
-F 2 "" H 3800 3800 60 0000 C CNN
-F 3 "" H 3800 3800 60 0000 C CNN
- 1 3800 3800
- 1 0 0 -1
-$EndComp
-$Comp
-L d_and U4
-U 1 1 5C937DC5
-P 3800 2150
-F 0 "U4" H 3800 2150 60 0000 C CNN
-F 1 "d_and" H 3850 2250 60 0000 C CNN
-F 2 "" H 3800 2150 60 0000 C CNN
-F 3 "" H 3800 2150 60 0000 C CNN
- 1 3800 2150
- 1 0 0 -1
-$EndComp
-Wire Wire Line
- 3350 2150 3300 2150
-Wire Wire Line
- 3300 2150 3300 3800
-Wire Wire Line
- 3300 2700 3400 2700
-Wire Wire Line
- 3300 3300 3350 3300
-Connection ~ 3300 2700
-Wire Wire Line
- 3000 3800 3350 3800
-Connection ~ 3300 3300
-Wire Wire Line
- 4350 3200 4350 3250
-Wire Wire Line
- 4350 3250 4250 3250
-Wire Wire Line
- 4400 2600 4400 2650
-Wire Wire Line
- 4400 2650 4300 2650
-Wire Wire Line
- 4400 2150 4300 2150
-Wire Wire Line
- 4300 2150 4300 2100
-Wire Wire Line
- 4300 2100 4250 2100
-Wire Wire Line
- 4350 3700 4250 3700
-Wire Wire Line
- 4250 3700 4250 3750
-Wire Wire Line
- 3350 3700 1600 3700
-Wire Wire Line
- 3350 3200 1600 3200
-Wire Wire Line
- 3400 2600 1600 2600
-Wire Wire Line
- 3350 2050 1600 2050
-Wire Wire Line
- 3000 3950 3000 3800
-Wire Wire Line
- 2950 3950 3000 3950
-Wire Wire Line
- 1600 3950 2350 3950
-Connection ~ 3300 3800
-$Comp
-L d_and U16
-U 1 1 5C9388D0
-P 3850 5100
-F 0 "U16" H 3850 5100 60 0000 C CNN
-F 1 "d_and" H 3900 5200 60 0000 C CNN
-F 2 "" H 3850 5100 60 0000 C CNN
-F 3 "" H 3850 5100 60 0000 C CNN
- 1 3850 5100
- 1 0 0 -1
-$EndComp
-$Comp
-L d_and U27
-U 1 1 5C9388D6
-P 4850 5250
-F 0 "U27" H 4850 5250 60 0000 C CNN
-F 1 "d_and" H 4900 5350 60 0000 C CNN
-F 2 "" H 4850 5250 60 0000 C CNN
-F 3 "" H 4850 5250 60 0000 C CNN
- 1 4850 5250
- 1 0 0 -1
-$EndComp
-$Comp
-L d_and U10
-U 1 1 5C9388DC
-P 3800 5700
-F 0 "U10" H 3800 5700 60 0000 C CNN
-F 1 "d_and" H 3850 5800 60 0000 C CNN
-F 2 "" H 3800 5700 60 0000 C CNN
-F 3 "" H 3800 5700 60 0000 C CNN
- 1 3800 5700
- 1 0 0 -1
-$EndComp
-$Comp
-L d_and U22
-U 1 1 5C9388E2
-P 4800 5850
-F 0 "U22" H 4800 5850 60 0000 C CNN
-F 1 "d_and" H 4850 5950 60 0000 C CNN
-F 2 "" H 4800 5850 60 0000 C CNN
-F 3 "" H 4800 5850 60 0000 C CNN
- 1 4800 5850
- 1 0 0 -1
-$EndComp
-$Comp
-L d_and U12
-U 1 1 5C9388E8
-P 3800 6200
-F 0 "U12" H 3800 6200 60 0000 C CNN
-F 1 "d_and" H 3850 6300 60 0000 C CNN
-F 2 "" H 3800 6200 60 0000 C CNN
-F 3 "" H 3800 6200 60 0000 C CNN
- 1 3800 6200
- 1 0 0 -1
-$EndComp
-$Comp
-L d_and U23
-U 1 1 5C9388EE
-P 4800 6350
-F 0 "U23" H 4800 6350 60 0000 C CNN
-F 1 "d_and" H 4850 6450 60 0000 C CNN
-F 2 "" H 4800 6350 60 0000 C CNN
-F 3 "" H 4800 6350 60 0000 C CNN
- 1 4800 6350
- 1 0 0 -1
-$EndComp
-$Comp
-L d_and U19
-U 1 1 5C9388F4
-P 3950 4550
-F 0 "U19" H 3950 4550 60 0000 C CNN
-F 1 "d_and" H 4000 4650 60 0000 C CNN
-F 2 "" H 3950 4550 60 0000 C CNN
-F 3 "" H 3950 4550 60 0000 C CNN
- 1 3950 4550
- 1 0 0 -1
-$EndComp
-$Comp
-L d_and U26
-U 1 1 5C9388FA
-P 4850 4800
-F 0 "U26" H 4850 4800 60 0000 C CNN
-F 1 "d_and" H 4900 4900 60 0000 C CNN
-F 2 "" H 4850 4800 60 0000 C CNN
-F 3 "" H 4850 4800 60 0000 C CNN
- 1 4850 4800
- 1 0 0 -1
-$EndComp
-$Comp
-L d_or U30
-U 1 1 5C938900
-P 5900 5200
-F 0 "U30" H 5900 5200 60 0000 C CNN
-F 1 "d_or" H 5900 5300 60 0000 C CNN
-F 2 "" H 5900 5200 60 0000 C CNN
-F 3 "" H 5900 5200 60 0000 C CNN
- 1 5900 5200
- 1 0 0 -1
-$EndComp
-$Comp
-L d_or U31
-U 1 1 5C938906
-P 5900 5450
-F 0 "U31" H 5900 5450 60 0000 C CNN
-F 1 "d_or" H 5900 5550 60 0000 C CNN
-F 2 "" H 5900 5450 60 0000 C CNN
-F 3 "" H 5900 5450 60 0000 C CNN
- 1 5900 5450
- 1 0 0 -1
-$EndComp
-$Comp
-L d_or U33
-U 1 1 5C93890C
-P 6850 5300
-F 0 "U33" H 6850 5300 60 0000 C CNN
-F 1 "d_or" H 6850 5400 60 0000 C CNN
-F 2 "" H 6850 5300 60 0000 C CNN
-F 3 "" H 6850 5300 60 0000 C CNN
- 1 6850 5300
- 1 0 0 -1
-$EndComp
-Wire Wire Line
- 4400 4500 4400 4700
-Wire Wire Line
- 4400 5150 4400 5050
-Wire Wire Line
- 4400 5050 4300 5050
-Wire Wire Line
- 4350 5750 4350 5650
-Wire Wire Line
- 4350 5650 4250 5650
-Wire Wire Line
- 4350 6250 4350 6150
-Wire Wire Line
- 4350 6150 4250 6150
-Wire Wire Line
- 6400 5200 6400 5150
-Wire Wire Line
- 6400 5150 6350 5150
-Wire Wire Line
- 6400 5300 6400 5400
-Wire Wire Line
- 6400 5400 6350 5400
-Wire Wire Line
- 5450 5100 5350 5100
-Wire Wire Line
- 5350 5100 5350 4750
-Wire Wire Line
- 5350 4750 5300 4750
-Wire Wire Line
- 5300 5200 5450 5200
-Wire Wire Line
- 5450 5350 5300 5350
-Wire Wire Line
- 5300 5350 5300 5800
-Wire Wire Line
- 5300 5800 5250 5800
-Wire Wire Line
- 5250 6300 5400 6300
-Wire Wire Line
- 5400 6300 5400 5450
-Wire Wire Line
- 5400 5450 5450 5450
-Wire Wire Line
- 3100 4450 3500 4450
-Wire Wire Line
- 3200 4550 3500 4550
-$Comp
-L d_and U17
-U 1 1 5C938937
-P 3850 5350
-F 0 "U17" H 3850 5350 60 0000 C CNN
-F 1 "d_and" H 3900 5450 60 0000 C CNN
-F 2 "" H 3850 5350 60 0000 C CNN
-F 3 "" H 3850 5350 60 0000 C CNN
- 1 3850 5350
- 1 0 0 -1
-$EndComp
-$Comp
-L d_and U11
-U 1 1 5C93893D
-P 3800 5950
-F 0 "U11" H 3800 5950 60 0000 C CNN
-F 1 "d_and" H 3850 6050 60 0000 C CNN
-F 2 "" H 3800 5950 60 0000 C CNN
-F 3 "" H 3800 5950 60 0000 C CNN
- 1 3800 5950
- 1 0 0 -1
-$EndComp
-$Comp
-L d_and U13
-U 1 1 5C938943
-P 3800 6450
-F 0 "U13" H 3800 6450 60 0000 C CNN
-F 1 "d_and" H 3850 6550 60 0000 C CNN
-F 2 "" H 3800 6450 60 0000 C CNN
-F 3 "" H 3800 6450 60 0000 C CNN
- 1 3800 6450
- 1 0 0 -1
-$EndComp
-$Comp
-L d_and U9
-U 1 1 5C938949
-P 3800 4800
-F 0 "U9" H 3800 4800 60 0000 C CNN
-F 1 "d_and" H 3850 4900 60 0000 C CNN
-F 2 "" H 3800 4800 60 0000 C CNN
-F 3 "" H 3800 4800 60 0000 C CNN
- 1 3800 4800
- 1 0 0 -1
-$EndComp
-Wire Wire Line
- 3350 4800 3300 4800
-Wire Wire Line
- 3300 4800 3300 6450
-Wire Wire Line
- 3300 5350 3400 5350
-Wire Wire Line
- 3300 5950 3350 5950
-Connection ~ 3300 5350
-Wire Wire Line
- 3200 6450 3350 6450
-Connection ~ 3300 5950
-Wire Wire Line
- 4350 5850 4350 5900
-Wire Wire Line
- 4350 5900 4250 5900
-Wire Wire Line
- 4400 5250 4400 5300
-Wire Wire Line
- 4400 5300 4300 5300
-Wire Wire Line
- 4400 4800 4300 4800
-Wire Wire Line
- 4300 4800 4300 4750
-Wire Wire Line
- 4300 4750 4250 4750
-Wire Wire Line
- 4350 6350 4250 6350
-Wire Wire Line
- 4250 6350 4250 6400
-Wire Wire Line
- 3350 6350 1600 6350
-Wire Wire Line
- 3350 5850 1600 5850
-Wire Wire Line
- 3400 5250 1600 5250
-Wire Wire Line
- 3350 4700 1600 4700
-Wire Wire Line
- 3200 6600 3200 6450
-Wire Wire Line
- 3000 6600 3200 6600
-Wire Wire Line
- 1600 6600 2400 6600
-Connection ~ 3300 6450
-Connection ~ 2300 1350
-Connection ~ 3100 4450
-Connection ~ 3200 4550
-$Comp
-L PORT U1
-U 1 1 5C93A0F9
-P 1350 2050
-F 0 "U1" H 1400 2150 30 0000 C CNN
-F 1 "PORT" H 1350 2050 30 0000 C CNN
-F 2 "" H 1350 2050 60 0000 C CNN
-F 3 "" H 1350 2050 60 0000 C CNN
- 1 1350 2050
- 1 0 0 -1
-$EndComp
-$Comp
-L PORT U1
-U 6 1 5C93A174
-P 1350 4700
-F 0 "U1" H 1400 4800 30 0000 C CNN
-F 1 "PORT" H 1350 4700 30 0000 C CNN
-F 2 "" H 1350 4700 60 0000 C CNN
-F 3 "" H 1350 4700 60 0000 C CNN
- 6 1350 4700
- 1 0 0 -1
-$EndComp
-$Comp
-L PORT U1
-U 2 1 5C93AA3C
-P 1350 2600
-F 0 "U1" H 1400 2700 30 0000 C CNN
-F 1 "PORT" H 1350 2600 30 0000 C CNN
-F 2 "" H 1350 2600 60 0000 C CNN
-F 3 "" H 1350 2600 60 0000 C CNN
- 2 1350 2600
- 1 0 0 -1
-$EndComp
-$Comp
-L PORT U1
-U 3 1 5C93AACB
-P 1350 3200
-F 0 "U1" H 1400 3300 30 0000 C CNN
-F 1 "PORT" H 1350 3200 30 0000 C CNN
-F 2 "" H 1350 3200 60 0000 C CNN
-F 3 "" H 1350 3200 60 0000 C CNN
- 3 1350 3200
- 1 0 0 -1
-$EndComp
-$Comp
-L PORT U1
-U 4 1 5C93AB5F
-P 1350 3700
-F 0 "U1" H 1400 3800 30 0000 C CNN
-F 1 "PORT" H 1350 3700 30 0000 C CNN
-F 2 "" H 1350 3700 60 0000 C CNN
-F 3 "" H 1350 3700 60 0000 C CNN
- 4 1350 3700
- 1 0 0 -1
-$EndComp
-$Comp
-L PORT U1
-U 7 1 5C93AD97
-P 1350 5250
-F 0 "U1" H 1400 5350 30 0000 C CNN
-F 1 "PORT" H 1350 5250 30 0000 C CNN
-F 2 "" H 1350 5250 60 0000 C CNN
-F 3 "" H 1350 5250 60 0000 C CNN
- 7 1350 5250
- 1 0 0 -1
-$EndComp
-$Comp
-L PORT U1
-U 8 1 5C93ADFC
-P 1350 5850
-F 0 "U1" H 1400 5950 30 0000 C CNN
-F 1 "PORT" H 1350 5850 30 0000 C CNN
-F 2 "" H 1350 5850 60 0000 C CNN
-F 3 "" H 1350 5850 60 0000 C CNN
- 8 1350 5850
- 1 0 0 -1
-$EndComp
-$Comp
-L PORT U1
-U 9 1 5C93AE63
-P 1350 6350
-F 0 "U1" H 1400 6450 30 0000 C CNN
-F 1 "PORT" H 1350 6350 30 0000 C CNN
-F 2 "" H 1350 6350 60 0000 C CNN
-F 3 "" H 1350 6350 60 0000 C CNN
- 9 1350 6350
- 1 0 0 -1
-$EndComp
-$Comp
-L PORT U1
-U 5 1 5C93AECA
-P 1350 3950
-F 0 "U1" H 1400 4050 30 0000 C CNN
-F 1 "PORT" H 1350 3950 30 0000 C CNN
-F 2 "" H 1350 3950 60 0000 C CNN
-F 3 "" H 1350 3950 60 0000 C CNN
- 5 1350 3950
- 1 0 0 -1
-$EndComp
-$Comp
-L PORT U1
-U 10 1 5C93AF79
-P 1350 6600
-F 0 "U1" H 1400 6700 30 0000 C CNN
-F 1 "PORT" H 1350 6600 30 0000 C CNN
-F 2 "" H 1350 6600 60 0000 C CNN
-F 3 "" H 1350 6600 60 0000 C CNN
- 10 1350 6600
- 1 0 0 -1
-$EndComp
-$Comp
-L PORT U1
-U 11 1 5C93B10A
-P 1550 950
-F 0 "U1" H 1600 1050 30 0000 C CNN
-F 1 "PORT" H 1550 950 30 0000 C CNN
-F 2 "" H 1550 950 60 0000 C CNN
-F 3 "" H 1550 950 60 0000 C CNN
- 11 1550 950
- 1 0 0 -1
-$EndComp
-$Comp
-L PORT U1
-U 12 1 5C93B179
-P 1550 1350
-F 0 "U1" H 1600 1450 30 0000 C CNN
-F 1 "PORT" H 1550 1350 30 0000 C CNN
-F 2 "" H 1550 1350 60 0000 C CNN
-F 3 "" H 1550 1350 60 0000 C CNN
- 12 1550 1350
- 1 0 0 -1
-$EndComp
-Wire Wire Line
- 7300 2600 7600 2600
-Wire Wire Line
- 7300 5250 7650 5250
-$Comp
-L PORT U1
-U 13 1 5C93B567
-P 7850 2600
-F 0 "U1" H 7900 2700 30 0000 C CNN
-F 1 "PORT" H 7850 2600 30 0000 C CNN
-F 2 "" H 7850 2600 60 0000 C CNN
-F 3 "" H 7850 2600 60 0000 C CNN
- 13 7850 2600
- -1 0 0 1
-$EndComp
-$Comp
-L PORT U1
-U 14 1 5C93B5DA
-P 7900 5250
-F 0 "U1" H 7950 5350 30 0000 C CNN
-F 1 "PORT" H 7900 5250 30 0000 C CNN
-F 2 "" H 7900 5250 60 0000 C CNN
-F 3 "" H 7900 5250 60 0000 C CNN
- 14 7900 5250
- -1 0 0 1
-$EndComp
-Connection ~ 2200 3450
-Wire Wire Line
- 3200 5100 3400 5100
-Wire Wire Line
- 3400 5000 2300 5000
-Connection ~ 2300 5000
-Wire Wire Line
- 3100 5600 3350 5600
-Wire Wire Line
- 2200 5700 3350 5700
-Wire Wire Line
- 2200 6200 3350 6200
-Connection ~ 2200 5700
-Wire Wire Line
- 2300 6100 3350 6100
-Wire Wire Line
- 3400 2450 3200 2450
-Connection ~ 3200 2450
-Wire Wire Line
- 3400 2350 2300 2350
-Connection ~ 2300 2350
-Wire Wire Line
- 3350 3050 2200 3050
-Connection ~ 2200 3050
-Wire Wire Line
- 3350 2950 3100 2950
-Connection ~ 3100 2950
-Wire Wire Line
- 3350 3450 2300 3450
-Wire Wire Line
- 2300 3450 2300 3400
-Connection ~ 2300 3400
-Wire Wire Line
- 3350 3550 2200 3550
-Connection ~ 2200 3550
-$Comp
-L d_inverter U34
-U 1 1 5C95C9D0
-P 2650 3950
-F 0 "U34" H 2650 3850 60 0000 C CNN
-F 1 "d_inverter" H 2650 4100 60 0000 C CNN
-F 2 "" H 2700 3900 60 0000 C CNN
-F 3 "" H 2700 3900 60 0000 C CNN
- 1 2650 3950
- 1 0 0 -1
-$EndComp
-$Comp
-L d_inverter U35
-U 1 1 5C95CD17
-P 2700 6600
-F 0 "U35" H 2700 6500 60 0000 C CNN
-F 1 "d_inverter" H 2700 6750 60 0000 C CNN
-F 2 "" H 2750 6550 60 0000 C CNN
-F 3 "" H 2750 6550 60 0000 C CNN
- 1 2700 6600
- 1 0 0 -1
-$EndComp
-$EndSCHEMATC
+EESchema Schematic File Version 2
+LIBS:power
+LIBS:device
+LIBS:texas
+LIBS:intel
+LIBS:audio
+LIBS:interface
+LIBS:digital-audio
+LIBS:philips
+LIBS:display
+LIBS:cypress
+LIBS:siliconi
+LIBS:opto
+LIBS:atmel
+LIBS:contrib
+LIBS:valves
+LIBS:eSim_Analog
+LIBS:eSim_Devices
+LIBS:eSim_Digital
+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:74153-cache
+EELAYER 25 0
+EELAYER END
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 1 1
+Title ""
+Date ""
+Rev ""
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+$Comp
+L d_and U14
+U 1 1 5C936BFE
+P 3850 2450
+F 0 "U14" H 3850 2450 60 0000 C CNN
+F 1 "d_and" H 3900 2550 60 0000 C CNN
+F 2 "" H 3850 2450 60 0000 C CNN
+F 3 "" H 3850 2450 60 0000 C CNN
+ 1 3850 2450
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_and U25
+U 1 1 5C936C8A
+P 4850 2600
+F 0 "U25" H 4850 2600 60 0000 C CNN
+F 1 "d_and" H 4900 2700 60 0000 C CNN
+F 2 "" H 4850 2600 60 0000 C CNN
+F 3 "" H 4850 2600 60 0000 C CNN
+ 1 4850 2600
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_and U5
+U 1 1 5C936E84
+P 3800 3050
+F 0 "U5" H 3800 3050 60 0000 C CNN
+F 1 "d_and" H 3850 3150 60 0000 C CNN
+F 2 "" H 3800 3050 60 0000 C CNN
+F 3 "" H 3800 3050 60 0000 C CNN
+ 1 3800 3050
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_and U20
+U 1 1 5C936E8A
+P 4800 3200
+F 0 "U20" H 4800 3200 60 0000 C CNN
+F 1 "d_and" H 4850 3300 60 0000 C CNN
+F 2 "" H 4800 3200 60 0000 C CNN
+F 3 "" H 4800 3200 60 0000 C CNN
+ 1 4800 3200
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_and U7
+U 1 1 5C936EF6
+P 3800 3550
+F 0 "U7" H 3800 3550 60 0000 C CNN
+F 1 "d_and" H 3850 3650 60 0000 C CNN
+F 2 "" H 3800 3550 60 0000 C CNN
+F 3 "" H 3800 3550 60 0000 C CNN
+ 1 3800 3550
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_and U21
+U 1 1 5C936EFC
+P 4800 3700
+F 0 "U21" H 4800 3700 60 0000 C CNN
+F 1 "d_and" H 4850 3800 60 0000 C CNN
+F 2 "" H 4800 3700 60 0000 C CNN
+F 3 "" H 4800 3700 60 0000 C CNN
+ 1 4800 3700
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_and U18
+U 1 1 5C936F88
+P 3950 1900
+F 0 "U18" H 3950 1900 60 0000 C CNN
+F 1 "d_and" H 4000 2000 60 0000 C CNN
+F 2 "" H 3950 1900 60 0000 C CNN
+F 3 "" H 3950 1900 60 0000 C CNN
+ 1 3950 1900
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_and U24
+U 1 1 5C936F8E
+P 4850 2150
+F 0 "U24" H 4850 2150 60 0000 C CNN
+F 1 "d_and" H 4900 2250 60 0000 C CNN
+F 2 "" H 4850 2150 60 0000 C CNN
+F 3 "" H 4850 2150 60 0000 C CNN
+ 1 4850 2150
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_or U28
+U 1 1 5C937316
+P 5900 2550
+F 0 "U28" H 5900 2550 60 0000 C CNN
+F 1 "d_or" H 5900 2650 60 0000 C CNN
+F 2 "" H 5900 2550 60 0000 C CNN
+F 3 "" H 5900 2550 60 0000 C CNN
+ 1 5900 2550
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_or U29
+U 1 1 5C9373A8
+P 5900 2800
+F 0 "U29" H 5900 2800 60 0000 C CNN
+F 1 "d_or" H 5900 2900 60 0000 C CNN
+F 2 "" H 5900 2800 60 0000 C CNN
+F 3 "" H 5900 2800 60 0000 C CNN
+ 1 5900 2800
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_or U32
+U 1 1 5C9373FC
+P 6850 2650
+F 0 "U32" H 6850 2650 60 0000 C CNN
+F 1 "d_or" H 6850 2750 60 0000 C CNN
+F 2 "" H 6850 2650 60 0000 C CNN
+F 3 "" H 6850 2650 60 0000 C CNN
+ 1 6850 2650
+ 1 0 0 -1
+$EndComp
+Wire Wire Line
+ 4400 1850 4400 2050
+Wire Wire Line
+ 4400 2500 4400 2400
+Wire Wire Line
+ 4400 2400 4300 2400
+Wire Wire Line
+ 4350 3100 4350 3000
+Wire Wire Line
+ 4350 3000 4250 3000
+Wire Wire Line
+ 4350 3600 4350 3500
+Wire Wire Line
+ 4350 3500 4250 3500
+Wire Wire Line
+ 6400 2550 6400 2500
+Wire Wire Line
+ 6400 2500 6350 2500
+Wire Wire Line
+ 6400 2650 6400 2750
+Wire Wire Line
+ 6400 2750 6350 2750
+Wire Wire Line
+ 5450 2450 5350 2450
+Wire Wire Line
+ 5350 2450 5350 2100
+Wire Wire Line
+ 5350 2100 5300 2100
+Wire Wire Line
+ 5300 2550 5450 2550
+Wire Wire Line
+ 5450 2700 5300 2700
+Wire Wire Line
+ 5300 2700 5300 3150
+Wire Wire Line
+ 5300 3150 5250 3150
+Wire Wire Line
+ 5250 3650 5400 3650
+Wire Wire Line
+ 5400 3650 5400 2800
+Wire Wire Line
+ 5400 2800 5450 2800
+$Comp
+L d_inverter U2
+U 1 1 5C9378F6
+P 2650 1350
+F 0 "U2" H 2650 1250 60 0000 C CNN
+F 1 "d_inverter" H 2650 1500 60 0000 C CNN
+F 2 "" H 2700 1300 60 0000 C CNN
+F 3 "" H 2700 1300 60 0000 C CNN
+ 1 2650 1350
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_inverter U3
+U 1 1 5C93798D
+P 2700 950
+F 0 "U3" H 2700 850 60 0000 C CNN
+F 1 "d_inverter" H 2700 1100 60 0000 C CNN
+F 2 "" H 2750 900 60 0000 C CNN
+F 3 "" H 2750 900 60 0000 C CNN
+ 1 2700 950
+ 1 0 0 -1
+$EndComp
+Wire Wire Line
+ 3500 1800 3100 1800
+Wire Wire Line
+ 3100 1350 3100 5600
+Wire Wire Line
+ 3500 1900 3200 1900
+Wire Wire Line
+ 3200 950 3200 5100
+Wire Wire Line
+ 2950 1350 3100 1350
+Connection ~ 3100 1800
+Wire Wire Line
+ 3000 950 3200 950
+Connection ~ 3200 1900
+Wire Wire Line
+ 1800 950 2400 950
+Wire Wire Line
+ 1800 1350 2350 1350
+Wire Wire Line
+ 2200 950 2200 6200
+Connection ~ 2200 950
+Wire Wire Line
+ 2300 1350 2300 6100
+$Comp
+L d_and U15
+U 1 1 5C937C96
+P 3850 2700
+F 0 "U15" H 3850 2700 60 0000 C CNN
+F 1 "d_and" H 3900 2800 60 0000 C CNN
+F 2 "" H 3850 2700 60 0000 C CNN
+F 3 "" H 3850 2700 60 0000 C CNN
+ 1 3850 2700
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_and U6
+U 1 1 5C937CEE
+P 3800 3300
+F 0 "U6" H 3800 3300 60 0000 C CNN
+F 1 "d_and" H 3850 3400 60 0000 C CNN
+F 2 "" H 3800 3300 60 0000 C CNN
+F 3 "" H 3800 3300 60 0000 C CNN
+ 1 3800 3300
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_and U8
+U 1 1 5C937D35
+P 3800 3800
+F 0 "U8" H 3800 3800 60 0000 C CNN
+F 1 "d_and" H 3850 3900 60 0000 C CNN
+F 2 "" H 3800 3800 60 0000 C CNN
+F 3 "" H 3800 3800 60 0000 C CNN
+ 1 3800 3800
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_and U4
+U 1 1 5C937DC5
+P 3800 2150
+F 0 "U4" H 3800 2150 60 0000 C CNN
+F 1 "d_and" H 3850 2250 60 0000 C CNN
+F 2 "" H 3800 2150 60 0000 C CNN
+F 3 "" H 3800 2150 60 0000 C CNN
+ 1 3800 2150
+ 1 0 0 -1
+$EndComp
+Wire Wire Line
+ 3350 2150 3300 2150
+Wire Wire Line
+ 3300 2150 3300 3800
+Wire Wire Line
+ 3300 2700 3400 2700
+Wire Wire Line
+ 3300 3300 3350 3300
+Connection ~ 3300 2700
+Wire Wire Line
+ 3000 3800 3350 3800
+Connection ~ 3300 3300
+Wire Wire Line
+ 4350 3200 4350 3250
+Wire Wire Line
+ 4350 3250 4250 3250
+Wire Wire Line
+ 4400 2600 4400 2650
+Wire Wire Line
+ 4400 2650 4300 2650
+Wire Wire Line
+ 4400 2150 4300 2150
+Wire Wire Line
+ 4300 2150 4300 2100
+Wire Wire Line
+ 4300 2100 4250 2100
+Wire Wire Line
+ 4350 3700 4250 3700
+Wire Wire Line
+ 4250 3700 4250 3750
+Wire Wire Line
+ 3350 3700 1600 3700
+Wire Wire Line
+ 3350 3200 1600 3200
+Wire Wire Line
+ 3400 2600 1600 2600
+Wire Wire Line
+ 3350 2050 1600 2050
+Wire Wire Line
+ 3000 3950 3000 3800
+Wire Wire Line
+ 2950 3950 3000 3950
+Wire Wire Line
+ 1600 3950 2350 3950
+Connection ~ 3300 3800
+$Comp
+L d_and U16
+U 1 1 5C9388D0
+P 3850 5100
+F 0 "U16" H 3850 5100 60 0000 C CNN
+F 1 "d_and" H 3900 5200 60 0000 C CNN
+F 2 "" H 3850 5100 60 0000 C CNN
+F 3 "" H 3850 5100 60 0000 C CNN
+ 1 3850 5100
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_and U27
+U 1 1 5C9388D6
+P 4850 5250
+F 0 "U27" H 4850 5250 60 0000 C CNN
+F 1 "d_and" H 4900 5350 60 0000 C CNN
+F 2 "" H 4850 5250 60 0000 C CNN
+F 3 "" H 4850 5250 60 0000 C CNN
+ 1 4850 5250
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_and U10
+U 1 1 5C9388DC
+P 3800 5700
+F 0 "U10" H 3800 5700 60 0000 C CNN
+F 1 "d_and" H 3850 5800 60 0000 C CNN
+F 2 "" H 3800 5700 60 0000 C CNN
+F 3 "" H 3800 5700 60 0000 C CNN
+ 1 3800 5700
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_and U22
+U 1 1 5C9388E2
+P 4800 5850
+F 0 "U22" H 4800 5850 60 0000 C CNN
+F 1 "d_and" H 4850 5950 60 0000 C CNN
+F 2 "" H 4800 5850 60 0000 C CNN
+F 3 "" H 4800 5850 60 0000 C CNN
+ 1 4800 5850
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_and U12
+U 1 1 5C9388E8
+P 3800 6200
+F 0 "U12" H 3800 6200 60 0000 C CNN
+F 1 "d_and" H 3850 6300 60 0000 C CNN
+F 2 "" H 3800 6200 60 0000 C CNN
+F 3 "" H 3800 6200 60 0000 C CNN
+ 1 3800 6200
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_and U23
+U 1 1 5C9388EE
+P 4800 6350
+F 0 "U23" H 4800 6350 60 0000 C CNN
+F 1 "d_and" H 4850 6450 60 0000 C CNN
+F 2 "" H 4800 6350 60 0000 C CNN
+F 3 "" H 4800 6350 60 0000 C CNN
+ 1 4800 6350
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_and U19
+U 1 1 5C9388F4
+P 3950 4550
+F 0 "U19" H 3950 4550 60 0000 C CNN
+F 1 "d_and" H 4000 4650 60 0000 C CNN
+F 2 "" H 3950 4550 60 0000 C CNN
+F 3 "" H 3950 4550 60 0000 C CNN
+ 1 3950 4550
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_and U26
+U 1 1 5C9388FA
+P 4850 4800
+F 0 "U26" H 4850 4800 60 0000 C CNN
+F 1 "d_and" H 4900 4900 60 0000 C CNN
+F 2 "" H 4850 4800 60 0000 C CNN
+F 3 "" H 4850 4800 60 0000 C CNN
+ 1 4850 4800
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_or U30
+U 1 1 5C938900
+P 5900 5200
+F 0 "U30" H 5900 5200 60 0000 C CNN
+F 1 "d_or" H 5900 5300 60 0000 C CNN
+F 2 "" H 5900 5200 60 0000 C CNN
+F 3 "" H 5900 5200 60 0000 C CNN
+ 1 5900 5200
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_or U31
+U 1 1 5C938906
+P 5900 5450
+F 0 "U31" H 5900 5450 60 0000 C CNN
+F 1 "d_or" H 5900 5550 60 0000 C CNN
+F 2 "" H 5900 5450 60 0000 C CNN
+F 3 "" H 5900 5450 60 0000 C CNN
+ 1 5900 5450
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_or U33
+U 1 1 5C93890C
+P 6850 5300
+F 0 "U33" H 6850 5300 60 0000 C CNN
+F 1 "d_or" H 6850 5400 60 0000 C CNN
+F 2 "" H 6850 5300 60 0000 C CNN
+F 3 "" H 6850 5300 60 0000 C CNN
+ 1 6850 5300
+ 1 0 0 -1
+$EndComp
+Wire Wire Line
+ 4400 4500 4400 4700
+Wire Wire Line
+ 4400 5150 4400 5050
+Wire Wire Line
+ 4400 5050 4300 5050
+Wire Wire Line
+ 4350 5750 4350 5650
+Wire Wire Line
+ 4350 5650 4250 5650
+Wire Wire Line
+ 4350 6250 4350 6150
+Wire Wire Line
+ 4350 6150 4250 6150
+Wire Wire Line
+ 6400 5200 6400 5150
+Wire Wire Line
+ 6400 5150 6350 5150
+Wire Wire Line
+ 6400 5300 6400 5400
+Wire Wire Line
+ 6400 5400 6350 5400
+Wire Wire Line
+ 5450 5100 5350 5100
+Wire Wire Line
+ 5350 5100 5350 4750
+Wire Wire Line
+ 5350 4750 5300 4750
+Wire Wire Line
+ 5300 5200 5450 5200
+Wire Wire Line
+ 5450 5350 5300 5350
+Wire Wire Line
+ 5300 5350 5300 5800
+Wire Wire Line
+ 5300 5800 5250 5800
+Wire Wire Line
+ 5250 6300 5400 6300
+Wire Wire Line
+ 5400 6300 5400 5450
+Wire Wire Line
+ 5400 5450 5450 5450
+Wire Wire Line
+ 3100 4450 3500 4450
+Wire Wire Line
+ 3200 4550 3500 4550
+$Comp
+L d_and U17
+U 1 1 5C938937
+P 3850 5350
+F 0 "U17" H 3850 5350 60 0000 C CNN
+F 1 "d_and" H 3900 5450 60 0000 C CNN
+F 2 "" H 3850 5350 60 0000 C CNN
+F 3 "" H 3850 5350 60 0000 C CNN
+ 1 3850 5350
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_and U11
+U 1 1 5C93893D
+P 3800 5950
+F 0 "U11" H 3800 5950 60 0000 C CNN
+F 1 "d_and" H 3850 6050 60 0000 C CNN
+F 2 "" H 3800 5950 60 0000 C CNN
+F 3 "" H 3800 5950 60 0000 C CNN
+ 1 3800 5950
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_and U13
+U 1 1 5C938943
+P 3800 6450
+F 0 "U13" H 3800 6450 60 0000 C CNN
+F 1 "d_and" H 3850 6550 60 0000 C CNN
+F 2 "" H 3800 6450 60 0000 C CNN
+F 3 "" H 3800 6450 60 0000 C CNN
+ 1 3800 6450
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_and U9
+U 1 1 5C938949
+P 3800 4800
+F 0 "U9" H 3800 4800 60 0000 C CNN
+F 1 "d_and" H 3850 4900 60 0000 C CNN
+F 2 "" H 3800 4800 60 0000 C CNN
+F 3 "" H 3800 4800 60 0000 C CNN
+ 1 3800 4800
+ 1 0 0 -1
+$EndComp
+Wire Wire Line
+ 3350 4800 3300 4800
+Wire Wire Line
+ 3300 4800 3300 6450
+Wire Wire Line
+ 3300 5350 3400 5350
+Wire Wire Line
+ 3300 5950 3350 5950
+Connection ~ 3300 5350
+Wire Wire Line
+ 3200 6450 3350 6450
+Connection ~ 3300 5950
+Wire Wire Line
+ 4350 5850 4350 5900
+Wire Wire Line
+ 4350 5900 4250 5900
+Wire Wire Line
+ 4400 5250 4400 5300
+Wire Wire Line
+ 4400 5300 4300 5300
+Wire Wire Line
+ 4400 4800 4300 4800
+Wire Wire Line
+ 4300 4800 4300 4750
+Wire Wire Line
+ 4300 4750 4250 4750
+Wire Wire Line
+ 4350 6350 4250 6350
+Wire Wire Line
+ 4250 6350 4250 6400
+Wire Wire Line
+ 3350 6350 1600 6350
+Wire Wire Line
+ 3350 5850 1600 5850
+Wire Wire Line
+ 3400 5250 1600 5250
+Wire Wire Line
+ 3350 4700 1600 4700
+Wire Wire Line
+ 3200 6600 3200 6450
+Wire Wire Line
+ 3000 6600 3200 6600
+Wire Wire Line
+ 1600 6600 2400 6600
+Connection ~ 3300 6450
+Connection ~ 2300 1350
+Connection ~ 3100 4450
+Connection ~ 3200 4550
+$Comp
+L PORT U1
+U 1 1 5C93A0F9
+P 1350 2050
+F 0 "U1" H 1400 2150 30 0000 C CNN
+F 1 "PORT" H 1350 2050 30 0000 C CNN
+F 2 "" H 1350 2050 60 0000 C CNN
+F 3 "" H 1350 2050 60 0000 C CNN
+ 1 1350 2050
+ 1 0 0 -1
+$EndComp
+$Comp
+L PORT U1
+U 6 1 5C93A174
+P 1350 4700
+F 0 "U1" H 1400 4800 30 0000 C CNN
+F 1 "PORT" H 1350 4700 30 0000 C CNN
+F 2 "" H 1350 4700 60 0000 C CNN
+F 3 "" H 1350 4700 60 0000 C CNN
+ 6 1350 4700
+ 1 0 0 -1
+$EndComp
+$Comp
+L PORT U1
+U 2 1 5C93AA3C
+P 1350 2600
+F 0 "U1" H 1400 2700 30 0000 C CNN
+F 1 "PORT" H 1350 2600 30 0000 C CNN
+F 2 "" H 1350 2600 60 0000 C CNN
+F 3 "" H 1350 2600 60 0000 C CNN
+ 2 1350 2600
+ 1 0 0 -1
+$EndComp
+$Comp
+L PORT U1
+U 3 1 5C93AACB
+P 1350 3200
+F 0 "U1" H 1400 3300 30 0000 C CNN
+F 1 "PORT" H 1350 3200 30 0000 C CNN
+F 2 "" H 1350 3200 60 0000 C CNN
+F 3 "" H 1350 3200 60 0000 C CNN
+ 3 1350 3200
+ 1 0 0 -1
+$EndComp
+$Comp
+L PORT U1
+U 4 1 5C93AB5F
+P 1350 3700
+F 0 "U1" H 1400 3800 30 0000 C CNN
+F 1 "PORT" H 1350 3700 30 0000 C CNN
+F 2 "" H 1350 3700 60 0000 C CNN
+F 3 "" H 1350 3700 60 0000 C CNN
+ 4 1350 3700
+ 1 0 0 -1
+$EndComp
+$Comp
+L PORT U1
+U 7 1 5C93AD97
+P 1350 5250
+F 0 "U1" H 1400 5350 30 0000 C CNN
+F 1 "PORT" H 1350 5250 30 0000 C CNN
+F 2 "" H 1350 5250 60 0000 C CNN
+F 3 "" H 1350 5250 60 0000 C CNN
+ 7 1350 5250
+ 1 0 0 -1
+$EndComp
+$Comp
+L PORT U1
+U 8 1 5C93ADFC
+P 1350 5850
+F 0 "U1" H 1400 5950 30 0000 C CNN
+F 1 "PORT" H 1350 5850 30 0000 C CNN
+F 2 "" H 1350 5850 60 0000 C CNN
+F 3 "" H 1350 5850 60 0000 C CNN
+ 8 1350 5850
+ 1 0 0 -1
+$EndComp
+$Comp
+L PORT U1
+U 9 1 5C93AE63
+P 1350 6350
+F 0 "U1" H 1400 6450 30 0000 C CNN
+F 1 "PORT" H 1350 6350 30 0000 C CNN
+F 2 "" H 1350 6350 60 0000 C CNN
+F 3 "" H 1350 6350 60 0000 C CNN
+ 9 1350 6350
+ 1 0 0 -1
+$EndComp
+$Comp
+L PORT U1
+U 5 1 5C93AECA
+P 1350 3950
+F 0 "U1" H 1400 4050 30 0000 C CNN
+F 1 "PORT" H 1350 3950 30 0000 C CNN
+F 2 "" H 1350 3950 60 0000 C CNN
+F 3 "" H 1350 3950 60 0000 C CNN
+ 5 1350 3950
+ 1 0 0 -1
+$EndComp
+$Comp
+L PORT U1
+U 10 1 5C93AF79
+P 1350 6600
+F 0 "U1" H 1400 6700 30 0000 C CNN
+F 1 "PORT" H 1350 6600 30 0000 C CNN
+F 2 "" H 1350 6600 60 0000 C CNN
+F 3 "" H 1350 6600 60 0000 C CNN
+ 10 1350 6600
+ 1 0 0 -1
+$EndComp
+$Comp
+L PORT U1
+U 11 1 5C93B10A
+P 1550 950
+F 0 "U1" H 1600 1050 30 0000 C CNN
+F 1 "PORT" H 1550 950 30 0000 C CNN
+F 2 "" H 1550 950 60 0000 C CNN
+F 3 "" H 1550 950 60 0000 C CNN
+ 11 1550 950
+ 1 0 0 -1
+$EndComp
+$Comp
+L PORT U1
+U 12 1 5C93B179
+P 1550 1350
+F 0 "U1" H 1600 1450 30 0000 C CNN
+F 1 "PORT" H 1550 1350 30 0000 C CNN
+F 2 "" H 1550 1350 60 0000 C CNN
+F 3 "" H 1550 1350 60 0000 C CNN
+ 12 1550 1350
+ 1 0 0 -1
+$EndComp
+Wire Wire Line
+ 7300 2600 7600 2600
+Wire Wire Line
+ 7300 5250 7650 5250
+$Comp
+L PORT U1
+U 13 1 5C93B567
+P 7850 2600
+F 0 "U1" H 7900 2700 30 0000 C CNN
+F 1 "PORT" H 7850 2600 30 0000 C CNN
+F 2 "" H 7850 2600 60 0000 C CNN
+F 3 "" H 7850 2600 60 0000 C CNN
+ 13 7850 2600
+ -1 0 0 1
+$EndComp
+$Comp
+L PORT U1
+U 14 1 5C93B5DA
+P 7900 5250
+F 0 "U1" H 7950 5350 30 0000 C CNN
+F 1 "PORT" H 7900 5250 30 0000 C CNN
+F 2 "" H 7900 5250 60 0000 C CNN
+F 3 "" H 7900 5250 60 0000 C CNN
+ 14 7900 5250
+ -1 0 0 1
+$EndComp
+Connection ~ 2200 3450
+Wire Wire Line
+ 3200 5100 3400 5100
+Wire Wire Line
+ 3400 5000 2300 5000
+Connection ~ 2300 5000
+Wire Wire Line
+ 3100 5600 3350 5600
+Wire Wire Line
+ 2200 5700 3350 5700
+Wire Wire Line
+ 2200 6200 3350 6200
+Connection ~ 2200 5700
+Wire Wire Line
+ 2300 6100 3350 6100
+Wire Wire Line
+ 3400 2450 3200 2450
+Connection ~ 3200 2450
+Wire Wire Line
+ 3400 2350 2300 2350
+Connection ~ 2300 2350
+Wire Wire Line
+ 3350 3050 2200 3050
+Connection ~ 2200 3050
+Wire Wire Line
+ 3350 2950 3100 2950
+Connection ~ 3100 2950
+Wire Wire Line
+ 3350 3450 2300 3450
+Wire Wire Line
+ 2300 3450 2300 3400
+Connection ~ 2300 3400
+Wire Wire Line
+ 3350 3550 2200 3550
+Connection ~ 2200 3550
+$Comp
+L d_inverter U34
+U 1 1 5C95C9D0
+P 2650 3950
+F 0 "U34" H 2650 3850 60 0000 C CNN
+F 1 "d_inverter" H 2650 4100 60 0000 C CNN
+F 2 "" H 2700 3900 60 0000 C CNN
+F 3 "" H 2700 3900 60 0000 C CNN
+ 1 2650 3950
+ 1 0 0 -1
+$EndComp
+$Comp
+L d_inverter U35
+U 1 1 5C95CD17
+P 2700 6600
+F 0 "U35" H 2700 6500 60 0000 C CNN
+F 1 "d_inverter" H 2700 6750 60 0000 C CNN
+F 2 "" H 2750 6550 60 0000 C CNN
+F 3 "" H 2750 6550 60 0000 C CNN
+ 1 2700 6600
+ 1 0 0 -1
+$EndComp
+$EndSCHEMATC
diff --git a/src/SubcircuitLibrary/74153/analysis b/src/SubcircuitLibrary/74153/analysis
index 655d30ed..ebd5c0a9 100644
--- a/src/SubcircuitLibrary/74153/analysis
+++ b/src/SubcircuitLibrary/74153/analysis
@@ -1 +1 @@
-.tran 0e-03 0e-00 0e-03
\ No newline at end of file
+.tran 0e-00 0e-00 0e-00
\ No newline at end of file
--
cgit