X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fam2904%2FAm2904MSR.json;h=927d41f8ebb17ff02dc83b4ed10cd14899df248f;hb=8bed58cd47f4e53a0a83e066d38864aa6875502f;hp=a5b084d719d326cdff5fa7fe2f54127414a82f04;hpb=5ab24a2ac9468d77d20b5ec41dcfafcb88e8c206;p=Mograsim.git diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json index a5b084d7..927d41f8 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json @@ -114,15 +114,6 @@ "innerScale": 0.2, "submodel": { "components": [ - { - "id": "Merger", - "name": "Merger#0", - "pos": { - "x": 385.0, - "y": 85.0 - }, - "params": 4 - }, { "id": "NandGate", "name": "NandGate#0", @@ -139,7 +130,10 @@ "x": 5.0, "y": 35.0 }, - "params": 4 + "params": { + "logicWidth": 4, + "orientation": "RIGHT" + } }, { "id": "Splitter", @@ -148,7 +142,10 @@ "x": 5.0, "y": 135.0 }, - "params": 4 + "params": { + "logicWidth": 4, + "orientation": "RIGHT" + } }, { "id": "Splitter", @@ -157,7 +154,10 @@ "x": 45.0, "y": 340.0 }, - "params": 3 + "params": { + "logicWidth": 3, + "orientation": "RIGHT" + } }, { "id": "Splitter", @@ -166,7 +166,22 @@ "x": 5.0, "y": 235.0 }, - "params": 4 + "params": { + "logicWidth": 4, + "orientation": "RIGHT" + } + }, + { + "id": "Splitter", + "name": "Splitter#4", + "pos": { + "x": 385.0, + "y": 85.0 + }, + "params": { + "logicWidth": 4, + "orientation": "LEFT" + } }, { "id": "WireCrossPoint", @@ -738,16 +753,16 @@ "pinName": "" }, "pin2": { - "compName": "Merger#0", - "pinName": "I2" + "compName": "Splitter#4", + "pinName": "O2" }, "name": "unnamedWire#27", "path": [] }, { "pin1": { - "compName": "Merger#0", - "pinName": "I3" + "compName": "Splitter#4", + "pinName": "O3" }, "pin2": { "compName": "WireCrossPoint#1", @@ -1128,8 +1143,8 @@ }, { "pin1": { - "compName": "Merger#0", - "pinName": "O" + "compName": "Splitter#4", + "pinName": "I" }, "pin2": { "compName": "_submodelinterface", @@ -1434,8 +1449,8 @@ "pinName": "" }, "pin2": { - "compName": "Merger#0", - "pinName": "I0" + "compName": "Splitter#4", + "pinName": "O0" }, "name": "unnamedWire#7", "path": [] @@ -1624,8 +1639,8 @@ }, { "pin1": { - "compName": "Merger#0", - "pinName": "I1" + "compName": "Splitter#4", + "pinName": "O1" }, "pin2": { "compName": "WireCrossPoint#3",