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=e7f5e6ecd11b1ab56964ce8dc93668570ebbccab;hb=2c32f5e4b0549a6b97a32cc96a36971c495ce11d;hp=6a1554e82ce480373af411d8b6aca6d4180448a5;hpb=56455a63fe2f85440189fc81856ccaa275cf10bb;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 6a1554e8..e7f5e6ec 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 @@ -1,47 +1,20 @@ { - "width": 35.0, - "height": 90.0, + "width": 30.0, + "height": 40.0, "interfacePins": [ { "location": { "x": 0.0, - "y": 45.0 - }, - "name": "A1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 55.0 - }, - "name": "A2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 65.0 - }, - "name": "A3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 75.0 + "y": 25.0 }, - "name": "A4", - "logicWidth": 1, + "name": "A", + "logicWidth": 4, "usage": "INPUT" }, { "location": { "x": 0.0, - "y": 85.0 + "y": 35.0 }, "name": "B", "logicWidth": 1, @@ -52,71 +25,17 @@ "x": 0.0, "y": 5.0 }, - "name": "C1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "C2", - "logicWidth": 1, + "name": "C", + "logicWidth": 4, "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, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, + "x": 30.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,16 +46,16 @@ "id": "and41", "name": "and41#0", "pos": { - "x": 15.0, - "y": 142.5 + "x": 20.0, + "y": 57.5 } }, { "id": "or_4", "name": "or_4#0", "pos": { - "x": 35.0, - "y": 37.5 + "x": 15.0, + "y": 2.5 } } ], @@ -144,84 +63,62 @@ { "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 + "y": 62.5 }, { "x": 10.0, - "y": 147.5 + "y": 72.5 } ] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "A2" + "compName": "or_4#0", + "pinName": "Y" }, "pin2": { - "compName": "and41#0", - "pinName": "A2" + "compName": "_submodelinterface", + "pinName": "Y" }, "name": "unnamedWire#1", - "path": [ - { - "x": 5.0, - "y": 137.5 - }, - { - "x": 5.0, - "y": 157.5 - } - ] + "path": [] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "A3" + "compName": "or_4#0", + "pinName": "B" }, "pin2": { "compName": "and41#0", - "pinName": "A3" + "pinName": "Y" }, "name": "unnamedWire#2", "path": [ { "x": 10.0, - "y": 162.5 + "y": 32.5 }, { "x": 10.0, - "y": 167.5 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A4" - }, - "pin2": { - "compName": "and41#0", - "pinName": "A4" - }, - "name": "unnamedWire#3", - "path": [ + "y": 52.5 + }, { - "x": 5.0, - "y": 187.5 + "x": 60.0, + "y": 52.5 }, { - "x": 5.0, - "y": 177.5 + "x": 60.0, + "y": 72.5 } ] }, @@ -234,283 +131,20 @@ "compName": "and41#0", "pinName": "B" }, - "name": "unnamedWire#4", - "path": [ - { - "x": 10.0, - "y": 212.5 - }, - { - "x": 10.0, - "y": 187.5 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "C1" - }, - "pin2": { - "compName": "or_4#0", - "pinName": "A1" - }, - "name": "unnamedWire#5", - "path": [ - { - "x": 10.0, - "y": 12.5 - }, - { - "x": 10.0, - "y": 42.5 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "C2" - }, - "pin2": { - "compName": "or_4#0", - "pinName": "A2" - }, - "name": "unnamedWire#6", - "path": [ - { - "x": 5.0, - "y": 37.5 - }, - { - "x": 5.0, - "y": 52.5 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "C3" - }, - "pin2": { - "compName": "or_4#0", - "pinName": "A3" - }, - "name": "unnamedWire#7", + "name": "unnamedWire#3", "path": [] }, { "pin1": { "compName": "_submodelinterface", - "pinName": "C4" - }, - "pin2": { - "compName": "or_4#0", - "pinName": "A4" - }, - "name": "unnamedWire#8", - "path": [ - { - "x": 5.0, - "y": 87.5 - }, - { - "x": 5.0, - "y": 72.5 - } - ] - }, - { - "pin1": { - "compName": "and41#0", - "pinName": "Y1" + "pinName": "C" }, "pin2": { "compName": "or_4#0", - "pinName": "B1" + "pinName": "A" }, - "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 - } - ] - }, - { - "pin1": { - "compName": "and41#0", - "pinName": "Y2" - }, - "pin2": { - "compName": "or_4#0", - "pinName": "B2" - }, - "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 - } - ] - }, - { - "pin1": { - "compName": "and41#0", - "pinName": "Y3" - }, - "pin2": { - "compName": "or_4#0", - "pinName": "B3" - }, - "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 - } - ] - }, - { - "pin1": { - "compName": "and41#0", - "pinName": "Y4" - }, - "pin2": { - "compName": "or_4#0", - "pinName": "B4" - }, - "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 - } - ] - }, - { - "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" - }, - "name": "unnamedWire#15", + "name": "unnamedWire#4", "path": [] - }, - { - "pin1": { - "compName": "or_4#0", - "pinName": "Y4" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y4" - }, - "name": "unnamedWire#16", - "path": [ - { - "x": 80.0, - "y": 72.5 - }, - { - "x": 80.0, - "y": 87.5 - } - ] } ], "version": "0.1.1"