From: Daniel Kirschten Date: Sun, 11 Oct 2020 17:21:42 +0000 (+0200) Subject: Cleaned or_4 X-Git-Url: https://mograsim.net/gitweb/?a=commitdiff_plain;h=bb03efb69158644ca0e35a6102e304a3f1514fbe;p=Mograsim.git Cleaned or_4 --- 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 e4371876..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,11 +1,11 @@ { - "width": 35.0, - "height": 90.0, + "width": 30.0, + "height": 40.0, "interfacePins": [ { "location": { "x": 0.0, - "y": 65.0 + "y": 25.0 }, "name": "A", "logicWidth": 4, @@ -14,7 +14,7 @@ { "location": { "x": 0.0, - "y": 85.0 + "y": 35.0 }, "name": "B", "logicWidth": 1, @@ -23,7 +23,7 @@ { "location": { "x": 0.0, - "y": 25.0 + "y": 5.0 }, "name": "C", "logicWidth": 4, @@ -31,8 +31,8 @@ }, { "location": { - "x": 35.0, - "y": 25.0 + "x": 30.0, + "y": 5.0 }, "name": "Y", "logicWidth": 4, @@ -42,56 +42,20 @@ "innerScale": 0.4, "submodel": { "components": [ - { - "id": "Splitter", - "name": "Splitter#0", - "pos": { - "x": 17.5, - "y": 87.5 - }, - "params": { - "logicWidth": 4, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#1", - "pos": { - "x": 72.5, - "y": 47.5 - }, - "params": { - "logicWidth": 4, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#2", - "pos": { - "x": 17.5, - "y": 47.5 - }, - "params": { - "logicWidth": 4, - "orientation": "RIGHT" - } - }, { "id": "and41", "name": "and41#0", "pos": { - "x": 35.0, - "y": 147.5 + "x": 20.0, + "y": 57.5 } }, { "id": "or_4", "name": "or_4#0", "pos": { - "x": 32.5, - "y": 42.5 + "x": 15.0, + "y": 2.5 } } ], @@ -106,12 +70,21 @@ "pinName": "A" }, "name": "unnamedWire#0", - "path": [] + "path": [ + { + "x": 10.0, + "y": 62.5 + }, + { + "x": 10.0, + "y": 72.5 + } + ] }, { "pin1": { - "compName": "Splitter#1", - "pinName": "I" + "compName": "or_4#0", + "pinName": "Y" }, "pin2": { "compName": "_submodelinterface", @@ -123,207 +96,54 @@ { "pin1": { "compName": "or_4#0", - "pinName": "Y1" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O0" - }, - "name": "unnamedWire#2", - "path": [] - }, - { - "pin1": { - "compName": "or_4#0", - "pinName": "Y2" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O1" - }, - "name": "unnamedWire#3", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", "pinName": "B" }, "pin2": { "compName": "and41#0", - "pinName": "B" + "pinName": "Y" }, - "name": "unnamedWire#4", + "name": "unnamedWire#2", "path": [ { - "x": 30.0, - "y": 212.5 + "x": 10.0, + "y": 32.5 + }, + { + "x": 10.0, + "y": 52.5 + }, + { + "x": 60.0, + "y": 52.5 }, { - "x": 30.0, - "y": 177.5 + "x": 60.0, + "y": 72.5 } ] }, { "pin1": { "compName": "_submodelinterface", - "pinName": "C" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "I" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O3" - }, - "pin2": { - "compName": "or_4#0", - "pinName": "A4" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O2" - }, - "pin2": { - "compName": "or_4#0", - "pinName": "A3" - }, - "name": "unnamedWire#7", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O1" - }, - "pin2": { - "compName": "or_4#0", - "pinName": "A2" - }, - "name": "unnamedWire#8", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O3" - }, - "pin2": { - "compName": "or_4#0", - "pinName": "B4" - }, - "name": "unnamedWire#9", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O2" - }, - "pin2": { - "compName": "or_4#0", - "pinName": "B3" - }, - "name": "unnamedWire#10", - "path": [] - }, - { - "pin1": { - "compName": "or_4#0", - "pinName": "B2" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O1" - }, - "name": "unnamedWire#11", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O0" - }, - "pin2": { - "compName": "or_4#0", - "pinName": "B1" - }, - "name": "unnamedWire#12", - "path": [] - }, - { - "pin1": { - "compName": "or_4#0", - "pinName": "Y3" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O2" - }, - "name": "unnamedWire#13", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O3" + "pinName": "B" }, "pin2": { - "compName": "or_4#0", - "pinName": "Y4" + "compName": "and41#0", + "pinName": "B" }, - "name": "unnamedWire#14", + "name": "unnamedWire#3", "path": [] }, { "pin1": { - "compName": "Splitter#0", - "pinName": "I" + "compName": "_submodelinterface", + "pinName": "C" }, "pin2": { - "compName": "and41#0", - "pinName": "Y" - }, - "name": "unnamedWire#15", - "path": [ - { - "x": 12.5, - "y": 102.5 - }, - { - "x": 12.5, - "y": 127.5 - }, - { - "x": 75.0, - "y": 127.5 - }, - { - "x": 75.0, - "y": 162.5 - } - ] - }, - { - "pin1": { "compName": "or_4#0", - "pinName": "A1" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O0" + "pinName": "A" }, - "name": "unnamedWire#16", + "name": "unnamedWire#4", "path": [] } ], diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/or_4.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/or_4.json index 26dbd774..87b7e9a5 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/or_4.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/or_4.json @@ -1,113 +1,32 @@ { - "width": 35.0, - "height": 80.0, + "width": 55.0, + "height": 45.0, "interfacePins": [ { "location": { "x": 0.0, - "y": 5.0 + "y": 10.0 }, - "name": "A1", - "logicWidth": 1, + "name": "A", + "logicWidth": 4, "usage": "INPUT" }, { "location": { "x": 0.0, - "y": 15.0 + "y": 30.0 }, - "name": "A2", - "logicWidth": 1, + "name": "B", + "logicWidth": 4, "usage": "INPUT" }, { "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "A3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 35.0 - }, - "name": "A4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 45.0 - }, - "name": "B1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 55.0 - }, - "name": "B2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 65.0 - }, - "name": "B3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 75.0 - }, - "name": "B4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.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 + "x": 55.0, + "y": 10.0 }, - "name": "Y4", - "logicWidth": 1, + "name": "Y", + "logicWidth": 4, "usage": "OUTPUT" } ], @@ -118,8 +37,8 @@ "id": "NandGate", "name": "NandGate#0", "pos": { - "x": 15.0, - "y": 2.5 + "x": 80.0, + "y": 5.0 }, "params": 1 }, @@ -127,8 +46,8 @@ "id": "NandGate", "name": "NandGate#1", "pos": { - "x": 15.0, - "y": 27.5 + "x": 80.0, + "y": 30.0 }, "params": 1 }, @@ -136,8 +55,8 @@ "id": "NandGate", "name": "NandGate#2", "pos": { - "x": 15.0, - "y": 52.5 + "x": 80.0, + "y": 55.0 }, "params": 1 }, @@ -145,165 +64,73 @@ "id": "NandGate", "name": "NandGate#3", "pos": { - "x": 15.0, - "y": 77.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#4", - "pos": { - "x": 15.0, - "y": 102.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#5", - "pos": { - "x": 15.0, - "y": 127.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#6", - "pos": { - "x": 15.0, - "y": 152.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#7", - "pos": { - "x": 15.0, - "y": 177.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#8", - "pos": { - "x": 65.0, - "y": 2.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#9", - "pos": { - "x": 65.0, - "y": 27.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#10", - "pos": { - "x": 65.0, - "y": 52.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#11", - "pos": { - "x": 65.0, - "y": 77.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 6.5, - "y": 11.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 6.5, - "y": 36.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 6.5, - "y": 61.5 + "x": 80.0, + "y": 80.0 }, "params": 1 }, { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", + "id": "Splitter", + "name": "Splitter#0", "pos": { - "x": 6.5, - "y": 86.5 + "x": 45.0, + "y": 60.0 }, - "params": 1 + "params": { + "logicWidth": 4, + "orientation": "RIGHT" + } }, { - "id": "WireCrossPoint", - "name": "WireCrossPoint#4", + "id": "Splitter", + "name": "Splitter#1", "pos": { - "x": 6.5, - "y": 111.5 + "x": 120.0, + "y": 10.0 }, - "params": 1 + "params": { + "logicWidth": 4, + "orientation": "LEFT" + } }, { - "id": "WireCrossPoint", - "name": "WireCrossPoint#5", + "id": "Splitter", + "name": "Splitter#2", "pos": { - "x": 6.5, - "y": 136.5 + "x": 45.0, + "y": 10.0 }, - "params": 1 + "params": { + "logicWidth": 4, + "orientation": "RIGHT" + } }, { - "id": "WireCrossPoint", - "name": "WireCrossPoint#6", + "id": "not4", + "name": "not4#0", "pos": { - "x": 6.5, - "y": 161.5 - }, - "params": 1 + "x": 5.0, + "y": 5.0 + } }, { - "id": "WireCrossPoint", - "name": "WireCrossPoint#7", + "id": "not4", + "name": "not4#1", "pos": { - "x": 6.5, - "y": 186.5 - }, - "params": 1 + "x": 5.0, + "y": 55.0 + } } ], "wires": [ { "pin1": { "compName": "_submodelinterface", - "pinName": "A1" + "pinName": "A" }, "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" + "compName": "not4#0", + "pinName": "A" }, "name": "unnamedWire#0", "path": [] @@ -311,398 +138,216 @@ { "pin1": { "compName": "_submodelinterface", - "pinName": "A2" + "pinName": "B" }, "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" + "compName": "not4#1", + "pinName": "A" }, "name": "unnamedWire#1", "path": [] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "A3" + "compName": "not4#0", + "pinName": "Y" }, "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" + "compName": "Splitter#2", + "pinName": "I" }, "name": "unnamedWire#2", "path": [] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "A4" + "compName": "Splitter#0", + "pinName": "I" }, "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" + "compName": "not4#1", + "pinName": "Y" }, "name": "unnamedWire#3", "path": [] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "B1" - }, - "pin2": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "name": "unnamedWire#4", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "B2" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "B3" - }, - "pin2": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "B4" - }, - "pin2": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "name": "unnamedWire#7", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" + "compName": "Splitter#2", + "pinName": "O3" }, "pin2": { "compName": "NandGate#0", "pinName": "A" }, - "name": "unnamedWire#8", - "path": [ - { - "x": 7.5, - "y": 7.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "B" - }, - "name": "unnamedWire#9", - "path": [ - { - "x": 7.5, - "y": 17.5 - } - ] + "name": "unnamedWire#4", + "path": [] }, { "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" + "compName": "Splitter#2", + "pinName": "O2" }, "pin2": { "compName": "NandGate#1", "pinName": "A" }, - "name": "unnamedWire#10", + "name": "unnamedWire#5", "path": [ { - "x": 7.5, - "y": 32.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "B" - }, - "name": "unnamedWire#11", - "path": [ + "x": 60.0, + "y": 20.0 + }, { - "x": 7.5, - "y": 42.5 + "x": 60.0, + "y": 35.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" + "compName": "Splitter#2", + "pinName": "O1" }, "pin2": { "compName": "NandGate#2", "pinName": "A" }, - "name": "unnamedWire#12", + "name": "unnamedWire#6", "path": [ { - "x": 7.5, - "y": 57.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "B" - }, - "name": "unnamedWire#13", - "path": [ + "x": 70.0, + "y": 30.0 + }, { - "x": 7.5, - "y": 67.5 + "x": 70.0, + "y": 60.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" + "compName": "Splitter#2", + "pinName": "O0" }, "pin2": { "compName": "NandGate#3", "pinName": "A" }, - "name": "unnamedWire#14", - "path": [ - { - "x": 7.5, - "y": 82.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#3", - "pinName": "B" - }, - "name": "unnamedWire#15", + "name": "unnamedWire#7", "path": [ { - "x": 7.5, - "y": 92.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#4", - "pinName": "A" - }, - "name": "unnamedWire#16", - "path": [ + "x": 75.0, + "y": 40.0 + }, { - "x": 7.5, - "y": 107.5 + "x": 75.0, + "y": 85.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" + "compName": "Splitter#0", + "pinName": "O3" }, "pin2": { - "compName": "NandGate#4", + "compName": "NandGate#0", "pinName": "B" }, - "name": "unnamedWire#17", + "name": "unnamedWire#8", "path": [ { - "x": 7.5, - "y": 117.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#5", - "pinName": "A" - }, - "name": "unnamedWire#18", - "path": [ + "x": 65.0, + "y": 60.0 + }, { - "x": 7.5, - "y": 132.5 + "x": 65.0, + "y": 20.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#5", + "compName": "NandGate#1", "pinName": "B" }, - "name": "unnamedWire#19", - "path": [ - { - "x": 7.5, - "y": 142.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, "pin2": { - "compName": "NandGate#6", - "pinName": "A" + "compName": "Splitter#0", + "pinName": "O2" }, - "name": "unnamedWire#20", + "name": "unnamedWire#9", "path": [ { - "x": 7.5, - "y": 157.5 + "x": 60.0, + "y": 45.0 + }, + { + "x": 60.0, + "y": 70.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" + "compName": "Splitter#0", + "pinName": "O1" }, "pin2": { - "compName": "NandGate#6", + "compName": "NandGate#2", "pinName": "B" }, - "name": "unnamedWire#21", + "name": "unnamedWire#10", "path": [ { - "x": 7.5, - "y": 167.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#7", - "pinName": "A" - }, - "name": "unnamedWire#22", - "path": [ + "x": 70.0, + "y": 80.0 + }, { - "x": 7.5, - "y": 182.5 + "x": 70.0, + "y": 70.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#7", + "compName": "NandGate#3", "pinName": "B" }, - "name": "unnamedWire#23", - "path": [ - { - "x": 7.5, - "y": 192.5 - } - ] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "Y" - }, "pin2": { - "compName": "NandGate#8", - "pinName": "A" + "compName": "Splitter#0", + "pinName": "O0" }, - "name": "unnamedWire#24", + "name": "unnamedWire#11", "path": [ { - "x": 40.0, - "y": 12.5 + "x": 75.0, + "y": 95.0 }, { - "x": 40.0, - "y": 7.5 + "x": 75.0, + "y": 90.0 } ] }, { "pin1": { - "compName": "NandGate#4", + "compName": "NandGate#0", "pinName": "Y" }, "pin2": { - "compName": "NandGate#8", - "pinName": "B" + "compName": "Splitter#1", + "pinName": "O3" }, - "name": "unnamedWire#25", + "name": "unnamedWire#12", "path": [ { - "x": 45.0, - "y": 112.5 + "x": 105.0, + "y": 15.0 }, { - "x": 45.0, - "y": 17.5 + "x": 105.0, + "y": 10.0 } ] }, @@ -712,81 +357,39 @@ "pinName": "Y" }, "pin2": { - "compName": "NandGate#9", - "pinName": "A" + "compName": "Splitter#1", + "pinName": "O2" }, - "name": "unnamedWire#26", + "name": "unnamedWire#13", "path": [ { - "x": 40.0, - "y": 37.5 + "x": 105.0, + "y": 40.0 }, { - "x": 40.0, - "y": 32.5 + "x": 105.0, + "y": 20.0 } ] }, { "pin1": { - "compName": "NandGate#5", - "pinName": "Y" + "compName": "Splitter#1", + "pinName": "O1" }, "pin2": { - "compName": "NandGate#9", - "pinName": "B" - }, - "name": "unnamedWire#27", - "path": [ - { - "x": 50.0, - "y": 137.5 - }, - { - "x": 50.0, - "y": 42.5 - } - ] - }, - { - "pin1": { "compName": "NandGate#2", "pinName": "Y" }, - "pin2": { - "compName": "NandGate#10", - "pinName": "A" - }, - "name": "unnamedWire#28", - "path": [ - { - "x": 40.0, - "y": 62.5 - }, - { - "x": 40.0, - "y": 57.5 - } - ] - }, - { - "pin1": { - "compName": "NandGate#6", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#10", - "pinName": "B" - }, - "name": "unnamedWire#29", + "name": "unnamedWire#14", "path": [ { - "x": 55.0, - "y": 162.5 + "x": 110.0, + "y": 30.0 }, { - "x": 55.0, - "y": 67.5 + "x": 110.0, + "y": 65.0 } ] }, @@ -796,88 +399,31 @@ "pinName": "Y" }, "pin2": { - "compName": "NandGate#11", - "pinName": "A" - }, - "name": "unnamedWire#30", - "path": [ - { - "x": 40.0, - "y": 87.5 - }, - { - "x": 40.0, - "y": 82.5 - } - ] - }, - { - "pin1": { - "compName": "NandGate#7", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#11", - "pinName": "B" + "compName": "Splitter#1", + "pinName": "O0" }, - "name": "unnamedWire#31", + "name": "unnamedWire#15", "path": [ { - "x": 60.0, - "y": 187.5 + "x": 115.0, + "y": 90.0 }, { - "x": 60.0, - "y": 92.5 + "x": 115.0, + "y": 40.0 } ] }, { "pin1": { - "compName": "NandGate#8", - "pinName": "Y" + "compName": "Splitter#1", + "pinName": "I" }, "pin2": { "compName": "_submodelinterface", - "pinName": "Y1" - }, - "name": "unnamedWire#32", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#9", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y2" - }, - "name": "unnamedWire#33", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#10", "pinName": "Y" }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y3" - }, - "name": "unnamedWire#34", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#11", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y4" - }, - "name": "unnamedWire#35", + "name": "unnamedWire#16", "path": [] } ], diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json index 64d509c7..8de3e2a3 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json @@ -187,8 +187,8 @@ "id": "Splitter", "name": "Splitter#2", "pos": { - "x": 285.0, - "y": 705.0 + "x": 305.0, + "y": 560.0 }, "params": { "logicWidth": 4, @@ -200,7 +200,7 @@ "name": "Splitter#3", "pos": { "x": 285.0, - "y": 635.0 + "y": 505.0 }, "params": { "logicWidth": 4, @@ -211,8 +211,8 @@ "id": "Splitter", "name": "Splitter#4", "pos": { - "x": 32.5, - "y": 617.5 + "x": 20.0, + "y": 600.0 }, "params": { "logicWidth": 4, @@ -260,7 +260,7 @@ "name": "WireCrossPoint#4", "pos": { "x": 49.0, - "y": 629.0 + "y": 519.0 }, "params": 4 }, @@ -269,7 +269,7 @@ "name": "WireCrossPoint#5", "pos": { "x": 49.0, - "y": 554.0 + "y": 464.0 }, "params": 4 }, @@ -278,7 +278,7 @@ "name": "WireCrossPoint#6", "pos": { "x": 49.0, - "y": 449.0 + "y": 409.0 }, "params": 4 }, @@ -296,7 +296,7 @@ "name": "WireCrossPoint#8", "pos": { "x": 109.0, - "y": 449.0 + "y": 409.0 }, "params": 4 }, @@ -305,7 +305,7 @@ "name": "WireCrossPoint#9", "pos": { "x": 109.0, - "y": 554.0 + "y": 464.0 }, "params": 4 }, @@ -314,7 +314,7 @@ "name": "WireCrossPoint#10", "pos": { "x": 109.0, - "y": 659.0 + "y": 519.0 }, "params": 4 }, @@ -346,31 +346,31 @@ "id": "andor414", "name": "andor414#0", "pos": { - "x": 235.0, - "y": 415.0 + "x": 240.0, + "y": 410.0 } }, { "id": "andor414", "name": "andor414#1", "pos": { - "x": 235.0, - "y": 520.0 + "x": 240.0, + "y": 465.0 } }, { "id": "andor414", "name": "andor414#2", "pos": { - "x": 235.0, - "y": 625.0 + "x": 240.0, + "y": 515.0 } }, { "id": "andor414", "name": "andor414#3", "pos": { - "x": 135.0, + "x": 140.0, "y": 385.0 } }, @@ -378,16 +378,16 @@ "id": "andor414", "name": "andor414#4", "pos": { - "x": 135.0, - "y": 490.0 + "x": 140.0, + "y": 440.0 } }, { "id": "andor414", "name": "andor414#5", "pos": { - "x": 135.0, - "y": 595.0 + "x": 140.0, + "y": 495.0 } }, { @@ -419,7 +419,7 @@ "name": "dlatch4#1", "pos": { "x": 55.0, - "y": 435.0 + "y": 395.0 } }, { @@ -427,7 +427,7 @@ "name": "dlatch4#2", "pos": { "x": 55.0, - "y": 540.0 + "y": 450.0 } }, { @@ -435,7 +435,7 @@ "name": "dlatch4#3", "pos": { "x": 55.0, - "y": 645.0 + "y": 505.0 } } ], @@ -678,7 +678,7 @@ }, { "x": 25.0, - "y": 470.0 + "y": 430.0 } ] }, @@ -699,7 +699,7 @@ }, { "x": 20.0, - "y": 575.0 + "y": 485.0 } ] }, @@ -720,7 +720,7 @@ }, { "x": 15.0, - "y": 680.0 + "y": 540.0 } ] }, @@ -782,7 +782,12 @@ "pinName": "" }, "name": "unnamedWire#21", - "path": [] + "path": [ + { + "x": 50.0, + "y": 615.0 + } + ] }, { "pin1": { @@ -794,12 +799,7 @@ "pinName": "D" }, "name": "unnamedWire#22", - "path": [ - { - "x": 50.0, - "y": 660.0 - } - ] + "path": [] }, { "pin1": { @@ -939,7 +939,7 @@ "path": [ { "x": 110.0, - "y": 690.0 + "y": 540.0 } ] }, @@ -981,7 +981,7 @@ }, { "x": 205.0, - "y": 500.0 + "y": 445.0 } ] }, @@ -1002,7 +1002,7 @@ }, { "x": 200.0, - "y": 605.0 + "y": 500.0 } ] }, @@ -1023,7 +1023,7 @@ }, { "x": 195.0, - "y": 710.0 + "y": 550.0 } ] }, @@ -1057,7 +1057,7 @@ "path": [ { "x": 125.0, - "y": 470.0 + "y": 420.0 } ] }, @@ -1074,7 +1074,7 @@ "path": [ { "x": 120.0, - "y": 575.0 + "y": 475.0 } ] }, @@ -1091,7 +1091,7 @@ "path": [ { "x": 115.0, - "y": 680.0 + "y": 530.0 } ] }, @@ -1144,12 +1144,12 @@ "y": 380.0 }, { - "x": 130.0, + "x": 135.0, "y": 380.0 }, { - "x": 130.0, - "y": 410.0 + "x": 135.0, + "y": 390.0 } ] }, @@ -1178,7 +1178,7 @@ "path": [ { "x": 110.0, - "y": 480.0 + "y": 435.0 } ] }, @@ -1207,19 +1207,19 @@ "path": [ { "x": 175.0, - "y": 410.0 + "y": 390.0 }, { "x": 175.0, - "y": 485.0 + "y": 430.0 }, { - "x": 130.0, - "y": 485.0 + "x": 135.0, + "y": 430.0 }, { - "x": 130.0, - "y": 515.0 + "x": 135.0, + "y": 445.0 } ] }, @@ -1236,19 +1236,19 @@ "path": [ { "x": 175.0, - "y": 515.0 + "y": 445.0 }, { "x": 175.0, - "y": 590.0 + "y": 485.0 }, { - "x": 130.0, - "y": 590.0 + "x": 135.0, + "y": 485.0 }, { - "x": 130.0, - "y": 620.0 + "x": 135.0, + "y": 500.0 } ] }, @@ -1265,11 +1265,11 @@ "path": [ { "x": 175.0, - "y": 620.0 + "y": 500.0 }, { "x": 175.0, - "y": 720.0 + "y": 575.0 } ] }, @@ -1286,7 +1286,7 @@ "path": [ { "x": 335.0, - "y": 735.0 + "y": 590.0 }, { "x": 335.0, @@ -1307,7 +1307,7 @@ "path": [ { "x": 110.0, - "y": 585.0 + "y": 490.0 } ] }, @@ -1328,15 +1328,15 @@ }, { "x": 275.0, - "y": 410.0 + "y": 405.0 }, { - "x": 230.0, - "y": 410.0 + "x": 235.0, + "y": 405.0 }, { - "x": 230.0, - "y": 440.0 + "x": 235.0, + "y": 415.0 } ] }, @@ -1353,19 +1353,19 @@ "path": [ { "x": 275.0, - "y": 440.0 + "y": 415.0 }, { "x": 275.0, - "y": 515.0 + "y": 460.0 }, { - "x": 230.0, - "y": 515.0 + "x": 235.0, + "y": 460.0 }, { - "x": 230.0, - "y": 545.0 + "x": 235.0, + "y": 470.0 } ] }, @@ -1382,19 +1382,19 @@ "path": [ { "x": 275.0, - "y": 545.0 + "y": 470.0 }, { "x": 275.0, - "y": 620.0 + "y": 510.0 }, { - "x": 230.0, - "y": 620.0 + "x": 235.0, + "y": 510.0 }, { - "x": 230.0, - "y": 650.0 + "x": 235.0, + "y": 520.0 } ] }, @@ -1423,7 +1423,7 @@ "path": [ { "x": 315.0, - "y": 665.0 + "y": 535.0 }, { "x": 317.5, @@ -1448,7 +1448,7 @@ }, { "x": 310.0, - "y": 655.0 + "y": 525.0 } ] }, @@ -1465,7 +1465,7 @@ "path": [ { "x": 305.0, - "y": 645.0 + "y": 515.0 }, { "x": 307.5, @@ -1490,7 +1490,7 @@ }, { "x": 300.0, - "y": 635.0 + "y": 505.0 } ] }, @@ -1511,7 +1511,7 @@ }, { "x": 330.0, - "y": 725.0 + "y": 580.0 } ] }, @@ -1528,7 +1528,7 @@ "path": [ { "x": 325.0, - "y": 715.0 + "y": 570.0 }, { "x": 325.0, @@ -1553,7 +1553,7 @@ }, { "x": 320.0, - "y": 705.0 + "y": 560.0 } ] }, diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json index 9daa3bb5..91a2d7c8 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json @@ -236,7 +236,7 @@ "name": "Splitter#3", "pos": { "x": 295.0, - "y": 785.0 + "y": 760.0 }, "params": { "logicWidth": 4, @@ -620,7 +620,7 @@ "name": "andor414#0", "pos": { "x": 250.0, - "y": 475.0 + "y": 515.0 } }, { @@ -636,14 +636,14 @@ "name": "andor414#2", "pos": { "x": 250.0, - "y": 775.0 + "y": 770.0 } }, { "id": "andor414", "name": "andor414#3", "pos": { - "x": 155.0, + "x": 160.0, "y": 435.0 } }, @@ -902,6 +902,14 @@ { "x": 15.0, "y": 195.0 + }, + { + "x": 245.0, + "y": 195.0 + }, + { + "x": 245.0, + "y": 185.0 } ] }, @@ -1779,7 +1787,7 @@ }, { "x": 130.0, - "y": 520.0 + "y": 470.0 } ] }, @@ -1793,7 +1801,16 @@ "pinName": "A" }, "name": "unnamedWire#75", - "path": [] + "path": [ + { + "x": 150.0, + "y": 650.0 + }, + { + "x": 150.0, + "y": 610.0 + } + ] }, { "pin1": { @@ -1808,7 +1825,7 @@ "path": [ { "x": 120.0, - "y": 820.0 + "y": 770.0 }, { "x": 120.0, @@ -1846,7 +1863,7 @@ "path": [ { "x": 225.0, - "y": 560.0 + "y": 550.0 } ] }, @@ -1863,7 +1880,7 @@ "path": [ { "x": 220.0, - "y": 710.0 + "y": 660.0 } ] }, @@ -1880,7 +1897,7 @@ "path": [ { "x": 215.0, - "y": 860.0 + "y": 805.0 } ] }, @@ -2134,7 +2151,16 @@ "pinName": "A" }, "name": "unnamedWire#101", - "path": [] + "path": [ + { + "x": 155.0, + "y": 500.0 + }, + { + "x": 155.0, + "y": 460.0 + } + ] }, { "pin1": { @@ -2189,7 +2215,7 @@ }, { "x": 125.0, - "y": 670.0 + "y": 620.0 } ] }, @@ -2294,15 +2320,15 @@ }, { "x": 290.0, - "y": 470.0 + "y": 455.0 }, { "x": 245.0, - "y": 470.0 + "y": 455.0 }, { "x": 245.0, - "y": 500.0 + "y": 520.0 } ] }, @@ -2319,7 +2345,7 @@ "path": [ { "x": 290.0, - "y": 500.0 + "y": 520.0 }, { "x": 290.0, @@ -2331,7 +2357,7 @@ }, { "x": 245.0, - "y": 650.0 + "y": 630.0 } ] }, @@ -2348,19 +2374,19 @@ "path": [ { "x": 290.0, - "y": 650.0 + "y": 630.0 }, { "x": 290.0, - "y": 770.0 + "y": 765.0 }, { "x": 245.0, - "y": 770.0 + "y": 765.0 }, { "x": 245.0, - "y": 800.0 + "y": 775.0 } ] }, @@ -2389,7 +2415,7 @@ "path": [ { "x": 345.0, - "y": 815.0 + "y": 790.0 }, { "x": 345.0, @@ -2414,7 +2440,7 @@ }, { "x": 340.0, - "y": 805.0 + "y": 780.0 } ] }, @@ -2431,7 +2457,7 @@ "path": [ { "x": 335.0, - "y": 795.0 + "y": 770.0 }, { "x": 335.0, @@ -2456,7 +2482,7 @@ }, { "x": 330.0, - "y": 785.0 + "y": 760.0 } ] }, @@ -2506,7 +2532,16 @@ "pinName": "A" }, "name": "unnamedWire#124", - "path": [] + "path": [ + { + "x": 235.0, + "y": 690.0 + }, + { + "x": 235.0, + "y": 650.0 + } + ] }, { "pin1": { @@ -2518,7 +2553,16 @@ "pinName": "A" }, "name": "unnamedWire#125", - "path": [] + "path": [ + { + "x": 150.0, + "y": 800.0 + }, + { + "x": 150.0, + "y": 760.0 + } + ] }, { "pin1": { @@ -2530,7 +2574,16 @@ "pinName": "A" }, "name": "unnamedWire#126", - "path": [] + "path": [ + { + "x": 240.0, + "y": 840.0 + }, + { + "x": 240.0, + "y": 795.0 + } + ] }, { "pin1": { @@ -2549,15 +2602,15 @@ }, { "x": 195.0, - "y": 430.0 + "y": 385.0 }, { - "x": 150.0, - "y": 430.0 + "x": 155.0, + "y": 385.0 }, { - "x": 150.0, - "y": 460.0 + "x": 155.0, + "y": 440.0 } ] }, @@ -2574,7 +2627,7 @@ "path": [ { "x": 195.0, - "y": 460.0 + "y": 440.0 }, { "x": 195.0, @@ -2586,7 +2639,7 @@ }, { "x": 150.0, - "y": 610.0 + "y": 590.0 } ] }, @@ -2603,7 +2656,7 @@ "path": [ { "x": 195.0, - "y": 610.0 + "y": 590.0 }, { "x": 195.0, @@ -2615,7 +2668,7 @@ }, { "x": 150.0, - "y": 760.0 + "y": 740.0 } ] }, @@ -2632,7 +2685,7 @@ "path": [ { "x": 195.0, - "y": 760.0 + "y": 740.0 }, { "x": 195.0, @@ -2765,7 +2818,7 @@ }, { "x": 290.0, - "y": 222.5 + "y": 225.0 } ] },