From: Daniel Kirschten Date: Sun, 11 Aug 2019 14:20:12 +0000 (+0200) Subject: Renamed GUIAm2901QReg to GUIdff4 X-Git-Url: https://mograsim.net/gitweb/?a=commitdiff_plain;h=c699fab7eb6157012ec3ed96b9c51d08bd6a189f;p=Mograsim.git Renamed GUIAm2901QReg to GUIdff4 --- diff --git a/net.mograsim.logic.model.am2900/components/GUIdff4.json b/net.mograsim.logic.model.am2900/components/GUIdff4.json new file mode 100644 index 00000000..4064f93e --- /dev/null +++ b/net.mograsim.logic.model.am2900/components/GUIdff4.json @@ -0,0 +1,716 @@ +mograsim version: 0.1.3 +{ + "width": 35.0, + "height": 60.0, + "interfacePins": [ + { + "location": { + "x": 0.0, + "y": 55.0 + }, + "name": "D4", + "logicWidth": 1 + }, + { + "location": { + "x": 35.0, + "y": 5.0 + }, + "name": "Q1", + "logicWidth": 1 + }, + { + "location": { + "x": 35.0, + "y": 15.0 + }, + "name": "Q2", + "logicWidth": 1 + }, + { + "location": { + "x": 35.0, + "y": 25.0 + }, + "name": "Q3", + "logicWidth": 1 + }, + { + "location": { + "x": 0.0, + "y": 5.0 + }, + "name": "C", + "logicWidth": 1 + }, + { + "location": { + "x": 35.0, + "y": 35.0 + }, + "name": "Q4", + "logicWidth": 1 + }, + { + "location": { + "x": 0.0, + "y": 25.0 + }, + "name": "D1", + "logicWidth": 1 + }, + { + "location": { + "x": 0.0, + "y": 15.0 + }, + "name": "WE", + "logicWidth": 1 + }, + { + "location": { + "x": 0.0, + "y": 35.0 + }, + "name": "D2", + "logicWidth": 1 + }, + { + "location": { + "x": 0.0, + "y": 45.0 + }, + "name": "D3", + "logicWidth": 1 + } + ], + "submodel": { + "innerScale": 0.2, + "subComps": [ + { + "id": "GUIdff", + "name": "GUIdff#1", + "pos": { + "x": 115.0, + "y": 70.0 + } + }, + { + "id": "GUIdff", + "name": "GUIdff#0", + "pos": { + "x": 115.0, + "y": 20.0 + } + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#1", + "pos": { + "x": 104.0, + "y": 74.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#0", + "pos": { + "x": 104.0, + "y": 24.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#3", + "pos": { + "x": 169.0, + "y": 24.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#2", + "pos": { + "x": 104.0, + "y": 124.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#5", + "pos": { + "x": 159.0, + "y": 124.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#4", + "pos": { + "x": 164.0, + "y": 74.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#6", + "pos": { + "x": 154.0, + "y": 174.0 + }, + "params": 1 + }, + { + "id": "GUImux1_4", + "name": "DeserializedSubmodelComponent#0", + "pos": { + "x": 55.0, + "y": 70.0 + } + }, + { + "id": "GUIdff", + "name": "GUIdff#3", + "pos": { + "x": 115.0, + "y": 170.0 + } + }, + { + "id": "GUIdff", + "name": "GUIdff#2", + "pos": { + "x": 115.0, + "y": 120.0 + } + } + ], + "innerWires": [ + { + "pin1": { + "compName": "WireCrossPoint#3", + "pinName": "" + }, + "pin2": { + "compName": "_submodelinterface", + "pinName": "Q1" + }, + "name": "unnamedWire#14", + "path": [] + }, + { + "pin1": { + "compName": "GUIdff#0", + "pinName": "Q" + }, + "pin2": { + "compName": "WireCrossPoint#3", + "pinName": "" + }, + "name": "unnamedWire#13", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#4", + "pinName": "" + }, + "pin2": { + "compName": "GUIdff#1", + "pinName": "Q" + }, + "name": "unnamedWire#16", + "path": [] + }, + { + "pin1": { + "compName": "_submodelinterface", + "pinName": "Q2" + }, + "pin2": { + "compName": "WireCrossPoint#4", + "pinName": "" + }, + "name": "unnamedWire#15", + "path": [] + }, + { + "pin1": { + "compName": "GUIdff#2", + "pinName": "Q" + }, + "pin2": { + "compName": "WireCrossPoint#5", + "pinName": "" + }, + "name": "unnamedWire#18", + "path": [] + }, + { + "pin1": { + "compName": "_submodelinterface", + "pinName": "D4" + }, + "pin2": { + "compName": "DeserializedSubmodelComponent#0", + "pinName": "I1_4" + }, + "name": "unnamedWire#17", + "path": [ + { + "x": 15.0, + "y": 275.0 + }, + { + "x": 15.0, + "y": 155.0 + } + ] + }, + { + "pin1": { + "compName": "WireCrossPoint#5", + "pinName": "" + }, + "pin2": { + "compName": "_submodelinterface", + "pinName": "Q3" + }, + "name": "unnamedWire#19", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#6", + "pinName": "" + }, + "pin2": { + "compName": "GUIdff#3", + "pinName": "Q" + }, + "name": "unnamedWire#21", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#6", + "pinName": "" + }, + "pin2": { + "compName": "_submodelinterface", + "pinName": "Q4" + }, + "name": "unnamedWire#20", + "path": [] + }, + { + "pin1": { + "compName": "DeserializedSubmodelComponent#0", + "pinName": "Y4" + }, + "pin2": { + "compName": "GUIdff#3", + "pinName": "D" + }, + "name": "unnamedWire#23", + "path": [ + { + "x": 95.0, + "y": 105.0 + }, + { + "x": 95.0, + "y": 185.0 + } + ] + }, + { + "pin1": { + "compName": "DeserializedSubmodelComponent#0", + "pinName": "Y3" + }, + "pin2": { + "compName": "GUIdff#2", + "pinName": "D" + }, + "name": "unnamedWire#22", + "path": [ + { + "x": 100.0, + "y": 95.0 + }, + { + "x": 100.0, + "y": 135.0 + } + ] + }, + { + "pin1": { + "compName": "WireCrossPoint#4", + "pinName": "" + }, + "pin2": { + "compName": "DeserializedSubmodelComponent#0", + "pinName": "I0_2" + }, + "name": "unnamedWire#25", + "path": [ + { + "x": 165.0, + "y": 200.0 + }, + { + "x": 45.0, + "y": 200.0 + }, + { + "x": 45.0, + "y": 95.0 + } + ] + }, + { + "pin1": { + "compName": "WireCrossPoint#3", + "pinName": "" + }, + "pin2": { + "compName": "DeserializedSubmodelComponent#0", + "pinName": "I0_1" + }, + "name": "unnamedWire#24", + "path": [ + { + "x": 170.0, + "y": 195.0 + }, + { + "x": 50.0, + "y": 195.0 + }, + { + "x": 50.0, + "y": 85.0 + } + ] + }, + { + "pin1": { + "compName": "WireCrossPoint#6", + "pinName": "" + }, + "pin2": { + "compName": "WireCrossPoint#6", + "pinName": "" + }, + "name": "unnamedWire#27", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#5", + "pinName": "" + }, + "pin2": { + "compName": "DeserializedSubmodelComponent#0", + "pinName": "I0_3" + }, + "name": "unnamedWire#26", + "path": [ + { + "x": 160.0, + "y": 205.0 + }, + { + "x": 40.0, + "y": 205.0 + }, + { + "x": 40.0, + "y": 105.0 + } + ] + }, + { + "pin1": { + "compName": "WireCrossPoint#6", + "pinName": "" + }, + "pin2": { + "compName": "DeserializedSubmodelComponent#0", + "pinName": "I0_4" + }, + "name": "unnamedWire#28", + "path": [ + { + "x": 155.0, + "y": 210.0 + }, + { + "x": 35.0, + "y": 210.0 + }, + { + "x": 35.0, + "y": 115.0 + } + ] + }, + { + "pin1": { + "compName": "_submodelinterface", + "pinName": "WE" + }, + "pin2": { + "compName": "DeserializedSubmodelComponent#0", + "pinName": "S0" + }, + "name": "unnamedWire#9", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#2", + "pinName": "" + }, + "pin2": { + "compName": "GUIdff#3", + "pinName": "C" + }, + "name": "unnamedWire#8", + "path": [ + { + "x": 105.0, + "y": 175.0 + } + ] + }, + { + "pin1": { + "compName": "WireCrossPoint#2", + "pinName": "" + }, + "pin2": { + "compName": "GUIdff#2", + "pinName": "C" + }, + "name": "unnamedWire#7", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#1", + "pinName": "" + }, + "pin2": { + "compName": "WireCrossPoint#2", + "pinName": "" + }, + "name": "unnamedWire#6", + "path": [] + }, + { + "pin1": { + "compName": "DeserializedSubmodelComponent#0", + "pinName": "Y1" + }, + "pin2": { + "compName": "GUIdff#0", + "pinName": "D" + }, + "name": "unnamedWire#1", + "path": [ + { + "x": 100.0, + "y": 75.0 + }, + { + "x": 100.0, + "y": 35.0 + } + ] + }, + { + "pin1": { + "compName": "_submodelinterface", + "pinName": "C" + }, + "pin2": { + "compName": "WireCrossPoint#0", + "pinName": "" + }, + "name": "unnamedWire#0", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#1", + "pinName": "" + }, + "pin2": { + "compName": "GUIdff#1", + "pinName": "C" + }, + "name": "unnamedWire#5", + "path": [] + }, + { + "pin1": { + "compName": "_submodelinterface", + "pinName": "D1" + }, + "pin2": { + "compName": "DeserializedSubmodelComponent#0", + "pinName": "I1_1" + }, + "name": "unnamedWire#10", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#0", + "pinName": "" + }, + "pin2": { + "compName": "WireCrossPoint#1", + "pinName": "" + }, + "name": "unnamedWire#4", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#0", + "pinName": "" + }, + "pin2": { + "compName": "GUIdff#0", + "pinName": "C" + }, + "name": "unnamedWire#3", + "path": [] + }, + { + "pin1": { + "compName": "_submodelinterface", + "pinName": "D3" + }, + "pin2": { + "compName": "DeserializedSubmodelComponent#0", + "pinName": "I1_3" + }, + "name": "unnamedWire#12", + "path": [ + { + "x": 10.0, + "y": 225.0 + }, + { + "x": 10.0, + "y": 145.0 + } + ] + }, + { + "pin1": { + "compName": "_submodelinterface", + "pinName": "D2" + }, + "pin2": { + "compName": "DeserializedSubmodelComponent#0", + "pinName": "I1_2" + }, + "name": "unnamedWire#11", + "path": [ + { + "x": 5.0, + "y": 175.0 + }, + { + "x": 5.0, + "y": 135.0 + } + ] + }, + { + "pin1": { + "compName": "DeserializedSubmodelComponent#0", + "pinName": "Y2" + }, + "pin2": { + "compName": "GUIdff#1", + "pinName": "D" + }, + "name": "unnamedWire#2", + "path": [] + } + ] + }, + "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererParams": { + "centerText": "D flip flop\n4 bit", + "centerTextHeight": 5.0, + "horizontalComponentCenter": 17.5, + "pinLabelHeight": 3.5, + "pinLabelMargin": 0.5 + }, + "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer", + "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler", + "highLevelStateHandlerParams": { + "subcomponentHighLevelStates": {}, + "atomicHighLevelStates": { + "q1": { + "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "params": { + "delegateTarget": "GUIdff#0", + "subStateID": "q" + } + }, + "q2": { + "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "params": { + "delegateTarget": "GUIdff#1", + "subStateID": "q" + } + }, + "q": { + "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler", + "params": { + "vectorPartTargets": [ + "q1", + "q2", + "q3", + "q4" + ], + "vectorPartLengthes": [ + 1, + 1, + 1, + 1 + ] + } + }, + "q3": { + "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "params": { + "delegateTarget": "GUIdff#2", + "subStateID": "q" + } + }, + "q4": { + "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "params": { + "delegateTarget": "GUIdff#3", + "subStateID": "q" + } + } + } + } +} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901.json b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901.json index 503d8546..02f17617 100644 --- a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901.json +++ b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901.json @@ -549,8 +549,8 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "GUIAm2901QReg", - "name": "GUIAm2901QReg#0", + "id": "GUIdff4", + "name": "GUIdff4#0", "pos": { "x": 90.0, "y": 2490.0 @@ -1538,7 +1538,7 @@ mograsim version: 0.1.3 "pinName": "" }, "pin2": { - "compName": "GUIAm2901QReg#0", + "compName": "GUIdff4#0", "pinName": "C" }, "name": "unnamedWire#17", @@ -2123,7 +2123,7 @@ mograsim version: 0.1.3 "pinName": "Y2" }, "pin2": { - "compName": "GUIAm2901QReg#0", + "compName": "GUIdff4#0", "pinName": "D2" }, "name": "unnamedWire#87", @@ -2135,7 +2135,7 @@ mograsim version: 0.1.3 "pinName": "Y1" }, "pin2": { - "compName": "GUIAm2901QReg#0", + "compName": "GUIdff4#0", "pinName": "D1" }, "name": "unnamedWire#86", @@ -2147,7 +2147,7 @@ mograsim version: 0.1.3 "pinName": "Y4" }, "pin2": { - "compName": "GUIAm2901QReg#0", + "compName": "GUIdff4#0", "pinName": "D4" }, "name": "unnamedWire#89", @@ -2159,7 +2159,7 @@ mograsim version: 0.1.3 "pinName": "Y3" }, "pin2": { - "compName": "GUIAm2901QReg#0", + "compName": "GUIdff4#0", "pinName": "D3" }, "name": "unnamedWire#88", @@ -2327,7 +2327,7 @@ mograsim version: 0.1.3 "pinName": "QWE" }, "pin2": { - "compName": "GUIAm2901QReg#0", + "compName": "GUIdff4#0", "pinName": "WE" }, "name": "unnamedWire#147", @@ -3003,7 +3003,7 @@ mograsim version: 0.1.3 }, { "pin1": { - "compName": "GUIAm2901QReg#0", + "compName": "GUIdff4#0", "pinName": "Q2" }, "pin2": { @@ -3015,7 +3015,7 @@ mograsim version: 0.1.3 }, { "pin1": { - "compName": "GUIAm2901QReg#0", + "compName": "GUIdff4#0", "pinName": "Q1" }, "pin2": { @@ -3027,7 +3027,7 @@ mograsim version: 0.1.3 }, { "pin1": { - "compName": "GUIAm2901QReg#0", + "compName": "GUIdff4#0", "pinName": "Q4" }, "pin2": { @@ -3039,7 +3039,7 @@ mograsim version: 0.1.3 }, { "pin1": { - "compName": "GUIAm2901QReg#0", + "compName": "GUIdff4#0", "pinName": "Q3" }, "pin2": { @@ -3406,7 +3406,7 @@ mograsim version: 0.1.3 "qreg": { "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", "params": { - "delegateTarget": "GUIAm2901QReg#0" + "delegateTarget": "GUIdff4#0" } }, "regs": { diff --git a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901QReg.json b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901QReg.json deleted file mode 100644 index 4f3bc2d7..00000000 --- a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901QReg.json +++ /dev/null @@ -1,716 +0,0 @@ -mograsim version: 0.1.3 -{ - "width": 35.0, - "height": 60.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 55.0 - }, - "name": "D4", - "logicWidth": 1 - }, - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "Q1", - "logicWidth": 1 - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "Q2", - "logicWidth": 1 - }, - { - "location": { - "x": 35.0, - "y": 25.0 - }, - "name": "Q3", - "logicWidth": 1 - }, - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "C", - "logicWidth": 1 - }, - { - "location": { - "x": 35.0, - "y": 35.0 - }, - "name": "Q4", - "logicWidth": 1 - }, - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "D1", - "logicWidth": 1 - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "WE", - "logicWidth": 1 - }, - { - "location": { - "x": 0.0, - "y": 35.0 - }, - "name": "D2", - "logicWidth": 1 - }, - { - "location": { - "x": 0.0, - "y": 45.0 - }, - "name": "D3", - "logicWidth": 1 - } - ], - "submodel": { - "innerScale": 0.2, - "subComps": [ - { - "id": "GUIdff", - "name": "GUIdff#1", - "pos": { - "x": 115.0, - "y": 70.0 - } - }, - { - "id": "GUIdff", - "name": "GUIdff#0", - "pos": { - "x": 115.0, - "y": 20.0 - } - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 104.0, - "y": 74.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 104.0, - "y": 24.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 169.0, - "y": 24.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 104.0, - "y": 124.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#5", - "pos": { - "x": 159.0, - "y": 124.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#4", - "pos": { - "x": 164.0, - "y": 74.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#6", - "pos": { - "x": 154.0, - "y": 174.0 - }, - "params": 1 - }, - { - "id": "GUImux1_4", - "name": "DeserializedSubmodelComponent#0", - "pos": { - "x": 55.0, - "y": 70.0 - } - }, - { - "id": "GUIdff", - "name": "GUIdff#3", - "pos": { - "x": 115.0, - "y": 170.0 - } - }, - { - "id": "GUIdff", - "name": "GUIdff#2", - "pos": { - "x": 115.0, - "y": 120.0 - } - } - ], - "innerWires": [ - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Q1" - }, - "name": "unnamedWire#14", - "path": [] - }, - { - "pin1": { - "compName": "GUIdff#0", - "pinName": "Q" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#13", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "GUIdff#1", - "pinName": "Q" - }, - "name": "unnamedWire#16", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "Q2" - }, - "pin2": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "name": "unnamedWire#15", - "path": [] - }, - { - "pin1": { - "compName": "GUIdff#2", - "pinName": "Q" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#18", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D4" - }, - "pin2": { - "compName": "DeserializedSubmodelComponent#0", - "pinName": "I1_4" - }, - "name": "unnamedWire#17", - "path": [ - { - "x": 15.0, - "y": 275.0 - }, - { - "x": 15.0, - "y": 155.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Q3" - }, - "name": "unnamedWire#19", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "GUIdff#3", - "pinName": "Q" - }, - "name": "unnamedWire#21", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Q4" - }, - "name": "unnamedWire#20", - "path": [] - }, - { - "pin1": { - "compName": "DeserializedSubmodelComponent#0", - "pinName": "Y4" - }, - "pin2": { - "compName": "GUIdff#3", - "pinName": "D" - }, - "name": "unnamedWire#23", - "path": [ - { - "x": 95.0, - "y": 105.0 - }, - { - "x": 95.0, - "y": 185.0 - } - ] - }, - { - "pin1": { - "compName": "DeserializedSubmodelComponent#0", - "pinName": "Y3" - }, - "pin2": { - "compName": "GUIdff#2", - "pinName": "D" - }, - "name": "unnamedWire#22", - "path": [ - { - "x": 100.0, - "y": 95.0 - }, - { - "x": 100.0, - "y": 135.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "DeserializedSubmodelComponent#0", - "pinName": "I0_2" - }, - "name": "unnamedWire#25", - "path": [ - { - "x": 165.0, - "y": 200.0 - }, - { - "x": 45.0, - "y": 200.0 - }, - { - "x": 45.0, - "y": 95.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "DeserializedSubmodelComponent#0", - "pinName": "I0_1" - }, - "name": "unnamedWire#24", - "path": [ - { - "x": 170.0, - "y": 195.0 - }, - { - "x": 50.0, - "y": 195.0 - }, - { - "x": 50.0, - "y": 85.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "name": "unnamedWire#27", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "DeserializedSubmodelComponent#0", - "pinName": "I0_3" - }, - "name": "unnamedWire#26", - "path": [ - { - "x": 160.0, - "y": 205.0 - }, - { - "x": 40.0, - "y": 205.0 - }, - { - "x": 40.0, - "y": 105.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "DeserializedSubmodelComponent#0", - "pinName": "I0_4" - }, - "name": "unnamedWire#28", - "path": [ - { - "x": 155.0, - "y": 210.0 - }, - { - "x": 35.0, - "y": 210.0 - }, - { - "x": 35.0, - "y": 115.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "WE" - }, - "pin2": { - "compName": "DeserializedSubmodelComponent#0", - "pinName": "S0" - }, - "name": "unnamedWire#9", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "GUIdff#3", - "pinName": "C" - }, - "name": "unnamedWire#8", - "path": [ - { - "x": 105.0, - "y": 175.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "GUIdff#2", - "pinName": "C" - }, - "name": "unnamedWire#7", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "DeserializedSubmodelComponent#0", - "pinName": "Y1" - }, - "pin2": { - "compName": "GUIdff#0", - "pinName": "D" - }, - "name": "unnamedWire#1", - "path": [ - { - "x": 100.0, - "y": 75.0 - }, - { - "x": 100.0, - "y": 35.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "C" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#0", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "GUIdff#1", - "pinName": "C" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D1" - }, - "pin2": { - "compName": "DeserializedSubmodelComponent#0", - "pinName": "I1_1" - }, - "name": "unnamedWire#10", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#4", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "GUIdff#0", - "pinName": "C" - }, - "name": "unnamedWire#3", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D3" - }, - "pin2": { - "compName": "DeserializedSubmodelComponent#0", - "pinName": "I1_3" - }, - "name": "unnamedWire#12", - "path": [ - { - "x": 10.0, - "y": 225.0 - }, - { - "x": 10.0, - "y": 145.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D2" - }, - "pin2": { - "compName": "DeserializedSubmodelComponent#0", - "pinName": "I1_2" - }, - "name": "unnamedWire#11", - "path": [ - { - "x": 5.0, - "y": 175.0 - }, - { - "x": 5.0, - "y": 135.0 - } - ] - }, - { - "pin1": { - "compName": "DeserializedSubmodelComponent#0", - "pinName": "Y2" - }, - "pin2": { - "compName": "GUIdff#1", - "pinName": "D" - }, - "name": "unnamedWire#2", - "path": [] - } - ] - }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", - "symbolRendererParams": { - "centerText": "GUIAm2901QReg", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer", - "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler", - "highLevelStateHandlerParams": { - "subcomponentHighLevelStates": {}, - "atomicHighLevelStates": { - "q1": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", - "params": { - "delegateTarget": "GUIdff#0", - "subStateID": "q" - } - }, - "q2": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", - "params": { - "delegateTarget": "GUIdff#1", - "subStateID": "q" - } - }, - "q": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler", - "params": { - "vectorPartTargets": [ - "q1", - "q2", - "q3", - "q4" - ], - "vectorPartLengthes": [ - 1, - 1, - 1, - 1 - ] - } - }, - "q3": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", - "params": { - "delegateTarget": "GUIdff#2", - "subStateID": "q" - } - }, - "q4": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", - "params": { - "delegateTarget": "GUIdff#3", - "subStateID": "q" - } - } - } - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/standardComponentIDMapping.json b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/standardComponentIDMapping.json index 4b036ccf..2983e00d 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/standardComponentIDMapping.json +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/standardComponentIDMapping.json @@ -8,7 +8,6 @@ mograsim version: 0.1.3 "GUIAm2901ALUInclSourceDecodeInclFunctionDecode": "file:components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json", "GUIAm2901ALUOneBit": "file:components/am2901/GUIAm2901ALUOneBit.json", "GUIAm2901DestDecode": "file:components/am2901/GUIAm2901DestDecode.json", - "GUIAm2901QReg": "file:components/am2901/GUIAm2901QReg.json", "GUIAm2901SourceDecode": "file:components/am2901/GUIAm2901SourceDecode.json", "GUIAndGate": "class:net.mograsim.logic.model.model.components.atomic.GUIAndGate", "GUINandGate": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", @@ -19,6 +18,7 @@ mograsim version: 0.1.3 "GUIandor414": "file:components/GUIandor414.json", "GUIdemux2": "file:components/GUIdemux2.json", "GUIdff": "file:components/GUIdff.json", + "GUIdff4": "file:components/GUIdff4.json", "GUIdlatch": "file:components/GUIdlatch.json", "GUIdlatch4": "file:components/GUIdlatch4.json", "GUIfulladder": "file:components/GUIfulladder.json",