TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-17 08:55:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

adds 7428 and 7440 which are duplicates of 7402 and 7413

Browse Source
This commit is contained in:
hneemann 2018-02-22 10:30:15 +01:00
parent 5617944a97
commit 3f3eb6b258
4 changed files with 588 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/ReleaseNotes.txt
View File

@ -1,6 +1,7 @@
Release Notes
HEAD, planed as v0.18
- Added 74181, 7440, 7428
- Added new text formatting engine which supports overline, super- and subscript.
Try "~Q_{n+1}^1" as an output label.
- It's possible to test circuits with a high-z input which can act as an output.

311
src/main/dig/lib/74xx/basic/7428.dig Normal file
View File

@ -0,0 +1,311 @@
<?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>quad 2-input NOR buffer</string>
</entry>
<entry>
<string>lockedMode</string>
<boolean>true</boolean>
</entry>
</attributes>
<visualElements>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>1A</string>
</entry>
<entry>
<string>pinNumber</string>
<int>2</int>
</entry>
</elementAttributes>
<pos x="300" y="220"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>1B</string>
</entry>
<entry>
<string>pinNumber</string>
<int>3</int>
</entry>
</elementAttributes>
<pos x="300" y="260"/>
</visualElement>
<visualElement>
<elementName>Out</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>1Y</string>
</entry>
<entry>
<string>pinNumber</string>
<int>1</int>
</entry>
</elementAttributes>
<pos x="460" y="240"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>2A</string>
</entry>
<entry>
<string>pinNumber</string>
<int>5</int>
</entry>
</elementAttributes>
<pos x="300" y="300"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>2B</string>
</entry>
<entry>
<string>pinNumber</string>
<int>6</int>
</entry>
</elementAttributes>
<pos x="300" y="340"/>
</visualElement>
<visualElement>
<elementName>Out</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>2Y</string>
</entry>
<entry>
<string>pinNumber</string>
<int>4</int>
</entry>
</elementAttributes>
<pos x="460" y="320"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>3B</string>
</entry>
<entry>
<string>pinNumber</string>
<int>9</int>
</entry>
</elementAttributes>
<pos x="300" y="420"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>3A</string>
</entry>
<entry>
<string>pinNumber</string>
<int>8</int>
</entry>
</elementAttributes>
<pos x="300" y="380"/>
</visualElement>
<visualElement>
<elementName>Out</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>3Y</string>
</entry>
<entry>
<string>pinNumber</string>
<int>10</int>
</entry>
</elementAttributes>
<pos x="460" y="400"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>4A</string>
</entry>
<entry>
<string>pinNumber</string>
<int>11</int>
</entry>
</elementAttributes>
<pos x="300" y="460"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>4B</string>
</entry>
<entry>
<string>pinNumber</string>
<int>12</int>
</entry>
</elementAttributes>
<pos x="300" y="500"/>
</visualElement>
<visualElement>
<elementName>Out</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>4Y</string>
</entry>
<entry>
<string>pinNumber</string>
<int>13</int>
</entry>
</elementAttributes>
<pos x="460" y="480"/>
</visualElement>
<visualElement>
<elementName>NOr</elementName>
<elementAttributes/>
<pos x="340" y="220"/>
</visualElement>
<visualElement>
<elementName>NOr</elementName>
<elementAttributes/>
<pos x="340" y="300"/>
</visualElement>
<visualElement>
<elementName>NOr</elementName>
<elementAttributes/>
<pos x="340" y="380"/>
</visualElement>
<visualElement>
<elementName>NOr</elementName>
<elementAttributes/>
<pos x="340" y="460"/>
</visualElement>
<visualElement>
<elementName>PowerSupply</elementName>
<elementAttributes/>
<pos x="340" y="560"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>VCC</string>
</entry>
<entry>
<string>pinNumber</string>
<int>14</int>
</entry>
<entry>
<string>InDefault</string>
<value v="1" z="false"/>
</entry>
</elementAttributes>
<pos x="300" y="560"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>GND</string>
</entry>
<entry>
<string>pinNumber</string>
<int>7</int>
</entry>
</elementAttributes>
<pos x="300" y="600"/>
</visualElement>
</visualElements>
<wires>
<wire>
<p1 x="420" y="320"/>
<p2 x="460" y="320"/>
</wire>
<wire>
<p1 x="420" y="480"/>
<p2 x="460" y="480"/>
</wire>
<wire>
<p1 x="300" y="260"/>
<p2 x="340" y="260"/>
</wire>
<wire>
<p1 x="300" y="420"/>
<p2 x="340" y="420"/>
</wire>
<wire>
<p1 x="320" y="580"/>
<p2 x="340" y="580"/>
</wire>
<wire>
<p1 x="300" y="300"/>
<p2 x="340" y="300"/>
</wire>
<wire>
<p1 x="300" y="460"/>
<p2 x="340" y="460"/>
</wire>
<wire>
<p1 x="420" y="240"/>
<p2 x="460" y="240"/>
</wire>
<wire>
<p1 x="420" y="400"/>
<p2 x="460" y="400"/>
</wire>
<wire>
<p1 x="300" y="560"/>
<p2 x="340" y="560"/>
</wire>
<wire>
<p1 x="300" y="340"/>
<p2 x="340" y="340"/>
</wire>
<wire>
<p1 x="300" y="500"/>
<p2 x="340" y="500"/>
</wire>
<wire>
<p1 x="300" y="600"/>
<p2 x="320" y="600"/>
</wire>
<wire>
<p1 x="300" y="220"/>
<p2 x="340" y="220"/>
</wire>
<wire>
<p1 x="300" y="380"/>
<p2 x="340" y="380"/>
</wire>
<wire>
<p1 x="320" y="580"/>
<p2 x="320" y="600"/>
</wire>
</wires>
</circuit>

275
src/main/dig/lib/74xx/basic/7440.dig Normal file
View File

@ -0,0 +1,275 @@
<?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>dual 4-input NAND gate</string>
</entry>
<entry>
<string>lockedMode</string>
<boolean>true</boolean>
</entry>
</attributes>
<visualElements>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>1A</string>
</entry>
<entry>
<string>pinNumber</string>
<int>1</int>
</entry>
</elementAttributes>
<pos x="300" y="220"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>1C</string>
</entry>
<entry>
<string>pinNumber</string>
<int>4</int>
</entry>
</elementAttributes>
<pos x="300" y="280"/>
</visualElement>
<visualElement>
<elementName>Out</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>1Y</string>
</entry>
<entry>
<string>pinNumber</string>
<int>6</int>
</entry>
</elementAttributes>
<pos x="460" y="260"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>2A</string>
</entry>
<entry>
<string>pinNumber</string>
<int>9</int>
</entry>
</elementAttributes>
<pos x="300" y="340"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>2C</string>
</entry>
<entry>
<string>pinNumber</string>
<int>12</int>
</entry>
</elementAttributes>
<pos x="300" y="400"/>
</visualElement>
<visualElement>
<elementName>Out</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>2Y</string>
</entry>
<entry>
<string>pinNumber</string>
<int>8</int>
</entry>
</elementAttributes>
<pos x="460" y="380"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>1B</string>
</entry>
<entry>
<string>pinNumber</string>
<int>2</int>
</entry>
</elementAttributes>
<pos x="160" y="240"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>2B</string>
</entry>
<entry>
<string>pinNumber</string>
<int>10</int>
</entry>
</elementAttributes>
<pos x="160" y="360"/>
</visualElement>
<visualElement>
<elementName>NAnd</elementName>
<elementAttributes>
<entry>
<string>Inputs</string>
<int>4</int>
</entry>
</elementAttributes>
<pos x="340" y="220"/>
</visualElement>
<visualElement>
<elementName>NAnd</elementName>
<elementAttributes>
<entry>
<string>Inputs</string>
<int>4</int>
</entry>
</elementAttributes>
<pos x="340" y="340"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>1D</string>
</entry>
<entry>
<string>pinNumber</string>
<int>5</int>
</entry>
</elementAttributes>
<pos x="160" y="300"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>2D</string>
</entry>
<entry>
<string>pinNumber</string>
<int>13</int>
</entry>
</elementAttributes>
<pos x="160" y="420"/>
</visualElement>
<visualElement>
<elementName>PowerSupply</elementName>
<elementAttributes/>
<pos x="340" y="500"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>VCC</string>
</entry>
<entry>
<string>pinNumber</string>
<int>14</int>
</entry>
<entry>
<string>InDefault</string>
<value v="1" z="false"/>
</entry>
</elementAttributes>
<pos x="300" y="500"/>
</visualElement>
<visualElement>
<elementName>In</elementName>
<elementAttributes>
<entry>
<string>Label</string>
<string>GND</string>
</entry>
<entry>
<string>pinNumber</string>
<int>7</int>
</entry>
</elementAttributes>
<pos x="300" y="540"/>
</visualElement>
</visualElements>
<wires>
<wire>
<p1 x="420" y="260"/>
<p2 x="460" y="260"/>
</wire>
<wire>
<p1 x="160" y="420"/>
<p2 x="340" y="420"/>
</wire>
<wire>
<p1 x="160" y="360"/>
<p2 x="340" y="360"/>
</wire>
<wire>
<p1 x="320" y="520"/>
<p2 x="340" y="520"/>
</wire>
<wire>
<p1 x="160" y="300"/>
<p2 x="340" y="300"/>
</wire>
<wire>
<p1 x="160" y="240"/>
<p2 x="340" y="240"/>
</wire>
<wire>
<p1 x="300" y="400"/>
<p2 x="340" y="400"/>
</wire>
<wire>
<p1 x="300" y="340"/>
<p2 x="340" y="340"/>
</wire>
<wire>
<p1 x="300" y="500"/>
<p2 x="340" y="500"/>
</wire>
<wire>
<p1 x="300" y="280"/>
<p2 x="340" y="280"/>
</wire>
<wire>
<p1 x="420" y="380"/>
<p2 x="460" y="380"/>
</wire>
<wire>
<p1 x="300" y="220"/>
<p2 x="340" y="220"/>
</wire>
<wire>
<p1 x="300" y="540"/>
<p2 x="320" y="540"/>
</wire>
<wire>
<p1 x="320" y="520"/>
<p2 x="320" y="540"/>
</wire>
</wires>
</circuit>

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 {
File examples = new File(Resources.getRoot().getParentFile().getParentFile(), "/main/dig");
assertEquals(212, new FileScanner(this::check).scan(examples));
assertEquals(214, new FileScanner(this::check).scan(examples));
assertEquals(159, testCasesInFiles);
}