mirror of
https://github.com/hneemann/Digital.git
synced 2025-09-27 06:51:37 -04:00
added 7480, fixed errors in 74163 and 74238
This commit is contained in:
hneemann
parent
aead304ec1
commit
7ccc0645da
531
src/main/dig/lib/74xx/arithmetic/7480.dig
Normal file
531
src/main/dig/lib/74xx/arithmetic/7480.dig
Normal file
@ -0,0 +1,531 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<circuit>
|
||||
<version>1</version>
|
||||
<attributes>
|
||||
<entry>
|
||||
<string>isDIL</string>
|
||||
<boolean>true</boolean>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>Description</string>
|
||||
<string>Gated Full Adder with Complementary Inputs
|
||||
and Complementary Sum Outputs</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>lockedMode</string>
|
||||
<boolean>true</boolean>
|
||||
</entry>
|
||||
</attributes>
|
||||
<visualElements>
|
||||
<visualElement>
|
||||
<elementName>Or</elementName>
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>inverterConfig</string>
|
||||
<inverterConfig>
|
||||
<string>In_2</string>
|
||||
<string>In_3</string>
|
||||
</inverterConfig>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>Inputs</string>
|
||||
<int>3</int>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="120" y="60"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>And</elementName>
|
||||
<elementAttributes/>
|
||||
<pos x="20" y="0"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>In</elementName>
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>A1</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<string>8</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="0" y="0"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>In</elementName>
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>A2</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<string>9</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="0" y="40"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>In</elementName>
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>AC</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<string>11</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="0" y="80"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>In</elementName>
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>A*</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<string>10</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="0" y="120"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>Or</elementName>
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>inverterConfig</string>
|
||||
<inverterConfig>
|
||||
<string>In_2</string>
|
||||
<string>In_3</string>
|
||||
</inverterConfig>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>Inputs</string>
|
||||
<int>3</int>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="120" y="220"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>And</elementName>
|
||||
<elementAttributes/>
|
||||
<pos x="20" y="160"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>In</elementName>
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>B1</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<string>12</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="0" y="160"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>In</elementName>
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>B2</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<string>13</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="0" y="200"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>In</elementName>
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>BC</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<string>2</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="0" y="240"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>In</elementName>
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>B*</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<string>1</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="0" y="280"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>XOr</elementName>
|
||||
<elementAttributes/>
|
||||
<pos x="240" y="200"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>And</elementName>
|
||||
<elementAttributes/>
|
||||
<pos x="240" y="80"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>And</elementName>
|
||||
<elementAttributes/>
|
||||
<pos x="360" y="220"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>XOr</elementName>
|
||||
<elementAttributes/>
|
||||
<pos x="360" y="300"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>In</elementName>
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Description</string>
|
||||
<string>Übertragsbit der Vorgängerschaltung.</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>Cn</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<string>3</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="0" y="340"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>Out</elementName>
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Description</string>
|
||||
<string>Übertragsbit</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>~Cn+1</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<string>4</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="560" y="120"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>Out</elementName>
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Description</string>
|
||||
<string>Summe</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>S</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<string>6</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="560" y="320"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>Out</elementName>
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Description</string>
|
||||
<string>Summe</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>~S</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<string>5</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="560" y="260"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>Not</elementName>
|
||||
<elementAttributes/>
|
||||
<pos x="500" y="260"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>PowerSupply</elementName>
|
||||
<elementAttributes/>
|
||||
<pos x="40" y="-100"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>In</elementName>
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>VCC</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<string>14</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>InDefault</string>
|
||||
<value v="1" z="false"/>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="0" y="-100"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>In</elementName>
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>GND</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<string>7</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="0" y="-60"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>Testcase</elementName>
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Testdata</string>
|
||||
<testData>
|
||||
<dataString>B* A* Cn AC BC ~Cn+1 S ~S
|
||||
1 1 0 1 1 1 0 1
|
||||
1 1 0 1 0 1 1 0
|
||||
1 1 0 0 1 1 1 0
|
||||
1 1 0 0 0 0 0 1
|
||||
1 1 1 1 1 1 1 0
|
||||
1 1 1 1 0 0 0 1
|
||||
1 1 1 0 1 0 0 1
|
||||
1 1 1 0 0 0 1 0
|
||||
</dataString>
|
||||
</testData>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="240" y="-120"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>NOr</elementName>
|
||||
<elementAttributes/>
|
||||
<pos x="460" y="100"/>
|
||||
</visualElement>
|
||||
</visualElements>
|
||||
<wires>
|
||||
<wire>
|
||||
<p1 x="200" y="80"/>
|
||||
<p2 x="220" y="200"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="220" y="120"/>
|
||||
<p2 x="200" y="240"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="320" y="220"/>
|
||||
<p2 x="340" y="300"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="340" y="260"/>
|
||||
<p2 x="320" y="340"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="0" y="0"/>
|
||||
<p2 x="20" y="0"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="420" y="320"/>
|
||||
<p2 x="480" y="320"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="480" y="320"/>
|
||||
<p2 x="560" y="320"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="0" y="160"/>
|
||||
<p2 x="20" y="160"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="0" y="-100"/>
|
||||
<p2 x="40" y="-100"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="80" y="100"/>
|
||||
<p2 x="100" y="100"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="300" y="100"/>
|
||||
<p2 x="460" y="100"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="80" y="260"/>
|
||||
<p2 x="100" y="260"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="340" y="260"/>
|
||||
<p2 x="360" y="260"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="540" y="260"/>
|
||||
<p2 x="560" y="260"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="480" y="260"/>
|
||||
<p2 x="500" y="260"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="0" y="40"/>
|
||||
<p2 x="20" y="40"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="0" y="200"/>
|
||||
<p2 x="20" y="200"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="220" y="200"/>
|
||||
<p2 x="240" y="200"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="340" y="300"/>
|
||||
<p2 x="360" y="300"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="440" y="140"/>
|
||||
<p2 x="460" y="140"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="20" y="-80"/>
|
||||
<p2 x="40" y="-80"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="180" y="240"/>
|
||||
<p2 x="200" y="240"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="420" y="240"/>
|
||||
<p2 x="440" y="240"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="0" y="240"/>
|
||||
<p2 x="100" y="240"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="200" y="240"/>
|
||||
<p2 x="240" y="240"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="0" y="80"/>
|
||||
<p2 x="100" y="80"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="180" y="80"/>
|
||||
<p2 x="200" y="80"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="200" y="80"/>
|
||||
<p2 x="240" y="80"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="80" y="180"/>
|
||||
<p2 x="100" y="180"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="80" y="20"/>
|
||||
<p2 x="100" y="20"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="0" y="340"/>
|
||||
<p2 x="320" y="340"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="320" y="340"/>
|
||||
<p2 x="360" y="340"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="220" y="120"/>
|
||||
<p2 x="240" y="120"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="540" y="120"/>
|
||||
<p2 x="560" y="120"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="0" y="120"/>
|
||||
<p2 x="80" y="120"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="0" y="280"/>
|
||||
<p2 x="80" y="280"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="0" y="-60"/>
|
||||
<p2 x="20" y="-60"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="300" y="220"/>
|
||||
<p2 x="320" y="220"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="100" y="220"/>
|
||||
<p2 x="120" y="220"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="320" y="220"/>
|
||||
<p2 x="360" y="220"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="100" y="60"/>
|
||||
<p2 x="120" y="60"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="80" y="100"/>
|
||||
<p2 x="80" y="120"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="80" y="260"/>
|
||||
<p2 x="80" y="280"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="480" y="260"/>
|
||||
<p2 x="480" y="320"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="100" y="20"/>
|
||||
<p2 x="100" y="60"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="100" y="180"/>
|
||||
<p2 x="100" y="220"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="20" y="-80"/>
|
||||
<p2 x="20" y="-60"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="440" y="140"/>
|
||||
<p2 x="440" y="240"/>
|
||||
</wire>
|
||||
</wires>
|
||||
</circuit>
|
||||
@ -60,11 +60,11 @@
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>~LD</string>
|
||||
<string>~PE</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<int>9</int>
|
||||
<string>9</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>Default</string>
|
||||
@ -92,11 +92,11 @@
|
||||
</entry>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>~CLR</string>
|
||||
<string>~SR</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<int>1</int>
|
||||
<string>1</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>Default</string>
|
||||
@ -114,11 +114,11 @@
|
||||
</entry>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>CLK</string>
|
||||
<string>CP</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<int>2</int>
|
||||
<string>2</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="320" y="340"/>
|
||||
@ -128,11 +128,11 @@
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>RCO</string>
|
||||
<string>TC</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<int>15</int>
|
||||
<string>15</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="760" y="440"/>
|
||||
@ -147,11 +147,11 @@
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>ENT</string>
|
||||
<string>CET</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<int>10</int>
|
||||
<string>10</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="320" y="460"/>
|
||||
@ -161,11 +161,11 @@
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>ENP</string>
|
||||
<string>CEP</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<int>7</int>
|
||||
<string>7</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="320" y="380"/>
|
||||
@ -214,14 +214,14 @@
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>A</string>
|
||||
<string>P0</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<int>3</int>
|
||||
<string>3</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="160" y="160"/>
|
||||
<pos x="160" y="140"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>Splitter</elementName>
|
||||
@ -235,49 +235,49 @@
|
||||
<string>4</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="300" y="160"/>
|
||||
<pos x="300" y="140"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>In</elementName>
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>B</string>
|
||||
<string>P1</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<int>4</int>
|
||||
<string>4</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="280" y="180"/>
|
||||
<pos x="280" y="160"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>In</elementName>
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>C</string>
|
||||
<string>P2</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<int>5</int>
|
||||
<string>5</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="160" y="200"/>
|
||||
<pos x="160" y="180"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>In</elementName>
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>D</string>
|
||||
<string>P3</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<int>6</int>
|
||||
<string>6</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="280" y="220"/>
|
||||
<pos x="280" y="200"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>Splitter</elementName>
|
||||
@ -298,11 +298,11 @@
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>QA</string>
|
||||
<string>Q0</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<int>14</int>
|
||||
<string>14</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="800" y="140"/>
|
||||
@ -312,11 +312,11 @@
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>QB</string>
|
||||
<string>Q1</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<int>13</int>
|
||||
<string>13</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="940" y="160"/>
|
||||
@ -326,11 +326,11 @@
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>QC</string>
|
||||
<string>Q2</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<int>12</int>
|
||||
<string>12</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="800" y="180"/>
|
||||
@ -340,19 +340,39 @@
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>QD</string>
|
||||
<string>Q3</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<int>11</int>
|
||||
<string>11</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="940" y="200"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>Testcase</elementName>
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Testdata</string>
|
||||
<testData>
|
||||
<dataString>~SR ~PE CP CET CEP P0 P1 P2 P3 Q0 Q1 Q2 Q3
|
||||
|
||||
# load
|
||||
loop(i,4)
|
||||
loop(n,16)
|
||||
1 0 C bits(2,i) bits(4,n) bits(4,n)
|
||||
end loop
|
||||
end loop
|
||||
</dataString>
|
||||
</testData>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="840" y="300"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>PowerSupply</elementName>
|
||||
<elementAttributes/>
|
||||
<pos x="320" y="0"/>
|
||||
<pos x="360" y="20"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>In</elementName>
|
||||
@ -363,14 +383,14 @@
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<int>16</int>
|
||||
<string>16</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>InDefault</string>
|
||||
<value v="1" z="false"/>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="280" y="0"/>
|
||||
<pos x="320" y="20"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>In</elementName>
|
||||
@ -381,17 +401,13 @@
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<int>8</int>
|
||||
<string>8</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="280" y="40"/>
|
||||
<pos x="320" y="60"/>
|
||||
</visualElement>
|
||||
</visualElements>
|
||||
<wires>
|
||||
<wire>
|
||||
<p1 x="320" y="160"/>
|
||||
<p2 x="460" y="160"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="640" y="160"/>
|
||||
<p2 x="660" y="160"/>
|
||||
@ -400,17 +416,17 @@
|
||||
<p1 x="560" y="160"/>
|
||||
<p2 x="580" y="160"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="160" y="160"/>
|
||||
<p2 x="300" y="160"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="780" y="160"/>
|
||||
<p2 x="940" y="160"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="280" y="0"/>
|
||||
<p2 x="320" y="0"/>
|
||||
<p1 x="280" y="160"/>
|
||||
<p2 x="300" y="160"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="360" y="160"/>
|
||||
<p2 x="460" y="160"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="460" y="420"/>
|
||||
@ -422,10 +438,6 @@
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="360" y="100"/>
|
||||
<p2 x="500" y="100"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="500" y="100"/>
|
||||
<p2 x="740" y="100"/>
|
||||
</wire>
|
||||
<wire>
|
||||
@ -436,17 +448,25 @@
|
||||
<p1 x="440" y="200"/>
|
||||
<p2 x="460" y="200"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="160" y="200"/>
|
||||
<p2 x="300" y="200"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="780" y="200"/>
|
||||
<p2 x="940" y="200"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="280" y="40"/>
|
||||
<p2 x="300" y="40"/>
|
||||
<p1 x="280" y="200"/>
|
||||
<p2 x="300" y="200"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="340" y="40"/>
|
||||
<p2 x="360" y="40"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="320" y="140"/>
|
||||
<p2 x="520" y="140"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="160" y="140"/>
|
||||
<p2 x="300" y="140"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="620" y="140"/>
|
||||
@ -456,10 +476,6 @@
|
||||
<p1 x="720" y="140"/>
|
||||
<p2 x="740" y="140"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="500" y="140"/>
|
||||
<p2 x="520" y="140"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="780" y="140"/>
|
||||
<p2 x="800" y="140"/>
|
||||
@ -478,7 +494,7 @@
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="320" y="300"/>
|
||||
<p2 x="480" y="300"/>
|
||||
<p2 x="540" y="300"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="360" y="240"/>
|
||||
@ -486,16 +502,16 @@
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="420" y="400"/>
|
||||
<p2 x="540" y="400"/>
|
||||
<p2 x="480" y="400"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="160" y="180"/>
|
||||
<p2 x="300" y="180"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="500" y="180"/>
|
||||
<p2 x="520" y="180"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="280" y="180"/>
|
||||
<p2 x="300" y="180"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="780" y="180"/>
|
||||
<p2 x="800" y="180"/>
|
||||
@ -505,8 +521,8 @@
|
||||
<p2 x="640" y="340"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="300" y="20"/>
|
||||
<p2 x="320" y="20"/>
|
||||
<p1 x="320" y="20"/>
|
||||
<p2 x="360" y="20"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="660" y="440"/>
|
||||
@ -524,30 +540,30 @@
|
||||
<p1 x="440" y="220"/>
|
||||
<p2 x="460" y="220"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="280" y="220"/>
|
||||
<p2 x="300" y="220"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="320" y="380"/>
|
||||
<p2 x="360" y="380"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="480" y="200"/>
|
||||
<p2 x="480" y="300"/>
|
||||
<p1 x="320" y="60"/>
|
||||
<p2 x="340" y="60"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="640" y="160"/>
|
||||
<p2 x="640" y="340"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="500" y="100"/>
|
||||
<p2 x="500" y="140"/>
|
||||
<p1 x="480" y="200"/>
|
||||
<p2 x="480" y="400"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="340" y="420"/>
|
||||
<p2 x="340" y="460"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="340" y="40"/>
|
||||
<p2 x="340" y="60"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="740" y="100"/>
|
||||
<p2 x="740" y="140"/>
|
||||
@ -558,23 +574,23 @@
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="360" y="100"/>
|
||||
<p2 x="360" y="200"/>
|
||||
<p2 x="360" y="160"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="360" y="240"/>
|
||||
<p2 x="360" y="260"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="360" y="160"/>
|
||||
<p2 x="360" y="200"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="540" y="180"/>
|
||||
<p2 x="540" y="400"/>
|
||||
<p2 x="540" y="300"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="460" y="220"/>
|
||||
<p2 x="460" y="420"/>
|
||||
</wire>
|
||||
<wire>
|
||||
<p1 x="300" y="20"/>
|
||||
<p2 x="300" y="40"/>
|
||||
</wire>
|
||||
</wires>
|
||||
</circuit>
|
||||
@ -49,7 +49,7 @@
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<int>1</int>
|
||||
<string>1</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="160" y="340"/>
|
||||
@ -63,7 +63,7 @@
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<int>3</int>
|
||||
<string>3</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="160" y="380"/>
|
||||
@ -77,7 +77,7 @@
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<int>2</int>
|
||||
<string>2</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="300" y="360"/>
|
||||
@ -101,7 +101,7 @@
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<int>6</int>
|
||||
<string>6</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="160" y="220"/>
|
||||
@ -120,7 +120,7 @@
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<int>5</int>
|
||||
<string>5</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="160" y="260"/>
|
||||
@ -139,7 +139,7 @@
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<int>4</int>
|
||||
<string>4</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="160" y="300"/>
|
||||
@ -149,11 +149,11 @@
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>~Y0</string>
|
||||
<string>Y0</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<int>15</int>
|
||||
<string>15</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="440" y="160"/>
|
||||
@ -163,11 +163,11 @@
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>~Y1</string>
|
||||
<string>Y1</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<int>14</int>
|
||||
<string>14</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="620" y="180"/>
|
||||
@ -177,11 +177,11 @@
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>~Y2</string>
|
||||
<string>Y2</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<int>13</int>
|
||||
<string>13</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="440" y="200"/>
|
||||
@ -191,11 +191,11 @@
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>~Y3</string>
|
||||
<string>Y3</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<int>12</int>
|
||||
<string>12</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="620" y="220"/>
|
||||
@ -205,11 +205,11 @@
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>~Y4</string>
|
||||
<string>Y4</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<int>11</int>
|
||||
<string>11</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="440" y="240"/>
|
||||
@ -219,11 +219,11 @@
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>~Y5</string>
|
||||
<string>Y5</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<int>10</int>
|
||||
<string>10</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="620" y="260"/>
|
||||
@ -233,11 +233,11 @@
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>~Y6</string>
|
||||
<string>Y6</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<int>9</int>
|
||||
<string>9</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="440" y="280"/>
|
||||
@ -247,11 +247,11 @@
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Label</string>
|
||||
<string>~Y7</string>
|
||||
<string>Y7</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<int>7</int>
|
||||
<string>7</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="620" y="300"/>
|
||||
@ -270,7 +270,7 @@
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<int>16</int>
|
||||
<string>16</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>InDefault</string>
|
||||
@ -288,11 +288,34 @@
|
||||
</entry>
|
||||
<entry>
|
||||
<string>pinNumber</string>
|
||||
<int>8</int>
|
||||
<string>8</string>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="160" y="160"/>
|
||||
</visualElement>
|
||||
<visualElement>
|
||||
<elementName>Testcase</elementName>
|
||||
<elementAttributes>
|
||||
<entry>
|
||||
<string>Testdata</string>
|
||||
<testData>
|
||||
<dataString>~GA ~GB G A B C Y0 Y1 Y2 Y3 Y4 Y5 Y6 Y7
|
||||
1 X X X X X 0 0 0 0 0 0 0 0
|
||||
X 1 X X X X 0 0 0 0 0 0 0 0
|
||||
X X 0 X X X 0 0 0 0 0 0 0 0
|
||||
0 0 1 0 0 0 1 0 0 0 0 0 0 0
|
||||
0 0 1 1 0 0 0 1 0 0 0 0 0 0
|
||||
0 0 1 0 1 0 0 0 1 0 0 0 0 0
|
||||
0 0 1 1 1 0 0 0 0 1 0 0 0 0
|
||||
0 0 1 0 0 1 0 0 0 0 1 0 0 0
|
||||
0 0 1 1 0 1 0 0 0 0 0 1 0 0
|
||||
0 0 1 0 1 1 0 0 0 0 0 0 1 0
|
||||
0 0 1 1 1 1 0 0 0 0 0 0 0 1</dataString>
|
||||
</testData>
|
||||
</entry>
|
||||
</elementAttributes>
|
||||
<pos x="520" y="360"/>
|
||||
</visualElement>
|
||||
</visualElements>
|
||||
<wires>
|
||||
<wire>
|
||||
|
||||
@ -94,7 +94,9 @@ public class ModelCreator implements Iterable<ModelEntry> {
|
||||
Pins pins = ve.getPins();
|
||||
ElementTypeDescription elementType = library.getElementType(ve.getElementName());
|
||||
ElementAttributes attr = ve.getElementAttributes();
|
||||
if (attr.getCleanLabel().contains("*")) {
|
||||
if (attr.getCleanLabel().contains("*")
|
||||
&& !ve.equalsDescription(In.DESCRIPTION)
|
||||
&& !ve.equalsDescription(Out.DESCRIPTION)) {
|
||||
attr = new ElementAttributes(attr);
|
||||
attr.set(Keys.LABEL, attr.getCleanLabel().replace("*", subName));
|
||||
}
|
||||
|
||||
@ -29,8 +29,8 @@ public class TestExamples extends TestCase {
|
||||
*/
|
||||
public void testDistExamples() throws Exception {
|
||||
File examples = new File(Resources.getRoot().getParentFile().getParentFile(), "/main/dig");
|
||||
assertEquals(200, new FileScanner(this::check).scan(examples));
|
||||
assertEquals(102, testCasesInFiles);
|
||||
assertEquals(201, new FileScanner(this::check).scan(examples));
|
||||
assertEquals(105, testCasesInFiles);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user