Merge pull request #134 from saurabhb17/master

cleanup part2

4 files changed, 131 insertions, 0 deletions

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..c955612e 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,19 @@
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
+<<<<<<< HEAD
 # DC
 #
 DEF DC 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
+=======
+# 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
+>>>>>>> fellowship2019-python3
 F2 "R1" -300 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 $FPLIST
@@ -110,9 +118,16 @@ ENDDEF
 #
 DEF eSim_R R 0 0 N Y 1 F N
 F0 "R" 50 130 50 H V C CNN
+<<<<<<< HEAD
 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
+=======
+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
+>>>>>>> fellowship2019-python3
 $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 43701631..7634e0b8 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,3 +1,4 @@
+<<<<<<< HEAD
 update=06/01/19 05:45:01

 version=1

 last_client=eeschema

@@ -42,3 +43,50 @@ LibName8=C:/Users/Bhargav/eSim/kicadSchematicLibrary/eSim_Power
 LibName9=C:/Users/Bhargav/eSim/kicadSchematicLibrary/eSim_Sources

 LibName10=C:/Users/Bhargav/eSim/kicadSchematicLibrary/eSim_Subckt

 LibName11=C:/Users/Bhargav/eSim/kicadSchematicLibrary/eSim_User

+=======
+update=Wed Mar 11 12:54:03 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=
+[eeschema/libraries]
+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
+>>>>>>> fellowship2019-python3
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..f18161c9 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,20 @@
 EESchema Schematic File Version 2
+<<<<<<< HEAD
 LIBS:power
+=======
+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
+>>>>>>> fellowship2019-python3
 LIBS:4_Input_NOR_Characteristics-cache
 EELAYER 25 0
 EELAYER END
@@ -364,7 +379,11 @@ F 3 "" V 7400 3450 30  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
+<<<<<<< HEAD
 L DC v6
+=======
+L DC-RESCUE-4_Input_NOR_Characteristics v6
+>>>>>>> fellowship2019-python3
 U 1 1 5CF1E4C8
 P 8200 3550
 F 0 "v6" H 8000 3650 60  0000 C CNN
@@ -375,7 +394,11 @@ F 3 "" H 8200 3550 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
+<<<<<<< HEAD
 L DC v5
+=======
+L DC-RESCUE-4_Input_NOR_Characteristics v5
+>>>>>>> fellowship2019-python3
 U 1 1 5CF1E4C2
 P 8200 3650
 F 0 "v5" H 8000 3750 60  0000 C CNN
@@ -386,7 +409,11 @@ F 3 "" H 8200 3650 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
+<<<<<<< HEAD
 L DC v8
+=======
+L DC-RESCUE-4_Input_NOR_Characteristics v8
+>>>>>>> fellowship2019-python3
 U 1 1 5CF1E4BC
 P 8200 3350
 F 0 "v8" H 8000 3450 60  0000 C CNN
@@ -397,7 +424,11 @@ F 3 "" H 8200 3350 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
+<<<<<<< HEAD
 L DC v7
+=======
+L DC-RESCUE-4_Input_NOR_Characteristics v7
+>>>>>>> fellowship2019-python3
 U 1 1 5CF1E4B6
 P 8200 3450
 F 0 "v7" H 8000 3550 60  0000 C CNN
@@ -556,7 +587,11 @@ F 3 "" V 3600 3350 30  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
+<<<<<<< HEAD
 L DC v4
+=======
+L DC-RESCUE-4_Input_NOR_Characteristics v4
+>>>>>>> fellowship2019-python3
 U 1 1 5CF1D11E
 P 2750 3550
 F 0 "v4" H 2550 3650 60  0000 C CNN
@@ -567,7 +602,11 @@ F 3 "" H 2750 3550 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
+<<<<<<< HEAD
 L DC v3
+=======
+L DC-RESCUE-4_Input_NOR_Characteristics v3
+>>>>>>> fellowship2019-python3
 U 1 1 5CF1D0EF
 P 2750 3450
 F 0 "v3" H 2550 3550 60  0000 C CNN
@@ -578,7 +617,11 @@ F 3 "" H 2750 3450 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
+<<<<<<< HEAD
 L DC v2
+=======
+L DC-RESCUE-4_Input_NOR_Characteristics v2
+>>>>>>> fellowship2019-python3
 U 1 1 5CF1D0C3
 P 2700 3350
 F 0 "v2" H 2500 3450 60  0000 C CNN
@@ -589,7 +632,11 @@ F 3 "" H 2700 3350 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
+<<<<<<< HEAD
 L DC v1
+=======
+L DC-RESCUE-4_Input_NOR_Characteristics v1
+>>>>>>> fellowship2019-python3
 U 1 1 5CF1CE2E
 P 2700 3250
 F 0 "v1" H 2500 3350 60  0000 C CNN