diff --git a/src/main/dig/74xx/lib/basic/7454.dig b/src/main/dig/74xx/lib/basic/7454.dig new file mode 100644 index 000000000..5a5c49744 --- /dev/null +++ b/src/main/dig/74xx/lib/basic/7454.dig @@ -0,0 +1,308 @@ + + + 1 + + + isDIL + true + + + Description + 2-3-2-3-line AND NOR gate + + + lockedMode + true + + + + + And + + + + + And + + + Inputs + 3 + + + + + + And + + + + + And + + + Inputs + 3 + + + + + + NOr + + + Inputs + 4 + + + + + + Out + + + Label + Y + + + pinNumber + 6 + + + + + + In + + + Label + 1A + + + pinNumber + 1 + + + + + + In + + + Label + 1B + + + pinNumber + 2 + + + + + + In + + + Label + 3A + + + pinNumber + 13 + + + + + + In + + + Label + 3B + + + pinNumber + 12 + + + + + + In + + + Label + 2A + + + pinNumber + 3 + + + + + + In + + + Label + 2C + + + pinNumber + 5 + + + + + + In + + + Label + 2B + + + pinNumber + 4 + + + + + + In + + + Label + 4A + + + pinNumber + 9 + + + + + + In + + + Label + 4C + + + pinNumber + 11 + + + + + + In + + + Label + 4B + + + pinNumber + 10 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/dig/74xx/lib/basic/7458.dig b/src/main/dig/74xx/lib/basic/7458.dig new file mode 100644 index 000000000..c4df3466d --- /dev/null +++ b/src/main/dig/74xx/lib/basic/7458.dig @@ -0,0 +1,326 @@ + + + 1 + + + isDIL + true + + + Description + dual AND OR gate + + + lockedMode + true + + + + + And + + + + + And + + + Inputs + 3 + + + + + + And + + + + + And + + + Inputs + 3 + + + + + + Out + + + Label + 1Y + + + pinNumber + 6 + + + + + + In + + + Label + 1A + + + pinNumber + 2 + + + + + + In + + + Label + 1B + + + pinNumber + 3 + + + + + + In + + + Label + 1C + + + pinNumber + 4 + + + + + + In + + + Label + 1D + + + pinNumber + 5 + + + + + + In + + + Label + 2D + + + pinNumber + 11 + + + + + + In + + + Label + 2F + + + pinNumber + 9 + + + + + + In + + + Label + 2E + + + pinNumber + 10 + + + + + + In + + + Label + 2A + + + pinNumber + 1 + + + + + + In + + + Label + 2C + + + pinNumber + 12 + + + + + + In + + + Label + 2B + + + pinNumber + 13 + + + + + + Or + + + + + Out + + + Label + 2Y + + + pinNumber + 8 + + + + + + Or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 f7e11f184..22664cab0 100644 --- a/src/test/java/de/neemann/digital/integration/TestExamples.java +++ b/src/test/java/de/neemann/digital/integration/TestExamples.java @@ -28,7 +28,7 @@ public class TestExamples extends TestCase { */ public void testDistExamples() throws Exception { File examples = new File(Resources.getRoot().getParentFile().getParentFile(), "/main/dig"); - assertEquals(170, new FileScanner(this::check).scan(examples)); + assertEquals(172, new FileScanner(this::check).scan(examples)); assertEquals(78, testCasesInFiles); }