mirror of
https://github.com/hneemann/Digital.git
synced 2025-09-27 15:03:21 -04:00
minor layout changes
This commit is contained in:
parent
e85604e3b6
commit
40fb4abab1
@ -1,6 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<circuit>
|
<circuit>
|
||||||
<version>1</version>
|
<version>1</version>
|
||||||
|
<attributes/>
|
||||||
<visualElements>
|
<visualElements>
|
||||||
<visualElement>
|
<visualElement>
|
||||||
<elementName>NOr</elementName>
|
<elementName>NOr</elementName>
|
||||||
@ -30,7 +31,7 @@
|
|||||||
<string>C</string>
|
<string>C</string>
|
||||||
</entry>
|
</entry>
|
||||||
</elementAttributes>
|
</elementAttributes>
|
||||||
<pos x="1240" y="700"/>
|
<pos x="1240" y="540"/>
|
||||||
</visualElement>
|
</visualElement>
|
||||||
<visualElement>
|
<visualElement>
|
||||||
<elementName>And</elementName>
|
<elementName>And</elementName>
|
||||||
@ -50,7 +51,7 @@
|
|||||||
<rotation rotation="3"/>
|
<rotation rotation="3"/>
|
||||||
</entry>
|
</entry>
|
||||||
</elementAttributes>
|
</elementAttributes>
|
||||||
<pos x="1280" y="520"/>
|
<pos x="1280" y="460"/>
|
||||||
</visualElement>
|
</visualElement>
|
||||||
<visualElement>
|
<visualElement>
|
||||||
<elementName>Out</elementName>
|
<elementName>Out</elementName>
|
||||||
@ -85,7 +86,7 @@
|
|||||||
<visualElement>
|
<visualElement>
|
||||||
<elementName>Not</elementName>
|
<elementName>Not</elementName>
|
||||||
<elementAttributes/>
|
<elementAttributes/>
|
||||||
<pos x="1420" y="700"/>
|
<pos x="1360" y="540"/>
|
||||||
</visualElement>
|
</visualElement>
|
||||||
<visualElement>
|
<visualElement>
|
||||||
<elementName>Out</elementName>
|
<elementName>Out</elementName>
|
||||||
@ -114,7 +115,7 @@ C 0 0 1
|
|||||||
</testData>
|
</testData>
|
||||||
</entry>
|
</entry>
|
||||||
</elementAttributes>
|
</elementAttributes>
|
||||||
<pos x="1760" y="660"/>
|
<pos x="1800" y="640"/>
|
||||||
</visualElement>
|
</visualElement>
|
||||||
</visualElements>
|
</visualElements>
|
||||||
<wires>
|
<wires>
|
||||||
@ -227,23 +228,23 @@ C 0 0 1
|
|||||||
<p2 x="1700" y="460"/>
|
<p2 x="1700" y="460"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="1240" y="700"/>
|
<p1 x="1240" y="540"/>
|
||||||
<p2 x="1320" y="700"/>
|
<p2 x="1320" y="540"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="1460" y="700"/>
|
<p1 x="1400" y="540"/>
|
||||||
<p2 x="1580" y="700"/>
|
<p2 x="1580" y="540"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="1320" y="700"/>
|
<p1 x="1320" y="540"/>
|
||||||
<p2 x="1420" y="700"/>
|
<p2 x="1360" y="540"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="1280" y="440"/>
|
<p1 x="1280" y="440"/>
|
||||||
<p2 x="1280" y="520"/>
|
<p2 x="1280" y="460"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="1280" y="560"/>
|
<p1 x="1280" y="500"/>
|
||||||
<p2 x="1280" y="640"/>
|
<p2 x="1280" y="640"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
@ -280,19 +281,19 @@ C 0 0 1
|
|||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="1320" y="480"/>
|
<p1 x="1320" y="480"/>
|
||||||
|
<p2 x="1320" y="540"/>
|
||||||
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="1320" y="540"/>
|
||||||
<p2 x="1320" y="600"/>
|
<p2 x="1320" y="600"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
|
||||||
<p1 x="1320" y="600"/>
|
|
||||||
<p2 x="1320" y="700"/>
|
|
||||||
</wire>
|
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="1580" y="480"/>
|
<p1 x="1580" y="480"/>
|
||||||
<p2 x="1580" y="600"/>
|
<p2 x="1580" y="540"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="1580" y="600"/>
|
<p1 x="1580" y="540"/>
|
||||||
<p2 x="1580" y="700"/>
|
<p2 x="1580" y="600"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="1420" y="560"/>
|
<p1 x="1420" y="560"/>
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<circuit>
|
<circuit>
|
||||||
<version>1</version>
|
<version>1</version>
|
||||||
|
<attributes/>
|
||||||
<visualElements>
|
<visualElements>
|
||||||
<visualElement>
|
<visualElement>
|
||||||
<elementName>D-MS.dig</elementName>
|
<elementName>D-MS.dig</elementName>
|
||||||
@ -22,7 +23,7 @@
|
|||||||
<elementAttributes>
|
<elementAttributes>
|
||||||
<entry>
|
<entry>
|
||||||
<string>Label</string>
|
<string>Label</string>
|
||||||
<string>D</string>
|
<string>$D$</string>
|
||||||
</entry>
|
</entry>
|
||||||
</elementAttributes>
|
</elementAttributes>
|
||||||
<pos x="140" y="120"/>
|
<pos x="140" y="120"/>
|
||||||
@ -46,7 +47,7 @@
|
|||||||
<elementAttributes>
|
<elementAttributes>
|
||||||
<entry>
|
<entry>
|
||||||
<string>Label</string>
|
<string>Label</string>
|
||||||
<string>C</string>
|
<string>$C$</string>
|
||||||
</entry>
|
</entry>
|
||||||
</elementAttributes>
|
</elementAttributes>
|
||||||
<pos x="140" y="200"/>
|
<pos x="140" y="200"/>
|
||||||
@ -79,32 +80,54 @@
|
|||||||
</elementAttributes>
|
</elementAttributes>
|
||||||
<pos x="440" y="80"/>
|
<pos x="440" y="80"/>
|
||||||
</visualElement>
|
</visualElement>
|
||||||
|
<visualElement>
|
||||||
|
<elementName>D-MS.dig</elementName>
|
||||||
|
<elementAttributes/>
|
||||||
|
<pos x="620" y="120"/>
|
||||||
|
</visualElement>
|
||||||
|
<visualElement>
|
||||||
|
<elementName>Out</elementName>
|
||||||
|
<elementAttributes>
|
||||||
|
<entry>
|
||||||
|
<string>rotation</string>
|
||||||
|
<rotation rotation="1"/>
|
||||||
|
</entry>
|
||||||
|
<entry>
|
||||||
|
<string>Label</string>
|
||||||
|
<string>D_3</string>
|
||||||
|
</entry>
|
||||||
|
</elementAttributes>
|
||||||
|
<pos x="720" y="80"/>
|
||||||
|
</visualElement>
|
||||||
<visualElement>
|
<visualElement>
|
||||||
<elementName>Testcase</elementName>
|
<elementName>Testcase</elementName>
|
||||||
<elementAttributes>
|
<elementAttributes>
|
||||||
<entry>
|
<entry>
|
||||||
<string>Testdata</string>
|
<string>Testdata</string>
|
||||||
<testData>
|
<testData>
|
||||||
<dataString>C D D_0 D_1 D_2
|
<dataString>C D D_0 D_1 D_2 D_3
|
||||||
# clear all bits
|
# clear all bits
|
||||||
C 0 0 x x
|
C 0 0 x x x
|
||||||
C 0 0 0 x
|
C 0 0 0 x x
|
||||||
C 0 0 0 0
|
C 0 0 0 0 x
|
||||||
|
C 0 0 0 0 0
|
||||||
|
|
||||||
# fill with one
|
# fill with one
|
||||||
C 1 1 0 0
|
C 1 1 0 0 0
|
||||||
C 1 1 1 0
|
C 1 1 1 0 0
|
||||||
C 1 1 1 1
|
C 1 1 1 1 0
|
||||||
|
C 1 1 1 1 1
|
||||||
|
|
||||||
# fill with zero
|
# fill with zero
|
||||||
C 0 0 1 1
|
C 0 0 1 1 1
|
||||||
C 0 0 0 1
|
C 0 0 0 1 1
|
||||||
C 0 0 0 0
|
C 0 0 0 0 1
|
||||||
|
C 0 0 0 0 0
|
||||||
</dataString>
|
</dataString>
|
||||||
</testData>
|
</testData>
|
||||||
</entry>
|
</entry>
|
||||||
</elementAttributes>
|
</elementAttributes>
|
||||||
<pos x="480" y="260"/>
|
<pos x="620" y="200"/>
|
||||||
</visualElement>
|
</visualElement>
|
||||||
</visualElements>
|
</visualElements>
|
||||||
<wires>
|
<wires>
|
||||||
@ -124,6 +147,10 @@ C 0 0 0 0
|
|||||||
<p1 x="540" y="120"/>
|
<p1 x="540" y="120"/>
|
||||||
<p2 x="580" y="120"/>
|
<p2 x="580" y="120"/>
|
||||||
</wire>
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="680" y="120"/>
|
||||||
|
<p2 x="720" y="120"/>
|
||||||
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="440" y="120"/>
|
<p1 x="440" y="120"/>
|
||||||
<p2 x="480" y="120"/>
|
<p2 x="480" y="120"/>
|
||||||
@ -132,17 +159,25 @@ C 0 0 0 0
|
|||||||
<p1 x="300" y="120"/>
|
<p1 x="300" y="120"/>
|
||||||
<p2 x="340" y="120"/>
|
<p2 x="340" y="120"/>
|
||||||
</wire>
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="580" y="120"/>
|
||||||
|
<p2 x="620" y="120"/>
|
||||||
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="140" y="200"/>
|
<p1 x="140" y="200"/>
|
||||||
<p2 x="180" y="200"/>
|
<p2 x="180" y="200"/>
|
||||||
</wire>
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="320" y="200"/>
|
||||||
|
<p2 x="460" y="200"/>
|
||||||
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="180" y="200"/>
|
<p1 x="180" y="200"/>
|
||||||
<p2 x="320" y="200"/>
|
<p2 x="320" y="200"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="320" y="200"/>
|
<p1 x="460" y="200"/>
|
||||||
<p2 x="460" y="200"/>
|
<p2 x="600" y="200"/>
|
||||||
</wire>
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="180" y="140"/>
|
<p1 x="180" y="140"/>
|
||||||
@ -156,10 +191,18 @@ C 0 0 0 0
|
|||||||
<p1 x="460" y="140"/>
|
<p1 x="460" y="140"/>
|
||||||
<p2 x="480" y="140"/>
|
<p2 x="480" y="140"/>
|
||||||
</wire>
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="600" y="140"/>
|
||||||
|
<p2 x="620" y="140"/>
|
||||||
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="320" y="140"/>
|
<p1 x="320" y="140"/>
|
||||||
<p2 x="320" y="200"/>
|
<p2 x="320" y="200"/>
|
||||||
</wire>
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="720" y="80"/>
|
||||||
|
<p2 x="720" y="120"/>
|
||||||
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="580" y="80"/>
|
<p1 x="580" y="80"/>
|
||||||
<p2 x="580" y="120"/>
|
<p2 x="580" y="120"/>
|
||||||
@ -172,6 +215,10 @@ C 0 0 0 0
|
|||||||
<p1 x="440" y="80"/>
|
<p1 x="440" y="80"/>
|
||||||
<p2 x="440" y="120"/>
|
<p2 x="440" y="120"/>
|
||||||
</wire>
|
</wire>
|
||||||
|
<wire>
|
||||||
|
<p1 x="600" y="140"/>
|
||||||
|
<p2 x="600" y="200"/>
|
||||||
|
</wire>
|
||||||
<wire>
|
<wire>
|
||||||
<p1 x="460" y="140"/>
|
<p1 x="460" y="140"/>
|
||||||
<p2 x="460" y="200"/>
|
<p2 x="460" y="200"/>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user