common code for Win and Linux, merged py2 changes

17 files changed, 847 insertions, 0 deletions

diff --git a/Examples/UJT_Relaxation_Oscillator/D.lib b/Examples/UJT_Relaxation_Oscillator/D.lib
new file mode 100644
index 00000000..8a7fb4da
--- /dev/null
+++ b/Examples/UJT_Relaxation_Oscillator/D.lib
@@ -0,0 +1,2 @@
+.model 1n4148 D(is=2.495E-09 rs=4.755E-01 n=1.679E+00 tt=3.030E-09 cjo=1.700E-12 vj=1 m=1.959E-01 bv=1.000E+02 ibv=1.000E-04)
+
diff --git a/Examples/UJT_Relaxation_Oscillator/UJT_Relaxation_Oscillator-cache.lib b/Examples/UJT_Relaxation_Oscillator/UJT_Relaxation_Oscillator-cache.lib
new file mode 100644
index 00000000..dbe7fd4b
--- /dev/null
+++ b/Examples/UJT_Relaxation_Oscillator/UJT_Relaxation_Oscillator-cache.lib
@@ -0,0 +1,103 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# 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
+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 w
+X - 2 0 -450 300 U 50 50 1 1 w
+ENDDRAW
+ENDDEF
+#
+# GND
+#
+DEF GND #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -250 50 H I C CNN
+F1 "GND" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
+X GND 1 0 0 0 D 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# UJT
+#
+DEF UJT X 0 40 Y Y 1 F N
+F0 "X" -50 -50 60 H V C CNN
+F1 "UJT" 50 -50 60 H V C CNN
+F2 "" -50 -50 60 H I C CNN
+F3 "" -50 -50 60 H I C CNN
+DRAW
+C -50 -50 206 0 1 0 N
+P 2 0 1 0 -100 100 -100 -200 N
+P 3 0 1 0 -250 0 -200 0 -100 -100 N
+P 3 0 1 0 -200 -50 -150 -50 -150 0 N
+P 3 0 1 0 -100 -150 0 -150 0 -250 N
+P 3 0 1 0 -100 50 0 50 0 150 N
+X E 1 -450 0 200 R 50 50 1 1 I
+X B1 2 0 -450 200 U 50 50 1 1 B
+X B2 3 0 350 200 D 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+# eSim_C
+#
+DEF eSim_C C 0 10 N Y 1 F N
+F0 "C" 25 100 50 H V L CNN
+F1 "eSim_C" 25 -100 50 H V L CNN
+F2 "" 38 -150 30 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ C_*
+$ENDFPLIST
+DRAW
+P 2 0 1 20 -80 -30 80 -30 N
+P 2 0 1 20 -80 30 80 30 N
+X ~ 1 0 150 110 D 40 40 1 1 P
+X ~ 2 0 -150 110 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# eSim_R
+#
+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
+F2 "" 50 -20 30 H V C CNN
+F3 "" 50 50 30 V V C CNN
+$FPLIST
+ R_*
+ Resistor_*
+$ENDFPLIST
+DRAW
+S 150 10 -50 90 0 1 10 N
+X ~ 1 -100 50 50 R 60 60 1 1 P
+X ~ 2 200 50 50 L 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+# plot_v1
+#
+DEF plot_v1 U 0 40 Y Y 1 F N
+F0 "U" 0 500 60 H V C CNN
+F1 "plot_v1" 200 350 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C 0 500 100 0 1 0 N
+X ~ ~ 0 200 200 U 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/Examples/UJT_Relaxation_Oscillator/UJT_Relaxation_Oscillator.cir b/Examples/UJT_Relaxation_Oscillator/UJT_Relaxation_Oscillator.cir
new file mode 100644
index 00000000..068735c1
--- /dev/null
+++ b/Examples/UJT_Relaxation_Oscillator/UJT_Relaxation_Oscillator.cir
@@ -0,0 +1,18 @@
+* /home/saurabh/eSim-Workspace/UJT_Relaxation_Oscillator/UJT_Relaxation_Oscillator.cir
+
+* EESchema Netlist Version 1.1 (Spice format) creation date: Wed Aug 28 14:50:42 2019
+
+* 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: /
+R1  Net-_C1-Pad1_ Net-_R1-Pad2_ 95.3k		
+R2  Vb2 Net-_R1-Pad2_ 4.7K		
+R3  GND Vb1 4.7k		
+C1  Net-_C1-Pad1_ GND 100n		
+v1  Net-_R1-Pad2_ GND DC		
+X1  Net-_C1-Pad1_ Vb1 Vb2 UJT		
+U1  Vb2 plot_v1		
+U2  Vb1 plot_v1		
+
+.end
diff --git a/Examples/UJT_Relaxation_Oscillator/UJT_Relaxation_Oscillator.cir.out b/Examples/UJT_Relaxation_Oscillator/UJT_Relaxation_Oscillator.cir.out
new file mode 100644
index 00000000..5c670499
--- /dev/null
+++ b/Examples/UJT_Relaxation_Oscillator/UJT_Relaxation_Oscillator.cir.out
@@ -0,0 +1,22 @@
+* /home/saurabh/esim-workspace/ujt_relaxation_oscillator/ujt_relaxation_oscillator.cir
+
+.include ujt.sub
+r1  net-_c1-pad1_ net-_r1-pad2_ 95.3k
+r2  vb2 net-_r1-pad2_ 4.7k
+r3  gnd vb1 4.7k
+c1  net-_c1-pad1_ gnd 100n
+v1 net-_r1-pad2_ gnd  dc 15
+x1 net-_c1-pad1_ vb1 vb2 ujt
+* u1  vb2 plot_v1
+* u2  vb1 plot_v1
+.tran 5e-06 10e-03 0e-00
+
+* Control Statements 
+.control
+run
+print allv > plot_data_v.txt
+print alli > plot_data_i.txt
+plot v(vb2)
+plot v(vb1)
+.endc
+.end
diff --git a/Examples/UJT_Relaxation_Oscillator/UJT_Relaxation_Oscillator.pro b/Examples/UJT_Relaxation_Oscillator/UJT_Relaxation_Oscillator.pro
new file mode 100644
index 00000000..148e9ed5
--- /dev/null
+++ b/Examples/UJT_Relaxation_Oscillator/UJT_Relaxation_Oscillator.pro
@@ -0,0 +1,73 @@
+update=22/05/2015 07:44:53
+version=1
+last_client=kicad
+[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=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
+
diff --git a/Examples/UJT_Relaxation_Oscillator/UJT_Relaxation_Oscillator.proj b/Examples/UJT_Relaxation_Oscillator/UJT_Relaxation_Oscillator.proj
new file mode 100644
index 00000000..9d47d369
--- /dev/null
+++ b/Examples/UJT_Relaxation_Oscillator/UJT_Relaxation_Oscillator.proj
@@ -0,0 +1 @@
+schematicFile UJT_Relaxation_Oscillator.sch
diff --git a/Examples/UJT_Relaxation_Oscillator/UJT_Relaxation_Oscillator.sch b/Examples/UJT_Relaxation_Oscillator/UJT_Relaxation_Oscillator.sch
new file mode 100644
index 00000000..5bb6d9e2
--- /dev/null
+++ b/Examples/UJT_Relaxation_Oscillator/UJT_Relaxation_Oscillator.sch
@@ -0,0 +1,207 @@
+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
+LIBS:UJT_RO-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 eSim_R R1
+U 1 1 5D664780
+P 4650 3000
+F 0 "R1" H 4700 3130 50  0000 C CNN
+F 1 "95.3k" H 4700 3050 50  0000 C CNN
+F 2 "" H 4700 2980 30  0000 C CNN
+F 3 "" V 4700 3050 30  0000 C CNN
+	1    4650 3000
+	0    -1   -1   0   
+$EndComp
+$Comp
+L eSim_R R2
+U 1 1 5D664781
+P 5800 2850
+F 0 "R2" H 5850 2980 50  0000 C CNN
+F 1 "4.7K" H 5850 2900 50  0000 C CNN
+F 2 "" H 5850 2830 30  0000 C CNN
+F 3 "" V 5850 2900 30  0000 C CNN
+	1    5800 2850
+	0    -1   -1   0   
+$EndComp
+$Comp
+L eSim_R R3
+U 1 1 5D664782
+P 5800 4550
+F 0 "R3" H 5850 4680 50  0000 C CNN
+F 1 "4.7k" H 5850 4600 50  0000 C CNN
+F 2 "" H 5850 4530 30  0000 C CNN
+F 3 "" V 5850 4600 30  0000 C CNN
+	1    5800 4550
+	0    -1   -1   0   
+$EndComp
+$Comp
+L eSim_C C1
+U 1 1 5D664783
+P 4550 4300
+F 0 "C1" H 4575 4400 50  0000 L CNN
+F 1 "100n" H 4575 4200 50  0000 L CNN
+F 2 "" H 4588 4150 30  0000 C CNN
+F 3 "" H 4550 4300 60  0000 C CNN
+	1    4550 4300
+	1    0    0    -1  
+$EndComp
+Connection ~ 4550 3600
+Wire Wire Line
+	4600 2450 4600 2800
+Wire Wire Line
+	5750 2450 5750 2650
+Wire Wire Line
+	5750 2950 5750 3250
+Wire Wire Line
+	4600 3100 4550 3100
+Wire Wire Line
+	4550 3100 4550 4150
+Wire Wire Line
+	4550 4450 4550 5050
+Wire Wire Line
+	5750 2450 4600 2450
+Wire Wire Line
+	5750 4050 5750 4350
+Wire Wire Line
+	5750 4650 5750 5050
+Wire Wire Line
+	5750 5050 4550 5050
+$Comp
+L DC v1
+U 1 1 5D664784
+P 6800 3500
+F 0 "v1" H 6600 3600 60  0000 C CNN
+F 1 "DC" H 6600 3450 60  0000 C CNN
+F 2 "R1" H 6500 3500 60  0000 C CNN
+F 3 "" H 6800 3500 60  0000 C CNN
+	1    6800 3500
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6800 3050 6800 2150
+Wire Wire Line
+	6800 2150 5300 2150
+Wire Wire Line
+	5300 2150 5300 2450
+Connection ~ 5300 2450
+Wire Wire Line
+	6800 3950 6800 5650
+Wire Wire Line
+	6800 5650 5250 5650
+Wire Wire Line
+	5250 5650 5250 5050
+Connection ~ 5250 5050
+$Comp
+L GND #PWR01
+U 1 1 5D664785
+P 4900 5050
+F 0 "#PWR01" H 4900 4800 50  0001 C CNN
+F 1 "GND" H 4900 4900 50  0000 C CNN
+F 2 "" H 4900 5050 50  0001 C CNN
+F 3 "" H 4900 5050 50  0001 C CNN
+	1    4900 5050
+	1    0    0    -1  
+$EndComp
+Connection ~ 4900 5050
+$Comp
+L UJT X1
+U 1 1 5D664787
+P 5750 3600
+F 0 "X1" H 5700 3550 60  0000 C CNN
+F 1 "UJT" H 5800 3550 60  0000 C CNN
+F 2 "" H 5700 3550 60  0001 C CNN
+F 3 "" H 5700 3550 60  0001 C CNN
+	1    5750 3600
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4550 3600 5300 3600
+$Comp
+L plot_v1 U1
+U 1 1 5D664788
+P 6150 3200
+F 0 "U1" H 6150 3700 60  0000 C CNN
+F 1 "plot_v1" H 6350 3550 60  0000 C CNN
+F 2 "" H 6150 3200 60  0000 C CNN
+F 3 "" H 6150 3200 60  0000 C CNN
+	1    6150 3200
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6150 3000 6150 3150
+Wire Wire Line
+	6150 3150 5750 3150
+Connection ~ 5750 3150
+$Comp
+L plot_v1 U2
+U 1 1 5D664789
+P 6150 4400
+F 0 "U2" H 6150 4900 60  0000 C CNN
+F 1 "plot_v1" H 6350 4750 60  0000 C CNN
+F 2 "" H 6150 4400 60  0000 C CNN
+F 3 "" H 6150 4400 60  0000 C CNN
+	1    6150 4400
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6150 4200 6150 4250
+Wire Wire Line
+	6150 4250 5750 4250
+Connection ~ 5750 4250
+Text GLabel 6150 3150 2    60   Input ~ 0
+Vb2
+Text GLabel 6150 4250 2    60   Input ~ 0
+Vb1
+$EndSCHEMATC
diff --git a/Examples/UJT_Relaxation_Oscillator/UJT_Relaxation_Oscillator_Previous_Values.xml b/Examples/UJT_Relaxation_Oscillator/UJT_Relaxation_Oscillator_Previous_Values.xml
new file mode 100644
index 00000000..9ae03e59
--- /dev/null
+++ b/Examples/UJT_Relaxation_Oscillator/UJT_Relaxation_Oscillator_Previous_Values.xml
@@ -0,0 +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 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">5</field2><field3 name="Stop Time">10</field3><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">us</field5><field6 name="Stop Combo">ms</field6></tran></analysis><source><v1 name="Source type">dc<field1 name="Value">15</field1></v1></source><model /><devicemodel /><subcircuit><x1><field>/home/saurabh/Downloads/eSim-1.1.2/src/SubcircuitLibrary/ujt</field></x1></subcircuit></KicadtoNgspice>
\ No newline at end of file
diff --git a/Examples/UJT_Relaxation_Oscillator/analysis b/Examples/UJT_Relaxation_Oscillator/analysis
new file mode 100644
index 00000000..6da1773c
--- /dev/null
+++ b/Examples/UJT_Relaxation_Oscillator/analysis
@@ -0,0 +1 @@
+.tran 5e-06 10e-03 0e-00
\ No newline at end of file
diff --git a/Examples/UJT_Relaxation_Oscillator/emitter.lib b/Examples/UJT_Relaxation_Oscillator/emitter.lib
new file mode 100644
index 00000000..07bc83f5
--- /dev/null
+++ b/Examples/UJT_Relaxation_Oscillator/emitter.lib
@@ -0,0 +1,11 @@
+.model emitter D(

++ Vj=1

++ Cjo=1.700E-12

++ Rs=4.755E-01

++ Is=21.3P

++ M=1.959E-01

++ N=1.8

++ Bv=1.000E+02

++ tt=3.030E-09

++ Ibv=1.000E-04

+)

diff --git a/Examples/UJT_Relaxation_Oscillator/ujt-cache.lib b/Examples/UJT_Relaxation_Oscillator/ujt-cache.lib
new file mode 100644
index 00000000..9284f2d1
--- /dev/null
+++ b/Examples/UJT_Relaxation_Oscillator/ujt-cache.lib
@@ -0,0 +1,137 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# CCVS
+#
+DEF CCVS H 0 40 Y Y 1 F N
+F0 "H" 0 150 50 H V C CNN
+F1 "CCVS" -200 -50 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ 1_pin
+$ENDFPLIST
+DRAW
+S -100 100 100 -100 0 1 0 N
+X + 1 -300 50 200 R 35 35 1 1 P
+X - 2 300 50 200 L 35 35 1 1 P
+X +c 3 -50 -200 100 U 35 35 1 1 P
+X -c 4 50 -200 100 U 35 35 1 1 P
+ENDDRAW
+ENDDEF
+#
+# NLDS
+#
+DEF NLDS BB 0 40 Y Y 1 F N
+F0 "BB" 0 0 60 H V C CNN
+F1 "NLDS" 0 0 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C 0 0 141 0 1 0 N
+X 1 1 0 350 200 D 50 50 1 1 B
+X 2 2 0 -350 200 U 50 50 1 1 B
+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
+#
+# eSim_C
+#
+DEF eSim_C C 0 10 N Y 1 F N
+F0 "C" 25 100 50 H V L CNN
+F1 "eSim_C" 25 -100 50 H V L CNN
+F2 "" 38 -150 30 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ C_*
+$ENDFPLIST
+DRAW
+P 2 0 1 20 -80 -30 80 -30 N
+P 2 0 1 20 -80 30 80 30 N
+X ~ 1 0 150 110 D 40 40 1 1 P
+X ~ 2 0 -150 110 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# eSim_Diode
+#
+DEF eSim_Diode D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "eSim_Diode" 0 -100 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ TO-???*
+ *SingleDiode
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
+DRAW
+T 0 -100 50 60 0 0 0 A Normal 0 C C
+T 0 100 50 60 0 0 0 K Normal 0 C C
+P 2 0 1 6 50 50 50 -50 N
+P 3 0 1 0 -50 50 50 0 -50 -50 F
+X A 1 -150 0 100 R 40 40 1 1 P
+X K 2 150 0 100 L 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# eSim_R
+#
+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
+F2 "" 50 -20 30 H V C CNN
+F3 "" 50 50 30 V V C CNN
+$FPLIST
+ R_*
+ Resistor_*
+$ENDFPLIST
+DRAW
+S 150 10 -50 90 0 1 10 N
+X ~ 1 -100 50 50 R 60 60 1 1 P
+X ~ 2 200 50 50 L 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/Examples/UJT_Relaxation_Oscillator/ujt.cir b/Examples/UJT_Relaxation_Oscillator/ujt.cir
new file mode 100644
index 00000000..6bdab774
--- /dev/null
+++ b/Examples/UJT_Relaxation_Oscillator/ujt.cir
@@ -0,0 +1,18 @@
+* /home/saurabh/Downloads/eSim-1.1.2/src/SubcircuitLibrary/ujt/ujt.cir
+
+* EESchema Netlist Version 1.1 (Spice format) creation date: Mon Aug 26 17:18:46 2019
+
+* 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: /
+R3  Net-_H1-Pad2_ Net-_H1-Pad1_ 1000k		
+H1  Net-_H1-Pad1_ Net-_H1-Pad2_ Net-_D1-Pad2_ Net-_B1-Pad1_ 1k		
+C1  Net-_B1-Pad1_ Net-_B1-Pad2_ 35p		
+R1  Net-_B1-Pad2_ Net-_R1-Pad2_ 38.15k		
+R2  Net-_R2-Pad1_ Net-_B1-Pad1_ 2.518k		
+U1  Net-_D1-Pad1_ Net-_R1-Pad2_ Net-_R2-Pad1_ PORT		
+B1  Net-_B1-Pad1_ Net-_B1-Pad2_ I=0.00028*V(5,7)+0.00575*V(5,7)*V(6)		
+D1  Net-_D1-Pad1_ Net-_D1-Pad2_ eSim_Diode		
+
+.end
diff --git a/Examples/UJT_Relaxation_Oscillator/ujt.cir.out b/Examples/UJT_Relaxation_Oscillator/ujt.cir.out
new file mode 100644
index 00000000..84d08b27
--- /dev/null
+++ b/Examples/UJT_Relaxation_Oscillator/ujt.cir.out
@@ -0,0 +1,22 @@
+* /home/saurabh/downloads/esim-1.1.2/src/subcircuitlibrary/ujt/ujt.cir
+
+.include D.lib
+r3  net-_h1-pad2_ net-_h1-pad1_ 1000k
+* h1
+c1  net-_b1-pad1_ net-_b1-pad2_ 35p
+r1  net-_b1-pad2_ net-_r1-pad2_ 38.15k
+r2  net-_r2-pad1_ net-_b1-pad1_ 2.518k
+* u1  net-_d1-pad1_ net-_r1-pad2_ net-_r2-pad1_ port
+b1  net-_b1-pad1_ net-_b1-pad2_ i=0.00028*v(5,7)+0.00575*v(5,7)*v(6)
+d1 net-_d1-pad1_ net-_d1-pad2_ 1N4148
+Vh1 net-_d1-pad2_ net-_b1-pad1_ 0
+h1 net-_h1-pad1_ net-_h1-pad2_ Vh1 1k
+.tran 5e-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/Examples/UJT_Relaxation_Oscillator/ujt.pro b/Examples/UJT_Relaxation_Oscillator/ujt.pro
new file mode 100644
index 00000000..24c5e186
--- /dev/null
+++ b/Examples/UJT_Relaxation_Oscillator/ujt.pro
@@ -0,0 +1,44 @@
+update=Tue Jun 11 16:36:40 2019
+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=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_User
+LibName3=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Subckt
+LibName4=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Sources
+LibName5=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Power
+LibName6=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Plot
+LibName7=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Miscellaneous
+LibName8=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Hybrid
+LibName9=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Digital
+LibName10=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Devices
+LibName11=/home/bhargav/Downloads/eSim-1.1.2/kicadSchematicLibrary/eSim_Analog
diff --git a/Examples/UJT_Relaxation_Oscillator/ujt.sch b/Examples/UJT_Relaxation_Oscillator/ujt.sch
new file mode 100644
index 00000000..581fcfe7
--- /dev/null
+++ b/Examples/UJT_Relaxation_Oscillator/ujt.sch
@@ -0,0 +1,173 @@
+EESchema Schematic File Version 2
+LIBS:power
+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_Devices
+LIBS:eSim_Analog
+LIBS:ujt-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 eSim_R R3
+U 1 1 5CF5F733
+P 6650 3400
+F 0 "R3" H 6700 3530 50  0000 C CNN
+F 1 "1000k" H 6700 3450 50  0000 C CNN
+F 2 "" H 6700 3380 30  0000 C CNN
+F 3 "" V 6700 3450 30  0000 C CNN
+	1    6650 3400
+	0    1    -1   0   
+$EndComp
+$Comp
+L CCVS H1
+U 1 1 5CF5F77B
+P 6150 3350
+F 0 "H1" H 6150 3500 50  0000 C CNN
+F 1 "1k" H 5950 3300 50  0000 C CNN
+F 2 "" H 6150 3350 60  0000 C CNN
+F 3 "" H 6150 3350 60  0000 C CNN
+	1    6150 3350
+	0    1    1    0   
+$EndComp
+$Comp
+L eSim_C C1
+U 1 1 5CF61B3A
+P 5150 4700
+F 0 "C1" H 5175 4800 50  0000 L CNN
+F 1 "35p" H 5175 4600 50  0000 L CNN
+F 2 "" H 5188 4550 30  0000 C CNN
+F 3 "" H 5150 4700 60  0000 C CNN
+	1    5150 4700
+	1    0    0    -1  
+$EndComp
+$Comp
+L eSim_R R1
+U 1 1 5CF6211F
+P 4300 4850
+F 0 "R1" H 4350 4980 50  0000 C CNN
+F 1 "38.15k" H 4350 4900 50  0000 C CNN
+F 2 "" H 4350 4830 30  0000 C CNN
+F 3 "" V 4350 4900 30  0000 C CNN
+	1    4300 4850
+	0    -1   -1   0   
+$EndComp
+$Comp
+L eSim_R R2
+U 1 1 5CF6218A
+P 4550 3650
+F 0 "R2" H 4600 3780 50  0000 C CNN
+F 1 "2.518k" H 4600 3700 50  0000 C CNN
+F 2 "" H 4600 3630 30  0000 C CNN
+F 3 "" V 4600 3700 30  0000 C CNN
+	1    4550 3650
+	0    1    1    0   
+$EndComp
+$Comp
+L PORT U1
+U 2 1 5CF6830A
+P 4250 4150
+F 0 "U1" H 4300 4250 30  0000 C CNN
+F 1 "PORT" H 4250 4150 30  0000 C CNN
+F 2 "" H 4250 4150 60  0000 C CNN
+F 3 "" H 4250 4150 60  0000 C CNN
+	2    4250 4150
+	0    1    1    0   
+$EndComp
+$Comp
+L PORT U1
+U 1 1 5CF689AD
+P 5950 2200
+F 0 "U1" H 6000 2300 30  0000 C CNN
+F 1 "PORT" H 5950 2200 30  0000 C CNN
+F 2 "" H 5950 2200 60  0000 C CNN
+F 3 "" H 5950 2200 60  0000 C CNN
+	1    5950 2200
+	0    1    1    0   
+$EndComp
+$Comp
+L PORT U1
+U 3 1 5CF69586
+P 4600 3000
+F 0 "U1" H 4650 3100 30  0000 C CNN
+F 1 "PORT" H 4600 3000 30  0000 C CNN
+F 2 "" H 4600 3000 60  0000 C CNN
+F 3 "" H 4600 3000 60  0000 C CNN
+	3    4600 3000
+	0    1    1    0   
+$EndComp
+$Comp
+L NLDS B1
+U 1 1 5CFD2C88
+P 5950 4800
+F 0 "B1" H 5950 4800 60  0000 C CNN
+F 1 "I=0.00028*V(5,7)+0.00575*V(5,7)*V(6)" H 7050 4900 60  0000 C CNN
+F 2 "" H 5950 4800 60  0000 C CNN
+F 3 "" H 5950 4800 60  0000 C CNN
+	1    5950 4800
+	1    0    0    -1  
+$EndComp
+$Comp
+L eSim_Diode D1
+U 1 1 5CFF8BB7
+P 5950 2850
+F 0 "D1" H 5950 2950 50  0000 C CNN
+F 1 "eSim_Diode" H 5950 2750 50  0000 C CNN
+F 2 "" H 5950 2850 60  0000 C CNN
+F 3 "" H 5950 2850 60  0000 C CNN
+	1    5950 2850
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	6200 3050 6700 3050
+Wire Wire Line
+	6700 3050 6700 3200
+Wire Wire Line
+	6200 3650 6700 3650
+Wire Wire Line
+	5950 2450 5950 2700
+Wire Wire Line
+	5950 3000 5950 3300
+Wire Wire Line
+	5950 3400 5950 4450
+Wire Wire Line
+	5150 4100 5150 4550
+Wire Wire Line
+	4600 4100 5950 4100
+Connection ~ 5950 4100
+Wire Wire Line
+	5150 4850 5150 5250
+Wire Wire Line
+	4250 5250 5950 5250
+Wire Wire Line
+	4250 5250 4250 4950
+Wire Wire Line
+	4600 4100 4600 3850
+Connection ~ 5150 4100
+Wire Wire Line
+	4250 4650 4250 4400
+Wire Wire Line
+	4600 3550 4600 3250
+Wire Wire Line
+	5950 5250 5950 5150
+Connection ~ 5150 5250
+Wire Wire Line
+	6700 3650 6700 3500
+$EndSCHEMATC
diff --git a/Examples/UJT_Relaxation_Oscillator/ujt.sub b/Examples/UJT_Relaxation_Oscillator/ujt.sub
new file mode 100644
index 00000000..7b9b302c
--- /dev/null
+++ b/Examples/UJT_Relaxation_Oscillator/ujt.sub
@@ -0,0 +1,13 @@
+* Motorola IP=.5U IV=6M VB1(sat)=3 Rbb=6.1K Vob1=3.6: E, B1, B2
+.subckt ujt 1 2 3
+DE 1 4 EMITTER
+VE 4 5 DC 0
+HVE 6 0 VE 1K
+RVE 0 6 1MEG
+BBB 5 7 I=0.00028*V(5,7)+0.00575*V(5,7)*V(6)
+CBB 5 7 35P
+RB1 7 2 38.15 RMOD
+RB2 3 5 2.518K RMOD
+.MODEL RMOD R TC1=.01
+.MODEL EMITTER D (IS=21.3P N=1.8)
+.ends ujt
diff --git a/Examples/UJT_Relaxation_Oscillator/ujt_Previous_Values.xml b/Examples/UJT_Relaxation_Oscillator/ujt_Previous_Values.xml
new file mode 100644
index 00000000..a5aa56d9
--- /dev/null
+++ b/Examples/UJT_Relaxation_Oscillator/ujt_Previous_Values.xml
@@ -0,0 +1 @@
+<KicadtoNgspice><source><v1 name="Source type">0</v1><ve1 name="Source type">0</ve1><i1 name="Source type">dc<field1 name="Value">0.000001m</field1></i1><v2 name="Source type">0</v2></source><model /><devicemodel><d1><field>/home/saurabh/Downloads/eSim-1.1.2/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 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">5</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