From 3aee914f9fccbb3aa663d0ed13c5078bac6104c8 Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Thu, 8 Oct 2020 17:55:28 +0200 Subject: [PATCH] Cleaned and51 --- .../logic/model/am2900/components/and51.json | 310 ++++++++++-------- .../model/am2900/components/ram5_12.json | 228 ++++++++----- 2 files changed, 321 insertions(+), 217 deletions(-) diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and51.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and51.json index 18806d6a..f75c564e 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and51.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and51.json @@ -1,56 +1,20 @@ { - "width": 15.0, - "height": 60.0, + "width": 35.0, + "height": 55.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": 5, "usage": "INPUT" }, { "location": { "x": 0.0, - "y": 35.0 - }, - "name": "A4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 45.0 - }, - "name": "A5", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 55.0 + "y": 50.0 }, "name": "B", "logicWidth": 1, @@ -58,58 +22,46 @@ }, { "location": { - "x": 15.0, - "y": 5.0 - }, - "name": "Y1", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 15.0, - "y": 15.0 - }, - "name": "Y2", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 15.0, + "x": 35.0, "y": 25.0 }, - "name": "Y3", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 15.0, - "y": 35.0 - }, - "name": "Y4", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 15.0, - "y": 45.0 - }, - "name": "Y5", - "logicWidth": 1, + "name": "Y", + "logicWidth": 5, "usage": "OUTPUT" } ], "innerScale": 0.4, "submodel": { "components": [ + { + "id": "Splitter", + "name": "Splitter#0", + "pos": { + "x": 5.0, + "y": 42.5 + }, + "params": { + "logicWidth": 5, + "orientation": "RIGHT" + } + }, + { + "id": "Splitter", + "name": "Splitter#1", + "pos": { + "x": 72.5, + "y": 42.5 + }, + "params": { + "logicWidth": 5, + "orientation": "LEFT" + } + }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", "pos": { - "x": 4.0, + "x": 26.5, "y": 46.5 }, "params": 1 @@ -118,7 +70,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#1", "pos": { - "x": 4.0, + "x": 26.5, "y": 71.5 }, "params": 1 @@ -127,7 +79,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#2", "pos": { - "x": 4.0, + "x": 26.5, "y": 96.5 }, "params": 1 @@ -136,7 +88,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#3", "pos": { - "x": 4.0, + "x": 26.5, "y": 121.5 }, "params": 1 @@ -145,7 +97,7 @@ "id": "and", "name": "and#0", "pos": { - "x": 7.5, + "x": 32.5, "y": 7.5 } }, @@ -153,7 +105,7 @@ "id": "and", "name": "and#1", "pos": { - "x": 7.5, + "x": 32.5, "y": 32.5 } }, @@ -161,7 +113,7 @@ "id": "and", "name": "and#2", "pos": { - "x": 7.5, + "x": 32.5, "y": 57.5 } }, @@ -169,7 +121,7 @@ "id": "and", "name": "and#3", "pos": { - "x": 7.5, + "x": 32.5, "y": 82.5 } }, @@ -177,7 +129,7 @@ "id": "and", "name": "and#4", "pos": { - "x": 7.5, + "x": 32.5, "y": 107.5 } } @@ -186,46 +138,64 @@ { "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": "O4" }, "pin2": { - "compName": "and#1", + "compName": "and#0", "pinName": "A" }, "name": "unnamedWire#1", - "path": [] + "path": [ + { + "x": 20.0, + "y": 42.5 + }, + { + "x": 20.0, + "y": 12.5 + } + ] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "A3" + "compName": "and#1", + "pinName": "A" }, "pin2": { - "compName": "and#2", - "pinName": "A" + "compName": "Splitter#0", + "pinName": "O3" }, "name": "unnamedWire#2", - "path": [] + "path": [ + { + "x": 25.0, + "y": 37.5 + }, + { + "x": 25.0, + "y": 52.5 + } + ] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "A4" + "compName": "Splitter#0", + "pinName": "O2" }, "pin2": { - "compName": "and#3", + "compName": "and#2", "pinName": "A" }, "name": "unnamedWire#3", @@ -243,8 +213,8 @@ "name": "unnamedWire#4", "path": [ { - "x": 5.0, - "y": 137.5 + "x": 27.5, + "y": 125.0 } ] }, @@ -320,70 +290,106 @@ "name": "unnamedWire#10", "path": [ { - "x": 5.0, + "x": 27.5, "y": 22.5 } ] }, { "pin1": { - "compName": "and#0", + "compName": "and#4", "pinName": "Y" }, "pin2": { - "compName": "_submodelinterface", - "pinName": "Y1" + "compName": "Splitter#1", + "pinName": "O0" }, "name": "unnamedWire#11", - "path": [] + "path": [ + { + "x": 67.5, + "y": 112.5 + }, + { + "x": 67.5, + "y": 82.5 + } + ] }, { "pin1": { - "compName": "and#1", - "pinName": "Y" + "compName": "Splitter#1", + "pinName": "O1" }, "pin2": { - "compName": "_submodelinterface", - "pinName": "Y2" + "compName": "and#3", + "pinName": "Y" }, "name": "unnamedWire#12", - "path": [] + "path": [ + { + "x": 62.5, + "y": 72.5 + }, + { + "x": 62.5, + "y": 87.5 + } + ] }, { "pin1": { - "compName": "and#2", - "pinName": "Y" + "compName": "Splitter#1", + "pinName": "O2" }, "pin2": { - "compName": "_submodelinterface", - "pinName": "Y3" + "compName": "and#2", + "pinName": "Y" }, "name": "unnamedWire#13", "path": [] }, { "pin1": { - "compName": "and#3", + "compName": "and#0", "pinName": "Y" }, "pin2": { - "compName": "_submodelinterface", - "pinName": "Y4" + "compName": "Splitter#1", + "pinName": "O4" }, "name": "unnamedWire#14", - "path": [] + "path": [ + { + "x": 67.5, + "y": 12.5 + }, + { + "x": 67.5, + "y": 42.5 + } + ] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "A5" + "compName": "Splitter#0", + "pinName": "O1" }, "pin2": { - "compName": "and#4", + "compName": "and#3", "pinName": "A" }, "name": "unnamedWire#15", - "path": [] + "path": [ + { + "x": 25.0, + "y": 72.5 + }, + { + "x": 25.0, + "y": 87.5 + } + ] }, { "pin1": { @@ -411,15 +417,57 @@ }, { "pin1": { - "compName": "and#4", + "compName": "Splitter#1", + "pinName": "O3" + }, + "pin2": { + "compName": "and#1", "pinName": "Y" }, + "name": "unnamedWire#18", + "path": [ + { + "x": 62.5, + "y": 52.5 + }, + { + "x": 62.5, + "y": 37.5 + } + ] + }, + { + "pin1": { + "compName": "Splitter#1", + "pinName": "I" + }, "pin2": { "compName": "_submodelinterface", - "pinName": "Y5" + "pinName": "Y" }, - "name": "unnamedWire#18", + "name": "unnamedWire#19", "path": [] + }, + { + "pin1": { + "compName": "Splitter#0", + "pinName": "O0" + }, + "pin2": { + "compName": "and#4", + "pinName": "A" + }, + "name": "unnamedWire#20", + "path": [ + { + "x": 20.0, + "y": 82.5 + }, + { + "x": 20.0, + "y": 112.5 + } + ] } ], "version": "0.1.1" 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" -- 2.17.1