diff --git a/distribution/ReleaseNotes.txt b/distribution/ReleaseNotes.txt index 58db2480a..abd1f3402 100644 --- a/distribution/ReleaseNotes.txt +++ b/distribution/ReleaseNotes.txt @@ -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. diff --git a/src/main/dig/lib/74xx/basic/7428.dig b/src/main/dig/lib/74xx/basic/7428.dig new file mode 100644 index 000000000..6eac98c91 --- /dev/null +++ b/src/main/dig/lib/74xx/basic/7428.dig @@ -0,0 +1,311 @@ + + + 1 + + + isDIL + true + + + Description + quad 2-input NOR buffer + + + lockedMode + true + + + + + In + + + Label + 1A + + + pinNumber + 2 + + + + + + In + + + Label + 1B + + + pinNumber + 3 + + + + + + Out + + + Label + 1Y + + + pinNumber + 1 + + + + + + In + + + Label + 2A + + + pinNumber + 5 + + + + + + In + + + Label + 2B + + + pinNumber + 6 + + + + + + Out + + + Label + 2Y + + + pinNumber + 4 + + + + + + In + + + Label + 3B + + + pinNumber + 9 + + + + + + In + + + Label + 3A + + + pinNumber + 8 + + + + + + Out + + + Label + 3Y + + + pinNumber + 10 + + + + + + In + + + Label + 4A + + + pinNumber + 11 + + + + + + In + + + Label + 4B + + + pinNumber + 12 + + + + + + Out + + + Label + 4Y + + + pinNumber + 13 + + + + + + NOr + + + + + NOr + + + + + NOr + + + + + NOr + + + + + PowerSupply + + + + + In + + + Label + VCC + + + pinNumber + 14 + + + InDefault + + + + + + + In + + + Label + GND + + + pinNumber + 7 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/dig/lib/74xx/basic/7440.dig b/src/main/dig/lib/74xx/basic/7440.dig new file mode 100644 index 000000000..10f79a376 --- /dev/null +++ b/src/main/dig/lib/74xx/basic/7440.dig @@ -0,0 +1,275 @@ + + + 1 + + + isDIL + true + + + Description + dual 4-input NAND gate + + + lockedMode + true + + + + + In + + + Label + 1A + + + pinNumber + 1 + + + + + + In + + + Label + 1C + + + pinNumber + 4 + + + + + + Out + + + Label + 1Y + + + pinNumber + 6 + + + + + + In + + + Label + 2A + + + pinNumber + 9 + + + + + + In + + + Label + 2C + + + pinNumber + 12 + + + + + + Out + + + Label + 2Y + + + pinNumber + 8 + + + + + + In + + + Label + 1B + + + pinNumber + 2 + + + + + + In + + + Label + 2B + + + pinNumber + 10 + + + + + + NAnd + + + Inputs + 4 + + + + + + NAnd + + + Inputs + 4 + + + + + + In + + + Label + 1D + + + pinNumber + 5 + + + + + + In + + + Label + 2D + + + pinNumber + 13 + + + + + + PowerSupply + + + + + In + + + Label + VCC + + + pinNumber + 14 + + + InDefault + + + + + + + In + + + Label + GND + + + pinNumber + 7 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/java/de/neemann/digital/integration/TestExamples.java b/src/test/java/de/neemann/digital/integration/TestExamples.java index 753614bf5..51689fc72 100644 --- a/src/test/java/de/neemann/digital/integration/TestExamples.java +++ b/src/test/java/de/neemann/digital/integration/TestExamples.java @@ -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); }