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%2Fam2904%2FAm2904MSR.json;h=c3b5fcfad56f1a183dc27a6f1bbce4cef9dec6ce;hp=927d41f8ebb17ff02dc83b4ed10cd14899df248f;hb=5c03a4fa605a1c3946eddece3b566b5aa0677759;hpb=9e8e8ae5414f52ec87f9247b10a525f41768c7dc diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json index 927d41f8..c3b5fcfa 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json @@ -203,136 +203,136 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#10", + "name": "WireCrossPoint#2", "pos": { - "x": 74.0, - "y": 54.0 + "x": 369.0, + "y": 94.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#11", + "name": "WireCrossPoint#3", "pos": { - "x": 74.0, - "y": 64.0 + "x": 374.0, + "y": 104.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#12", + "name": "WireCrossPoint#4", "pos": { - "x": 34.0, - "y": 234.0 + "x": 379.0, + "y": 114.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#13", + "name": "WireCrossPoint#5", "pos": { - "x": 124.0, - "y": 174.0 + "x": 29.0, + "y": 284.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#14", + "name": "WireCrossPoint#6", "pos": { - "x": 74.0, - "y": 74.0 + "x": 39.0, + "y": 304.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#15", + "name": "WireCrossPoint#7", "pos": { - "x": 164.0, - "y": 59.0 + "x": 19.0, + "y": 194.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#16", + "name": "WireCrossPoint#8", "pos": { - "x": 269.0, - "y": 39.0 + "x": 79.0, + "y": 254.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#2", + "name": "WireCrossPoint#9", "pos": { - "x": 369.0, - "y": 94.0 + "x": 39.0, + "y": 84.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#3", + "name": "WireCrossPoint#10", "pos": { - "x": 374.0, - "y": 104.0 + "x": 74.0, + "y": 54.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#4", + "name": "WireCrossPoint#11", "pos": { - "x": 379.0, - "y": 114.0 + "x": 74.0, + "y": 64.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#5", + "name": "WireCrossPoint#12", "pos": { - "x": 29.0, - "y": 284.0 + "x": 34.0, + "y": 234.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#6", + "name": "WireCrossPoint#13", "pos": { - "x": 39.0, - "y": 304.0 + "x": 124.0, + "y": 174.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#7", + "name": "WireCrossPoint#14", "pos": { - "x": 19.0, - "y": 194.0 + "x": 74.0, + "y": 74.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#8", + "name": "WireCrossPoint#15", "pos": { - "x": 79.0, - "y": 254.0 + "x": 164.0, + "y": 59.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#9", + "name": "WireCrossPoint#16", "pos": { - "x": 39.0, - "y": 84.0 + "x": 269.0, + "y": 39.0 }, "params": 1 }, @@ -460,6 +460,141 @@ } ] }, + { + "pin1": { + "compName": "_submodelinterface", + "pinName": "_EN" + }, + "pin2": { + "compName": "dff4_finewe#0", + "pinName": "_WE3" + }, + "name": "unnamedWire#2", + "path": [ + { + "x": 150.0, + "y": 25.0 + }, + { + "x": 310.0, + "y": 25.0 + }, + { + "x": 310.0, + "y": 115.0 + } + ] + }, + { + "pin1": { + "compName": "_submodelinterface", + "pinName": "_EC" + }, + "pin2": { + "compName": "and#0", + "pinName": "A" + }, + "name": "unnamedWire#3", + "path": [ + { + "x": 100.0, + "y": 20.0 + }, + { + "x": 190.0, + "y": 20.0 + }, + { + "x": 190.0, + "y": 55.0 + } + ] + }, + { + "pin1": { + "compName": "_submodelinterface", + "pinName": "_EZ" + }, + "pin2": { + "compName": "dff4_finewe#0", + "pinName": "_WE1" + }, + "name": "unnamedWire#4", + "path": [ + { + "x": 50.0, + "y": 15.0 + }, + { + "x": 320.0, + "y": 15.0 + }, + { + "x": 320.0, + "y": 95.0 + } + ] + }, + { + "pin1": { + "compName": "Splitter#4", + "pinName": "I" + }, + "pin2": { + "compName": "_submodelinterface", + "pinName": "Q" + }, + "name": "unnamedWire#5", + "path": [] + }, + { + "pin1": { + "compName": "dff4_finewe#0", + "pinName": "Q1" + }, + "pin2": { + "compName": "WireCrossPoint#1", + "pinName": "" + }, + "name": "unnamedWire#6", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#4", + "pinName": "" + }, + "pin2": { + "compName": "Splitter#4", + "pinName": "O0" + }, + "name": "unnamedWire#7", + "path": [] + }, + { + "pin1": { + "compName": "Splitter#4", + "pinName": "O1" + }, + "pin2": { + "compName": "WireCrossPoint#3", + "pinName": "" + }, + "name": "unnamedWire#8", + "path": [] + }, + { + "pin1": { + "compName": "dff4_finewe#0", + "pinName": "Q2" + }, + "pin2": { + "compName": "WireCrossPoint#2", + "pinName": "" + }, + "name": "unnamedWire#9", + "path": [] + }, { "pin1": { "compName": "_submodelinterface", @@ -616,31 +751,6 @@ "name": "unnamedWire#19", "path": [] }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "_EN" - }, - "pin2": { - "compName": "dff4_finewe#0", - "pinName": "_WE3" - }, - "name": "unnamedWire#2", - "path": [ - { - "x": 150.0, - "y": 25.0 - }, - { - "x": 310.0, - "y": 25.0 - }, - { - "x": 310.0, - "y": 115.0 - } - ] - }, { "pin1": { "compName": "_submodelinterface", @@ -783,31 +893,6 @@ "name": "unnamedWire#29", "path": [] }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "_EC" - }, - "pin2": { - "compName": "and#0", - "pinName": "A" - }, - "name": "unnamedWire#3", - "path": [ - { - "x": 100.0, - "y": 20.0 - }, - { - "x": 190.0, - "y": 20.0 - }, - { - "x": 190.0, - "y": 55.0 - } - ] - }, { "pin1": { "compName": "not4#0", @@ -977,31 +1062,6 @@ } ] }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "_EZ" - }, - "pin2": { - "compName": "dff4_finewe#0", - "pinName": "_WE1" - }, - "name": "unnamedWire#4", - "path": [ - { - "x": 50.0, - "y": 15.0 - }, - { - "x": 320.0, - "y": 15.0 - }, - { - "x": 320.0, - "y": 95.0 - } - ] - }, { "pin1": { "compName": "WireCrossPoint#6", @@ -1141,18 +1201,6 @@ "name": "unnamedWire#49", "path": [] }, - { - "pin1": { - "compName": "Splitter#4", - "pinName": "I" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Q" - }, - "name": "unnamedWire#5", - "path": [] - }, { "pin1": { "compName": "WireCrossPoint#10", @@ -1283,18 +1331,6 @@ } ] }, - { - "pin1": { - "compName": "dff4_finewe#0", - "pinName": "Q1" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#6", - "path": [] - }, { "pin1": { "compName": "mux1_4#3", @@ -1443,18 +1479,6 @@ } ] }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "Splitter#4", - "pinName": "O0" - }, - "name": "unnamedWire#7", - "path": [] - }, { "pin1": { "compName": "mux1_4#4", @@ -1637,18 +1661,6 @@ } ] }, - { - "pin1": { - "compName": "Splitter#4", - "pinName": "O1" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#8", - "path": [] - }, { "pin1": { "compName": "mux1_4#4", @@ -1849,18 +1861,6 @@ "name": "unnamedWire#89", "path": [] }, - { - "pin1": { - "compName": "dff4_finewe#0", - "pinName": "Q2" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#9", - "path": [] - }, { "pin1": { "compName": "WireCrossPoint#15", @@ -1904,7 +1904,7 @@ "compName": "mux1_4#0", "pinName": "S0" }, - "name": "unnamedWire#93", + "name": "unnamedWire#92", "path": [] } ],