minor

8 files changed, 152 insertions, 120 deletions

diff --git a/Examples/Analysis_Of_Digital_IC/3_Input_NAND_Characteristics/3_and.pro b/Examples/Analysis_Of_Digital_IC/3_Input_NAND_Characteristics/3_and.pro
index 0fdf4d25..c5f4a39f 100644
--- a/Examples/Analysis_Of_Digital_IC/3_Input_NAND_Characteristics/3_and.pro
+++ b/Examples/Analysis_Of_Digital_IC/3_Input_NAND_Characteristics/3_and.pro
@@ -1,44 +1,43 @@
-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=Wed Mar 18 19:43:53 2020
+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_Sources
+LibName9=eSim_Subckt
+LibName10=eSim_User
diff --git a/Examples/Analysis_Of_Digital_IC/3_Input_NAND_Characteristics/plot_data_i.txt b/Examples/Analysis_Of_Digital_IC/3_Input_NAND_Characteristics/plot_data_i.txt
index 0a1605df..1b24c22f 100644
--- a/Examples/Analysis_Of_Digital_IC/3_Input_NAND_Characteristics/plot_data_i.txt
+++ b/Examples/Analysis_Of_Digital_IC/3_Input_NAND_Characteristics/plot_data_i.txt
@@ -1,5 +1,5 @@
             * c:\users\malli\esim-workspace\4023_test\4023_test.cir
-            Transient Analysis  Wed Mar 18 18:12:20  2020
+            Transient Analysis  Wed Mar 18 19:44:14  2020
 --------------------------------------------------------------------------------
 Index   time            a4#branch_1_0   a4#branch_1_1   a4#branch_1_2   
 --------------------------------------------------------------------------------
@@ -67,7 +67,7 @@ Index   time            a4#branch_1_0   a4#branch_1_1   a4#branch_1_2
 58	1.000000e-01	0.000000e+00	0.000000e+00	0.000000e+00	
 
             * c:\users\malli\esim-workspace\4023_test\4023_test.cir
-            Transient Analysis  Wed Mar 18 18:12:20  2020
+            Transient Analysis  Wed Mar 18 19:44:14  2020
 --------------------------------------------------------------------------------
 Index   time            v1#branch       v2#branch       v3#branch       
 --------------------------------------------------------------------------------
@@ -135,7 +135,7 @@ Index   time            v1#branch       v2#branch       v3#branch
 58	1.000000e-01	0.000000e+00	0.000000e+00	0.000000e+00	
 
             * c:\users\malli\esim-workspace\4023_test\4023_test.cir
-            Transient Analysis  Wed Mar 18 18:12:20  2020
+            Transient Analysis  Wed Mar 18 19:44:14  2020
 --------------------------------------------------------------------------------
 Index   time            v4#branch       v5#branch       v6#branch       
 --------------------------------------------------------------------------------
@@ -203,7 +203,7 @@ Index   time            v4#branch       v5#branch       v6#branch
 58	1.000000e-01	0.000000e+00	0.000000e+00	0.000000e+00	
 
             * c:\users\malli\esim-workspace\4023_test\4023_test.cir
-            Transient Analysis  Wed Mar 18 18:12:20  2020
+            Transient Analysis  Wed Mar 18 19:44:14  2020
 --------------------------------------------------------------------------------
 Index   time            v7#branch       v8#branch       v9#branch       
 --------------------------------------------------------------------------------
diff --git a/Examples/Analysis_Of_Digital_IC/3_Input_NAND_Characteristics/plot_data_v.txt b/Examples/Analysis_Of_Digital_IC/3_Input_NAND_Characteristics/plot_data_v.txt
index f1e450ec..109a3ed3 100644
--- a/Examples/Analysis_Of_Digital_IC/3_Input_NAND_Characteristics/plot_data_v.txt
+++ b/Examples/Analysis_Of_Digital_IC/3_Input_NAND_Characteristics/plot_data_v.txt
@@ -1,5 +1,5 @@
             * c:\users\malli\esim-workspace\4023_test\4023_test.cir
-            Transient Analysis  Wed Mar 18 18:12:20  2020
+            Transient Analysis  Wed Mar 18 19:44:14  2020
 --------------------------------------------------------------------------------
 Index   time            a1              a2              a3              
 --------------------------------------------------------------------------------
@@ -67,7 +67,7 @@ Index   time            a1              a2              a3
 58	1.000000e-01	0.000000e+00	5.000000e+00	5.000000e+00	
 
             * c:\users\malli\esim-workspace\4023_test\4023_test.cir
-            Transient Analysis  Wed Mar 18 18:12:20  2020
+            Transient Analysis  Wed Mar 18 19:44:14  2020
 --------------------------------------------------------------------------------
 Index   time            b1              b2              b3              
 --------------------------------------------------------------------------------
@@ -135,7 +135,7 @@ Index   time            b1              b2              b3
 58	1.000000e-01	5.000000e+00	0.000000e+00	5.000000e+00	
 
             * c:\users\malli\esim-workspace\4023_test\4023_test.cir
-            Transient Analysis  Wed Mar 18 18:12:20  2020
+            Transient Analysis  Wed Mar 18 19:44:14  2020
 --------------------------------------------------------------------------------
 Index   time            c1              c2              c3              
 --------------------------------------------------------------------------------
@@ -203,7 +203,7 @@ Index   time            c1              c2              c3
 58	1.000000e-01	0.000000e+00	0.000000e+00	0.000000e+00	
 
             * c:\users\malli\esim-workspace\4023_test\4023_test.cir
-            Transient Analysis  Wed Mar 18 18:12:20  2020
+            Transient Analysis  Wed Mar 18 19:44:14  2020
 --------------------------------------------------------------------------------
 Index   time            q1              q2              q3              
 --------------------------------------------------------------------------------
diff --git a/Examples/Analysis_Of_Digital_IC/4073_test/3_and.pro b/Examples/Analysis_Of_Digital_IC/4073_test/3_and.pro
index 0fdf4d25..dfb28cee 100644
--- a/Examples/Analysis_Of_Digital_IC/4073_test/3_and.pro
+++ b/Examples/Analysis_Of_Digital_IC/4073_test/3_and.pro
@@ -1,44 +1,43 @@
-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=Wed Mar 18 19:41:37 2020
+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_Sources
+LibName9=eSim_Subckt
+LibName10=eSim_User
diff --git a/Examples/Analysis_Of_Digital_IC/4_Input_NOR_Characteristics/4_Input_NOR_Characteristics-cache.lib b/Examples/Analysis_Of_Digital_IC/4_Input_NOR_Characteristics/4_Input_NOR_Characteristics-cache.lib
index 57f05c24..798ad8bc 100644
--- a/Examples/Analysis_Of_Digital_IC/4_Input_NOR_Characteristics/4_Input_NOR_Characteristics-cache.lib
+++ b/Examples/Analysis_Of_Digital_IC/4_Input_NOR_Characteristics/4_Input_NOR_Characteristics-cache.lib
@@ -1,11 +1,11 @@
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
-# DC
+# DC-RESCUE-4_Input_NOR_Characteristics
 #
-DEF DC v 0 40 Y Y 1 F N
+DEF DC-RESCUE-4_Input_NOR_Characteristics v 0 40 Y Y 1 F N
 F0 "v" -200 100 60 H V C CNN
-F1 "DC" -200 -50 60 H V C CNN
+F1 "DC-RESCUE-4_Input_NOR_Characteristics" -200 -50 60 H V C CNN
 F2 "R1" -300 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 $FPLIST
@@ -110,9 +110,10 @@ ENDDEF
 #
 DEF eSim_R R 0 0 N Y 1 F N
 F0 "R" 50 130 50 H V C CNN
-F1 "eSim_R" 50 50 50 H V C CNN
+F1 "eSim_R" 50 -50 50 H V C CNN
 F2 "" 50 -20 30 H V C CNN
 F3 "" 50 50 30 V V C CNN
+ALIAS resistor
 $FPLIST
  R_*
  Resistor_*
diff --git a/Examples/Analysis_Of_Digital_IC/4_Input_NOR_Characteristics/4_Input_NOR_Characteristics-rescue.lib b/Examples/Analysis_Of_Digital_IC/4_Input_NOR_Characteristics/4_Input_NOR_Characteristics-rescue.lib
new file mode 100644
index 00000000..9ba9e4d7
--- /dev/null
+++ b/Examples/Analysis_Of_Digital_IC/4_Input_NOR_Characteristics/4_Input_NOR_Characteristics-rescue.lib
@@ -0,0 +1,21 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# DC-RESCUE-4_Input_NOR_Characteristics
+#
+DEF DC-RESCUE-4_Input_NOR_Characteristics v 0 40 Y Y 1 F N
+F0 "v" -200 100 60 H V C CNN
+F1 "DC-RESCUE-4_Input_NOR_Characteristics" -200 -50 60 H V C CNN
+F2 "R1" -300 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ 1_pin
+$ENDFPLIST
+DRAW
+C 0 0 150 0 1 0 N
+X + 1 0 450 300 D 50 50 1 1 P
+X - 2 0 -450 300 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/Examples/Analysis_Of_Digital_IC/4_Input_NOR_Characteristics/4_Input_NOR_Characteristics.pro b/Examples/Analysis_Of_Digital_IC/4_Input_NOR_Characteristics/4_Input_NOR_Characteristics.pro
index d20e19b0..9f91a19f 100644
--- a/Examples/Analysis_Of_Digital_IC/4_Input_NOR_Characteristics/4_Input_NOR_Characteristics.pro
+++ b/Examples/Analysis_Of_Digital_IC/4_Input_NOR_Characteristics/4_Input_NOR_Characteristics.pro
@@ -1,4 +1,4 @@
-update=Wed Mar 18 18:14:21 2020
+update=Wed Mar 18 19:49:13 2020
 version=1
 last_client=eeschema
 [general]
@@ -31,14 +31,15 @@ NetIExt=net
 version=1
 LibDir=
 [eeschema/libraries]
-LibName1=power
-LibName2=eSim_Devices
-LibName3=eSim_User
-LibName4=eSim_Subckt
-LibName5=eSim_Sources
-LibName6=eSim_Power
-LibName7=eSim_Plot
-LibName8=eSim_Miscellaneous
-LibName9=eSim_Hybrid
-LibName10=eSim_Digital
-LibName11=eSim_Analog
+LibName1=4_Input_NOR_Characteristics-rescue
+LibName2=power
+LibName3=eSim_Devices
+LibName4=eSim_User
+LibName5=eSim_Subckt
+LibName6=eSim_Sources
+LibName7=eSim_Power
+LibName8=eSim_Plot
+LibName9=eSim_Miscellaneous
+LibName10=eSim_Hybrid
+LibName11=eSim_Digital
+LibName12=eSim_Analog
diff --git a/Examples/Analysis_Of_Digital_IC/4_Input_NOR_Characteristics/4_Input_NOR_Characteristics.sch b/Examples/Analysis_Of_Digital_IC/4_Input_NOR_Characteristics/4_Input_NOR_Characteristics.sch
index e07e773f..9ecf9c77 100644
--- a/Examples/Analysis_Of_Digital_IC/4_Input_NOR_Characteristics/4_Input_NOR_Characteristics.sch
+++ b/Examples/Analysis_Of_Digital_IC/4_Input_NOR_Characteristics/4_Input_NOR_Characteristics.sch
@@ -1,5 +1,16 @@
 EESchema Schematic File Version 2
+LIBS:4_Input_NOR_Characteristics-rescue
 LIBS:power
+LIBS:eSim_Devices
+LIBS:eSim_User
+LIBS:eSim_Subckt
+LIBS:eSim_Sources
+LIBS:eSim_Power
+LIBS:eSim_Plot
+LIBS:eSim_Miscellaneous
+LIBS:eSim_Hybrid
+LIBS:eSim_Digital
+LIBS:eSim_Analog
 LIBS:4_Input_NOR_Characteristics-cache
 EELAYER 25 0
 EELAYER END
@@ -364,7 +375,7 @@ F 3 "" V 7400 3450 30  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L DC v6
+L DC-RESCUE-4_Input_NOR_Characteristics v6
 U 1 1 5CF1E4C8
 P 8200 3550
 F 0 "v6" H 8000 3650 60  0000 C CNN
@@ -375,7 +386,7 @@ F 3 "" H 8200 3550 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L DC v5
+L DC-RESCUE-4_Input_NOR_Characteristics v5
 U 1 1 5CF1E4C2
 P 8200 3650
 F 0 "v5" H 8000 3750 60  0000 C CNN
@@ -386,7 +397,7 @@ F 3 "" H 8200 3650 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L DC v8
+L DC-RESCUE-4_Input_NOR_Characteristics v8
 U 1 1 5CF1E4BC
 P 8200 3350
 F 0 "v8" H 8000 3450 60  0000 C CNN
@@ -397,7 +408,7 @@ F 3 "" H 8200 3350 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L DC v7
+L DC-RESCUE-4_Input_NOR_Characteristics v7
 U 1 1 5CF1E4B6
 P 8200 3450
 F 0 "v7" H 8000 3550 60  0000 C CNN
@@ -556,7 +567,7 @@ F 3 "" V 3600 3350 30  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L DC v4
+L DC-RESCUE-4_Input_NOR_Characteristics v4
 U 1 1 5CF1D11E
 P 2750 3550
 F 0 "v4" H 2550 3650 60  0000 C CNN
@@ -567,7 +578,7 @@ F 3 "" H 2750 3550 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L DC v3
+L DC-RESCUE-4_Input_NOR_Characteristics v3
 U 1 1 5CF1D0EF
 P 2750 3450
 F 0 "v3" H 2550 3550 60  0000 C CNN
@@ -578,7 +589,7 @@ F 3 "" H 2750 3450 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L DC v2
+L DC-RESCUE-4_Input_NOR_Characteristics v2
 U 1 1 5CF1D0C3
 P 2700 3350
 F 0 "v2" H 2500 3450 60  0000 C CNN
@@ -589,7 +600,7 @@ F 3 "" H 2700 3350 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L DC v1
+L DC-RESCUE-4_Input_NOR_Characteristics v1
 U 1 1 5CF1CE2E
 P 2700 3250
 F 0 "v1" H 2500 3350 60  0000 C CNN