From e2afca47e58e69b03378537c5f1d1a15a806a10d Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Wed, 14 Oct 2020 00:25:12 +0200 Subject: [PATCH] Cleaned sel2_4 and sel3_4 --- .../am2900/components/am2901/Am2901.json | 714 ++++++++---------- ...ALUInclSourceDecodeInclFunctionDecode.json | 698 +++-------------- .../logic/model/am2900/components/sel2_4.json | 458 ++++++----- .../logic/model/am2900/components/sel3_4.json | 683 ++++++----------- 4 files changed, 862 insertions(+), 1691 deletions(-) diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json index 0249fd17..83bcb603 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json @@ -191,8 +191,8 @@ "id": "Splitter", "name": "Splitter#1", "pos": { - "x": 185.0, - "y": 730.0 + "x": 125.0, + "y": 1040.0 }, "params": { "logicWidth": 4, @@ -239,8 +239,8 @@ "id": "Splitter", "name": "Splitter#5", "pos": { - "x": 110.0, - "y": 765.0 + "x": 140.0, + "y": 740.0 }, "params": { "logicWidth": 4, @@ -251,20 +251,20 @@ "id": "Splitter", "name": "Splitter#6", "pos": { - "x": 110.0, - "y": 800.0 + "x": 125.0, + "y": 995.0 }, "params": { "logicWidth": 4, - "orientation": "RIGHT" + "orientation": "LEFT" } }, { "id": "Splitter", "name": "Splitter#7", "pos": { - "x": 110.0, - "y": 835.0 + "x": 140.0, + "y": 805.0 }, "params": { "logicWidth": 4, @@ -275,12 +275,12 @@ "id": "Splitter", "name": "Splitter#8", "pos": { - "x": 135.0, - "y": 1000.0 + "x": 155.0, + "y": 750.0 }, "params": { "logicWidth": 4, - "orientation": "RIGHT" + "orientation": "LEFT" } }, { @@ -299,8 +299,8 @@ "id": "Splitter", "name": "Splitter#10", "pos": { - "x": 135.0, - "y": 965.0 + "x": 110.0, + "y": 985.0 }, "params": { "logicWidth": 4, @@ -311,8 +311,8 @@ "id": "Splitter", "name": "Splitter#11", "pos": { - "x": 135.0, - "y": 1035.0 + "x": 110.0, + "y": 1050.0 }, "params": { "logicWidth": 4, @@ -335,8 +335,8 @@ "id": "Splitter", "name": "Splitter#13", "pos": { - "x": 190.0, - "y": 930.0 + "x": 155.0, + "y": 795.0 }, "params": { "logicWidth": 4, @@ -396,7 +396,7 @@ "name": "WireCrossPoint#0", "pos": { "x": 14.0, - "y": 714.0 + "y": 679.0 }, "params": 1 }, @@ -414,7 +414,7 @@ "name": "WireCrossPoint#2", "pos": { "x": 254.0, - "y": 749.0 + "y": 709.0 }, "params": 1 }, @@ -423,7 +423,7 @@ "name": "WireCrossPoint#3", "pos": { "x": 134.0, - "y": 729.0 + "y": 689.0 }, "params": 1 }, @@ -432,7 +432,7 @@ "name": "WireCrossPoint#4", "pos": { "x": 129.0, - "y": 739.0 + "y": 699.0 }, "params": 1 }, @@ -441,7 +441,7 @@ "name": "WireCrossPoint#5", "pos": { "x": 124.0, - "y": 749.0 + "y": 709.0 }, "params": 1 }, @@ -458,7 +458,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#7", "pos": { - "x": 259.0, + "x": 309.0, "y": 944.0 }, "params": 4 @@ -467,8 +467,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#8", "pos": { - "x": 129.0, - "y": 1049.0 + "x": 104.0, + "y": 1064.0 }, "params": 4 }, @@ -494,8 +494,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#11", "pos": { - "x": 434.0, - "y": 734.0 + "x": 454.0, + "y": 789.0 }, "params": 1 }, @@ -522,7 +522,7 @@ "name": "WireCrossPoint#14", "pos": { "x": 104.0, - "y": 779.0 + "y": 729.0 }, "params": 4 }, @@ -531,7 +531,7 @@ "name": "WireCrossPoint#15", "pos": { "x": 104.0, - "y": 814.0 + "y": 754.0 }, "params": 4 }, @@ -540,7 +540,7 @@ "name": "WireCrossPoint#16", "pos": { "x": 104.0, - "y": 854.0 + "y": 819.0 }, "params": 4 }, @@ -558,7 +558,7 @@ "name": "WireCrossPoint#18", "pos": { "x": 99.0, - "y": 964.0 + "y": 1024.0 }, "params": 1 }, @@ -567,7 +567,7 @@ "name": "WireCrossPoint#19", "pos": { "x": 99.0, - "y": 764.0 + "y": 779.0 }, "params": 1 }, @@ -612,7 +612,7 @@ "name": "WireCrossPoint#24", "pos": { "x": 424.0, - "y": 1079.0 + "y": 1034.0 }, "params": 1 }, @@ -625,6 +625,15 @@ }, "params": 4 }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#26", + "pos": { + "x": 254.0, + "y": 719.0 + }, + "params": 1 + }, { "id": "and", "name": "and#0", @@ -637,7 +646,7 @@ "id": "dff4_we", "name": "dff4_we#0", "pos": { - "x": 220.0, + "x": 280.0, "y": 930.0 } }, @@ -653,7 +662,7 @@ "id": "dlatch4", "name": "dlatch4#1", "pos": { - "x": 260.0, + "x": 280.0, "y": 675.0 } }, @@ -685,8 +694,8 @@ "id": "sel3_4", "name": "sel3_4#0", "pos": { - "x": 145.0, - "y": 725.0 + "x": 185.0, + "y": 685.0 } }, { @@ -891,18 +900,14 @@ "name": "unnamedWire#13", "path": [ { - "x": 230.0, - "y": 715.0 - }, - { - "x": 230.0, - "y": 750.0 + "x": 255.0, + "y": 680.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#2", + "compName": "WireCrossPoint#26", "pinName": "" }, "pin2": { @@ -913,7 +918,7 @@ "path": [ { "x": 715.0, - "y": 750.0 + "y": 720.0 }, { "x": 715.0, @@ -943,34 +948,21 @@ "pinName": "C" }, "name": "unnamedWire#16", - "path": [ - { - "x": 255.0, - "y": 710.0 - } - ] + "path": [] }, { "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { "compName": "dff4_we#0", "pinName": "C" }, + "pin2": { + "compName": "WireCrossPoint#26", + "pinName": "" + }, "name": "unnamedWire#17", "path": [ { "x": 255.0, - "y": 900.0 - }, - { - "x": 210.0, - "y": 900.0 - }, - { - "x": 210.0, "y": 955.0 } ] @@ -1057,7 +1049,7 @@ }, "pin2": { "compName": "sel3_4#0", - "pinName": "SA" + "pinName": "S1" }, "name": "unnamedWire#21", "path": [] @@ -1069,7 +1061,7 @@ }, "pin2": { "compName": "sel3_4#0", - "pinName": "SB" + "pinName": "S2" }, "name": "unnamedWire#22", "path": [] @@ -1081,7 +1073,7 @@ }, "pin2": { "compName": "sel3_4#0", - "pinName": "SC" + "pinName": "S3" }, "name": "unnamedWire#23", "path": [] @@ -1093,7 +1085,7 @@ }, "pin2": { "compName": "sel3_4#1", - "pinName": "SA" + "pinName": "S1" }, "name": "unnamedWire#24", "path": [ @@ -1110,7 +1102,7 @@ }, "pin2": { "compName": "sel3_4#1", - "pinName": "SB" + "pinName": "S2" }, "name": "unnamedWire#25", "path": [ @@ -1122,13 +1114,13 @@ }, { "pin1": { - "compName": "sel3_4#1", - "pinName": "SC" - }, - "pin2": { "compName": "WireCrossPoint#20", "pinName": "" }, + "pin2": { + "compName": "sel3_4#1", + "pinName": "S3" + }, "name": "unnamedWire#26", "path": [ { @@ -1182,14 +1174,31 @@ { "pin1": { "compName": "sel3_4#0", - "pinName": "Y4" + "pinName": "Y" }, "pin2": { - "compName": "Splitter#1", - "pinName": "O3" + "compName": "ram4#0", + "pinName": "D" }, "name": "unnamedWire#29", - "path": [] + "path": [ + { + "x": 250.0, + "y": 740.0 + }, + { + "x": 250.0, + "y": 290.0 + }, + { + "x": 565.0, + "y": 290.0 + }, + { + "x": 565.0, + "y": 210.0 + } + ] }, { "pin1": { @@ -1317,66 +1326,72 @@ }, { "pin1": { - "compName": "sel3_4#0", - "pinName": "Y1" + "compName": "sel3_4#1", + "pinName": "Y" }, "pin2": { - "compName": "Splitter#1", - "pinName": "O0" + "compName": "dff4_we#0", + "pinName": "D" }, "name": "unnamedWire#37", - "path": [] + "path": [ + { + "x": 215.0, + "y": 980.0 + }, + { + "x": 215.0, + "y": 945.0 + } + ] }, { "pin1": { - "compName": "sel3_4#0", - "pinName": "Y2" + "compName": "sel3_4#1", + "pinName": "B" }, "pin2": { - "compName": "Splitter#1", - "pinName": "O1" + "compName": "WireCrossPoint#16", + "pinName": "" }, "name": "unnamedWire#38", - "path": [] + "path": [ + { + "x": 105.0, + "y": 970.0 + } + ] }, { "pin1": { - "compName": "Splitter#1", - "pinName": "O2" + "compName": "Splitter#5", + "pinName": "I" }, "pin2": { - "compName": "sel3_4#0", - "pinName": "Y3" + "compName": "WireCrossPoint#15", + "pinName": "" }, "name": "unnamedWire#39", "path": [] }, { "pin1": { - "compName": "Splitter#1", - "pinName": "I" + "compName": "WireCrossPoint#24", + "pinName": "" }, "pin2": { - "compName": "ram4#0", - "pinName": "D" + "compName": "Splitter#1", + "pinName": "O3" }, "name": "unnamedWire#40", "path": [ { - "x": 200.0, - "y": 745.0 - }, - { - "x": 200.0, - "y": 290.0 - }, - { - "x": 630.0, - "y": 290.0 + "x": 120.0, + "y": 1035.0 }, { - "x": 630.0, - "y": 210.0 + "x": 120.0, + "y": 1040.0 } ] }, @@ -1392,11 +1407,11 @@ "name": "unnamedWire#41", "path": [ { - "x": 255.0, + "x": 275.0, "y": 690.0 }, { - "x": 255.0, + "x": 275.0, "y": 580.0 }, { @@ -1510,72 +1525,81 @@ }, { "pin1": { - "compName": "Splitter#13", - "pinName": "I" + "compName": "Splitter#11", + "pinName": "O3" }, "pin2": { - "compName": "dff4_we#0", - "pinName": "D" + "compName": "Splitter#1", + "pinName": "O2" }, "name": "unnamedWire#48", "path": [] }, { "pin1": { - "compName": "sel3_4#1", - "pinName": "Y4" + "compName": "Splitter#11", + "pinName": "O2" }, "pin2": { - "compName": "Splitter#13", - "pinName": "O3" + "compName": "Splitter#1", + "pinName": "O1" }, "name": "unnamedWire#49", "path": [] }, { "pin1": { - "compName": "sel3_4#1", - "pinName": "Y3" + "compName": "Splitter#11", + "pinName": "O1" }, "pin2": { - "compName": "Splitter#13", - "pinName": "O2" + "compName": "Splitter#1", + "pinName": "O0" }, "name": "unnamedWire#50", "path": [] }, { "pin1": { - "compName": "sel3_4#1", - "pinName": "Y2" + "compName": "Splitter#1", + "pinName": "I" }, "pin2": { - "compName": "Splitter#13", - "pinName": "O1" + "compName": "sel3_4#1", + "pinName": "C" }, "name": "unnamedWire#51", - "path": [] + "path": [ + { + "x": 145.0, + "y": 1055.0 + }, + { + "x": 145.0, + "y": 980.0 + } + ] }, { "pin1": { - "compName": "sel3_4#1", - "pinName": "B4" + "compName": "WireCrossPoint#18", + "pinName": "" }, "pin2": { - "compName": "Splitter#8", - "pinName": "O3" + "compName": "Splitter#6", + "pinName": "O0" }, "name": "unnamedWire#52", "path": [] }, { "pin1": { - "compName": "Splitter#8", - "pinName": "O2" + "compName": "Splitter#10", + "pinName": "O0" }, "pin2": { - "compName": "sel3_4#1", - "pinName": "B3" + "compName": "Splitter#6", + "pinName": "O1" }, "name": "unnamedWire#53", "path": [] @@ -1597,30 +1621,30 @@ }, { "x": 80.0, - "y": 965.0 + "y": 1025.0 } ] }, { "pin1": { - "compName": "Splitter#11", - "pinName": "O2" + "compName": "Splitter#10", + "pinName": "O1" }, "pin2": { - "compName": "sel3_4#1", - "pinName": "C2" + "compName": "Splitter#6", + "pinName": "O2" }, "name": "unnamedWire#55", "path": [] }, { "pin1": { - "compName": "Splitter#11", - "pinName": "O1" + "compName": "Splitter#10", + "pinName": "O2" }, "pin2": { - "compName": "sel3_4#1", - "pinName": "C1" + "compName": "Splitter#6", + "pinName": "O3" }, "name": "unnamedWire#56", "path": [] @@ -1649,12 +1673,12 @@ "name": "unnamedWire#58", "path": [ { - "x": 130.0, - "y": 1090.0 + "x": 105.0, + "y": 1100.0 }, { - "x": 260.0, - "y": 1090.0 + "x": 310.0, + "y": 1100.0 } ] }, @@ -1704,7 +1728,7 @@ }, { "x": 75.0, - "y": 765.0 + "y": 780.0 } ] }, @@ -1720,8 +1744,8 @@ "name": "unnamedWire#62", "path": [ { - "x": 130.0, - "y": 980.0 + "x": 105.0, + "y": 1000.0 } ] }, @@ -1739,48 +1763,57 @@ }, { "pin1": { - "compName": "sel3_4#1", - "pinName": "B2" + "compName": "Splitter#6", + "pinName": "I" }, "pin2": { - "compName": "Splitter#8", - "pinName": "O1" + "compName": "sel3_4#1", + "pinName": "A" }, "name": "unnamedWire#64", - "path": [] + "path": [ + { + "x": 140.0, + "y": 1010.0 + }, + { + "x": 140.0, + "y": 960.0 + } + ] }, { "pin1": { - "compName": "Splitter#8", - "pinName": "O0" + "compName": "WireCrossPoint#26", + "pinName": "" }, "pin2": { - "compName": "sel3_4#1", - "pinName": "B1" + "compName": "WireCrossPoint#2", + "pinName": "" }, "name": "unnamedWire#65", "path": [] }, { "pin1": { - "compName": "Splitter#10", + "compName": "Splitter#5", "pinName": "O0" }, "pin2": { - "compName": "sel3_4#1", - "pinName": "A2" + "compName": "Splitter#8", + "pinName": "O1" }, "name": "unnamedWire#66", "path": [] }, { "pin1": { - "compName": "Splitter#11", - "pinName": "O3" + "compName": "Splitter#5", + "pinName": "O1" }, "pin2": { - "compName": "sel3_4#1", - "pinName": "C3" + "compName": "Splitter#8", + "pinName": "O2" }, "name": "unnamedWire#67", "path": [] @@ -1812,15 +1845,24 @@ }, { "pin1": { - "compName": "Splitter#13", - "pinName": "O0" + "compName": "Splitter#8", + "pinName": "I" }, "pin2": { - "compName": "sel3_4#1", - "pinName": "Y1" + "compName": "sel3_4#0", + "pinName": "A" }, "name": "unnamedWire#69", - "path": [] + "path": [ + { + "x": 170.0, + "y": 765.0 + }, + { + "x": 170.0, + "y": 720.0 + } + ] }, { "pin1": { @@ -1892,7 +1934,7 @@ { "pin1": { "compName": "Splitter#4", - "pinName": "O0" + "pinName": "O3" }, "pin2": { "compName": "or4#0", @@ -1911,7 +1953,12 @@ "pinName": "" }, "name": "unnamedWire#74", - "path": [] + "path": [ + { + "x": 455.0, + "y": 735.0 + } + ] }, { "pin1": { @@ -1931,30 +1978,18 @@ "pinName": "" }, "pin2": { - "compName": "sel3_4#0", - "pinName": "C4" + "compName": "Splitter#13", + "pinName": "O3" }, "name": "unnamedWire#76", "path": [ { - "x": 435.0, - "y": 795.0 + "x": 150.0, + "y": 790.0 }, { - "x": 195.0, + "x": 150.0, "y": 795.0 - }, - { - "x": 195.0, - "y": 880.0 - }, - { - "x": 140.0, - "y": 880.0 - }, - { - "x": 140.0, - "y": 870.0 } ] }, @@ -1969,10 +2004,6 @@ }, "name": "unnamedWire#77", "path": [ - { - "x": 455.0, - "y": 735.0 - }, { "x": 455.0, "y": 1100.0 @@ -1981,20 +2012,20 @@ }, { "pin1": { - "compName": "Splitter#4", - "pinName": "O1" - }, - "pin2": { "compName": "or4#0", "pinName": "A2" }, + "pin2": { + "compName": "Splitter#4", + "pinName": "O2" + }, "name": "unnamedWire#78", "path": [] }, { "pin1": { "compName": "Splitter#4", - "pinName": "O2" + "pinName": "O1" }, "pin2": { "compName": "or4#0", @@ -2005,13 +2036,13 @@ }, { "pin1": { - "compName": "Splitter#4", - "pinName": "O3" - }, - "pin2": { "compName": "or4#0", "pinName": "A4" }, + "pin2": { + "compName": "Splitter#4", + "pinName": "O0" + }, "name": "unnamedWire#80", "path": [] }, @@ -2079,135 +2110,79 @@ "pinName": "" }, "pin2": { - "compName": "Splitter#5", - "pinName": "I" + "compName": "sel3_4#0", + "pinName": "B" }, "name": "unnamedWire#85", "path": [] }, { "pin1": { - "compName": "sel3_4#0", - "pinName": "A4" - }, - "pin2": { "compName": "Splitter#5", "pinName": "O2" }, - "name": "unnamedWire#86", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#5", - "pinName": "O1" - }, "pin2": { - "compName": "sel3_4#0", - "pinName": "A3" + "compName": "Splitter#8", + "pinName": "O3" }, - "name": "unnamedWire#87", + "name": "unnamedWire#86", "path": [] }, { "pin1": { - "compName": "Splitter#5", - "pinName": "O0" + "compName": "WireCrossPoint#19", + "pinName": "" }, "pin2": { - "compName": "sel3_4#0", - "pinName": "A2" - }, - "name": "unnamedWire#88", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#6", + "compName": "Splitter#8", "pinName": "O0" }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "B1" - }, - "name": "unnamedWire#89", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#6", - "pinName": "O1" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "B2" - }, - "name": "unnamedWire#90", + "name": "unnamedWire#87", "path": [] }, { "pin1": { - "compName": "Splitter#6", - "pinName": "O2" + "compName": "Splitter#13", + "pinName": "I" }, "pin2": { "compName": "sel3_4#0", - "pinName": "B3" - }, - "name": "unnamedWire#91", - "path": [] - }, - { - "pin1": { - "compName": "sel3_4#1", - "pinName": "A1" - }, - "pin2": { - "compName": "WireCrossPoint#18", - "pinName": "" + "pinName": "C" }, - "name": "unnamedWire#92", + "name": "unnamedWire#88", "path": [ { - "x": 100.0, - "y": 960.0 + "x": 180.0, + "y": 810.0 + }, + { + "x": 180.0, + "y": 740.0 } ] }, { "pin1": { - "compName": "Splitter#6", - "pinName": "O3" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "B4" - }, - "name": "unnamedWire#93", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#6", - "pinName": "I" + "compName": "Splitter#7", + "pinName": "O1" }, "pin2": { - "compName": "WireCrossPoint#15", - "pinName": "" + "compName": "Splitter#13", + "pinName": "O0" }, - "name": "unnamedWire#94", + "name": "unnamedWire#89", "path": [] }, { "pin1": { - "compName": "WireCrossPoint#15", - "pinName": "" + "compName": "Splitter#7", + "pinName": "O2" }, "pin2": { - "compName": "WireCrossPoint#14", - "pinName": "" + "compName": "Splitter#13", + "pinName": "O1" }, - "name": "unnamedWire#95", + "name": "unnamedWire#90", "path": [] }, { @@ -2216,34 +2191,22 @@ "pinName": "O3" }, "pin2": { - "compName": "sel3_4#0", - "pinName": "C3" - }, - "name": "unnamedWire#96", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#7", + "compName": "Splitter#13", "pinName": "O2" }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "C2" - }, - "name": "unnamedWire#97", + "name": "unnamedWire#91", "path": [] }, { "pin1": { - "compName": "Splitter#7", - "pinName": "O1" + "compName": "WireCrossPoint#15", + "pinName": "" }, "pin2": { - "compName": "sel3_4#0", - "pinName": "C1" + "compName": "WireCrossPoint#14", + "pinName": "" }, - "name": "unnamedWire#98", + "name": "unnamedWire#92", "path": [] }, { @@ -2255,7 +2218,7 @@ "compName": "WireCrossPoint#16", "pinName": "" }, - "name": "unnamedWire#99", + "name": "unnamedWire#93", "path": [] }, { @@ -2267,50 +2230,9 @@ "compName": "Splitter#7", "pinName": "I" }, - "name": "unnamedWire#100", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#10", - "pinName": "O1" - }, - "pin2": { - "compName": "sel3_4#1", - "pinName": "A3" - }, - "name": "unnamedWire#101", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#10", - "pinName": "O2" - }, - "pin2": { - "compName": "sel3_4#1", - "pinName": "A4" - }, - "name": "unnamedWire#102", + "name": "unnamedWire#94", "path": [] }, - { - "pin1": { - "compName": "Splitter#8", - "pinName": "I" - }, - "pin2": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "name": "unnamedWire#103", - "path": [ - { - "x": 105.0, - "y": 1015.0 - } - ] - }, { "pin1": { "compName": "WireCrossPoint#25", @@ -2320,7 +2242,7 @@ "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", "pinName": "F" }, - "name": "unnamedWire#104", + "name": "unnamedWire#95", "path": [ { "x": 610.0, @@ -2341,7 +2263,7 @@ "compName": "TriStateBuffer#0", "pinName": "IN" }, - "name": "unnamedWire#105", + "name": "unnamedWire#96", "path": [] }, { @@ -2353,7 +2275,7 @@ "compName": "and#0", "pinName": "A" }, - "name": "unnamedWire#106", + "name": "unnamedWire#97", "path": [] }, { @@ -2365,7 +2287,7 @@ "compName": "and#0", "pinName": "B" }, - "name": "unnamedWire#107" + "name": "unnamedWire#98" }, { "pin1": { @@ -2376,7 +2298,7 @@ "compName": "ram4#0", "pinName": "WE" }, - "name": "unnamedWire#108", + "name": "unnamedWire#99", "path": [ { "x": 630.0, @@ -2397,7 +2319,7 @@ "compName": "dff4_we#0", "pinName": "WE" }, - "name": "unnamedWire#109", + "name": "unnamedWire#100", "path": [ { "x": 450.0, @@ -2408,11 +2330,11 @@ "y": 245.0 }, { - "x": 215.0, + "x": 270.0, "y": 245.0 }, { - "x": 215.0, + "x": 270.0, "y": 935.0 } ] @@ -2426,7 +2348,7 @@ "compName": "TriStateBuffer#2", "pinName": "IN" }, - "name": "unnamedWire#110", + "name": "unnamedWire#101", "path": [] }, { @@ -2438,7 +2360,7 @@ "compName": "WireCrossPoint#17", "pinName": "" }, - "name": "unnamedWire#111", + "name": "unnamedWire#102", "path": [] }, { @@ -2450,7 +2372,7 @@ "compName": "NandGate#1", "pinName": "A" }, - "name": "unnamedWire#112", + "name": "unnamedWire#103", "path": [ { "x": 415.0, @@ -2467,7 +2389,7 @@ "compName": "NandGate#1", "pinName": "B" }, - "name": "unnamedWire#113", + "name": "unnamedWire#104", "path": [ { "x": 415.0, @@ -2484,7 +2406,7 @@ "compName": "_submodelinterface", "pinName": "F\u003d0" }, - "name": "unnamedWire#114", + "name": "unnamedWire#105", "path": [ { "x": 445.0, @@ -2513,7 +2435,7 @@ "compName": "TriStateBuffer#0", "pinName": "OUT" }, - "name": "unnamedWire#115", + "name": "unnamedWire#106", "path": [ { "x": 100.0, @@ -2538,26 +2460,9 @@ "compName": "Splitter#9", "pinName": "I" }, - "name": "unnamedWire#116", + "name": "unnamedWire#107", "path": [] }, - { - "pin1": { - "compName": "WireCrossPoint#19", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "A1" - }, - "name": "unnamedWire#117", - "path": [ - { - "x": 100.0, - "y": 760.0 - } - ] - }, { "pin1": { "compName": "WireCrossPoint#19", @@ -2567,7 +2472,7 @@ "compName": "TriStateBuffer#1", "pinName": "OUT" }, - "name": "unnamedWire#118", + "name": "unnamedWire#108", "path": [ { "x": 100.0, @@ -2588,7 +2493,7 @@ "compName": "WireCrossPoint#5", "pinName": "" }, - "name": "unnamedWire#119", + "name": "unnamedWire#109", "path": [] }, { @@ -2600,7 +2505,7 @@ "compName": "TriStateBuffer#1", "pinName": "EN" }, - "name": "unnamedWire#120", + "name": "unnamedWire#110", "path": [ { "x": 395.0, @@ -2621,7 +2526,7 @@ "compName": "TriStateBuffer#0", "pinName": "EN" }, - "name": "unnamedWire#121", + "name": "unnamedWire#111", "path": [] }, { @@ -2633,7 +2538,7 @@ "compName": "WireCrossPoint#20", "pinName": "" }, - "name": "unnamedWire#122", + "name": "unnamedWire#112", "path": [] }, { @@ -2645,7 +2550,7 @@ "compName": "WireCrossPoint#3", "pinName": "" }, - "name": "unnamedWire#123", + "name": "unnamedWire#113", "path": [] }, { @@ -2657,7 +2562,7 @@ "compName": "WireCrossPoint#23", "pinName": "" }, - "name": "unnamedWire#124", + "name": "unnamedWire#114", "path": [] }, { @@ -2669,30 +2574,9 @@ "compName": "WireCrossPoint#23", "pinName": "" }, - "name": "unnamedWire#125", + "name": "unnamedWire#115", "path": [] }, - { - "pin1": { - "compName": "sel3_4#1", - "pinName": "C4" - }, - "pin2": { - "compName": "WireCrossPoint#24", - "pinName": "" - }, - "name": "unnamedWire#126", - "path": [ - { - "x": 145.0, - "y": 1070.0 - }, - { - "x": 145.0, - "y": 1080.0 - } - ] - }, { "pin1": { "compName": "WireCrossPoint#24", @@ -2702,7 +2586,7 @@ "compName": "TriStateBuffer#2", "pinName": "OUT" }, - "name": "unnamedWire#127", + "name": "unnamedWire#116", "path": [ { "x": 425.0, @@ -2719,7 +2603,7 @@ "compName": "_submodelinterface", "pinName": "Qn+3" }, - "name": "unnamedWire#128", + "name": "unnamedWire#117", "path": [ { "x": 425.0, @@ -2736,7 +2620,7 @@ "compName": "WireCrossPoint#25", "pinName": "" }, - "name": "unnamedWire#129", + "name": "unnamedWire#118", "path": [] }, { @@ -2748,7 +2632,7 @@ "compName": "Am2901DestDecode#0", "pinName": "I" }, - "name": "unnamedWire#130", + "name": "unnamedWire#119", "path": [ { "x": 835.0, diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json index 751a50e6..e0b88db7 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json @@ -99,8 +99,8 @@ "id": "Am2901SourceDecode", "name": "Am2901SourceDecode#0", "pos": { - "x": 155.0, - "y": 155.0 + "x": 150.0, + "y": 160.0 } }, { @@ -139,113 +139,14 @@ "orientation": "UP" } }, - { - "id": "Splitter", - "name": "Splitter#3", - "pos": { - "x": 220.0, - "y": 105.0 - }, - "params": { - "logicWidth": 4, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#4", - "pos": { - "x": 275.0, - "y": 85.0 - }, - "params": { - "logicWidth": 4, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#5", - "pos": { - "x": 195.0, - "y": 220.0 - }, - "params": { - "logicWidth": 4, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#6", - "pos": { - "x": 220.0, - "y": 260.0 - }, - "params": { - "logicWidth": 4, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#7", - "pos": { - "x": 220.0, - "y": 300.0 - }, - "params": { - "logicWidth": 4, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#8", - "pos": { - "x": 275.0, - "y": 190.0 - }, - "params": { - "logicWidth": 4, - "orientation": "LEFT" - } - }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", "pos": { - "x": 209.0, - "y": 219.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 214.0, - "y": 229.0 + "x": 89.0, + "y": 179.0 }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 219.0, - "y": 239.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 224.0, - "y": 249.0 - }, - "params": 1 + "params": 4 }, { "id": "sel2_4", @@ -260,7 +161,7 @@ "name": "sel3_4#0", "pos": { "x": 235.0, - "y": 185.0 + "y": 190.0 } } ], @@ -293,11 +194,11 @@ "y": 60.0 }, { - "x": 290.0, + "x": 295.0, "y": 60.0 }, { - "x": 290.0, + "x": 295.0, "y": 115.0 } ] @@ -330,12 +231,12 @@ "y": 50.0 }, { - "x": 150.0, + "x": 145.0, "y": 50.0 }, { - "x": 150.0, - "y": 170.0 + "x": 145.0, + "y": 175.0 } ] }, @@ -358,13 +259,13 @@ }, "pin2": { "compName": "sel2_4#0", - "pinName": "SB" + "pinName": "S2" }, "name": "unnamedWire#5", "path": [ { "x": 205.0, - "y": 170.0 + "y": 175.0 }, { "x": 205.0, @@ -374,303 +275,114 @@ }, { "pin1": { - "compName": "Splitter#3", - "pinName": "O3" - }, - "pin2": { - "compName": "sel2_4#0", - "pinName": "A4" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O2" - }, - "pin2": { - "compName": "sel2_4#0", - "pinName": "A3" - }, - "name": "unnamedWire#7", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O1" - }, - "pin2": { - "compName": "sel2_4#0", - "pinName": "A2" - }, - "name": "unnamedWire#8", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O0" + "compName": "_submodelinterface", + "pinName": "D" }, "pin2": { "compName": "sel2_4#0", - "pinName": "A1" - }, - "name": "unnamedWire#9", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", "pinName": "A" }, - "pin2": { - "compName": "Splitter#5", - "pinName": "I" - }, - "name": "unnamedWire#10", + "name": "unnamedWire#6", "path": [ { - "x": 90.0, - "y": 180.0 + "x": 20.0, + "y": 40.0 }, { - "x": 90.0, - "y": 235.0 + "x": 20.0, + "y": 105.0 } ] }, - { - "pin1": { - "compName": "Splitter#5", - "pinName": "O3" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#11", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#5", - "pinName": "O2" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#12", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#5", - "pinName": "O1" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#13", - "path": [] - }, { "pin1": { "compName": "WireCrossPoint#0", "pinName": "" }, "pin2": { - "compName": "sel2_4#0", - "pinName": "B1" + "compName": "sel3_4#0", + "pinName": "A" }, - "name": "unnamedWire#14", + "name": "unnamedWire#7", "path": [ { - "x": 210.0, - "y": 145.0 + "x": 90.0, + "y": 225.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" + "compName": "_submodelinterface", + "pinName": "B" }, "pin2": { - "compName": "sel2_4#0", - "pinName": "B2" + "compName": "sel3_4#0", + "pinName": "B" }, - "name": "unnamedWire#15", + "name": "unnamedWire#8", "path": [ { - "x": 215.0, - "y": 155.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "sel2_4#0", - "pinName": "B3" - }, - "name": "unnamedWire#16", - "path": [ + "x": 35.0, + "y": 280.0 + }, { - "x": 220.0, - "y": 165.0 + "x": 35.0, + "y": 235.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" + "compName": "_submodelinterface", + "pinName": "Q" }, "pin2": { - "compName": "sel2_4#0", - "pinName": "B4" + "compName": "sel3_4#0", + "pinName": "C" }, - "name": "unnamedWire#17", + "name": "unnamedWire#9", "path": [ { - "x": 225.0, - "y": 175.0 + "x": 45.0, + "y": 320.0 + }, + { + "x": 45.0, + "y": 245.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "A1" - }, - "name": "unnamedWire#18", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "A2" - }, - "name": "unnamedWire#19", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "A3" - }, - "name": "unnamedWire#20", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "A4" - }, - "name": "unnamedWire#21", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#5", - "pinName": "O0" + "compName": "_submodelinterface", + "pinName": "A" }, "pin2": { "compName": "WireCrossPoint#0", "pinName": "" }, - "name": "unnamedWire#22", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#6", - "pinName": "O3" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "B4" - }, - "name": "unnamedWire#23", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#6", - "pinName": "O2" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "B3" - }, - "name": "unnamedWire#24", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#6", - "pinName": "O1" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "B2" - }, - "name": "unnamedWire#25", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#7", - "pinName": "O0" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "C1" - }, - "name": "unnamedWire#26", + "name": "unnamedWire#10", "path": [] }, { "pin1": { "compName": "sel3_4#0", - "pinName": "SC" + "pinName": "Y" }, "pin2": { - "compName": "Am2901SourceDecode#0", - "pinName": "SQ" + "compName": "Am2901ALUInclDecode#0", + "pinName": "S" }, - "name": "unnamedWire#27", + "name": "unnamedWire#11", "path": [ { - "x": 200.0, - "y": 210.0 + "x": 305.0, + "y": 245.0 }, { - "x": 200.0, - "y": 160.0 + "x": 305.0, + "y": 80.0 } ] }, @@ -681,13 +393,13 @@ }, "pin2": { "compName": "sel2_4#0", - "pinName": "SA" + "pinName": "S1" }, - "name": "unnamedWire#28", + "name": "unnamedWire#12", "path": [ { "x": 195.0, - "y": 200.0 + "y": 205.0 }, { "x": 195.0, @@ -698,183 +410,104 @@ { "pin1": { "compName": "Am2901SourceDecode#0", - "pinName": "SB" + "pinName": "SQ" }, "pin2": { "compName": "sel3_4#0", - "pinName": "SB" + "pinName": "S3" }, - "name": "unnamedWire#29", + "name": "unnamedWire#13", "path": [ { - "x": 205.0, - "y": 180.0 + "x": 200.0, + "y": 165.0 }, { - "x": 205.0, - "y": 200.0 + "x": 200.0, + "y": 215.0 } ] }, { "pin1": { - "compName": "sel3_4#0", + "compName": "Am2901SourceDecode#0", "pinName": "SA" }, "pin2": { - "compName": "Am2901SourceDecode#0", - "pinName": "SA" + "compName": "sel3_4#0", + "pinName": "S1" }, - "name": "unnamedWire#30", + "name": "unnamedWire#14", "path": [] }, { "pin1": { - "compName": "Am2901ALUInclDecode#0", - "pinName": "F" + "compName": "WireCrossPoint#0", + "pinName": "" }, "pin2": { - "compName": "_submodelinterface", - "pinName": "F" + "compName": "sel2_4#0", + "pinName": "B" }, - "name": "unnamedWire#31", - "path": [] + "name": "unnamedWire#15", + "path": [ + { + "x": 90.0, + "y": 125.0 + } + ] }, { "pin1": { - "compName": "Splitter#4", - "pinName": "I" + "compName": "Am2901SourceDecode#0", + "pinName": "SB" }, "pin2": { - "compName": "Am2901ALUInclDecode#0", - "pinName": "R" + "compName": "sel3_4#0", + "pinName": "S2" }, - "name": "unnamedWire#32", + "name": "unnamedWire#16", "path": [ { - "x": 300.0, - "y": 100.0 + "x": 205.0, + "y": 185.0 }, { - "x": 300.0, - "y": 50.0 + "x": 205.0, + "y": 205.0 } ] }, { "pin1": { - "compName": "sel2_4#0", - "pinName": "Y4" - }, - "pin2": { - "compName": "Splitter#4", - "pinName": "O3" - }, - "name": "unnamedWire#33", - "path": [] - }, - { - "pin1": { - "compName": "sel2_4#0", - "pinName": "Y3" - }, - "pin2": { - "compName": "Splitter#4", - "pinName": "O2" - }, - "name": "unnamedWire#34", - "path": [] - }, - { - "pin1": { - "compName": "sel2_4#0", - "pinName": "Y2" + "compName": "Am2901ALUInclDecode#0", + "pinName": "F" }, "pin2": { - "compName": "Splitter#4", - "pinName": "O1" + "compName": "_submodelinterface", + "pinName": "F" }, - "name": "unnamedWire#35", + "name": "unnamedWire#17", "path": [] }, { "pin1": { - "compName": "Splitter#4", - "pinName": "O0" - }, - "pin2": { "compName": "sel2_4#0", - "pinName": "Y1" - }, - "name": "unnamedWire#36", - "path": [] - }, - { - "pin1": { - "compName": "sel3_4#0", - "pinName": "Y4" - }, - "pin2": { - "compName": "Splitter#8", - "pinName": "O3" - }, - "name": "unnamedWire#37", - "path": [] - }, - { - "pin1": { - "compName": "sel3_4#0", - "pinName": "Y3" - }, - "pin2": { - "compName": "Splitter#8", - "pinName": "O2" - }, - "name": "unnamedWire#38", - "path": [] - }, - { - "pin1": { - "compName": "sel3_4#0", - "pinName": "Y2" - }, - "pin2": { - "compName": "Splitter#8", - "pinName": "O1" - }, - "name": "unnamedWire#39", - "path": [] - }, - { - "pin1": { - "compName": "sel3_4#0", - "pinName": "Y1" - }, - "pin2": { - "compName": "Splitter#8", - "pinName": "O0" - }, - "name": "unnamedWire#40", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#8", - "pinName": "I" + "pinName": "Y" }, "pin2": { "compName": "Am2901ALUInclDecode#0", - "pinName": "S" + "pinName": "R" }, - "name": "unnamedWire#41", + "name": "unnamedWire#18", "path": [ { - "x": 305.0, - "y": 205.0 + "x": 300.0, + "y": 105.0 }, { - "x": 305.0, - "y": 80.0 + "x": 300.0, + "y": 50.0 } ] }, @@ -887,7 +520,7 @@ "compName": "_submodelinterface", "pinName": "Cn+4" }, - "name": "unnamedWire#42", + "name": "unnamedWire#19", "path": [ { "x": 365.0, @@ -908,7 +541,7 @@ "compName": "_submodelinterface", "pinName": "OVR" }, - "name": "unnamedWire#43", + "name": "unnamedWire#20", "path": [ { "x": 360.0, @@ -929,7 +562,7 @@ "compName": "Splitter#2", "pinName": "O0" }, - "name": "unnamedWire#44", + "name": "unnamedWire#21", "path": [] }, { @@ -941,7 +574,7 @@ "compName": "Splitter#1", "pinName": "O1" }, - "name": "unnamedWire#45", + "name": "unnamedWire#22", "path": [] }, { @@ -953,7 +586,7 @@ "compName": "Splitter#1", "pinName": "O0" }, - "name": "unnamedWire#46", + "name": "unnamedWire#23", "path": [] }, { @@ -965,7 +598,7 @@ "compName": "Am2901ALUInclDecode#0", "pinName": "I" }, - "name": "unnamedWire#47", + "name": "unnamedWire#24", "path": [ { "x": 185.0, @@ -990,119 +623,8 @@ "compName": "_submodelinterface", "pinName": "I" }, - "name": "unnamedWire#48", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#3", - "pinName": "I" - }, - "name": "unnamedWire#49", - "path": [ - { - "x": 25.0, - "y": 40.0 - }, - { - "x": 25.0, - "y": 120.0 - } - ] - }, - { - "pin1": { - "compName": "sel3_4#0", - "pinName": "B1" - }, - "pin2": { - "compName": "Splitter#6", - "pinName": "O0" - }, - "name": "unnamedWire#50", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#6", - "pinName": "I" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "B" - }, - "name": "unnamedWire#51", - "path": [ - { - "x": 215.0, - "y": 275.0 - }, - { - "x": 215.0, - "y": 280.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#7", - "pinName": "O1" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "C2" - }, - "name": "unnamedWire#52", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#7", - "pinName": "O2" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "C3" - }, - "name": "unnamedWire#53", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#7", - "pinName": "O3" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "C4" - }, - "name": "unnamedWire#54", + "name": "unnamedWire#25", "path": [] - }, - { - "pin1": { - "compName": "Splitter#7", - "pinName": "I" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Q" - }, - "name": "unnamedWire#55", - "path": [ - { - "x": 215.0, - "y": 315.0 - }, - { - "x": 215.0, - "y": 320.0 - } - ] } ], "version": "0.1.1" diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel2_4.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel2_4.json index 444d02b9..aa99aaf4 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel2_4.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel2_4.json @@ -1,23 +1,14 @@ { - "width": 35.0, - "height": 100.0, + "width": 55.0, + "height": 80.0, "interfacePins": [ { "location": { "x": 0.0, "y": 25.0 }, - "name": "A1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 35.0 - }, - "name": "A2", - "logicWidth": 1, + "name": "A", + "logicWidth": 4, "usage": "INPUT" }, { @@ -25,53 +16,8 @@ "x": 0.0, "y": 45.0 }, - "name": "A3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 55.0 - }, - "name": "A4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 65.0 - }, - "name": "B1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 75.0 - }, - "name": "B2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 85.0 - }, - "name": "B3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 95.0 - }, - "name": "B4", - "logicWidth": 1, + "name": "B", + "logicWidth": 4, "usage": "INPUT" }, { @@ -79,7 +25,7 @@ "x": 0.0, "y": 5.0 }, - "name": "SA", + "name": "S1", "logicWidth": 1, "usage": "INPUT" }, @@ -88,44 +34,17 @@ "x": 0.0, "y": 15.0 }, - "name": "SB", + "name": "S2", "logicWidth": 1, "usage": "INPUT" }, { "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "Y1", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "Y2", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, + "x": 55.0, "y": 25.0 }, - "name": "Y3", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 35.0 - }, - "name": "Y4", - "logicWidth": 1, + "name": "Y", + "logicWidth": 4, "usage": "OUTPUT" } ], @@ -136,7 +55,7 @@ "id": "NandGate", "name": "NandGate#0", "pos": { - "x": 20.0, + "x": 50.0, "y": 2.5 }, "params": 1 @@ -145,7 +64,7 @@ "id": "NandGate", "name": "NandGate#1", "pos": { - "x": 20.0, + "x": 50.0, "y": 52.5 }, "params": 1 @@ -154,7 +73,7 @@ "id": "NandGate", "name": "NandGate#2", "pos": { - "x": 20.0, + "x": 50.0, "y": 102.5 }, "params": 1 @@ -163,7 +82,7 @@ "id": "NandGate", "name": "NandGate#3", "pos": { - "x": 20.0, + "x": 50.0, "y": 152.5 }, "params": 1 @@ -172,7 +91,7 @@ "id": "NandGate", "name": "NandGate#4", "pos": { - "x": 20.0, + "x": 50.0, "y": 27.5 }, "params": 1 @@ -181,7 +100,7 @@ "id": "NandGate", "name": "NandGate#5", "pos": { - "x": 20.0, + "x": 50.0, "y": 77.5 }, "params": 1 @@ -190,7 +109,7 @@ "id": "NandGate", "name": "NandGate#6", "pos": { - "x": 20.0, + "x": 50.0, "y": 127.5 }, "params": 1 @@ -199,7 +118,7 @@ "id": "NandGate", "name": "NandGate#7", "pos": { - "x": 20.0, + "x": 50.0, "y": 177.5 }, "params": 1 @@ -208,8 +127,8 @@ "id": "NandGate", "name": "NandGate#8", "pos": { - "x": 65.0, - "y": 2.5 + "x": 80.0, + "y": 7.5 }, "params": 1 }, @@ -217,8 +136,8 @@ "id": "NandGate", "name": "NandGate#9", "pos": { - "x": 65.0, - "y": 27.5 + "x": 80.0, + "y": 57.5 }, "params": 1 }, @@ -226,8 +145,8 @@ "id": "NandGate", "name": "NandGate#10", "pos": { - "x": 65.0, - "y": 52.5 + "x": 80.0, + "y": 107.5 }, "params": 1 }, @@ -235,16 +154,52 @@ "id": "NandGate", "name": "NandGate#11", "pos": { - "x": 65.0, - "y": 77.5 + "x": 80.0, + "y": 157.5 }, "params": 1 }, + { + "id": "Splitter", + "name": "Splitter#0", + "pos": { + "x": 5.0, + "y": 47.5 + }, + "params": { + "logicWidth": 4, + "orientation": "RIGHT" + } + }, + { + "id": "Splitter", + "name": "Splitter#1", + "pos": { + "x": 5.0, + "y": 97.5 + }, + "params": { + "logicWidth": 4, + "orientation": "RIGHT" + } + }, + { + "id": "Splitter", + "name": "Splitter#2", + "pos": { + "x": 120.0, + "y": 47.5 + }, + "params": { + "logicWidth": 4, + "orientation": "LEFT" + } + }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", "pos": { - "x": 6.5, + "x": 44.0, "y": 16.5 }, "params": 1 @@ -253,7 +208,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#1", "pos": { - "x": 6.5, + "x": 44.0, "y": 66.5 }, "params": 1 @@ -262,7 +217,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#2", "pos": { - "x": 6.5, + "x": 44.0, "y": 116.5 }, "params": 1 @@ -271,7 +226,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#3", "pos": { - "x": 4.0, + "x": 39.0, "y": 41.5 }, "params": 1 @@ -280,7 +235,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#4", "pos": { - "x": 4.0, + "x": 39.0, "y": 91.5 }, "params": 1 @@ -289,7 +244,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#5", "pos": { - "x": 4.0, + "x": 39.0, "y": 141.5 }, "params": 1 @@ -298,8 +253,8 @@ "wires": [ { "pin1": { - "compName": "_submodelinterface", - "pinName": "A1" + "compName": "Splitter#0", + "pinName": "O3" }, "pin2": { "compName": "NandGate#0", @@ -308,40 +263,31 @@ "name": "unnamedWire#0", "path": [ { - "x": 15.0, - "y": 62.5 + "x": 20.0, + "y": 47.5 }, { - "x": 15.0, + "x": 20.0, "y": 7.5 } ] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "A2" + "compName": "Splitter#0", + "pinName": "O2" }, "pin2": { "compName": "NandGate#1", "pinName": "A" }, "name": "unnamedWire#1", - "path": [ - { - "x": 17.5, - "y": 87.5 - }, - { - "x": 17.5, - "y": 57.5 - } - ] + "path": [] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "A3" + "compName": "Splitter#0", + "pinName": "O1" }, "pin2": { "compName": "NandGate#2", @@ -350,19 +296,19 @@ "name": "unnamedWire#2", "path": [ { - "x": 17.5, - "y": 112.5 + "x": 35.0, + "y": 67.5 }, { - "x": 17.5, + "x": 35.0, "y": 107.5 } ] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "A4" + "compName": "Splitter#0", + "pinName": "O0" }, "pin2": { "compName": "NandGate#3", @@ -371,19 +317,19 @@ "name": "unnamedWire#3", "path": [ { - "x": 17.5, - "y": 137.5 + "x": 30.0, + "y": 77.5 }, { - "x": 17.5, + "x": 30.0, "y": 157.5 } ] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "B1" + "compName": "Splitter#1", + "pinName": "O3" }, "pin2": { "compName": "NandGate#4", @@ -392,19 +338,19 @@ "name": "unnamedWire#4", "path": [ { - "x": 10.0, - "y": 162.5 + "x": 25.0, + "y": 97.5 }, { - "x": 10.0, + "x": 25.0, "y": 32.5 } ] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "B2" + "compName": "Splitter#1", + "pinName": "O2" }, "pin2": { "compName": "NandGate#5", @@ -413,19 +359,19 @@ "name": "unnamedWire#5", "path": [ { - "x": 12.5, - "y": 187.5 + "x": 20.0, + "y": 107.5 }, { - "x": 12.5, + "x": 20.0, "y": 82.5 } ] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "B3" + "compName": "Splitter#1", + "pinName": "O1" }, "pin2": { "compName": "NandGate#6", @@ -434,19 +380,19 @@ "name": "unnamedWire#6", "path": [ { - "x": 15.0, - "y": 212.5 + "x": 25.0, + "y": 117.5 }, { - "x": 15.0, + "x": 25.0, "y": 132.5 } ] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "B4" + "compName": "Splitter#1", + "pinName": "O0" }, "pin2": { "compName": "NandGate#7", @@ -455,11 +401,11 @@ "name": "unnamedWire#7", "path": [ { - "x": 10.0, - "y": 237.5 + "x": 20.0, + "y": 127.5 }, { - "x": 10.0, + "x": 20.0, "y": 182.5 } ] @@ -467,24 +413,36 @@ { "pin1": { "compName": "_submodelinterface", - "pinName": "SA" + "pinName": "S1" }, "pin2": { "compName": "WireCrossPoint#0", "pinName": "" }, - "name": "unnamedWire#8" + "name": "unnamedWire#8", + "path": [ + { + "x": 45.0, + "y": 12.5 + } + ] }, { "pin1": { "compName": "_submodelinterface", - "pinName": "SB" + "pinName": "S2" }, "pin2": { "compName": "WireCrossPoint#3", "pinName": "" }, - "name": "unnamedWire#9" + "name": "unnamedWire#9", + "path": [ + { + "x": 40.0, + "y": 37.5 + } + ] }, { "pin1": { @@ -553,7 +511,7 @@ "name": "unnamedWire#15", "path": [ { - "x": 7.5, + "x": 45.0, "y": 167.5 } ] @@ -625,7 +583,7 @@ "name": "unnamedWire#21", "path": [ { - "x": 5.0, + "x": 40.0, "y": 192.5 } ] @@ -640,16 +598,7 @@ "pinName": "A" }, "name": "unnamedWire#22", - "path": [ - { - "x": 42.5, - "y": 12.5 - }, - { - "x": 42.5, - "y": 7.5 - } - ] + "path": [] }, { "pin1": { @@ -663,12 +612,12 @@ "name": "unnamedWire#23", "path": [ { - "x": 45.0, + "x": 75.0, "y": 37.5 }, { - "x": 45.0, - "y": 17.5 + "x": 75.0, + "y": 22.5 } ] }, @@ -682,16 +631,7 @@ "pinName": "A" }, "name": "unnamedWire#24", - "path": [ - { - "x": 47.5, - "y": 62.5 - }, - { - "x": 47.5, - "y": 32.5 - } - ] + "path": [] }, { "pin1": { @@ -705,12 +645,12 @@ "name": "unnamedWire#25", "path": [ { - "x": 50.0, + "x": 75.0, "y": 87.5 }, { - "x": 50.0, - "y": 42.5 + "x": 75.0, + "y": 72.5 } ] }, @@ -724,16 +664,7 @@ "pinName": "A" }, "name": "unnamedWire#26", - "path": [ - { - "x": 52.5, - "y": 112.5 - }, - { - "x": 52.5, - "y": 57.5 - } - ] + "path": [] }, { "pin1": { @@ -747,12 +678,12 @@ "name": "unnamedWire#27", "path": [ { - "x": 55.0, + "x": 75.0, "y": 137.5 }, { - "x": 55.0, - "y": 67.5 + "x": 75.0, + "y": 122.5 } ] }, @@ -766,16 +697,7 @@ "pinName": "A" }, "name": "unnamedWire#28", - "path": [ - { - "x": 57.5, - "y": 162.5 - }, - { - "x": 57.5, - "y": 82.5 - } - ] + "path": [] }, { "pin1": { @@ -789,12 +711,12 @@ "name": "unnamedWire#29", "path": [ { - "x": 60.0, + "x": 75.0, "y": 187.5 }, { - "x": 60.0, - "y": 92.5 + "x": 75.0, + "y": 172.5 } ] }, @@ -804,23 +726,41 @@ "pinName": "Y" }, "pin2": { - "compName": "_submodelinterface", - "pinName": "Y1" + "compName": "Splitter#2", + "pinName": "O3" }, "name": "unnamedWire#30", - "path": [] + "path": [ + { + "x": 105.0, + "y": 17.5 + }, + { + "x": 105.0, + "y": 47.5 + } + ] }, { "pin1": { - "compName": "NandGate#9", - "pinName": "Y" + "compName": "Splitter#2", + "pinName": "O2" }, "pin2": { - "compName": "_submodelinterface", - "pinName": "Y2" + "compName": "NandGate#9", + "pinName": "Y" }, "name": "unnamedWire#31", - "path": [] + "path": [ + { + "x": 105.0, + "y": 57.5 + }, + { + "x": 105.0, + "y": 67.5 + } + ] }, { "pin1": { @@ -828,22 +768,76 @@ "pinName": "Y" }, "pin2": { - "compName": "_submodelinterface", - "pinName": "Y3" + "compName": "Splitter#2", + "pinName": "O1" }, "name": "unnamedWire#32", - "path": [] + "path": [ + { + "x": 110.0, + "y": 117.5 + }, + { + "x": 110.0, + "y": 67.5 + } + ] }, { "pin1": { + "compName": "Splitter#2", + "pinName": "O0" + }, + "pin2": { "compName": "NandGate#11", "pinName": "Y" }, + "name": "unnamedWire#33", + "path": [ + { + "x": 115.0, + "y": 77.5 + }, + { + "x": 115.0, + "y": 167.5 + } + ] + }, + { + "pin1": { + "compName": "_submodelinterface", + "pinName": "A" + }, "pin2": { + "compName": "Splitter#0", + "pinName": "I" + }, + "name": "unnamedWire#34", + "path": [] + }, + { + "pin1": { "compName": "_submodelinterface", - "pinName": "Y4" + "pinName": "B" }, - "name": "unnamedWire#33", + "pin2": { + "compName": "Splitter#1", + "pinName": "I" + }, + "name": "unnamedWire#35", + "path": [] + }, + { + "pin1": { + "compName": "Splitter#2", + "pinName": "I" + }, + "pin2": { + "compName": "_submodelinterface", + "pinName": "Y" + }, + "name": "unnamedWire#36", "path": [] } ], diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel3_4.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel3_4.json index aaddfdf3..0bc14dd5 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel3_4.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel3_4.json @@ -1,14 +1,14 @@ { - "width": 35.0, - "height": 150.0, + "width": 60.0, + "height": 80.0, "interfacePins": [ { "location": { "x": 0.0, "y": 35.0 }, - "name": "A1", - "logicWidth": 1, + "name": "A", + "logicWidth": 4, "usage": "INPUT" }, { @@ -16,8 +16,8 @@ "x": 0.0, "y": 45.0 }, - "name": "A2", - "logicWidth": 1, + "name": "B", + "logicWidth": 4, "usage": "INPUT" }, { @@ -25,89 +25,8 @@ "x": 0.0, "y": 55.0 }, - "name": "A3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 65.0 - }, - "name": "A4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 75.0 - }, - "name": "B1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 85.0 - }, - "name": "B2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 95.0 - }, - "name": "B3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 105.0 - }, - "name": "B4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 115.0 - }, - "name": "C1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 125.0 - }, - "name": "C2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 135.0 - }, - "name": "C3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 145.0 - }, - "name": "C4", - "logicWidth": 1, + "name": "C", + "logicWidth": 4, "usage": "INPUT" }, { @@ -115,7 +34,7 @@ "x": 0.0, "y": 5.0 }, - "name": "SA", + "name": "S1", "logicWidth": 1, "usage": "INPUT" }, @@ -124,7 +43,7 @@ "x": 0.0, "y": 15.0 }, - "name": "SB", + "name": "S2", "logicWidth": 1, "usage": "INPUT" }, @@ -133,56 +52,29 @@ "x": 0.0, "y": 25.0 }, - "name": "SC", + "name": "S3", "logicWidth": 1, "usage": "INPUT" }, { "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "Y1", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "Y2", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 25.0 - }, - "name": "Y3", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 35.0 + "x": 60.0, + "y": 55.0 }, - "name": "Y4", - "logicWidth": 1, + "name": "Y", + "logicWidth": 4, "usage": "OUTPUT" } ], - "innerScale": 0.2, + "innerScale": 0.4, "submodel": { "components": [ { "id": "NandGate", "name": "NandGate#0", "pos": { - "x": 50.0, - "y": 570.0 + "x": 35.0, + "y": 97.5 }, "params": 1 }, @@ -190,8 +82,8 @@ "id": "NandGate", "name": "NandGate#1", "pos": { - "x": 50.0, - "y": 620.0 + "x": 35.0, + "y": 122.5 }, "params": 1 }, @@ -199,8 +91,8 @@ "id": "NandGate", "name": "NandGate#2", "pos": { - "x": 50.0, - "y": 670.0 + "x": 35.0, + "y": 147.5 }, "params": 1 }, @@ -208,8 +100,8 @@ "id": "NandGate", "name": "NandGate#3", "pos": { - "x": 50.0, - "y": 720.0 + "x": 35.0, + "y": 172.5 }, "params": 1 }, @@ -217,8 +109,8 @@ "id": "NandGate", "name": "NandGate#4", "pos": { - "x": 152.5, - "y": 15.0 + "x": 100.0, + "y": 92.5 }, "params": 1 }, @@ -226,8 +118,8 @@ "id": "NandGate", "name": "NandGate#5", "pos": { - "x": 152.5, - "y": 65.0 + "x": 100.0, + "y": 117.5 }, "params": 1 }, @@ -235,8 +127,8 @@ "id": "NandGate", "name": "NandGate#6", "pos": { - "x": 152.5, - "y": 115.0 + "x": 100.0, + "y": 142.5 }, "params": 1 }, @@ -244,8 +136,8 @@ "id": "NandGate", "name": "NandGate#7", "pos": { - "x": 152.5, - "y": 165.0 + "x": 100.0, + "y": 167.5 }, "params": 1 }, @@ -254,19 +146,31 @@ "name": "Splitter#0", "pos": { "x": 100.0, - "y": 205.0 + "y": 57.5 }, "params": { "logicWidth": 4, - "orientation": "RIGHT" + "orientation": "LEFT" } }, { "id": "Splitter", "name": "Splitter#1", "pos": { - "x": 75.0, - "y": 255.0 + "x": 5.0, + "y": 122.5 + }, + "params": { + "logicWidth": 4, + "orientation": "RIGHT" + } + }, + { + "id": "Splitter", + "name": "Splitter#2", + "pos": { + "x": 135.0, + "y": 122.5 }, "params": { "logicWidth": 4, @@ -278,7 +182,7 @@ "name": "WireCrossPoint#0", "pos": { "x": 29.0, - "y": 584.0 + "y": 111.5 }, "params": 1 }, @@ -287,7 +191,7 @@ "name": "WireCrossPoint#1", "pos": { "x": 29.0, - "y": 634.0 + "y": 136.5 }, "params": 1 }, @@ -296,7 +200,7 @@ "name": "WireCrossPoint#2", "pos": { "x": 29.0, - "y": 684.0 + "y": 161.5 }, "params": 1 }, @@ -304,292 +208,309 @@ "id": "not4", "name": "not4#0", "pos": { - "x": 60.0, - "y": 200.0 + "x": 80.0, + "y": 12.5 } }, { "id": "sel2_4", "name": "sel2_4#0", "pos": { - "x": 35.0, - "y": 250.0 + "x": 20.0, + "y": 7.5 } } ], "wires": [ { "pin1": { - "compName": "_submodelinterface", - "pinName": "SA" + "compName": "sel2_4#0", + "pinName": "S1" }, "pin2": { - "compName": "sel2_4#0", - "pinName": "SA" + "compName": "_submodelinterface", + "pinName": "S1" }, "name": "unnamedWire#0", - "path": [ - { - "x": 25.0, - "y": 25.0 - }, - { - "x": 25.0, - "y": 255.0 - } - ] + "path": [] }, { "pin1": { "compName": "_submodelinterface", - "pinName": "SB" + "pinName": "S2" }, "pin2": { "compName": "sel2_4#0", - "pinName": "SB" + "pinName": "S2" }, "name": "unnamedWire#1", "path": [ { - "x": 20.0, - "y": 75.0 + "x": 5.0, + "y": 37.5 }, { - "x": 20.0, - "y": 265.0 + "x": 5.0, + "y": 22.5 } ] }, { "pin1": { "compName": "_submodelinterface", - "pinName": "A1" + "pinName": "A" }, "pin2": { "compName": "sel2_4#0", - "pinName": "A1" + "pinName": "A" }, "name": "unnamedWire#2", "path": [ { - "x": 15.0, - "y": 175.0 + "x": 10.0, + "y": 87.5 }, { - "x": 15.0, - "y": 275.0 + "x": 10.0, + "y": 32.5 } ] }, { "pin1": { "compName": "_submodelinterface", - "pinName": "A2" + "pinName": "B" }, "pin2": { "compName": "sel2_4#0", - "pinName": "A2" + "pinName": "B" }, "name": "unnamedWire#3", "path": [ { - "x": 10.0, - "y": 225.0 + "x": 15.0, + "y": 112.5 }, { - "x": 10.0, - "y": 285.0 + "x": 15.0, + "y": 52.5 } ] }, { "pin1": { "compName": "_submodelinterface", - "pinName": "A3" + "pinName": "C" }, "pin2": { - "compName": "sel2_4#0", - "pinName": "A3" + "compName": "Splitter#1", + "pinName": "I" }, "name": "unnamedWire#4", - "path": [ - { - "x": 5.0, - "y": 275.0 - }, - { - "x": 5.0, - "y": 295.0 - } - ] + "path": [] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "A4" + "compName": "Splitter#1", + "pinName": "O3" }, "pin2": { - "compName": "sel2_4#0", - "pinName": "A4" + "compName": "NandGate#0", + "pinName": "A" }, "name": "unnamedWire#5", "path": [ { - "x": 5.0, - "y": 325.0 + "x": 20.0, + "y": 122.5 }, { - "x": 5.0, - "y": 305.0 + "x": 20.0, + "y": 102.5 } ] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "B1" + "compName": "Splitter#1", + "pinName": "O2" }, "pin2": { - "compName": "sel2_4#0", - "pinName": "B1" + "compName": "NandGate#1", + "pinName": "A" }, "name": "unnamedWire#6", "path": [ { - "x": 10.0, - "y": 375.0 + "x": 20.0, + "y": 132.5 }, { - "x": 10.0, - "y": 315.0 + "x": 20.0, + "y": 127.5 } ] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "B2" + "compName": "Splitter#1", + "pinName": "O1" }, "pin2": { - "compName": "sel2_4#0", - "pinName": "B2" + "compName": "NandGate#2", + "pinName": "A" }, "name": "unnamedWire#7", "path": [ { - "x": 15.0, - "y": 425.0 + "x": 25.0, + "y": 142.5 }, { - "x": 15.0, - "y": 325.0 + "x": 25.0, + "y": 152.5 } ] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "B3" + "compName": "NandGate#3", + "pinName": "A" }, "pin2": { - "compName": "sel2_4#0", - "pinName": "B3" + "compName": "Splitter#1", + "pinName": "O0" }, "name": "unnamedWire#8", "path": [ { "x": 20.0, - "y": 475.0 + "y": 177.5 }, { "x": 20.0, - "y": 335.0 + "y": 152.5 } ] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "B4" + "compName": "NandGate#4", + "pinName": "Y" }, "pin2": { - "compName": "sel2_4#0", - "pinName": "B4" + "compName": "Splitter#2", + "pinName": "O3" }, "name": "unnamedWire#9", "path": [ { - "x": 25.0, - "y": 525.0 + "x": 130.0, + "y": 102.5 }, { - "x": 25.0, - "y": 345.0 + "x": 130.0, + "y": 122.5 } ] }, { "pin1": { "compName": "sel2_4#0", - "pinName": "Y1" + "pinName": "Y" }, "pin2": { - "compName": "Splitter#1", - "pinName": "O3" + "compName": "not4#0", + "pinName": "A" }, "name": "unnamedWire#10", "path": [] }, { "pin1": { - "compName": "Splitter#1", - "pinName": "O2" + "compName": "WireCrossPoint#0", + "pinName": "" }, "pin2": { - "compName": "sel2_4#0", - "pinName": "Y2" + "compName": "_submodelinterface", + "pinName": "S3" }, "name": "unnamedWire#11", - "path": [] + "path": [ + { + "x": 30.0, + "y": 92.5 + }, + { + "x": 5.0, + "y": 92.5 + }, + { + "x": 5.0, + "y": 62.5 + } + ] }, { "pin1": { - "compName": "sel2_4#0", - "pinName": "Y3" + "compName": "Splitter#2", + "pinName": "O2" }, "pin2": { - "compName": "Splitter#1", - "pinName": "O1" + "compName": "NandGate#5", + "pinName": "Y" }, "name": "unnamedWire#12", - "path": [] + "path": [ + { + "x": 130.0, + "y": 132.5 + }, + { + "x": 130.0, + "y": 127.5 + } + ] }, { "pin1": { - "compName": "Splitter#1", - "pinName": "O0" + "compName": "Splitter#2", + "pinName": "O1" }, "pin2": { - "compName": "sel2_4#0", - "pinName": "Y4" + "compName": "NandGate#6", + "pinName": "Y" }, "name": "unnamedWire#13", - "path": [] + "path": [ + { + "x": 125.0, + "y": 142.5 + }, + { + "x": 125.0, + "y": 152.5 + } + ] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "SC" + "compName": "Splitter#2", + "pinName": "O0" }, "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" + "compName": "NandGate#7", + "pinName": "Y" }, "name": "unnamedWire#14", "path": [ { - "x": 30.0, - "y": 125.0 + "x": 130.0, + "y": 152.5 + }, + { + "x": 130.0, + "y": 177.5 } ] }, @@ -615,12 +536,7 @@ "pinName": "" }, "name": "unnamedWire#16", - "path": [ - { - "x": 30.0, - "y": 125.0 - } - ] + "path": [] }, { "pin1": { @@ -644,12 +560,7 @@ "pinName": "" }, "name": "unnamedWire#18", - "path": [ - { - "x": 30.0, - "y": 125.0 - } - ] + "path": [] }, { "pin1": { @@ -676,57 +587,42 @@ "path": [ { "x": 30.0, - "y": 735.0 + "y": 187.5 } ] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "C1" + "compName": "Splitter#2", + "pinName": "I" }, "pin2": { - "compName": "NandGate#0", - "pinName": "A" + "compName": "_submodelinterface", + "pinName": "Y" }, "name": "unnamedWire#21", "path": [] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "C2" + "compName": "Splitter#0", + "pinName": "I" }, "pin2": { - "compName": "NandGate#1", - "pinName": "A" + "compName": "not4#0", + "pinName": "Y" }, "name": "unnamedWire#22", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "C3" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "A" - }, - "name": "unnamedWire#23", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "C4" - }, - "pin2": { - "compName": "NandGate#3", - "pinName": "A" - }, - "name": "unnamedWire#24", - "path": [] + "path": [ + { + "x": 120.0, + "y": 72.5 + }, + { + "x": 120.0, + "y": 32.5 + } + ] }, { "pin1": { @@ -737,15 +633,15 @@ "compName": "NandGate#4", "pinName": "A" }, - "name": "unnamedWire#25", + "name": "unnamedWire#23", "path": [ { - "x": 115.0, - "y": 205.0 + "x": 80.0, + "y": 57.5 }, { - "x": 115.0, - "y": 20.0 + "x": 80.0, + "y": 97.5 } ] }, @@ -758,15 +654,15 @@ "compName": "NandGate#5", "pinName": "A" }, - "name": "unnamedWire#26", + "name": "unnamedWire#24", "path": [ { - "x": 120.0, - "y": 215.0 + "x": 85.0, + "y": 67.5 }, { - "x": 120.0, - "y": 70.0 + "x": 85.0, + "y": 122.5 } ] }, @@ -779,15 +675,15 @@ "compName": "NandGate#6", "pinName": "A" }, - "name": "unnamedWire#27", + "name": "unnamedWire#25", "path": [ { - "x": 125.0, - "y": 225.0 + "x": 90.0, + "y": 77.5 }, { - "x": 125.0, - "y": 120.0 + "x": 90.0, + "y": 147.5 } ] }, @@ -800,15 +696,15 @@ "compName": "NandGate#7", "pinName": "A" }, - "name": "unnamedWire#28", + "name": "unnamedWire#26", "path": [ { - "x": 130.0, - "y": 235.0 + "x": 95.0, + "y": 87.5 }, { - "x": 130.0, - "y": 170.0 + "x": 95.0, + "y": 172.5 } ] }, @@ -821,17 +717,8 @@ "compName": "NandGate#4", "pinName": "B" }, - "name": "unnamedWire#29", - "path": [ - { - "x": 135.0, - "y": 580.0 - }, - { - "x": 135.0, - "y": 30.0 - } - ] + "name": "unnamedWire#27", + "path": [] }, { "pin1": { @@ -842,17 +729,8 @@ "compName": "NandGate#5", "pinName": "B" }, - "name": "unnamedWire#30", - "path": [ - { - "x": 140.0, - "y": 630.0 - }, - { - "x": 140.0, - "y": 80.0 - } - ] + "name": "unnamedWire#28", + "path": [] }, { "pin1": { @@ -863,17 +741,8 @@ "compName": "NandGate#6", "pinName": "B" }, - "name": "unnamedWire#31", - "path": [ - { - "x": 145.0, - "y": 680.0 - }, - { - "x": 145.0, - "y": 130.0 - } - ] + "name": "unnamedWire#29", + "path": [] }, { "pin1": { @@ -884,105 +753,7 @@ "compName": "NandGate#7", "pinName": "B" }, - "name": "unnamedWire#32", - "path": [ - { - "x": 150.0, - "y": 730.0 - }, - { - "x": 150.0, - "y": 180.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#4", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y1" - }, - "name": "unnamedWire#33", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#5", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y2" - }, - "name": "unnamedWire#34", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#6", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y3" - }, - "name": "unnamedWire#35", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#7", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y4" - }, - "name": "unnamedWire#36", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "I" - }, - "pin2": { - "compName": "not4#0", - "pinName": "A" - }, - "name": "unnamedWire#37", - "path": [ - { - "x": 90.0, - "y": 270.0 - }, - { - "x": 90.0, - "y": 245.0 - }, - { - "x": 55.0, - "y": 245.0 - }, - { - "x": 55.0, - "y": 220.0 - } - ] - }, - { - "pin1": { - "compName": "not4#0", - "pinName": "Y" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "I" - }, - "name": "unnamedWire#38", + "name": "unnamedWire#30", "path": [] } ], -- 2.17.1