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%2Fram5_12.json;h=f4aa4c52ae44a1751c51bd56109c2f4847c8617b;hp=13f10a05e15ed41145b3d44ed4f2304dc1480fb1;hb=3aee914f9fccbb3aa663d0ed13c5078bac6104c8;hpb=fd24001741bef589628e036e26cf3dba1dd7921c diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram5_12.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram5_12.json index 13f10a05..f4aa4c52 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram5_12.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram5_12.json @@ -64,7 +64,7 @@ "id": "NandGate", "name": "NandGate#0", "pos": { - "x": 125.0, + "x": 155.0, "y": 20.0 }, "params": 1 @@ -73,7 +73,7 @@ "id": "Splitter", "name": "Splitter#0", "pos": { - "x": 195.0, + "x": 220.0, "y": 100.0 }, "params": { @@ -86,13 +86,37 @@ "name": "Splitter#1", "pos": { "x": 15.0, - "y": 25.0 + "y": 35.0 }, "params": { "logicWidth": 3, "orientation": "RIGHT" } }, + { + "id": "Splitter", + "name": "Splitter#2", + "pos": { + "x": 130.0, + "y": 35.0 + }, + "params": { + "logicWidth": 5, + "orientation": "RIGHT" + } + }, + { + "id": "Splitter", + "name": "Splitter#3", + "pos": { + "x": 75.0, + "y": 35.0 + }, + "params": { + "logicWidth": 5, + "orientation": "LEFT" + } + }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", @@ -179,7 +203,7 @@ "name": "WireCrossPoint#9", "pos": { "x": 29.0, - "y": 24.0 + "y": 34.0 }, "params": 1 }, @@ -187,7 +211,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#10", "pos": { - "x": 119.0, + "x": 149.0, "y": 24.0 }, "params": 1 @@ -196,7 +220,7 @@ "id": "and51", "name": "and51#0", "pos": { - "x": 75.0, + "x": 90.0, "y": 30.0 } }, @@ -204,7 +228,7 @@ "id": "and", "name": "and#0", "pos": { - "x": 155.0, + "x": 185.0, "y": 30.0 } }, @@ -213,7 +237,7 @@ "name": "demux2#0", "pos": { "x": 35.0, - "y": 30.0 + "y": 40.0 } }, { @@ -463,7 +487,7 @@ "y": 15.0 }, { - "x": 205.0, + "x": 230.0, "y": 15.0 } ] @@ -484,7 +508,7 @@ "y": 120.0 }, { - "x": 205.0, + "x": 230.0, "y": 120.0 } ] @@ -513,12 +537,12 @@ "name": "unnamedWire#12", "path": [ { - "x": 215.0, - "y": 120.0 + "x": 240.0, + "y": 125.0 }, { "x": 230.0, - "y": 120.0 + "y": 125.0 }, { "x": 230.0, @@ -538,7 +562,7 @@ "name": "unnamedWire#13", "path": [ { - "x": 195.0, + "x": 220.0, "y": 115.0 }, { @@ -553,12 +577,12 @@ }, { "pin1": { - "compName": "demux2#0", - "pinName": "Y00" + "compName": "WireCrossPoint#9", + "pinName": "" }, "pin2": { - "compName": "and51#0", - "pinName": "A1" + "compName": "Splitter#3", + "pinName": "O4" }, "name": "unnamedWire#14", "path": [] @@ -683,12 +707,12 @@ }, { "pin1": { - "compName": "and51#0", - "pinName": "A2" + "compName": "demux2#0", + "pinName": "Y00" }, "pin2": { - "compName": "demux2#0", - "pinName": "Y01" + "compName": "Splitter#3", + "pinName": "O0" }, "name": "unnamedWire#24", "path": [] @@ -696,23 +720,23 @@ { "pin1": { "compName": "demux2#0", - "pinName": "Y10" + "pinName": "Y01" }, "pin2": { - "compName": "and51#0", - "pinName": "A3" + "compName": "Splitter#3", + "pinName": "O1" }, "name": "unnamedWire#25", "path": [] }, { "pin1": { - "compName": "and51#0", - "pinName": "A4" + "compName": "demux2#0", + "pinName": "Y10" }, "pin2": { - "compName": "demux2#0", - "pinName": "Y11" + "compName": "Splitter#3", + "pinName": "O2" }, "name": "unnamedWire#26", "path": [] @@ -738,7 +762,7 @@ }, { "x": 10.0, - "y": 35.0 + "y": 45.0 } ] }, @@ -778,19 +802,27 @@ "name": "unnamedWire#30", "path": [ { - "x": 20.0, + "x": 85.0, + "y": 80.0 + }, + { + "x": 85.0, + "y": 85.0 + }, + { + "x": 10.0, "y": 85.0 }, { - "x": 20.0, + "x": 10.0, "y": 50.0 } ] }, { "pin1": { - "compName": "and51#0", - "pinName": "Y1" + "compName": "Splitter#2", + "pinName": "O0" }, "pin2": { "compName": "and#0", @@ -799,19 +831,19 @@ "name": "unnamedWire#31", "path": [ { - "x": 115.0, - "y": 35.0 + "x": 180.0, + "y": 75.0 }, { - "x": 115.0, + "x": 180.0, "y": 45.0 } ] }, { "pin1": { - "compName": "and51#0", - "pinName": "Y2" + "compName": "Splitter#2", + "pinName": "O1" }, "pin2": { "compName": "dff12_we#0", @@ -820,11 +852,11 @@ "name": "unnamedWire#32", "path": [ { - "x": 110.0, - "y": 45.0 + "x": 160.0, + "y": 65.0 }, { - "x": 110.0, + "x": 160.0, "y": 110.0 }, { @@ -843,8 +875,8 @@ "pinName": "WE" }, "pin2": { - "compName": "and51#0", - "pinName": "Y3" + "compName": "Splitter#2", + "pinName": "O2" }, "name": "unnamedWire#33", "path": [ @@ -857,70 +889,70 @@ "y": 105.0 }, { - "x": 105.0, + "x": 155.0, "y": 105.0 }, { - "x": 105.0, + "x": 155.0, "y": 55.0 } ] }, { "pin1": { - "compName": "and51#0", - "pinName": "Y4" - }, - "pin2": { "compName": "dff12_we#3", "pinName": "WE" }, + "pin2": { + "compName": "Splitter#2", + "pinName": "O3" + }, "name": "unnamedWire#34", "path": [ { - "x": 100.0, - "y": 65.0 + "x": 70.0, + "y": 290.0 }, { - "x": 100.0, + "x": 70.0, "y": 100.0 }, { - "x": 70.0, + "x": 150.0, "y": 100.0 }, { - "x": 70.0, - "y": 290.0 + "x": 150.0, + "y": 45.0 } ] }, { "pin1": { - "compName": "dff12_we#4", - "pinName": "WE" + "compName": "Splitter#2", + "pinName": "O4" }, "pin2": { - "compName": "and51#0", - "pinName": "Y5" + "compName": "dff12_we#4", + "pinName": "WE" }, "name": "unnamedWire#35", "path": [ { - "x": 65.0, - "y": 340.0 + "x": 145.0, + "y": 35.0 }, { - "x": 65.0, + "x": 145.0, "y": 95.0 }, { - "x": 95.0, + "x": 65.0, "y": 95.0 }, { - "x": 95.0, - "y": 75.0 + "x": 65.0, + "y": 340.0 } ] }, @@ -1091,19 +1123,19 @@ "name": "unnamedWire#47", "path": [ { - "x": 185.0, + "x": 215.0, "y": 35.0 }, { - "x": 185.0, - "y": 55.0 + "x": 215.0, + "y": 85.0 }, { - "x": 115.0, - "y": 55.0 + "x": 165.0, + "y": 85.0 }, { - "x": 115.0, + "x": 165.0, "y": 115.0 }, { @@ -1118,20 +1150,15 @@ }, { "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" + "compName": "Splitter#3", + "pinName": "O3" }, "pin2": { - "compName": "and51#0", - "pinName": "A5" + "compName": "demux2#0", + "pinName": "Y11" }, "name": "unnamedWire#48", - "path": [ - { - "x": 30.0, - "y": 75.0 - } - ] + "path": [] }, { "pin1": { @@ -1157,7 +1184,7 @@ "name": "unnamedWire#50", "path": [ { - "x": 120.0, + "x": 150.0, "y": 35.0 } ] @@ -1172,7 +1199,12 @@ "pinName": "" }, "name": "unnamedWire#51", - "path": [] + "path": [ + { + "x": 30.0, + "y": 25.0 + } + ] }, { "pin1": { @@ -1186,14 +1218,38 @@ "name": "unnamedWire#52", "path": [ { - "x": 150.0, + "x": 180.0, "y": 30.0 }, { - "x": 150.0, + "x": 180.0, "y": 35.0 } ] + }, + { + "pin1": { + "compName": "Splitter#2", + "pinName": "I" + }, + "pin2": { + "compName": "and51#0", + "pinName": "Y" + }, + "name": "unnamedWire#53", + "path": [] + }, + { + "pin1": { + "compName": "Splitter#3", + "pinName": "I" + }, + "pin2": { + "compName": "and51#0", + "pinName": "A" + }, + "name": "unnamedWire#54", + "path": [] } ], "version": "0.1.1"