X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fandor414.json;h=23ac1135e8be2a9c613022ff1ce3dd759483a02e;hb=989cf7da1ea37c4174bea281ae56ead12cb725be;hp=8bf2bfbb9e94085d6d146bb78a100c29d6bd8ace;hpb=d094b43f1697af4586f135790919f866cc53a9a5;p=Mograsim.git 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 8bf2bfbb..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,96 +56,78 @@ "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" } ], "innerScale": 0.4, "submodel": { "components": [ + { + "id": "Splitter", + "name": "Splitter#0", + "pos": { + "x": 17.5, + "y": 87.5 + }, + "params": { + "logicWidth": 4, + "orientation": "RIGHT" + } + }, + { + "id": "Splitter", + "name": "Splitter#1", + "pos": { + "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": 15.0, - "y": 137.5 + "x": 35.0, + "y": 147.5 } }, { "id": "or_4", "name": "or_4#0", "pos": { - "x": 35.0, - "y": 37.5 + "x": 32.5, + "y": 42.5 } } ], @@ -144,77 +135,50 @@ { "pin1": { "compName": "_submodelinterface", - "pinName": "A1" + "pinName": "A" }, "pin2": { "compName": "and41#0", - "pinName": "A1" + "pinName": "A" }, "name": "unnamedWire#0", - "path": [ - { - "x": 10.0, - "y": 112.5 - }, - { - "x": 10.0, - "y": 142.5 - } - ] + "path": [] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "A2" + "compName": "Splitter#1", + "pinName": "I" }, "pin2": { - "compName": "and41#0", - "pinName": "A2" + "compName": "_submodelinterface", + "pinName": "Y" }, "name": "unnamedWire#1", - "path": [ - { - "x": 5.0, - "y": 137.5 - }, - { - "x": 5.0, - "y": 152.5 - } - ] + "path": [] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "A3" + "compName": "or_4#0", + "pinName": "Y1" }, "pin2": { - "compName": "and41#0", - "pinName": "A3" + "compName": "Splitter#1", + "pinName": "O0" }, "name": "unnamedWire#2", "path": [] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "A4" + "compName": "or_4#0", + "pinName": "Y2" }, "pin2": { - "compName": "and41#0", - "pinName": "A4" + "compName": "Splitter#1", + "pinName": "O1" }, "name": "unnamedWire#3", - "path": [ - { - "x": 5.0, - "y": 187.5 - }, - { - "x": 5.0, - "y": 172.5 - } - ] + "path": [] }, { "pin1": { @@ -228,61 +192,43 @@ "name": "unnamedWire#4", "path": [ { - "x": 10.0, + "x": 30.0, "y": 212.5 }, { - "x": 10.0, - "y": 182.5 + "x": 30.0, + "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", @@ -293,215 +239,128 @@ }, { "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": { - "compName": "and41#0", - "pinName": "Y1" + "compName": "Splitter#0", + "pinName": "O3" }, "pin2": { "compName": "or_4#0", - "pinName": "B1" + "pinName": "B4" }, "name": "unnamedWire#9", - "path": [ - { - "x": 70.0, - "y": 142.5 - }, - { - "x": 70.0, - "y": 120.0 - }, - { - "x": 30.0, - "y": 120.0 - }, - { - "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": 65.0, - "y": 152.5 - }, - { - "x": 65.0, - "y": 125.0 - }, - { - "x": 25.0, - "y": 125.0 - }, - { - "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": 60.0, - "y": 162.5 - }, - { - "x": 60.0, - "y": 130.0 - }, - { - "x": 20.0, - "y": 130.0 - }, - { - "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": 55.0, - "y": 172.5 - }, - { - "x": 55.0, - "y": 135.0 - }, - { - "x": 15.0, - "y": 135.0 - }, - { - "x": 15.0, - "y": 112.5 - } - ] + "path": [] }, { "pin1": { "compName": "or_4#0", - "pinName": "Y1" + "pinName": "Y3" }, "pin2": { - "compName": "_submodelinterface", - "pinName": "Y1" + "compName": "Splitter#1", + "pinName": "O2" }, "name": "unnamedWire#13", - "path": [ - { - "x": 75.0, - "y": 42.5 - }, - { - "x": 75.0, - "y": 12.5 - } - ] + "path": [] }, { "pin1": { - "compName": "or_4#0", - "pinName": "Y2" + "compName": "Splitter#1", + "pinName": "O3" }, "pin2": { - "compName": "_submodelinterface", - "pinName": "Y2" + "compName": "or_4#0", + "pinName": "Y4" }, "name": "unnamedWire#14", - "path": [ - { - "x": 80.0, - "y": 52.5 - }, - { - "x": 80.0, - "y": 37.5 - } - ] + "path": [] }, { "pin1": { - "compName": "or_4#0", - "pinName": "Y3" + "compName": "Splitter#0", + "pinName": "I" }, "pin2": { - "compName": "_submodelinterface", - "pinName": "Y3" + "compName": "and41#0", + "pinName": "Y" }, "name": "unnamedWire#15", - "path": [] + "path": [ + { + "x": 12.5, + "y": 102.5 + }, + { + "x": 12.5, + "y": 127.5 + }, + { + "x": 75.0, + "y": 127.5 + }, + { + "x": 75.0, + "y": 162.5 + } + ] }, { "pin1": { "compName": "or_4#0", - "pinName": "Y4" + "pinName": "A1" }, "pin2": { - "compName": "_submodelinterface", - "pinName": "Y4" + "compName": "Splitter#2", + "pinName": "O0" }, "name": "unnamedWire#16", - "path": [ - { - "x": 80.0, - "y": 72.5 - }, - { - "x": 80.0, - "y": 87.5 - } - ] + "path": [] } ], "version": "0.1.1"