TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-27 06:51:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed an error in 7476

Browse Source
This commit is contained in:
hneemann 2017-07-17 21:49:10 +02:00
parent 2ec6a90b70
commit a272bebd7b
2 changed files with 192 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

242
src/main/dig/lib/74xx/flipflops/7476.dig
View File

@ -50,7 +50,7 @@
<int>15</int> <int>15</int>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="820" y="260"/> <pos x="1000" y="260"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>Out</elementName> <elementName>Out</elementName>
@ -64,7 +64,7 @@
<int>14</int> <int>14</int>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="820" y="300"/> <pos x="1000" y="340"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>In</elementName> <elementName>In</elementName>
@ -170,7 +170,7 @@
<int>1</int> <int>1</int>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="640" y="480"/> <pos x="640" y="540"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>Out</elementName> <elementName>Out</elementName>
@ -184,7 +184,7 @@
<int>11</int> <int>11</int>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="820" y="480"/> <pos x="1000" y="540"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>Out</elementName> <elementName>Out</elementName>
@ -198,7 +198,7 @@
<int>10</int> <int>10</int>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="820" y="520"/> <pos x="1000" y="620"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>In</elementName> <elementName>In</elementName>
@ -216,7 +216,7 @@
<int>6</int> <int>6</int>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="640" y="520"/> <pos x="640" y="580"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>In</elementName> <elementName>In</elementName>
@ -238,7 +238,7 @@
<int>1</int> <int>1</int>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="640" y="560"/> <pos x="640" y="620"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>In</elementName> <elementName>In</elementName>
@ -260,7 +260,7 @@
<int>1</int> <int>1</int>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="640" y="600"/> <pos x="640" y="660"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>In</elementName> <elementName>In</elementName>
@ -282,7 +282,7 @@
<int>1</int> <int>1</int>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="640" y="440"/> <pos x="640" y="500"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>JK_FF_AS</elementName> <elementName>JK_FF_AS</elementName>
@ -310,7 +310,99 @@
</inverterConfig> </inverterConfig>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="720" y="480"/> <pos x="720" y="540"/>
</visualElement>
<visualElement>
<elementName>Testcase</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>Flip Flop #1</string>
</entry>
<entry>
<string>Testdata</string>
<testData>
<dataString>1~C 1~S 1J 1K 1~CLK 1Q 1~Q
0 1 X X X 0 1
1 0 X X X 1 0
0 0 X X X 1 1
1 1 1 0 C 1 0
1 1 0 1 C 0 1
# Tests for &quot;no change&quot; and &quot;toggle&quot; states
1 1 0 1 C 0 1
1 1 0 0 C 0 1
1 1 1 1 C 1 0
1 1 0 0 C 1 0
1 1 1 1 C 0 1</dataString>
</testData>
</entry>
</elementAttributes>
<pos x="900" y="180"/>
</visualElement>
<visualElement>
<elementName>Or</elementName>
<elementAttributes/>
<pos x="920" y="320"/>
</visualElement>
<visualElement>
<elementName>And</elementName>
<elementAttributes>
<entry>
<string>inverterConfig</string>
<inverterConfig>
<string>In_1</string>
<string>In_2</string>
</inverterConfig>
</entry>
</elementAttributes>
<pos x="840" y="340"/>
</visualElement>
<visualElement>
<elementName>Or</elementName>
<elementAttributes/>
<pos x="920" y="600"/>
</visualElement>
<visualElement>
<elementName>And</elementName>
<elementAttributes>
<entry>
<string>inverterConfig</string>
<inverterConfig>
<string>In_1</string>
<string>In_2</string>
</inverterConfig>
</entry>
</elementAttributes>
<pos x="840" y="620"/>
</visualElement>
<visualElement>
<elementName>Testcase</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>Flip Flop #2</string>
</entry>
<entry>
<string>Testdata</string>
<testData>
<dataString>2~C 2~S 2J 2K 2~CLK 2Q 2~Q
0 1 X X X 0 1
1 0 X X X 1 0
0 0 X X X 1 1
1 1 1 0 C 1 0
1 1 0 1 C 0 1
# Tests for &quot;no change&quot; and &quot;toggle&quot; states
1 1 0 1 C 0 1
1 1 0 0 C 0 1
1 1 1 1 C 1 0
1 1 0 0 C 1 0
1 1 1 1 C 0 1</dataString>
</testData>
</entry>
</elementAttributes>
<pos x="900" y="460"/>
</visualElement> </visualElement>
</visualElements> </visualElements>
<wires> <wires>
@ -319,16 +411,12 @@
<p2 x="720" y="320"/> <p2 x="720" y="320"/>
</wire> </wire>
<wire> <wire>
<p1 x="680" y="480"/> <p1 x="860" y="320"/>
<p2 x="700" y="480"/> <p2 x="920" y="320"/>
</wire> </wire>
<wire> <wire>
<p1 x="640" y="480"/> <p1 x="900" y="640"/>
<p2 x="660" y="480"/> <p2 x="920" y="640"/>
</wire>
<wire>
<p1 x="780" y="480"/>
<p2 x="820" y="480"/>
</wire> </wire>
<wire> <wire>
<p1 x="680" y="260"/> <p1 x="680" y="260"/>
@ -340,39 +428,51 @@
</wire> </wire>
<wire> <wire>
<p1 x="780" y="260"/> <p1 x="780" y="260"/>
<p2 x="820" y="260"/> <p2 x="1000" y="260"/>
</wire> </wire>
<wire> <wire>
<p1 x="640" y="520"/> <p1 x="640" y="580"/>
<p2 x="700" y="520"/> <p2 x="700" y="580"/>
</wire> </wire>
<wire> <wire>
<p1 x="800" y="520"/> <p1 x="900" y="360"/>
<p2 x="820" y="520"/> <p2 x="920" y="360"/>
</wire> </wire>
<wire> <wire>
<p1 x="640" y="300"/> <p1 x="640" y="300"/>
<p2 x="700" y="300"/> <p2 x="700" y="300"/>
</wire> </wire>
<wire> <wire>
<p1 x="800" y="300"/> <p1 x="680" y="620"/>
<p2 x="820" y="300"/> <p2 x="700" y="620"/>
</wire> </wire>
<wire> <wire>
<p1 x="680" y="560"/> <p1 x="640" y="620"/>
<p2 x="700" y="560"/> <p2 x="660" y="620"/>
</wire> </wire>
<wire> <wire>
<p1 x="640" y="560"/> <p1 x="980" y="620"/>
<p2 x="660" y="560"/> <p2 x="1000" y="620"/>
</wire> </wire>
<wire> <wire>
<p1 x="660" y="500"/> <p1 x="800" y="620"/>
<p2 x="720" y="500"/> <p2 x="820" y="620"/>
</wire> </wire>
<wire> <wire>
<p1 x="780" y="500"/> <p1 x="660" y="560"/>
<p2 x="800" y="500"/> <p2 x="720" y="560"/>
</wire>
<wire>
<p1 x="780" y="560"/>
<p2 x="860" y="560"/>
</wire>
<wire>
<p1 x="980" y="340"/>
<p2 x="1000" y="340"/>
</wire>
<wire>
<p1 x="800" y="340"/>
<p2 x="820" y="340"/>
</wire> </wire>
<wire> <wire>
<p1 x="680" y="340"/> <p1 x="680" y="340"/>
@ -382,41 +482,73 @@
<p1 x="640" y="340"/> <p1 x="640" y="340"/>
<p2 x="660" y="340"/> <p2 x="660" y="340"/>
</wire> </wire>
<wire>
<p1 x="640" y="660"/>
<p2 x="680" y="660"/>
</wire>
<wire>
<p1 x="680" y="660"/>
<p2 x="820" y="660"/>
</wire>
<wire>
<p1 x="640" y="500"/>
<p2 x="680" y="500"/>
</wire>
<wire>
<p1 x="680" y="500"/>
<p2 x="800" y="500"/>
</wire>
<wire> <wire>
<p1 x="780" y="280"/> <p1 x="780" y="280"/>
<p2 x="800" y="280"/> <p2 x="860" y="280"/>
</wire> </wire>
<wire> <wire>
<p1 x="660" y="280"/> <p1 x="660" y="280"/>
<p2 x="720" y="280"/> <p2 x="720" y="280"/>
</wire> </wire>
<wire> <wire>
<p1 x="640" y="600"/> <p1 x="660" y="600"/>
<p2 x="680" y="600"/> <p2 x="720" y="600"/>
</wire> </wire>
<wire> <wire>
<p1 x="640" y="440"/> <p1 x="860" y="600"/>
<p2 x="680" y="440"/> <p2 x="920" y="600"/>
</wire> </wire>
<wire> <wire>
<p1 x="660" y="540"/> <p1 x="680" y="540"/>
<p2 x="720" y="540"/> <p2 x="700" y="540"/>
</wire>
<wire>
<p1 x="640" y="540"/>
<p2 x="660" y="540"/>
</wire>
<wire>
<p1 x="780" y="540"/>
<p2 x="1000" y="540"/>
</wire> </wire>
<wire> <wire>
<p1 x="640" y="380"/> <p1 x="640" y="380"/>
<p2 x="680" y="380"/> <p2 x="680" y="380"/>
</wire> </wire>
<wire>
<p1 x="680" y="380"/>
<p2 x="820" y="380"/>
</wire>
<wire> <wire>
<p1 x="640" y="220"/> <p1 x="640" y="220"/>
<p2 x="680" y="220"/> <p2 x="680" y="220"/>
</wire> </wire>
<wire> <wire>
<p1 x="800" y="280"/> <p1 x="680" y="220"/>
<p2 x="800" y="300"/> <p2 x="800" y="220"/>
</wire>
<wire>
<p1 x="800" y="220"/>
<p2 x="800" y="340"/>
</wire> </wire>
<wire> <wire>
<p1 x="800" y="500"/> <p1 x="800" y="500"/>
<p2 x="800" y="520"/> <p2 x="800" y="620"/>
</wire> </wire>
<wire> <wire>
<p1 x="660" y="260"/> <p1 x="660" y="260"/>
@ -426,14 +558,14 @@
<p1 x="660" y="320"/> <p1 x="660" y="320"/>
<p2 x="660" y="340"/> <p2 x="660" y="340"/>
</wire> </wire>
<wire>
<p1 x="660" y="480"/>
<p2 x="660" y="500"/>
</wire>
<wire> <wire>
<p1 x="660" y="540"/> <p1 x="660" y="540"/>
<p2 x="660" y="560"/> <p2 x="660" y="560"/>
</wire> </wire>
<wire>
<p1 x="660" y="600"/>
<p2 x="660" y="620"/>
</wire>
<wire> <wire>
<p1 x="680" y="220"/> <p1 x="680" y="220"/>
<p2 x="680" y="260"/> <p2 x="680" y="260"/>
@ -443,12 +575,20 @@
<p2 x="680" y="380"/> <p2 x="680" y="380"/>
</wire> </wire>
<wire> <wire>
<p1 x="680" y="440"/> <p1 x="680" y="500"/>
<p2 x="680" y="480"/> <p2 x="680" y="540"/>
</wire> </wire>
<wire> <wire>
<p1 x="680" y="560"/> <p1 x="680" y="620"/>
<p2 x="680" y="600"/> <p2 x="680" y="660"/>
</wire>
<wire>
<p1 x="860" y="280"/>
<p2 x="860" y="320"/>
</wire>
<wire>
<p1 x="860" y="560"/>
<p2 x="860" y="600"/>
</wire> </wire>
</wires> </wires>
<measurementOrdering/> <measurementOrdering/>

2
src/test/java/de/neemann/digital/integration/TestExamples.java
View File

@ -29,7 +29,7 @@ public class TestExamples extends TestCase {
public void testDistExamples() throws Exception { public void testDistExamples() throws Exception {
File examples = new File(Resources.getRoot().getParentFile().getParentFile(), "/main/dig"); File examples = new File(Resources.getRoot().getParentFile().getParentFile(), "/main/dig");
assertEquals(191, new FileScanner(this::check).scan(examples)); assertEquals(191, new FileScanner(this::check).scan(examples));
assertEquals(90, testCasesInFiles); assertEquals(92, testCasesInFiles);
} }
/** /**