X-Git-Url: https://mograsim.net/gitweb/?p=Mograsim.git;a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fram2.json;fp=plugins%2Fnet.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fram2.json;h=80b6c65976d80287dbe9bfb01a8fc68fb3901cdf;hp=8de3e2a3f8994098c246536b9f9b2eb781ce1341;hb=b807c368a322f07144d976c502b3d242bc7ea51e;hpb=18ca9fbf3ca2d74f2bf363d27e9bc399af3de0a4 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 8de3e2a3..80b6c659 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 @@ -1,14 +1,14 @@ { - "width": 35.0, - "height": 90.0, + "width": 50.0, + "height": 75.0, "interfacePins": [ { "location": { "x": 0.0, "y": 5.0 }, - "name": "A0", - "logicWidth": 1, + "name": "A", + "logicWidth": 2, "usage": "INPUT" }, { @@ -16,155 +16,56 @@ "x": 0.0, "y": 15.0 }, - "name": "A1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "B0", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 35.0 - }, - "name": "B1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 55.0 - }, - "name": "D1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 65.0 - }, - "name": "D2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 75.0 - }, - "name": "D3", - "logicWidth": 1, + "name": "B", + "logicWidth": 2, "usage": "INPUT" }, { "location": { "x": 0.0, - "y": 85.0 + "y": 40.0 }, - "name": "D4", - "logicWidth": 1, + "name": "D", + "logicWidth": 4, "usage": "INPUT" }, { "location": { - "x": 35.0, + "x": 50.0, "y": 5.0 }, - "name": "QA1", - "logicWidth": 1, + "name": "QA", + "logicWidth": 4, "usage": "OUTPUT" }, { "location": { - "x": 35.0, + "x": 50.0, "y": 15.0 }, - "name": "QA2", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 25.0 - }, - "name": "QA3", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 35.0 - }, - "name": "QA4", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 45.0 - }, - "name": "QB1", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 55.0 - }, - "name": "QB2", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 65.0 - }, - "name": "QB3", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 75.0 - }, - "name": "QB4", - "logicWidth": 1, + "name": "QB", + "logicWidth": 4, "usage": "OUTPUT" }, { "location": { "x": 0.0, - "y": 45.0 + "y": 30.0 }, "name": "WE", "logicWidth": 1, "usage": "INPUT" } ], - "innerScale": 0.1, + "innerScale": 0.2, "submodel": { "components": [ { "id": "Splitter", "name": "Splitter#0", "pos": { - "x": 45.0, - "y": 220.0 + "x": 35.0, + "y": 110.0 }, "params": { "logicWidth": 4, @@ -175,8 +76,8 @@ "id": "Splitter", "name": "Splitter#1", "pos": { - "x": 135.0, - "y": 155.0 + "x": 110.0, + "y": 70.0 }, "params": { "logicWidth": 4, @@ -187,11 +88,11 @@ "id": "Splitter", "name": "Splitter#2", "pos": { - "x": 305.0, - "y": 560.0 + "x": 5.0, + "y": 20.0 }, "params": { - "logicWidth": 4, + "logicWidth": 2, "orientation": "RIGHT" } }, @@ -199,32 +100,20 @@ "id": "Splitter", "name": "Splitter#3", "pos": { - "x": 285.0, - "y": 505.0 + "x": 5.0, + "y": 70.0 }, "params": { - "logicWidth": 4, + "logicWidth": 2, "orientation": "RIGHT" } }, - { - "id": "Splitter", - "name": "Splitter#4", - "pos": { - "x": 20.0, - "y": 600.0 - }, - "params": { - "logicWidth": 4, - "orientation": "LEFT" - } - }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", "pos": { - "x": 129.0, - "y": 154.0 + "x": 104.0, + "y": 99.0 }, "params": 1 }, @@ -232,8 +121,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#1", "pos": { - "x": 124.0, - "y": 164.0 + "x": 99.0, + "y": 89.0 }, "params": 1 }, @@ -241,8 +130,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#2", "pos": { - "x": 119.0, - "y": 174.0 + "x": 94.0, + "y": 79.0 }, "params": 1 }, @@ -250,8 +139,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#3", "pos": { - "x": 114.0, - "y": 184.0 + "x": 89.0, + "y": 69.0 }, "params": 1 }, @@ -259,8 +148,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#4", "pos": { - "x": 49.0, - "y": 519.0 + "x": 34.0, + "y": 289.0 }, "params": 4 }, @@ -268,8 +157,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#5", "pos": { - "x": 49.0, - "y": 464.0 + "x": 34.0, + "y": 234.0 }, "params": 4 }, @@ -277,8 +166,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#6", "pos": { - "x": 49.0, - "y": 409.0 + "x": 84.0, + "y": 169.0 }, "params": 4 }, @@ -286,8 +175,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#7", "pos": { - "x": 109.0, - "y": 344.0 + "x": 84.0, + "y": 234.0 }, "params": 4 }, @@ -295,8 +184,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#8", "pos": { - "x": 109.0, - "y": 409.0 + "x": 84.0, + "y": 289.0 }, "params": 4 }, @@ -304,8 +193,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#9", "pos": { - "x": 109.0, - "y": 464.0 + "x": 84.0, + "y": 344.0 }, "params": 4 }, @@ -313,8 +202,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#10", "pos": { - "x": 109.0, - "y": 519.0 + "x": 34.0, + "y": 199.0 }, "params": 4 }, @@ -322,219 +211,192 @@ "id": "and41", "name": "and41#0", "pos": { - "x": 150.0, - "y": 155.0 + "x": 130.0, + "y": 70.0 } }, { "id": "and41", "name": "and41#1", "pos": { - "x": 235.0, - "y": 360.0 + "x": 195.0, + "y": 175.0 } }, { "id": "and41", "name": "and41#2", "pos": { - "x": 135.0, - "y": 330.0 + "x": 115.0, + "y": 145.0 } }, { "id": "andor414", "name": "andor414#0", "pos": { - "x": 240.0, - "y": 410.0 + "x": 200.0, + "y": 225.0 } }, { "id": "andor414", "name": "andor414#1", "pos": { - "x": 240.0, - "y": 465.0 + "x": 200.0, + "y": 280.0 } }, { "id": "andor414", "name": "andor414#2", "pos": { - "x": 240.0, - "y": 515.0 + "x": 200.0, + "y": 330.0 } }, { "id": "andor414", "name": "andor414#3", "pos": { - "x": 140.0, - "y": 385.0 + "x": 120.0, + "y": 200.0 } }, { "id": "andor414", "name": "andor414#4", "pos": { - "x": 140.0, - "y": 440.0 + "x": 120.0, + "y": 255.0 } }, { "id": "andor414", "name": "andor414#5", "pos": { - "x": 140.0, - "y": 495.0 + "x": 120.0, + "y": 310.0 } }, { "id": "demux2", "name": "demux2#0", "pos": { - "x": 55.0, - "y": 45.0 + "x": 20.0, + "y": 15.0 } }, { "id": "demux2", "name": "demux2#1", "pos": { - "x": 55.0, - "y": 150.0 + "x": 20.0, + "y": 65.0 } }, { "id": "dlatch4", "name": "dlatch4#0", "pos": { - "x": 55.0, - "y": 330.0 + "x": 40.0, + "y": 155.0 } }, { "id": "dlatch4", "name": "dlatch4#1", "pos": { - "x": 55.0, - "y": 395.0 + "x": 40.0, + "y": 220.0 } }, { "id": "dlatch4", "name": "dlatch4#2", "pos": { - "x": 55.0, - "y": 450.0 + "x": 40.0, + "y": 275.0 } }, { "id": "dlatch4", "name": "dlatch4#3", "pos": { - "x": 55.0, - "y": 505.0 + "x": 40.0, + "y": 330.0 } } ], "wires": [ { "pin1": { - "compName": "_submodelinterface", - "pinName": "A0" + "compName": "Splitter#2", + "pinName": "I" }, "pin2": { - "compName": "demux2#0", - "pinName": "S0" + "compName": "_submodelinterface", + "pinName": "A" }, "name": "unnamedWire#0", "path": [] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "A1" + "compName": "Splitter#2", + "pinName": "O1" }, "pin2": { "compName": "demux2#0", "pinName": "S1" }, "name": "unnamedWire#1", - "path": [ - { - "x": 10.0, - "y": 150.0 - }, - { - "x": 10.0, - "y": 60.0 - } - ] + "path": [] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "B0" + "compName": "Splitter#3", + "pinName": "O1" }, "pin2": { "compName": "demux2#1", - "pinName": "S0" + "pinName": "S1" }, "name": "unnamedWire#2", - "path": [ - { - "x": 5.0, - "y": 250.0 - }, - { - "x": 5.0, - "y": 155.0 - } - ] + "path": [] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "B1" + "compName": "demux2#1", + "pinName": "S0" }, "pin2": { - "compName": "demux2#1", - "pinName": "S1" + "compName": "Splitter#3", + "pinName": "O0" }, "name": "unnamedWire#3", - "path": [ - { - "x": 10.0, - "y": 350.0 - }, - { - "x": 10.0, - "y": 165.0 - } - ] + "path": [] }, { "pin1": { - "compName": "demux2#1", - "pinName": "Y00" + "compName": "WireCrossPoint#3", + "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" + "compName": "demux2#1", + "pinName": "Y11" }, "name": "unnamedWire#4", "path": [] }, { "pin1": { - "compName": "demux2#1", - "pinName": "Y01" + "compName": "WireCrossPoint#2", + "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" + "compName": "demux2#1", + "pinName": "Y10" }, "name": "unnamedWire#5", "path": [] @@ -542,10 +404,10 @@ { "pin1": { "compName": "demux2#1", - "pinName": "Y10" + "pinName": "Y01" }, "pin2": { - "compName": "WireCrossPoint#2", + "compName": "WireCrossPoint#1", "pinName": "" }, "name": "unnamedWire#6", @@ -553,12 +415,12 @@ }, { "pin1": { - "compName": "demux2#1", - "pinName": "Y11" + "compName": "WireCrossPoint#0", + "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" + "compName": "demux2#1", + "pinName": "Y00" }, "name": "unnamedWire#7", "path": [] @@ -577,13 +439,13 @@ }, { "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { "compName": "Splitter#1", "pinName": "O2" }, + "pin2": { + "compName": "WireCrossPoint#2", + "pinName": "" + }, "name": "unnamedWire#9", "path": [] }, @@ -601,13 +463,13 @@ }, { "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { "compName": "Splitter#1", "pinName": "O0" }, + "pin2": { + "compName": "WireCrossPoint#0", + "pinName": "" + }, "name": "unnamedWire#11", "path": [] }, @@ -623,41 +485,41 @@ "name": "unnamedWire#12", "path": [ { - "x": 5.0, - "y": 450.0 + "x": 75.0, + "y": 150.0 }, { - "x": 5.0, - "y": 300.0 + "x": 75.0, + "y": 115.0 }, { - "x": 145.0, - "y": 300.0 + "x": 125.0, + "y": 115.0 }, { - "x": 145.0, - "y": 185.0 + "x": 125.0, + "y": 100.0 } ] }, { "pin1": { - "compName": "dlatch4#0", - "pinName": "C" - }, - "pin2": { "compName": "Splitter#0", "pinName": "O0" }, + "pin2": { + "compName": "dlatch4#3", + "pinName": "C" + }, "name": "unnamedWire#13", "path": [ { "x": 30.0, - "y": 365.0 + "y": 140.0 }, { "x": 30.0, - "y": 250.0 + "y": 365.0 } ] }, @@ -667,18 +529,18 @@ "pinName": "O1" }, "pin2": { - "compName": "dlatch4#1", + "compName": "dlatch4#2", "pinName": "C" }, "name": "unnamedWire#14", "path": [ { "x": 25.0, - "y": 240.0 + "y": 130.0 }, { "x": 25.0, - "y": 430.0 + "y": 310.0 } ] }, @@ -688,18 +550,18 @@ "pinName": "O2" }, "pin2": { - "compName": "dlatch4#2", + "compName": "dlatch4#1", "pinName": "C" }, "name": "unnamedWire#15", "path": [ { "x": 20.0, - "y": 230.0 + "y": 120.0 }, { "x": 20.0, - "y": 485.0 + "y": 255.0 } ] }, @@ -709,53 +571,58 @@ "pinName": "O3" }, "pin2": { - "compName": "dlatch4#3", + "compName": "dlatch4#0", "pinName": "C" }, "name": "unnamedWire#16", "path": [ { "x": 15.0, - "y": 220.0 + "y": 110.0 }, { "x": 15.0, - "y": 540.0 + "y": 190.0 } ] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "D1" + "compName": "WireCrossPoint#4", + "pinName": "" }, "pin2": { - "compName": "Splitter#4", - "pinName": "O0" + "compName": "dlatch4#3", + "pinName": "D" }, "name": "unnamedWire#17", - "path": [] + "path": [ + { + "x": 35.0, + "y": 345.0 + } + ] }, { "pin1": { - "compName": "Splitter#4", - "pinName": "O1" + "compName": "demux2#0", + "pinName": "S0" }, "pin2": { - "compName": "_submodelinterface", - "pinName": "D2" + "compName": "Splitter#2", + "pinName": "O0" }, "name": "unnamedWire#18", "path": [] }, { "pin1": { - "compName": "Splitter#4", - "pinName": "O2" + "compName": "Splitter#3", + "pinName": "I" }, "pin2": { "compName": "_submodelinterface", - "pinName": "D3" + "pinName": "B" }, "name": "unnamedWire#19", "path": [] @@ -763,59 +630,80 @@ { "pin1": { "compName": "_submodelinterface", - "pinName": "D4" + "pinName": "D" }, "pin2": { - "compName": "Splitter#4", - "pinName": "O3" + "compName": "WireCrossPoint#10", + "pinName": "" }, "name": "unnamedWire#20", "path": [] }, { "pin1": { - "compName": "Splitter#4", - "pinName": "I" + "compName": "WireCrossPoint#10", + "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#4", + "compName": "WireCrossPoint#5", "pinName": "" }, "name": "unnamedWire#21", - "path": [ - { - "x": 50.0, - "y": 615.0 - } - ] + "path": [] }, { "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" + "compName": "andor414#2", + "pinName": "Y" }, "pin2": { - "compName": "dlatch4#3", - "pinName": "D" + "compName": "_submodelinterface", + "pinName": "QA" }, "name": "unnamedWire#22", - "path": [] + "path": [ + { + "x": 240.0, + "y": 335.0 + }, + { + "x": 240.0, + "y": 25.0 + } + ] }, { "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" + "compName": "andor414#5", + "pinName": "Y" }, "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" + "compName": "_submodelinterface", + "pinName": "QB" }, "name": "unnamedWire#23", - "path": [] + "path": [ + { + "x": 165.0, + "y": 315.0 + }, + { + "x": 165.0, + "y": 150.0 + }, + { + "x": 210.0, + "y": 150.0 + }, + { + "x": 210.0, + "y": 75.0 + } + ] }, { "pin1": { - "compName": "WireCrossPoint#5", + "compName": "WireCrossPoint#4", "pinName": "" }, "pin2": { @@ -827,11 +715,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#5", + "compName": "WireCrossPoint#4", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#6", + "compName": "WireCrossPoint#5", "pinName": "" }, "name": "unnamedWire#25", @@ -843,7 +731,7 @@ "pinName": "D" }, "pin2": { - "compName": "WireCrossPoint#6", + "compName": "WireCrossPoint#5", "pinName": "" }, "name": "unnamedWire#26", @@ -851,7 +739,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#6", + "compName": "WireCrossPoint#10", "pinName": "" }, "pin2": { @@ -861,14 +749,14 @@ "name": "unnamedWire#27", "path": [ { - "x": 50.0, - "y": 345.0 + "x": 35.0, + "y": 170.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#7", + "compName": "WireCrossPoint#6", "pinName": "" }, "pin2": { @@ -884,7 +772,7 @@ "pinName": "Q" }, "pin2": { - "compName": "WireCrossPoint#8", + "compName": "WireCrossPoint#7", "pinName": "" }, "name": "unnamedWire#29", @@ -896,7 +784,7 @@ "pinName": "Q" }, "pin2": { - "compName": "WireCrossPoint#9", + "compName": "WireCrossPoint#8", "pinName": "" }, "name": "unnamedWire#30", @@ -908,7 +796,7 @@ "pinName": "Q" }, "pin2": { - "compName": "WireCrossPoint#10", + "compName": "WireCrossPoint#9", "pinName": "" }, "name": "unnamedWire#31", @@ -916,7 +804,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#10", + "compName": "WireCrossPoint#9", "pinName": "" }, "pin2": { @@ -924,11 +812,16 @@ "pinName": "A" }, "name": "unnamedWire#32", - "path": [] + "path": [ + { + "x": 85.0, + "y": 335.0 + } + ] }, { "pin1": { - "compName": "WireCrossPoint#10", + "compName": "WireCrossPoint#9", "pinName": "" }, "pin2": { @@ -938,8 +831,8 @@ "name": "unnamedWire#33", "path": [ { - "x": 110.0, - "y": 540.0 + "x": 85.0, + "y": 355.0 } ] }, @@ -949,18 +842,18 @@ "pinName": "Y00" }, "pin2": { - "compName": "and41#1", + "compName": "andor414#2", "pinName": "B" }, "name": "unnamedWire#34", "path": [ { - "x": 210.0, + "x": 190.0, "y": 50.0 }, { - "x": 210.0, - "y": 390.0 + "x": 190.0, + "y": 365.0 } ] }, @@ -970,66 +863,66 @@ "pinName": "Y01" }, "pin2": { - "compName": "andor414#0", + "compName": "andor414#1", "pinName": "B" }, "name": "unnamedWire#35", "path": [ { - "x": 205.0, - "y": 60.0 + "x": 185.0, + "y": 40.0 }, { - "x": 205.0, - "y": 445.0 + "x": 185.0, + "y": 315.0 } ] }, { "pin1": { - "compName": "demux2#0", - "pinName": "Y10" + "compName": "andor414#0", + "pinName": "B" }, "pin2": { - "compName": "andor414#1", - "pinName": "B" + "compName": "demux2#0", + "pinName": "Y10" }, "name": "unnamedWire#36", "path": [ { - "x": 200.0, - "y": 70.0 + "x": 180.0, + "y": 260.0 }, { - "x": 200.0, - "y": 500.0 + "x": 180.0, + "y": 30.0 } ] }, { "pin1": { - "compName": "demux2#0", - "pinName": "Y11" + "compName": "and41#1", + "pinName": "B" }, "pin2": { - "compName": "andor414#2", - "pinName": "B" + "compName": "demux2#0", + "pinName": "Y11" }, "name": "unnamedWire#37", "path": [ { - "x": 195.0, - "y": 80.0 + "x": 175.0, + "y": 205.0 }, { - "x": 195.0, - "y": 550.0 + "x": 175.0, + "y": 20.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#0", + "compName": "WireCrossPoint#3", "pinName": "" }, "pin2": { @@ -1039,14 +932,14 @@ "name": "unnamedWire#38", "path": [ { - "x": 130.0, - "y": 360.0 + "x": 90.0, + "y": 175.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#1", + "compName": "WireCrossPoint#2", "pinName": "" }, "pin2": { @@ -1056,14 +949,14 @@ "name": "unnamedWire#39", "path": [ { - "x": 125.0, - "y": 420.0 + "x": 95.0, + "y": 235.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#2", + "compName": "WireCrossPoint#1", "pinName": "" }, "pin2": { @@ -1073,14 +966,14 @@ "name": "unnamedWire#40", "path": [ { - "x": 120.0, - "y": 475.0 + "x": 100.0, + "y": 290.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#3", + "compName": "WireCrossPoint#0", "pinName": "" }, "pin2": { @@ -1090,14 +983,14 @@ "name": "unnamedWire#41", "path": [ { - "x": 115.0, - "y": 530.0 + "x": 105.0, + "y": 345.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#7", + "compName": "WireCrossPoint#6", "pinName": "" }, "pin2": { @@ -1105,7 +998,12 @@ "pinName": "A" }, "name": "unnamedWire#42", - "path": [] + "path": [ + { + "x": 85.0, + "y": 160.0 + } + ] }, { "pin1": { @@ -1113,14 +1011,14 @@ "pinName": "A" }, "pin2": { - "compName": "WireCrossPoint#7", + "compName": "WireCrossPoint#6", "pinName": "" }, "name": "unnamedWire#43", "path": [ { - "x": 110.0, - "y": 375.0 + "x": 85.0, + "y": 190.0 } ] }, @@ -1136,26 +1034,26 @@ "name": "unnamedWire#44", "path": [ { - "x": 175.0, - "y": 345.0 + "x": 155.0, + "y": 160.0 }, { - "x": 175.0, - "y": 380.0 + "x": 155.0, + "y": 195.0 }, { - "x": 135.0, - "y": 380.0 + "x": 115.0, + "y": 195.0 }, { - "x": 135.0, - "y": 390.0 + "x": 115.0, + "y": 205.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#8", + "compName": "WireCrossPoint#7", "pinName": "" }, "pin2": { @@ -1163,11 +1061,16 @@ "pinName": "A" }, "name": "unnamedWire#45", - "path": [] + "path": [ + { + "x": 85.0, + "y": 225.0 + } + ] }, { "pin1": { - "compName": "WireCrossPoint#8", + "compName": "WireCrossPoint#7", "pinName": "" }, "pin2": { @@ -1177,14 +1080,14 @@ "name": "unnamedWire#46", "path": [ { - "x": 110.0, - "y": 435.0 + "x": 85.0, + "y": 250.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#9", + "compName": "WireCrossPoint#8", "pinName": "" }, "pin2": { @@ -1192,7 +1095,12 @@ "pinName": "A" }, "name": "unnamedWire#47", - "path": [] + "path": [ + { + "x": 85.0, + "y": 280.0 + } + ] }, { "pin1": { @@ -1206,20 +1114,20 @@ "name": "unnamedWire#48", "path": [ { - "x": 175.0, - "y": 390.0 + "x": 155.0, + "y": 205.0 }, { - "x": 175.0, - "y": 430.0 + "x": 155.0, + "y": 245.0 }, { - "x": 135.0, - "y": 430.0 + "x": 115.0, + "y": 245.0 }, { - "x": 135.0, - "y": 445.0 + "x": 115.0, + "y": 260.0 } ] }, @@ -1235,79 +1143,37 @@ "name": "unnamedWire#49", "path": [ { - "x": 175.0, - "y": 445.0 + "x": 155.0, + "y": 260.0 }, { - "x": 175.0, - "y": 485.0 - }, - { - "x": 135.0, - "y": 485.0 - }, - { - "x": 135.0, - "y": 500.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#5", - "pinName": "Y" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "I" - }, - "name": "unnamedWire#50", - "path": [ - { - "x": 175.0, - "y": 500.0 + "x": 155.0, + "y": 300.0 }, { - "x": 175.0, - "y": 575.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O0" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "QB1" - }, - "name": "unnamedWire#51", - "path": [ - { - "x": 335.0, - "y": 590.0 + "x": 115.0, + "y": 300.0 }, { - "x": 335.0, - "y": 450.0 + "x": 115.0, + "y": 315.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#9", + "compName": "WireCrossPoint#8", "pinName": "" }, "pin2": { "compName": "andor414#1", "pinName": "A" }, - "name": "unnamedWire#52", + "name": "unnamedWire#50", "path": [ { - "x": 110.0, - "y": 490.0 + "x": 85.0, + "y": 305.0 } ] }, @@ -1320,23 +1186,23 @@ "compName": "andor414#0", "pinName": "C" }, - "name": "unnamedWire#53", + "name": "unnamedWire#51", "path": [ { - "x": 275.0, - "y": 375.0 + "x": 235.0, + "y": 190.0 }, { - "x": 275.0, - "y": 405.0 + "x": 235.0, + "y": 220.0 }, { - "x": 235.0, - "y": 405.0 + "x": 195.0, + "y": 220.0 }, { - "x": 235.0, - "y": 415.0 + "x": 195.0, + "y": 230.0 } ] }, @@ -1349,23 +1215,23 @@ "compName": "andor414#1", "pinName": "C" }, - "name": "unnamedWire#54", + "name": "unnamedWire#52", "path": [ { - "x": 275.0, - "y": 415.0 + "x": 235.0, + "y": 230.0 }, { - "x": 275.0, - "y": 460.0 + "x": 235.0, + "y": 275.0 }, { - "x": 235.0, - "y": 460.0 + "x": 195.0, + "y": 275.0 }, { - "x": 235.0, - "y": 470.0 + "x": 195.0, + "y": 285.0 } ] }, @@ -1378,182 +1244,23 @@ "compName": "andor414#2", "pinName": "C" }, - "name": "unnamedWire#55", + "name": "unnamedWire#53", "path": [ - { - "x": 275.0, - "y": 470.0 - }, - { - "x": 275.0, - "y": 510.0 - }, { "x": 235.0, - "y": 510.0 + "y": 285.0 }, { "x": 235.0, - "y": 520.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#2", - "pinName": "Y" - }, - "pin2": { - "compName": "Splitter#3", - "pinName": "I" - }, - "name": "unnamedWire#56", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O0" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "QA1" - }, - "name": "unnamedWire#57", - "path": [ - { - "x": 315.0, - "y": 535.0 - }, - { - "x": 317.5, - "y": 50.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "QA2" - }, - "pin2": { - "compName": "Splitter#3", - "pinName": "O1" - }, - "name": "unnamedWire#58", - "path": [ - { - "x": 312.5, - "y": 150.0 - }, - { - "x": 310.0, - "y": 525.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O2" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "QA3" - }, - "name": "unnamedWire#59", - "path": [ - { - "x": 305.0, - "y": 515.0 - }, - { - "x": 307.5, - "y": 250.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "QA4" - }, - "pin2": { - "compName": "Splitter#3", - "pinName": "O3" - }, - "name": "unnamedWire#60", - "path": [ - { - "x": 300.0, - "y": 350.0 - }, - { - "x": 300.0, - "y": 505.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "QB2" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O1" - }, - "name": "unnamedWire#61", - "path": [ - { - "x": 330.0, - "y": 550.0 - }, - { - "x": 330.0, - "y": 580.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O2" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "QB3" - }, - "name": "unnamedWire#62", - "path": [ - { - "x": 325.0, - "y": 570.0 + "y": 325.0 }, { - "x": 325.0, - "y": 650.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "QB4" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O3" - }, - "name": "unnamedWire#63", - "path": [ - { - "x": 320.0, - "y": 750.0 + "x": 195.0, + "y": 325.0 }, { - "x": 320.0, - "y": 560.0 + "x": 195.0, + "y": 335.0 } ] }, @@ -1566,15 +1273,15 @@ "compName": "and41#0", "pinName": "Y" }, - "name": "unnamedWire#64", + "name": "unnamedWire#54", "path": [ { - "x": 190.0, - "y": 235.0 + "x": 170.0, + "y": 125.0 }, { - "x": 190.0, - "y": 170.0 + "x": 170.0, + "y": 85.0 } ] }, @@ -1587,7 +1294,7 @@ "compName": "and41#0", "pinName": "A" }, - "name": "unnamedWire#65", + "name": "unnamedWire#55", "path": [] } ], @@ -1608,25 +1315,25 @@ "c00": { "id": "delegating", "params": { - "delegateTarget": "dlatch4#0" + "delegateTarget": "dlatch4#3" } }, "c01": { "id": "delegating", "params": { - "delegateTarget": "dlatch4#1" + "delegateTarget": "dlatch4#2" } }, "c10": { "id": "delegating", "params": { - "delegateTarget": "dlatch4#2" + "delegateTarget": "dlatch4#1" } }, "c11": { "id": "delegating", "params": { - "delegateTarget": "dlatch4#3" + "delegateTarget": "dlatch4#0" } } },