Modified Example

10 files changed, 176 insertions, 63 deletions

diff --git a/Examples/Halfwave_Rectifier/Halfwave_Rectifier-cache.lib b/Examples/Halfwave_Rectifier/Halfwave_Rectifier-cache.lib
index b5a381ce..3c867dec 100644
--- a/Examples/Halfwave_Rectifier/Halfwave_Rectifier-cache.lib
+++ b/Examples/Halfwave_Rectifier/Halfwave_Rectifier-cache.lib
@@ -49,11 +49,11 @@ P 6 0 1 0  0 0  0 50  -75 100  0 150  75 100  0 50 N
 ENDDRAW
 ENDDEF
 #
-# R
+# R-RESCUE-Halfwave_Rectifier
 #
-DEF R R 0 0 N Y 1 F N
+DEF R-RESCUE-Halfwave_Rectifier R 0 0 N Y 1 F N
 F0 "R" 80 0 50 V V C CNN
-F1 "R" 0 0 50 V V C CNN
+F1 "R-RESCUE-Halfwave_Rectifier" 0 0 50 V V C CNN
 F2 "" -70 0 30 V V C CNN
 F3 "" 0 0 30 H V C CNN
 $FPLIST
diff --git a/Examples/Halfwave_Rectifier/Halfwave_Rectifier-rescue.lib b/Examples/Halfwave_Rectifier/Halfwave_Rectifier-rescue.lib
new file mode 100644
index 00000000..89ca7210
--- /dev/null
+++ b/Examples/Halfwave_Rectifier/Halfwave_Rectifier-rescue.lib
@@ -0,0 +1,22 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# R-RESCUE-Halfwave_Rectifier
+#
+DEF R-RESCUE-Halfwave_Rectifier R 0 0 N Y 1 F N
+F0 "R" 80 0 50 V V C CNN
+F1 "R-RESCUE-Halfwave_Rectifier" 0 0 50 V V C CNN
+F2 "" -70 0 30 V V C CNN
+F3 "" 0 0 30 H V C CNN
+$FPLIST
+ R_*
+ Resistor_*
+$ENDFPLIST
+DRAW
+S -40 -100 40 100 0 1 10 N
+X ~ 1 0 150 50 D 60 60 1 1 P
+X ~ 2 0 -150 50 U 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/Examples/Halfwave_Rectifier/Halfwave_Rectifier.bak b/Examples/Halfwave_Rectifier/Halfwave_Rectifier.bak
index 6008a5e9..da840534 100644
--- a/Examples/Halfwave_Rectifier/Halfwave_Rectifier.bak
+++ b/Examples/Halfwave_Rectifier/Halfwave_Rectifier.bak
@@ -1,4 +1,12 @@
 EESchema Schematic File Version 2
+LIBS:eSim_Subckt
+LIBS:eSim_Sources
+LIBS:eSim_Hybrid
+LIBS:eSim_Digital
+LIBS:eSim_Devices
+LIBS:eSim_Analog
+LIBS:eSim_Miscellaneous
+LIBS:eSim_User
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -28,14 +36,7 @@ LIBS:opto
 LIBS:atmel
 LIBS:contrib
 LIBS:valves
-LIBS:eSim_Subckt
-LIBS:eSim_Sources
-LIBS:eSim_Hybrid
-LIBS:eSim_Digital
-LIBS:eSim_Devices
-LIBS:eSim_Analog
-LIBS:eSim_Miscellaneous
-LIBS:eSim_User
+LIBS:Halfwave_Rectifier-cache
 EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
@@ -50,4 +51,90 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
+$Comp
+L D D1
+U 1 1 5593CBB8
+P 5700 2900
+F 0 "D1" H 5700 3000 50  0000 C CNN
+F 1 "D" H 5700 2800 50  0000 C CNN
+F 2 "" H 5700 2900 60  0000 C CNN
+F 3 "" H 5700 2900 60  0000 C CNN
+	1    5700 2900
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R1
+U 1 1 5593CC2C
+P 6300 3350
+F 0 "R1" V 6380 3350 50  0000 C CNN
+F 1 "1k" V 6300 3350 50  0000 C CNN
+F 2 "" V 6230 3350 30  0000 C CNN
+F 3 "" H 6300 3350 30  0000 C CNN
+	1    6300 3350
+	1    0    0    -1  
+$EndComp
+$Comp
+L sine v1
+U 1 1 5593CC81
+P 5050 3400
+F 0 "v1" H 4850 3500 60  0000 C CNN
+F 1 "sine" H 4850 3350 60  0000 C CNN
+F 2 "R1" H 4750 3400 60  0000 C CNN
+F 3 "" H 5050 3400 60  0000 C CNN
+	1    5050 3400
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR01
+U 1 1 5593CCF2
+P 5700 4050
+F 0 "#PWR01" H 5700 3800 50  0001 C CNN
+F 1 "GND" H 5700 3900 50  0000 C CNN
+F 2 "" H 5700 4050 60  0000 C CNN
+F 3 "" H 5700 4050 60  0000 C CNN
+	1    5700 4050
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5050 2950 5050 2900
+Wire Wire Line
+	5050 2900 5550 2900
+Wire Wire Line
+	5850 2900 6300 2900
+Wire Wire Line
+	6300 2900 6300 3200
+Wire Wire Line
+	6300 3500 6300 3900
+Wire Wire Line
+	6300 3900 5050 3900
+Wire Wire Line
+	5050 3900 5050 3850
+Wire Wire Line
+	5700 3800 5700 4050
+Connection ~ 5700 3900
+$Comp
+L PWR_FLAG #FLG02
+U 1 1 5593CD49
+P 5700 3800
+F 0 "#FLG02" H 5700 3895 50  0001 C CNN
+F 1 "PWR_FLAG" H 5700 3980 50  0000 C CNN
+F 2 "" H 5700 3800 60  0000 C CNN
+F 3 "" H 5700 3800 60  0000 C CNN
+	1    5700 3800
+	1    0    0    -1  
+$EndComp
+Text GLabel 5200 2750 0    60   Input ~ 0
+IN
+Text GLabel 6200 2800 2    60   Input ~ 0
+OUT
+Wire Wire Line
+	5200 2750 5250 2750
+Wire Wire Line
+	5250 2750 5250 2900
+Connection ~ 5250 2900
+Wire Wire Line
+	6200 2800 6100 2800
+Wire Wire Line
+	6100 2800 6100 2900
+Connection ~ 6100 2900
 $EndSCHEMATC
diff --git a/Examples/Halfwave_Rectifier/Halfwave_Rectifier.cir b/Examples/Halfwave_Rectifier/Halfwave_Rectifier.cir
index aef7b704..bca6b7df 100644
--- a/Examples/Halfwave_Rectifier/Halfwave_Rectifier.cir
+++ b/Examples/Halfwave_Rectifier/Halfwave_Rectifier.cir
@@ -1,9 +1,11 @@
-* EESchema Netlist Version 1.1 (Spice format) creation date: Wed Jul  1 11:15:52 2015
+* /home/fossee/Downloads/eSim-master/Examples/Halfwave_Rectifier/Halfwave_Rectifier.cir
+
+* EESchema Netlist Version 1.1 (Spice format) creation date: Wed Aug 19 15:22:23 2015
 
 * 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:/
+* Sheet Name: /
 D1  IN OUT D		
 R1  OUT GND 1k		
 v1  IN GND sine		
diff --git a/Examples/Halfwave_Rectifier/Halfwave_Rectifier.cir.out b/Examples/Halfwave_Rectifier/Halfwave_Rectifier.cir.out
index 5207e889..4d1d5489 100644
--- a/Examples/Halfwave_Rectifier/Halfwave_Rectifier.cir.out
+++ b/Examples/Halfwave_Rectifier/Halfwave_Rectifier.cir.out
@@ -1,4 +1,4 @@
-* eeschema netlist version 1.1 (spice format) creation date: wed jul  1 11:15:52 2015
+* /home/fossee/downloads/esim-master/examples/halfwave_rectifier/halfwave_rectifier.cir
 
 .include D.lib
 d1 in out D1N750
diff --git a/Examples/Halfwave_Rectifier/Halfwave_Rectifier.pro b/Examples/Halfwave_Rectifier/Halfwave_Rectifier.pro
index 50b1770e..751b9051 100644
--- a/Examples/Halfwave_Rectifier/Halfwave_Rectifier.pro
+++ b/Examples/Halfwave_Rectifier/Halfwave_Rectifier.pro
@@ -1,4 +1,4 @@
-update=Wed Jul  1 11:12:33 2015
+update=Wed Aug 19 15:21:48 2015
 version=1
 last_client=eeschema
 [general]
@@ -31,40 +31,41 @@ NetIExt=net
 version=1
 LibDir=
 [eeschema/libraries]
-LibName1=/home/gaurav/Desktop/eSim Library/eSim_Subckt
-LibName2=/home/gaurav/Desktop/eSim Library/eSim_Sources
-LibName3=/home/gaurav/Desktop/eSim Library/eSim_Hybrid
-LibName4=/home/gaurav/Desktop/eSim Library/eSim_Digital
-LibName5=/home/gaurav/Desktop/eSim Library/eSim_Devices
-LibName6=/home/gaurav/Desktop/eSim Library/eSim_Analog
-LibName7=/home/gaurav/Desktop/eSim Library/eSim_Miscellaneous
-LibName8=/home/gaurav/Desktop/eSim Library/eSim_User
-LibName9=power
-LibName10=device
-LibName11=transistors
-LibName12=conn
-LibName13=linear
-LibName14=regul
-LibName15=74xx
-LibName16=cmos4000
-LibName17=adc-dac
-LibName18=memory
-LibName19=xilinx
-LibName20=microcontrollers
-LibName21=dsp
-LibName22=microchip
-LibName23=analog_switches
-LibName24=motorola
-LibName25=texas
-LibName26=intel
-LibName27=audio
-LibName28=interface
-LibName29=digital-audio
-LibName30=philips
-LibName31=display
-LibName32=cypress
-LibName33=siliconi
-LibName34=opto
-LibName35=atmel
-LibName36=contrib
-LibName37=valves
+LibName1=eSim_Analog
+LibName2=eSim_Devices
+LibName3=eSim_Digital
+LibName4=eSim_Hybrid
+LibName5=eSim_Miscellaneous
+LibName6=eSim_Sources
+LibName7=eSim_Subckt
+LibName8=eSim_User
+LibName9=Halfwave_Rectifier-rescue
+LibName10=power
+LibName11=device
+LibName12=transistors
+LibName13=conn
+LibName14=linear
+LibName15=regul
+LibName16=74xx
+LibName17=cmos4000
+LibName18=adc-dac
+LibName19=memory
+LibName20=xilinx
+LibName21=microcontrollers
+LibName22=dsp
+LibName23=microchip
+LibName24=analog_switches
+LibName25=motorola
+LibName26=texas
+LibName27=intel
+LibName28=audio
+LibName29=interface
+LibName30=digital-audio
+LibName31=philips
+LibName32=display
+LibName33=cypress
+LibName34=siliconi
+LibName35=opto
+LibName36=atmel
+LibName37=contrib
+LibName38=valves
diff --git a/Examples/Halfwave_Rectifier/Halfwave_Rectifier.sch b/Examples/Halfwave_Rectifier/Halfwave_Rectifier.sch
index da840534..d1b72e0b 100644
--- a/Examples/Halfwave_Rectifier/Halfwave_Rectifier.sch
+++ b/Examples/Halfwave_Rectifier/Halfwave_Rectifier.sch
@@ -1,12 +1,13 @@
 EESchema Schematic File Version 2
-LIBS:eSim_Subckt
-LIBS:eSim_Sources
-LIBS:eSim_Hybrid
-LIBS:eSim_Digital
-LIBS:eSim_Devices
 LIBS:eSim_Analog
+LIBS:eSim_Devices
+LIBS:eSim_Digital
+LIBS:eSim_Hybrid
 LIBS:eSim_Miscellaneous
+LIBS:eSim_Sources
+LIBS:eSim_Subckt
 LIBS:eSim_User
+LIBS:Halfwave_Rectifier-rescue
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -63,7 +64,7 @@ F 3 "" H 5700 2900 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R1
+L R-RESCUE-Halfwave_Rectifier R1
 U 1 1 5593CC2C
 P 6300 3350
 F 0 "R1" V 6380 3350 50  0000 C CNN
diff --git a/Examples/Halfwave_Rectifier/Halfwave_Rectifier_Previous_Values.xml b/Examples/Halfwave_Rectifier/Halfwave_Rectifier_Previous_Values.xml
index e497fb71..f87669dd 100644
--- a/Examples/Halfwave_Rectifier/Halfwave_Rectifier_Previous_Values.xml
+++ b/Examples/Halfwave_Rectifier/Halfwave_Rectifier_Previous_Values.xml
@@ -1 +1 @@
-<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 Name" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">False</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></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><v1 name="Source type">sine<field1 name="Offset Value">0</field1><field2 name="Amplitude">2</field2><field3 name="Frequency">50</field3><field4 name="Delay Time">0</field4><field5 name="Damping Factor">0</field5></v1></source><model /><devicemodel><d1><field>/home/gaurav/workspace/eSim/src/deviceModelLibrary/Diode/D.lib</field></d1></devicemodel><subcircuit /></KicadtoNgspice>
\ No newline at end of file
+<KicadtoNgspice><source><v1 name="Source type">sine<field1 name="Offset Value">0</field1><field2 name="Amplitude">2</field2><field3 name="Frequency">50</field3><field4 name="Delay Time">0</field4><field5 name="Damping Factor">0</field5></v1></source><model /><devicemodel><d1><field>/opt/eSim/src/deviceModelLibrary/Diode/D.lib</field></d1></devicemodel><subcircuit /><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 Name" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">False</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></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></KicadtoNgspice>
\ No newline at end of file
diff --git a/Examples/Halfwave_Rectifier/plot_data_i.txt b/Examples/Halfwave_Rectifier/plot_data_i.txt
index 1dbba44e..86c4c4ea 100644
--- a/Examples/Halfwave_Rectifier/plot_data_i.txt
+++ b/Examples/Halfwave_Rectifier/plot_data_i.txt
@@ -1,5 +1,5 @@
-* eeschema netlist version 1.1 (spice format) creation date: wed jul  1 11:15:52 2015
-Transient Analysis  Wed Jul  1 11:18:15  2015
+* /home/fossee/downloads/esim-master/examples/halfwave_rectifier/halfwave_rectifier.cir
+Transient Analysis  Wed Aug 19 15:41:02  2015
 --------------------------------------------------------------------------------
 Index   time            alli            
 --------------------------------------------------------------------------------
diff --git a/Examples/Halfwave_Rectifier/plot_data_v.txt b/Examples/Halfwave_Rectifier/plot_data_v.txt
index d6b3cfbb..6e6c45b0 100644
--- a/Examples/Halfwave_Rectifier/plot_data_v.txt
+++ b/Examples/Halfwave_Rectifier/plot_data_v.txt
@@ -1,5 +1,5 @@
-* eeschema netlist version 1.1 (spice format) creation date: wed jul  1 11:15:52 2015
-Transient Analysis  Wed Jul  1 11:18:15  2015
+* /home/fossee/downloads/esim-master/examples/halfwave_rectifier/halfwave_rectifier.cir
+Transient Analysis  Wed Aug 19 15:41:02  2015
 --------------------------------------------------------------------------------
 Index   time            in              out             
 --------------------------------------------------------------------------------