X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fam2904%2FAm2904muSR.json;h=2949d8da6d1ca9d5f2cd5d848a7d6fd084af9ef4;hb=8bed58cd47f4e53a0a83e066d38864aa6875502f;hp=a1991009ea457f6ca9bda45985c96b80542cb5dc;hpb=b32414f8406634aca730d724a011023c0da8bf22;p=Mograsim.git diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json index a1991009..2949d8da 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json @@ -1,11 +1,11 @@ { - "width": 45.0, - "height": 46.0, + "width": 50.0, + "height": 65.0, "interfacePins": [ { "location": { - "x": 14.0, - "y": 46.0 + "x": 0.0, + "y": 10.0 }, "name": "C", "logicWidth": 1, @@ -13,8 +13,8 @@ }, { "location": { - "x": 27.5, - "y": 46.0 + "x": 0.0, + "y": 50.0 }, "name": "CINV", "logicWidth": 1, @@ -23,7 +23,7 @@ { "location": { "x": 0.0, - "y": 31.0 + "y": 40.0 }, "name": "I", "logicWidth": 4, @@ -32,7 +32,7 @@ { "location": { "x": 0.0, - "y": 13.5 + "y": 30.0 }, "name": "M", "logicWidth": 4, @@ -40,8 +40,8 @@ }, { "location": { - "x": 4.0, - "y": 46.0 + "x": 0.0, + "y": 20.0 }, "name": "MUX", "logicWidth": 2, @@ -49,8 +49,8 @@ }, { "location": { - "x": 37.5, - "y": 46.0 + "x": 0.0, + "y": 60.0 }, "name": "OVRRET", "logicWidth": 1, @@ -58,8 +58,8 @@ }, { "location": { - "x": 45.0, - "y": 19.0 + "x": 50.0, + "y": 10.0 }, "name": "Q", "logicWidth": 4, @@ -67,7 +67,7 @@ }, { "location": { - "x": 15.5, + "x": 20.0, "y": 0.0 }, "name": "_EC", @@ -76,7 +76,7 @@ }, { "location": { - "x": 25.5, + "x": 30.0, "y": 0.0 }, "name": "_EN", @@ -85,7 +85,7 @@ }, { "location": { - "x": 35.5, + "x": 40.0, "y": 0.0 }, "name": "_EOVR", @@ -94,7 +94,7 @@ }, { "location": { - "x": 5.5, + "x": 10.0, "y": 0.0 }, "name": "_EZ", @@ -102,48 +102,15 @@ "usage": "INPUT" } ], - "innerScale": 0.1, + "innerScale": 0.2, "submodel": { "components": [ - { - "id": "mux1_4", - "name": "DeserializedSubmodelComponent#0", - "pos": { - "x": 45.0, - "y": 240.0 - } - }, - { - "id": "mux1_4", - "name": "DeserializedSubmodelComponent#1", - "pos": { - "x": 100.0, - "y": 190.0 - } - }, - { - "id": "xor", - "name": "DeserializedSubmodelComponent#2", - "pos": { - "x": 215.0, - "y": 200.0 - } - }, - { - "id": "Merger", - "name": "Merger#0", - "pos": { - "x": 435.0, - "y": 175.0 - }, - "params": 4 - }, { "id": "NandGate", "name": "NandGate#0", "pos": { - "x": 245.0, - "y": 245.0 + "x": 155.0, + "y": 135.0 }, "params": 1 }, @@ -151,8 +118,8 @@ "id": "NandGate", "name": "NandGate#1", "pos": { - "x": 215.0, - "y": 255.0 + "x": 125.0, + "y": 150.0 }, "params": 1 }, @@ -160,8 +127,8 @@ "id": "NandGate", "name": "NandGate#2", "pos": { - "x": 215.0, - "y": 235.0 + "x": 125.0, + "y": 130.0 }, "params": 1 }, @@ -170,34 +137,55 @@ "name": "Splitter#0", "pos": { "x": 5.0, - "y": 120.0 + "y": 135.0 }, - "params": 4 + "params": { + "logicWidth": 4, + "orientation": "RIGHT" + } }, { "id": "Splitter", "name": "Splitter#1", "pos": { "x": 5.0, - "y": 295.0 + "y": 185.0 }, - "params": 4 + "params": { + "logicWidth": 4, + "orientation": "RIGHT" + } }, { "id": "Splitter", "name": "Splitter#2", "pos": { - "x": 45.0, - "y": 430.0 + "x": 5.0, + "y": 95.0 + }, + "params": { + "logicWidth": 2, + "orientation": "RIGHT" + } + }, + { + "id": "Splitter", + "name": "Splitter#3", + "pos": { + "x": 230.0, + "y": 30.0 }, - "params": 2 + "params": { + "logicWidth": 4, + "orientation": "LEFT" + } }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", "pos": { - "x": 89.0, - "y": 234.0 + "x": 19.0, + "y": 119.0 }, "params": 1 }, @@ -205,8 +193,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#1", "pos": { - "x": 89.0, - "y": 224.0 + "x": 59.0, + "y": 109.0 }, "params": 1 }, @@ -214,8 +202,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#2", "pos": { - "x": 89.0, - "y": 214.0 + "x": 59.0, + "y": 99.0 }, "params": 1 }, @@ -223,8 +211,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#3", "pos": { - "x": 429.0, - "y": 204.0 + "x": 224.0, + "y": 59.0 }, "params": 1 }, @@ -232,8 +220,17 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#4", "pos": { - "x": 209.0, - "y": 244.0 + "x": 114.0, + "y": 134.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#5", + "pos": { + "x": 59.0, + "y": 119.0 }, "params": 1 }, @@ -241,8 +238,32 @@ "id": "dff4_finewe", "name": "dff4_finewe#0", "pos": { - "x": 375.0, - "y": 170.0 + "x": 185.0, + "y": 25.0 + } + }, + { + "id": "mux1_4", + "name": "mux1_4#0", + "pos": { + "x": 25.0, + "y": 125.0 + } + }, + { + "id": "mux1_4", + "name": "mux1_4#1", + "pos": { + "x": 65.0, + "y": 75.0 + } + }, + { + "id": "xor", + "name": "xor#0", + "pos": { + "x": 130.0, + "y": 105.0 } } ], @@ -253,16 +274,16 @@ "pinName": "Q1" }, "pin2": { - "compName": "Merger#0", - "pinName": "I3" + "compName": "Splitter#3", + "pinName": "O3" }, "name": "unnamedWire#0", "path": [] }, { "pin1": { - "compName": "Merger#0", - "pinName": "I2" + "compName": "Splitter#3", + "pinName": "O2" }, "pin2": { "compName": "dff4_finewe#0", @@ -273,7 +294,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I1_4" }, "pin2": { @@ -281,7 +302,16 @@ "pinName": "O0" }, "name": "unnamedWire#10", - "path": [] + "path": [ + { + "x": 20.0, + "y": 210.0 + }, + { + "x": 20.0, + "y": 215.0 + } + ] }, { "pin1": { @@ -289,8 +319,8 @@ "pinName": "" }, "pin2": { - "compName": "Merger#0", - "pinName": "I0" + "compName": "Splitter#3", + "pinName": "O0" }, "name": "unnamedWire#11", "path": [] @@ -301,18 +331,18 @@ "pinName": "O0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I0_4" }, "name": "unnamedWire#12", "path": [ { "x": 20.0, - "y": 150.0 + "y": 165.0 }, { "x": 20.0, - "y": 285.0 + "y": 170.0 } ] }, @@ -322,18 +352,18 @@ "pinName": "O1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I0_3" }, "name": "unnamedWire#13", "path": [ { - "x": 25.0, - "y": 140.0 + "x": 20.0, + "y": 155.0 }, { - "x": 25.0, - "y": 275.0 + "x": 20.0, + "y": 160.0 } ] }, @@ -343,18 +373,18 @@ "pinName": "O2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I0_2" }, "name": "unnamedWire#14", "path": [ { - "x": 30.0, - "y": 130.0 + "x": 20.0, + "y": 145.0 }, { - "x": 30.0, - "y": 265.0 + "x": 20.0, + "y": 150.0 } ] }, @@ -368,12 +398,7 @@ "pinName": "I" }, "name": "unnamedWire#15", - "path": [ - { - "x": 40.0, - "y": 435.0 - } - ] + "path": [] }, { "pin1": { @@ -387,18 +412,18 @@ "name": "unnamedWire#16", "path": [ { - "x": 90.0, - "y": 440.0 + "x": 20.0, + "y": 105.0 } ] }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "Y4" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "I1_4" }, "name": "unnamedWire#17", @@ -406,11 +431,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "I1_3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "Y3" }, "name": "unnamedWire#18", @@ -418,11 +443,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "Y2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "I1_2" }, "name": "unnamedWire#19", @@ -430,8 +455,8 @@ }, { "pin1": { - "compName": "Merger#0", - "pinName": "I1" + "compName": "Splitter#3", + "pinName": "O1" }, "pin2": { "compName": "dff4_finewe#0", @@ -442,11 +467,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "Y1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "I1_1" }, "name": "unnamedWire#20", @@ -454,7 +479,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "I0_1" }, "pin2": { @@ -464,8 +489,8 @@ "name": "unnamedWire#21", "path": [ { - "x": 90.0, - "y": 205.0 + "x": 60.0, + "y": 90.0 } ] }, @@ -475,7 +500,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "I0_2" }, "name": "unnamedWire#22", @@ -483,7 +508,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "I0_3" }, "pin2": { @@ -507,11 +532,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#1", + "compName": "WireCrossPoint#0", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#0", + "compName": "WireCrossPoint#5", "pinName": "" }, "name": "unnamedWire#25", @@ -519,11 +544,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#0", + "compName": "WireCrossPoint#5", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "I0_4" }, "name": "unnamedWire#26", @@ -535,18 +560,14 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "S0" }, "name": "unnamedWire#27", "path": [ { - "x": 40.0, - "y": 235.0 - }, - { - "x": 40.0, - "y": 245.0 + "x": 20.0, + "y": 130.0 } ] }, @@ -556,21 +577,33 @@ "pinName": "O1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "S0" }, "name": "unnamedWire#28", "path": [ { - "x": 85.0, - "y": 430.0 + "x": 20.0, + "y": 95.0 }, { - "x": 85.0, - "y": 195.0 + "x": 20.0, + "y": 80.0 } ] }, + { + "pin1": { + "compName": "WireCrossPoint#5", + "pinName": "" + }, + "pin2": { + "compName": "WireCrossPoint#1", + "pinName": "" + }, + "name": "unnamedWire#29", + "path": [] + }, { "pin1": { "compName": "dff4_finewe#0", @@ -593,16 +626,7 @@ "pinName": "A" }, "name": "unnamedWire#30", - "path": [ - { - "x": 240.0, - "y": 245.0 - }, - { - "x": 240.0, - "y": 250.0 - } - ] + "path": [] }, { "pin1": { @@ -616,12 +640,12 @@ "name": "unnamedWire#31", "path": [ { - "x": 240.0, - "y": 260.0 + "x": 150.0, + "y": 150.0 }, { - "x": 240.0, - "y": 265.0 + "x": 150.0, + "y": 160.0 } ] }, @@ -637,31 +661,15 @@ "name": "unnamedWire#32", "path": [ { - "x": 375.0, - "y": 360.0 - }, - { - "x": 205.0, - "y": 360.0 + "x": 115.0, + "y": 300.0 }, { - "x": 205.0, - "y": 260.0 + "x": 115.0, + "y": 155.0 } ] }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#33", - "path": [] - }, { "pin1": { "compName": "WireCrossPoint#3", @@ -671,33 +679,42 @@ "compName": "NandGate#1", "pinName": "B" }, - "name": "unnamedWire#34", + "name": "unnamedWire#33", "path": [ { - "x": 430.0, - "y": 280.0 + "x": 225.0, + "y": 175.0 }, { - "x": 210.0, - "y": 280.0 + "x": 120.0, + "y": 175.0 }, { - "x": 210.0, - "y": 270.0 + "x": 120.0, + "y": 165.0 } ] }, { "pin1": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "Y2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "xor#0", "pinName": "A" }, - "name": "unnamedWire#35", - "path": [] + "name": "unnamedWire#34", + "path": [ + { + "x": 125.0, + "y": 90.0 + }, + { + "x": 125.0, + "y": 110.0 + } + ] }, { "pin1": { @@ -705,22 +722,18 @@ "pinName": "CINV" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "xor#0", "pinName": "B" }, - "name": "unnamedWire#36", + "name": "unnamedWire#35", "path": [ { - "x": 275.0, - "y": 390.0 - }, - { - "x": 190.0, - "y": 390.0 + "x": 105.0, + "y": 250.0 }, { - "x": 190.0, - "y": 215.0 + "x": 105.0, + "y": 120.0 } ] }, @@ -733,18 +746,18 @@ "compName": "_submodelinterface", "pinName": "_EZ" }, - "name": "unnamedWire#37", + "name": "unnamedWire#36", "path": [ { - "x": 370.0, - "y": 185.0 + "x": 180.0, + "y": 40.0 }, { - "x": 370.0, + "x": 180.0, "y": 5.0 }, { - "x": 55.0, + "x": 50.0, "y": 5.0 } ] @@ -758,19 +771,15 @@ "compName": "dff4_finewe#0", "pinName": "C" }, - "name": "unnamedWire#38", + "name": "unnamedWire#37", "path": [ { - "x": 140.0, - "y": 325.0 - }, - { - "x": 345.0, - "y": 325.0 + "x": 55.0, + "y": 50.0 }, { - "x": 345.0, - "y": 175.0 + "x": 55.0, + "y": 30.0 } ] }, @@ -783,26 +792,22 @@ "compName": "dff4_finewe#0", "pinName": "_WE4" }, - "name": "unnamedWire#39", + "name": "unnamedWire#38", "path": [ { - "x": 355.0, - "y": 215.0 + "x": 200.0, + "y": 20.0 + }, + { + "x": 165.0, + "y": 20.0 + }, + { + "x": 165.0, + "y": 70.0 } ] }, - { - "pin1": { - "compName": "Merger#0", - "pinName": "O" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Q" - }, - "name": "unnamedWire#4", - "path": [] - }, { "pin1": { "compName": "dff4_finewe#0", @@ -812,22 +817,43 @@ "compName": "_submodelinterface", "pinName": "_EN" }, - "name": "unnamedWire#40", + "name": "unnamedWire#39", "path": [ { - "x": 360.0, - "y": 205.0 + "x": 170.0, + "y": 60.0 }, { - "x": 360.0, + "x": 170.0, "y": 15.0 }, { - "x": 255.0, + "x": 150.0, "y": 15.0 } ] }, + { + "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", @@ -837,19 +863,19 @@ "compName": "dff4_finewe#0", "pinName": "_WE2" }, - "name": "unnamedWire#41", + "name": "unnamedWire#40", "path": [ { - "x": 155.0, + "x": 100.0, "y": 10.0 }, { - "x": 365.0, + "x": 175.0, "y": 10.0 }, { - "x": 365.0, - "y": 195.0 + "x": 175.0, + "y": 50.0 } ] }, @@ -859,39 +885,30 @@ "pinName": "D1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "Y1" }, - "name": "unnamedWire#42", - "path": [ - { - "x": 315.0, - "y": 225.0 - }, - { - "x": 315.0, - "y": 195.0 - } - ] + "name": "unnamedWire#41", + "path": [] }, { "pin1": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "xor#0", "pinName": "Y" }, "pin2": { "compName": "dff4_finewe#0", "pinName": "D2" }, - "name": "unnamedWire#43", + "name": "unnamedWire#42", "path": [ { - "x": 310.0, - "y": 205.0 + "x": 170.0, + "y": 110.0 }, { - "x": 310.0, - "y": 235.0 + "x": 170.0, + "y": 90.0 } ] }, @@ -901,28 +918,11 @@ "pinName": "D3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "Y3" }, - "name": "unnamedWire#44", - "path": [ - { - "x": 305.0, - "y": 245.0 - }, - { - "x": 305.0, - "y": 225.0 - }, - { - "x": 170.0, - "y": 225.0 - }, - { - "x": 170.0, - "y": 215.0 - } - ] + "name": "unnamedWire#43", + "path": [] }, { "pin1": { @@ -930,18 +930,14 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "Y4" }, - "name": "unnamedWire#45", + "name": "unnamedWire#44", "path": [ { - "x": 160.0, - "y": 245.0 - }, - { - "x": 160.0, - "y": 225.0 + "x": 115.0, + "y": 110.0 } ] }, @@ -954,8 +950,17 @@ "compName": "dff4_finewe#0", "pinName": "D4" }, - "name": "unnamedWire#46", - "path": [] + "name": "unnamedWire#45", + "path": [ + { + "x": 180.0, + "y": 145.0 + }, + { + "x": 180.0, + "y": 110.0 + } + ] }, { "pin1": { @@ -966,13 +971,8 @@ "compName": "NandGate#2", "pinName": "A" }, - "name": "unnamedWire#47", - "path": [ - { - "x": 210.0, - "y": 240.0 - } - ] + "name": "unnamedWire#46", + "path": [] }, { "pin1": { @@ -983,11 +983,11 @@ "compName": "NandGate#2", "pinName": "B" }, - "name": "unnamedWire#48", + "name": "unnamedWire#47", "path": [ { - "x": 210.0, - "y": 250.0 + "x": 115.0, + "y": 145.0 } ] }, @@ -997,18 +997,18 @@ "pinName": "O3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I0_1" }, - "name": "unnamedWire#49", + "name": "unnamedWire#48", "path": [ { - "x": 35.0, - "y": 120.0 + "x": 20.0, + "y": 135.0 }, { - "x": 35.0, - "y": 255.0 + "x": 20.0, + "y": 140.0 } ] }, @@ -1042,15 +1042,24 @@ "pinName": "O3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I1_1" }, "name": "unnamedWire#7", - "path": [] + "path": [ + { + "x": 20.0, + "y": 185.0 + }, + { + "x": 20.0, + "y": 180.0 + } + ] }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I1_2" }, "pin2": { @@ -1058,7 +1067,16 @@ "pinName": "O2" }, "name": "unnamedWire#8", - "path": [] + "path": [ + { + "x": 20.0, + "y": 190.0 + }, + { + "x": 20.0, + "y": 195.0 + } + ] }, { "pin1": { @@ -1066,18 +1084,27 @@ "pinName": "O1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I1_3" }, "name": "unnamedWire#9", - "path": [] + "path": [ + { + "x": 20.0, + "y": 205.0 + }, + { + "x": 20.0, + "y": 200.0 + } + ] } ], "version": "0.1.1" }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "muSR", + "centerText": "µSR", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5,