X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fam2904%2FAm2904muSR.json;h=94fe508a8dc0bbbd8365ee7eecf718b6614a9c00;hb=63b01516457d2cac32750158fc8893c6f38fc8ff;hp=2949d8da6d1ca9d5f2cd5d848a7d6fd084af9ef4;hpb=58babf45ae7d259a296656451d796dbe601377a4;p=Mograsim.git diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json index 2949d8da..94fe508a 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json @@ -243,16 +243,16 @@ } }, { - "id": "mux1_4", - "name": "mux1_4#0", + "id": "mux1_4_sb", + "name": "mux1_4_sb#0", "pos": { "x": 25.0, "y": 125.0 } }, { - "id": "mux1_4", - "name": "mux1_4#1", + "id": "mux1_4_sb", + "name": "mux1_4_sb#1", "pos": { "x": 65.0, "y": 75.0 @@ -271,7 +271,7 @@ { "pin1": { "compName": "dff4_finewe#0", - "pinName": "Q1" + "pinName": "Q4" }, "pin2": { "compName": "Splitter#3", @@ -287,14 +287,146 @@ }, "pin2": { "compName": "dff4_finewe#0", - "pinName": "Q2" + "pinName": "Q3" }, "name": "unnamedWire#1", "path": [] }, { "pin1": { - "compName": "mux1_4#0", + "compName": "Splitter#3", + "pinName": "O1" + }, + "pin2": { + "compName": "dff4_finewe#0", + "pinName": "Q2" + }, + "name": "unnamedWire#2", + "path": [] + }, + { + "pin1": { + "compName": "dff4_finewe#0", + "pinName": "Q1" + }, + "pin2": { + "compName": "WireCrossPoint#3", + "pinName": "" + }, + "name": "unnamedWire#3", + "path": [] + }, + { + "pin1": { + "compName": "Splitter#3", + "pinName": "I" + }, + "pin2": { + "compName": "_submodelinterface", + "pinName": "Q" + }, + "name": "unnamedWire#4", + "path": [ + { + "x": 245.0, + "y": 45.0 + }, + { + "x": 245.0, + "y": 50.0 + } + ] + }, + { + "pin1": { + "compName": "_submodelinterface", + "pinName": "M" + }, + "pin2": { + "compName": "Splitter#0", + "pinName": "I" + }, + "name": "unnamedWire#5", + "path": [] + }, + { + "pin1": { + "compName": "_submodelinterface", + "pinName": "I" + }, + "pin2": { + "compName": "Splitter#1", + "pinName": "I" + }, + "name": "unnamedWire#6", + "path": [] + }, + { + "pin1": { + "compName": "Splitter#1", + "pinName": "O3" + }, + "pin2": { + "compName": "mux1_4_sb#0", + "pinName": "I1_1" + }, + "name": "unnamedWire#7", + "path": [ + { + "x": 20.0, + "y": 185.0 + }, + { + "x": 20.0, + "y": 180.0 + } + ] + }, + { + "pin1": { + "compName": "mux1_4_sb#0", + "pinName": "I1_2" + }, + "pin2": { + "compName": "Splitter#1", + "pinName": "O2" + }, + "name": "unnamedWire#8", + "path": [ + { + "x": 20.0, + "y": 190.0 + }, + { + "x": 20.0, + "y": 195.0 + } + ] + }, + { + "pin1": { + "compName": "Splitter#1", + "pinName": "O1" + }, + "pin2": { + "compName": "mux1_4_sb#0", + "pinName": "I1_3" + }, + "name": "unnamedWire#9", + "path": [ + { + "x": 20.0, + "y": 205.0 + }, + { + "x": 20.0, + "y": 200.0 + } + ] + }, + { + "pin1": { + "compName": "mux1_4_sb#0", "pinName": "I1_4" }, "pin2": { @@ -331,7 +463,7 @@ "pinName": "O0" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I0_4" }, "name": "unnamedWire#12", @@ -352,7 +484,7 @@ "pinName": "O1" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I0_3" }, "name": "unnamedWire#13", @@ -373,7 +505,7 @@ "pinName": "O2" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I0_2" }, "name": "unnamedWire#14", @@ -419,11 +551,11 @@ }, { "pin1": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "Y4" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I1_4" }, "name": "unnamedWire#17", @@ -431,11 +563,11 @@ }, { "pin1": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I1_3" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "Y3" }, "name": "unnamedWire#18", @@ -443,11 +575,11 @@ }, { "pin1": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "Y2" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I1_2" }, "name": "unnamedWire#19", @@ -455,23 +587,11 @@ }, { "pin1": { - "compName": "Splitter#3", - "pinName": "O1" - }, - "pin2": { - "compName": "dff4_finewe#0", - "pinName": "Q3" - }, - "name": "unnamedWire#2", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "Y1" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I1_1" }, "name": "unnamedWire#20", @@ -479,7 +599,7 @@ }, { "pin1": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I0_1" }, "pin2": { @@ -500,7 +620,7 @@ "pinName": "" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I0_2" }, "name": "unnamedWire#22", @@ -508,7 +628,7 @@ }, { "pin1": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I0_3" }, "pin2": { @@ -548,7 +668,7 @@ "pinName": "" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I0_4" }, "name": "unnamedWire#26", @@ -560,7 +680,7 @@ "pinName": "" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "S0" }, "name": "unnamedWire#27", @@ -577,7 +697,7 @@ "pinName": "O1" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "S0" }, "name": "unnamedWire#28", @@ -604,18 +724,6 @@ "name": "unnamedWire#29", "path": [] }, - { - "pin1": { - "compName": "dff4_finewe#0", - "pinName": "Q4" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#3", - "path": [] - }, { "pin1": { "compName": "NandGate#2", @@ -697,7 +805,7 @@ }, { "pin1": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "Y2" }, "pin2": { @@ -740,7 +848,7 @@ { "pin1": { "compName": "dff4_finewe#0", - "pinName": "_WE1" + "pinName": "_WE4" }, "pin2": { "compName": "_submodelinterface", @@ -790,7 +898,7 @@ }, "pin2": { "compName": "dff4_finewe#0", - "pinName": "_WE4" + "pinName": "_WE1" }, "name": "unnamedWire#38", "path": [ @@ -811,7 +919,7 @@ { "pin1": { "compName": "dff4_finewe#0", - "pinName": "_WE3" + "pinName": "_WE2" }, "pin2": { "compName": "_submodelinterface", @@ -833,27 +941,6 @@ } ] }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "I" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Q" - }, - "name": "unnamedWire#4", - "path": [ - { - "x": 245.0, - "y": 45.0 - }, - { - "x": 245.0, - "y": 50.0 - } - ] - }, { "pin1": { "compName": "_submodelinterface", @@ -861,7 +948,7 @@ }, "pin2": { "compName": "dff4_finewe#0", - "pinName": "_WE2" + "pinName": "_WE3" }, "name": "unnamedWire#40", "path": [ @@ -882,10 +969,10 @@ { "pin1": { "compName": "dff4_finewe#0", - "pinName": "D1" + "pinName": "D4" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "Y1" }, "name": "unnamedWire#41", @@ -898,7 +985,7 @@ }, "pin2": { "compName": "dff4_finewe#0", - "pinName": "D2" + "pinName": "D3" }, "name": "unnamedWire#42", "path": [ @@ -915,10 +1002,10 @@ { "pin1": { "compName": "dff4_finewe#0", - "pinName": "D3" + "pinName": "D2" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "Y3" }, "name": "unnamedWire#43", @@ -930,7 +1017,7 @@ "pinName": "" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "Y4" }, "name": "unnamedWire#44", @@ -948,7 +1035,7 @@ }, "pin2": { "compName": "dff4_finewe#0", - "pinName": "D4" + "pinName": "D1" }, "name": "unnamedWire#45", "path": [ @@ -997,7 +1084,7 @@ "pinName": "O3" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I0_1" }, "name": "unnamedWire#48", @@ -1011,100 +1098,13 @@ "y": 140.0 } ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "M" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "I" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "I" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O3" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I1_1" - }, - "name": "unnamedWire#7", - "path": [ - { - "x": 20.0, - "y": 185.0 - }, - { - "x": 20.0, - "y": 180.0 - } - ] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "I1_2" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O2" - }, - "name": "unnamedWire#8", - "path": [ - { - "x": 20.0, - "y": 190.0 - }, - { - "x": 20.0, - "y": 195.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O1" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I1_3" - }, - "name": "unnamedWire#9", - "path": [ - { - "x": 20.0, - "y": 205.0 - }, - { - "x": 20.0, - "y": 200.0 - } - ] } ], "version": "0.1.1" }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "µSR", + "centerText": "\u00b5SR", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, @@ -1121,6 +1121,34 @@ "delegateTarget": "dff4_finewe#0", "subStateID": "q" } + }, + "q1": { + "id": "delegating", + "params": { + "delegateTarget": "dff4_finewe#0", + "subStateID": "q1" + } + }, + "q2": { + "id": "delegating", + "params": { + "delegateTarget": "dff4_finewe#0", + "subStateID": "q2" + } + }, + "q3": { + "id": "delegating", + "params": { + "delegateTarget": "dff4_finewe#0", + "subStateID": "q3" + } + }, + "q4": { + "id": "delegating", + "params": { + "delegateTarget": "dff4_finewe#0", + "subStateID": "q4" + } } } },