diff --git a/src/main/dig/cmos/and.dig b/src/main/dig/cmos/and.dig index 056a1e436..8f38f7c69 100644 --- a/src/main/dig/cmos/and.dig +++ b/src/main/dig/cmos/and.dig @@ -25,7 +25,7 @@ Y - + NFET @@ -212,7 +212,7 @@ - + diff --git a/src/main/dig/cmos/or.dig b/src/main/dig/cmos/or.dig new file mode 100644 index 000000000..bc03440fa --- /dev/null +++ b/src/main/dig/cmos/or.dig @@ -0,0 +1,282 @@ + + + 1 + + + VDD + + + + + In + + + Label + A + + + + + + Out + + + Label + Y + + + + + + Ground + + + + + Testcase + + + Testdata + + A B Y +0 0 0 +0 1 1 +1 0 1 +1 1 1 + +# transitions +0 0 0 +0 1 1 +0 0 0 +1 0 1 +0 0 0 +1 1 1 +0 0 0 +0 1 1 +1 0 1 +0 1 1 +1 1 1 +0 1 1 +1 0 1 +1 1 1 +1 0 1 + + + + + + + + In + + + Label + B + + + + + + NFET + + + Label + T6 + + + + + + PFET + + + Label + T5 + + + + + + NFET + + + Label + T3 + + + + + + NFET + + + Label + T4 + + + + + + PFET + + + Label + T1 + + + + + + PFET + + + Label + T2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 1a4b0acc9..5b6f8529c 100644 --- a/src/test/java/de/neemann/digital/integration/TestExamples.java +++ b/src/test/java/de/neemann/digital/integration/TestExamples.java @@ -28,8 +28,8 @@ public class TestExamples extends TestCase { */ public void testDistExamples() throws Exception { File examples = new File(Resources.getRoot().getParentFile().getParentFile(), "/main/dig"); - assertEquals(98, new FileScanner(this::check).scan(examples)); - assertEquals(50, testCasesInFiles); + assertEquals(99, new FileScanner(this::check).scan(examples)); + assertEquals(51, testCasesInFiles); } /**