From f5cddf1abaeeec5aa6bf287cde656d032d9c2acf Mon Sep 17 00:00:00 2001 From: hneemann Date: Wed, 22 Mar 2017 20:20:19 +0100 Subject: [PATCH] added some examples --- src/main/dig/cmos/d-ff.dig | 344 ++++++++++++++++++ src/main/dig/cmos/d-tg-ff.dig | 314 ++++++++++++++++ .../digital/integration/TestExamples.java | 4 +- 3 files changed, 660 insertions(+), 2 deletions(-) create mode 100644 src/main/dig/cmos/d-ff.dig create mode 100644 src/main/dig/cmos/d-tg-ff.dig diff --git a/src/main/dig/cmos/d-ff.dig b/src/main/dig/cmos/d-ff.dig new file mode 100644 index 000000000..90b21f00c --- /dev/null +++ b/src/main/dig/cmos/d-ff.dig @@ -0,0 +1,344 @@ + + + 1 + + + PFET + + + + + PFET + + + + + NFET + + + + + NFET + + + + + PullUp + + + + + PullUp + + + + + PullDown + + + + + PullDown + + + + + Out + + + Label + ~Q + + + + + + Out + + + Label + Q + + + + + + NFET + + + + + NFET + + + + + PFET + + + + + PFET + + + + + In + + + Label + D + + + + + + VDD + + + + + Ground + + + + + NFET + + + + + PFET + + + + + VDD + + + + + In + + + Label + C + + + + + + Ground + + + + + Testcase + + + Testdata + + C D Q ~Q +1 0 0 1 +0 0 0 1 +0 1 0 1 +0 0 0 1 +1 1 1 0 +0 1 1 0 +0 0 1 0 +1 0 0 1 +0 0 0 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/dig/cmos/d-tg-ff.dig b/src/main/dig/cmos/d-tg-ff.dig new file mode 100644 index 000000000..dc07e4df1 --- /dev/null +++ b/src/main/dig/cmos/d-tg-ff.dig @@ -0,0 +1,314 @@ + + + 1 + + + PFET + + + + + PFET + + + + + NFET + + + + + NFET + + + + + PullUp + + + + + PullUp + + + + + PullDown + + + + + PullDown + + + + + Out + + + Label + ~Q + + + + + + Out + + + Label + Q + + + + + + NFET + + + rotation + + + + + + + PFET + + + rotation + + + + + + + In + + + Label + D + + + + + + NFET + + + + + PFET + + + + + VDD + + + + + In + + + Label + C + + + + + + Ground + + + + + Testcase + + + Testdata + + C D Q ~Q +1 0 0 1 +0 0 0 1 +0 1 0 1 +0 0 0 1 +1 1 1 0 +0 1 1 0 +0 0 1 0 +1 0 0 1 +0 0 0 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 a8ad7f141..f752e0f4e 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(104, new FileScanner(this::check).scan(examples)); - assertEquals(52, testCasesInFiles); + assertEquals(106, new FileScanner(this::check).scan(examples)); + assertEquals(54, testCasesInFiles); } /**