16 files changed, 0 insertions, 808 deletions
diff --git a/src/SubcircuitLibrary/full_sub/analysis b/src/SubcircuitLibrary/full_sub/analysis
deleted file mode 100644
index 660a46cc..00000000
--- a/src/SubcircuitLibrary/full_sub/analysis
+++ /dev/null
@@ -1 +0,0 @@
-.tran 10e-03 100e-03 0e-03
-\ No newline at end of file
diff --git a/src/SubcircuitLibrary/full_sub/full_sub-cache.lib b/src/SubcircuitLibrary/full_sub/full_sub-cache.lib
deleted file mode 100644
index 6949ac1a..00000000
--- a/src/SubcircuitLibrary/full_sub/full_sub-cache.lib
+++ /dev/null
@@ -1,79 +0,0 @@
-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
-#
-# half_sub
-#
-DEF half_sub X 0 40 Y Y 1 F N
-F0 "X" 0 0 60 H V C CNN
-F1 "half_sub" 0 0 60 H V C CNN
-F2 "" 0 0 60 H I C CNN
-F3 "" 0 0 60 H I C CNN
-DRAW
-S -300 300 300 -300 0 1 0 N
-X A 1 -500 200 200 R 50 50 1 1 I
-X B 2 -500 -100 200 R 50 50 1 1 I
-X D 3 500 150 200 L 50 50 1 1 O
-X BORROW 4 500 -100 200 L 50 50 1 1 O
-ENDDRAW
-ENDDEF
-#
-#End Library
diff --git a/src/SubcircuitLibrary/full_sub/full_sub-rescue.lib b/src/SubcircuitLibrary/full_sub/full_sub-rescue.lib
deleted file mode 100644
index 803b5ece..00000000
--- a/src/SubcircuitLibrary/full_sub/full_sub-rescue.lib
+++ /dev/null
@@ -1,20 +0,0 @@
-EESchema-LIBRARY Version 2.3
-#encoding utf-8
-#
-# half_sub-RESCUE-full_sub
-#
-DEF half_sub-RESCUE-full_sub X 0 40 Y Y 1 F N
-F0 "X" 0 0 60 H V C CNN
-F1 "half_sub-RESCUE-full_sub" 0 0 60 H V C CNN
-F2 "" 0 0 60 H I C CNN
-F3 "" 0 0 60 H I C CNN
-DRAW
-S -1450 850 1550 -1050 0 1 0 N
-X A 1 -1100 850 200 R 50 50 1 1 I
-X B 2 -350 850 200 R 50 50 1 1 I
-X D 3 -800 -1050 200 L 50 50 1 1 O
-X BORROW 4 0 -1050 200 L 50 50 1 1 O
-ENDDRAW
-ENDDEF
-#
-#End Library
diff --git a/src/SubcircuitLibrary/full_sub/full_sub.cir b/src/SubcircuitLibrary/full_sub/full_sub.cir
deleted file mode 100644
index 67359421..00000000
--- a/src/SubcircuitLibrary/full_sub/full_sub.cir
+++ /dev/null
@@ -1,14 +0,0 @@
-* C:\esim\eSim\src\SubcircuitLibrary\full_sub\full_sub.cir
-
-* EESchema Netlist Version 1.1 (Spice format) creation date: 03/07/19 10:58:59
-
-* 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: /
-U3  Net-_U3-Pad1_ Net-_U3-Pad2_ Net-_U3-Pad3_ d_or		
-U5  Net-_U5-Pad1_ Net-_U5-Pad2_ Net-_U5-Pad3_ Net-_U5-Pad4_ Net-_U3-Pad3_ PORT		
-X1  Net-_U5-Pad1_ Net-_U5-Pad2_ Net-_X1-Pad3_ Net-_U3-Pad1_ half_sub		
-X2  Net-_U5-Pad3_ Net-_X1-Pad3_ Net-_U5-Pad4_ Net-_U3-Pad2_ half_sub		
-
-.end
diff --git a/src/SubcircuitLibrary/full_sub/full_sub.cir.out b/src/SubcircuitLibrary/full_sub/full_sub.cir.out
deleted file mode 100644
index 5e58cc0a..00000000
--- a/src/SubcircuitLibrary/full_sub/full_sub.cir.out
+++ /dev/null
@@ -1,19 +0,0 @@
-* c:\esim\esim\src\subcircuitlibrary\full_sub\full_sub.cir
-
-.include half_sub.sub
-* u3  net-_u3-pad1_ net-_u3-pad2_ net-_u3-pad3_ d_or
-* u5  net-_u5-pad1_ net-_u5-pad2_ net-_u5-pad3_ net-_u5-pad4_ net-_u3-pad3_ port
-x1 net-_u5-pad1_ net-_u5-pad2_ net-_x1-pad3_ net-_u3-pad1_ half_sub
-x2 net-_u5-pad3_ net-_x1-pad3_ net-_u5-pad4_ net-_u3-pad2_ half_sub
-a1 [net-_u3-pad1_ net-_u3-pad2_ ] net-_u3-pad3_ u3
-* 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 ) 
-.tran 10e-03 100e-03 0e-03
-
-* Control Statements 
-.control
-run
-print allv > plot_data_v.txt
-print alli > plot_data_i.txt
-.endc
-.end
diff --git a/src/SubcircuitLibrary/full_sub/full_sub.pro b/src/SubcircuitLibrary/full_sub/full_sub.pro
deleted file mode 100644
index 1a0c3543..00000000
--- a/src/SubcircuitLibrary/full_sub/full_sub.pro
+++ /dev/null
@@ -1,74 +0,0 @@
-update=03/07/19 10:55:03
-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=full_sub-rescue
-LibName2=adc-dac
-LibName3=memory
-LibName4=xilinx
-LibName5=microcontrollers
-LibName6=dsp
-LibName7=microchip
-LibName8=analog_switches
-LibName9=motorola
-LibName10=texas
-LibName11=intel
-LibName12=audio
-LibName13=interface
-LibName14=digital-audio
-LibName15=philips
-LibName16=display
-LibName17=cypress
-LibName18=siliconi
-LibName19=opto
-LibName20=atmel
-LibName21=contrib
-LibName22=power
-LibName23=device
-LibName24=transistors
-LibName25=conn
-LibName26=linear
-LibName27=regul
-LibName28=74xx
-LibName29=cmos4000
-LibName30=eSim_Analog
-LibName31=eSim_Devices
-LibName32=eSim_Digital
-LibName33=eSim_Hybrid
-LibName34=eSim_Miscellaneous
-LibName35=eSim_Power
-LibName36=eSim_Sources
-LibName37=eSim_Subckt
-LibName38=eSim_User
-LibName39=eSim_Plot
-LibName40=eSim_PSpice
-
diff --git a/src/SubcircuitLibrary/full_sub/full_sub.sch b/src/SubcircuitLibrary/full_sub/full_sub.sch
deleted file mode 100644
index 99ca85e5..00000000
--- a/src/SubcircuitLibrary/full_sub/full_sub.sch
+++ /dev/null
@@ -1,211 +0,0 @@
-EESchema Schematic File Version 2
-LIBS:full_sub-rescue
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-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:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:eSim_Analog
-LIBS:eSim_Devices
-LIBS:eSim_Digital
-LIBS:eSim_Hybrid
-LIBS:eSim_Miscellaneous
-LIBS:eSim_Power
-LIBS:eSim_Sources
-LIBS:eSim_Subckt
-LIBS:eSim_User
-LIBS:eSim_Plot
-LIBS:eSim_PSpice
-LIBS:full_sub-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_or U3
-U 1 1 5C80734A
-P 9350 4050
-F 0 "U3" H 9350 4050 60  0000 C CNN
-F 1 "d_or" H 9350 4150 60  0000 C CNN
-F 2 "" H 9350 4050 60  0000 C CNN
-F 3 "" H 9350 4050 60  0000 C CNN
-	1    9350 4050
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	4850 3600 5800 3600
-Wire Wire Line
-	4650 2800 8600 2800
-Wire Wire Line
-	8600 2800 8600 3950
-Wire Wire Line
-	8600 3950 8900 3950
-Wire Wire Line
-	8100 4450 8650 4450
-Wire Wire Line
-	8650 4450 8650 4050
-Wire Wire Line
-	8650 4050 8900 4050
-Wire Wire Line
-	2800 3450 2800 3250
-Wire Wire Line
-	2800 3250 3300 3250
-Wire Wire Line
-	1450 3550 3300 3550
-Wire Wire Line
-	4050 5100 5200 5100
-Wire Wire Line
-	5800 3600 5800 5250
-Wire Wire Line
-	8250 5250 9350 5250
-Wire Wire Line
-	9350 5250 9350 4900
-Wire Wire Line
-	9350 4900 10750 4900
-Wire Wire Line
-	9800 4000 9800 4600
-Wire Wire Line
-	9800 4600 9550 4600
-Wire Wire Line
-	9550 4600 9550 4800
-Wire Wire Line
-	9550 4800 10750 4800
-$Comp
-L PORT U5
-U 1 1 5C80A4E8
-P 1200 3450
-F 0 "U5" H 1250 3550 30  0000 C CNN
-F 1 "PORT" H 1200 3450 30  0000 C CNN
-F 2 "" H 1200 3450 60  0000 C CNN
-F 3 "" H 1200 3450 60  0000 C CNN
-	1    1200 3450
-	1    0    0    -1  
-$EndComp
-$Comp
-L PORT U5
-U 2 1 5C80A51E
-P 1200 3650
-F 0 "U5" H 1250 3750 30  0000 C CNN
-F 1 "PORT" H 1200 3650 30  0000 C CNN
-F 2 "" H 1200 3650 60  0000 C CNN
-F 3 "" H 1200 3650 60  0000 C CNN
-	2    1200 3650
-	1    0    0    -1  
-$EndComp
-$Comp
-L PORT U5
-U 3 1 5C80A54E
-P 3800 5100
-F 0 "U5" H 3850 5200 30  0000 C CNN
-F 1 "PORT" H 3800 5100 30  0000 C CNN
-F 2 "" H 3800 5100 60  0000 C CNN
-F 3 "" H 3800 5100 60  0000 C CNN
-	3    3800 5100
-	1    0    0    -1  
-$EndComp
-$Comp
-L PORT U5
-U 5 1 5C80A828
-P 11000 4800
-F 0 "U5" H 11050 4900 30  0000 C CNN
-F 1 "PORT" H 11000 4800 30  0000 C CNN
-F 2 "" H 11000 4800 60  0000 C CNN
-F 3 "" H 11000 4800 60  0000 C CNN
-	5    11000 4800
-	-1   0    0    1   
-$EndComp
-$Comp
-L PORT U5
-U 4 1 5C80AB2A
-P 11000 4950
-F 0 "U5" H 11050 5050 30  0000 C CNN
-F 1 "PORT" H 11000 4950 30  0000 C CNN
-F 2 "" H 11000 4950 60  0000 C CNN
-F 3 "" H 11000 4950 60  0000 C CNN
-	4    11000 4950
-	-1   0    0    1   
-$EndComp
-Wire Wire Line
-	1450 3450 2800 3450
-Wire Wire Line
-	1450 3650 1450 3550
-Wire Wire Line
-	10750 4900 10750 4950
-$Comp
-L half_sub X1
-U 1 1 5C80AC4D
-P 3800 3450
-F 0 "X1" H 3800 3450 60  0000 C CNN
-F 1 "half_sub" H 3800 3450 60  0000 C CNN
-F 2 "" H 3800 3450 60  0001 C CNN
-F 3 "" H 3800 3450 60  0001 C CNN
-	1    3800 3450
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	4300 3550 4650 3550
-Wire Wire Line
-	4650 3550 4650 2800
-Wire Wire Line
-	4300 3300 4850 3300
-Wire Wire Line
-	4850 3300 4850 3600
-$Comp
-L half_sub X2
-U 1 1 5C80AD72
-P 7300 5150
-F 0 "X2" H 7300 5150 60  0000 C CNN
-F 1 "half_sub" H 7300 5150 60  0000 C CNN
-F 2 "" H 7300 5150 60  0001 C CNN
-F 3 "" H 7300 5150 60  0001 C CNN
-	1    7300 5150
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	5800 5250 6800 5250
-Wire Wire Line
-	5200 5100 5200 4950
-Wire Wire Line
-	5200 4950 6800 4950
-Wire Wire Line
-	7800 5000 8250 5000
-Wire Wire Line
-	8250 5000 8250 5250
-Wire Wire Line
-	7800 5250 8100 5250
-Wire Wire Line
-	8100 5250 8100 4450
-$EndSCHEMATC
diff --git a/src/SubcircuitLibrary/full_sub/full_sub.sub b/src/SubcircuitLibrary/full_sub/full_sub.sub
deleted file mode 100644
index 9c9dcc5a..00000000
--- a/src/SubcircuitLibrary/full_sub/full_sub.sub
+++ /dev/null
@@ -1,13 +0,0 @@
-* Subcircuit full_sub
-.subckt full_sub net-_u5-pad1_ net-_u5-pad2_ net-_u5-pad3_ net-_u5-pad4_ net-_u3-pad3_ 
-* c:\esim\esim\src\subcircuitlibrary\full_sub\full_sub.cir
-.include half_sub.sub
-* u3  net-_u3-pad1_ net-_u3-pad2_ net-_u3-pad3_ d_or
-x1 net-_u5-pad1_ net-_u5-pad2_ net-_x1-pad3_ net-_u3-pad1_ half_sub
-x2 net-_u5-pad3_ net-_x1-pad3_ net-_u5-pad4_ net-_u3-pad2_ half_sub
-a1 [net-_u3-pad1_ net-_u3-pad2_ ] net-_u3-pad3_ u3
-* 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 )
-* Control Statements
-
-.ends full_sub
-\ No newline at end of file
diff --git a/src/SubcircuitLibrary/full_sub/full_sub_Previous_Values.xml b/src/SubcircuitLibrary/full_sub/full_sub_Previous_Values.xml
deleted file mode 100644
index fcdb63e0..00000000
--- a/src/SubcircuitLibrary/full_sub/full_sub_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time">0</field1><field2 name="Step Time">10</field2><field3 name="Stop Time">100</field3><field4 name="Start Combo">ms</field4><field5 name="Step Combo">ms</field5><field6 name="Stop Combo">ms</field6></tran></analysis><source /><model><u3 name="type">d_or<field1 name="Enter Fall Delay (default=1.0e-9)" /><field2 name="Enter Input Load (default=1.0e-12)" /><field3 name="Enter Rise Delay (default=1.0e-9)" /></u3></model><devicemodel /><subcircuit><x2><field>C:\esim\eSim\src\SubcircuitLibrary\half_sub</field></x2><x1><field>C:\esim\eSim\src\SubcircuitLibrary\half_sub</field></x1></subcircuit></KicadtoNgspice>
-\ No newline at end of file
diff --git a/src/SubcircuitLibrary/full_sub/half_sub-cache.lib b/src/SubcircuitLibrary/full_sub/half_sub-cache.lib
deleted file mode 100644
index bd15e664..00000000
--- a/src/SubcircuitLibrary/full_sub/half_sub-cache.lib
+++ /dev/null
@@ -1,95 +0,0 @@
-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_xor
-#
-DEF d_xor U 0 40 Y Y 1 F N
-F0 "U" 0 0 60 H V C CNN
-F1 "d_xor" 50 100 47 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 -350 50 180 -337 337 0 1 0 N -200 -50 -200 150
-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 150 -50 -200 -50 N
-P 2 0 1 0 150 150 -200 150 N
-X IN1 1 -450 100 215 R 50 43 1 1 I
-X IN2 2 -450 0 215 R 50 43 1 1 I
-X OUT 3 450 50 200 L 50 39 1 1 O
-ENDDRAW
-ENDDEF
-#
-#End Library
diff --git a/src/SubcircuitLibrary/full_sub/half_sub.cir b/src/SubcircuitLibrary/full_sub/half_sub.cir
deleted file mode 100644
index f20f0368..00000000
--- a/src/SubcircuitLibrary/full_sub/half_sub.cir
+++ /dev/null
@@ -1,14 +0,0 @@
-* /home/bhargav/Downloads/eSim-1.1.2/src/SubcircuitLibrary/half_sub/half_sub.cir
-
-* EESchema Netlist Version 1.1 (Spice format) creation date: Wed 06 Mar 2019 08:19:54 PM IST
-
-* 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: /
-U3  Net-_U1-Pad1_ Net-_U1-Pad2_ Net-_U1-Pad3_ d_xor		
-U2  Net-_U1-Pad1_ Net-_U2-Pad2_ d_inverter		
-U4  Net-_U1-Pad2_ Net-_U2-Pad2_ 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/full_sub/half_sub.cir.out b/src/SubcircuitLibrary/full_sub/half_sub.cir.out
deleted file mode 100644
index 91816956..00000000
--- a/src/SubcircuitLibrary/full_sub/half_sub.cir.out
+++ /dev/null
@@ -1,24 +0,0 @@
-* /home/bhargav/downloads/esim-1.1.2/src/subcircuitlibrary/half_sub/half_sub.cir
-
-* u3  net-_u1-pad1_ net-_u1-pad2_ net-_u1-pad3_ d_xor
-* u2  net-_u1-pad1_ net-_u2-pad2_ d_inverter
-* u4  net-_u1-pad2_ net-_u2-pad2_ 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-_u1-pad3_ u3
-a2 net-_u1-pad1_ net-_u2-pad2_ u2
-a3 [net-_u1-pad2_ net-_u2-pad2_ ] net-_u1-pad4_ u4
-* Schematic Name: d_xor, NgSpice Name: d_xor
-.model u3 d_xor(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 ) 
-* 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_and, NgSpice Name: d_and
-.model u4 d_and(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 ) 
-.tran 10e-03 100e-03 0e-03
-
-* Control Statements 
-.control
-run
-print allv > plot_data_v.txt
-print alli > plot_data_i.txt
-.endc
-.end
diff --git a/src/SubcircuitLibrary/full_sub/half_sub.pro b/src/SubcircuitLibrary/full_sub/half_sub.pro
deleted file mode 100644
index 90e3ded9..00000000
--- a/src/SubcircuitLibrary/full_sub/half_sub.pro
+++ /dev/null
@@ -1,74 +0,0 @@
-update=Wed 06 Mar 2019 11:10:38 PM IST
-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=adc-dac
-LibName2=memory
-LibName3=xilinx
-LibName4=microcontrollers
-LibName5=dsp
-LibName6=microchip
-LibName7=analog_switches
-LibName8=motorola
-LibName9=texas
-LibName10=intel
-LibName11=audio
-LibName12=interface
-LibName13=digital-audio
-LibName14=philips
-LibName15=display
-LibName16=cypress
-LibName17=siliconi
-LibName18=opto
-LibName19=atmel
-LibName20=contrib
-LibName21=power
-LibName22=device
-LibName23=transistors
-LibName24=conn
-LibName25=linear
-LibName26=regul
-LibName27=74xx
-LibName28=cmos4000
-LibName29=eSim_Analog
-LibName30=eSim_Devices
-LibName31=eSim_Digital
-LibName32=eSim_Hybrid
-LibName33=eSim_Miscellaneous
-LibName34=eSim_Power
-LibName35=eSim_Sources
-LibName36=eSim_Subckt
-LibName37=eSim_User
-LibName38=eSim_Plot
-LibName39=eSim_PSpice
-LibName40=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Subckt
-
diff --git a/src/SubcircuitLibrary/full_sub/half_sub.sch b/src/SubcircuitLibrary/full_sub/half_sub.sch
deleted file mode 100644
index e70b1675..00000000
--- a/src/SubcircuitLibrary/full_sub/half_sub.sch
+++ /dev/null
@@ -1,150 +0,0 @@
-EESchema Schematic File Version 2
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-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:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:eSim_Analog
-LIBS:eSim_Devices
-LIBS:eSim_Digital
-LIBS:eSim_Hybrid
-LIBS:eSim_Miscellaneous
-LIBS:eSim_Power
-LIBS:eSim_Sources
-LIBS:eSim_Subckt
-LIBS:eSim_User
-LIBS:eSim_Plot
-LIBS:eSim_PSpice
-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_xor U3
-U 1 1 5C7FDDA3
-P 4400 3150
-F 0 "U3" H 4400 3150 60  0000 C CNN
-F 1 "d_xor" H 4450 3250 47  0000 C CNN
-F 2 "" H 4400 3150 60  0000 C CNN
-F 3 "" H 4400 3150 60  0000 C CNN
-	1    4400 3150
-	1    0    0    -1  
-$EndComp
-$Comp
-L d_inverter U2
-U 1 1 5C7FDDD8
-P 3400 3750
-F 0 "U2" H 3400 3650 60  0000 C CNN
-F 1 "d_inverter" H 3400 3900 60  0000 C CNN
-F 2 "" H 3450 3700 60  0000 C CNN
-F 3 "" H 3450 3700 60  0000 C CNN
-	1    3400 3750
-	1    0    0    -1  
-$EndComp
-$Comp
-L d_and U4
-U 1 1 5C7FDE57
-P 4450 3750
-F 0 "U4" H 4450 3750 60  0000 C CNN
-F 1 "d_and" H 4500 3850 60  0000 C CNN
-F 2 "" H 4450 3750 60  0000 C CNN
-F 3 "" H 4450 3750 60  0000 C CNN
-	1    4450 3750
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	3950 3150 3950 3650
-Wire Wire Line
-	3950 3650 4000 3650
-Wire Wire Line
-	3700 3750 4000 3750
-Wire Wire Line
-	3100 3750 3100 3050
-Wire Wire Line
-	2950 3050 3950 3050
-$Comp
-L PORT U1
-U 1 1 5C7FDF5A
-P 2700 3050
-F 0 "U1" H 2750 3150 30  0000 C CNN
-F 1 "PORT" H 2700 3050 30  0000 C CNN
-F 2 "" H 2700 3050 60  0000 C CNN
-F 3 "" H 2700 3050 60  0000 C CNN
-	1    2700 3050
-	1    0    0    -1  
-$EndComp
-$Comp
-L PORT U1
-U 2 1 5C7FDF97
-P 3500 3350
-F 0 "U1" H 3550 3450 30  0000 C CNN
-F 1 "PORT" H 3500 3350 30  0000 C CNN
-F 2 "" H 3500 3350 60  0000 C CNN
-F 3 "" H 3500 3350 60  0000 C CNN
-	2    3500 3350
-	1    0    0    -1  
-$EndComp
-$Comp
-L PORT U1
-U 3 1 5C7FE00A
-P 5300 3100
-F 0 "U1" H 5350 3200 30  0000 C CNN
-F 1 "PORT" H 5300 3100 30  0000 C CNN
-F 2 "" H 5300 3100 60  0000 C CNN
-F 3 "" H 5300 3100 60  0000 C CNN
-	3    5300 3100
-	-1   0    0    1   
-$EndComp
-$Comp
-L PORT U1
-U 4 1 5C7FE064
-P 5350 3700
-F 0 "U1" H 5400 3800 30  0000 C CNN
-F 1 "PORT" H 5350 3700 30  0000 C CNN
-F 2 "" H 5350 3700 60  0000 C CNN
-F 3 "" H 5350 3700 60  0000 C CNN
-	4    5350 3700
-	-1   0    0    1   
-$EndComp
-Connection ~ 3100 3050
-Wire Wire Line
-	3750 3350 3950 3350
-Connection ~ 3950 3350
-Wire Wire Line
-	4850 3100 5050 3100
-Wire Wire Line
-	4900 3700 5100 3700
-$EndSCHEMATC
diff --git a/src/SubcircuitLibrary/full_sub/half_sub.sub b/src/SubcircuitLibrary/full_sub/half_sub.sub
deleted file mode 100644
index a61a3409..00000000
--- a/src/SubcircuitLibrary/full_sub/half_sub.sub
+++ /dev/null
@@ -1,18 +0,0 @@
-* Subcircuit half_sub
-.subckt half_sub net-_u1-pad1_ net-_u1-pad2_ net-_u1-pad3_ net-_u1-pad4_ 
-* /home/bhargav/downloads/esim-1.1.2/src/subcircuitlibrary/half_sub/half_sub.cir
-* u3  net-_u1-pad1_ net-_u1-pad2_ net-_u1-pad3_ d_xor
-* u2  net-_u1-pad1_ net-_u2-pad2_ d_inverter
-* u4  net-_u1-pad2_ net-_u2-pad2_ net-_u1-pad4_ d_and
-a1 [net-_u1-pad1_ net-_u1-pad2_ ] net-_u1-pad3_ u3
-a2 net-_u1-pad1_ net-_u2-pad2_ u2
-a3 [net-_u1-pad2_ net-_u2-pad2_ ] net-_u1-pad4_ u4
-* Schematic Name: d_xor, NgSpice Name: d_xor
-.model u3 d_xor(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
-* 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_and, NgSpice Name: d_and
-.model u4 d_and(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
-* Control Statements
-
-.ends half_sub
-\ No newline at end of file
diff --git a/src/SubcircuitLibrary/full_sub/half_sub_Previous_Values.xml b/src/SubcircuitLibrary/full_sub/half_sub_Previous_Values.xml
deleted file mode 100644
index 115ba703..00000000
--- a/src/SubcircuitLibrary/full_sub/half_sub_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<KicadtoNgspice><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time">0</field1><field2 name="Step Time">10</field2><field3 name="Stop Time">100</field3><field4 name="Start Combo">ms</field4><field5 name="Step Combo">ms</field5><field6 name="Stop Combo">ms</field6></tran></analysis><source /><model><u3 name="type">d_xor<field1 name="Enter Fall Delay (default=1.0e-9)" /><field2 name="Enter Input Load (default=1.0e-12)" /><field3 name="Enter Rise Delay (default=1.0e-9)" /></u3><u2 name="type">d_inverter<field4 name="Enter Fall Delay (default=1.0e-9)" /><field5 name="Enter Input Load (default=1.0e-12)" /><field6 name="Enter Rise Delay (default=1.0e-9)" /></u2><u4 name="type">d_and<field7 name="Enter Fall Delay (default=1.0e-9)" /><field8 name="Enter Input Load (default=1.0e-12)" /><field9 name="Enter Rise Delay (default=1.0e-9)" /></u4></model><devicemodel /><subcircuit /></KicadtoNgspice>
-\ No newline at end of file