update libraries

12 files changed, 23 insertions, 449 deletions

diff --git a/library/SubcircuitLibrary/ujt/D.lib b/library/SubcircuitLibrary/ujt/D.lib
deleted file mode 100644
index 8a7fb4da..00000000
--- a/library/SubcircuitLibrary/ujt/D.lib
+++ /dev/null
@@ -1,2 +0,0 @@
-.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/library/SubcircuitLibrary/ujt/analysis b/library/SubcircuitLibrary/ujt/analysis
deleted file mode 100644
index ffc57a6b..00000000
--- a/library/SubcircuitLibrary/ujt/analysis
+++ /dev/null
@@ -1 +0,0 @@
-.tran 5e-03 100e-03 0e-03
\ No newline at end of file
diff --git a/library/SubcircuitLibrary/ujt/emitter.lib b/library/SubcircuitLibrary/ujt/emitter.lib
deleted file mode 100644
index 3e78b1ee..00000000
--- a/library/SubcircuitLibrary/ujt/emitter.lib
+++ /dev/null
@@ -1,11 +0,0 @@
-.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/library/SubcircuitLibrary/ujt/plot_data_i.txt b/library/SubcircuitLibrary/ujt/plot_data_i.txt
deleted file mode 100644
index e69de29b..00000000
--- a/library/SubcircuitLibrary/ujt/plot_data_i.txt
+++ /dev/null
diff --git a/library/SubcircuitLibrary/ujt/plot_data_v.txt b/library/SubcircuitLibrary/ujt/plot_data_v.txt
deleted file mode 100644
index e69de29b..00000000
--- a/library/SubcircuitLibrary/ujt/plot_data_v.txt
+++ /dev/null
diff --git a/library/SubcircuitLibrary/ujt/ujt-cache.lib b/library/SubcircuitLibrary/ujt/ujt-cache.lib
deleted file mode 100644
index ff75f664..00000000
--- a/library/SubcircuitLibrary/ujt/ujt-cache.lib
+++ /dev/null
@@ -1,137 +0,0 @@
-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/library/SubcircuitLibrary/ujt/ujt.cir b/library/SubcircuitLibrary/ujt/ujt.cir
deleted file mode 100644
index e0e911d7..00000000
--- a/library/SubcircuitLibrary/ujt/ujt.cir
+++ /dev/null
@@ -1,18 +0,0 @@
-* /home/bhargav/Downloads/eSim-1.1.2/src/SubcircuitLibrary/ujt/ujt.cir
-
-* EESchema Netlist Version 1.1 (Spice format) creation date: Sat Jun 15 12:43:54 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  /0 /6 1000k		
-H1  /6 /0 /4 /5 1k		
-C1  /5 /7 35p		
-R1  /7 /2 38.15k		
-R2  /3 /5 2.518k		
-U1  /1 /2 /3 PORT		
-B1  /5 /7 I=0.00028*V(5,7)+0.00575*V(5,7)*V(6)		
-D1  /1 /4 eSim_Diode		
-
-.end
diff --git a/library/SubcircuitLibrary/ujt/ujt.cir.out b/library/SubcircuitLibrary/ujt/ujt.cir.out
deleted file mode 100644
index 2045c539..00000000
--- a/library/SubcircuitLibrary/ujt/ujt.cir.out
+++ /dev/null
@@ -1,22 +0,0 @@
-* /home/bhargav/downloads/esim-1.1.2/src/subcircuitlibrary/ujt/ujt.cir
-
-.include emitter.lib
-r3  /0 /6 1000k
-* h1
-c1  /5 /7 35p
-r1  /7 /2 38.15k
-r2  /3 /5 2.518k
-* u1  /1 /2 /3 port
-b1  /5 /7 i=0.00028*v(5,7)+0.00575*v(5,7)*v(6)
-d1 /1 /4 emitter
-Vh1 /4 /5 0
-h1 /6 /0 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/library/SubcircuitLibrary/ujt/ujt.pro b/library/SubcircuitLibrary/ujt/ujt.pro
deleted file mode 100644
index 24c5e186..00000000
--- a/library/SubcircuitLibrary/ujt/ujt.pro
+++ /dev/null
@@ -1,44 +0,0 @@
-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/library/SubcircuitLibrary/ujt/ujt.sch b/library/SubcircuitLibrary/ujt/ujt.sch
deleted file mode 100644
index a82bddf7..00000000
--- a/library/SubcircuitLibrary/ujt/ujt.sch
+++ /dev/null
@@ -1,199 +0,0 @@
-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
-Text Label 5600 4100 0    60   ~ 0
-5
-Text Label 5950 3150 0    60   ~ 0
-4
-Text Label 5950 2600 0    60   ~ 0
-1
-Text Label 6450 3050 0    60   ~ 0
-6
-Text Label 6450 3650 0    60   ~ 0
-0
-$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
-Text Label 5350 5250 0    60   ~ 0
-7
-Text Label 4600 3450 0    60   ~ 0
-3
-Text Label 4250 4500 0    60   ~ 0
-2
-$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 6300 3650
-Wire Wire Line
-	6300 3650 6700 3650
-Wire Wire Line
-	5950 2450 5950 2700
-Wire Wire Line
-	5950 3000 5950 3300
-Wire Wire Line
-	5950 3400 5950 3850
-Wire Wire Line
-	5950 3850 5950 4100
-Wire Wire Line
-	5950 4100 5950 4450
-Wire Wire Line
-	5150 4100 5150 4550
-Wire Wire Line
-	4600 4100 5150 4100
-Wire Wire Line
-	5150 4100 5950 4100
-Connection ~ 5950 4100
-Wire Wire Line
-	5150 4850 5150 5250
-Wire Wire Line
-	4250 5250 5150 5250
-Wire Wire Line
-	5150 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/library/SubcircuitLibrary/ujt/ujt.sub b/library/SubcircuitLibrary/ujt/ujt.sub
index 2fb1db35..90a3d433 100644
--- a/library/SubcircuitLibrary/ujt/ujt.sub
+++ b/library/SubcircuitLibrary/ujt/ujt.sub
@@ -1,16 +1,25 @@
-* Subcircuit ujt
-.subckt ujt /1 /2 /3 
-* /home/bhargav/downloads/esim-1.1.2/src/subcircuitlibrary/ujt/ujt.cir
-.include emitter.lib
-r3  /0 /6 1000k
-* h1
-c1  /5 /7 35p
-r1  /7 /2 38.15k
-r2  /3 /5 2.518k
-b1  /5 /7 i=0.00028*v(5,7)+0.00575*v(5,7)*v(6)
-d1 /1 /4 emitter
-Vh1 /4 /5 0
-h1 /6 /0 Vh1 1k
-* Control Statements
+* 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
\ No newline at end of file
diff --git a/library/SubcircuitLibrary/ujt/ujt_Previous_Values.xml b/library/SubcircuitLibrary/ujt/ujt_Previous_Values.xml
deleted file mode 100644
index 4468b395..00000000
--- a/library/SubcircuitLibrary/ujt/ujt_Previous_Values.xml
+++ /dev/null
@@ -1 +0,0 @@
-<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/bhargav/Downloads/eSim-1.1.2/src/deviceModelLibrary/Diode/emitter.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