diff --git a/src/main/dig/lib/74xx/flipflops/7476.dig b/src/main/dig/lib/74xx/flipflops/7476.dig index 9c849efee..d1d563905 100644 --- a/src/main/dig/lib/74xx/flipflops/7476.dig +++ b/src/main/dig/lib/74xx/flipflops/7476.dig @@ -50,7 +50,7 @@ 15 - + Out @@ -64,7 +64,7 @@ 14 - + In @@ -170,7 +170,7 @@ 1 - + Out @@ -184,7 +184,7 @@ 11 - + Out @@ -198,7 +198,7 @@ 10 - + In @@ -216,7 +216,7 @@ 6 - + In @@ -238,7 +238,7 @@ 1 - + In @@ -260,7 +260,7 @@ 1 - + In @@ -282,7 +282,7 @@ 1 - + JK_FF_AS @@ -310,7 +310,99 @@ - + + + + Testcase + + + Label + Flip Flop #1 + + + Testdata + + 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 "no change" and "toggle" 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 + + + + + + + Or + + + + + And + + + inverterConfig + + In_1 + In_2 + + + + + + + Or + + + + + And + + + inverterConfig + + In_1 + In_2 + + + + + + + Testcase + + + Label + Flip Flop #2 + + + Testdata + + 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 "no change" and "toggle" 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 + + + + @@ -319,16 +411,12 @@ - - + + - - - - - - + + @@ -340,39 +428,51 @@ - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + @@ -382,41 +482,73 @@ + + + + + + + + + + + + + + + + - + - - + + - - + + - - + + + + + + + + + + + + + + - - + + + + + + - + @@ -426,14 +558,14 @@ - - - - + + + + @@ -443,12 +575,20 @@ - - + + - - + + + + + + + + + + diff --git a/src/test/java/de/neemann/digital/integration/TestExamples.java b/src/test/java/de/neemann/digital/integration/TestExamples.java index 51ec998fc..330aafede 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(191, new FileScanner(this::check).scan(examples)); - assertEquals(90, testCasesInFiles); + assertEquals(92, testCasesInFiles); } /**