summaryrefslogtreecommitdiff
path: root/views/webtronix_server
diff options
context:
space:
mode:
Diffstat (limited to 'views/webtronix_server')
-rw-r--r--views/webtronix_server/parts.json41
-rw-r--r--views/webtronix_server/spice/1N34a.lib (renamed from views/webtronix_server/spice/1N34A.lib)1
-rw-r--r--views/webtronix_server/spice/diac.sub15
-rw-r--r--views/webtronix_server/spice/full_adder.sub13
-rw-r--r--views/webtronix_server/spice/half_adder.sub14
-rw-r--r--views/webtronix_server/spice/scr.sub23
-rw-r--r--views/webtronix_server/spice/triac.sub32
-rw-r--r--views/webtronix_server/spice/ua741.sub12
-rw-r--r--views/webtronix_server/subcircuits/diac.svg (renamed from views/webtronix_server/diodes/trigger.svg)12
-rw-r--r--views/webtronix_server/subcircuits/diacsubcircuit.pngbin0 -> 6212 bytes
-rw-r--r--views/webtronix_server/subcircuits/fulladder.svg46
-rw-r--r--views/webtronix_server/subcircuits/fulladdersubcircuit.pngbin0 -> 9589 bytes
-rw-r--r--views/webtronix_server/subcircuits/halfadder.svg42
-rw-r--r--views/webtronix_server/subcircuits/halfaddersubcircuit.pngbin0 -> 6944 bytes
-rw-r--r--views/webtronix_server/subcircuits/opampsubcircuit.pngbin0 -> 7774 bytes
-rw-r--r--views/webtronix_server/subcircuits/scr.svg (renamed from views/webtronix_server/diodes/scr.svg)12
-rw-r--r--views/webtronix_server/subcircuits/scrsubcircuit.pngbin0 -> 7533 bytes
-rw-r--r--views/webtronix_server/subcircuits/triac.svg (renamed from views/webtronix_server/diodes/triac.svg)8
-rw-r--r--views/webtronix_server/subcircuits/triacsubcircuit.pngbin0 -> 9228 bytes
19 files changed, 248 insertions, 23 deletions
diff --git a/views/webtronix_server/parts.json b/views/webtronix_server/parts.json
index 6241db9..581f66d 100644
--- a/views/webtronix_server/parts.json
+++ b/views/webtronix_server/parts.json
@@ -10,12 +10,43 @@
"op-amp":{
"help":"ux + - v- out v+ model\n\ndirective = include model file",
"values":{
- "lm324":["lm324.mod"],
- "lm358":["lm358.mod"],
- "741":["ua741.mod","lm741.mod"],
- "tl084":["tl084.mod"]
+ "ua741":["ua741.sub"]
}
+ },
+ "scr":{
+ "values":{
+ "scr":["scr.sub"]
+ }
+ },
+ "triac":{
+ "values":{
+ "triac":["triac.sub"]
+ }
+
+ },
+ "diac":{
+ "values":{
+ "diac":["diac.sub"]
+ }
+
+ },
+ "fulladder":{
+ "values":{
+ "full_adder":["full_adder.sub"]
+ }
+
+ },
+ "halfadder":{
+ "values":{
+ "half_adder":["half_adder.sub"]
+ }
+
}
+
+
+
+
+
},
"analogmodels":{
@@ -160,8 +191,6 @@
"help":"dx a k model\na=anode\nk=kathode"
},
- "scr":{},
- "triac":{},
"zener":{}
},
"switches":{
diff --git a/views/webtronix_server/spice/1N34A.lib b/views/webtronix_server/spice/1N34a.lib
index e0d0ac6..1ec59ea 100644
--- a/views/webtronix_server/spice/1N34A.lib
+++ b/views/webtronix_server/spice/1N34a.lib
@@ -1,3 +1,2 @@
-
.MODEL 1N34A D(bv=75 cjo=0.5e-12 eg=0.67 ibv=18e-3
+ is=2e-7 rs=7 n=1.3 vj=0.1 m=0.27 )
diff --git a/views/webtronix_server/spice/diac.sub b/views/webtronix_server/spice/diac.sub
new file mode 100644
index 0000000..7f28ecc
--- /dev/null
+++ b/views/webtronix_server/spice/diac.sub
@@ -0,0 +1,15 @@
+* Subcircuit diac
+.subckt diac 1 2
+* /opt/esim/src/subcircuitlibrary/diac/diac.cir
+* u1 1 1 2 aswitch
+* u2 1 1 2 aswitch
+a1 1 (1 2) u1
+a2 1 (1 2) u2
+* Schematic Name: aswitch, NgSpice Name: aswitch
+.model u1 aswitch(log=TRUE cntl_off=0.1 cntl_on=25 r_on=0.0125 r_off=1000000 )
+* Schematic Name: aswitch, NgSpice Name: aswitch
+.model u2 aswitch(log=TRUE cntl_off=-0.1 cntl_on=-25 r_on=0.0125 r_off=1000000 )
+
+* Control Statements
+
+.ends diac
diff --git a/views/webtronix_server/spice/full_adder.sub b/views/webtronix_server/spice/full_adder.sub
new file mode 100644
index 0000000..5f261f7
--- /dev/null
+++ b/views/webtronix_server/spice/full_adder.sub
@@ -0,0 +1,13 @@
+* Subcircuit full_adder
+.subckt full_adder 8 7 5 4 1
+* eeschema netlist version 1.1 (spice format) creation date: wed jun 24 12:24:33 2015
+.include half_adder.sub
+x1 8 7 6 2 half_adder
+x2 5 6 4 3 half_adder
+* u2 3 2 1 d_or
+a1 [3 2 ] 1 u2
+* Schematic Name: d_or, NgSpice Name: d_or
+.model u2 d_or(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
+* Control Statements
+
+.ends full_adder \ No newline at end of file
diff --git a/views/webtronix_server/spice/half_adder.sub b/views/webtronix_server/spice/half_adder.sub
new file mode 100644
index 0000000..e9f9222
--- /dev/null
+++ b/views/webtronix_server/spice/half_adder.sub
@@ -0,0 +1,14 @@
+* Subcircuit half_adder
+.subckt half_adder 1 4 3 2
+* eeschema netlist version 1.1 (spice format) creation date: wed jun 24 11:31:48 2015
+* u2 1 4 3 d_xor
+* u3 1 4 2 d_and
+a1 [1 4 ] 3 u2
+a2 [1 4 ] 2 u3
+* Schematic Name: d_xor, NgSpice Name: d_xor
+.model u2 d_xor(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
+* Schematic Name: d_and, NgSpice Name: d_and
+.model u3 d_and(fall_delay=1.0e-9 input_load=1.0e-12 rise_delay=1.0e-9 )
+* Control Statements
+
+.ends half_adder \ No newline at end of file
diff --git a/views/webtronix_server/spice/scr.sub b/views/webtronix_server/spice/scr.sub
new file mode 100644
index 0000000..398c892
--- /dev/null
+++ b/views/webtronix_server/spice/scr.sub
@@ -0,0 +1,23 @@
+* Subcircuit scr
+.subckt scr 3 7 1
+* /opt/esim/src/subcircuitlibrary/scr/scr.cir
+.include PowerDiode.lib
+* f2
+d1 5 2 PowerDiode
+c1 3 9 10u
+* f1
+v1 8 4 dc 0
+v2 6 5 dc 0
+* u1 9 1 6 aswitch
+r1 7 8 50
+r2 3 9 1
+Vf2 2 3 0
+f2 3 9 Vf2 100
+Vf1 4 3 0
+f1 3 9 Vf1 10
+a1 9 (1 6) u1
+* Schematic Name: aswitch, NgSpice Name: aswitch
+.model u1 aswitch(log=TRUE cntl_off=0.0 cntl_on=1.0 r_on=1.0 r_off=1.0e12 )
+* Control Statements
+
+.ends scr
diff --git a/views/webtronix_server/spice/triac.sub b/views/webtronix_server/spice/triac.sub
new file mode 100644
index 0000000..760908b
--- /dev/null
+++ b/views/webtronix_server/spice/triac.sub
@@ -0,0 +1,32 @@
+* Subcircuit triac
+.subckt triac 8 11 10
+* /opt/esim/src/subcircuitlibrary/triac/triac.cir
+.include PowerDiode.lib
+* f3
+v3 7 2 dc 0
+* f2
+v2 6 3 dc 0
+c1 8 9 10u
+* f1
+v1 10 4 dc 0
+* u1 9 11 6 aswitch
+* u2 9 2 11 aswitch
+r1 8 9 1
+d1 5 8 PowerDiode
+d2 1 7 PowerDiode
+Vf3 1 8 0
+f3 8 9 Vf3 10
+Vf2 3 5 0
+f2 8 9 Vf2 10
+Vf1 4 8 0
+f1 8 9 Vf1 100
+a1 9 (11 6) u1
+a2 9 (2 11) u2
+* Schematic Name: aswitch, NgSpice Name: aswitch
+.model u1 aswitch(log=TRUE cntl_off=0.1 cntl_on=1 r_on=0.0125 r_off=1000000 )
+* Schematic Name: aswitch, NgSpice Name: aswitch
+.model u2 aswitch(log=TRUE cntl_off=-0.1 cntl_on=-1 r_on=0.0125 r_off=1000000 )
+
+* Control Statements
+
+.ends triac
diff --git a/views/webtronix_server/spice/ua741.sub b/views/webtronix_server/spice/ua741.sub
new file mode 100644
index 0000000..ad26c00
--- /dev/null
+++ b/views/webtronix_server/spice/ua741.sub
@@ -0,0 +1,12 @@
+* Subcircuit ua741
+.subckt ua741 6 7 3
+* eeschema netlist version 1.1 (spice format) creation date: monday 17 december 2012 11:16:58 am ist
+rout1 3 2 75
+eout1 2 0 1 0 1
+cbw1 1 0 31.85e-9
+rbw1 1 4 0.5e6
+ein1 4 0 7 6 100e3
+rin1 7 6 2e6
+* Control Statements
+
+.ends ua741 \ No newline at end of file
diff --git a/views/webtronix_server/diodes/trigger.svg b/views/webtronix_server/subcircuits/diac.svg
index 1970739..4645f95 100644
--- a/views/webtronix_server/diodes/trigger.svg
+++ b/views/webtronix_server/subcircuits/diac.svg
@@ -9,8 +9,8 @@
<g connects="0,10;40,10"
stroke='black'
stroke-width='2px'
- id="D"
- class="trigger">
+ id="X"
+ class="diac">
<metadata class="part" >
<wtx:part xmlns:wtx="/home/niel/Desktop/webtronics" >
<wtx:pins>
@@ -19,11 +19,11 @@
<wtx:node index="2" x="40" y="10"/>
</wtx:analog>
</wtx:pins>
- <wtx:id>d</wtx:id>
+ <wtx:id>x</wtx:id>
- <wtx:type>d</wtx:type>
- <wtx:name>trigger</wtx:name>
- <wtx:category>diodes</wtx:category>
+ <wtx:type>x</wtx:type>
+ <wtx:name>diac</wtx:name>
+ <wtx:category>subcircuits</wtx:category>
<wtx:flip></wtx:flip>
<wtx:value></wtx:value>
<wtx:label></wtx:label>
diff --git a/views/webtronix_server/subcircuits/diacsubcircuit.png b/views/webtronix_server/subcircuits/diacsubcircuit.png
new file mode 100644
index 0000000..4230dad
--- /dev/null
+++ b/views/webtronix_server/subcircuits/diacsubcircuit.png
Binary files differ
diff --git a/views/webtronix_server/subcircuits/fulladder.svg b/views/webtronix_server/subcircuits/fulladder.svg
new file mode 100644
index 0000000..c0a25b6
--- /dev/null
+++ b/views/webtronix_server/subcircuits/fulladder.svg
@@ -0,0 +1,46 @@
+<svg width="104" height="74" xmlns="http://www.w3.org/2000/svg">
+ <!-- Created with Method Draw - http://github.com/duopixel/Method-Draw/ -->
+ <g id="X"
+ class="fulladder">
+
+
+<metadata class="part" >
+ <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
+ <wtx:pins>
+ <wtx:analog>
+ <wtx:node index="1" x="0" y="19"/>
+ <wtx:node index="2" x="0" y="39"/>
+ <wtx:node index="3" x="0" y="59"/>
+ <wtx:node index="4" x="103" y="19"/>
+ <wtx:node index="5" x="103" y="59"/>
+ </wtx:analog>
+ </wtx:pins>
+ <wtx:id>x</wtx:id>
+
+ <wtx:type>x</wtx:type>
+ <wtx:name>fulladder</wtx:name>
+ <wtx:category>subcircuits</wtx:category>
+ <wtx:flip></wtx:flip>
+ <wtx:value></wtx:value>
+ <wtx:label></wtx:label>
+ <wtx:spice></wtx:spice>
+ <wtx:model></wtx:model>
+ </wtx:part>
+</metadata>
+
+
+ <rect id="svg_1" height="70" width="55" y="2.75" x="23.75" stroke-width="1.5" stroke="#000" fill="#fff"/>
+ <line stroke-linecap="null" stroke-linejoin="null" id="svg_4" y2="18.75" x2="102.75" y1="18.75" x1="79.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+ <line stroke-linecap="null" stroke-linejoin="null" id="svg_5" y2="19.75" x2="23.75" y1="19.75" x1="0.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+ <line stroke-linecap="null" stroke-linejoin="null" id="svg_6" y2="57.75" x2="102.75" y1="57.75" x1="79.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+ <line stroke-linecap="null" stroke-linejoin="null" id="svg_7" y2="38.75" x2="23.75" y1="38.75" x1="0.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+ <line stroke-linecap="null" stroke-linejoin="null" id="svg_8" y2="58.75" x2="23.75" y1="58.75" x1="0.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+ <text style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="9" id="svg_9" y="24.75" x="26.75" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">IN1</text>
+ <text style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="9" id="svg_10" y="42.75" x="26.75" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">IN2</text>
+ <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="9" id="svg_11" y="62.75" x="26.75" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">CIN</text>
+ <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="9" id="svg_12" y="23.75" x="55.75" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">SUM</text>
+ <text style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="9" id="svg_13" y="62.75" x="51.75" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">COUT</text>
+ <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="8" id="svg_14" y="33.75" x="50.75" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">FULL</text>
+ <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="8" id="svg_15" y="44.75" x="47.75" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">ADDER</text>
+ </g>
+</svg> \ No newline at end of file
diff --git a/views/webtronix_server/subcircuits/fulladdersubcircuit.png b/views/webtronix_server/subcircuits/fulladdersubcircuit.png
new file mode 100644
index 0000000..c9b7d0d
--- /dev/null
+++ b/views/webtronix_server/subcircuits/fulladdersubcircuit.png
Binary files differ
diff --git a/views/webtronix_server/subcircuits/halfadder.svg b/views/webtronix_server/subcircuits/halfadder.svg
new file mode 100644
index 0000000..4525fe9
--- /dev/null
+++ b/views/webtronix_server/subcircuits/halfadder.svg
@@ -0,0 +1,42 @@
+<svg width="104" height="74" xmlns="http://www.w3.org/2000/svg">
+ <!-- Created with Method Draw - http://github.com/duopixel/Method-Draw/ -->
+ <g id="x"
+ class="halfadder">
+
+<metadata class="part" >
+ <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
+ <wtx:pins>
+ <wtx:analog>
+ <wtx:node index="1" x="0" y="19"/>
+ <wtx:node index="2" x="0" y="59"/>
+ <wtx:node index="3" x="103" y="19"/>
+ <wtx:node index="4" x="103" y="59"/>
+ </wtx:analog>
+ </wtx:pins>
+ <wtx:id>x</wtx:id>
+
+ <wtx:type>x</wtx:type>
+ <wtx:name>halfadder</wtx:name>
+ <wtx:category>subcircuits</wtx:category>
+ <wtx:flip></wtx:flip>
+ <wtx:value></wtx:value>
+ <wtx:label></wtx:label>
+ <wtx:spice></wtx:spice>
+ <wtx:model></wtx:model>
+ </wtx:part>
+</metadata>
+
+
+ <rect id="svg_1" height="70" width="55" y="2.75" x="23.75" stroke-width="1.5" stroke="#000" fill="#fff"/>
+ <line stroke-linecap="null" stroke-linejoin="null" id="svg_4" y2="18.75" x2="102.75" y1="18.75" x1="79.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+ <line stroke-linecap="null" stroke-linejoin="null" id="svg_5" y2="19.75" x2="23.75" y1="19.75" x1="0.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+ <line stroke-linecap="null" stroke-linejoin="null" id="svg_6" y2="57.75" x2="102.75" y1="57.75" x1="79.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+ <line stroke-linecap="null" stroke-linejoin="null" id="svg_8" y2="58.75" x2="23.75" y1="58.75" x1="0.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+ <text style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="9" id="svg_9" y="24.75" x="26.75" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">IN1</text>
+ <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="9" id="svg_10" y="62.75" x="26.75" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">IN2</text>
+ <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="9" id="svg_12" y="23.75" x="55.75" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">SUM</text>
+ <text style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="9" id="svg_13" y="62.75" x="51.75" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">COUT</text>
+ <text style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="8" id="svg_14" y="33.75" x="50.75" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">HALF</text>
+ <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="8" id="svg_15" y="44.75" x="47.75" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">ADDER</text>
+ </g>
+</svg> \ No newline at end of file
diff --git a/views/webtronix_server/subcircuits/halfaddersubcircuit.png b/views/webtronix_server/subcircuits/halfaddersubcircuit.png
new file mode 100644
index 0000000..ce6d477
--- /dev/null
+++ b/views/webtronix_server/subcircuits/halfaddersubcircuit.png
Binary files differ
diff --git a/views/webtronix_server/subcircuits/opampsubcircuit.png b/views/webtronix_server/subcircuits/opampsubcircuit.png
new file mode 100644
index 0000000..49c322d
--- /dev/null
+++ b/views/webtronix_server/subcircuits/opampsubcircuit.png
Binary files differ
diff --git a/views/webtronix_server/diodes/scr.svg b/views/webtronix_server/subcircuits/scr.svg
index 95048a6..570ddd6 100644
--- a/views/webtronix_server/diodes/scr.svg
+++ b/views/webtronix_server/subcircuits/scr.svg
@@ -9,10 +9,10 @@
<g connects="0,10;40,10;0,20"
stroke='black'
stroke-width='2px'
- id="D"
- classs="scr" >
+ id="x"
+ class="scr" >
<metadata class="part" >
- <wtx:part xmlns:wtx="/home/niel/Desktop/webtronics" >
+ <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
<wtx:pins>
<wtx:analog>
<wtx:node index="1" x="0" y="10"/>
@@ -20,11 +20,11 @@
<wtx:node index="3" x="0" y="20"/>
</wtx:analog>
</wtx:pins>
- <wtx:id>d</wtx:id>
+ <wtx:id>x</wtx:id>
- <wtx:type>d</wtx:type>
+ <wtx:type>x</wtx:type>
<wtx:name>scr</wtx:name>
- <wtx:category>diodes</wtx:category>
+ <wtx:category>subcircuits</wtx:category>
<wtx:flip></wtx:flip>
<wtx:value></wtx:value>
<wtx:label></wtx:label>
diff --git a/views/webtronix_server/subcircuits/scrsubcircuit.png b/views/webtronix_server/subcircuits/scrsubcircuit.png
new file mode 100644
index 0000000..ee4e768
--- /dev/null
+++ b/views/webtronix_server/subcircuits/scrsubcircuit.png
Binary files differ
diff --git a/views/webtronix_server/diodes/triac.svg b/views/webtronix_server/subcircuits/triac.svg
index 096cd2f..168a93f 100644
--- a/views/webtronix_server/diodes/triac.svg
+++ b/views/webtronix_server/subcircuits/triac.svg
@@ -8,7 +8,7 @@
>
<g stroke='black'
stroke-width='2px'
- id="D"
+ id="x"
class ="triac">
<metadata class="part" >
<wtx:part xmlns:wtx="/home/niel/Desktop/webtronics" >
@@ -19,11 +19,11 @@
<wtx:node index="3" x="40" y="20"/>
</wtx:analog>
</wtx:pins>
- <wtx:id>d</wtx:id>
+ <wtx:id>x</wtx:id>
- <wtx:type>d</wtx:type>
+ <wtx:type>x</wtx:type>
<wtx:name>triac</wtx:name>
- <wtx:category>diodes</wtx:category>
+ <wtx:category>subcircuits</wtx:category>
<wtx:flip></wtx:flip>
<wtx:value></wtx:value>
<wtx:label></wtx:label>
diff --git a/views/webtronix_server/subcircuits/triacsubcircuit.png b/views/webtronix_server/subcircuits/triacsubcircuit.png
new file mode 100644
index 0000000..295ab8f
--- /dev/null
+++ b/views/webtronix_server/subcircuits/triacsubcircuit.png
Binary files differ