From 50233adbd742806fd0bed210d2180094af6e48b7 Mon Sep 17 00:00:00 2001 From: hneemann Date: Sat, 3 Jun 2017 10:39:58 +0200 Subject: [PATCH] added a CAS-RAS example --- distribution/ReleaseNotes.txt | 3 + src/main/dig/cmos/CAS_RAS.dig | 908 ++++++++++++++++++ src/main/dig/cmos/dec.dig | 9 + .../digital/integration/TestExamples.java | 2 +- 4 files changed, 921 insertions(+), 1 deletion(-) create mode 100644 src/main/dig/cmos/CAS_RAS.dig diff --git a/distribution/ReleaseNotes.txt b/distribution/ReleaseNotes.txt index 397a7550b..a501ba870 100644 --- a/distribution/ReleaseNotes.txt +++ b/distribution/ReleaseNotes.txt @@ -1,5 +1,8 @@ Release Notes +Planed as v0.13 +- added a fuse to simulate a PROM + v0.12, released on 02. Jun 2016 - Added undo/redo functions. - New wire drawing mode: If a wire is added it is rectangular by default. diff --git a/src/main/dig/cmos/CAS_RAS.dig b/src/main/dig/cmos/CAS_RAS.dig new file mode 100644 index 000000000..db58b2460 --- /dev/null +++ b/src/main/dig/cmos/CAS_RAS.dig @@ -0,0 +1,908 @@ + + + 1 + + + + In + + + Label + A_0 + + + + + + In + + + Label + A_1 + + + + + + PullUp + + + + + PullUp + + + + + PullUp + + + + + PullUp + + + + + NFET + + + + + NFET + + + + + NFET + + + + + NFET + + + + + Out + + + Label + Q + + + + + + Ground + + + + + Ground + + + + + Ground + + + + + Ground + + + + + Ground + + + + + Ground + + + + + Ground + + + + + Ground + + + + + Ground + + + + + Ground + + + + + Ground + + + + + Ground + + + + + Ground + + + + + Ground + + + + + Driver + + + flipSelPos + true + + + + + + In + + + Label + CS + + + Default + 1 + + + + + + Ground + + + + + Ground + + + + + FGNFET + + + + + FGNFET + + + + + FGNFET + + + + + FGNFET + + + + + FGNFET + + + + + FGNFET + + + + + FGNFET + + + Blown + true + + + + + + FGNFET + + + + + FGNFET + + + + + FGNFET + + + + + FGNFET + + + Blown + true + + + + + + FGNFET + + + + + FGNFET + + + + + FGNFET + + + + + FGNFET + + + + + FGNFET + + + + + D_FF + + + Bits + 2 + + + + + + Decoder + + + Selector Bits + 2 + + + + + + Splitter + + + Input Splitting + 1,1 + + + Output Splitting + 2 + + + + + + Decoder + + + flipSelPos + true + + + Selector Bits + 2 + + + + + + D_FF + + + Bits + 2 + + + + + + In + + + Label + RAS + + + + + + In + + + Label + CAS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/dig/cmos/dec.dig b/src/main/dig/cmos/dec.dig index 04e264644..ea4ad441f 100644 --- a/src/main/dig/cmos/dec.dig +++ b/src/main/dig/cmos/dec.dig @@ -2,6 +2,15 @@ 1 + + backgroundColor + + 255 + 255 + 255 + 0 + + Width 2 diff --git a/src/test/java/de/neemann/digital/integration/TestExamples.java b/src/test/java/de/neemann/digital/integration/TestExamples.java index 6c0f6ea00..baa99721c 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(182, new FileScanner(this::check).scan(examples)); + assertEquals(183, new FileScanner(this::check).scan(examples)); assertEquals(82, testCasesInFiles); }