mirror of
https://github.com/hneemann/Digital.git
synced 2025-09-19 09:54:49 -04:00
Merge branch 'master' into svgExport
This commit is contained in:
hneemann
commit
28b0cbe377
File diff suppressed because it is too large
Load Diff
@ -92,24 +92,6 @@
|
|||||||
</elementAttributes>
|
</elementAttributes>
|
||||||
<pos x="-180" y="-400"/>
|
<pos x="-180" y="-400"/>
|
||||||
</visualElement>
|
</visualElement>
|
||||||
<visualElement>
|
|
||||||
<elementName>Out</elementName>
|
|
||||||
<elementAttributes>
|
|
||||||
<entry>
|
|
||||||
<string>Description</string>
|
|
||||||
<string>ripple blanking output (LOW active)</string>
|
|
||||||
</entry>
|
|
||||||
<entry>
|
|
||||||
<string>Label</string>
|
|
||||||
<string>~RBO</string>
|
|
||||||
</entry>
|
|
||||||
<entry>
|
|
||||||
<string>pinNumber</string>
|
|
||||||
<string>4</string>
|
|
||||||
</entry>
|
|
||||||
</elementAttributes>
|
|
||||||
<pos x="100" y="-220"/>
|
|
||||||
</visualElement>
|
|
||||||
<visualElement>
|
<visualElement>
|
||||||
<elementName>In</elementName>
|
<elementName>In</elementName>
|
||||||
<elementAttributes>
|
<elementAttributes>
|
||||||
@ -125,6 +107,10 @@
|
|||||||
<string>pinNumber</string>
|
<string>pinNumber</string>
|
||||||
<string>5</string>
|
<string>5</string>
|
||||||
</entry>
|
</entry>
|
||||||
|
<entry>
|
||||||
|
<string>InDefault</string>
|
||||||
|
<value v="1" z="false"/>
|
||||||
|
</entry>
|
||||||
</elementAttributes>
|
</elementAttributes>
|
||||||
<pos x="-180" y="240"/>
|
<pos x="-180" y="240"/>
|
||||||
</visualElement>
|
</visualElement>
|
||||||
@ -144,7 +130,7 @@
|
|||||||
<int>1</int>
|
<int>1</int>
|
||||||
</entry>
|
</entry>
|
||||||
</elementAttributes>
|
</elementAttributes>
|
||||||
<pos x="740" y="-1100"/>
|
<pos x="680" y="-1100"/>
|
||||||
</visualElement>
|
</visualElement>
|
||||||
<visualElement>
|
<visualElement>
|
||||||
<elementName>Out</elementName>
|
<elementName>Out</elementName>
|
||||||
@ -162,7 +148,7 @@
|
|||||||
<int>1</int>
|
<int>1</int>
|
||||||
</entry>
|
</entry>
|
||||||
</elementAttributes>
|
</elementAttributes>
|
||||||
<pos x="740" y="-820"/>
|
<pos x="680" y="-820"/>
|
||||||
</visualElement>
|
</visualElement>
|
||||||
<visualElement>
|
<visualElement>
|
||||||
<elementName>Out</elementName>
|
<elementName>Out</elementName>
|
||||||
@ -180,7 +166,7 @@
|
|||||||
<int>1</int>
|
<int>1</int>
|
||||||
</entry>
|
</entry>
|
||||||
</elementAttributes>
|
</elementAttributes>
|
||||||
<pos x="740" y="-620"/>
|
<pos x="680" y="-620"/>
|
||||||
</visualElement>
|
</visualElement>
|
||||||
<visualElement>
|
<visualElement>
|
||||||
<elementName>Out</elementName>
|
<elementName>Out</elementName>
|
||||||
@ -198,7 +184,7 @@
|
|||||||
<int>1</int>
|
<int>1</int>
|
||||||
</entry>
|
</entry>
|
||||||
</elementAttributes>
|
</elementAttributes>
|
||||||
<pos x="740" y="-360"/>
|
<pos x="680" y="-360"/>
|
||||||
</visualElement>
|
</visualElement>
|
||||||
<visualElement>
|
<visualElement>
|
||||||
<elementName>Out</elementName>
|
<elementName>Out</elementName>
|
||||||
@ -216,7 +202,7 @@
|
|||||||
<int>1</int>
|
<int>1</int>
|
||||||
</entry>
|
</entry>
|
||||||
</elementAttributes>
|
</elementAttributes>
|
||||||
<pos x="740" y="-160"/>
|
<pos x="680" y="-160"/>
|
||||||
</visualElement>
|
</visualElement>
|
||||||
<visualElement>
|
<visualElement>
|
||||||
<elementName>Out</elementName>
|
<elementName>Out</elementName>
|
||||||
@ -234,7 +220,7 @@
|
|||||||
<int>1</int>
|
<int>1</int>
|
||||||
</entry>
|
</entry>
|
||||||
</elementAttributes>
|
</elementAttributes>
|
||||||
<pos x="740" y="80"/>
|
<pos x="680" y="80"/>
|
||||||
</visualElement>
|
</visualElement>
|
||||||
<visualElement>
|
<visualElement>
|
||||||
<elementName>Out</elementName>
|
<elementName>Out</elementName>
|
||||||
@ -252,7 +238,7 @@
|
|||||||
<int>1</int>
|
<int>1</int>
|
||||||
</entry>
|
</entry>
|
||||||
</elementAttributes>
|
</elementAttributes>
|
||||||
<pos x="740" y="320"/>
|
<pos x="680" y="320"/>
|
||||||
</visualElement>
|
</visualElement>
|
||||||
<visualElement>
|
<visualElement>
|
||||||
<elementName>In</elementName>
|
<elementName>In</elementName>
|
||||||
@ -269,13 +255,17 @@
|
|||||||
<string>pinNumber</string>
|
<string>pinNumber</string>
|
||||||
<string>3</string>
|
<string>3</string>
|
||||||
</entry>
|
</entry>
|
||||||
|
<entry>
|
||||||
|
<string>InDefault</string>
|
||||||
|
<value v="1" z="false"/>
|
||||||
|
</entry>
|
||||||
</elementAttributes>
|
</elementAttributes>
|
||||||
<pos x="-180" y="140"/>
|
<pos x="-180" y="140"/>
|
||||||
</visualElement>
|
</visualElement>
|
||||||
<visualElement>
|
<visualElement>
|
||||||
<elementName>PowerSupply</elementName>
|
<elementName>PowerSupply</elementName>
|
||||||
<elementAttributes/>
|
<elementAttributes/>
|
||||||
<pos x="-140" y="-1180"/>
|
<pos x="-20" y="-1140"/>
|
||||||
</visualElement>
|
</visualElement>
|
||||||
<visualElement>
|
<visualElement>
|
||||||
<elementName>In</elementName>
|
<elementName>In</elementName>
|
||||||
@ -293,7 +283,7 @@
|
|||||||
<value v="1" z="false"/>
|
<value v="1" z="false"/>
|
||||||
</entry>
|
</entry>
|
||||||
</elementAttributes>
|
</elementAttributes>
|
||||||
<pos x="-180" y="-1180"/>
|
<pos x="-60" y="-1140"/>
|
||||||
</visualElement>
|
</visualElement>
|
||||||
<visualElement>
|
<visualElement>
|
||||||
<elementName>In</elementName>
|
<elementName>In</elementName>
|
||||||
@ -307,7 +297,7 @@
|
|||||||
<string>8</string>
|
<string>8</string>
|
||||||
</entry>
|
</entry>
|
||||||
</elementAttributes>
|
</elementAttributes>
|
||||||
<pos x="-180" y="-1140"/>
|
<pos x="-60" y="-1100"/>
|
||||||
</visualElement>
|
</visualElement>
|
||||||
<visualElement>
|
<visualElement>
|
||||||
<elementName>Testcase</elementName>
|
<elementName>Testcase</elementName>
|
||||||
@ -315,34 +305,42 @@
|
|||||||
<entry>
|
<entry>
|
||||||
<string>Testdata</string>
|
<string>Testdata</string>
|
||||||
<testData>
|
<testData>
|
||||||
<dataString>~LT ~RBI D C B A ~RBO a b c d e f g
|
<dataString>~LT ~RBI D C B A ~BI/~RBO a b c d e f g ~BI/~RBO_out
|
||||||
1 1 0 0 0 0 1 1 1 1 1 1 1 0
|
1 0 0 0 0 0 z 0 0 0 0 0 0 0 0
|
||||||
|
1 1 0 0 0 0 z 1 1 1 1 1 1 0 1
|
||||||
|
1 0 0 0 0 0 0 0 0 0 0 0 0 0 0
|
||||||
|
# ~RBI=0 & ~BI=1 is not allowed
|
||||||
|
#1 0 0 0 0 0 1 1 1 1 1 1 1 0 1
|
||||||
|
1 1 0 0 0 0 0 0 0 0 0 0 0 0 0
|
||||||
|
1 1 0 0 0 0 1 1 1 1 1 1 1 0 1
|
||||||
|
|
||||||
1 x 0 0 0 1 1 0 1 1 0 0 0 0
|
1 x 0 0 0 1 z 0 1 1 0 0 0 0 1
|
||||||
1 x 0 0 1 0 1 1 1 0 1 1 0 1
|
1 x 0 0 1 0 z 1 1 0 1 1 0 1 1
|
||||||
1 x 0 0 1 1 1 1 1 1 1 0 0 1
|
1 x 0 0 1 1 z 1 1 1 1 0 0 1 1
|
||||||
1 x 0 1 0 0 1 0 1 1 0 0 1 1
|
1 x 0 1 0 0 z 0 1 1 0 0 1 1 1
|
||||||
1 x 0 1 0 1 1 1 0 1 1 0 1 1
|
1 x 0 1 0 1 z 1 0 1 1 0 1 1 1
|
||||||
1 x 0 1 1 0 1 1 0 1 1 1 1 1
|
1 x 0 1 1 0 z 1 0 1 1 1 1 1 1
|
||||||
1 x 0 1 1 1 1 1 1 1 0 0 0 0
|
1 x 0 1 1 1 z 1 1 1 0 0 0 0 1
|
||||||
1 x 1 0 0 0 1 1 1 1 1 1 1 1
|
1 x 1 0 0 0 z 1 1 1 1 1 1 1 1
|
||||||
1 x 1 0 0 1 1 1 1 1 1 0 1 1
|
1 x 1 0 0 1 z 1 1 1 1 0 1 1 1
|
||||||
1 x 1 0 1 0 1 0 0 0 1 1 0 1
|
1 x 1 0 1 0 z 0 0 0 1 1 0 1 1
|
||||||
1 x 1 0 1 1 1 0 0 1 1 0 0 1
|
1 x 1 0 1 1 z 0 0 1 1 0 0 1 1
|
||||||
1 x 1 1 0 0 1 0 1 0 0 0 1 1
|
1 x 1 1 0 0 z 0 1 0 0 0 1 1 1
|
||||||
1 x 1 1 0 1 1 1 0 0 1 0 1 1
|
1 x 1 1 0 1 z 1 0 0 1 0 1 1 1
|
||||||
1 x 1 1 1 0 1 0 0 0 1 1 1 1
|
1 x 1 1 1 0 z 0 0 0 1 1 1 1 1
|
||||||
1 x 1 1 1 1 1 0 0 0 0 0 0 0
|
1 x 1 1 1 1 z 0 0 0 0 0 0 0 1
|
||||||
|
|
||||||
#x x x x x x 0 0 0 0 0 0 0 0
|
#x x x x x x z 0 0 0 0 0 0 0
|
||||||
1 0 0 0 0 0 0 0 0 0 0 0 0 0
|
1 0 0 0 0 0 z 0 0 0 0 0 0 0 0
|
||||||
0 x x x x x 1 1 1 1 1 1 1 1
|
0 x x x x x z 1 1 1 1 1 1 1 1
|
||||||
|
0 x x x x x 0 0 0 0 0 0 0 0 0
|
||||||
|
0 x x x x x 1 1 1 1 1 1 1 1 1
|
||||||
|
|
||||||
</dataString>
|
</dataString>
|
||||||
</testData>
|
</testData>
|
||||||
</entry>
|
</entry>
|
||||||
</elementAttributes>
|
</elementAttributes>
|
||||||
<pos x="60" y="-1200"/>
|
<pos x="100" y="-1160"/>
|
||||||
</visualElement>
|
</visualElement>
|
||||||
<visualElement>
|
<visualElement>
|
||||||
<elementName>NAnd</elementName>
|
<elementName>NAnd</elementName>
|
||||||
@ -436,7 +434,7 @@
|
|||||||
<boolean>true</boolean>
|
<boolean>true</boolean>
|
||||||
</entry>
|
</entry>
|
||||||
</elementAttributes>
|
</elementAttributes>
|
||||||
<pos x="-20" y="220"/>
|
<pos x="40" y="220"/>
|
||||||
</visualElement>
|
</visualElement>
|
||||||
<visualElement>
|
<visualElement>
|
||||||
<elementName>And</elementName>
|
<elementName>And</elementName>
|
||||||
@ -665,161 +663,43 @@
|
|||||||
<rotation rotation="1"/>
|
<rotation rotation="1"/>
|
||||||
</entry>
|
</entry>
|
||||||
</elementAttributes>
|
</elementAttributes>
|
||||||
<pos x="-80" y="100"/>
|
<pos x="-20" y="100"/>
|
||||||
</visualElement>
|
</visualElement>
|
||||||
<visualElement>
|
<visualElement>
|
||||||
<elementName>And</elementName>
|
<elementName>In</elementName>
|
||||||
<elementAttributes>
|
<elementAttributes>
|
||||||
<entry>
|
<entry>
|
||||||
<string>wideShape</string>
|
<string>Description</string>
|
||||||
|
<string>Blanking Input/Ripple Blank Output</string>
|
||||||
|
</entry>
|
||||||
|
<entry>
|
||||||
|
<string>Label</string>
|
||||||
|
<string>~BI/~RBO</string>
|
||||||
|
</entry>
|
||||||
|
<entry>
|
||||||
|
<string>pinNumber</string>
|
||||||
|
<string>4</string>
|
||||||
|
</entry>
|
||||||
|
<entry>
|
||||||
|
<string>InDefault</string>
|
||||||
|
<value v="0" z="true"/>
|
||||||
|
</entry>
|
||||||
|
<entry>
|
||||||
|
<string>isHighZ</string>
|
||||||
<boolean>true</boolean>
|
<boolean>true</boolean>
|
||||||
</entry>
|
</entry>
|
||||||
<entry>
|
|
||||||
<string>inverterConfig</string>
|
|
||||||
<inverterConfig>
|
|
||||||
<string>In_1</string>
|
|
||||||
<string>In_2</string>
|
|
||||||
</inverterConfig>
|
|
||||||
</entry>
|
|
||||||
</elementAttributes>
|
</elementAttributes>
|
||||||
<pos x="560" y="-640"/>
|
<pos x="-180" y="-260"/>
|
||||||
</visualElement>
|
|
||||||
<visualElement>
|
|
||||||
<elementName>And</elementName>
|
|
||||||
<elementAttributes>
|
|
||||||
<entry>
|
|
||||||
<string>wideShape</string>
|
|
||||||
<boolean>true</boolean>
|
|
||||||
</entry>
|
|
||||||
<entry>
|
|
||||||
<string>inverterConfig</string>
|
|
||||||
<inverterConfig>
|
|
||||||
<string>In_1</string>
|
|
||||||
<string>In_2</string>
|
|
||||||
</inverterConfig>
|
|
||||||
</entry>
|
|
||||||
</elementAttributes>
|
|
||||||
<pos x="560" y="-180"/>
|
|
||||||
</visualElement>
|
|
||||||
<visualElement>
|
|
||||||
<elementName>And</elementName>
|
|
||||||
<elementAttributes>
|
|
||||||
<entry>
|
|
||||||
<string>wideShape</string>
|
|
||||||
<boolean>true</boolean>
|
|
||||||
</entry>
|
|
||||||
<entry>
|
|
||||||
<string>inverterConfig</string>
|
|
||||||
<inverterConfig>
|
|
||||||
<string>In_1</string>
|
|
||||||
<string>In_2</string>
|
|
||||||
</inverterConfig>
|
|
||||||
</entry>
|
|
||||||
</elementAttributes>
|
|
||||||
<pos x="560" y="300"/>
|
|
||||||
</visualElement>
|
|
||||||
<visualElement>
|
|
||||||
<elementName>And</elementName>
|
|
||||||
<elementAttributes>
|
|
||||||
<entry>
|
|
||||||
<string>wideShape</string>
|
|
||||||
<boolean>true</boolean>
|
|
||||||
</entry>
|
|
||||||
<entry>
|
|
||||||
<string>inverterConfig</string>
|
|
||||||
<inverterConfig>
|
|
||||||
<string>In_1</string>
|
|
||||||
<string>In_2</string>
|
|
||||||
<string>In_3</string>
|
|
||||||
</inverterConfig>
|
|
||||||
</entry>
|
|
||||||
<entry>
|
|
||||||
<string>Inputs</string>
|
|
||||||
<int>3</int>
|
|
||||||
</entry>
|
|
||||||
</elementAttributes>
|
|
||||||
<pos x="560" y="60"/>
|
|
||||||
</visualElement>
|
|
||||||
<visualElement>
|
|
||||||
<elementName>And</elementName>
|
|
||||||
<elementAttributes>
|
|
||||||
<entry>
|
|
||||||
<string>wideShape</string>
|
|
||||||
<boolean>true</boolean>
|
|
||||||
</entry>
|
|
||||||
<entry>
|
|
||||||
<string>inverterConfig</string>
|
|
||||||
<inverterConfig>
|
|
||||||
<string>In_1</string>
|
|
||||||
<string>In_2</string>
|
|
||||||
<string>In_3</string>
|
|
||||||
</inverterConfig>
|
|
||||||
</entry>
|
|
||||||
<entry>
|
|
||||||
<string>Inputs</string>
|
|
||||||
<int>3</int>
|
|
||||||
</entry>
|
|
||||||
</elementAttributes>
|
|
||||||
<pos x="560" y="-380"/>
|
|
||||||
</visualElement>
|
|
||||||
<visualElement>
|
|
||||||
<elementName>And</elementName>
|
|
||||||
<elementAttributes>
|
|
||||||
<entry>
|
|
||||||
<string>wideShape</string>
|
|
||||||
<boolean>true</boolean>
|
|
||||||
</entry>
|
|
||||||
<entry>
|
|
||||||
<string>inverterConfig</string>
|
|
||||||
<inverterConfig>
|
|
||||||
<string>In_1</string>
|
|
||||||
<string>In_2</string>
|
|
||||||
<string>In_3</string>
|
|
||||||
</inverterConfig>
|
|
||||||
</entry>
|
|
||||||
<entry>
|
|
||||||
<string>Inputs</string>
|
|
||||||
<int>3</int>
|
|
||||||
</entry>
|
|
||||||
</elementAttributes>
|
|
||||||
<pos x="560" y="-840"/>
|
|
||||||
</visualElement>
|
|
||||||
<visualElement>
|
|
||||||
<elementName>And</elementName>
|
|
||||||
<elementAttributes>
|
|
||||||
<entry>
|
|
||||||
<string>wideShape</string>
|
|
||||||
<boolean>true</boolean>
|
|
||||||
</entry>
|
|
||||||
<entry>
|
|
||||||
<string>inverterConfig</string>
|
|
||||||
<inverterConfig>
|
|
||||||
<string>In_1</string>
|
|
||||||
<string>In_2</string>
|
|
||||||
<string>In_3</string>
|
|
||||||
</inverterConfig>
|
|
||||||
</entry>
|
|
||||||
<entry>
|
|
||||||
<string>Inputs</string>
|
|
||||||
<int>3</int>
|
|
||||||
</entry>
|
|
||||||
</elementAttributes>
|
|
||||||
<pos x="560" y="-1120"/>
|
|
||||||
</visualElement>
|
</visualElement>
|
||||||
<visualElement>
|
<visualElement>
|
||||||
<elementName>PullUp</elementName>
|
<elementName>PullUp</elementName>
|
||||||
<elementAttributes/>
|
<elementAttributes/>
|
||||||
<pos x="60" y="-240"/>
|
<pos x="120" y="-220"/>
|
||||||
</visualElement>
|
|
||||||
<visualElement>
|
|
||||||
<elementName>NFET</elementName>
|
|
||||||
<elementAttributes/>
|
|
||||||
<pos x="40" y="-200"/>
|
|
||||||
</visualElement>
|
</visualElement>
|
||||||
<visualElement>
|
<visualElement>
|
||||||
<elementName>Ground</elementName>
|
<elementName>Ground</elementName>
|
||||||
<elementAttributes/>
|
<elementAttributes/>
|
||||||
<pos x="60" y="-140"/>
|
<pos x="120" y="-120"/>
|
||||||
</visualElement>
|
</visualElement>
|
||||||
<visualElement>
|
<visualElement>
|
||||||
<elementName>And</elementName>
|
<elementName>And</elementName>
|
||||||
@ -837,7 +717,103 @@
|
|||||||
<int>6</int>
|
<int>6</int>
|
||||||
</entry>
|
</entry>
|
||||||
</elementAttributes>
|
</elementAttributes>
|
||||||
<pos x="-40" y="-20"/>
|
<pos x="20" y="-20"/>
|
||||||
|
</visualElement>
|
||||||
|
<visualElement>
|
||||||
|
<elementName>NOr</elementName>
|
||||||
|
<elementAttributes>
|
||||||
|
<entry>
|
||||||
|
<string>wideShape</string>
|
||||||
|
<boolean>true</boolean>
|
||||||
|
</entry>
|
||||||
|
<entry>
|
||||||
|
<string>Inputs</string>
|
||||||
|
<int>3</int>
|
||||||
|
</entry>
|
||||||
|
</elementAttributes>
|
||||||
|
<pos x="540" y="-1120"/>
|
||||||
|
</visualElement>
|
||||||
|
<visualElement>
|
||||||
|
<elementName>NOr</elementName>
|
||||||
|
<elementAttributes>
|
||||||
|
<entry>
|
||||||
|
<string>wideShape</string>
|
||||||
|
<boolean>true</boolean>
|
||||||
|
</entry>
|
||||||
|
<entry>
|
||||||
|
<string>Inputs</string>
|
||||||
|
<int>3</int>
|
||||||
|
</entry>
|
||||||
|
</elementAttributes>
|
||||||
|
<pos x="540" y="-840"/>
|
||||||
|
</visualElement>
|
||||||
|
<visualElement>
|
||||||
|
<elementName>NOr</elementName>
|
||||||
|
<elementAttributes>
|
||||||
|
<entry>
|
||||||
|
<string>wideShape</string>
|
||||||
|
<boolean>true</boolean>
|
||||||
|
</entry>
|
||||||
|
<entry>
|
||||||
|
<string>Inputs</string>
|
||||||
|
<int>3</int>
|
||||||
|
</entry>
|
||||||
|
</elementAttributes>
|
||||||
|
<pos x="540" y="-380"/>
|
||||||
|
</visualElement>
|
||||||
|
<visualElement>
|
||||||
|
<elementName>NOr</elementName>
|
||||||
|
<elementAttributes>
|
||||||
|
<entry>
|
||||||
|
<string>wideShape</string>
|
||||||
|
<boolean>true</boolean>
|
||||||
|
</entry>
|
||||||
|
<entry>
|
||||||
|
<string>Inputs</string>
|
||||||
|
<int>3</int>
|
||||||
|
</entry>
|
||||||
|
</elementAttributes>
|
||||||
|
<pos x="540" y="60"/>
|
||||||
|
</visualElement>
|
||||||
|
<visualElement>
|
||||||
|
<elementName>NOr</elementName>
|
||||||
|
<elementAttributes>
|
||||||
|
<entry>
|
||||||
|
<string>wideShape</string>
|
||||||
|
<boolean>true</boolean>
|
||||||
|
</entry>
|
||||||
|
</elementAttributes>
|
||||||
|
<pos x="540" y="300"/>
|
||||||
|
</visualElement>
|
||||||
|
<visualElement>
|
||||||
|
<elementName>NOr</elementName>
|
||||||
|
<elementAttributes>
|
||||||
|
<entry>
|
||||||
|
<string>wideShape</string>
|
||||||
|
<boolean>true</boolean>
|
||||||
|
</entry>
|
||||||
|
</elementAttributes>
|
||||||
|
<pos x="540" y="-180"/>
|
||||||
|
</visualElement>
|
||||||
|
<visualElement>
|
||||||
|
<elementName>NOr</elementName>
|
||||||
|
<elementAttributes>
|
||||||
|
<entry>
|
||||||
|
<string>wideShape</string>
|
||||||
|
<boolean>true</boolean>
|
||||||
|
</entry>
|
||||||
|
</elementAttributes>
|
||||||
|
<pos x="540" y="-640"/>
|
||||||
|
</visualElement>
|
||||||
|
<visualElement>
|
||||||
|
<elementName>Driver</elementName>
|
||||||
|
<elementAttributes>
|
||||||
|
<entry>
|
||||||
|
<string>rotation</string>
|
||||||
|
<rotation rotation="1"/>
|
||||||
|
</entry>
|
||||||
|
</elementAttributes>
|
||||||
|
<pos x="120" y="-160"/>
|
||||||
</visualElement>
|
</visualElement>
|
||||||
</visualElements>
|
</visualElements>
|
||||||
<wires>
|
<wires>
|
||||||
@ -857,6 +833,10 @@
|
|||||||
<p1 x="340" y="-260"/>
|
<p1 x="340" y="-260"/>
|
||||||
<p2 x="420" y="-260"/>
|
<p2 x="420" y="-260"/>
|
||||||
</wire>
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="-180" y="-260"/>
|
||||||
|
<p2 x="80" y="-260"/>
|
||||||
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="260" y="260"/>
|
<p1 x="260" y="260"/>
|
||||||
<p2 x="420" y="260"/>
|
<p2 x="420" y="260"/>
|
||||||
@ -865,10 +845,6 @@
|
|||||||
<p1 x="380" y="-1160"/>
|
<p1 x="380" y="-1160"/>
|
||||||
<p2 x="420" y="-1160"/>
|
<p2 x="420" y="-1160"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
|
||||||
<p1 x="-160" y="-1160"/>
|
|
||||||
<p2 x="-140" y="-1160"/>
|
|
||||||
</wire>
|
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="80" y="-520"/>
|
<p1 x="80" y="-520"/>
|
||||||
<p2 x="100" y="-520"/>
|
<p2 x="100" y="-520"/>
|
||||||
@ -895,7 +871,7 @@
|
|||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="-180" y="140"/>
|
<p1 x="-180" y="140"/>
|
||||||
<p2 x="-80" y="140"/>
|
<p2 x="-20" y="140"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="260" y="-1040"/>
|
<p1 x="260" y="-1040"/>
|
||||||
@ -927,10 +903,10 @@
|
|||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="-100" y="20"/>
|
<p1 x="-100" y="20"/>
|
||||||
<p2 x="-80" y="20"/>
|
<p2 x="-20" y="20"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="80" y="20"/>
|
<p1 x="140" y="20"/>
|
||||||
<p2 x="280" y="20"/>
|
<p2 x="280" y="20"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
@ -938,8 +914,8 @@
|
|||||||
<p2 x="420" y="20"/>
|
<p2 x="420" y="20"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="-80" y="20"/>
|
<p1 x="-20" y="20"/>
|
||||||
<p2 x="-40" y="20"/>
|
<p2 x="20" y="20"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="300" y="-920"/>
|
<p1 x="300" y="-920"/>
|
||||||
@ -962,24 +938,20 @@
|
|||||||
<p2 x="420" y="280"/>
|
<p2 x="420" y="280"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="-180" y="-1180"/>
|
<p1 x="200" y="-540"/>
|
||||||
<p2 x="-140" y="-1180"/>
|
<p2 x="340" y="-540"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="500" y="-1180"/>
|
<p1 x="500" y="-1180"/>
|
||||||
<p2 x="520" y="-1180"/>
|
<p2 x="520" y="-1180"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="200" y="-540"/>
|
<p1 x="80" y="-160"/>
|
||||||
<p2 x="340" y="-540"/>
|
<p2 x="100" y="-160"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="640" y="-160"/>
|
<p1 x="640" y="-160"/>
|
||||||
<p2 x="740" y="-160"/>
|
<p2 x="680" y="-160"/>
|
||||||
</wire>
|
|
||||||
<wire>
|
|
||||||
<p1 x="20" y="-160"/>
|
|
||||||
<p2 x="40" y="-160"/>
|
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="520" y="-800"/>
|
<p1 x="520" y="-800"/>
|
||||||
@ -1018,7 +990,7 @@
|
|||||||
<p2 x="420" y="-680"/>
|
<p2 x="420" y="-680"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="60" y="40"/>
|
<p1 x="120" y="40"/>
|
||||||
<p2 x="320" y="40"/>
|
<p2 x="320" y="40"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
@ -1063,7 +1035,7 @@
|
|||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="640" y="-820"/>
|
<p1 x="640" y="-820"/>
|
||||||
<p2 x="740" y="-820"/>
|
<p2 x="680" y="-820"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="320" y="-820"/>
|
<p1 x="320" y="-820"/>
|
||||||
@ -1115,7 +1087,7 @@
|
|||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="640" y="320"/>
|
<p1 x="640" y="320"/>
|
||||||
<p2 x="740" y="320"/>
|
<p2 x="680" y="320"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="500" y="-580"/>
|
<p1 x="500" y="-580"/>
|
||||||
@ -1141,18 +1113,26 @@
|
|||||||
<p1 x="460" y="-200"/>
|
<p1 x="460" y="-200"/>
|
||||||
<p2 x="520" y="-200"/>
|
<p2 x="520" y="-200"/>
|
||||||
</wire>
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="80" y="-200"/>
|
||||||
|
<p2 x="120" y="-200"/>
|
||||||
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="500" y="-1100"/>
|
<p1 x="500" y="-1100"/>
|
||||||
<p2 x="540" y="-1100"/>
|
<p2 x="540" y="-1100"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="640" y="-1100"/>
|
<p1 x="640" y="-1100"/>
|
||||||
<p2 x="740" y="-1100"/>
|
<p2 x="680" y="-1100"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="320" y="-1100"/>
|
<p1 x="320" y="-1100"/>
|
||||||
<p2 x="420" y="-1100"/>
|
<p2 x="420" y="-1100"/>
|
||||||
</wire>
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="-60" y="-1100"/>
|
||||||
|
<p2 x="-40" y="-1100"/>
|
||||||
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="500" y="-460"/>
|
<p1 x="500" y="-460"/>
|
||||||
<p2 x="520" y="-460"/>
|
<p2 x="520" y="-460"/>
|
||||||
@ -1166,7 +1146,7 @@
|
|||||||
<p2 x="420" y="-720"/>
|
<p2 x="420" y="-720"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="40" y="80"/>
|
<p1 x="100" y="80"/>
|
||||||
<p2 x="360" y="80"/>
|
<p2 x="360" y="80"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
@ -1175,7 +1155,7 @@
|
|||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="640" y="80"/>
|
<p1 x="640" y="80"/>
|
||||||
<p2 x="740" y="80"/>
|
<p2 x="680" y="80"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="60" y="-340"/>
|
<p1 x="60" y="-340"/>
|
||||||
@ -1217,18 +1197,14 @@
|
|||||||
<p1 x="280" y="-600"/>
|
<p1 x="280" y="-600"/>
|
||||||
<p2 x="420" y="-600"/>
|
<p2 x="420" y="-600"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
|
||||||
<p1 x="60" y="-220"/>
|
|
||||||
<p2 x="80" y="-220"/>
|
|
||||||
</wire>
|
|
||||||
<wire>
|
|
||||||
<p1 x="80" y="-220"/>
|
|
||||||
<p2 x="100" y="-220"/>
|
|
||||||
</wire>
|
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="80" y="-860"/>
|
<p1 x="80" y="-860"/>
|
||||||
<p2 x="100" y="-860"/>
|
<p2 x="100" y="-860"/>
|
||||||
</wire>
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="-40" y="-1120"/>
|
||||||
|
<p2 x="-20" y="-1120"/>
|
||||||
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="520" y="-1120"/>
|
<p1 x="520" y="-1120"/>
|
||||||
<p2 x="540" y="-1120"/>
|
<p2 x="540" y="-1120"/>
|
||||||
@ -1267,7 +1243,7 @@
|
|||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="640" y="-360"/>
|
<p1 x="640" y="-360"/>
|
||||||
<p2 x="740" y="-360"/>
|
<p2 x="680" y="-360"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="320" y="-360"/>
|
<p1 x="320" y="-360"/>
|
||||||
@ -1287,7 +1263,7 @@
|
|||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="640" y="-620"/>
|
<p1 x="640" y="-620"/>
|
||||||
<p2 x="740" y="-620"/>
|
<p2 x="680" y="-620"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="60" y="-620"/>
|
<p1 x="60" y="-620"/>
|
||||||
@ -1303,11 +1279,11 @@
|
|||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="-180" y="240"/>
|
<p1 x="-180" y="240"/>
|
||||||
<p2 x="-20" y="240"/>
|
<p2 x="40" y="240"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="-180" y="-1140"/>
|
<p1 x="-60" y="-1140"/>
|
||||||
<p2 x="-160" y="-1140"/>
|
<p2 x="-20" y="-1140"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="260" y="-500"/>
|
<p1 x="260" y="-500"/>
|
||||||
@ -1326,7 +1302,7 @@
|
|||||||
<p2 x="420" y="-760"/>
|
<p2 x="420" y="-760"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="0" y="120"/>
|
<p1 x="60" y="120"/>
|
||||||
<p2 x="400" y="120"/>
|
<p2 x="400" y="120"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
@ -1389,10 +1365,6 @@
|
|||||||
<p1 x="320" y="-780"/>
|
<p1 x="320" y="-780"/>
|
||||||
<p2 x="320" y="-480"/>
|
<p2 x="320" y="-480"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
|
||||||
<p1 x="0" y="-20"/>
|
|
||||||
<p2 x="0" y="120"/>
|
|
||||||
</wire>
|
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="-100" y="-940"/>
|
<p1 x="-100" y="-940"/>
|
||||||
<p2 x="-100" y="-760"/>
|
<p2 x="-100" y="-760"/>
|
||||||
@ -1442,40 +1414,12 @@
|
|||||||
<p2 x="260" y="-300"/>
|
<p2 x="260" y="-300"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="-40" y="-20"/>
|
<p1 x="100" y="-20"/>
|
||||||
<p2 x="-40" y="20"/>
|
<p2 x="100" y="80"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="40" y="-20"/>
|
<p1 x="-40" y="-1120"/>
|
||||||
<p2 x="40" y="80"/>
|
<p2 x="-40" y="-1100"/>
|
||||||
</wire>
|
|
||||||
<wire>
|
|
||||||
<p1 x="360" y="-980"/>
|
|
||||||
<p2 x="360" y="-620"/>
|
|
||||||
</wire>
|
|
||||||
<wire>
|
|
||||||
<p1 x="360" y="160"/>
|
|
||||||
<p2 x="360" y="360"/>
|
|
||||||
</wire>
|
|
||||||
<wire>
|
|
||||||
<p1 x="360" y="-620"/>
|
|
||||||
<p2 x="360" y="-560"/>
|
|
||||||
</wire>
|
|
||||||
<wire>
|
|
||||||
<p1 x="360" y="-560"/>
|
|
||||||
<p2 x="360" y="-440"/>
|
|
||||||
</wire>
|
|
||||||
<wire>
|
|
||||||
<p1 x="360" y="-440"/>
|
|
||||||
<p2 x="360" y="80"/>
|
|
||||||
</wire>
|
|
||||||
<wire>
|
|
||||||
<p1 x="360" y="80"/>
|
|
||||||
<p2 x="360" y="100"/>
|
|
||||||
</wire>
|
|
||||||
<wire>
|
|
||||||
<p1 x="360" y="100"/>
|
|
||||||
<p2 x="360" y="160"/>
|
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="520" y="-1080"/>
|
<p1 x="520" y="-1080"/>
|
||||||
@ -1533,6 +1477,46 @@
|
|||||||
<p1 x="520" y="340"/>
|
<p1 x="520" y="340"/>
|
||||||
<p2 x="520" y="380"/>
|
<p2 x="520" y="380"/>
|
||||||
</wire>
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="360" y="-980"/>
|
||||||
|
<p2 x="360" y="-620"/>
|
||||||
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="360" y="160"/>
|
||||||
|
<p2 x="360" y="360"/>
|
||||||
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="360" y="-620"/>
|
||||||
|
<p2 x="360" y="-560"/>
|
||||||
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="360" y="-560"/>
|
||||||
|
<p2 x="360" y="-440"/>
|
||||||
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="360" y="-440"/>
|
||||||
|
<p2 x="360" y="80"/>
|
||||||
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="360" y="80"/>
|
||||||
|
<p2 x="360" y="100"/>
|
||||||
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="360" y="100"/>
|
||||||
|
<p2 x="360" y="160"/>
|
||||||
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="40" y="220"/>
|
||||||
|
<p2 x="40" y="240"/>
|
||||||
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="40" y="-20"/>
|
||||||
|
<p2 x="40" y="160"/>
|
||||||
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="140" y="-20"/>
|
||||||
|
<p2 x="140" y="20"/>
|
||||||
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="300" y="-1200"/>
|
<p1 x="300" y="-1200"/>
|
||||||
<p2 x="300" y="-920"/>
|
<p2 x="300" y="-920"/>
|
||||||
@ -1566,16 +1550,8 @@
|
|||||||
<p2 x="300" y="-580"/>
|
<p2 x="300" y="-580"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="-80" y="100"/>
|
<p1 x="80" y="-160"/>
|
||||||
<p2 x="-80" y="140"/>
|
<p2 x="80" y="-100"/>
|
||||||
</wire>
|
|
||||||
<wire>
|
|
||||||
<p1 x="-80" y="20"/>
|
|
||||||
<p2 x="-80" y="60"/>
|
|
||||||
</wire>
|
|
||||||
<wire>
|
|
||||||
<p1 x="80" y="-20"/>
|
|
||||||
<p2 x="80" y="20"/>
|
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="80" y="-860"/>
|
<p1 x="80" y="-860"/>
|
||||||
@ -1583,7 +1559,11 @@
|
|||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="80" y="-300"/>
|
<p1 x="80" y="-300"/>
|
||||||
<p2 x="80" y="-220"/>
|
<p2 x="80" y="-260"/>
|
||||||
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="80" y="-260"/>
|
||||||
|
<p2 x="80" y="-200"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="80" y="-680"/>
|
<p1 x="80" y="-680"/>
|
||||||
@ -1614,12 +1594,12 @@
|
|||||||
<p2 x="400" y="400"/>
|
<p2 x="400" y="400"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="-20" y="220"/>
|
<p1 x="-20" y="100"/>
|
||||||
<p2 x="-20" y="240"/>
|
<p2 x="-20" y="140"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="-20" y="-20"/>
|
<p1 x="-20" y="20"/>
|
||||||
<p2 x="-20" y="160"/>
|
<p2 x="-20" y="60"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="340" y="-1080"/>
|
<p1 x="340" y="-1080"/>
|
||||||
@ -1654,8 +1634,24 @@
|
|||||||
<p2 x="340" y="-260"/>
|
<p2 x="340" y="-260"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="20" y="-160"/>
|
<p1 x="20" y="-20"/>
|
||||||
<p2 x="20" y="-100"/>
|
<p2 x="20" y="20"/>
|
||||||
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="120" y="-220"/>
|
||||||
|
<p2 x="120" y="-200"/>
|
||||||
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="120" y="-140"/>
|
||||||
|
<p2 x="120" y="-120"/>
|
||||||
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="120" y="-20"/>
|
||||||
|
<p2 x="120" y="40"/>
|
||||||
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="120" y="-200"/>
|
||||||
|
<p2 x="120" y="-180"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="280" y="-1120"/>
|
<p1 x="280" y="-1120"/>
|
||||||
@ -1677,17 +1673,9 @@
|
|||||||
<p1 x="280" y="-600"/>
|
<p1 x="280" y="-600"/>
|
||||||
<p2 x="280" y="-380"/>
|
<p2 x="280" y="-380"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
|
||||||
<p1 x="60" y="-240"/>
|
|
||||||
<p2 x="60" y="-220"/>
|
|
||||||
</wire>
|
|
||||||
<wire>
|
|
||||||
<p1 x="60" y="-160"/>
|
|
||||||
<p2 x="60" y="-140"/>
|
|
||||||
</wire>
|
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="60" y="-20"/>
|
<p1 x="60" y="-20"/>
|
||||||
<p2 x="60" y="40"/>
|
<p2 x="60" y="120"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="60" y="-960"/>
|
<p1 x="60" y="-960"/>
|
||||||
@ -1705,10 +1693,6 @@
|
|||||||
<p1 x="60" y="-400"/>
|
<p1 x="60" y="-400"/>
|
||||||
<p2 x="60" y="-340"/>
|
<p2 x="60" y="-340"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
|
||||||
<p1 x="60" y="-220"/>
|
|
||||||
<p2 x="60" y="-200"/>
|
|
||||||
</wire>
|
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="380" y="-1160"/>
|
<p1 x="380" y="-1160"/>
|
||||||
<p2 x="380" y="-880"/>
|
<p2 x="380" y="-880"/>
|
||||||
@ -1721,10 +1705,6 @@
|
|||||||
<p1 x="380" y="-640"/>
|
<p1 x="380" y="-640"/>
|
||||||
<p2 x="380" y="-320"/>
|
<p2 x="380" y="-320"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
|
||||||
<p1 x="-160" y="-1160"/>
|
|
||||||
<p2 x="-160" y="-1140"/>
|
|
||||||
</wire>
|
|
||||||
</wires>
|
</wires>
|
||||||
<measurementOrdering/>
|
<measurementOrdering/>
|
||||||
</circuit>
|
</circuit>
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -30,56 +30,56 @@ bei der Speicheradressierung verwendet.}}</string>
|
|||||||
<string>A</string>
|
<string>A</string>
|
||||||
<pin>
|
<pin>
|
||||||
<pos x="0" y="0"/>
|
<pos x="0" y="0"/>
|
||||||
<showLabel>false</showLabel>
|
<showLabel>true</showLabel>
|
||||||
</pin>
|
</pin>
|
||||||
</entry>
|
</entry>
|
||||||
<entry>
|
<entry>
|
||||||
<string>Op</string>
|
<string>Op</string>
|
||||||
<pin>
|
<pin>
|
||||||
<pos x="60" y="100"/>
|
<pos x="0" y="20"/>
|
||||||
<showLabel>false</showLabel>
|
<showLabel>true</showLabel>
|
||||||
</pin>
|
</pin>
|
||||||
</entry>
|
</entry>
|
||||||
<entry>
|
<entry>
|
||||||
<string>Neg</string>
|
<string>Neg</string>
|
||||||
<pin>
|
<pin>
|
||||||
<pos x="80" y="60"/>
|
<pos x="80" y="60"/>
|
||||||
<showLabel>false</showLabel>
|
<showLabel>true</showLabel>
|
||||||
</pin>
|
</pin>
|
||||||
</entry>
|
</entry>
|
||||||
<entry>
|
<entry>
|
||||||
<string>B</string>
|
<string>B</string>
|
||||||
<pin>
|
<pin>
|
||||||
<pos x="0" y="100"/>
|
<pos x="0" y="100"/>
|
||||||
<showLabel>false</showLabel>
|
<showLabel>true</showLabel>
|
||||||
</pin>
|
</pin>
|
||||||
</entry>
|
</entry>
|
||||||
<entry>
|
<entry>
|
||||||
<string>Zero</string>
|
<string>Zero</string>
|
||||||
<pin>
|
<pin>
|
||||||
<pos x="80" y="40"/>
|
<pos x="80" y="40"/>
|
||||||
<showLabel>false</showLabel>
|
<showLabel>true</showLabel>
|
||||||
</pin>
|
</pin>
|
||||||
</entry>
|
</entry>
|
||||||
<entry>
|
<entry>
|
||||||
<string>Ci</string>
|
<string>Ci</string>
|
||||||
<pin>
|
<pin>
|
||||||
<pos x="0" y="120"/>
|
<pos x="0" y="120"/>
|
||||||
<showLabel>false</showLabel>
|
<showLabel>true</showLabel>
|
||||||
</pin>
|
</pin>
|
||||||
</entry>
|
</entry>
|
||||||
<entry>
|
<entry>
|
||||||
<string>Carry</string>
|
<string>Carry</string>
|
||||||
<pin>
|
<pin>
|
||||||
<pos x="80" y="80"/>
|
<pos x="80" y="80"/>
|
||||||
<showLabel>false</showLabel>
|
<showLabel>true</showLabel>
|
||||||
</pin>
|
</pin>
|
||||||
</entry>
|
</entry>
|
||||||
<entry>
|
<entry>
|
||||||
<string>Y</string>
|
<string>Y</string>
|
||||||
<pin>
|
<pin>
|
||||||
<pos x="80" y="20"/>
|
<pos x="80" y="20"/>
|
||||||
<showLabel>false</showLabel>
|
<showLabel>true</showLabel>
|
||||||
</pin>
|
</pin>
|
||||||
</entry>
|
</entry>
|
||||||
</pins>
|
</pins>
|
||||||
@ -106,110 +106,6 @@ bei der Speicheradressierung verwendet.}}</string>
|
|||||||
<alpha>255</alpha>
|
<alpha>255</alpha>
|
||||||
</color>
|
</color>
|
||||||
</poly>
|
</poly>
|
||||||
<text>
|
|
||||||
<p1 x="4" y="6"/>
|
|
||||||
<p2 x="5" y="6"/>
|
|
||||||
<text>A</text>
|
|
||||||
<orientation>LEFTBOTTOM</orientation>
|
|
||||||
<size>18</size>
|
|
||||||
<color>
|
|
||||||
<red>128</red>
|
|
||||||
<green>128</green>
|
|
||||||
<blue>128</blue>
|
|
||||||
<alpha>255</alpha>
|
|
||||||
</color>
|
|
||||||
</text>
|
|
||||||
<text>
|
|
||||||
<p1 x="4" y="106"/>
|
|
||||||
<p2 x="5" y="106"/>
|
|
||||||
<text>B</text>
|
|
||||||
<orientation>LEFTBOTTOM</orientation>
|
|
||||||
<size>18</size>
|
|
||||||
<color>
|
|
||||||
<red>128</red>
|
|
||||||
<green>128</green>
|
|
||||||
<blue>128</blue>
|
|
||||||
<alpha>255</alpha>
|
|
||||||
</color>
|
|
||||||
</text>
|
|
||||||
<text>
|
|
||||||
<p1 x="23" y="102"/>
|
|
||||||
<p2 x="24" y="102"/>
|
|
||||||
<text>Op</text>
|
|
||||||
<orientation>LEFTBOTTOM</orientation>
|
|
||||||
<size>18</size>
|
|
||||||
<color>
|
|
||||||
<red>128</red>
|
|
||||||
<green>128</green>
|
|
||||||
<blue>128</blue>
|
|
||||||
<alpha>255</alpha>
|
|
||||||
</color>
|
|
||||||
</text>
|
|
||||||
<text>
|
|
||||||
<p1 x="4" y="126"/>
|
|
||||||
<p2 x="5" y="126"/>
|
|
||||||
<text>Ci</text>
|
|
||||||
<orientation>LEFTBOTTOM</orientation>
|
|
||||||
<size>18</size>
|
|
||||||
<color>
|
|
||||||
<red>128</red>
|
|
||||||
<green>128</green>
|
|
||||||
<blue>128</blue>
|
|
||||||
<alpha>255</alpha>
|
|
||||||
</color>
|
|
||||||
</text>
|
|
||||||
<text>
|
|
||||||
<p1 x="76" y="27"/>
|
|
||||||
<p2 x="77" y="27"/>
|
|
||||||
<text>Y</text>
|
|
||||||
<orientation>RIGHTBOTTOM</orientation>
|
|
||||||
<size>18</size>
|
|
||||||
<color>
|
|
||||||
<red>128</red>
|
|
||||||
<green>128</green>
|
|
||||||
<blue>128</blue>
|
|
||||||
<alpha>255</alpha>
|
|
||||||
</color>
|
|
||||||
</text>
|
|
||||||
<text>
|
|
||||||
<p1 x="76" y="47"/>
|
|
||||||
<p2 x="77" y="47"/>
|
|
||||||
<text>Zero</text>
|
|
||||||
<orientation>RIGHTBOTTOM</orientation>
|
|
||||||
<size>18</size>
|
|
||||||
<color>
|
|
||||||
<red>128</red>
|
|
||||||
<green>128</green>
|
|
||||||
<blue>128</blue>
|
|
||||||
<alpha>255</alpha>
|
|
||||||
</color>
|
|
||||||
</text>
|
|
||||||
<text>
|
|
||||||
<p1 x="76" y="67"/>
|
|
||||||
<p2 x="77" y="67"/>
|
|
||||||
<text>Neg</text>
|
|
||||||
<orientation>RIGHTBOTTOM</orientation>
|
|
||||||
<size>18</size>
|
|
||||||
<color>
|
|
||||||
<red>128</red>
|
|
||||||
<green>128</green>
|
|
||||||
<blue>128</blue>
|
|
||||||
<alpha>255</alpha>
|
|
||||||
</color>
|
|
||||||
</text>
|
|
||||||
<text>
|
|
||||||
<p1 x="76" y="87"/>
|
|
||||||
<p2 x="77" y="87"/>
|
|
||||||
<text>Carry</text>
|
|
||||||
<orientation>RIGHTBOTTOM</orientation>
|
|
||||||
<size>18</size>
|
|
||||||
<color>
|
|
||||||
<red>128</red>
|
|
||||||
<green>128</green>
|
|
||||||
<blue>128</blue>
|
|
||||||
<alpha>255</alpha>
|
|
||||||
</color>
|
|
||||||
</text>
|
|
||||||
</drawables>
|
</drawables>
|
||||||
</shape>
|
</shape>
|
||||||
</entry>
|
</entry>
|
||||||
|
|||||||
@ -11,7 +11,7 @@
|
|||||||
version="1.1"
|
version="1.1"
|
||||||
id="svg48"
|
id="svg48"
|
||||||
sodipodi:docname="ALU.svg"
|
sodipodi:docname="ALU.svg"
|
||||||
inkscape:version="0.92.1 r15371">
|
inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
|
||||||
<metadata
|
<metadata
|
||||||
id="metadata52">
|
id="metadata52">
|
||||||
<rdf:RDF>
|
<rdf:RDF>
|
||||||
@ -29,12 +29,12 @@
|
|||||||
showgrid="true"
|
showgrid="true"
|
||||||
id="namedview4"
|
id="namedview4"
|
||||||
inkscape:zoom="3.5454545"
|
inkscape:zoom="3.5454545"
|
||||||
inkscape:cx="120"
|
inkscape:cx="71.064102"
|
||||||
inkscape:cy="87.435899"
|
inkscape:cy="87.435899"
|
||||||
inkscape:window-width="1680"
|
inkscape:window-width="1680"
|
||||||
inkscape:window-height="1002"
|
inkscape:window-height="993"
|
||||||
inkscape:window-x="0"
|
inkscape:window-x="0"
|
||||||
inkscape:window-y="24"
|
inkscape:window-y="28"
|
||||||
inkscape:window-maximized="1"
|
inkscape:window-maximized="1"
|
||||||
inkscape:current-layer="svg48">
|
inkscape:current-layer="svg48">
|
||||||
<inkscape:grid
|
<inkscape:grid
|
||||||
@ -50,127 +50,52 @@
|
|||||||
id="rect6"
|
id="rect6"
|
||||||
inkscape:connector-curvature="0"
|
inkscape:connector-curvature="0"
|
||||||
sodipodi:nodetypes="cccccccc" />
|
sodipodi:nodetypes="cccccccc" />
|
||||||
<g
|
|
||||||
id="g11">
|
|
||||||
<circle
|
|
||||||
id="pin:A"
|
|
||||||
cx="0"
|
|
||||||
cy="0"
|
|
||||||
r="3"
|
|
||||||
style="fill:#0000b2" />
|
|
||||||
<text
|
|
||||||
font-size="18"
|
|
||||||
x="4"
|
|
||||||
y="6"
|
|
||||||
id="text9"
|
|
||||||
style="font-size:18px;fill:#808080">A</text>
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="g16"
|
|
||||||
transform="translate(0.28205128,80.102565)">
|
|
||||||
<circle
|
|
||||||
id="pin:B"
|
|
||||||
cx="0"
|
|
||||||
cy="20"
|
|
||||||
r="3"
|
|
||||||
style="fill:#0000b2" />
|
|
||||||
<text
|
|
||||||
font-size="18"
|
|
||||||
x="4"
|
|
||||||
y="26"
|
|
||||||
id="text14"
|
|
||||||
style="font-size:18px;fill:#808080">B</text>
|
|
||||||
</g>
|
|
||||||
<circle
|
<circle
|
||||||
style="fill:#0000b2"
|
style="fill:#0000b2"
|
||||||
r="3"
|
r="3"
|
||||||
cy="100.47581"
|
cy="0"
|
||||||
cx="59.743538"
|
cx="0"
|
||||||
id="pin:Op" />
|
id="pin+:A" />
|
||||||
<text
|
<circle
|
||||||
style="font-size:18px;fill:#808080"
|
style="fill:#0000b2"
|
||||||
id="text19"
|
r="3"
|
||||||
y="102.18784"
|
cy="100.10256"
|
||||||
x="22.559103"
|
cx="0.28205127"
|
||||||
font-size="18">Op</text>
|
id="pin+:B" />
|
||||||
<g
|
<circle
|
||||||
id="g26"
|
style="fill:#0000b2"
|
||||||
transform="translate(-0.28205129,60.076924)">
|
r="3"
|
||||||
<circle
|
cy="20.09119"
|
||||||
id="pin:Ci"
|
cx="-0.051334661"
|
||||||
cx="0"
|
id="pin+:Op" />
|
||||||
cy="60"
|
<circle
|
||||||
r="3"
|
style="fill:#0000b2"
|
||||||
style="fill:#0000b2" />
|
r="3"
|
||||||
<text
|
cy="120.07693"
|
||||||
font-size="18"
|
cx="-0.2820513"
|
||||||
x="4"
|
id="pin+:Ci" />
|
||||||
y="66"
|
<circle
|
||||||
id="text24"
|
style="fill:#b20000"
|
||||||
style="font-size:18px;fill:#808080">Ci</text>
|
r="3"
|
||||||
</g>
|
cy="20.871796"
|
||||||
<g
|
cx="80"
|
||||||
id="g31"
|
id="pin+:Y" />
|
||||||
transform="translate(-2.5641015e-8,20.871795)">
|
<circle
|
||||||
<circle
|
style="fill:#b20000"
|
||||||
id="pin:Y"
|
r="3"
|
||||||
cx="80"
|
cy="40.871796"
|
||||||
cy="0"
|
cx="80"
|
||||||
r="3"
|
id="pin+:Zero" />
|
||||||
style="fill:#b20000" />
|
<circle
|
||||||
<text
|
style="fill:#b20000"
|
||||||
font-size="18"
|
r="3"
|
||||||
x="76"
|
cy="60.871796"
|
||||||
y="6"
|
cx="80"
|
||||||
id="text29"
|
id="pin+:Neg" />
|
||||||
style="font-size:18px;text-anchor:end;fill:#808080">Y</text>
|
<circle
|
||||||
</g>
|
style="fill:#b20000"
|
||||||
<g
|
r="3"
|
||||||
id="g36"
|
cy="80.871796"
|
||||||
transform="translate(-2.5641015e-8,20.871795)">
|
cx="80"
|
||||||
<circle
|
id="pin+:Carry" />
|
||||||
id="pin:Zero"
|
|
||||||
cx="80"
|
|
||||||
cy="20"
|
|
||||||
r="3"
|
|
||||||
style="fill:#b20000" />
|
|
||||||
<text
|
|
||||||
font-size="18"
|
|
||||||
x="76"
|
|
||||||
y="26"
|
|
||||||
id="text34"
|
|
||||||
style="font-size:18px;text-anchor:end;fill:#808080">Zero</text>
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="g41"
|
|
||||||
transform="translate(-2.5641015e-8,20.871795)">
|
|
||||||
<circle
|
|
||||||
id="pin:Neg"
|
|
||||||
cx="80"
|
|
||||||
cy="40"
|
|
||||||
r="3"
|
|
||||||
style="fill:#b20000" />
|
|
||||||
<text
|
|
||||||
font-size="18"
|
|
||||||
x="76"
|
|
||||||
y="46"
|
|
||||||
id="text39"
|
|
||||||
style="font-size:18px;text-anchor:end;fill:#808080">Neg</text>
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="g46"
|
|
||||||
transform="translate(-2.5641015e-8,20.871795)">
|
|
||||||
<circle
|
|
||||||
id="pin:Carry"
|
|
||||||
cx="80"
|
|
||||||
cy="60"
|
|
||||||
r="3"
|
|
||||||
style="fill:#b20000" />
|
|
||||||
<text
|
|
||||||
font-size="18"
|
|
||||||
x="76"
|
|
||||||
y="66"
|
|
||||||
id="text44"
|
|
||||||
style="font-size:18px;text-anchor:end;fill:#808080">Carry</text>
|
|
||||||
</g>
|
|
||||||
</svg>
|
</svg>
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 2.4 KiB |
@ -573,7 +573,7 @@ Single-Cycle CPU.}}</string>
|
|||||||
<string>ALUop</string>
|
<string>ALUop</string>
|
||||||
</entry>
|
</entry>
|
||||||
</elementAttributes>
|
</elementAttributes>
|
||||||
<pos x="1140" y="220"/>
|
<pos x="1060" y="100"/>
|
||||||
</visualElement>
|
</visualElement>
|
||||||
<visualElement>
|
<visualElement>
|
||||||
<elementName>Tunnel</elementName>
|
<elementName>Tunnel</elementName>
|
||||||
@ -889,12 +889,8 @@ Single-Cycle CPU.}}</string>
|
|||||||
<p2 x="840" y="480"/>
|
<p2 x="840" y="480"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="800" y="420"/>
|
<p1 x="1060" y="100"/>
|
||||||
<p2 x="820" y="420"/>
|
<p2 x="1080" y="100"/>
|
||||||
</wire>
|
|
||||||
<wire>
|
|
||||||
<p1 x="820" y="420"/>
|
|
||||||
<p2 x="840" y="420"/>
|
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="800" y="100"/>
|
<p1 x="800" y="100"/>
|
||||||
@ -920,6 +916,14 @@ Single-Cycle CPU.}}</string>
|
|||||||
<p1 x="1280" y="100"/>
|
<p1 x="1280" y="100"/>
|
||||||
<p2 x="1360" y="100"/>
|
<p2 x="1360" y="100"/>
|
||||||
</wire>
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="800" y="420"/>
|
||||||
|
<p2 x="820" y="420"/>
|
||||||
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="820" y="420"/>
|
||||||
|
<p2 x="840" y="420"/>
|
||||||
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="1420" y="360"/>
|
<p1 x="1420" y="360"/>
|
||||||
<p2 x="1440" y="360"/>
|
<p2 x="1440" y="360"/>
|
||||||
@ -1208,10 +1212,6 @@ Single-Cycle CPU.}}</string>
|
|||||||
<p1 x="1200" y="160"/>
|
<p1 x="1200" y="160"/>
|
||||||
<p2 x="1200" y="320"/>
|
<p2 x="1200" y="320"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
|
||||||
<p1 x="1140" y="180"/>
|
|
||||||
<p2 x="1140" y="220"/>
|
|
||||||
</wire>
|
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="500" y="580"/>
|
<p1 x="500" y="580"/>
|
||||||
<p2 x="500" y="600"/>
|
<p2 x="500" y="600"/>
|
||||||
|
|||||||
@ -558,7 +558,7 @@ An dieser Adresse muss sich die ISR befinden.}}</string>
|
|||||||
<string>ALUop</string>
|
<string>ALUop</string>
|
||||||
</entry>
|
</entry>
|
||||||
</elementAttributes>
|
</elementAttributes>
|
||||||
<pos x="1160" y="280"/>
|
<pos x="1080" y="160"/>
|
||||||
</visualElement>
|
</visualElement>
|
||||||
<visualElement>
|
<visualElement>
|
||||||
<elementName>Tunnel</elementName>
|
<elementName>Tunnel</elementName>
|
||||||
@ -1197,16 +1197,8 @@ Interrupt ausgelöst. Die ISR muss sich an Adresse
|
|||||||
<p2 x="840" y="540"/>
|
<p2 x="840" y="540"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="1000" y="480"/>
|
<p1 x="1080" y="160"/>
|
||||||
<p2 x="1080" y="480"/>
|
<p2 x="1100" y="160"/>
|
||||||
</wire>
|
|
||||||
<wire>
|
|
||||||
<p1 x="1140" y="480"/>
|
|
||||||
<p2 x="1260" y="480"/>
|
|
||||||
</wire>
|
|
||||||
<wire>
|
|
||||||
<p1 x="280" y="480"/>
|
|
||||||
<p2 x="340" y="480"/>
|
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="1180" y="160"/>
|
<p1 x="1180" y="160"/>
|
||||||
@ -1228,6 +1220,18 @@ Interrupt ausgelöst. Die ISR muss sich an Adresse
|
|||||||
<p1 x="1200" y="160"/>
|
<p1 x="1200" y="160"/>
|
||||||
<p2 x="1340" y="160"/>
|
<p2 x="1340" y="160"/>
|
||||||
</wire>
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="1000" y="480"/>
|
||||||
|
<p2 x="1080" y="480"/>
|
||||||
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="1140" y="480"/>
|
||||||
|
<p2 x="1260" y="480"/>
|
||||||
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="280" y="480"/>
|
||||||
|
<p2 x="340" y="480"/>
|
||||||
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="1000" y="420"/>
|
<p1 x="1000" y="420"/>
|
||||||
<p2 x="1060" y="420"/>
|
<p2 x="1060" y="420"/>
|
||||||
@ -1392,10 +1396,6 @@ Interrupt ausgelöst. Die ISR muss sich an Adresse
|
|||||||
<p1 x="520" y="720"/>
|
<p1 x="520" y="720"/>
|
||||||
<p2 x="520" y="740"/>
|
<p2 x="520" y="740"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
|
||||||
<p1 x="1160" y="240"/>
|
|
||||||
<p2 x="1160" y="280"/>
|
|
||||||
</wire>
|
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="460" y="500"/>
|
<p1 x="460" y="500"/>
|
||||||
<p2 x="460" y="600"/>
|
<p2 x="460" y="600"/>
|
||||||
|
|||||||
@ -438,7 +438,7 @@ Single-Cycle CPU.}}</string>
|
|||||||
<string>ALUop</string>
|
<string>ALUop</string>
|
||||||
</entry>
|
</entry>
|
||||||
</elementAttributes>
|
</elementAttributes>
|
||||||
<pos x="1120" y="280"/>
|
<pos x="1040" y="160"/>
|
||||||
</visualElement>
|
</visualElement>
|
||||||
<visualElement>
|
<visualElement>
|
||||||
<elementName>Tunnel</elementName>
|
<elementName>Tunnel</elementName>
|
||||||
@ -971,16 +971,8 @@ Single-Cycle CPU.}}</string>
|
|||||||
<p2 x="400" y="220"/>
|
<p2 x="400" y="220"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="500" y="480"/>
|
<p1 x="1040" y="160"/>
|
||||||
<p2 x="620" y="480"/>
|
<p2 x="1060" y="160"/>
|
||||||
</wire>
|
|
||||||
<wire>
|
|
||||||
<p1 x="880" y="480"/>
|
|
||||||
<p2 x="900" y="480"/>
|
|
||||||
</wire>
|
|
||||||
<wire>
|
|
||||||
<p1 x="820" y="480"/>
|
|
||||||
<p2 x="840" y="480"/>
|
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="1280" y="160"/>
|
<p1 x="1280" y="160"/>
|
||||||
@ -1010,6 +1002,18 @@ Single-Cycle CPU.}}</string>
|
|||||||
<p1 x="1160" y="160"/>
|
<p1 x="1160" y="160"/>
|
||||||
<p2 x="1260" y="160"/>
|
<p2 x="1260" y="160"/>
|
||||||
</wire>
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="500" y="480"/>
|
||||||
|
<p2 x="620" y="480"/>
|
||||||
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="880" y="480"/>
|
||||||
|
<p2 x="900" y="480"/>
|
||||||
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="820" y="480"/>
|
||||||
|
<p2 x="840" y="480"/>
|
||||||
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="740" y="420"/>
|
<p1 x="740" y="420"/>
|
||||||
<p2 x="840" y="420"/>
|
<p2 x="840" y="420"/>
|
||||||
@ -1242,10 +1246,6 @@ Single-Cycle CPU.}}</string>
|
|||||||
<p1 x="1180" y="220"/>
|
<p1 x="1180" y="220"/>
|
||||||
<p2 x="1180" y="360"/>
|
<p2 x="1180" y="360"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
|
||||||
<p1 x="1120" y="240"/>
|
|
||||||
<p2 x="1120" y="280"/>
|
|
||||||
</wire>
|
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="480" y="620"/>
|
<p1 x="480" y="620"/>
|
||||||
<p2 x="480" y="640"/>
|
<p2 x="480" y="640"/>
|
||||||
|
|||||||
@ -498,7 +498,7 @@ Von Neumann Two-Cycle CPU.}}</string>
|
|||||||
<string>ALUop</string>
|
<string>ALUop</string>
|
||||||
</entry>
|
</entry>
|
||||||
</elementAttributes>
|
</elementAttributes>
|
||||||
<pos x="1160" y="280"/>
|
<pos x="1080" y="160"/>
|
||||||
</visualElement>
|
</visualElement>
|
||||||
<visualElement>
|
<visualElement>
|
||||||
<elementName>Tunnel</elementName>
|
<elementName>Tunnel</elementName>
|
||||||
@ -920,6 +920,10 @@ Von Neumann Two-Cycle CPU.}}</string>
|
|||||||
<p1 x="580" y="540"/>
|
<p1 x="580" y="540"/>
|
||||||
<p2 x="660" y="540"/>
|
<p2 x="660" y="540"/>
|
||||||
</wire>
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="1080" y="160"/>
|
||||||
|
<p2 x="1100" y="160"/>
|
||||||
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="1180" y="160"/>
|
<p1 x="1180" y="160"/>
|
||||||
<p2 x="1220" y="160"/>
|
<p2 x="1220" y="160"/>
|
||||||
@ -1140,10 +1144,6 @@ Von Neumann Two-Cycle CPU.}}</string>
|
|||||||
<p1 x="520" y="700"/>
|
<p1 x="520" y="700"/>
|
||||||
<p2 x="520" y="720"/>
|
<p2 x="520" y="720"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
|
||||||
<p1 x="1160" y="240"/>
|
|
||||||
<p2 x="1160" y="280"/>
|
|
||||||
</wire>
|
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="460" y="460"/>
|
<p1 x="460" y="460"/>
|
||||||
<p2 x="460" y="540"/>
|
<p2 x="460" y="540"/>
|
||||||
|
|||||||
@ -1335,7 +1335,7 @@ public class CircuitComponent extends JComponent implements ChangedListener, Lib
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void mousePressed(MouseEvent e) {
|
public void mousePressed(MouseEvent e) {
|
||||||
hadFocusAtClick = hasFocus();
|
hadFocusAtClick = SwingUtilities.getWindowAncestor(CircuitComponent.this).isFocused();
|
||||||
pos = new Vector(e.getX(), e.getY());
|
pos = new Vector(e.getX(), e.getY());
|
||||||
isMoved = false;
|
isMoved = false;
|
||||||
requestFocusInWindow();
|
requestFocusInWindow();
|
||||||
|
|||||||
@ -99,7 +99,7 @@ public class Keyboard extends Node implements Element {
|
|||||||
*
|
*
|
||||||
* @param keyboardInterface the keyboard interface
|
* @param keyboardInterface the keyboard interface
|
||||||
*/
|
*/
|
||||||
public void setKeyboardDialog(KeyboardInterface keyboardInterface) {
|
public void setKeyboard(KeyboardInterface keyboardInterface) {
|
||||||
this.keyboardInterface = keyboardInterface;
|
this.keyboardInterface = keyboardInterface;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -37,6 +37,7 @@ public class KeyboardDialog extends JDialog implements Keyboard.KeyboardInterfac
|
|||||||
text = "";
|
text = "";
|
||||||
|
|
||||||
textLabel.setFocusable(true);
|
textLabel.setFocusable(true);
|
||||||
|
textLabel.setFocusTraversalKeysEnabled(false);
|
||||||
textLabel.addKeyListener(new KeyAdapter() {
|
textLabel.addKeyListener(new KeyAdapter() {
|
||||||
@Override
|
@Override
|
||||||
public void keyTyped(KeyEvent e) {
|
public void keyTyped(KeyEvent e) {
|
||||||
@ -54,7 +55,7 @@ public class KeyboardDialog extends JDialog implements Keyboard.KeyboardInterfac
|
|||||||
setLocationRelativeTo(owner);
|
setLocationRelativeTo(owner);
|
||||||
setVisible(true);
|
setVisible(true);
|
||||||
|
|
||||||
keyboard.setKeyboardDialog(this);
|
keyboard.setKeyboard(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user