From c6d2e46a2cd3cf810662ec7e7687e7bc44ad66c9 Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Thu, 8 Oct 2020 18:36:12 +0200 Subject: [PATCH] Cleaned andor414 --- .../model/am2900/components/andor414.json | 271 +-- .../logic/model/am2900/components/ram2.json | 1472 +++++------------ .../logic/model/am2900/components/ram4.json | 1229 ++++---------- 3 files changed, 814 insertions(+), 2158 deletions(-) diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/andor414.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/andor414.json index a9b97195..23ac1135 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/andor414.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/andor414.json @@ -2,6 +2,15 @@ "width": 35.0, "height": 90.0, "interfacePins": [ + { + "location": { + "x": 0.0, + "y": 65.0 + }, + "name": "A", + "logicWidth": 4, + "usage": "INPUT" + }, { "location": { "x": 0.0, @@ -22,7 +31,7 @@ }, { "location": { - "x": 0.0, + "x": -6.0, "y": 65.0 }, "name": "A3", @@ -47,76 +56,22 @@ "logicWidth": 1, "usage": "INPUT" }, - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "C1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "C2", - "logicWidth": 1, - "usage": "INPUT" - }, { "location": { "x": 0.0, "y": 25.0 }, - "name": "C3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 35.0 - }, - "name": "C4", - "logicWidth": 1, + "name": "C", + "logicWidth": 4, "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 - }, - "name": "Y4", - "logicWidth": 1, + "name": "Y", + "logicWidth": 4, "usage": "OUTPUT" } ], @@ -127,8 +82,8 @@ "id": "Splitter", "name": "Splitter#0", "pos": { - "x": 20.0, - "y": 82.5 + "x": 17.5, + "y": 87.5 }, "params": { "logicWidth": 4, @@ -139,28 +94,40 @@ "id": "Splitter", "name": "Splitter#1", "pos": { - "x": 15.0, - "y": 142.5 + "x": 72.5, + "y": 47.5 }, "params": { "logicWidth": 4, "orientation": "LEFT" } }, + { + "id": "Splitter", + "name": "Splitter#2", + "pos": { + "x": 17.5, + "y": 47.5 + }, + "params": { + "logicWidth": 4, + "orientation": "RIGHT" + } + }, { "id": "and41", "name": "and41#0", "pos": { "x": 35.0, - "y": 142.5 + "y": 147.5 } }, { "id": "or_4", "name": "or_4#0", "pos": { - "x": 35.0, - "y": 37.5 + "x": 32.5, + "y": 42.5 } } ], @@ -168,47 +135,47 @@ { "pin1": { "compName": "_submodelinterface", - "pinName": "A4" + "pinName": "A" }, "pin2": { - "compName": "Splitter#1", - "pinName": "O3" + "compName": "and41#0", + "pinName": "A" }, "name": "unnamedWire#0", "path": [] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "A3" + "compName": "Splitter#1", + "pinName": "I" }, "pin2": { - "compName": "Splitter#1", - "pinName": "O2" + "compName": "_submodelinterface", + "pinName": "Y" }, "name": "unnamedWire#1", "path": [] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "A2" + "compName": "or_4#0", + "pinName": "Y1" }, "pin2": { "compName": "Splitter#1", - "pinName": "O1" + "pinName": "O0" }, "name": "unnamedWire#2", "path": [] }, { "pin1": { - "compName": "Splitter#1", - "pinName": "O0" + "compName": "or_4#0", + "pinName": "Y2" }, "pin2": { - "compName": "_submodelinterface", - "pinName": "A1" + "compName": "Splitter#1", + "pinName": "O1" }, "name": "unnamedWire#3", "path": [] @@ -230,56 +197,38 @@ }, { "x": 30.0, - "y": 172.5 + "y": 177.5 } ] }, { "pin1": { "compName": "_submodelinterface", - "pinName": "C1" + "pinName": "C" }, "pin2": { - "compName": "or_4#0", - "pinName": "A1" + "compName": "Splitter#2", + "pinName": "I" }, "name": "unnamedWire#5", - "path": [ - { - "x": 10.0, - "y": 12.5 - }, - { - "x": 10.0, - "y": 42.5 - } - ] + "path": [] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "C2" + "compName": "Splitter#2", + "pinName": "O3" }, "pin2": { "compName": "or_4#0", - "pinName": "A2" + "pinName": "A4" }, "name": "unnamedWire#6", - "path": [ - { - "x": 5.0, - "y": 37.5 - }, - { - "x": 5.0, - "y": 52.5 - } - ] + "path": [] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "C3" + "compName": "Splitter#2", + "pinName": "O2" }, "pin2": { "compName": "or_4#0", @@ -290,24 +239,15 @@ }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "C4" + "compName": "Splitter#2", + "pinName": "O1" }, "pin2": { "compName": "or_4#0", - "pinName": "A4" + "pinName": "A2" }, "name": "unnamedWire#8", - "path": [ - { - "x": 5.0, - "y": 87.5 - }, - { - "x": 5.0, - "y": 72.5 - } - ] + "path": [] }, { "pin1": { @@ -357,80 +297,29 @@ "name": "unnamedWire#12", "path": [] }, - { - "pin1": { - "compName": "or_4#0", - "pinName": "Y1" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y1" - }, - "name": "unnamedWire#13", - "path": [ - { - "x": 75.0, - "y": 42.5 - }, - { - "x": 75.0, - "y": 12.5 - } - ] - }, - { - "pin1": { - "compName": "or_4#0", - "pinName": "Y2" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y2" - }, - "name": "unnamedWire#14", - "path": [ - { - "x": 80.0, - "y": 52.5 - }, - { - "x": 80.0, - "y": 37.5 - } - ] - }, { "pin1": { "compName": "or_4#0", "pinName": "Y3" }, "pin2": { - "compName": "_submodelinterface", - "pinName": "Y3" + "compName": "Splitter#1", + "pinName": "O2" }, - "name": "unnamedWire#15", + "name": "unnamedWire#13", "path": [] }, { "pin1": { - "compName": "or_4#0", - "pinName": "Y4" + "compName": "Splitter#1", + "pinName": "O3" }, "pin2": { - "compName": "_submodelinterface", + "compName": "or_4#0", "pinName": "Y4" }, - "name": "unnamedWire#16", - "path": [ - { - "x": 80.0, - "y": 72.5 - }, - { - "x": 80.0, - "y": 87.5 - } - ] + "name": "unnamedWire#14", + "path": [] }, { "pin1": { @@ -441,14 +330,14 @@ "compName": "and41#0", "pinName": "Y" }, - "name": "unnamedWire#17", + "name": "unnamedWire#15", "path": [ { - "x": 15.0, - "y": 97.5 + "x": 12.5, + "y": 102.5 }, { - "x": 15.0, + "x": 12.5, "y": 127.5 }, { @@ -457,20 +346,20 @@ }, { "x": 75.0, - "y": 157.5 + "y": 162.5 } ] }, { "pin1": { - "compName": "Splitter#1", - "pinName": "I" + "compName": "or_4#0", + "pinName": "A1" }, "pin2": { - "compName": "and41#0", - "pinName": "A" + "compName": "Splitter#2", + "pinName": "O0" }, - "name": "unnamedWire#18", + "name": "unnamedWire#16", "path": [] } ], diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json index 489306ef..3312bfb4 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json @@ -175,7 +175,7 @@ "id": "Splitter", "name": "Splitter#1", "pos": { - "x": 130.0, + "x": 135.0, "y": 155.0 }, "params": { @@ -187,7 +187,7 @@ "id": "Splitter", "name": "Splitter#2", "pos": { - "x": 110.0, + "x": 95.0, "y": 330.0 }, "params": { @@ -199,8 +199,8 @@ "id": "Splitter", "name": "Splitter#3", "pos": { - "x": 120.0, - "y": 440.0 + "x": 285.0, + "y": 705.0 }, "params": { "logicWidth": 4, @@ -211,19 +211,55 @@ "id": "Splitter", "name": "Splitter#4", "pos": { - "x": 220.0, - "y": 490.0 + "x": 285.0, + "y": 635.0 }, "params": { "logicWidth": 4, "orientation": "RIGHT" } }, + { + "id": "Splitter", + "name": "Splitter#5", + "pos": { + "x": 95.0, + "y": 435.0 + }, + "params": { + "logicWidth": 4, + "orientation": "LEFT" + } + }, + { + "id": "Splitter", + "name": "Splitter#6", + "pos": { + "x": 95.0, + "y": 540.0 + }, + "params": { + "logicWidth": 4, + "orientation": "LEFT" + } + }, + { + "id": "Splitter", + "name": "Splitter#7", + "pos": { + "x": 95.0, + "y": 645.0 + }, + "params": { + "logicWidth": 4, + "orientation": "LEFT" + } + }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", "pos": { - "x": 121.5, + "x": 129.0, "y": 154.0 }, "params": 1 @@ -232,7 +268,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#1", "pos": { - "x": 104.0, + "x": 124.0, "y": 164.0 }, "params": 1 @@ -241,7 +277,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#2", "pos": { - "x": 99.0, + "x": 119.0, "y": 174.0 }, "params": 1 @@ -250,7 +286,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#3", "pos": { - "x": 94.0, + "x": 114.0, "y": 184.0 }, "params": 1 @@ -260,7 +296,7 @@ "name": "WireCrossPoint#4", "pos": { "x": 34.0, - "y": 549.0 + "y": 539.0 }, "params": 1 }, @@ -278,7 +314,7 @@ "name": "WireCrossPoint#6", "pos": { "x": 44.0, - "y": 749.0 + "y": 664.0 }, "params": 1 }, @@ -287,7 +323,7 @@ "name": "WireCrossPoint#7", "pos": { "x": 49.0, - "y": 809.0 + "y": 674.0 }, "params": 1 }, @@ -296,7 +332,7 @@ "name": "WireCrossPoint#8", "pos": { "x": 34.0, - "y": 479.0 + "y": 434.0 }, "params": 1 }, @@ -305,7 +341,7 @@ "name": "WireCrossPoint#9", "pos": { "x": 39.0, - "y": 489.0 + "y": 444.0 }, "params": 1 }, @@ -314,7 +350,7 @@ "name": "WireCrossPoint#10", "pos": { "x": 44.0, - "y": 499.0 + "y": 454.0 }, "params": 1 }, @@ -323,7 +359,7 @@ "name": "WireCrossPoint#11", "pos": { "x": 49.0, - "y": 509.0 + "y": 464.0 }, "params": 1 }, @@ -332,7 +368,7 @@ "name": "WireCrossPoint#12", "pos": { "x": 34.0, - "y": 629.0 + "y": 549.0 }, "params": 1 }, @@ -341,7 +377,7 @@ "name": "WireCrossPoint#13", "pos": { "x": 39.0, - "y": 639.0 + "y": 549.0 }, "params": 1 }, @@ -350,7 +386,7 @@ "name": "WireCrossPoint#14", "pos": { "x": 44.0, - "y": 649.0 + "y": 559.0 }, "params": 1 }, @@ -359,7 +395,7 @@ "name": "WireCrossPoint#15", "pos": { "x": 49.0, - "y": 659.0 + "y": 569.0 }, "params": 1 }, @@ -367,8 +403,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#16", "pos": { - "x": 129.0, - "y": 349.0 + "x": 109.0, + "y": 344.0 }, "params": 4 }, @@ -376,109 +412,28 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#17", "pos": { - "x": 129.0, - "y": 479.0 + "x": 109.0, + "y": 449.0 }, - "params": 1 + "params": 4 }, { "id": "WireCrossPoint", "name": "WireCrossPoint#18", "pos": { - "x": 124.0, - "y": 489.0 + "x": 109.0, + "y": 554.0 }, - "params": 1 + "params": 4 }, { "id": "WireCrossPoint", "name": "WireCrossPoint#19", "pos": { - "x": 119.0, - "y": 499.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#20", - "pos": { - "x": 114.0, - "y": 509.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#21", - "pos": { - "x": 129.0, - "y": 629.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#22", - "pos": { - "x": 124.0, - "y": 639.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#23", - "pos": { - "x": 119.0, - "y": 649.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#24", - "pos": { - "x": 114.0, + "x": 109.0, "y": 659.0 }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#25", - "pos": { - "x": 129.0, - "y": 779.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#26", - "pos": { - "x": 124.0, - "y": 789.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#27", - "pos": { - "x": 119.0, - "y": 799.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#28", - "pos": { - "x": 114.0, - "y": 809.0 - }, - "params": 1 + "params": 4 }, { "id": "and41", @@ -493,7 +448,7 @@ "name": "and41#1", "pos": { "x": 235.0, - "y": 375.0 + "y": 360.0 } }, { @@ -501,7 +456,7 @@ "name": "and41#2", "pos": { "x": 135.0, - "y": 335.0 + "y": 330.0 } }, { @@ -509,7 +464,7 @@ "name": "andor414#0", "pos": { "x": 235.0, - "y": 485.0 + "y": 415.0 } }, { @@ -517,7 +472,7 @@ "name": "andor414#1", "pos": { "x": 235.0, - "y": 635.0 + "y": 520.0 } }, { @@ -525,7 +480,7 @@ "name": "andor414#2", "pos": { "x": 235.0, - "y": 785.0 + "y": 625.0 } }, { @@ -533,7 +488,7 @@ "name": "andor414#3", "pos": { "x": 135.0, - "y": 435.0 + "y": 385.0 } }, { @@ -541,7 +496,7 @@ "name": "andor414#4", "pos": { "x": 135.0, - "y": 585.0 + "y": 490.0 } }, { @@ -549,7 +504,7 @@ "name": "andor414#5", "pos": { "x": 135.0, - "y": 735.0 + "y": 595.0 } }, { @@ -581,7 +536,7 @@ "name": "dlatch4#1", "pos": { "x": 55.0, - "y": 475.0 + "y": 430.0 } }, { @@ -589,7 +544,7 @@ "name": "dlatch4#2", "pos": { "x": 55.0, - "y": 625.0 + "y": 535.0 } }, { @@ -597,7 +552,7 @@ "name": "dlatch4#3", "pos": { "x": 55.0, - "y": 775.0 + "y": 640.0 } } ], @@ -840,7 +795,7 @@ }, { "x": 25.0, - "y": 520.0 + "y": 475.0 } ] }, @@ -861,7 +816,7 @@ }, { "x": 20.0, - "y": 670.0 + "y": 580.0 } ] }, @@ -882,7 +837,7 @@ }, { "x": 15.0, - "y": 820.0 + "y": 685.0 } ] }, @@ -892,7 +847,7 @@ "pinName": "D1" }, "pin2": { - "compName": "WireCrossPoint#4", + "compName": "WireCrossPoint#12", "pinName": "" }, "name": "unnamedWire#17", @@ -920,7 +875,12 @@ "pinName": "" }, "name": "unnamedWire#19", - "path": [] + "path": [ + { + "x": 45.0, + "y": 750.0 + } + ] }, { "pin1": { @@ -1117,7 +1077,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#12", + "compName": "WireCrossPoint#4", "pinName": "" }, "pin2": { @@ -1212,7 +1172,7 @@ "path": [ { "x": 35.0, - "y": 780.0 + "y": 645.0 } ] }, @@ -1229,7 +1189,7 @@ "path": [ { "x": 40.0, - "y": 790.0 + "y": 655.0 } ] }, @@ -1243,12 +1203,7 @@ "pinName": "D3" }, "name": "unnamedWire#43", - "path": [ - { - "x": 45.0, - "y": 800.0 - } - ] + "path": [] }, { "pin1": { @@ -1316,20 +1271,20 @@ "pinName": "Q1" }, "pin2": { - "compName": "WireCrossPoint#17", - "pinName": "" + "compName": "Splitter#5", + "pinName": "O0" }, "name": "unnamedWire#49", "path": [] }, { "pin1": { - "compName": "dlatch4#1", - "pinName": "Q2" + "compName": "Splitter#5", + "pinName": "O1" }, "pin2": { - "compName": "WireCrossPoint#18", - "pinName": "" + "compName": "dlatch4#1", + "pinName": "Q2" }, "name": "unnamedWire#50", "path": [] @@ -1340,20 +1295,20 @@ "pinName": "Q3" }, "pin2": { - "compName": "WireCrossPoint#19", - "pinName": "" + "compName": "Splitter#5", + "pinName": "O2" }, "name": "unnamedWire#51", "path": [] }, { "pin1": { - "compName": "dlatch4#1", - "pinName": "Q4" + "compName": "Splitter#5", + "pinName": "O3" }, "pin2": { - "compName": "WireCrossPoint#20", - "pinName": "" + "compName": "dlatch4#1", + "pinName": "Q4" }, "name": "unnamedWire#52", "path": [] @@ -1361,11 +1316,11 @@ { "pin1": { "compName": "dlatch4#2", - "pinName": "Q1" + "pinName": "Q4" }, "pin2": { - "compName": "WireCrossPoint#21", - "pinName": "" + "compName": "Splitter#6", + "pinName": "O3" }, "name": "unnamedWire#53", "path": [] @@ -1373,23 +1328,23 @@ { "pin1": { "compName": "dlatch4#2", - "pinName": "Q2" + "pinName": "Q3" }, "pin2": { - "compName": "WireCrossPoint#22", - "pinName": "" + "compName": "Splitter#6", + "pinName": "O2" }, "name": "unnamedWire#54", "path": [] }, { "pin1": { - "compName": "dlatch4#2", - "pinName": "Q3" + "compName": "Splitter#6", + "pinName": "O1" }, "pin2": { - "compName": "WireCrossPoint#23", - "pinName": "" + "compName": "dlatch4#2", + "pinName": "Q2" }, "name": "unnamedWire#55", "path": [] @@ -1397,59 +1352,64 @@ { "pin1": { "compName": "dlatch4#2", - "pinName": "Q4" + "pinName": "Q1" }, "pin2": { - "compName": "WireCrossPoint#24", - "pinName": "" + "compName": "Splitter#6", + "pinName": "O0" }, "name": "unnamedWire#56", "path": [] }, { "pin1": { - "compName": "dlatch4#3", - "pinName": "Q1" + "compName": "WireCrossPoint#19", + "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#25", - "pinName": "" + "compName": "Splitter#7", + "pinName": "I" }, "name": "unnamedWire#57", "path": [] }, { "pin1": { - "compName": "dlatch4#3", - "pinName": "Q2" + "compName": "WireCrossPoint#19", + "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#26", - "pinName": "" + "compName": "andor414#5", + "pinName": "A" }, "name": "unnamedWire#58", "path": [] }, { "pin1": { - "compName": "dlatch4#3", - "pinName": "Q3" + "compName": "WireCrossPoint#19", + "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#27", - "pinName": "" + "compName": "andor414#2", + "pinName": "A" }, "name": "unnamedWire#59", - "path": [] + "path": [ + { + "x": 110.0, + "y": 690.0 + } + ] }, { "pin1": { - "compName": "dlatch4#3", - "pinName": "Q4" + "compName": "Splitter#7", + "pinName": "O3" }, "pin2": { - "compName": "WireCrossPoint#28", - "pinName": "" + "compName": "dlatch4#3", + "pinName": "Q4" }, "name": "unnamedWire#60", "path": [] @@ -1471,7 +1431,7 @@ }, { "x": 210.0, - "y": 405.0 + "y": 390.0 } ] }, @@ -1492,7 +1452,7 @@ }, { "x": 205.0, - "y": 570.0 + "y": 500.0 } ] }, @@ -1513,7 +1473,7 @@ }, { "x": 200.0, - "y": 720.0 + "y": 605.0 } ] }, @@ -1534,7 +1494,7 @@ }, { "x": 195.0, - "y": 870.0 + "y": 710.0 } ] }, @@ -1550,8 +1510,8 @@ "name": "unnamedWire#65", "path": [ { - "x": 125.0, - "y": 365.0 + "x": 130.0, + "y": 360.0 } ] }, @@ -1567,8 +1527,8 @@ "name": "unnamedWire#66", "path": [ { - "x": 105.0, - "y": 520.0 + "x": 125.0, + "y": 470.0 } ] }, @@ -1584,8 +1544,8 @@ "name": "unnamedWire#67", "path": [ { - "x": 100.0, - "y": 670.0 + "x": 120.0, + "y": 575.0 } ] }, @@ -1601,8 +1561,8 @@ "name": "unnamedWire#68", "path": [ { - "x": 95.0, - "y": 820.0 + "x": 115.0, + "y": 680.0 } ] }, @@ -1616,12 +1576,7 @@ "pinName": "" }, "name": "unnamedWire#69", - "path": [ - { - "x": 130.0, - "y": 345.0 - } - ] + "path": [] }, { "pin1": { @@ -1647,1174 +1602,501 @@ "name": "unnamedWire#71", "path": [ { - "x": 130.0, - "y": 390.0 + "x": 110.0, + "y": 375.0 } ] }, { "pin1": { - "compName": "Splitter#3", - "pinName": "I" - }, - "pin2": { "compName": "and41#2", "pinName": "Y" }, + "pin2": { + "compName": "andor414#3", + "pinName": "C" + }, "name": "unnamedWire#72", "path": [ { - "x": 115.0, - "y": 455.0 + "x": 175.0, + "y": 345.0 }, { - "x": 115.0, - "y": 412.5 + "x": 175.0, + "y": 380.0 }, { - "x": 175.0, - "y": 412.5 + "x": 130.0, + "y": 380.0 }, { - "x": 175.0, - "y": 350.0 + "x": 130.0, + "y": 410.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#17", - "pinName": "" + "compName": "Splitter#5", + "pinName": "I" }, "pin2": { - "compName": "andor414#0", - "pinName": "A1" + "compName": "WireCrossPoint#17", + "pinName": "" }, "name": "unnamedWire#73", - "path": [ - { - "x": 130.0, - "y": 530.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#18", - "pinName": "" - }, - "pin2": { - "compName": "andor414#0", - "pinName": "A2" - }, - "name": "unnamedWire#74", - "path": [ - { - "x": 125.0, - "y": 540.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#19", - "pinName": "" - }, - "pin2": { - "compName": "andor414#0", - "pinName": "A3" - }, - "name": "unnamedWire#75", - "path": [ - { - "x": 120.0, - "y": 550.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#20", - "pinName": "" - }, - "pin2": { - "compName": "andor414#0", - "pinName": "A4" - }, - "name": "unnamedWire#76", - "path": [ - { - "x": 115.0, - "y": 560.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#21", - "pinName": "" - }, - "pin2": { - "compName": "andor414#1", - "pinName": "A1" - }, - "name": "unnamedWire#77", - "path": [ - { - "x": 130.0, - "y": 680.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#22", - "pinName": "" - }, - "pin2": { - "compName": "andor414#1", - "pinName": "A2" - }, - "name": "unnamedWire#78", - "path": [ - { - "x": 125.0, - "y": 690.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#23", - "pinName": "" - }, - "pin2": { - "compName": "andor414#1", - "pinName": "A3" - }, - "name": "unnamedWire#79", - "path": [ - { - "x": 120.0, - "y": 700.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#24", - "pinName": "" - }, - "pin2": { - "compName": "andor414#1", - "pinName": "A4" - }, - "name": "unnamedWire#80", - "path": [ - { - "x": 115.0, - "y": 710.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#25", - "pinName": "" - }, - "pin2": { - "compName": "andor414#2", - "pinName": "A1" - }, - "name": "unnamedWire#81", - "path": [ - { - "x": 130.0, - "y": 830.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#26", - "pinName": "" - }, - "pin2": { - "compName": "andor414#2", - "pinName": "A2" - }, - "name": "unnamedWire#82", - "path": [ - { - "x": 125.0, - "y": 840.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#27", - "pinName": "" - }, - "pin2": { - "compName": "andor414#2", - "pinName": "A3" - }, - "name": "unnamedWire#83", - "path": [ - { - "x": 120.0, - "y": 850.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#28", - "pinName": "" - }, - "pin2": { - "compName": "andor414#2", - "pinName": "A4" - }, - "name": "unnamedWire#84", - "path": [ - { - "x": 115.0, - "y": 860.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O0" - }, - "pin2": { - "compName": "andor414#3", - "pinName": "C1" - }, - "name": "unnamedWire#85", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O1" - }, - "pin2": { - "compName": "andor414#3", - "pinName": "C2" - }, - "name": "unnamedWire#86", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O2" - }, - "pin2": { - "compName": "andor414#3", - "pinName": "C3" - }, - "name": "unnamedWire#87", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O3" - }, - "pin2": { - "compName": "andor414#3", - "pinName": "C4" - }, - "name": "unnamedWire#88", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#17", - "pinName": "" - }, - "pin2": { - "compName": "andor414#3", - "pinName": "A1" - }, - "name": "unnamedWire#89", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#18", - "pinName": "" - }, - "pin2": { - "compName": "andor414#3", - "pinName": "A2" - }, - "name": "unnamedWire#90", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#19", - "pinName": "" - }, - "pin2": { - "compName": "andor414#3", - "pinName": "A3" - }, - "name": "unnamedWire#91", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#20", - "pinName": "" - }, - "pin2": { - "compName": "andor414#3", - "pinName": "A4" - }, - "name": "unnamedWire#92", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#21", - "pinName": "" - }, - "pin2": { - "compName": "andor414#4", - "pinName": "A1" - }, - "name": "unnamedWire#93", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#22", - "pinName": "" - }, - "pin2": { - "compName": "andor414#4", - "pinName": "A2" - }, - "name": "unnamedWire#94", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#23", - "pinName": "" - }, - "pin2": { - "compName": "andor414#4", - "pinName": "A3" - }, - "name": "unnamedWire#95", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#24", - "pinName": "" - }, - "pin2": { - "compName": "andor414#4", - "pinName": "A4" - }, - "name": "unnamedWire#96", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#25", - "pinName": "" - }, - "pin2": { - "compName": "andor414#5", - "pinName": "A1" - }, - "name": "unnamedWire#97", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#26", - "pinName": "" - }, - "pin2": { - "compName": "andor414#5", - "pinName": "A2" - }, - "name": "unnamedWire#98", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#27", - "pinName": "" - }, - "pin2": { - "compName": "andor414#5", - "pinName": "A3" - }, - "name": "unnamedWire#99", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#28", - "pinName": "" - }, - "pin2": { - "compName": "andor414#5", - "pinName": "A4" - }, - "name": "unnamedWire#100", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#4", - "pinName": "O0" - }, - "pin2": { - "compName": "andor414#0", - "pinName": "C1" - }, - "name": "unnamedWire#101", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#4", - "pinName": "O1" - }, - "pin2": { - "compName": "andor414#0", - "pinName": "C2" - }, - "name": "unnamedWire#102", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#4", - "pinName": "O2" - }, - "pin2": { - "compName": "andor414#0", - "pinName": "C3" - }, - "name": "unnamedWire#103", "path": [] }, { "pin1": { - "compName": "andor414#0", - "pinName": "C4" + "compName": "WireCrossPoint#17", + "pinName": "" }, "pin2": { - "compName": "Splitter#4", - "pinName": "O3" + "compName": "andor414#3", + "pinName": "A" }, - "name": "unnamedWire#104", + "name": "unnamedWire#74", "path": [] }, { "pin1": { - "compName": "andor414#0", - "pinName": "Y1" - }, - "pin2": { - "compName": "andor414#1", - "pinName": "C1" - }, - "name": "unnamedWire#105", - "path": [ - { - "x": 290.0, - "y": 490.0 - }, - { - "x": 290.0, - "y": 595.0 - }, - { - "x": 230.0, - "y": 595.0 - }, - { - "x": 230.0, - "y": 640.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#0", - "pinName": "Y2" + "compName": "WireCrossPoint#17", + "pinName": "" }, "pin2": { - "compName": "andor414#1", - "pinName": "C2" - }, - "name": "unnamedWire#106", - "path": [ - { - "x": 285.0, - "y": 500.0 - }, - { - "x": 285.0, - "y": 590.0 - }, - { - "x": 225.0, - "y": 590.0 - }, - { - "x": 225.0, - "y": 650.0 - } - ] - }, - { - "pin1": { "compName": "andor414#0", - "pinName": "Y3" - }, - "pin2": { - "compName": "andor414#1", - "pinName": "C3" + "pinName": "A" }, - "name": "unnamedWire#107", + "name": "unnamedWire#75", "path": [ { - "x": 280.0, - "y": 510.0 - }, - { - "x": 280.0, - "y": 585.0 - }, - { - "x": 220.0, - "y": 585.0 - }, - { - "x": 220.0, - "y": 660.0 + "x": 110.0, + "y": 480.0 } ] }, { "pin1": { - "compName": "andor414#0", - "pinName": "Y4" + "compName": "WireCrossPoint#18", + "pinName": "" }, "pin2": { - "compName": "andor414#1", - "pinName": "C4" + "compName": "andor414#4", + "pinName": "A" }, - "name": "unnamedWire#108", - "path": [ - { - "x": 275.0, - "y": 520.0 - }, - { - "x": 275.0, - "y": 580.0 - }, - { - "x": 215.0, - "y": 580.0 - }, - { - "x": 215.0, - "y": 670.0 - } - ] + "name": "unnamedWire#76", + "path": [] }, { "pin1": { - "compName": "andor414#1", - "pinName": "Y1" + "compName": "dlatch4#3", + "pinName": "Q3" }, "pin2": { - "compName": "andor414#2", - "pinName": "C1" + "compName": "Splitter#7", + "pinName": "O2" }, - "name": "unnamedWire#109", - "path": [ - { - "x": 290.0, - "y": 640.0 - }, - { - "x": 290.0, - "y": 745.0 - }, - { - "x": 230.0, - "y": 745.0 - }, - { - "x": 230.0, - "y": 790.0 - } - ] + "name": "unnamedWire#77", + "path": [] }, { "pin1": { - "compName": "andor414#1", - "pinName": "Y2" + "compName": "dlatch4#3", + "pinName": "Q2" }, "pin2": { - "compName": "andor414#2", - "pinName": "C2" + "compName": "Splitter#7", + "pinName": "O1" }, - "name": "unnamedWire#110", - "path": [ - { - "x": 285.0, - "y": 650.0 - }, - { - "x": 285.0, - "y": 740.0 - }, - { - "x": 225.0, - "y": 740.0 - }, - { - "x": 225.0, - "y": 800.0 - } - ] + "name": "unnamedWire#78", + "path": [] }, { "pin1": { - "compName": "andor414#1", - "pinName": "Y3" + "compName": "Splitter#7", + "pinName": "O0" }, "pin2": { - "compName": "andor414#2", - "pinName": "C3" + "compName": "dlatch4#3", + "pinName": "Q1" }, - "name": "unnamedWire#111", - "path": [ - { - "x": 280.0, - "y": 660.0 - }, - { - "x": 280.0, - "y": 735.0 - }, - { - "x": 220.0, - "y": 735.0 - }, - { - "x": 220.0, - "y": 810.0 - } - ] + "name": "unnamedWire#79", + "path": [] }, { "pin1": { - "compName": "andor414#1", - "pinName": "Y4" + "compName": "andor414#3", + "pinName": "Y" }, "pin2": { - "compName": "andor414#2", - "pinName": "C4" + "compName": "andor414#4", + "pinName": "C" }, - "name": "unnamedWire#112", + "name": "unnamedWire#80", "path": [ { - "x": 275.0, - "y": 670.0 - }, - { - "x": 275.0, - "y": 730.0 + "x": 175.0, + "y": 410.0 }, { - "x": 215.0, - "y": 730.0 + "x": 175.0, + "y": 485.0 }, { - "x": 215.0, - "y": 820.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#2", - "pinName": "Y1" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "QA1" - }, - "name": "unnamedWire#113", - "path": [ - { - "x": 300.0, - "y": 790.0 + "x": 130.0, + "y": 485.0 }, { - "x": 300.0, - "y": 50.0 + "x": 130.0, + "y": 515.0 } ] }, { "pin1": { - "compName": "andor414#2", - "pinName": "Y2" + "compName": "andor414#4", + "pinName": "Y" }, "pin2": { - "compName": "_submodelinterface", - "pinName": "QA2" + "compName": "andor414#5", + "pinName": "C" }, - "name": "unnamedWire#114", + "name": "unnamedWire#81", "path": [ { - "x": 305.0, - "y": 800.0 + "x": 175.0, + "y": 515.0 }, { - "x": 305.0, - "y": 150.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#2", - "pinName": "Y3" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "QA3" - }, - "name": "unnamedWire#115", - "path": [ - { - "x": 310.0, - "y": 810.0 + "x": 175.0, + "y": 590.0 }, { - "x": 310.0, - "y": 250.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#2", - "pinName": "Y4" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "QA4" - }, - "name": "unnamedWire#116", - "path": [ - { - "x": 315.0, - "y": 820.0 + "x": 130.0, + "y": 590.0 }, { - "x": 315.0, - "y": 350.0 + "x": 130.0, + "y": 620.0 } ] }, { "pin1": { - "compName": "and41#1", + "compName": "andor414#5", "pinName": "Y" }, "pin2": { - "compName": "Splitter#4", + "compName": "Splitter#3", "pinName": "I" }, - "name": "unnamedWire#117", + "name": "unnamedWire#82", "path": [ { - "x": 275.0, - "y": 390.0 - }, - { - "x": 275.0, - "y": 420.0 - }, - { - "x": 215.0, - "y": 420.0 + "x": 175.0, + "y": 620.0 }, { - "x": 215.0, - "y": 505.0 + "x": 175.0, + "y": 720.0 } ] }, { "pin1": { - "compName": "andor414#3", - "pinName": "Y1" + "compName": "Splitter#3", + "pinName": "O0" }, "pin2": { - "compName": "andor414#4", - "pinName": "C1" + "compName": "_submodelinterface", + "pinName": "QB1" }, - "name": "unnamedWire#118", + "name": "unnamedWire#83", "path": [ { - "x": 190.0, - "y": 440.0 - }, - { - "x": 190.0, - "y": 580.0 - }, - { - "x": 130.0, - "y": 580.0 + "x": 335.0, + "y": 735.0 }, { - "x": 130.0, - "y": 590.0 + "x": 335.0, + "y": 450.0 } ] }, { "pin1": { - "compName": "andor414#3", - "pinName": "Y2" + "compName": "Splitter#6", + "pinName": "I" }, "pin2": { - "compName": "andor414#4", - "pinName": "C2" + "compName": "WireCrossPoint#18", + "pinName": "" + }, + "name": "unnamedWire#84", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#18", + "pinName": "" + }, + "pin2": { + "compName": "andor414#1", + "pinName": "A" }, - "name": "unnamedWire#119", + "name": "unnamedWire#85", "path": [ { - "x": 185.0, - "y": 450.0 - }, - { - "x": 185.0, - "y": 575.0 - }, - { - "x": 125.0, - "y": 575.0 - }, - { - "x": 125.0, - "y": 600.0 + "x": 110.0, + "y": 585.0 } ] }, { "pin1": { - "compName": "andor414#3", - "pinName": "Y3" + "compName": "and41#1", + "pinName": "Y" }, "pin2": { - "compName": "andor414#4", - "pinName": "C3" + "compName": "andor414#0", + "pinName": "C" }, - "name": "unnamedWire#120", + "name": "unnamedWire#86", "path": [ { - "x": 180.0, - "y": 460.0 + "x": 275.0, + "y": 375.0 }, { - "x": 180.0, - "y": 570.0 + "x": 275.0, + "y": 410.0 }, { - "x": 120.0, - "y": 570.0 + "x": 230.0, + "y": 410.0 }, { - "x": 120.0, - "y": 610.0 + "x": 230.0, + "y": 440.0 } ] }, { "pin1": { - "compName": "andor414#3", - "pinName": "Y4" + "compName": "andor414#0", + "pinName": "Y" }, "pin2": { - "compName": "andor414#4", - "pinName": "C4" + "compName": "andor414#1", + "pinName": "C" }, - "name": "unnamedWire#121", + "name": "unnamedWire#87", "path": [ { - "x": 175.0, - "y": 470.0 + "x": 275.0, + "y": 440.0 }, { - "x": 175.0, - "y": 565.0 + "x": 275.0, + "y": 515.0 }, { - "x": 115.0, - "y": 565.0 + "x": 230.0, + "y": 515.0 }, { - "x": 115.0, - "y": 620.0 + "x": 230.0, + "y": 545.0 } ] }, { "pin1": { - "compName": "andor414#4", - "pinName": "Y1" + "compName": "andor414#1", + "pinName": "Y" }, "pin2": { - "compName": "andor414#5", - "pinName": "C1" + "compName": "andor414#2", + "pinName": "C" }, - "name": "unnamedWire#122", + "name": "unnamedWire#88", "path": [ { - "x": 190.0, - "y": 590.0 + "x": 275.0, + "y": 545.0 }, { - "x": 190.0, - "y": 730.0 + "x": 275.0, + "y": 620.0 }, { - "x": 130.0, - "y": 730.0 + "x": 230.0, + "y": 620.0 }, { - "x": 130.0, - "y": 740.0 + "x": 230.0, + "y": 650.0 } ] }, { "pin1": { - "compName": "andor414#4", - "pinName": "Y2" + "compName": "andor414#2", + "pinName": "Y" }, "pin2": { - "compName": "andor414#5", - "pinName": "C2" + "compName": "Splitter#4", + "pinName": "I" }, - "name": "unnamedWire#123", + "name": "unnamedWire#89", + "path": [] + }, + { + "pin1": { + "compName": "Splitter#4", + "pinName": "O0" + }, + "pin2": { + "compName": "_submodelinterface", + "pinName": "QA1" + }, + "name": "unnamedWire#90", "path": [ { - "x": 185.0, - "y": 600.0 - }, - { - "x": 185.0, - "y": 725.0 - }, - { - "x": 125.0, - "y": 725.0 + "x": 315.0, + "y": 665.0 }, { - "x": 125.0, - "y": 750.0 + "x": 317.5, + "y": 50.0 } ] }, { "pin1": { - "compName": "andor414#4", - "pinName": "Y3" + "compName": "_submodelinterface", + "pinName": "QA2" }, "pin2": { - "compName": "andor414#5", - "pinName": "C3" + "compName": "Splitter#4", + "pinName": "O1" }, - "name": "unnamedWire#124", + "name": "unnamedWire#91", "path": [ { - "x": 180.0, - "y": 610.0 - }, - { - "x": 180.0, - "y": 720.0 - }, - { - "x": 120.0, - "y": 720.0 + "x": 312.5, + "y": 150.0 }, { - "x": 120.0, - "y": 760.0 + "x": 310.0, + "y": 655.0 } ] }, { "pin1": { - "compName": "andor414#4", - "pinName": "Y4" + "compName": "Splitter#4", + "pinName": "O2" }, "pin2": { - "compName": "andor414#5", - "pinName": "C4" + "compName": "_submodelinterface", + "pinName": "QA3" }, - "name": "unnamedWire#125", + "name": "unnamedWire#92", "path": [ { - "x": 175.0, - "y": 620.0 - }, - { - "x": 175.0, - "y": 715.0 - }, - { - "x": 115.0, - "y": 715.0 + "x": 305.0, + "y": 645.0 }, { - "x": 115.0, - "y": 770.0 + "x": 307.5, + "y": 250.0 } ] }, { "pin1": { - "compName": "andor414#5", - "pinName": "Y1" + "compName": "_submodelinterface", + "pinName": "QA4" }, "pin2": { - "compName": "_submodelinterface", - "pinName": "QB1" + "compName": "Splitter#4", + "pinName": "O3" }, - "name": "unnamedWire#126", + "name": "unnamedWire#93", "path": [ { - "x": 190.0, - "y": 740.0 - }, - { - "x": 190.0, - "y": 880.0 - }, - { - "x": 325.0, - "y": 880.0 + "x": 300.0, + "y": 350.0 }, { - "x": 325.0, - "y": 450.0 + "x": 300.0, + "y": 635.0 } ] }, { "pin1": { - "compName": "andor414#5", - "pinName": "Y2" - }, - "pin2": { "compName": "_submodelinterface", "pinName": "QB2" }, - "name": "unnamedWire#127", + "pin2": { + "compName": "Splitter#3", + "pinName": "O1" + }, + "name": "unnamedWire#94", "path": [ - { - "x": 185.0, - "y": 750.0 - }, - { - "x": 185.0, - "y": 885.0 - }, { "x": 330.0, - "y": 885.0 + "y": 550.0 }, { "x": 330.0, - "y": 550.0 + "y": 725.0 } ] }, { "pin1": { - "compName": "andor414#5", - "pinName": "Y3" + "compName": "Splitter#3", + "pinName": "O2" }, "pin2": { "compName": "_submodelinterface", "pinName": "QB3" }, - "name": "unnamedWire#128", + "name": "unnamedWire#95", "path": [ { - "x": 180.0, - "y": 760.0 - }, - { - "x": 180.0, - "y": 890.0 - }, - { - "x": 335.0, - "y": 890.0 + "x": 325.0, + "y": 715.0 }, { - "x": 335.0, + "x": 325.0, "y": 650.0 } ] }, { "pin1": { - "compName": "andor414#5", - "pinName": "Y4" - }, - "pin2": { "compName": "_submodelinterface", "pinName": "QB4" }, - "name": "unnamedWire#129", + "pin2": { + "compName": "Splitter#3", + "pinName": "O3" + }, + "name": "unnamedWire#96", "path": [ { - "x": 175.0, - "y": 770.0 - }, - { - "x": 175.0, - "y": 895.0 - }, - { - "x": 340.0, - "y": 895.0 + "x": 320.0, + "y": 750.0 }, { - "x": 340.0, - "y": 750.0 + "x": 320.0, + "y": 705.0 } ] }, @@ -2827,7 +2109,7 @@ "compName": "and41#0", "pinName": "Y" }, - "name": "unnamedWire#130", + "name": "unnamedWire#97", "path": [ { "x": 190.0, @@ -2848,7 +2130,7 @@ "compName": "and41#0", "pinName": "A" }, - "name": "unnamedWire#131", + "name": "unnamedWire#98", "path": [] } ], diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json index d818b022..9daa3bb5 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json @@ -199,8 +199,8 @@ "id": "Splitter", "name": "Splitter#0", "pos": { - "x": 140.0, - "y": 440.0 + "x": 295.0, + "y": 900.0 }, "params": { "logicWidth": 4, @@ -223,7 +223,7 @@ "id": "Splitter", "name": "Splitter#2", "pos": { - "x": 137.5, + "x": 135.0, "y": 375.0 }, "params": { @@ -235,8 +235,8 @@ "id": "Splitter", "name": "Splitter#3", "pos": { - "x": 235.0, - "y": 490.0 + "x": 295.0, + "y": 785.0 }, "params": { "logicWidth": 4, @@ -267,6 +267,78 @@ "orientation": "LEFT" } }, + { + "id": "Splitter", + "name": "Splitter#6", + "pos": { + "x": 135.0, + "y": 485.0 + }, + "params": { + "logicWidth": 4, + "orientation": "LEFT" + } + }, + { + "id": "Splitter", + "name": "Splitter#7", + "pos": { + "x": 135.0, + "y": 525.0 + }, + "params": { + "logicWidth": 4, + "orientation": "LEFT" + } + }, + { + "id": "Splitter", + "name": "Splitter#8", + "pos": { + "x": 135.0, + "y": 635.0 + }, + "params": { + "logicWidth": 4, + "orientation": "LEFT" + } + }, + { + "id": "Splitter", + "name": "Splitter#9", + "pos": { + "x": 135.0, + "y": 675.0 + }, + "params": { + "logicWidth": 4, + "orientation": "LEFT" + } + }, + { + "id": "Splitter", + "name": "Splitter#10", + "pos": { + "x": 135.0, + "y": 785.0 + }, + "params": { + "logicWidth": 4, + "orientation": "LEFT" + } + }, + { + "id": "Splitter", + "name": "Splitter#11", + "pos": { + "x": 135.0, + "y": 825.0 + }, + "params": { + "logicWidth": 4, + "orientation": "LEFT" + } + }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", @@ -548,7 +620,7 @@ "name": "andor414#0", "pos": { "x": 250.0, - "y": 485.0 + "y": 475.0 } }, { @@ -556,7 +628,7 @@ "name": "andor414#1", "pos": { "x": 250.0, - "y": 635.0 + "y": 625.0 } }, { @@ -564,7 +636,7 @@ "name": "andor414#2", "pos": { "x": 250.0, - "y": 785.0 + "y": 775.0 } }, { @@ -1713,43 +1785,34 @@ }, { "pin1": { - "compName": "demux2#0", - "pinName": "Y10" + "compName": "Splitter#8", + "pinName": "I" }, "pin2": { "compName": "andor414#4", - "pinName": "B" + "pinName": "A" }, "name": "unnamedWire#75", - "path": [ - { - "x": 125.0, - "y": 70.0 - }, - { - "x": 125.0, - "y": 670.0 - } - ] + "path": [] }, { "pin1": { - "compName": "demux2#0", - "pinName": "Y11" - }, - "pin2": { "compName": "andor414#5", "pinName": "B" }, + "pin2": { + "compName": "demux2#0", + "pinName": "Y11" + }, "name": "unnamedWire#76", "path": [ { "x": 120.0, - "y": 80.0 + "y": 820.0 }, { "x": 120.0, - "y": 820.0 + "y": 80.0 } ] }, @@ -1783,7 +1846,7 @@ "path": [ { "x": 225.0, - "y": 570.0 + "y": 560.0 } ] }, @@ -1800,7 +1863,7 @@ "path": [ { "x": 220.0, - "y": 720.0 + "y": 710.0 } ] }, @@ -1817,7 +1880,7 @@ "path": [ { "x": 215.0, - "y": 870.0 + "y": 860.0 } ] }, @@ -1871,24 +1934,15 @@ }, { "pin1": { - "compName": "ram2#1", - "pinName": "QB1" + "compName": "Splitter#7", + "pinName": "O0" }, "pin2": { - "compName": "andor414#0", - "pinName": "A1" + "compName": "ram2#1", + "pinName": "QB1" }, "name": "unnamedWire#85", - "path": [ - { - "x": 140.0, - "y": 525.0 - }, - { - "x": 140.0, - "y": 530.0 - } - ] + "path": [] }, { "pin1": { @@ -1896,41 +1950,23 @@ "pinName": "QB2" }, "pin2": { - "compName": "andor414#0", - "pinName": "A2" + "compName": "Splitter#7", + "pinName": "O1" }, "name": "unnamedWire#86", - "path": [ - { - "x": 140.0, - "y": 535.0 - }, - { - "x": 140.0, - "y": 540.0 - } - ] + "path": [] }, { "pin1": { - "compName": "ram2#1", - "pinName": "QB3" + "compName": "Splitter#7", + "pinName": "O2" }, "pin2": { - "compName": "andor414#0", - "pinName": "A3" + "compName": "ram2#1", + "pinName": "QB3" }, "name": "unnamedWire#87", - "path": [ - { - "x": 140.0, - "y": 545.0 - }, - { - "x": 140.0, - "y": 550.0 - } - ] + "path": [] }, { "pin1": { @@ -1938,20 +1974,11 @@ "pinName": "QB4" }, "pin2": { - "compName": "andor414#0", - "pinName": "A4" + "compName": "Splitter#7", + "pinName": "O3" }, "name": "unnamedWire#88", - "path": [ - { - "x": 140.0, - "y": 555.0 - }, - { - "x": 140.0, - "y": 560.0 - } - ] + "path": [] }, { "pin1": { @@ -1959,41 +1986,23 @@ "pinName": "QB1" }, "pin2": { - "compName": "andor414#1", - "pinName": "A1" + "compName": "Splitter#9", + "pinName": "O0" }, "name": "unnamedWire#89", - "path": [ - { - "x": 140.0, - "y": 675.0 - }, - { - "x": 140.0, - "y": 680.0 - } - ] + "path": [] }, { "pin1": { - "compName": "ram2#2", - "pinName": "QB2" + "compName": "Splitter#9", + "pinName": "O1" }, "pin2": { - "compName": "andor414#1", - "pinName": "A2" + "compName": "ram2#2", + "pinName": "QB2" }, "name": "unnamedWire#90", - "path": [ - { - "x": 140.0, - "y": 685.0 - }, - { - "x": 140.0, - "y": 690.0 - } - ] + "path": [] }, { "pin1": { @@ -2001,125 +2010,71 @@ "pinName": "QB3" }, "pin2": { - "compName": "andor414#1", - "pinName": "A3" + "compName": "Splitter#9", + "pinName": "O2" }, "name": "unnamedWire#91", - "path": [ - { - "x": 140.0, - "y": 695.0 - }, - { - "x": 140.0, - "y": 700.0 - } - ] + "path": [] }, { "pin1": { - "compName": "ram2#2", - "pinName": "QB4" + "compName": "Splitter#9", + "pinName": "O3" }, "pin2": { - "compName": "andor414#1", - "pinName": "A4" + "compName": "ram2#2", + "pinName": "QB4" }, "name": "unnamedWire#92", - "path": [ - { - "x": 140.0, - "y": 705.0 - }, - { - "x": 140.0, - "y": 710.0 - } - ] + "path": [] }, { "pin1": { "compName": "ram2#3", - "pinName": "QB1" + "pinName": "QB4" }, "pin2": { - "compName": "andor414#2", - "pinName": "A1" + "compName": "Splitter#11", + "pinName": "O3" }, "name": "unnamedWire#93", - "path": [ - { - "x": 140.0, - "y": 825.0 - }, - { - "x": 140.0, - "y": 830.0 - } - ] + "path": [] }, { "pin1": { - "compName": "ram2#3", - "pinName": "QB2" + "compName": "Splitter#11", + "pinName": "O2" }, "pin2": { - "compName": "andor414#2", - "pinName": "A2" + "compName": "ram2#3", + "pinName": "QB3" }, "name": "unnamedWire#94", - "path": [ - { - "x": 140.0, - "y": 835.0 - }, - { - "x": 140.0, - "y": 840.0 - } - ] + "path": [] }, { "pin1": { "compName": "ram2#3", - "pinName": "QB3" + "pinName": "QB2" }, "pin2": { - "compName": "andor414#2", - "pinName": "A3" + "compName": "Splitter#11", + "pinName": "O1" }, "name": "unnamedWire#95", - "path": [ - { - "x": 140.0, - "y": 845.0 - }, - { - "x": 140.0, - "y": 850.0 - } - ] + "path": [] }, { "pin1": { - "compName": "ram2#3", - "pinName": "QB4" + "compName": "Splitter#11", + "pinName": "O0" }, "pin2": { - "compName": "andor414#2", - "pinName": "A4" + "compName": "ram2#3", + "pinName": "QB1" }, "name": "unnamedWire#96", - "path": [ - { - "x": 140.0, - "y": 855.0 - }, - { - "x": 140.0, - "y": 860.0 - } - ] + "path": [] }, { "pin1": { @@ -2171,213 +2126,132 @@ }, { "pin1": { - "compName": "ram2#1", - "pinName": "QA1" + "compName": "Splitter#6", + "pinName": "I" }, "pin2": { "compName": "andor414#3", - "pinName": "A1" + "pinName": "A" }, "name": "unnamedWire#101", - "path": [ - { - "x": 140.0, - "y": 485.0 - }, - { - "x": 140.0, - "y": 480.0 - } - ] + "path": [] }, { "pin1": { "compName": "ram2#1", - "pinName": "QA2" + "pinName": "QA4" }, "pin2": { - "compName": "andor414#3", - "pinName": "A2" + "compName": "Splitter#6", + "pinName": "O3" }, "name": "unnamedWire#102", - "path": [ - { - "x": 140.0, - "y": 495.0 - }, - { - "x": 140.0, - "y": 490.0 - } - ] + "path": [] }, { "pin1": { - "compName": "ram2#1", - "pinName": "QA3" + "compName": "Splitter#6", + "pinName": "O2" }, "pin2": { - "compName": "andor414#3", - "pinName": "A3" + "compName": "ram2#1", + "pinName": "QA3" }, "name": "unnamedWire#103", - "path": [ - { - "x": 140.0, - "y": 505.0 - }, - { - "x": 140.0, - "y": 500.0 - } - ] + "path": [] }, { "pin1": { "compName": "ram2#1", - "pinName": "QA4" + "pinName": "QA2" }, "pin2": { - "compName": "andor414#3", - "pinName": "A4" + "compName": "Splitter#6", + "pinName": "O1" }, "name": "unnamedWire#104", - "path": [ - { - "x": 140.0, - "y": 515.0 - }, - { - "x": 140.0, - "y": 510.0 - } - ] + "path": [] }, { "pin1": { - "compName": "ram2#2", - "pinName": "QA1" + "compName": "demux2#0", + "pinName": "Y10" }, "pin2": { "compName": "andor414#4", - "pinName": "A1" + "pinName": "B" }, "name": "unnamedWire#105", "path": [ { - "x": 140.0, - "y": 635.0 + "x": 125.0, + "y": 70.0 }, { - "x": 140.0, - "y": 630.0 + "x": 125.0, + "y": 670.0 } ] }, { "pin1": { - "compName": "ram2#2", - "pinName": "QA2" + "compName": "Splitter#8", + "pinName": "O0" }, "pin2": { - "compName": "andor414#4", - "pinName": "A2" + "compName": "ram2#2", + "pinName": "QA1" }, "name": "unnamedWire#106", - "path": [ - { - "x": 140.0, - "y": 645.0 - }, - { - "x": 140.0, - "y": 640.0 - } - ] + "path": [] }, { "pin1": { "compName": "ram2#2", - "pinName": "QA3" + "pinName": "QA2" }, "pin2": { - "compName": "andor414#4", - "pinName": "A3" + "compName": "Splitter#8", + "pinName": "O1" }, "name": "unnamedWire#107", - "path": [ - { - "x": 140.0, - "y": 655.0 - }, - { - "x": 140.0, - "y": 650.0 - } - ] + "path": [] }, { "pin1": { - "compName": "ram2#2", - "pinName": "QA4" + "compName": "Splitter#8", + "pinName": "O2" }, "pin2": { - "compName": "andor414#4", - "pinName": "A4" + "compName": "ram2#2", + "pinName": "QA3" }, "name": "unnamedWire#108", - "path": [ - { - "x": 140.0, - "y": 665.0 - }, - { - "x": 140.0, - "y": 660.0 - } - ] + "path": [] }, { "pin1": { - "compName": "ram2#3", - "pinName": "QA1" + "compName": "Splitter#10", + "pinName": "O0" }, "pin2": { - "compName": "andor414#5", - "pinName": "A1" + "compName": "ram2#3", + "pinName": "QA1" }, "name": "unnamedWire#109", - "path": [ - { - "x": 140.0, - "y": 785.0 - }, - { - "x": 140.0, - "y": 780.0 - } - ] + "path": [] }, { "pin1": { - "compName": "ram2#3", - "pinName": "QA2" + "compName": "Splitter#10", + "pinName": "O1" }, "pin2": { - "compName": "andor414#5", - "pinName": "A2" + "compName": "ram2#3", + "pinName": "QA2" }, "name": "unnamedWire#110", - "path": [ - { - "x": 140.0, - "y": 795.0 - }, - { - "x": 140.0, - "y": 790.0 - } - ] + "path": [] }, { "pin1": { @@ -2385,828 +2259,468 @@ "pinName": "QA3" }, "pin2": { - "compName": "andor414#5", - "pinName": "A3" + "compName": "Splitter#10", + "pinName": "O2" }, "name": "unnamedWire#111", - "path": [ - { - "x": 140.0, - "y": 805.0 - }, - { - "x": 140.0, - "y": 800.0 - } - ] - }, - { - "pin1": { - "compName": "ram2#3", - "pinName": "QA4" - }, - "pin2": { - "compName": "andor414#5", - "pinName": "A4" - }, - "name": "unnamedWire#112", - "path": [ - { - "x": 140.0, - "y": 815.0 - }, - { - "x": 140.0, - "y": 810.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O0" - }, - "pin2": { - "compName": "andor414#0", - "pinName": "C1" - }, - "name": "unnamedWire#113", "path": [] }, { "pin1": { - "compName": "Splitter#3", - "pinName": "O1" - }, - "pin2": { - "compName": "andor414#0", - "pinName": "C2" - }, - "name": "unnamedWire#114", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O2" + "compName": "Splitter#10", + "pinName": "O3" }, "pin2": { - "compName": "andor414#0", - "pinName": "C3" + "compName": "ram2#3", + "pinName": "QA4" }, - "name": "unnamedWire#115", + "name": "unnamedWire#112", "path": [] }, { "pin1": { - "compName": "andor414#0", - "pinName": "C4" + "compName": "and41#1", + "pinName": "Y" }, "pin2": { - "compName": "Splitter#3", - "pinName": "O3" - }, - "name": "unnamedWire#116", - "path": [] - }, - { - "pin1": { "compName": "andor414#0", - "pinName": "Y1" - }, - "pin2": { - "compName": "andor414#1", - "pinName": "C1" + "pinName": "C" }, - "name": "unnamedWire#117", + "name": "unnamedWire#113", "path": [ { - "x": 305.0, - "y": 490.0 + "x": 290.0, + "y": 390.0 }, { - "x": 305.0, - "y": 595.0 + "x": 290.0, + "y": 470.0 }, { "x": 245.0, - "y": 595.0 + "y": 470.0 }, { "x": 245.0, - "y": 640.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#0", - "pinName": "Y2" - }, - "pin2": { - "compName": "andor414#1", - "pinName": "C2" - }, - "name": "unnamedWire#118", - "path": [ - { - "x": 300.0, "y": 500.0 - }, - { - "x": 300.0, - "y": 590.0 - }, - { - "x": 240.0, - "y": 590.0 - }, - { - "x": 240.0, - "y": 650.0 } ] }, { "pin1": { "compName": "andor414#0", - "pinName": "Y3" - }, - "pin2": { - "compName": "andor414#1", - "pinName": "C3" - }, - "name": "unnamedWire#119", - "path": [ - { - "x": 295.0, - "y": 510.0 - }, - { - "x": 295.0, - "y": 585.0 - }, - { - "x": 235.0, - "y": 585.0 - }, - { - "x": 235.0, - "y": 660.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#0", - "pinName": "Y4" + "pinName": "Y" }, "pin2": { "compName": "andor414#1", - "pinName": "C4" + "pinName": "C" }, - "name": "unnamedWire#120", + "name": "unnamedWire#114", "path": [ { "x": 290.0, - "y": 520.0 + "y": 500.0 }, { "x": 290.0, - "y": 580.0 - }, - { - "x": 230.0, - "y": 580.0 - }, - { - "x": 230.0, - "y": 670.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#1", - "pinName": "Y1" - }, - "pin2": { - "compName": "andor414#2", - "pinName": "C1" - }, - "name": "unnamedWire#121", - "path": [ - { - "x": 305.0, - "y": 640.0 - }, - { - "x": 305.0, - "y": 745.0 + "y": 620.0 }, { "x": 245.0, - "y": 745.0 + "y": 620.0 }, { "x": 245.0, - "y": 790.0 + "y": 650.0 } ] }, { "pin1": { "compName": "andor414#1", - "pinName": "Y2" + "pinName": "Y" }, "pin2": { "compName": "andor414#2", - "pinName": "C2" + "pinName": "C" }, - "name": "unnamedWire#122", + "name": "unnamedWire#115", "path": [ { - "x": 300.0, + "x": 290.0, "y": 650.0 }, { - "x": 300.0, - "y": 740.0 + "x": 290.0, + "y": 770.0 }, { - "x": 240.0, - "y": 740.0 + "x": 245.0, + "y": 770.0 }, { - "x": 240.0, + "x": 245.0, "y": 800.0 } ] }, { "pin1": { - "compName": "andor414#1", - "pinName": "Y3" - }, - "pin2": { "compName": "andor414#2", - "pinName": "C3" - }, - "name": "unnamedWire#123", - "path": [ - { - "x": 295.0, - "y": 660.0 - }, - { - "x": 295.0, - "y": 735.0 - }, - { - "x": 235.0, - "y": 735.0 - }, - { - "x": 235.0, - "y": 810.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#1", - "pinName": "Y4" + "pinName": "Y" }, "pin2": { - "compName": "andor414#2", - "pinName": "C4" + "compName": "Splitter#3", + "pinName": "I" }, - "name": "unnamedWire#124", - "path": [ - { - "x": 290.0, - "y": 670.0 - }, - { - "x": 290.0, - "y": 730.0 - }, - { - "x": 230.0, - "y": 730.0 - }, - { - "x": 230.0, - "y": 820.0 - } - ] + "name": "unnamedWire#116", + "path": [] }, { "pin1": { - "compName": "andor414#2", - "pinName": "Y1" + "compName": "Splitter#3", + "pinName": "O0" }, "pin2": { "compName": "_submodelinterface", "pinName": "QB1" }, - "name": "unnamedWire#125", + "name": "unnamedWire#117", "path": [ { - "x": 330.0, - "y": 790.0 + "x": 345.0, + "y": 815.0 }, { - "x": 330.0, + "x": 345.0, "y": 450.0 } ] }, { "pin1": { - "compName": "andor414#2", - "pinName": "Y2" - }, - "pin2": { "compName": "_submodelinterface", "pinName": "QB2" }, - "name": "unnamedWire#126", + "pin2": { + "compName": "Splitter#3", + "pinName": "O1" + }, + "name": "unnamedWire#118", "path": [ { - "x": 335.0, - "y": 800.0 + "x": 340.0, + "y": 550.0 }, { - "x": 335.0, - "y": 550.0 + "x": 340.0, + "y": 805.0 } ] }, { "pin1": { - "compName": "andor414#2", - "pinName": "Y3" + "compName": "Splitter#3", + "pinName": "O2" }, "pin2": { "compName": "_submodelinterface", "pinName": "QB3" }, - "name": "unnamedWire#127", + "name": "unnamedWire#119", "path": [ { - "x": 340.0, - "y": 810.0 + "x": 335.0, + "y": 795.0 }, { - "x": 340.0, + "x": 335.0, "y": 650.0 } ] }, { "pin1": { - "compName": "andor414#2", - "pinName": "Y4" - }, - "pin2": { "compName": "_submodelinterface", "pinName": "QB4" }, - "name": "unnamedWire#128", + "pin2": { + "compName": "Splitter#3", + "pinName": "O3" + }, + "name": "unnamedWire#120", "path": [ { - "x": 345.0, - "y": 820.0 + "x": 330.0, + "y": 750.0 }, { - "x": 345.0, - "y": 750.0 + "x": 330.0, + "y": 785.0 } ] }, { "pin1": { - "compName": "Splitter#0", + "compName": "Splitter#6", "pinName": "O0" }, "pin2": { - "compName": "andor414#3", - "pinName": "C1" - }, - "name": "unnamedWire#129", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O1" - }, - "pin2": { - "compName": "andor414#3", - "pinName": "C2" + "compName": "ram2#1", + "pinName": "QA1" }, - "name": "unnamedWire#130", + "name": "unnamedWire#121", "path": [] }, { "pin1": { - "compName": "Splitter#0", - "pinName": "O2" + "compName": "Splitter#7", + "pinName": "I" }, "pin2": { - "compName": "andor414#3", - "pinName": "C3" + "compName": "andor414#0", + "pinName": "A" }, - "name": "unnamedWire#131", + "name": "unnamedWire#122", "path": [] }, { "pin1": { - "compName": "andor414#3", - "pinName": "C4" + "compName": "ram2#2", + "pinName": "QA4" }, "pin2": { - "compName": "Splitter#0", + "compName": "Splitter#8", "pinName": "O3" }, - "name": "unnamedWire#132", + "name": "unnamedWire#123", "path": [] }, { "pin1": { - "compName": "andor414#3", - "pinName": "Y1" + "compName": "Splitter#9", + "pinName": "I" }, "pin2": { - "compName": "andor414#4", - "pinName": "C1" + "compName": "andor414#1", + "pinName": "A" }, - "name": "unnamedWire#133", - "path": [ - { - "x": 210.0, - "y": 440.0 - }, - { - "x": 210.0, - "y": 580.0 - }, - { - "x": 150.0, - "y": 580.0 - }, - { - "x": 150.0, - "y": 590.0 - } - ] + "name": "unnamedWire#124", + "path": [] }, { "pin1": { - "compName": "andor414#3", - "pinName": "Y2" + "compName": "Splitter#10", + "pinName": "I" }, "pin2": { - "compName": "andor414#4", - "pinName": "C2" + "compName": "andor414#5", + "pinName": "A" }, - "name": "unnamedWire#134", - "path": [ - { - "x": 205.0, - "y": 450.0 - }, - { - "x": 205.0, - "y": 575.0 - }, - { - "x": 145.0, - "y": 575.0 - }, - { - "x": 145.0, - "y": 600.0 - } - ] + "name": "unnamedWire#125", + "path": [] }, { "pin1": { - "compName": "andor414#3", - "pinName": "Y3" + "compName": "Splitter#11", + "pinName": "I" }, "pin2": { - "compName": "andor414#4", - "pinName": "C3" + "compName": "andor414#2", + "pinName": "A" }, - "name": "unnamedWire#135", - "path": [ - { - "x": 200.0, - "y": 460.0 - }, - { - "x": 200.0, - "y": 570.0 - }, - { - "x": 140.0, - "y": 570.0 - }, - { - "x": 140.0, - "y": 610.0 - } - ] + "name": "unnamedWire#126", + "path": [] }, { "pin1": { - "compName": "andor414#3", - "pinName": "Y4" + "compName": "and41#2", + "pinName": "Y" }, "pin2": { - "compName": "andor414#4", - "pinName": "C4" + "compName": "andor414#3", + "pinName": "C" }, - "name": "unnamedWire#136", + "name": "unnamedWire#127", "path": [ { "x": 195.0, - "y": 470.0 + "y": 350.0 }, { "x": 195.0, - "y": 565.0 - }, - { - "x": 135.0, - "y": 565.0 - }, - { - "x": 135.0, - "y": 620.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#4", - "pinName": "Y1" - }, - "pin2": { - "compName": "andor414#5", - "pinName": "C1" - }, - "name": "unnamedWire#137", - "path": [ - { - "x": 210.0, - "y": 590.0 - }, - { - "x": 210.0, - "y": 730.0 + "y": 430.0 }, { "x": 150.0, - "y": 730.0 + "y": 430.0 }, { "x": 150.0, - "y": 740.0 + "y": 460.0 } ] }, { "pin1": { - "compName": "andor414#4", - "pinName": "Y2" + "compName": "andor414#3", + "pinName": "Y" }, "pin2": { - "compName": "andor414#5", - "pinName": "C2" + "compName": "andor414#4", + "pinName": "C" }, - "name": "unnamedWire#138", + "name": "unnamedWire#128", "path": [ { - "x": 205.0, - "y": 600.0 + "x": 195.0, + "y": 460.0 }, { - "x": 205.0, - "y": 725.0 + "x": 195.0, + "y": 580.0 }, { - "x": 145.0, - "y": 725.0 + "x": 150.0, + "y": 580.0 }, { - "x": 145.0, - "y": 750.0 + "x": 150.0, + "y": 610.0 } ] }, { "pin1": { "compName": "andor414#4", - "pinName": "Y3" + "pinName": "Y" }, "pin2": { "compName": "andor414#5", - "pinName": "C3" + "pinName": "C" }, - "name": "unnamedWire#139", + "name": "unnamedWire#129", "path": [ { - "x": 200.0, + "x": 195.0, "y": 610.0 }, { - "x": 200.0, - "y": 720.0 + "x": 195.0, + "y": 730.0 }, { - "x": 140.0, - "y": 720.0 + "x": 150.0, + "y": 730.0 }, { - "x": 140.0, + "x": 150.0, "y": 760.0 } ] }, { "pin1": { - "compName": "andor414#4", - "pinName": "Y4" + "compName": "andor414#5", + "pinName": "Y" }, "pin2": { - "compName": "andor414#5", - "pinName": "C4" + "compName": "Splitter#0", + "pinName": "I" }, - "name": "unnamedWire#140", + "name": "unnamedWire#130", "path": [ { "x": 195.0, - "y": 620.0 + "y": 760.0 }, { "x": 195.0, - "y": 715.0 - }, - { - "x": 135.0, - "y": 715.0 - }, - { - "x": 135.0, - "y": 770.0 + "y": 915.0 } ] }, { "pin1": { - "compName": "andor414#5", - "pinName": "Y1" + "compName": "Splitter#0", + "pinName": "O3" }, "pin2": { "compName": "_submodelinterface", - "pinName": "QA1" + "pinName": "QA4" }, - "name": "unnamedWire#141", + "name": "unnamedWire#131", "path": [ - { - "x": 210.0, - "y": 740.0 - }, - { - "x": 210.0, - "y": 880.0 - }, { "x": 310.0, - "y": 880.0 + "y": 900.0 }, { "x": 310.0, - "y": 50.0 + "y": 350.0 } ] }, { "pin1": { - "compName": "andor414#5", - "pinName": "Y2" + "compName": "_submodelinterface", + "pinName": "QA3" }, "pin2": { - "compName": "_submodelinterface", - "pinName": "QA2" + "compName": "Splitter#0", + "pinName": "O2" }, - "name": "unnamedWire#142", + "name": "unnamedWire#132", "path": [ - { - "x": 205.0, - "y": 750.0 - }, - { - "x": 205.0, - "y": 885.0 - }, { "x": 315.0, - "y": 885.0 + "y": 250.0 }, { "x": 315.0, - "y": 150.0 + "y": 910.0 } ] }, { "pin1": { - "compName": "andor414#5", - "pinName": "Y3" + "compName": "Splitter#0", + "pinName": "O1" }, "pin2": { "compName": "_submodelinterface", - "pinName": "QA3" + "pinName": "QA2" }, - "name": "unnamedWire#143", + "name": "unnamedWire#133", "path": [ - { - "x": 200.0, - "y": 760.0 - }, - { - "x": 200.0, - "y": 890.0 - }, { "x": 320.0, - "y": 890.0 + "y": 920.0 }, { "x": 320.0, - "y": 250.0 + "y": 150.0 } ] }, { "pin1": { - "compName": "andor414#5", - "pinName": "Y4" + "compName": "_submodelinterface", + "pinName": "QA1" }, "pin2": { - "compName": "_submodelinterface", - "pinName": "QA4" + "compName": "Splitter#0", + "pinName": "O0" }, - "name": "unnamedWire#144", + "name": "unnamedWire#134", "path": [ - { - "x": 195.0, - "y": 770.0 - }, - { - "x": 195.0, - "y": 895.0 - }, { "x": 325.0, - "y": 895.0 + "y": 50.0 }, { "x": 325.0, - "y": 350.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "I" - }, - "pin2": { - "compName": "and41#2", - "pinName": "Y" - }, - "name": "unnamedWire#145", - "path": [ - { - "x": 135.0, - "y": 455.0 - }, - { - "x": 135.0, - "y": 430.0 - }, - { - "x": 195.0, - "y": 430.0 - }, - { - "x": 195.0, - "y": 350.0 + "y": 930.0 } ] }, @@ -3219,7 +2733,7 @@ "compName": "and41#2", "pinName": "A" }, - "name": "unnamedWire#146", + "name": "unnamedWire#135", "path": [] }, { @@ -3231,38 +2745,9 @@ "compName": "and41#1", "pinName": "A" }, - "name": "unnamedWire#147", + "name": "unnamedWire#136", "path": [] }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "I" - }, - "pin2": { - "compName": "and41#1", - "pinName": "Y" - }, - "name": "unnamedWire#148", - "path": [ - { - "x": 230.0, - "y": 505.0 - }, - { - "x": 230.0, - "y": 460.0 - }, - { - "x": 290.0, - "y": 460.0 - }, - { - "x": 290.0, - "y": 390.0 - } - ] - }, { "pin1": { "compName": "and41#0", @@ -3272,7 +2757,7 @@ "compName": "Splitter#4", "pinName": "I" }, - "name": "unnamedWire#149", + "name": "unnamedWire#137", "path": [ { "x": 290.0, @@ -3293,7 +2778,7 @@ "compName": "and41#0", "pinName": "A" }, - "name": "unnamedWire#150", + "name": "unnamedWire#138", "path": [] } ], -- 2.17.1