From: Daniel Kirschten Date: Thu, 8 Oct 2020 15:40:38 +0000 (+0200) Subject: Cleaned and41 X-Git-Url: https://mograsim.net/gitweb/?p=Mograsim.git;a=commitdiff_plain;h=fd24001741bef589628e036e26cf3dba1dd7921c Cleaned and41 --- diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and41.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and41.json index d2ce1ab4..5b8d710e 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and41.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and41.json @@ -1,47 +1,20 @@ { - "width": 15.0, - "height": 50.0, + "width": 35.0, + "height": 40.0, "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "A1", - "logicWidth": 1, - "usage": "INPUT" - }, { "location": { "x": 0.0, "y": 15.0 }, - "name": "A2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "A3", - "logicWidth": 1, + "name": "A", + "logicWidth": 4, "usage": "INPUT" }, { "location": { "x": 0.0, - "y": 35.0 - }, - "name": "A4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 45.0 + "y": 30.0 }, "name": "B", "logicWidth": 1, @@ -49,50 +22,47 @@ }, { "location": { - "x": 15.0, - "y": 5.0 - }, - "name": "Y1", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 15.0, + "x": 35.0, "y": 15.0 }, - "name": "Y2", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 15.0, - "y": 25.0 - }, - "name": "Y3", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 15.0, - "y": 35.0 - }, - "name": "Y4", - "logicWidth": 1, + "name": "Y", + "logicWidth": 4, "usage": "OUTPUT" } ], "innerScale": 0.4, "submodel": { "components": [ + { + "id": "Splitter", + "name": "Splitter#0", + "pos": { + "x": 5.0, + "y": 22.5 + }, + "params": { + "logicWidth": 4, + "orientation": "RIGHT" + } + }, + { + "id": "Splitter", + "name": "Splitter#1", + "pos": { + "x": 72.5, + "y": 22.5 + }, + "params": { + "logicWidth": 4, + "orientation": "LEFT" + } + }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", "pos": { - "x": 4.0, - "y": 46.5 + "x": 26.5, + "y": 41.5 }, "params": 1 }, @@ -100,8 +70,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#1", "pos": { - "x": 4.0, - "y": 71.5 + "x": 26.5, + "y": 66.5 }, "params": 1 }, @@ -109,8 +79,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#2", "pos": { - "x": 4.0, - "y": 96.5 + "x": 26.5, + "y": 74.0 }, "params": 1 }, @@ -118,32 +88,32 @@ "id": "and", "name": "and#0", "pos": { - "x": 7.5, - "y": 7.5 + "x": 32.5, + "y": 2.5 } }, { "id": "and", "name": "and#1", "pos": { - "x": 7.5, - "y": 32.5 + "x": 32.5, + "y": 27.5 } }, { "id": "and", "name": "and#2", "pos": { - "x": 7.5, - "y": 57.5 + "x": 32.5, + "y": 52.5 } }, { "id": "and", "name": "and#3", "pos": { - "x": 7.5, - "y": 82.5 + "x": 32.5, + "y": 77.5 } } ], @@ -151,34 +121,43 @@ { "pin1": { "compName": "_submodelinterface", - "pinName": "A1" + "pinName": "A" }, "pin2": { - "compName": "and#0", - "pinName": "A" + "compName": "Splitter#0", + "pinName": "I" }, "name": "unnamedWire#0", "path": [] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "A2" + "compName": "Splitter#0", + "pinName": "O3" }, "pin2": { - "compName": "and#1", + "compName": "and#0", "pinName": "A" }, "name": "unnamedWire#1", - "path": [] + "path": [ + { + "x": 20.0, + "y": 22.5 + }, + { + "x": 20.0, + "y": 7.5 + } + ] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "A3" + "compName": "Splitter#0", + "pinName": "O2" }, "pin2": { - "compName": "and#2", + "compName": "and#1", "pinName": "A" }, "name": "unnamedWire#2", @@ -186,15 +165,24 @@ }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "A4" + "compName": "Splitter#0", + "pinName": "O1" }, "pin2": { - "compName": "and#3", + "compName": "and#2", "pinName": "A" }, "name": "unnamedWire#3", - "path": [] + "path": [ + { + "x": 25.0, + "y": 42.5 + }, + { + "x": 25.0, + "y": 57.5 + } + ] }, { "pin1": { @@ -206,12 +194,7 @@ "pinName": "" }, "name": "unnamedWire#4", - "path": [ - { - "x": 5.0, - "y": 112.5 - } - ] + "path": [] }, { "pin1": { @@ -223,7 +206,12 @@ "pinName": "B" }, "name": "unnamedWire#5", - "path": [] + "path": [ + { + "x": 27.5, + "y": 92.5 + } + ] }, { "pin1": { @@ -285,33 +273,54 @@ "name": "unnamedWire#10", "path": [ { - "x": 5.0, - "y": 22.5 + "x": 27.5, + "y": 17.5 } ] }, { "pin1": { - "compName": "and#0", - "pinName": "Y" + "compName": "Splitter#1", + "pinName": "I" }, "pin2": { "compName": "_submodelinterface", - "pinName": "Y1" + "pinName": "Y" }, "name": "unnamedWire#11", "path": [] }, { "pin1": { - "compName": "and#1", + "compName": "and#0", "pinName": "Y" }, "pin2": { - "compName": "_submodelinterface", - "pinName": "Y2" + "compName": "Splitter#1", + "pinName": "O3" }, "name": "unnamedWire#12", + "path": [ + { + "x": 67.5, + "y": 7.5 + }, + { + "x": 67.5, + "y": 22.5 + } + ] + }, + { + "pin1": { + "compName": "Splitter#1", + "pinName": "O2" + }, + "pin2": { + "compName": "and#1", + "pinName": "Y" + }, + "name": "unnamedWire#13", "path": [] }, { @@ -320,23 +329,62 @@ "pinName": "Y" }, "pin2": { - "compName": "_submodelinterface", - "pinName": "Y3" + "compName": "Splitter#1", + "pinName": "O1" }, - "name": "unnamedWire#13", - "path": [] + "name": "unnamedWire#14", + "path": [ + { + "x": 62.5, + "y": 57.5 + }, + { + "x": 62.5, + "y": 42.5 + } + ] }, { "pin1": { + "compName": "Splitter#1", + "pinName": "O0" + }, + "pin2": { "compName": "and#3", "pinName": "Y" }, + "name": "unnamedWire#15", + "path": [ + { + "x": 67.5, + "y": 52.5 + }, + { + "x": 67.5, + "y": 82.5 + } + ] + }, + { + "pin1": { + "compName": "Splitter#0", + "pinName": "O0" + }, "pin2": { - "compName": "_submodelinterface", - "pinName": "Y4" + "compName": "and#3", + "pinName": "A" }, - "name": "unnamedWire#14", - "path": [] + "name": "unnamedWire#16", + "path": [ + { + "x": 20.0, + "y": 52.5 + }, + { + "x": 20.0, + "y": 82.5 + } + ] } ], "version": "0.1.1" 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 6a1554e8..a9b97195 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 @@ -123,11 +123,35 @@ "innerScale": 0.4, "submodel": { "components": [ + { + "id": "Splitter", + "name": "Splitter#0", + "pos": { + "x": 20.0, + "y": 82.5 + }, + "params": { + "logicWidth": 4, + "orientation": "RIGHT" + } + }, + { + "id": "Splitter", + "name": "Splitter#1", + "pos": { + "x": 15.0, + "y": 142.5 + }, + "params": { + "logicWidth": 4, + "orientation": "LEFT" + } + }, { "id": "and41", "name": "and41#0", "pos": { - "x": 15.0, + "x": 35.0, "y": 142.5 } }, @@ -144,86 +168,50 @@ { "pin1": { "compName": "_submodelinterface", - "pinName": "A1" + "pinName": "A4" }, "pin2": { - "compName": "and41#0", - "pinName": "A1" + "compName": "Splitter#1", + "pinName": "O3" }, "name": "unnamedWire#0", - "path": [ - { - "x": 10.0, - "y": 112.5 - }, - { - "x": 10.0, - "y": 147.5 - } - ] + "path": [] }, { "pin1": { "compName": "_submodelinterface", - "pinName": "A2" + "pinName": "A3" }, "pin2": { - "compName": "and41#0", - "pinName": "A2" + "compName": "Splitter#1", + "pinName": "O2" }, "name": "unnamedWire#1", - "path": [ - { - "x": 5.0, - "y": 137.5 - }, - { - "x": 5.0, - "y": 157.5 - } - ] + "path": [] }, { "pin1": { "compName": "_submodelinterface", - "pinName": "A3" + "pinName": "A2" }, "pin2": { - "compName": "and41#0", - "pinName": "A3" + "compName": "Splitter#1", + "pinName": "O1" }, "name": "unnamedWire#2", - "path": [ - { - "x": 10.0, - "y": 162.5 - }, - { - "x": 10.0, - "y": 167.5 - } - ] + "path": [] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "A4" + "compName": "Splitter#1", + "pinName": "O0" }, "pin2": { - "compName": "and41#0", - "pinName": "A4" + "compName": "_submodelinterface", + "pinName": "A1" }, "name": "unnamedWire#3", - "path": [ - { - "x": 5.0, - "y": 187.5 - }, - { - "x": 5.0, - "y": 177.5 - } - ] + "path": [] }, { "pin1": { @@ -237,12 +225,12 @@ "name": "unnamedWire#4", "path": [ { - "x": 10.0, + "x": 30.0, "y": 212.5 }, { - "x": 10.0, - "y": 187.5 + "x": 30.0, + "y": 172.5 } ] }, @@ -323,119 +311,51 @@ }, { "pin1": { - "compName": "and41#0", - "pinName": "Y1" + "compName": "Splitter#0", + "pinName": "O3" }, "pin2": { "compName": "or_4#0", - "pinName": "B1" + "pinName": "B4" }, "name": "unnamedWire#9", - "path": [ - { - "x": 50.0, - "y": 147.5 - }, - { - "x": 50.0, - "y": 122.5 - }, - { - "x": 30.0, - "y": 122.5 - }, - { - "x": 30.0, - "y": 82.5 - } - ] + "path": [] }, { "pin1": { - "compName": "and41#0", - "pinName": "Y2" + "compName": "Splitter#0", + "pinName": "O2" }, "pin2": { "compName": "or_4#0", - "pinName": "B2" + "pinName": "B3" }, "name": "unnamedWire#10", - "path": [ - { - "x": 45.0, - "y": 157.5 - }, - { - "x": 45.0, - "y": 127.5 - }, - { - "x": 25.0, - "y": 127.5 - }, - { - "x": 25.0, - "y": 92.5 - } - ] + "path": [] }, { "pin1": { - "compName": "and41#0", - "pinName": "Y3" + "compName": "or_4#0", + "pinName": "B2" }, "pin2": { - "compName": "or_4#0", - "pinName": "B3" + "compName": "Splitter#0", + "pinName": "O1" }, "name": "unnamedWire#11", - "path": [ - { - "x": 40.0, - "y": 167.5 - }, - { - "x": 40.0, - "y": 132.5 - }, - { - "x": 20.0, - "y": 132.5 - }, - { - "x": 20.0, - "y": 102.5 - } - ] + "path": [] }, { "pin1": { - "compName": "and41#0", - "pinName": "Y4" + "compName": "Splitter#0", + "pinName": "O0" }, "pin2": { "compName": "or_4#0", - "pinName": "B4" + "pinName": "B1" }, "name": "unnamedWire#12", - "path": [ - { - "x": 35.0, - "y": 177.5 - }, - { - "x": 35.0, - "y": 137.5 - }, - { - "x": 15.0, - "y": 137.5 - }, - { - "x": 15.0, - "y": 112.5 - } - ] + "path": [] }, { "pin1": { @@ -511,6 +431,47 @@ "y": 87.5 } ] + }, + { + "pin1": { + "compName": "Splitter#0", + "pinName": "I" + }, + "pin2": { + "compName": "and41#0", + "pinName": "Y" + }, + "name": "unnamedWire#17", + "path": [ + { + "x": 15.0, + "y": 97.5 + }, + { + "x": 15.0, + "y": 127.5 + }, + { + "x": 75.0, + "y": 127.5 + }, + { + "x": 75.0, + "y": 157.5 + } + ] + }, + { + "pin1": { + "compName": "Splitter#1", + "pinName": "I" + }, + "pin2": { + "compName": "and41#0", + "pinName": "A" + }, + "name": "unnamedWire#18", + "path": [] } ], "version": "0.1.1" 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 436d07f2..489306ef 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 @@ -159,11 +159,71 @@ "innerScale": 0.1, "submodel": { "components": [ + { + "id": "Splitter", + "name": "Splitter#0", + "pos": { + "x": 45.0, + "y": 220.0 + }, + "params": { + "logicWidth": 4, + "orientation": "LEFT" + } + }, + { + "id": "Splitter", + "name": "Splitter#1", + "pos": { + "x": 130.0, + "y": 155.0 + }, + "params": { + "logicWidth": 4, + "orientation": "LEFT" + } + }, + { + "id": "Splitter", + "name": "Splitter#2", + "pos": { + "x": 110.0, + "y": 330.0 + }, + "params": { + "logicWidth": 4, + "orientation": "LEFT" + } + }, + { + "id": "Splitter", + "name": "Splitter#3", + "pos": { + "x": 120.0, + "y": 440.0 + }, + "params": { + "logicWidth": 4, + "orientation": "RIGHT" + } + }, + { + "id": "Splitter", + "name": "Splitter#4", + "pos": { + "x": 220.0, + "y": 490.0 + }, + "params": { + "logicWidth": 4, + "orientation": "RIGHT" + } + }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", "pos": { - "x": 109.0, + "x": 121.5, "y": 154.0 }, "params": 1 @@ -308,40 +368,13 @@ "name": "WireCrossPoint#16", "pos": { "x": 129.0, - "y": 329.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#17", - "pos": { - "x": 124.0, - "y": 339.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#18", - "pos": { - "x": 119.0, "y": 349.0 }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#19", - "pos": { - "x": 114.0, - "y": 359.0 - }, - "params": 1 + "params": 4 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#20", + "name": "WireCrossPoint#17", "pos": { "x": 129.0, "y": 479.0 @@ -350,7 +383,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#21", + "name": "WireCrossPoint#18", "pos": { "x": 124.0, "y": 489.0 @@ -359,7 +392,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#22", + "name": "WireCrossPoint#19", "pos": { "x": 119.0, "y": 499.0 @@ -368,7 +401,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#23", + "name": "WireCrossPoint#20", "pos": { "x": 114.0, "y": 509.0 @@ -377,7 +410,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#24", + "name": "WireCrossPoint#21", "pos": { "x": 129.0, "y": 629.0 @@ -386,7 +419,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#25", + "name": "WireCrossPoint#22", "pos": { "x": 124.0, "y": 639.0 @@ -395,7 +428,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#26", + "name": "WireCrossPoint#23", "pos": { "x": 119.0, "y": 649.0 @@ -404,7 +437,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#27", + "name": "WireCrossPoint#24", "pos": { "x": 114.0, "y": 659.0 @@ -413,7 +446,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#28", + "name": "WireCrossPoint#25", "pos": { "x": 129.0, "y": 779.0 @@ -422,7 +455,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#29", + "name": "WireCrossPoint#26", "pos": { "x": 124.0, "y": 789.0 @@ -431,7 +464,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#30", + "name": "WireCrossPoint#27", "pos": { "x": 119.0, "y": 799.0 @@ -440,7 +473,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#31", + "name": "WireCrossPoint#28", "pos": { "x": 114.0, "y": 809.0 @@ -451,8 +484,8 @@ "id": "and41", "name": "and41#0", "pos": { - "x": 130.0, - "y": 150.0 + "x": 150.0, + "y": 155.0 } }, { @@ -468,7 +501,7 @@ "name": "and41#2", "pos": { "x": 135.0, - "y": 325.0 + "y": 335.0 } }, { @@ -694,48 +727,48 @@ }, { "pin1": { - "compName": "WireCrossPoint#0", + "compName": "WireCrossPoint#3", "pinName": "" }, "pin2": { - "compName": "and41#0", - "pinName": "A1" + "compName": "Splitter#1", + "pinName": "O3" }, "name": "unnamedWire#8", "path": [] }, { "pin1": { - "compName": "WireCrossPoint#1", + "compName": "WireCrossPoint#2", "pinName": "" }, "pin2": { - "compName": "and41#0", - "pinName": "A2" + "compName": "Splitter#1", + "pinName": "O2" }, "name": "unnamedWire#9", "path": [] }, { "pin1": { - "compName": "WireCrossPoint#2", + "compName": "WireCrossPoint#1", "pinName": "" }, "pin2": { - "compName": "and41#0", - "pinName": "A3" + "compName": "Splitter#1", + "pinName": "O1" }, "name": "unnamedWire#10", "path": [] }, { "pin1": { - "compName": "WireCrossPoint#3", + "compName": "WireCrossPoint#0", "pinName": "" }, "pin2": { - "compName": "and41#0", - "pinName": "A4" + "compName": "Splitter#1", + "pinName": "O0" }, "name": "unnamedWire#11", "path": [] @@ -760,48 +793,40 @@ "y": 300.0 }, { - "x": 125.0, + "x": 145.0, "y": 300.0 }, { - "x": 125.0, - "y": 195.0 + "x": 145.0, + "y": 185.0 } ] }, { "pin1": { - "compName": "and41#0", - "pinName": "Y1" - }, - "pin2": { "compName": "dlatch4#0", "pinName": "C" }, + "pin2": { + "compName": "Splitter#0", + "pinName": "O0" + }, "name": "unnamedWire#13", "path": [ - { - "x": 185.0, - "y": 155.0 - }, - { - "x": 185.0, - "y": 250.0 - }, { "x": 30.0, - "y": 250.0 + "y": 370.0 }, { "x": 30.0, - "y": 370.0 + "y": 250.0 } ] }, { "pin1": { - "compName": "and41#0", - "pinName": "Y2" + "compName": "Splitter#0", + "pinName": "O1" }, "pin2": { "compName": "dlatch4#1", @@ -809,17 +834,9 @@ }, "name": "unnamedWire#14", "path": [ - { - "x": 180.0, - "y": 165.0 - }, - { - "x": 180.0, - "y": 245.0 - }, { "x": 25.0, - "y": 245.0 + "y": 240.0 }, { "x": 25.0, @@ -829,8 +846,8 @@ }, { "pin1": { - "compName": "and41#0", - "pinName": "Y3" + "compName": "Splitter#0", + "pinName": "O2" }, "pin2": { "compName": "dlatch4#2", @@ -838,17 +855,9 @@ }, "name": "unnamedWire#15", "path": [ - { - "x": 175.0, - "y": 175.0 - }, - { - "x": 175.0, - "y": 240.0 - }, { "x": 20.0, - "y": 240.0 + "y": 230.0 }, { "x": 20.0, @@ -858,8 +867,8 @@ }, { "pin1": { - "compName": "and41#0", - "pinName": "Y4" + "compName": "Splitter#0", + "pinName": "O3" }, "pin2": { "compName": "dlatch4#3", @@ -867,17 +876,9 @@ }, "name": "unnamedWire#16", "path": [ - { - "x": 170.0, - "y": 185.0 - }, - { - "x": 170.0, - "y": 235.0 - }, { "x": 15.0, - "y": 235.0 + "y": 220.0 }, { "x": 15.0, @@ -1264,11 +1265,11 @@ { "pin1": { "compName": "dlatch4#0", - "pinName": "Q1" + "pinName": "Q4" }, "pin2": { - "compName": "WireCrossPoint#16", - "pinName": "" + "compName": "Splitter#2", + "pinName": "O3" }, "name": "unnamedWire#45", "path": [] @@ -1276,11 +1277,11 @@ { "pin1": { "compName": "dlatch4#0", - "pinName": "Q2" + "pinName": "Q3" }, "pin2": { - "compName": "WireCrossPoint#17", - "pinName": "" + "compName": "Splitter#2", + "pinName": "O2" }, "name": "unnamedWire#46", "path": [] @@ -1288,23 +1289,23 @@ { "pin1": { "compName": "dlatch4#0", - "pinName": "Q3" + "pinName": "Q2" }, "pin2": { - "compName": "WireCrossPoint#18", - "pinName": "" + "compName": "Splitter#2", + "pinName": "O1" }, "name": "unnamedWire#47", "path": [] }, { "pin1": { - "compName": "dlatch4#0", - "pinName": "Q4" + "compName": "Splitter#2", + "pinName": "O0" }, "pin2": { - "compName": "WireCrossPoint#19", - "pinName": "" + "compName": "dlatch4#0", + "pinName": "Q1" }, "name": "unnamedWire#48", "path": [] @@ -1315,7 +1316,7 @@ "pinName": "Q1" }, "pin2": { - "compName": "WireCrossPoint#20", + "compName": "WireCrossPoint#17", "pinName": "" }, "name": "unnamedWire#49", @@ -1327,7 +1328,7 @@ "pinName": "Q2" }, "pin2": { - "compName": "WireCrossPoint#21", + "compName": "WireCrossPoint#18", "pinName": "" }, "name": "unnamedWire#50", @@ -1339,7 +1340,7 @@ "pinName": "Q3" }, "pin2": { - "compName": "WireCrossPoint#22", + "compName": "WireCrossPoint#19", "pinName": "" }, "name": "unnamedWire#51", @@ -1351,7 +1352,7 @@ "pinName": "Q4" }, "pin2": { - "compName": "WireCrossPoint#23", + "compName": "WireCrossPoint#20", "pinName": "" }, "name": "unnamedWire#52", @@ -1363,7 +1364,7 @@ "pinName": "Q1" }, "pin2": { - "compName": "WireCrossPoint#24", + "compName": "WireCrossPoint#21", "pinName": "" }, "name": "unnamedWire#53", @@ -1375,7 +1376,7 @@ "pinName": "Q2" }, "pin2": { - "compName": "WireCrossPoint#25", + "compName": "WireCrossPoint#22", "pinName": "" }, "name": "unnamedWire#54", @@ -1387,7 +1388,7 @@ "pinName": "Q3" }, "pin2": { - "compName": "WireCrossPoint#26", + "compName": "WireCrossPoint#23", "pinName": "" }, "name": "unnamedWire#55", @@ -1399,7 +1400,7 @@ "pinName": "Q4" }, "pin2": { - "compName": "WireCrossPoint#27", + "compName": "WireCrossPoint#24", "pinName": "" }, "name": "unnamedWire#56", @@ -1411,7 +1412,7 @@ "pinName": "Q1" }, "pin2": { - "compName": "WireCrossPoint#28", + "compName": "WireCrossPoint#25", "pinName": "" }, "name": "unnamedWire#57", @@ -1423,7 +1424,7 @@ "pinName": "Q2" }, "pin2": { - "compName": "WireCrossPoint#29", + "compName": "WireCrossPoint#26", "pinName": "" }, "name": "unnamedWire#58", @@ -1435,7 +1436,7 @@ "pinName": "Q3" }, "pin2": { - "compName": "WireCrossPoint#30", + "compName": "WireCrossPoint#27", "pinName": "" }, "name": "unnamedWire#59", @@ -1447,7 +1448,7 @@ "pinName": "Q4" }, "pin2": { - "compName": "WireCrossPoint#31", + "compName": "WireCrossPoint#28", "pinName": "" }, "name": "unnamedWire#60", @@ -1470,7 +1471,7 @@ }, { "x": 210.0, - "y": 420.0 + "y": 405.0 } ] }, @@ -1549,8 +1550,8 @@ "name": "unnamedWire#65", "path": [ { - "x": 110.0, - "y": 370.0 + "x": 125.0, + "y": 365.0 } ] }, @@ -1607,75 +1608,82 @@ }, { "pin1": { - "compName": "WireCrossPoint#16", - "pinName": "" + "compName": "Splitter#2", + "pinName": "I" }, "pin2": { - "compName": "and41#1", - "pinName": "A1" + "compName": "WireCrossPoint#16", + "pinName": "" }, "name": "unnamedWire#69", "path": [ { "x": 130.0, - "y": 380.0 + "y": 345.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#17", + "compName": "WireCrossPoint#16", "pinName": "" }, "pin2": { - "compName": "and41#1", - "pinName": "A2" + "compName": "and41#2", + "pinName": "A" }, "name": "unnamedWire#70", - "path": [ - { - "x": 125.0, - "y": 390.0 - } - ] + "path": [] }, { "pin1": { - "compName": "WireCrossPoint#18", - "pinName": "" + "compName": "and41#1", + "pinName": "A" }, "pin2": { - "compName": "and41#1", - "pinName": "A3" + "compName": "WireCrossPoint#16", + "pinName": "" }, "name": "unnamedWire#71", "path": [ { - "x": 120.0, - "y": 400.0 + "x": 130.0, + "y": 390.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#19", - "pinName": "" + "compName": "Splitter#3", + "pinName": "I" }, "pin2": { - "compName": "and41#1", - "pinName": "A4" + "compName": "and41#2", + "pinName": "Y" }, "name": "unnamedWire#72", "path": [ { "x": 115.0, - "y": 410.0 + "y": 455.0 + }, + { + "x": 115.0, + "y": 412.5 + }, + { + "x": 175.0, + "y": 412.5 + }, + { + "x": 175.0, + "y": 350.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#20", + "compName": "WireCrossPoint#17", "pinName": "" }, "pin2": { @@ -1692,7 +1700,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#21", + "compName": "WireCrossPoint#18", "pinName": "" }, "pin2": { @@ -1709,7 +1717,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#22", + "compName": "WireCrossPoint#19", "pinName": "" }, "pin2": { @@ -1726,7 +1734,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#23", + "compName": "WireCrossPoint#20", "pinName": "" }, "pin2": { @@ -1743,7 +1751,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#24", + "compName": "WireCrossPoint#21", "pinName": "" }, "pin2": { @@ -1760,7 +1768,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#25", + "compName": "WireCrossPoint#22", "pinName": "" }, "pin2": { @@ -1777,7 +1785,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#26", + "compName": "WireCrossPoint#23", "pinName": "" }, "pin2": { @@ -1794,7 +1802,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#27", + "compName": "WireCrossPoint#24", "pinName": "" }, "pin2": { @@ -1811,7 +1819,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#28", + "compName": "WireCrossPoint#25", "pinName": "" }, "pin2": { @@ -1828,7 +1836,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#29", + "compName": "WireCrossPoint#26", "pinName": "" }, "pin2": { @@ -1845,7 +1853,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#30", + "compName": "WireCrossPoint#27", "pinName": "" }, "pin2": { @@ -1862,7 +1870,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#31", + "compName": "WireCrossPoint#28", "pinName": "" }, "pin2": { @@ -1879,55 +1887,55 @@ }, { "pin1": { - "compName": "WireCrossPoint#16", - "pinName": "" + "compName": "Splitter#3", + "pinName": "O0" }, "pin2": { - "compName": "and41#2", - "pinName": "A1" + "compName": "andor414#3", + "pinName": "C1" }, "name": "unnamedWire#85", "path": [] }, { "pin1": { - "compName": "WireCrossPoint#17", - "pinName": "" + "compName": "Splitter#3", + "pinName": "O1" }, "pin2": { - "compName": "and41#2", - "pinName": "A2" + "compName": "andor414#3", + "pinName": "C2" }, "name": "unnamedWire#86", "path": [] }, { "pin1": { - "compName": "WireCrossPoint#18", - "pinName": "" + "compName": "Splitter#3", + "pinName": "O2" }, "pin2": { - "compName": "and41#2", - "pinName": "A3" + "compName": "andor414#3", + "pinName": "C3" }, "name": "unnamedWire#87", "path": [] }, { "pin1": { - "compName": "WireCrossPoint#19", - "pinName": "" + "compName": "Splitter#3", + "pinName": "O3" }, "pin2": { - "compName": "and41#2", - "pinName": "A4" + "compName": "andor414#3", + "pinName": "C4" }, "name": "unnamedWire#88", "path": [] }, { "pin1": { - "compName": "WireCrossPoint#20", + "compName": "WireCrossPoint#17", "pinName": "" }, "pin2": { @@ -1939,7 +1947,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#21", + "compName": "WireCrossPoint#18", "pinName": "" }, "pin2": { @@ -1951,7 +1959,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#22", + "compName": "WireCrossPoint#19", "pinName": "" }, "pin2": { @@ -1963,7 +1971,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#23", + "compName": "WireCrossPoint#20", "pinName": "" }, "pin2": { @@ -1975,7 +1983,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#24", + "compName": "WireCrossPoint#21", "pinName": "" }, "pin2": { @@ -1987,7 +1995,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#25", + "compName": "WireCrossPoint#22", "pinName": "" }, "pin2": { @@ -1999,7 +2007,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#26", + "compName": "WireCrossPoint#23", "pinName": "" }, "pin2": { @@ -2011,7 +2019,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#27", + "compName": "WireCrossPoint#24", "pinName": "" }, "pin2": { @@ -2023,7 +2031,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#28", + "compName": "WireCrossPoint#25", "pinName": "" }, "pin2": { @@ -2035,7 +2043,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#29", + "compName": "WireCrossPoint#26", "pinName": "" }, "pin2": { @@ -2047,7 +2055,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#30", + "compName": "WireCrossPoint#27", "pinName": "" }, "pin2": { @@ -2059,7 +2067,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#31", + "compName": "WireCrossPoint#28", "pinName": "" }, "pin2": { @@ -2071,119 +2079,51 @@ }, { "pin1": { - "compName": "and41#1", - "pinName": "Y1" + "compName": "Splitter#4", + "pinName": "O0" }, "pin2": { "compName": "andor414#0", "pinName": "C1" }, "name": "unnamedWire#101", - "path": [ - { - "x": 290.0, - "y": 380.0 - }, - { - "x": 290.0, - "y": 445.0 - }, - { - "x": 230.0, - "y": 445.0 - }, - { - "x": 230.0, - "y": 490.0 - } - ] + "path": [] }, { "pin1": { - "compName": "and41#1", - "pinName": "Y2" + "compName": "Splitter#4", + "pinName": "O1" }, "pin2": { "compName": "andor414#0", "pinName": "C2" }, "name": "unnamedWire#102", - "path": [ - { - "x": 285.0, - "y": 390.0 - }, - { - "x": 285.0, - "y": 440.0 - }, - { - "x": 225.0, - "y": 440.0 - }, - { - "x": 225.0, - "y": 500.0 - } - ] + "path": [] }, { "pin1": { - "compName": "and41#1", - "pinName": "Y3" + "compName": "Splitter#4", + "pinName": "O2" }, "pin2": { "compName": "andor414#0", "pinName": "C3" }, "name": "unnamedWire#103", - "path": [ - { - "x": 280.0, - "y": 400.0 - }, - { - "x": 280.0, - "y": 435.0 - }, - { - "x": 220.0, - "y": 435.0 - }, - { - "x": 220.0, - "y": 510.0 - } - ] + "path": [] }, { "pin1": { - "compName": "and41#1", - "pinName": "Y4" - }, - "pin2": { "compName": "andor414#0", "pinName": "C4" }, + "pin2": { + "compName": "Splitter#4", + "pinName": "O3" + }, "name": "unnamedWire#104", - "path": [ - { - "x": 275.0, - "y": 410.0 - }, - { - "x": 275.0, - "y": 430.0 - }, - { - "x": 215.0, - "y": 430.0 - }, - { - "x": 215.0, - "y": 520.0 - } - ] + "path": [] }, { "pin1": { @@ -2503,117 +2443,30 @@ }, { "pin1": { - "compName": "and41#2", - "pinName": "Y1" + "compName": "and41#1", + "pinName": "Y" }, "pin2": { - "compName": "andor414#3", - "pinName": "C1" + "compName": "Splitter#4", + "pinName": "I" }, "name": "unnamedWire#117", "path": [ { - "x": 190.0, - "y": 330.0 - }, - { - "x": 190.0, - "y": 430.0 - }, - { - "x": 130.0, - "y": 430.0 - }, - { - "x": 130.0, - "y": 440.0 - } - ] - }, - { - "pin1": { - "compName": "and41#2", - "pinName": "Y2" - }, - "pin2": { - "compName": "andor414#3", - "pinName": "C2" - }, - "name": "unnamedWire#118", - "path": [ - { - "x": 185.0, - "y": 340.0 - }, - { - "x": 185.0, - "y": 425.0 - }, - { - "x": 125.0, - "y": 425.0 - }, - { - "x": 125.0, - "y": 450.0 - } - ] - }, - { - "pin1": { - "compName": "and41#2", - "pinName": "Y3" - }, - "pin2": { - "compName": "andor414#3", - "pinName": "C3" - }, - "name": "unnamedWire#119", - "path": [ - { - "x": 180.0, - "y": 350.0 + "x": 275.0, + "y": 390.0 }, { - "x": 180.0, + "x": 275.0, "y": 420.0 }, { - "x": 120.0, + "x": 215.0, "y": 420.0 }, { - "x": 120.0, - "y": 460.0 - } - ] - }, - { - "pin1": { - "compName": "and41#2", - "pinName": "Y4" - }, - "pin2": { - "compName": "andor414#3", - "pinName": "C4" - }, - "name": "unnamedWire#120", - "path": [ - { - "x": 175.0, - "y": 360.0 - }, - { - "x": 175.0, - "y": 415.0 - }, - { - "x": 115.0, - "y": 415.0 - }, - { - "x": 115.0, - "y": 470.0 + "x": 215.0, + "y": 505.0 } ] }, @@ -2626,7 +2479,7 @@ "compName": "andor414#4", "pinName": "C1" }, - "name": "unnamedWire#121", + "name": "unnamedWire#118", "path": [ { "x": 190.0, @@ -2655,7 +2508,7 @@ "compName": "andor414#4", "pinName": "C2" }, - "name": "unnamedWire#122", + "name": "unnamedWire#119", "path": [ { "x": 185.0, @@ -2684,7 +2537,7 @@ "compName": "andor414#4", "pinName": "C3" }, - "name": "unnamedWire#123", + "name": "unnamedWire#120", "path": [ { "x": 180.0, @@ -2713,7 +2566,7 @@ "compName": "andor414#4", "pinName": "C4" }, - "name": "unnamedWire#124", + "name": "unnamedWire#121", "path": [ { "x": 175.0, @@ -2742,7 +2595,7 @@ "compName": "andor414#5", "pinName": "C1" }, - "name": "unnamedWire#125", + "name": "unnamedWire#122", "path": [ { "x": 190.0, @@ -2771,7 +2624,7 @@ "compName": "andor414#5", "pinName": "C2" }, - "name": "unnamedWire#126", + "name": "unnamedWire#123", "path": [ { "x": 185.0, @@ -2800,7 +2653,7 @@ "compName": "andor414#5", "pinName": "C3" }, - "name": "unnamedWire#127", + "name": "unnamedWire#124", "path": [ { "x": 180.0, @@ -2829,7 +2682,7 @@ "compName": "andor414#5", "pinName": "C4" }, - "name": "unnamedWire#128", + "name": "unnamedWire#125", "path": [ { "x": 175.0, @@ -2858,7 +2711,7 @@ "compName": "_submodelinterface", "pinName": "QB1" }, - "name": "unnamedWire#129", + "name": "unnamedWire#126", "path": [ { "x": 190.0, @@ -2887,7 +2740,7 @@ "compName": "_submodelinterface", "pinName": "QB2" }, - "name": "unnamedWire#130", + "name": "unnamedWire#127", "path": [ { "x": 185.0, @@ -2916,7 +2769,7 @@ "compName": "_submodelinterface", "pinName": "QB3" }, - "name": "unnamedWire#131", + "name": "unnamedWire#128", "path": [ { "x": 180.0, @@ -2945,7 +2798,7 @@ "compName": "_submodelinterface", "pinName": "QB4" }, - "name": "unnamedWire#132", + "name": "unnamedWire#129", "path": [ { "x": 175.0, @@ -2964,6 +2817,39 @@ "y": 750.0 } ] + }, + { + "pin1": { + "compName": "Splitter#0", + "pinName": "I" + }, + "pin2": { + "compName": "and41#0", + "pinName": "Y" + }, + "name": "unnamedWire#130", + "path": [ + { + "x": 190.0, + "y": 235.0 + }, + { + "x": 190.0, + "y": 170.0 + } + ] + }, + { + "pin1": { + "compName": "Splitter#1", + "pinName": "I" + }, + "pin2": { + "compName": "and41#0", + "pinName": "A" + }, + "name": "unnamedWire#131", + "path": [] } ], "version": "0.1.1" 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 06fa3bec..d818b022 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 @@ -195,6 +195,78 @@ "innerScale": 0.1, "submodel": { "components": [ + { + "id": "Splitter", + "name": "Splitter#0", + "pos": { + "x": 140.0, + "y": 440.0 + }, + "params": { + "logicWidth": 4, + "orientation": "RIGHT" + } + }, + { + "id": "Splitter", + "name": "Splitter#1", + "pos": { + "x": 135.0, + "y": 335.0 + }, + "params": { + "logicWidth": 4, + "orientation": "LEFT" + } + }, + { + "id": "Splitter", + "name": "Splitter#2", + "pos": { + "x": 137.5, + "y": 375.0 + }, + "params": { + "logicWidth": 4, + "orientation": "LEFT" + } + }, + { + "id": "Splitter", + "name": "Splitter#3", + "pos": { + "x": 235.0, + "y": 490.0 + }, + "params": { + "logicWidth": 4, + "orientation": "RIGHT" + } + }, + { + "id": "Splitter", + "name": "Splitter#4", + "pos": { + "x": 40.0, + "y": 210.0 + }, + "params": { + "logicWidth": 4, + "orientation": "LEFT" + } + }, + { + "id": "Splitter", + "name": "Splitter#5", + "pos": { + "x": 235.0, + "y": 155.0 + }, + "params": { + "logicWidth": 4, + "orientation": "LEFT" + } + }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", @@ -451,8 +523,8 @@ "id": "and41", "name": "and41#0", "pos": { - "x": 235.0, - "y": 150.0 + "x": 250.0, + "y": 155.0 } }, { @@ -468,7 +540,7 @@ "name": "and41#2", "pos": { "x": 155.0, - "y": 325.0 + "y": 335.0 } }, { @@ -694,48 +766,48 @@ }, { "pin1": { - "compName": "WireCrossPoint#0", + "compName": "WireCrossPoint#3", "pinName": "" }, "pin2": { - "compName": "and41#0", - "pinName": "A1" + "compName": "Splitter#5", + "pinName": "O3" }, "name": "unnamedWire#8", "path": [] }, { "pin1": { - "compName": "WireCrossPoint#1", + "compName": "WireCrossPoint#2", "pinName": "" }, "pin2": { - "compName": "and41#0", - "pinName": "A2" + "compName": "Splitter#5", + "pinName": "O2" }, "name": "unnamedWire#9", "path": [] }, { "pin1": { - "compName": "WireCrossPoint#2", + "compName": "WireCrossPoint#1", "pinName": "" }, "pin2": { - "compName": "and41#0", - "pinName": "A3" + "compName": "Splitter#5", + "pinName": "O1" }, "name": "unnamedWire#10", "path": [] }, { "pin1": { - "compName": "WireCrossPoint#3", + "compName": "WireCrossPoint#0", "pinName": "" }, "pin2": { - "compName": "and41#0", - "pinName": "A4" + "compName": "Splitter#5", + "pinName": "O0" }, "name": "unnamedWire#11", "path": [] @@ -763,8 +835,8 @@ }, { "pin1": { - "compName": "and41#0", - "pinName": "Y1" + "compName": "Splitter#4", + "pinName": "O0" }, "pin2": { "compName": "ram2#0", @@ -772,17 +844,9 @@ }, "name": "unnamedWire#13", "path": [ - { - "x": 290.0, - "y": 155.0 - }, - { - "x": 290.0, - "y": 230.0 - }, { "x": 35.0, - "y": 230.0 + "y": 240.0 }, { "x": 35.0, @@ -792,8 +856,8 @@ }, { "pin1": { - "compName": "and41#0", - "pinName": "Y2" + "compName": "Splitter#4", + "pinName": "O1" }, "pin2": { "compName": "ram2#1", @@ -801,17 +865,9 @@ }, "name": "unnamedWire#14", "path": [ - { - "x": 285.0, - "y": 165.0 - }, - { - "x": 285.0, - "y": 225.0 - }, { "x": 30.0, - "y": 225.0 + "y": 230.0 }, { "x": 30.0, @@ -821,8 +877,8 @@ }, { "pin1": { - "compName": "and41#0", - "pinName": "Y3" + "compName": "Splitter#4", + "pinName": "O2" }, "pin2": { "compName": "ram2#2", @@ -830,14 +886,6 @@ }, "name": "unnamedWire#15", "path": [ - { - "x": 280.0, - "y": 175.0 - }, - { - "x": 280.0, - "y": 220.0 - }, { "x": 25.0, "y": 220.0 @@ -850,8 +898,8 @@ }, { "pin1": { - "compName": "and41#0", - "pinName": "Y4" + "compName": "Splitter#4", + "pinName": "O3" }, "pin2": { "compName": "ram2#3", @@ -859,17 +907,9 @@ }, "name": "unnamedWire#16", "path": [ - { - "x": 275.0, - "y": 185.0 - }, - { - "x": 275.0, - "y": 215.0 - }, { "x": 20.0, - "y": 215.0 + "y": 210.0 }, { "x": 20.0, @@ -1641,12 +1681,12 @@ "name": "unnamedWire#73", "path": [ { - "x": 135.0, + "x": 150.0, "y": 50.0 }, { - "x": 135.0, - "y": 370.0 + "x": 150.0, + "y": 365.0 } ] }, @@ -1726,7 +1766,7 @@ "path": [ { "x": 230.0, - "y": 420.0 + "y": 405.0 } ] }, @@ -1784,86 +1824,50 @@ { "pin1": { "compName": "ram2#0", - "pinName": "QB1" + "pinName": "QB4" }, "pin2": { - "compName": "and41#1", - "pinName": "A1" + "compName": "Splitter#2", + "pinName": "O3" }, "name": "unnamedWire#81", - "path": [ - { - "x": 140.0, - "y": 375.0 - }, - { - "x": 140.0, - "y": 380.0 - } - ] + "path": [] }, { "pin1": { - "compName": "ram2#0", - "pinName": "QB2" + "compName": "Splitter#2", + "pinName": "O2" }, "pin2": { - "compName": "and41#1", - "pinName": "A2" + "compName": "ram2#0", + "pinName": "QB3" }, "name": "unnamedWire#82", - "path": [ - { - "x": 140.0, - "y": 385.0 - }, - { - "x": 140.0, - "y": 390.0 - } - ] + "path": [] }, { "pin1": { "compName": "ram2#0", - "pinName": "QB3" + "pinName": "QB2" }, "pin2": { - "compName": "and41#1", - "pinName": "A3" + "compName": "Splitter#2", + "pinName": "O1" }, "name": "unnamedWire#83", - "path": [ - { - "x": 140.0, - "y": 395.0 - }, - { - "x": 140.0, - "y": 400.0 - } - ] + "path": [] }, { "pin1": { - "compName": "ram2#0", - "pinName": "QB4" + "compName": "Splitter#2", + "pinName": "O0" }, "pin2": { - "compName": "and41#1", - "pinName": "A4" + "compName": "ram2#0", + "pinName": "QB1" }, "name": "unnamedWire#84", - "path": [ - { - "x": 140.0, - "y": 405.0 - }, - { - "x": 140.0, - "y": 410.0 - } - ] + "path": [] }, { "pin1": { @@ -2120,86 +2124,50 @@ { "pin1": { "compName": "ram2#0", - "pinName": "QA1" + "pinName": "QA4" }, "pin2": { - "compName": "and41#2", - "pinName": "A1" + "compName": "Splitter#1", + "pinName": "O3" }, "name": "unnamedWire#97", - "path": [ - { - "x": 140.0, - "y": 335.0 - }, - { - "x": 140.0, - "y": 330.0 - } - ] + "path": [] }, { "pin1": { "compName": "ram2#0", - "pinName": "QA2" + "pinName": "QA3" }, "pin2": { - "compName": "and41#2", - "pinName": "A2" + "compName": "Splitter#1", + "pinName": "O2" }, "name": "unnamedWire#98", - "path": [ - { - "x": 140.0, - "y": 345.0 - }, - { - "x": 140.0, - "y": 340.0 - } - ] + "path": [] }, { "pin1": { - "compName": "ram2#0", - "pinName": "QA3" + "compName": "Splitter#1", + "pinName": "O1" }, "pin2": { - "compName": "and41#2", - "pinName": "A3" + "compName": "ram2#0", + "pinName": "QA2" }, "name": "unnamedWire#99", - "path": [ - { - "x": 140.0, - "y": 355.0 - }, - { - "x": 140.0, - "y": 350.0 - } - ] + "path": [] }, { "pin1": { "compName": "ram2#0", - "pinName": "QA4" + "pinName": "QA1" }, "pin2": { - "compName": "and41#2", - "pinName": "A4" + "compName": "Splitter#1", + "pinName": "O0" }, "name": "unnamedWire#100", - "path": [ - { - "x": 140.0, - "y": 365.0 - }, - { - "x": 140.0, - "y": 360.0 - } - ] + "path": [] }, { "pin1": { @@ -2455,119 +2423,51 @@ }, { "pin1": { - "compName": "and41#1", - "pinName": "Y1" + "compName": "Splitter#3", + "pinName": "O0" }, "pin2": { "compName": "andor414#0", "pinName": "C1" }, "name": "unnamedWire#113", - "path": [ - { - "x": 305.0, - "y": 380.0 - }, - { - "x": 305.0, - "y": 445.0 - }, - { - "x": 245.0, - "y": 445.0 - }, - { - "x": 245.0, - "y": 490.0 - } - ] + "path": [] }, { "pin1": { - "compName": "and41#1", - "pinName": "Y2" + "compName": "Splitter#3", + "pinName": "O1" }, "pin2": { "compName": "andor414#0", "pinName": "C2" }, "name": "unnamedWire#114", - "path": [ - { - "x": 300.0, - "y": 390.0 - }, - { - "x": 300.0, - "y": 440.0 - }, - { - "x": 240.0, - "y": 440.0 - }, - { - "x": 240.0, - "y": 500.0 - } - ] + "path": [] }, { "pin1": { - "compName": "and41#1", - "pinName": "Y3" + "compName": "Splitter#3", + "pinName": "O2" }, "pin2": { "compName": "andor414#0", "pinName": "C3" }, "name": "unnamedWire#115", - "path": [ - { - "x": 295.0, - "y": 400.0 - }, - { - "x": 295.0, - "y": 435.0 - }, - { - "x": 235.0, - "y": 435.0 - }, - { - "x": 235.0, - "y": 510.0 - } - ] + "path": [] }, { "pin1": { - "compName": "and41#1", - "pinName": "Y4" - }, - "pin2": { "compName": "andor414#0", "pinName": "C4" }, + "pin2": { + "compName": "Splitter#3", + "pinName": "O3" + }, "name": "unnamedWire#116", - "path": [ - { - "x": 290.0, - "y": 410.0 - }, - { - "x": 290.0, - "y": 430.0 - }, - { - "x": 230.0, - "y": 430.0 - }, - { - "x": 230.0, - "y": 520.0 - } - ] + "path": [] }, { "pin1": { @@ -2887,119 +2787,51 @@ }, { "pin1": { - "compName": "and41#2", - "pinName": "Y1" + "compName": "Splitter#0", + "pinName": "O0" }, "pin2": { "compName": "andor414#3", "pinName": "C1" }, "name": "unnamedWire#129", - "path": [ - { - "x": 210.0, - "y": 330.0 - }, - { - "x": 210.0, - "y": 430.0 - }, - { - "x": 150.0, - "y": 430.0 - }, - { - "x": 150.0, - "y": 440.0 - } - ] + "path": [] }, { "pin1": { - "compName": "and41#2", - "pinName": "Y2" + "compName": "Splitter#0", + "pinName": "O1" }, "pin2": { "compName": "andor414#3", "pinName": "C2" }, "name": "unnamedWire#130", - "path": [ - { - "x": 205.0, - "y": 340.0 - }, - { - "x": 205.0, - "y": 425.0 - }, - { - "x": 145.0, - "y": 425.0 - }, - { - "x": 145.0, - "y": 450.0 - } - ] + "path": [] }, { "pin1": { - "compName": "and41#2", - "pinName": "Y3" + "compName": "Splitter#0", + "pinName": "O2" }, "pin2": { "compName": "andor414#3", "pinName": "C3" }, "name": "unnamedWire#131", - "path": [ - { - "x": 200.0, - "y": 350.0 - }, - { - "x": 200.0, - "y": 420.0 - }, - { - "x": 140.0, - "y": 420.0 - }, - { - "x": 140.0, - "y": 460.0 - } - ] + "path": [] }, { "pin1": { - "compName": "and41#2", - "pinName": "Y4" - }, - "pin2": { "compName": "andor414#3", "pinName": "C4" }, + "pin2": { + "compName": "Splitter#0", + "pinName": "O3" + }, "name": "unnamedWire#132", - "path": [ - { - "x": 195.0, - "y": 360.0 - }, - { - "x": 195.0, - "y": 415.0 - }, - { - "x": 135.0, - "y": 415.0 - }, - { - "x": 135.0, - "y": 470.0 - } - ] + "path": [] }, { "pin1": { @@ -3348,6 +3180,121 @@ "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 + } + ] + }, + { + "pin1": { + "compName": "Splitter#1", + "pinName": "I" + }, + "pin2": { + "compName": "and41#2", + "pinName": "A" + }, + "name": "unnamedWire#146", + "path": [] + }, + { + "pin1": { + "compName": "Splitter#2", + "pinName": "I" + }, + "pin2": { + "compName": "and41#1", + "pinName": "A" + }, + "name": "unnamedWire#147", + "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", + "pinName": "Y" + }, + "pin2": { + "compName": "Splitter#4", + "pinName": "I" + }, + "name": "unnamedWire#149", + "path": [ + { + "x": 290.0, + "y": 170.0 + }, + { + "x": 290.0, + "y": 222.5 + } + ] + }, + { + "pin1": { + "compName": "Splitter#5", + "pinName": "I" + }, + "pin2": { + "compName": "and41#0", + "pinName": "A" + }, + "name": "unnamedWire#150", + "path": [] } ], "version": "0.1.1"