summaryrefslogtreecommitdiff
path: root/src/SubcircuitLibrary/ujt
diff options
context:
space:
mode:
Diffstat (limited to 'src/SubcircuitLibrary/ujt')
-rw-r--r--src/SubcircuitLibrary/ujt/analysis2
-rw-r--r--src/SubcircuitLibrary/ujt/emitter.lib15
-rw-r--r--src/SubcircuitLibrary/ujt/plot_data_i.txt67
-rw-r--r--src/SubcircuitLibrary/ujt/plot_data_v.txt203
-rw-r--r--src/SubcircuitLibrary/ujt/ujt-cache.lib17
-rw-r--r--src/SubcircuitLibrary/ujt/ujt.cir18
-rw-r--r--src/SubcircuitLibrary/ujt/ujt.cir.out20
-rw-r--r--src/SubcircuitLibrary/ujt/ujt.sch138
-rw-r--r--src/SubcircuitLibrary/ujt/ujt.sub18
-rw-r--r--src/SubcircuitLibrary/ujt/ujt_Previous_Values.xml2
10 files changed, 109 insertions, 391 deletions
diff --git a/src/SubcircuitLibrary/ujt/analysis b/src/SubcircuitLibrary/ujt/analysis
index 21dc4b94..ffc57a6b 100644
--- a/src/SubcircuitLibrary/ujt/analysis
+++ b/src/SubcircuitLibrary/ujt/analysis
@@ -1 +1 @@
-.tran 5e-06 100e-03 0e-03 \ No newline at end of file
+.tran 5e-03 100e-03 0e-03 \ No newline at end of file
diff --git a/src/SubcircuitLibrary/ujt/emitter.lib b/src/SubcircuitLibrary/ujt/emitter.lib
index 3af759f4..3e78b1ee 100644
--- a/src/SubcircuitLibrary/ujt/emitter.lib
+++ b/src/SubcircuitLibrary/ujt/emitter.lib
@@ -1,4 +1,11 @@
-.MODEL emitter D(
-+ Is=21.3P
-+ N=1.8
-) \ No newline at end of file
+.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/src/SubcircuitLibrary/ujt/plot_data_i.txt b/src/SubcircuitLibrary/ujt/plot_data_i.txt
index bb08d2c2..e69de29b 100644
--- a/src/SubcircuitLibrary/ujt/plot_data_i.txt
+++ b/src/SubcircuitLibrary/ujt/plot_data_i.txt
@@ -1,67 +0,0 @@
- * /home/bhargav/downloads/esim-1.1.2/src/subcircuitlibrary/ujt/ujt.cir
- Transient Analysis Sat Jun 15 16:01:36 2019
---------------------------------------------------------------------------------
-Index time h1#branch vh1#branch
---------------------------------------------------------------------------------
-0 0.000000e+00 1.936296e-124 -1.93630e-121
-1 1.000000e-05 1.522607e-65 -1.52261e-62
-2 2.000000e-05 1.522589e-65 -1.52259e-62
-3 4.000000e-05 1.522545e-65 -1.52255e-62
-4 8.000000e-05 0.000000e+00 0.000000e+00
-5 1.600000e-04 0.000000e+00 0.000000e+00
-6 3.200000e-04 0.000000e+00 0.000000e+00
-7 6.400000e-04 0.000000e+00 0.000000e+00
-8 1.280000e-03 3.035283e-65 -3.03528e-62
-9 2.560000e-03 1.511759e-65 -1.51176e-62
-10 4.560000e-03 0.000000e+00 0.000000e+00
-11 6.560000e-03 0.000000e+00 0.000000e+00
-12 8.560000e-03 0.000000e+00 0.000000e+00
-13 1.056000e-02 0.000000e+00 0.000000e+00
-14 1.256000e-02 0.000000e+00 0.000000e+00
-15 1.456000e-02 0.000000e+00 0.000000e+00
-16 1.656000e-02 0.000000e+00 0.000000e+00
-17 1.856000e-02 0.000000e+00 0.000000e+00
-18 2.056000e-02 0.000000e+00 0.000000e+00
-19 2.256000e-02 0.000000e+00 0.000000e+00
-20 2.456000e-02 0.000000e+00 0.000000e+00
-21 2.656000e-02 0.000000e+00 0.000000e+00
-22 2.856000e-02 0.000000e+00 0.000000e+00
-23 3.056000e-02 0.000000e+00 0.000000e+00
-24 3.256000e-02 0.000000e+00 0.000000e+00
-25 3.456000e-02 0.000000e+00 0.000000e+00
-26 3.656000e-02 0.000000e+00 0.000000e+00
-27 3.856000e-02 0.000000e+00 0.000000e+00
-28 4.056000e-02 0.000000e+00 0.000000e+00
-29 4.256000e-02 0.000000e+00 0.000000e+00
-30 4.456000e-02 0.000000e+00 0.000000e+00
-31 4.656000e-02 0.000000e+00 0.000000e+00
-32 4.856000e-02 0.000000e+00 0.000000e+00
-33 5.056000e-02 0.000000e+00 0.000000e+00
-34 5.256000e-02 0.000000e+00 0.000000e+00
-35 5.456000e-02 0.000000e+00 0.000000e+00
-36 5.656000e-02 0.000000e+00 0.000000e+00
-37 5.856000e-02 0.000000e+00 0.000000e+00
-38 6.056000e-02 0.000000e+00 0.000000e+00
-39 6.256000e-02 0.000000e+00 0.000000e+00
-40 6.456000e-02 0.000000e+00 0.000000e+00
-41 6.656000e-02 0.000000e+00 0.000000e+00
-42 6.856000e-02 0.000000e+00 0.000000e+00
-43 7.056000e-02 0.000000e+00 0.000000e+00
-44 7.256000e-02 0.000000e+00 0.000000e+00
-45 7.456000e-02 0.000000e+00 0.000000e+00
-46 7.656000e-02 0.000000e+00 0.000000e+00
-47 7.856000e-02 0.000000e+00 0.000000e+00
-48 8.056000e-02 0.000000e+00 0.000000e+00
-49 8.256000e-02 0.000000e+00 0.000000e+00
-50 8.456000e-02 0.000000e+00 0.000000e+00
-51 8.656000e-02 0.000000e+00 0.000000e+00
-52 8.856000e-02 0.000000e+00 0.000000e+00
-53 9.056000e-02 0.000000e+00 0.000000e+00
-54 9.256000e-02 0.000000e+00 0.000000e+00
-
-Index time h1#branch vh1#branch
---------------------------------------------------------------------------------
-55 9.456000e-02 0.000000e+00 0.000000e+00
-56 9.656000e-02 0.000000e+00 0.000000e+00
-57 9.856000e-02 0.000000e+00 0.000000e+00
-58 1.000000e-01 3.640960e-66 -3.64096e-63
diff --git a/src/SubcircuitLibrary/ujt/plot_data_v.txt b/src/SubcircuitLibrary/ujt/plot_data_v.txt
index 207ce5b7..e69de29b 100644
--- a/src/SubcircuitLibrary/ujt/plot_data_v.txt
+++ b/src/SubcircuitLibrary/ujt/plot_data_v.txt
@@ -1,203 +0,0 @@
- * /home/bhargav/downloads/esim-1.1.2/src/subcircuitlibrary/ujt/ujt.cir
- Transient Analysis Sat Jun 15 16:01:36 2019
---------------------------------------------------------------------------------
-Index time V(1) V(2) V(3)
---------------------------------------------------------------------------------
-0 0.000000e+00 6.088894e-52 -2.80622e-43 -2.80622e-43
-1 1.000000e-05 -2.51069e-46 -2.80871e-43 -2.80871e-43
-2 2.000000e-05 -2.51068e-46 -2.80868e-43 -2.80868e-43
-3 4.000000e-05 -2.51147e-46 -2.80860e-43 -2.80860e-43
-4 8.000000e-05 1.691803e-50 -2.80589e-43 -2.80589e-43
-5 1.600000e-04 -1.19543e-50 -2.80543e-43 -2.80543e-43
-6 3.200000e-04 -2.36974e-50 -2.80438e-43 -2.80438e-43
-7 6.400000e-04 4.520590e-52 -2.80203e-43 -2.80203e-43
-8 1.280000e-03 -2.71395e-46 -2.79955e-43 -2.79955e-43
-9 2.560000e-03 -3.13629e-46 -2.78870e-43 -2.78870e-43
-10 4.560000e-03 -5.10465e-52 -2.76667e-43 -2.76667e-43
-11 6.560000e-03 -2.20180e-52 -2.74650e-43 -2.74650e-43
-12 8.560000e-03 2.805351e-52 -2.72507e-43 -2.72507e-43
-13 1.056000e-02 -6.11918e-52 -2.70239e-43 -2.70239e-43
-14 1.256000e-02 -1.35091e-52 -2.67846e-43 -2.67846e-43
-15 1.456000e-02 6.127039e-53 -2.65331e-43 -2.65331e-43
-16 1.656000e-02 -6.60318e-52 -2.62693e-43 -2.62693e-43
-17 1.856000e-02 -2.70241e-52 -2.59936e-43 -2.59936e-43
-18 2.056000e-02 6.713684e-53 -2.57059e-43 -2.57059e-43
-19 2.256000e-02 -1.55773e-52 -2.54064e-43 -2.54064e-43
-20 2.456000e-02 3.929090e-53 -2.50953e-43 -2.50953e-43
-21 2.656000e-02 -5.71836e-52 -2.47727e-43 -2.47727e-43
-22 2.856000e-02 -1.42047e-52 -2.44388e-43 -2.44388e-43
-23 3.056000e-02 -4.85310e-52 -2.40937e-43 -2.40937e-43
-24 3.256000e-02 3.962144e-52 -2.37377e-43 -2.37377e-43
-25 3.456000e-02 -7.13895e-52 -2.33707e-43 -2.33707e-43
-26 3.656000e-02 -3.25981e-52 -2.29932e-43 -2.29932e-43
-27 3.856000e-02 -3.11521e-52 -2.26051e-43 -2.26051e-43
-28 4.056000e-02 2.279041e-52 -2.22068e-43 -2.22068e-43
-29 4.256000e-02 -4.09991e-52 -2.17983e-43 -2.17983e-43
-30 4.456000e-02 6.197036e-53 -2.13800e-43 -2.13800e-43
-31 4.656000e-02 -4.88067e-52 -2.09519e-43 -2.09519e-43
-32 4.856000e-02 -5.64247e-52 -2.05144e-43 -2.05144e-43
-33 5.056000e-02 -4.96151e-52 -2.00675e-43 -2.00675e-43
-34 5.256000e-02 -4.23061e-52 -1.96115e-43 -1.96115e-43
-35 5.456000e-02 2.057927e-52 -1.91467e-43 -1.91467e-43
-36 5.656000e-02 -6.33244e-52 -1.86732e-43 -1.86732e-43
-37 5.856000e-02 -3.34770e-52 -1.81913e-43 -1.81913e-43
-38 6.056000e-02 -2.07109e-52 -1.77011e-43 -1.77011e-43
-39 6.256000e-02 1.985474e-52 -1.72030e-43 -1.72030e-43
-40 6.456000e-02 -2.45836e-52 -1.66972e-43 -1.66972e-43
-41 6.656000e-02 -1.04902e-52 -1.61839e-43 -1.61839e-43
-42 6.856000e-02 -2.43454e-52 -1.56633e-43 -1.56633e-43
-43 7.056000e-02 -9.13597e-53 -1.51357e-43 -1.51357e-43
-44 7.256000e-02 -2.89902e-52 -1.46013e-43 -1.46013e-43
-45 7.456000e-02 -1.08625e-52 -1.40604e-43 -1.40604e-43
-46 7.656000e-02 -1.19143e-52 -1.35132e-43 -1.35132e-43
-47 7.856000e-02 -3.87284e-52 -1.29600e-43 -1.29600e-43
-48 8.056000e-02 -1.76399e-52 -1.24011e-43 -1.24011e-43
-49 8.256000e-02 9.167300e-53 -1.18367e-43 -1.18367e-43
-50 8.456000e-02 -1.40774e-52 -1.12671e-43 -1.12671e-43
-51 8.656000e-02 1.945441e-52 -1.06925e-43 -1.06925e-43
-52 8.856000e-02 -7.42845e-53 -1.01132e-43 -1.01132e-43
-53 9.056000e-02 -3.70259e-52 -9.52954e-44 -9.52954e-44
-54 9.256000e-02 -5.23530e-54 -8.94171e-44 -8.94171e-44
-
-Index time V(1) V(2) V(3)
---------------------------------------------------------------------------------
-55 9.456000e-02 1.749423e-52 -8.35001e-44 -8.35001e-44
-56 9.656000e-02 -1.18682e-52 -7.75471e-44 -7.75471e-44
-57 9.856000e-02 -3.13438e-53 -7.15610e-44 -7.15610e-44
-58 1.000000e-01 6.326077e-47 -6.71639e-44 -6.71639e-44
-
- * /home/bhargav/downloads/esim-1.1.2/src/subcircuitlibrary/ujt/ujt.cir
- Transient Analysis Sat Jun 15 16:01:36 2019
---------------------------------------------------------------------------------
-Index time V(4) V(5) V(6)
---------------------------------------------------------------------------------
-0 0.000000e+00 -2.80622e-43 -2.80622e-43 -1.93630e-118
-1 1.000000e-05 -2.80871e-43 -2.80871e-43 -1.52261e-59
-2 2.000000e-05 -2.80868e-43 -2.80868e-43 -1.52259e-59
-3 4.000000e-05 -2.80860e-43 -2.80860e-43 -1.52255e-59
-4 8.000000e-05 -2.80589e-43 -2.80589e-43 0.000000e+00
-5 1.600000e-04 -2.80543e-43 -2.80543e-43 0.000000e+00
-6 3.200000e-04 -2.80438e-43 -2.80438e-43 0.000000e+00
-7 6.400000e-04 -2.80203e-43 -2.80203e-43 0.000000e+00
-8 1.280000e-03 -2.79955e-43 -2.79955e-43 -3.03528e-59
-9 2.560000e-03 -2.78870e-43 -2.78870e-43 -1.51176e-59
-10 4.560000e-03 -2.76667e-43 -2.76667e-43 0.000000e+00
-11 6.560000e-03 -2.74650e-43 -2.74650e-43 0.000000e+00
-12 8.560000e-03 -2.72507e-43 -2.72507e-43 0.000000e+00
-13 1.056000e-02 -2.70239e-43 -2.70239e-43 0.000000e+00
-14 1.256000e-02 -2.67846e-43 -2.67846e-43 0.000000e+00
-15 1.456000e-02 -2.65331e-43 -2.65331e-43 0.000000e+00
-16 1.656000e-02 -2.62693e-43 -2.62693e-43 0.000000e+00
-17 1.856000e-02 -2.59936e-43 -2.59936e-43 0.000000e+00
-18 2.056000e-02 -2.57059e-43 -2.57059e-43 0.000000e+00
-19 2.256000e-02 -2.54064e-43 -2.54064e-43 0.000000e+00
-20 2.456000e-02 -2.50953e-43 -2.50953e-43 0.000000e+00
-21 2.656000e-02 -2.47727e-43 -2.47727e-43 0.000000e+00
-22 2.856000e-02 -2.44388e-43 -2.44388e-43 0.000000e+00
-23 3.056000e-02 -2.40937e-43 -2.40937e-43 0.000000e+00
-24 3.256000e-02 -2.37377e-43 -2.37377e-43 0.000000e+00
-25 3.456000e-02 -2.33707e-43 -2.33707e-43 0.000000e+00
-26 3.656000e-02 -2.29932e-43 -2.29932e-43 0.000000e+00
-27 3.856000e-02 -2.26051e-43 -2.26051e-43 0.000000e+00
-28 4.056000e-02 -2.22068e-43 -2.22068e-43 0.000000e+00
-29 4.256000e-02 -2.17983e-43 -2.17983e-43 0.000000e+00
-30 4.456000e-02 -2.13800e-43 -2.13800e-43 0.000000e+00
-31 4.656000e-02 -2.09519e-43 -2.09519e-43 0.000000e+00
-32 4.856000e-02 -2.05144e-43 -2.05144e-43 0.000000e+00
-33 5.056000e-02 -2.00675e-43 -2.00675e-43 0.000000e+00
-34 5.256000e-02 -1.96115e-43 -1.96115e-43 0.000000e+00
-35 5.456000e-02 -1.91467e-43 -1.91467e-43 0.000000e+00
-36 5.656000e-02 -1.86732e-43 -1.86732e-43 0.000000e+00
-37 5.856000e-02 -1.81913e-43 -1.81913e-43 0.000000e+00
-38 6.056000e-02 -1.77011e-43 -1.77011e-43 0.000000e+00
-39 6.256000e-02 -1.72030e-43 -1.72030e-43 0.000000e+00
-40 6.456000e-02 -1.66972e-43 -1.66972e-43 0.000000e+00
-41 6.656000e-02 -1.61839e-43 -1.61839e-43 0.000000e+00
-42 6.856000e-02 -1.56633e-43 -1.56633e-43 0.000000e+00
-43 7.056000e-02 -1.51357e-43 -1.51357e-43 0.000000e+00
-44 7.256000e-02 -1.46013e-43 -1.46013e-43 0.000000e+00
-45 7.456000e-02 -1.40604e-43 -1.40604e-43 0.000000e+00
-46 7.656000e-02 -1.35132e-43 -1.35132e-43 0.000000e+00
-47 7.856000e-02 -1.29600e-43 -1.29600e-43 0.000000e+00
-48 8.056000e-02 -1.24011e-43 -1.24011e-43 0.000000e+00
-49 8.256000e-02 -1.18367e-43 -1.18367e-43 0.000000e+00
-50 8.456000e-02 -1.12671e-43 -1.12671e-43 0.000000e+00
-51 8.656000e-02 -1.06925e-43 -1.06925e-43 0.000000e+00
-52 8.856000e-02 -1.01132e-43 -1.01132e-43 0.000000e+00
-53 9.056000e-02 -9.52954e-44 -9.52954e-44 0.000000e+00
-54 9.256000e-02 -8.94171e-44 -8.94171e-44 0.000000e+00
-
-Index time V(4) V(5) V(6)
---------------------------------------------------------------------------------
-55 9.456000e-02 -8.35001e-44 -8.35001e-44 0.000000e+00
-56 9.656000e-02 -7.75471e-44 -7.75471e-44 0.000000e+00
-57 9.856000e-02 -7.15610e-44 -7.15610e-44 0.000000e+00
-58 1.000000e-01 -6.71639e-44 -6.71639e-44 -3.64096e-60
-
- * /home/bhargav/downloads/esim-1.1.2/src/subcircuitlibrary/ujt/ujt.cir
- Transient Analysis Sat Jun 15 16:01:36 2019
---------------------------------------------------------------------------------
-Index time V(7)
---------------------------------------------------------------------------------
-0 0.000000e+00 -2.80622e-43
-1 1.000000e-05 -2.80871e-43
-2 2.000000e-05 -2.80868e-43
-3 4.000000e-05 -2.80860e-43
-4 8.000000e-05 -2.80589e-43
-5 1.600000e-04 -2.80543e-43
-6 3.200000e-04 -2.80438e-43
-7 6.400000e-04 -2.80203e-43
-8 1.280000e-03 -2.79955e-43
-9 2.560000e-03 -2.78870e-43
-10 4.560000e-03 -2.76667e-43
-11 6.560000e-03 -2.74650e-43
-12 8.560000e-03 -2.72507e-43
-13 1.056000e-02 -2.70239e-43
-14 1.256000e-02 -2.67846e-43
-15 1.456000e-02 -2.65331e-43
-16 1.656000e-02 -2.62693e-43
-17 1.856000e-02 -2.59936e-43
-18 2.056000e-02 -2.57059e-43
-19 2.256000e-02 -2.54064e-43
-20 2.456000e-02 -2.50953e-43
-21 2.656000e-02 -2.47727e-43
-22 2.856000e-02 -2.44388e-43
-23 3.056000e-02 -2.40937e-43
-24 3.256000e-02 -2.37377e-43
-25 3.456000e-02 -2.33707e-43
-26 3.656000e-02 -2.29932e-43
-27 3.856000e-02 -2.26051e-43
-28 4.056000e-02 -2.22068e-43
-29 4.256000e-02 -2.17983e-43
-30 4.456000e-02 -2.13800e-43
-31 4.656000e-02 -2.09519e-43
-32 4.856000e-02 -2.05144e-43
-33 5.056000e-02 -2.00675e-43
-34 5.256000e-02 -1.96115e-43
-35 5.456000e-02 -1.91467e-43
-36 5.656000e-02 -1.86732e-43
-37 5.856000e-02 -1.81913e-43
-38 6.056000e-02 -1.77011e-43
-39 6.256000e-02 -1.72030e-43
-40 6.456000e-02 -1.66972e-43
-41 6.656000e-02 -1.61839e-43
-42 6.856000e-02 -1.56633e-43
-43 7.056000e-02 -1.51357e-43
-44 7.256000e-02 -1.46013e-43
-45 7.456000e-02 -1.40604e-43
-46 7.656000e-02 -1.35132e-43
-47 7.856000e-02 -1.29600e-43
-48 8.056000e-02 -1.24011e-43
-49 8.256000e-02 -1.18367e-43
-50 8.456000e-02 -1.12671e-43
-51 8.656000e-02 -1.06925e-43
-52 8.856000e-02 -1.01132e-43
-53 9.056000e-02 -9.52954e-44
-54 9.256000e-02 -8.94171e-44
-
-Index time V(7)
---------------------------------------------------------------------------------
-55 9.456000e-02 -8.35001e-44
-56 9.656000e-02 -7.75471e-44
-57 9.856000e-02 -7.15610e-44
-58 1.000000e-01 -6.71639e-44
diff --git a/src/SubcircuitLibrary/ujt/ujt-cache.lib b/src/SubcircuitLibrary/ujt/ujt-cache.lib
index e6fcb32b..ff75f664 100644
--- a/src/SubcircuitLibrary/ujt/ujt-cache.lib
+++ b/src/SubcircuitLibrary/ujt/ujt-cache.lib
@@ -20,23 +20,10 @@ X -c 4 50 -200 100 U 35 35 1 1 P
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
-#
# NLDS
#
-DEF NLDS B 0 40 Y Y 1 F N
-F0 "B" 0 0 60 H V C CNN
+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
diff --git a/src/SubcircuitLibrary/ujt/ujt.cir b/src/SubcircuitLibrary/ujt/ujt.cir
index 017c4845..e0e911d7 100644
--- a/src/SubcircuitLibrary/ujt/ujt.cir
+++ b/src/SubcircuitLibrary/ujt/ujt.cir
@@ -1,18 +1,18 @@
* /home/bhargav/Downloads/eSim-1.1.2/src/SubcircuitLibrary/ujt/ujt.cir
-* EESchema Netlist Version 1.1 (Spice format) creation date: Sun Jun 16 10:51:40 2019
+* 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 GND 6 1000k
-C1 5 7 35p
-R1 7 2 38.15
-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
-H1 6 GND 4 5 1k
+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/src/SubcircuitLibrary/ujt/ujt.cir.out b/src/SubcircuitLibrary/ujt/ujt.cir.out
index c3186f1c..2045c539 100644
--- a/src/SubcircuitLibrary/ujt/ujt.cir.out
+++ b/src/SubcircuitLibrary/ujt/ujt.cir.out
@@ -1,17 +1,17 @@
* /home/bhargav/downloads/esim-1.1.2/src/subcircuitlibrary/ujt/ujt.cir
.include emitter.lib
-r3 gnd 6 1000k
-c1 5 7 35p
-r1 7 2 38.15
-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
+r3 /0 /6 1000k
* h1
-Vh1 4 5 0
-h1 6 gnd Vh1 1k
-.tran 5e-06 100e-03 0e-03
+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
diff --git a/src/SubcircuitLibrary/ujt/ujt.sch b/src/SubcircuitLibrary/ujt/ujt.sch
index c1eb98f1..a82bddf7 100644
--- a/src/SubcircuitLibrary/ujt/ujt.sch
+++ b/src/SubcircuitLibrary/ujt/ujt.sch
@@ -28,15 +28,26 @@ $EndDescr
$Comp
L eSim_R R3
U 1 1 5CF5F733
-P 7400 2850
-F 0 "R3" H 7450 2980 50 0000 C CNN
-F 1 "1000k" H 7450 2900 50 0000 C CNN
-F 2 "" H 7450 2830 30 0000 C CNN
-F 3 "" V 7450 2900 30 0000 C CNN
- 1 7400 2850
+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
@@ -52,7 +63,7 @@ L eSim_R R1
U 1 1 5CF6211F
P 4300 4850
F 0 "R1" H 4350 4980 50 0000 C CNN
-F 1 "38.15" H 4350 4900 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
@@ -83,12 +94,12 @@ $EndComp
$Comp
L PORT U1
U 1 1 5CF689AD
-P 5950 1200
-F 0 "U1" H 6000 1300 30 0000 C CNN
-F 1 "PORT" H 5950 1200 30 0000 C CNN
-F 2 "" H 5950 1200 60 0000 C CNN
-F 3 "" H 5950 1200 60 0000 C CNN
- 1 5950 1200
+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
@@ -102,6 +113,16 @@ 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
@@ -113,37 +134,54 @@ 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 1850
-F 0 "D1" H 5950 1950 50 0000 C CNN
-F 1 "eSim_Diode" H 5950 1750 50 0000 C CNN
-F 2 "" H 5950 1850 60 0000 C CNN
-F 3 "" H 5950 1850 60 0000 C CNN
- 1 5950 1850
+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
- 6950 2500 7450 2500
+ 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
- 7450 2500 7450 2650
+ 5950 2450 5950 2700
Wire Wire Line
- 6950 3100 7450 3100
+ 5950 3000 5950 3300
Wire Wire Line
- 5950 1450 5950 1700
+ 5950 3400 5950 3850
Wire Wire Line
- 5950 2000 5950 2750
+ 5950 3850 5950 4100
Wire Wire Line
- 5950 2850 5950 4450
+ 5950 4100 5950 4450
Wire Wire Line
5150 4100 5150 4550
Wire Wire Line
- 4600 4100 5950 4100
+ 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 5950 5250
+ 4250 5250 5150 5250
+Wire Wire Line
+ 5150 5250 5950 5250
Wire Wire Line
4250 5250 4250 4950
Wire Wire Line
@@ -157,49 +195,5 @@ Wire Wire Line
5950 5250 5950 5150
Connection ~ 5150 5250
Wire Wire Line
- 7450 3100 7450 2950
-Connection ~ 5950 4100
-$Comp
-L CCVS H1
-U 1 1 5D04A7ED
-P 6900 2800
-F 0 "H1" H 6900 2950 50 0000 C CNN
-F 1 "1k" H 6700 2750 50 0000 C CNN
-F 2 "" H 6900 2800 60 0000 C CNN
-F 3 "" H 6900 2800 60 0000 C CNN
- 1 6900 2800
- 0 1 1 0
-$EndComp
-$Comp
-L GND #PWR01
-U 1 1 5D04C560
-P 7150 3150
-F 0 "#PWR01" H 7150 2900 50 0001 C CNN
-F 1 "GND" H 7150 3000 50 0000 C CNN
-F 2 "" H 7150 3150 50 0001 C CNN
-F 3 "" H 7150 3150 50 0001 C CNN
- 1 7150 3150
- 1 0 0 -1
-$EndComp
-Wire Wire Line
- 7150 3150 7150 3100
-Connection ~ 7150 3100
-Wire Wire Line
- 5950 2750 6700 2750
-Wire Wire Line
- 6700 2850 5950 2850
-Text GLabel 5950 1550 0 60 Input ~ 0
-1
-Text GLabel 5950 2200 0 60 Input ~ 0
-4
-Text GLabel 5950 3500 0 60 Input ~ 0
-5
-Text GLabel 5700 5250 3 60 Input ~ 0
-7
-Text GLabel 4250 4550 0 60 Input ~ 0
-2
-Text GLabel 4600 3350 0 60 Input ~ 0
-3
-Text GLabel 7200 2500 1 60 Input ~ 0
-6
+ 6700 3650 6700 3500
$EndSCHEMATC
diff --git a/src/SubcircuitLibrary/ujt/ujt.sub b/src/SubcircuitLibrary/ujt/ujt.sub
index e86745b5..2fb1db35 100644
--- a/src/SubcircuitLibrary/ujt/ujt.sub
+++ b/src/SubcircuitLibrary/ujt/ujt.sub
@@ -1,16 +1,16 @@
* Subcircuit ujt
-.subckt ujt 1 2 3
+.subckt ujt /1 /2 /3
* /home/bhargav/downloads/esim-1.1.2/src/subcircuitlibrary/ujt/ujt.cir
.include emitter.lib
-r3 gnd 6 1000k
-c1 5 7 35p
-r1 7 2 38.15
-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
+r3 /0 /6 1000k
* h1
-Vh1 4 5 0
-h1 6 gnd Vh1 1k
+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
.ends ujt \ No newline at end of file
diff --git a/src/SubcircuitLibrary/ujt/ujt_Previous_Values.xml b/src/SubcircuitLibrary/ujt/ujt_Previous_Values.xml
index 993933d5..4468b395 100644
--- a/src/SubcircuitLibrary/ujt/ujt_Previous_Values.xml
+++ b/src/SubcircuitLibrary/ujt/ujt_Previous_Values.xml
@@ -1 +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><v1 name="Source type">dc<field1 name="Value">0</field1></v1></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">us</field5><field6 name="Stop Combo">ms</field6></tran></analysis></KicadtoNgspice> \ No newline at end of file
+<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
generated by cgit (git 2.34.1) at 2024-12-20 07:51:34 +0000