TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-28 07:28:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

moved some examples to distribution

Browse Source
This commit is contained in:
hneemann 2017-02-23 15:25:14 +01:00
parent e872b7dcf2
commit 8741bd9ea1
6 changed files with 80 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
distribution/Assembly.xml
View File

@ -67,6 +67,13 @@
<include>*.dig</include> <include>*.dig</include>
</includes> </includes>
</fileSet> </fileSet>
<fileSet>
<directory>${basedir}/src/main/dig/cmos</directory>
<outputDirectory>/examples/cmos/</outputDirectory>
<includes>
<include>*.dig</include>
</includes>
</fileSet>
<fileSet> <fileSet>
<directory>${basedir}/src/main/dig/test</directory> <directory>${basedir}/src/main/dig/test</directory>
<outputDirectory>/examples/test/</outputDirectory> <outputDirectory>/examples/test/</outputDirectory>

58
src/test/resources/dig/test/fet/and.dig → src/main/dig/cmos/and.dig
View File

@ -15,7 +15,7 @@
<string>A</string> <string>A</string>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="140" y="300"/> <pos x="120" y="300"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>Out</elementName> <elementName>Out</elementName>
@ -82,7 +82,7 @@
<string>B</string> <string>B</string>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="140" y="460"/> <pos x="120" y="460"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>NFET</elementName> <elementName>NFET</elementName>
@ -126,6 +126,14 @@
</visualElement> </visualElement>
</visualElements> </visualElements>
<wires> <wires>
<wire>
<p1 x="140" y="440"/>
<p2 x="180" y="320"/>
</wire>
<wire>
<p1 x="140" y="320"/>
<p2 x="180" y="440"/>
</wire>
<wire> <wire>
<p1 x="220" y="240"/> <p1 x="220" y="240"/>
<p2 x="260" y="240"/> <p2 x="260" y="240"/>
@ -135,15 +143,15 @@
<p2 x="340" y="240"/> <p2 x="340" y="240"/>
</wire> </wire>
<wire> <wire>
<p1 x="160" y="320"/> <p1 x="180" y="320"/>
<p2 x="240" y="320"/> <p2 x="240" y="320"/>
</wire> </wire>
<wire> <wire>
<p1 x="160" y="500"/> <p1 x="140" y="500"/>
<p2 x="200" y="500"/> <p2 x="200" y="500"/>
</wire> </wire>
<wire> <wire>
<p1 x="180" y="260"/> <p1 x="140" y="260"/>
<p2 x="200" y="260"/> <p2 x="200" y="260"/>
</wire> </wire>
<wire> <wire>
@ -155,8 +163,8 @@
<p2 x="200" y="440"/> <p2 x="200" y="440"/>
</wire> </wire>
<wire> <wire>
<p1 x="140" y="460"/> <p1 x="120" y="460"/>
<p2 x="160" y="460"/> <p2 x="140" y="460"/>
</wire> </wire>
<wire> <wire>
<p1 x="300" y="460"/> <p1 x="300" y="460"/>
@ -167,8 +175,8 @@
<p2 x="320" y="300"/> <p2 x="320" y="300"/>
</wire> </wire>
<wire> <wire>
<p1 x="140" y="300"/> <p1 x="120" y="300"/>
<p2 x="180" y="300"/> <p2 x="140" y="300"/>
</wire> </wire>
<wire> <wire>
<p1 x="340" y="380"/> <p1 x="340" y="380"/>
@ -182,14 +190,6 @@
<p1 x="260" y="380"/> <p1 x="260" y="380"/>
<p2 x="300" y="380"/> <p2 x="300" y="380"/>
</wire> </wire>
<wire>
<p1 x="160" y="320"/>
<p2 x="160" y="460"/>
</wire>
<wire>
<p1 x="160" y="460"/>
<p2 x="160" y="500"/>
</wire>
<wire> <wire>
<p1 x="340" y="240"/> <p1 x="340" y="240"/>
<p2 x="340" y="300"/> <p2 x="340" y="300"/>
@ -206,14 +206,6 @@
<p1 x="340" y="380"/> <p1 x="340" y="380"/>
<p2 x="340" y="420"/> <p2 x="340" y="420"/>
</wire> </wire>
<wire>
<p1 x="180" y="260"/>
<p2 x="180" y="300"/>
</wire>
<wire>
<p1 x="180" y="300"/>
<p2 x="180" y="440"/>
</wire>
<wire> <wire>
<p1 x="260" y="240"/> <p1 x="260" y="240"/>
<p2 x="260" y="320"/> <p2 x="260" y="320"/>
@ -222,6 +214,22 @@
<p1 x="260" y="360"/> <p1 x="260" y="360"/>
<p2 x="260" y="380"/> <p2 x="260" y="380"/>
</wire> </wire>
<wire>
<p1 x="140" y="260"/>
<p2 x="140" y="300"/>
</wire>
<wire>
<p1 x="140" y="440"/>
<p2 x="140" y="460"/>
</wire>
<wire>
<p1 x="140" y="460"/>
<p2 x="140" y="500"/>
</wire>
<wire>
<p1 x="140" y="300"/>
<p2 x="140" y="320"/>
</wire>
<wire> <wire>
<p1 x="220" y="220"/> <p1 x="220" y="220"/>
<p2 x="220" y="240"/> <p2 x="220" y="240"/>

60
src/test/resources/dig/test/fet/inverter.dig → src/main/dig/cmos/inverter.dig
View File

@ -5,7 +5,7 @@
<visualElement> <visualElement>
<elementName>VDD</elementName> <elementName>VDD</elementName>
<elementAttributes/> <elementAttributes/>
<pos x="220" y="320"/> <pos x="220" y="300"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>In</elementName> <elementName>In</elementName>
@ -14,12 +14,8 @@
<string>Label</string> <string>Label</string>
<string>A</string> <string>A</string>
</entry> </entry>
<entry>
<string>isHighZ</string>
<boolean>true</boolean>
</entry>
</elementAttributes> </elementAttributes>
<pos x="160" y="400"/> <pos x="140" y="400"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>Out</elementName> <elementName>Out</elementName>
@ -29,22 +25,32 @@
<string>Y</string> <string>Y</string>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="240" y="400"/> <pos x="260" y="400"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>NFET</elementName> <elementName>NFET</elementName>
<elementAttributes/> <elementAttributes>
<pos x="200" y="420"/> <entry>
<string>Label</string>
<string>T2</string>
</entry>
</elementAttributes>
<pos x="200" y="440"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>PFET</elementName> <elementName>PFET</elementName>
<elementAttributes/> <elementAttributes>
<pos x="200" y="340"/> <entry>
<string>Label</string>
<string>T1</string>
</entry>
</elementAttributes>
<pos x="200" y="320"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>Ground</elementName> <elementName>Ground</elementName>
<elementAttributes/> <elementAttributes/>
<pos x="220" y="480"/> <pos x="220" y="500"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>Testcase</elementName> <elementName>Testcase</elementName>
@ -59,49 +65,49 @@ Z Z</dataString>
</testData> </testData>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="280" y="300"/> <pos x="300" y="460"/>
</visualElement> </visualElement>
</visualElements> </visualElements>
<wires> <wires>
<wire> <wire>
<p1 x="220" y="400"/> <p1 x="220" y="400"/>
<p2 x="240" y="400"/> <p2 x="260" y="400"/>
</wire> </wire>
<wire> <wire>
<p1 x="160" y="400"/> <p1 x="140" y="400"/>
<p2 x="180" y="400"/> <p2 x="180" y="400"/>
</wire> </wire>
<wire> <wire>
<p1 x="180" y="340"/> <p1 x="180" y="320"/>
<p2 x="200" y="340"/> <p2 x="200" y="320"/>
</wire> </wire>
<wire> <wire>
<p1 x="180" y="460"/> <p1 x="180" y="480"/>
<p2 x="200" y="460"/> <p2 x="200" y="480"/>
</wire> </wire>
<wire> <wire>
<p1 x="180" y="340"/> <p1 x="180" y="320"/>
<p2 x="180" y="400"/> <p2 x="180" y="400"/>
</wire> </wire>
<wire> <wire>
<p1 x="180" y="400"/> <p1 x="180" y="400"/>
<p2 x="180" y="460"/> <p2 x="180" y="480"/>
</wire> </wire>
<wire> <wire>
<p1 x="220" y="460"/> <p1 x="220" y="480"/>
<p2 x="220" y="480"/> <p2 x="220" y="500"/>
</wire> </wire>
<wire> <wire>
<p1 x="220" y="380"/> <p1 x="220" y="360"/>
<p2 x="220" y="400"/> <p2 x="220" y="400"/>
</wire> </wire>
<wire> <wire>
<p1 x="220" y="320"/> <p1 x="220" y="300"/>
<p2 x="220" y="340"/> <p2 x="220" y="320"/>
</wire> </wire>
<wire> <wire>
<p1 x="220" y="400"/> <p1 x="220" y="400"/>
<p2 x="220" y="420"/> <p2 x="220" y="440"/>
</wire> </wire>
</wires> </wires>
</circuit> </circuit>

0
src/test/resources/dig/test/fet/openDrainOut.dig → src/main/dig/cmos/openDrainOut.dig
View File

6
src/test/resources/dig/test/fet/tristateout.dig → src/main/dig/cmos/tristateout.dig
View File

@ -7,7 +7,7 @@
<elementAttributes> <elementAttributes>
<entry> <entry>
<string>Label</string> <string>Label</string>
<string>T6</string> <string>T4</string>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="500" y="500"/> <pos x="500" y="500"/>
@ -17,7 +17,7 @@
<elementAttributes> <elementAttributes>
<entry> <entry>
<string>Label</string> <string>Label</string>
<string>T5</string> <string>T6</string>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="500" y="440"/> <pos x="500" y="440"/>
@ -27,7 +27,7 @@
<elementAttributes> <elementAttributes>
<entry> <entry>
<string>Label</string> <string>Label</string>
<string>T4</string> <string>T5</string>
</entry> </entry>
</elementAttributes> </elementAttributes>
<pos x="500" y="360"/> <pos x="500" y="360"/>

8
src/test/java/de/neemann/digital/integration/TestExamples.java
View File

@ -28,8 +28,8 @@ public class TestExamples extends TestCase {
*/ */
public void testDistExamples() throws Exception { public void testDistExamples() throws Exception {
File examples = new File(Resources.getRoot().getParentFile().getParentFile(), "/main/dig"); File examples = new File(Resources.getRoot().getParentFile().getParentFile(), "/main/dig");
assertEquals(94, new FileScanner(this::check).scan(examples)); assertEquals(98, new FileScanner(this::check).scan(examples));
assertEquals(46, testCasesInFiles); assertEquals(50, testCasesInFiles);
} }
/** /**
@ -39,8 +39,8 @@ public class TestExamples extends TestCase {
*/ */
public void testTestExamples() throws Exception { public void testTestExamples() throws Exception {
File examples = new File(Resources.getRoot(), "/dig/test"); File examples = new File(Resources.getRoot(), "/dig/test");
assertEquals(45, new FileScanner(this::check).scan(examples)); assertEquals(41, new FileScanner(this::check).scan(examples));
assertEquals(35, testCasesInFiles); assertEquals(31, testCasesInFiles);
} }