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%2For_4.json;h=87b7e9a57107b426fa44f6440f6ad623eebfe23d;hp=26dbd774450e39988c2e707cac6a87f1e8008603;hb=bb03efb69158644ca0e35a6102e304a3f1514fbe;hpb=de50afe9150ec4d6430eb4347768798a40993ced 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": [] } ],