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%2Fdff4_we.json;h=680b5f1fb26d1c0d325affc6926d267a01fa61b5;hp=b7b85a9dcf4e62e0b0e4511f504ce13d008f4c96;hb=b7cd13e87beb4f5b83294a0771cf787fd4218a73;hpb=4f574b3fdb4c4c86a187451e1e0b36fbce85728a diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_we.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_we.json index b7b85a9d..680b5f1f 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_we.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_we.json @@ -1,5 +1,5 @@ { - "width": 35.0, + "width": 25.0, "height": 30.0, "interfacePins": [ { @@ -22,7 +22,7 @@ }, { "location": { - "x": 35.0, + "x": 25.0, "y": 15.0 }, "name": "Q", @@ -42,98 +42,23 @@ "innerScale": 0.2, "submodel": { "components": [ - { - "id": "Splitter", - "name": "Splitter#0", - "pos": { - "x": 155.0, - "y": 60.0 - }, - "params": { - "logicWidth": 4, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#1", - "pos": { - "x": 70.0, - "y": 25.0 - }, - "params": { - "logicWidth": 4, - "orientation": "RIGHT" - } - }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", "pos": { - "x": 99.0, - "y": 109.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 99.0, - "y": 59.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 99.0, - "y": 84.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 169.0, + "x": 119.0, "y": 74.0 }, "params": 4 }, { - "id": "dff", - "name": "dff#0", + "id": "dff4", + "name": "dff4#0", "pos": { - "x": 105.0, + "x": 75.0, "y": 20.0 } }, - { - "id": "dff", - "name": "dff#1", - "pos": { - "x": 105.0, - "y": 45.0 - } - }, - { - "id": "dff", - "name": "dff#2", - "pos": { - "x": 105.0, - "y": 70.0 - } - }, - { - "id": "dff", - "name": "dff#3", - "pos": { - "x": 105.0, - "y": 95.0 - } - }, { "id": "mux1_4", "name": "mux1_4#0", @@ -146,127 +71,50 @@ "wires": [ { "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "dff#0", - "pinName": "C" - }, - "name": "unnamedWire#0", - "path": [ - { - "x": 100.0, - "y": 35.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O3" + "compName": "mux1_4#0", + "pinName": "Y" }, "pin2": { - "compName": "dff#0", + "compName": "dff4#0", "pinName": "D" }, - "name": "unnamedWire#1", + "name": "unnamedWire#0", "path": [] }, { "pin1": { - "compName": "Splitter#1", - "pinName": "O2" + "compName": "dff4#0", + "pinName": "Q" }, "pin2": { - "compName": "dff#1", - "pinName": "D" + "compName": "WireCrossPoint#0", + "pinName": "" }, - "name": "unnamedWire#2", + "name": "unnamedWire#1", "path": [ { - "x": 95.0, - "y": 35.0 - }, - { - "x": 95.0, - "y": 50.0 + "x": 120.0, + "y": 40.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "dff#3", + "compName": "dff4#0", "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" }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#8", + "name": "unnamedWire#2", "path": [ { - "x": 100.0, + "x": 70.0, + "y": 50.0 + }, + { + "x": 70.0, "y": 125.0 } ] @@ -280,7 +128,7 @@ "compName": "mux1_4#0", "pinName": "S0" }, - "name": "unnamedWire#9", + "name": "unnamedWire#3", "path": [] }, { @@ -292,7 +140,7 @@ "compName": "mux1_4#0", "pinName": "I1" }, - "name": "unnamedWire#10", + "name": "unnamedWire#4", "path": [ { "x": 5.0, @@ -306,41 +154,29 @@ }, { "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "I" - }, - "name": "unnamedWire#11", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", + "compName": "WireCrossPoint#0", "pinName": "" }, "pin2": { "compName": "_submodelinterface", "pinName": "Q" }, - "name": "unnamedWire#12", + "name": "unnamedWire#5", "path": [] }, { "pin1": { - "compName": "WireCrossPoint#3", + "compName": "WireCrossPoint#0", "pinName": "" }, "pin2": { "compName": "mux1_4#0", "pinName": "I0" }, - "name": "unnamedWire#13", + "name": "unnamedWire#6", "path": [ { - "x": 170.0, + "x": 120.0, "y": 140.0 }, { @@ -352,144 +188,6 @@ "y": 40.0 } ] - }, - { - "pin1": { - "compName": "dff#2", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O1" - }, - "name": "unnamedWire#14", - "path": [ - { - "x": 90.0, - "y": 75.0 - }, - { - "x": 90.0, - "y": 45.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O0" - }, - "pin2": { - "compName": "dff#3", - "pinName": "D" - }, - "name": "unnamedWire#15", - "path": [ - { - "x": 85.0, - "y": 55.0 - }, - { - "x": 85.0, - "y": 100.0 - } - ] - }, - { - "pin1": { - "compName": "dff#0", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O3" - }, - "name": "unnamedWire#16", - "path": [ - { - "x": 150.0, - "y": 25.0 - }, - { - "x": 150.0, - "y": 60.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O2" - }, - "pin2": { - "compName": "dff#1", - "pinName": "Q" - }, - "name": "unnamedWire#17", - "path": [ - { - "x": 145.0, - "y": 70.0 - }, - { - "x": 145.0, - "y": 50.0 - } - ] - }, - { - "pin1": { - "compName": "dff#2", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O1" - }, - "name": "unnamedWire#18", - "path": [ - { - "x": 145.0, - "y": 75.0 - }, - { - "x": 145.0, - "y": 80.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O0" - }, - "pin2": { - "compName": "dff#3", - "pinName": "Q" - }, - "name": "unnamedWire#19", - "path": [ - { - "x": 145.0, - "y": 90.0 - }, - { - "x": 145.0, - "y": 100.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "I" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "Y" - }, - "name": "unnamedWire#20", - "path": [] } ], "version": "0.1.1" @@ -508,47 +206,9 @@ "subcomponentHighLevelStates": {}, "atomicHighLevelStates": { "q": { - "id": "bitVectorSplitting", - "params": { - "vectorPartTargets": [ - "q4", - "q3", - "q2", - "q1" - ], - "vectorPartLengthes": [ - 1, - 1, - 1, - 1 - ] - } - }, - "q1": { - "id": "delegating", - "params": { - "delegateTarget": "dff#3", - "subStateID": "q" - } - }, - "q2": { - "id": "delegating", - "params": { - "delegateTarget": "dff#2", - "subStateID": "q" - } - }, - "q3": { - "id": "delegating", - "params": { - "delegateTarget": "dff#1", - "subStateID": "q" - } - }, - "q4": { "id": "delegating", "params": { - "delegateTarget": "dff#0", + "delegateTarget": "dff4#0", "subStateID": "q" } }