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%2Fand41.json;h=5b8d710e7c0f3a5a2ff42a229280bd9a11832ebb;hp=d2ce1ab4ae5b7ae3e216a37a96dc88d73401e00c;hb=fd24001741bef589628e036e26cf3dba1dd7921c;hpb=4295beb495196d8cf8b6e47d2d498085411cde3c 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"