X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fam2904%2FAm2904MSR.json;h=a5b084d719d326cdff5fa7fe2f54127414a82f04;hb=5ab24a2ac9468d77d20b5ec41dcfafcb88e8c206;hp=7d890990e64239da6f215b4e08e2ef0d36d6ab6d;hpb=68cf226ba2de82bb93f8993cb153ab543b4757bb;p=Mograsim.git diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json index 7d890990..a5b084d7 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json @@ -1,11 +1,11 @@ { - "width": 45.0, - "height": 46.0, + "width": 80.0, + "height": 75.0, "interfacePins": [ { "location": { - "x": 14.0, - "y": 46.0 + "x": 50.0, + "y": 0.0 }, "name": "C", "logicWidth": 1, @@ -13,8 +13,8 @@ }, { "location": { - "x": 27.5, - "y": 46.0 + "x": 60.0, + "y": 0.0 }, "name": "COVD_EN", "logicWidth": 1, @@ -22,8 +22,8 @@ }, { "location": { - "x": 37.5, - "y": 46.0 + "x": 70.0, + "y": 0.0 }, "name": "COVD_V", "logicWidth": 1, @@ -32,7 +32,7 @@ { "location": { "x": 0.0, - "y": 31.0 + "y": 50.0 }, "name": "I", "logicWidth": 4, @@ -40,8 +40,8 @@ }, { "location": { - "x": 4.0, - "y": 46.0 + "x": 0.0, + "y": 70.0 }, "name": "MUX", "logicWidth": 3, @@ -49,8 +49,8 @@ }, { "location": { - "x": 45.0, - "y": 19.0 + "x": 80.0, + "y": 20.0 }, "name": "Q", "logicWidth": 4, @@ -59,7 +59,7 @@ { "location": { "x": 0.0, - "y": 18.0 + "y": 30.0 }, "name": "Y", "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,8 +85,8 @@ }, { "location": { - "x": 35.5, - "y": 0.2 + "x": 40.0, + "y": 0.0 }, "name": "_EOVR", "logicWidth": 1, @@ -94,7 +94,7 @@ }, { "location": { - "x": 5.5, + "x": 10.0, "y": 0.0 }, "name": "_EZ", @@ -104,22 +104,22 @@ { "location": { "x": 0.0, - "y": 5.0 + "y": 10.0 }, "name": "mu", "logicWidth": 4, "usage": "INPUT" } ], - "innerScale": 0.1, + "innerScale": 0.2, "submodel": { "components": [ { "id": "Merger", "name": "Merger#0", "pos": { - "x": 435.0, - "y": 175.0 + "x": 385.0, + "y": 85.0 }, "params": 4 }, @@ -127,8 +127,8 @@ "id": "NandGate", "name": "NandGate#0", "pos": { - "x": 325.0, - "y": 90.0 + "x": 170.0, + "y": 55.0 }, "params": 1 }, @@ -146,7 +146,7 @@ "name": "Splitter#1", "pos": { "x": 5.0, - "y": 165.0 + "y": 135.0 }, "params": 4 }, @@ -155,7 +155,7 @@ "name": "Splitter#2", "pos": { "x": 45.0, - "y": 425.0 + "y": 340.0 }, "params": 3 }, @@ -164,7 +164,7 @@ "name": "Splitter#3", "pos": { "x": 5.0, - "y": 295.0 + "y": 235.0 }, "params": 4 }, @@ -172,8 +172,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#0", "pos": { - "x": 29.0, - "y": 284.0 + "x": 19.0, + "y": 224.0 }, "params": 1 }, @@ -181,8 +181,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#1", "pos": { - "x": 414.0, - "y": 174.0 + "x": 364.0, + "y": 84.0 }, "params": 1 }, @@ -190,8 +190,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#10", "pos": { - "x": 89.0, - "y": 84.0 + "x": 74.0, + "y": 54.0 }, "params": 1 }, @@ -199,8 +199,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#11", "pos": { - "x": 89.0, - "y": 94.0 + "x": 74.0, + "y": 64.0 }, "params": 1 }, @@ -208,8 +208,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#12", "pos": { - "x": 19.0, - "y": 294.0 + "x": 34.0, + "y": 234.0 }, "params": 1 }, @@ -217,8 +217,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#13", "pos": { - "x": 194.0, - "y": 234.0 + "x": 124.0, + "y": 174.0 }, "params": 1 }, @@ -226,8 +226,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#14", "pos": { - "x": 89.0, - "y": 104.0 + "x": 74.0, + "y": 74.0 }, "params": 1 }, @@ -235,8 +235,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#15", "pos": { - "x": 319.0, - "y": 294.0 + "x": 164.0, + "y": 59.0 }, "params": 1 }, @@ -244,8 +244,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#16", "pos": { - "x": 319.0, - "y": 104.0 + "x": 269.0, + "y": 39.0 }, "params": 1 }, @@ -253,8 +253,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#2", "pos": { - "x": 419.0, - "y": 184.0 + "x": 369.0, + "y": 94.0 }, "params": 1 }, @@ -262,8 +262,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#3", "pos": { - "x": 424.0, - "y": 194.0 + "x": 374.0, + "y": 104.0 }, "params": 1 }, @@ -271,8 +271,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#4", "pos": { - "x": 429.0, - "y": 204.0 + "x": 379.0, + "y": 114.0 }, "params": 1 }, @@ -280,8 +280,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#5", "pos": { - "x": 84.0, - "y": 344.0 + "x": 29.0, + "y": 284.0 }, "params": 1 }, @@ -289,8 +289,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#6", "pos": { - "x": 94.0, - "y": 364.0 + "x": 39.0, + "y": 304.0 }, "params": 1 }, @@ -298,8 +298,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#7", "pos": { - "x": 29.0, - "y": 254.0 + "x": 19.0, + "y": 194.0 }, "params": 1 }, @@ -307,8 +307,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#8", "pos": { - "x": 74.0, - "y": 314.0 + "x": 79.0, + "y": 254.0 }, "params": 1 }, @@ -316,8 +316,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#9", "pos": { - "x": 49.0, - "y": 114.0 + "x": 39.0, + "y": 84.0 }, "params": 1 }, @@ -325,80 +325,80 @@ "id": "and", "name": "and#0", "pos": { - "x": 380.0, - "y": 85.0 + "x": 195.0, + "y": 50.0 } }, { "id": "dff4_finewe", "name": "dff4_finewe#0", "pos": { - "x": 375.0, - "y": 170.0 + "x": 325.0, + "y": 80.0 } }, { "id": "mux1", "name": "mux1#0", "pos": { - "x": 325.0, - "y": 290.0 + "x": 280.0, + "y": 175.0 } }, { "id": "mux1_4", "name": "mux1_4#0", "pos": { - "x": 55.0, - "y": 110.0 + "x": 45.0, + "y": 80.0 } }, { "id": "mux1_4", "name": "mux1_4#1", "pos": { - "x": 150.0, - "y": 280.0 + "x": 85.0, + "y": 220.0 } }, { "id": "mux1_4", "name": "mux1_4#2", "pos": { - "x": 110.0, - "y": 60.0 + "x": 90.0, + "y": 30.0 } }, { "id": "mux1_4", "name": "mux1_4#3", "pos": { - "x": 200.0, - "y": 230.0 + "x": 130.0, + "y": 170.0 } }, { "id": "mux1_4", "name": "mux1_4#4", "pos": { - "x": 250.0, - "y": 180.0 + "x": 175.0, + "y": 120.0 } }, { "id": "not4", "name": "not4#0", "pos": { - "x": 100.0, - "y": 330.0 + "x": 45.0, + "y": 270.0 } }, { "id": "xor", "name": "xor#0", "pos": { - "x": 35.0, - "y": 250.0 + "x": 40.0, + "y": 190.0 } } ], @@ -415,24 +415,8 @@ "name": "unnamedWire#0", "path": [ { - "x": 140.0, - "y": 445.0 - }, - { - "x": 255.0, - "y": 445.0 - }, - { - "x": 255.0, - "y": 280.0 - }, - { - "x": 340.0, - "y": 280.0 - }, - { - "x": 340.0, - "y": 175.0 + "x": 250.0, + "y": 85.0 } ] }, @@ -448,12 +432,16 @@ "name": "unnamedWire#1", "path": [ { - "x": 355.0, + "x": 200.0, "y": 30.0 }, { - "x": 355.0, - "y": 215.0 + "x": 305.0, + "y": 30.0 + }, + { + "x": 305.0, + "y": 125.0 } ] }, @@ -494,7 +482,7 @@ "path": [ { "x": 35.0, - "y": 125.0 + "y": 95.0 }, { "x": 35.0, @@ -519,7 +507,7 @@ }, { "x": 30.0, - "y": 135.0 + "y": 105.0 } ] }, @@ -540,7 +528,7 @@ }, { "x": 25.0, - "y": 145.0 + "y": 115.0 } ] }, @@ -561,7 +549,7 @@ }, { "x": 20.0, - "y": 155.0 + "y": 125.0 } ] }, @@ -625,16 +613,16 @@ "name": "unnamedWire#2", "path": [ { - "x": 255.0, + "x": 150.0, "y": 25.0 }, { - "x": 360.0, + "x": 310.0, "y": 25.0 }, { - "x": 360.0, - "y": 205.0 + "x": 310.0, + "y": 115.0 } ] }, @@ -648,12 +636,7 @@ "pinName": "I" }, "name": "unnamedWire#20", - "path": [ - { - "x": 40.0, - "y": 435.0 - } - ] + "path": [] }, { "pin1": { @@ -691,12 +674,12 @@ "name": "unnamedWire#23", "path": [ { - "x": 25.0, - "y": 305.0 + "x": 30.0, + "y": 245.0 }, { - "x": 25.0, - "y": 265.0 + "x": 30.0, + "y": 205.0 } ] }, @@ -713,15 +696,15 @@ "path": [ { "x": 60.0, - "y": 445.0 + "y": 360.0 }, { "x": 60.0, - "y": 415.0 + "y": 335.0 }, { - "x": 30.0, - "y": 415.0 + "x": 20.0, + "y": 335.0 } ] }, @@ -797,16 +780,16 @@ "name": "unnamedWire#3", "path": [ { - "x": 155.0, + "x": 100.0, "y": 20.0 }, { - "x": 365.0, + "x": 190.0, "y": 20.0 }, { - "x": 365.0, - "y": 90.0 + "x": 190.0, + "y": 55.0 } ] }, @@ -870,16 +853,16 @@ "name": "unnamedWire#34", "path": [ { - "x": 415.0, - "y": 380.0 + "x": 365.0, + "y": 315.0 }, { - "x": 80.0, - "y": 380.0 + "x": 25.0, + "y": 315.0 }, { - "x": 80.0, - "y": 335.0 + "x": 25.0, + "y": 275.0 } ] }, @@ -895,12 +878,12 @@ "name": "unnamedWire#35", "path": [ { - "x": 420.0, - "y": 385.0 + "x": 370.0, + "y": 320.0 }, { - "x": 85.0, - "y": 385.0 + "x": 30.0, + "y": 320.0 } ] }, @@ -916,16 +899,16 @@ "name": "unnamedWire#36", "path": [ { - "x": 425.0, - "y": 390.0 + "x": 375.0, + "y": 325.0 }, { - "x": 90.0, - "y": 390.0 + "x": 35.0, + "y": 325.0 }, { - "x": 90.0, - "y": 355.0 + "x": 35.0, + "y": 295.0 } ] }, @@ -941,12 +924,12 @@ "name": "unnamedWire#37", "path": [ { - "x": 430.0, - "y": 395.0 + "x": 380.0, + "y": 330.0 }, { - "x": 95.0, - "y": 395.0 + "x": 40.0, + "y": 330.0 } ] }, @@ -974,8 +957,8 @@ "name": "unnamedWire#39", "path": [ { - "x": 85.0, - "y": 325.0 + "x": 30.0, + "y": 265.0 } ] }, @@ -991,16 +974,16 @@ "name": "unnamedWire#4", "path": [ { - "x": 55.0, + "x": 50.0, "y": 15.0 }, { - "x": 370.0, + "x": 320.0, "y": 15.0 }, { - "x": 370.0, - "y": 185.0 + "x": 320.0, + "y": 95.0 } ] }, @@ -1016,8 +999,8 @@ "name": "unnamedWire#40", "path": [ { - "x": 95.0, - "y": 305.0 + "x": 40.0, + "y": 245.0 } ] }, @@ -1045,12 +1028,12 @@ "name": "unnamedWire#42", "path": [ { - "x": 30.0, - "y": 230.0 + "x": 20.0, + "y": 175.0 }, { - "x": 50.0, - "y": 230.0 + "x": 40.0, + "y": 175.0 } ] }, @@ -1090,8 +1073,8 @@ "name": "unnamedWire#45", "path": [ { - "x": 50.0, - "y": 105.0 + "x": 40.0, + "y": 75.0 } ] }, @@ -1215,8 +1198,8 @@ "name": "unnamedWire#54", "path": [ { - "x": 90.0, - "y": 75.0 + "x": 75.0, + "y": 45.0 } ] }, @@ -1280,8 +1263,8 @@ "name": "unnamedWire#59", "path": [ { - "x": 20.0, - "y": 245.0 + "x": 35.0, + "y": 185.0 } ] }, @@ -1321,8 +1304,8 @@ "name": "unnamedWire#61", "path": [ { - "x": 75.0, - "y": 265.0 + "x": 80.0, + "y": 205.0 } ] }, @@ -1338,12 +1321,12 @@ "name": "unnamedWire#62", "path": [ { - "x": 80.0, - "y": 325.0 + "x": 25.0, + "y": 265.0 }, { - "x": 80.0, - "y": 275.0 + "x": 25.0, + "y": 215.0 } ] }, @@ -1407,8 +1390,8 @@ "name": "unnamedWire#67", "path": [ { - "x": 195.0, - "y": 435.0 + "x": 125.0, + "y": 350.0 } ] }, @@ -1436,12 +1419,12 @@ "name": "unnamedWire#69", "path": [ { - "x": 105.0, - "y": 235.0 + "x": 85.0, + "y": 175.0 }, { - "x": 105.0, - "y": 65.0 + "x": 85.0, + "y": 35.0 } ] }, @@ -1469,12 +1452,12 @@ "name": "unnamedWire#70", "path": [ { - "x": 295.0, - "y": 215.0 + "x": 235.0, + "y": 155.0 }, { - "x": 295.0, - "y": 255.0 + "x": 235.0, + "y": 165.0 } ] }, @@ -1490,12 +1473,12 @@ "name": "unnamedWire#71", "path": [ { - "x": 300.0, - "y": 245.0 + "x": 240.0, + "y": 155.0 }, { - "x": 300.0, - "y": 205.0 + "x": 240.0, + "y": 145.0 } ] }, @@ -1511,20 +1494,20 @@ "name": "unnamedWire#72", "path": [ { - "x": 420.0, - "y": 90.0 + "x": 235.0, + "y": 55.0 }, { - "x": 420.0, - "y": 110.0 + "x": 235.0, + "y": 20.0 }, { - "x": 365.0, - "y": 110.0 + "x": 315.0, + "y": 20.0 }, { - "x": 365.0, - "y": 195.0 + "x": 315.0, + "y": 105.0 } ] }, @@ -1540,12 +1523,12 @@ "name": "unnamedWire#73", "path": [ { - "x": 310.0, - "y": 225.0 + "x": 250.0, + "y": 135.0 }, { - "x": 310.0, - "y": 185.0 + "x": 250.0, + "y": 125.0 } ] }, @@ -1609,12 +1592,12 @@ "name": "unnamedWire#78", "path": [ { - "x": 200.0, - "y": 225.0 + "x": 140.0, + "y": 165.0 }, { - "x": 200.0, - "y": 95.0 + "x": 140.0, + "y": 65.0 } ] }, @@ -1630,12 +1613,12 @@ "name": "unnamedWire#79", "path": [ { - "x": 205.0, - "y": 85.0 + "x": 145.0, + "y": 55.0 }, { - "x": 205.0, - "y": 215.0 + "x": 145.0, + "y": 155.0 } ] }, @@ -1663,12 +1646,12 @@ "name": "unnamedWire#80", "path": [ { - "x": 210.0, - "y": 205.0 + "x": 150.0, + "y": 145.0 }, { - "x": 210.0, - "y": 75.0 + "x": 150.0, + "y": 45.0 } ] }, @@ -1684,12 +1667,12 @@ "name": "unnamedWire#81", "path": [ { - "x": 215.0, - "y": 65.0 + "x": 155.0, + "y": 35.0 }, { - "x": 215.0, - "y": 195.0 + "x": 155.0, + "y": 135.0 } ] }, @@ -1705,12 +1688,12 @@ "name": "unnamedWire#82", "path": [ { - "x": 245.0, - "y": 425.0 + "x": 170.0, + "y": 340.0 }, { - "x": 245.0, - "y": 185.0 + "x": 170.0, + "y": 125.0 } ] }, @@ -1720,40 +1703,49 @@ "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#15", - "pinName": "" + "compName": "NandGate#0", + "pinName": "A" }, "name": "unnamedWire#83", "path": [] }, { "pin1": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "pin2": { "compName": "_submodelinterface", "pinName": "COVD_EN" }, + "pin2": { + "compName": "WireCrossPoint#16", + "pinName": "" + }, "name": "unnamedWire#84", "path": [ { - "x": 275.0, - "y": 295.0 + "x": 300.0, + "y": 10.0 + }, + { + "x": 270.0, + "y": 10.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#15", + "compName": "WireCrossPoint#16", "pinName": "" }, "pin2": { - "compName": "mux1#0", - "pinName": "S0" + "compName": "WireCrossPoint#15", + "pinName": "" }, "name": "unnamedWire#85", - "path": [] + "path": [ + { + "x": 165.0, + "y": 40.0 + } + ] }, { "pin1": { @@ -1767,16 +1759,16 @@ "name": "unnamedWire#86", "path": [ { - "x": 375.0, - "y": 325.0 + "x": 350.0, + "y": 70.0 }, { - "x": 320.0, - "y": 325.0 + "x": 265.0, + "y": 70.0 }, { - "x": 320.0, - "y": 315.0 + "x": 265.0, + "y": 200.0 } ] }, @@ -1792,12 +1784,20 @@ "name": "unnamedWire#87", "path": [ { - "x": 305.0, - "y": 195.0 + "x": 245.0, + "y": 135.0 }, { - "x": 305.0, - "y": 305.0 + "x": 245.0, + "y": 145.0 + }, + { + "x": 275.0, + "y": 145.0 + }, + { + "x": 275.0, + "y": 190.0 } ] }, @@ -1813,12 +1813,12 @@ "name": "unnamedWire#88", "path": [ { - "x": 365.0, - "y": 295.0 + "x": 320.0, + "y": 180.0 }, { - "x": 365.0, - "y": 235.0 + "x": 320.0, + "y": 145.0 } ] }, @@ -1848,15 +1848,20 @@ }, { "pin1": { - "compName": "WireCrossPoint#16", + "compName": "WireCrossPoint#15", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#15", - "pinName": "" + "compName": "NandGate#0", + "pinName": "B" }, "name": "unnamedWire#90", - "path": [] + "path": [ + { + "x": 165.0, + "y": 70.0 + } + ] }, { "pin1": { @@ -1864,26 +1869,14 @@ "pinName": "" }, "pin2": { - "compName": "NandGate#0", - "pinName": "B" + "compName": "mux1#0", + "pinName": "S0" }, "name": "unnamedWire#91", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "A" - }, - "pin2": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "name": "unnamedWire#92", "path": [ { - "x": 320.0, - "y": 95.0 + "x": 270.0, + "y": 180.0 } ] },