X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fdff4.json;h=ae5611bb4e5b3b920395eadcd46272059efa9963;hb=de50afe9150ec4d6430eb4347768798a40993ced;hp=cd20361721db7714f2cb344429816ff37bdf6978;hpb=58babf45ae7d259a296656451d796dbe601377a4;p=Mograsim.git diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json index cd203617..ae5611bb 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json @@ -1,11 +1,11 @@ { - "width": 35.0, - "height": 60.0, + "width": 40.0, + "height": 45.0, "interfacePins": [ { "location": { "x": 0.0, - "y": 45.0 + "y": 30.0 }, "name": "C", "logicWidth": 1, @@ -14,148 +14,73 @@ { "location": { "x": 0.0, - "y": 5.0 + "y": 20.0 }, - "name": "D1", - "logicWidth": 1, + "name": "D", + "logicWidth": 4, "usage": "INPUT" }, { "location": { - "x": 0.0, - "y": 15.0 + "x": 40.0, + "y": 20.0 }, - "name": "D2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "D3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 35.0 - }, - "name": "D4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "Q1", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "Q2", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 25.0 - }, - "name": "Q3", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 35.0 - }, - "name": "Q4", - "logicWidth": 1, + "name": "Q", + "logicWidth": 4, "usage": "OUTPUT" - }, - { - "location": { - "x": 0.0, - "y": 55.0 - }, - "name": "WE", - "logicWidth": 1, - "usage": "INPUT" } ], - "innerScale": 0.2, + "innerScale": 0.4, "submodel": { "components": [ { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", + "id": "Splitter", + "name": "Splitter#0", "pos": { - "x": 104.0, - "y": 184.0 + "x": 85.0, + "y": 35.0 }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 104.0, - "y": 84.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 104.0, - "y": 134.0 - }, - "params": 1 + "params": { + "logicWidth": 4, + "orientation": "LEFT" + } }, { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", + "id": "Splitter", + "name": "Splitter#1", "pos": { - "x": 169.0, - "y": 24.0 + "x": 5.0, + "y": 35.0 }, - "params": 1 + "params": { + "logicWidth": 4, + "orientation": "RIGHT" + } }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#4", + "name": "WireCrossPoint#0", "pos": { - "x": 164.0, + "x": 29.0, "y": 74.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#5", + "name": "WireCrossPoint#1", "pos": { - "x": 159.0, - "y": 124.0 + "x": 29.0, + "y": 44.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#6", + "name": "WireCrossPoint#2", "pos": { - "x": 154.0, - "y": 174.0 + "x": 29.0, + "y": 69.0 }, "params": 1 }, @@ -163,40 +88,32 @@ "id": "dff", "name": "dff#0", "pos": { - "x": 115.0, - "y": 20.0 + "x": 35.0, + "y": 5.0 } }, { "id": "dff", "name": "dff#1", "pos": { - "x": 115.0, - "y": 70.0 + "x": 35.0, + "y": 30.0 } }, { "id": "dff", "name": "dff#2", "pos": { - "x": 115.0, - "y": 120.0 + "x": 35.0, + "y": 55.0 } }, { "id": "dff", "name": "dff#3", "pos": { - "x": 115.0, - "y": 170.0 - } - }, - { - "id": "mux1_4", - "name": "mux1_4#0", - "pos": { - "x": 55.0, - "y": 60.0 + "x": 35.0, + "y": 80.0 } } ], @@ -213,15 +130,15 @@ "name": "unnamedWire#0", "path": [ { - "x": 105.0, - "y": 35.0 + "x": 30.0, + "y": 20.0 } ] }, { "pin1": { - "compName": "mux1_4#0", - "pinName": "Y1" + "compName": "Splitter#1", + "pinName": "O3" }, "pin2": { "compName": "dff#0", @@ -230,448 +147,260 @@ "name": "unnamedWire#1", "path": [ { - "x": 100.0, - "y": 65.0 + "x": 20.0, + "y": 35.0 }, { - "x": 100.0, - "y": 25.0 + "x": 20.0, + "y": 10.0 } ] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "D1" + "compName": "Splitter#1", + "pinName": "O2" }, "pin2": { - "compName": "mux1_4#0", - "pinName": "I1_1" + "compName": "dff#1", + "pinName": "D" }, - "name": "unnamedWire#10", + "name": "unnamedWire#2", "path": [ { "x": 25.0, - "y": 25.0 + "y": 45.0 }, { "x": 25.0, - "y": 115.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D2" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I1_2" - }, - "name": "unnamedWire#11", - "path": [ - { - "x": 20.0, - "y": 75.0 - }, - { - "x": 20.0, - "y": 125.0 + "y": 35.0 } ] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "D3" + "compName": "WireCrossPoint#0", + "pinName": "" }, "pin2": { - "compName": "mux1_4#0", - "pinName": "I1_3" + "compName": "dff#3", + "pinName": "C" }, - "name": "unnamedWire#12", + "name": "unnamedWire#3", "path": [ { - "x": 25.0, - "y": 125.0 - }, - { - "x": 25.0, - "y": 135.0 + "x": 30.0, + "y": 95.0 } ] }, { "pin1": { - "compName": "dff#0", - "pinName": "Q" + "compName": "WireCrossPoint#0", + "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#3", + "compName": "WireCrossPoint#2", "pinName": "" }, - "name": "unnamedWire#13", + "name": "unnamedWire#4", "path": [] }, { "pin1": { - "compName": "WireCrossPoint#3", + "compName": "WireCrossPoint#1", "pinName": "" }, "pin2": { - "compName": "_submodelinterface", - "pinName": "Q1" + "compName": "dff#1", + "pinName": "C" }, - "name": "unnamedWire#14", + "name": "unnamedWire#5", "path": [] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "Q2" + "compName": "WireCrossPoint#1", + "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#4", + "compName": "WireCrossPoint#2", "pinName": "" }, - "name": "unnamedWire#15", + "name": "unnamedWire#6", "path": [] }, { "pin1": { - "compName": "WireCrossPoint#4", + "compName": "WireCrossPoint#2", "pinName": "" }, "pin2": { - "compName": "dff#1", - "pinName": "Q" + "compName": "dff#2", + "pinName": "C" }, - "name": "unnamedWire#16", + "name": "unnamedWire#7", "path": [] }, { "pin1": { "compName": "_submodelinterface", - "pinName": "D4" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I1_4" - }, - "name": "unnamedWire#17", - "path": [ - { - "x": 25.0, - "y": 175.0 - }, - { - "x": 25.0, - "y": 145.0 - } - ] - }, - { - "pin1": { - "compName": "dff#2", - "pinName": "Q" + "pinName": "C" }, "pin2": { - "compName": "WireCrossPoint#5", + "compName": "WireCrossPoint#0", "pinName": "" }, - "name": "unnamedWire#18", + "name": "unnamedWire#8", "path": [] }, { "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { "compName": "_submodelinterface", - "pinName": "Q3" - }, - "name": "unnamedWire#19", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "Y2" - }, - "pin2": { - "compName": "dff#1", "pinName": "D" }, - "name": "unnamedWire#2", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, "pin2": { - "compName": "_submodelinterface", - "pinName": "Q4" + "compName": "Splitter#1", + "pinName": "I" }, - "name": "unnamedWire#20", + "name": "unnamedWire#9", "path": [] }, { "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" + "compName": "Splitter#0", + "pinName": "I" }, "pin2": { - "compName": "dff#3", + "compName": "_submodelinterface", "pinName": "Q" }, - "name": "unnamedWire#21", + "name": "unnamedWire#10", "path": [] }, { "pin1": { - "compName": "mux1_4#0", - "pinName": "Y3" - }, - "pin2": { "compName": "dff#2", "pinName": "D" }, - "name": "unnamedWire#22", - "path": [ - { - "x": 100.0, - "y": 85.0 - }, - { - "x": 100.0, - "y": 125.0 - } - ] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "Y4" - }, - "pin2": { - "compName": "dff#3", - "pinName": "D" - }, - "name": "unnamedWire#23", - "path": [ - { - "x": 95.0, - "y": 95.0 - }, - { - "x": 95.0, - "y": 175.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, "pin2": { - "compName": "mux1_4#0", - "pinName": "I0_1" + "compName": "Splitter#1", + "pinName": "O1" }, - "name": "unnamedWire#24", + "name": "unnamedWire#11", "path": [ { - "x": 170.0, - "y": 205.0 - }, - { - "x": 50.0, - "y": 205.0 + "x": 20.0, + "y": 60.0 }, { - "x": 50.0, - "y": 75.0 + "x": 20.0, + "y": 55.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" + "compName": "Splitter#1", + "pinName": "O0" }, "pin2": { - "compName": "mux1_4#0", - "pinName": "I0_2" + "compName": "dff#3", + "pinName": "D" }, - "name": "unnamedWire#25", + "name": "unnamedWire#12", "path": [ { - "x": 165.0, - "y": 210.0 - }, - { - "x": 45.0, - "y": 210.0 + "x": 20.0, + "y": 65.0 }, { - "x": 45.0, + "x": 20.0, "y": 85.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" + "compName": "dff#0", + "pinName": "Q" }, "pin2": { - "compName": "mux1_4#0", - "pinName": "I0_3" + "compName": "Splitter#0", + "pinName": "O3" }, - "name": "unnamedWire#26", + "name": "unnamedWire#13", "path": [ { - "x": 160.0, - "y": 215.0 + "x": 80.0, + "y": 10.0 }, { - "x": 40.0, - "y": 215.0 - }, - { - "x": 40.0, - "y": 95.0 + "x": 80.0, + "y": 35.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" + "compName": "Splitter#0", + "pinName": "O2" }, "pin2": { - "compName": "mux1_4#0", - "pinName": "I0_4" + "compName": "dff#1", + "pinName": "Q" }, - "name": "unnamedWire#27", + "name": "unnamedWire#14", "path": [ { - "x": 155.0, - "y": 220.0 + "x": 75.0, + "y": 45.0 }, { - "x": 35.0, - "y": 220.0 - }, - { - "x": 35.0, - "y": 105.0 + "x": 75.0, + "y": 35.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "dff#3", - "pinName": "C" - }, - "name": "unnamedWire#3", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#4", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "dff#1", - "pinName": "C" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { "compName": "dff#2", - "pinName": "C" - }, - "name": "unnamedWire#7", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "C" + "pinName": "Q" }, "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" + "compName": "Splitter#0", + "pinName": "O1" }, - "name": "unnamedWire#8", + "name": "unnamedWire#15", "path": [ { - "x": 20.0, - "y": 225.0 + "x": 80.0, + "y": 60.0 }, { - "x": 20.0, - "y": 185.0 + "x": 80.0, + "y": 55.0 } ] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "WE" + "compName": "Splitter#0", + "pinName": "O0" }, "pin2": { - "compName": "mux1_4#0", - "pinName": "S0" + "compName": "dff#3", + "pinName": "Q" }, - "name": "unnamedWire#9", + "name": "unnamedWire#16", "path": [ { - "x": 10.0, - "y": 275.0 + "x": 80.0, + "y": 65.0 }, { - "x": 10.0, - "y": 65.0 + "x": 80.0, + "y": 85.0 } ] } @@ -711,28 +440,28 @@ "q1": { "id": "delegating", "params": { - "delegateTarget": "dff#0", + "delegateTarget": "dff#3", "subStateID": "q" } }, "q2": { "id": "delegating", "params": { - "delegateTarget": "dff#1", + "delegateTarget": "dff#2", "subStateID": "q" } }, "q3": { "id": "delegating", "params": { - "delegateTarget": "dff#2", + "delegateTarget": "dff#1", "subStateID": "q" } }, "q4": { "id": "delegating", "params": { - "delegateTarget": "dff#3", + "delegateTarget": "dff#0", "subStateID": "q" } }