X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fnet.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fdff16.json;h=8ba48b4f5f55769c0c4e51f86b0e707f588044d4;hb=5c03a4fa605a1c3946eddece3b566b5aa0677759;hp=6efc9033a91ff241911b1162df0c4ea5d2312a02;hpb=9e8e8ae5414f52ec87f9247b10a525f41768c7dc;p=Mograsim.git diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16.json index 6efc9033..8ba48b4f 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16.json @@ -77,109 +77,109 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#10", + "name": "WireCrossPoint#2", "pos": { - "x": 114.0, - "y": 139.0 + "x": 64.0, + "y": 89.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#11", + "name": "WireCrossPoint#3", "pos": { - "x": 114.0, - "y": 229.0 + "x": 64.0, + "y": 119.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#12", + "name": "WireCrossPoint#4", "pos": { - "x": 114.0, - "y": 109.0 + "x": 64.0, + "y": 179.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#13", + "name": "WireCrossPoint#5", "pos": { - "x": 114.0, - "y": 169.0 + "x": 64.0, + "y": 209.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#14", + "name": "WireCrossPoint#6", "pos": { - "x": 114.0, - "y": 199.0 + "x": 64.0, + "y": 149.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#2", + "name": "WireCrossPoint#7", "pos": { - "x": 64.0, - "y": 89.0 + "x": 114.0, + "y": 79.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#3", + "name": "WireCrossPoint#8", "pos": { - "x": 64.0, - "y": 119.0 + "x": 114.0, + "y": 49.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#4", + "name": "WireCrossPoint#9", "pos": { - "x": 64.0, - "y": 179.0 + "x": 114.0, + "y": 139.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#5", + "name": "WireCrossPoint#10", "pos": { - "x": 64.0, - "y": 209.0 + "x": 114.0, + "y": 229.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#6", + "name": "WireCrossPoint#11", "pos": { - "x": 64.0, - "y": 149.0 + "x": 114.0, + "y": 109.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#8", + "name": "WireCrossPoint#12", "pos": { "x": 114.0, - "y": 79.0 + "y": 169.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#9", + "name": "WireCrossPoint#13", "pos": { "x": 114.0, - "y": 49.0 + "y": 199.0 }, "params": 1 }, @@ -201,114 +201,114 @@ }, { "id": "dff", - "name": "dff#10", + "name": "dff#2", "pos": { "x": 120.0, - "y": 245.0 - } - }, - { - "id": "dff", - "name": "dff#11", - "pos": { - "x": 70.0, - "y": 225.0 + "y": 65.0 } }, { "id": "dff", - "name": "dff#12", + "name": "dff#3", "pos": { "x": 70.0, - "y": 195.0 + "y": 45.0 } }, { "id": "dff", - "name": "dff#13", + "name": "dff#4", "pos": { "x": 120.0, - "y": 155.0 + "y": 95.0 } }, { "id": "dff", - "name": "dff#14", + "name": "dff#5", "pos": { "x": 120.0, - "y": 185.0 + "y": 125.0 } }, { "id": "dff", - "name": "dff#15", + "name": "dff#6", "pos": { "x": 70.0, - "y": 165.0 + "y": 75.0 } }, { "id": "dff", - "name": "dff#2", + "name": "dff#7", "pos": { - "x": 120.0, - "y": 65.0 + "x": 70.0, + "y": 105.0 } }, { "id": "dff", - "name": "dff#3", + "name": "dff#8", "pos": { "x": 70.0, - "y": 45.0 + "y": 135.0 } }, { "id": "dff", - "name": "dff#4", + "name": "dff#9", "pos": { "x": 120.0, - "y": 95.0 + "y": 215.0 } }, { "id": "dff", - "name": "dff#5", + "name": "dff#10", "pos": { "x": 120.0, - "y": 125.0 + "y": 245.0 } }, { "id": "dff", - "name": "dff#6", + "name": "dff#11", "pos": { "x": 70.0, - "y": 75.0 + "y": 225.0 } }, { "id": "dff", - "name": "dff#7", + "name": "dff#12", "pos": { "x": 70.0, - "y": 105.0 + "y": 195.0 } }, { "id": "dff", - "name": "dff#8", + "name": "dff#13", "pos": { - "x": 70.0, - "y": 135.0 + "x": 120.0, + "y": 155.0 } }, { "id": "dff", - "name": "dff#9", + "name": "dff#14", "pos": { "x": 120.0, - "y": 215.0 + "y": 185.0 + } + }, + { + "id": "dff", + "name": "dff#15", + "pos": { + "x": 70.0, + "y": 165.0 } } ], @@ -355,6 +355,156 @@ } ] }, + { + "pin1": { + "compName": "Splitter#0", + "pinName": "O13" + }, + "pin2": { + "compName": "dff#3", + "pinName": "D" + }, + "name": "unnamedWire#2", + "path": [ + { + "x": 30.0, + "y": 70.0 + }, + { + "x": 30.0, + "y": 50.0 + } + ] + }, + { + "pin1": { + "compName": "dff#2", + "pinName": "D" + }, + "pin2": { + "compName": "Splitter#0", + "pinName": "O12" + }, + "name": "unnamedWire#3", + "path": [ + { + "x": 35.0, + "y": 70.0 + }, + { + "x": 35.0, + "y": 80.0 + } + ] + }, + { + "pin1": { + "compName": "Splitter#0", + "pinName": "O11" + }, + "pin2": { + "compName": "dff#6", + "pinName": "D" + }, + "name": "unnamedWire#4", + "path": [ + { + "x": 40.0, + "y": 90.0 + }, + { + "x": 40.0, + "y": 80.0 + } + ] + }, + { + "pin1": { + "compName": "dff#4", + "pinName": "D" + }, + "pin2": { + "compName": "Splitter#0", + "pinName": "O10" + }, + "name": "unnamedWire#5", + "path": [] + }, + { + "pin1": { + "compName": "dff#7", + "pinName": "D" + }, + "pin2": { + "compName": "Splitter#0", + "pinName": "O9" + }, + "name": "unnamedWire#6", + "path": [] + }, + { + "pin1": { + "compName": "Splitter#0", + "pinName": "O8" + }, + "pin2": { + "compName": "dff#5", + "pinName": "D" + }, + "name": "unnamedWire#7", + "path": [ + { + "x": 60.0, + "y": 120.0 + }, + { + "x": 60.0, + "y": 130.0 + } + ] + }, + { + "pin1": { + "compName": "dff#8", + "pinName": "D" + }, + "pin2": { + "compName": "Splitter#0", + "pinName": "O7" + }, + "name": "unnamedWire#8", + "path": [ + { + "x": 55.0, + "y": 140.0 + }, + { + "x": 55.0, + "y": 130.0 + } + ] + }, + { + "pin1": { + "compName": "Splitter#0", + "pinName": "O6" + }, + "pin2": { + "compName": "dff#13", + "pinName": "D" + }, + "name": "unnamedWire#9", + "path": [ + { + "x": 50.0, + "y": 140.0 + }, + { + "x": 50.0, + "y": 160.0 + } + ] + }, { "pin1": { "compName": "dff#15", @@ -529,27 +679,6 @@ "name": "unnamedWire#19", "path": [] }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O13" - }, - "pin2": { - "compName": "dff#3", - "pinName": "D" - }, - "name": "unnamedWire#2", - "path": [ - { - "x": 30.0, - "y": 70.0 - }, - { - "x": 30.0, - "y": 50.0 - } - ] - }, { "pin1": { "compName": "WireCrossPoint#1", @@ -659,37 +788,16 @@ "path": [] }, { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "dff#12", - "pinName": "C" - }, - "name": "unnamedWire#29", - "path": [] - }, - { - "pin1": { - "compName": "dff#2", - "pinName": "D" + "pin1": { + "compName": "WireCrossPoint#5", + "pinName": "" }, "pin2": { - "compName": "Splitter#0", - "pinName": "O12" + "compName": "dff#12", + "pinName": "C" }, - "name": "unnamedWire#3", - "path": [ - { - "x": 35.0, - "y": 70.0 - }, - { - "x": 35.0, - "y": 80.0 - } - ] + "name": "unnamedWire#29", + "path": [] }, { "pin1": { @@ -714,7 +822,7 @@ "pinName": "C" }, "pin2": { - "compName": "WireCrossPoint#11", + "compName": "WireCrossPoint#10", "pinName": "" }, "name": "unnamedWire#31", @@ -727,7 +835,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#11", + "compName": "WireCrossPoint#10", "pinName": "" }, "pin2": { @@ -739,11 +847,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#11", + "compName": "WireCrossPoint#10", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#14", + "compName": "WireCrossPoint#13", "pinName": "" }, "name": "unnamedWire#33", @@ -755,7 +863,7 @@ "pinName": "C" }, "pin2": { - "compName": "WireCrossPoint#14", + "compName": "WireCrossPoint#13", "pinName": "" }, "name": "unnamedWire#34", @@ -763,11 +871,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#13", + "compName": "WireCrossPoint#12", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#14", + "compName": "WireCrossPoint#13", "pinName": "" }, "name": "unnamedWire#35", @@ -775,7 +883,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#13", + "compName": "WireCrossPoint#12", "pinName": "" }, "pin2": { @@ -787,11 +895,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#13", + "compName": "WireCrossPoint#12", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#10", + "compName": "WireCrossPoint#9", "pinName": "" }, "name": "unnamedWire#37", @@ -799,7 +907,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#10", + "compName": "WireCrossPoint#9", "pinName": "" }, "pin2": { @@ -811,11 +919,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#12", + "compName": "WireCrossPoint#11", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#10", + "compName": "WireCrossPoint#9", "pinName": "" }, "name": "unnamedWire#39", @@ -823,28 +931,7 @@ }, { "pin1": { - "compName": "Splitter#0", - "pinName": "O11" - }, - "pin2": { - "compName": "dff#6", - "pinName": "D" - }, - "name": "unnamedWire#4", - "path": [ - { - "x": 40.0, - "y": 90.0 - }, - { - "x": 40.0, - "y": 80.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#12", + "compName": "WireCrossPoint#11", "pinName": "" }, "pin2": { @@ -856,11 +943,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#12", + "compName": "WireCrossPoint#11", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#8", + "compName": "WireCrossPoint#7", "pinName": "" }, "name": "unnamedWire#41", @@ -868,7 +955,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#8", + "compName": "WireCrossPoint#7", "pinName": "" }, "pin2": { @@ -880,11 +967,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#8", + "compName": "WireCrossPoint#7", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#9", + "compName": "WireCrossPoint#8", "pinName": "" }, "name": "unnamedWire#43", @@ -892,7 +979,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#9", + "compName": "WireCrossPoint#8", "pinName": "" }, "pin2": { @@ -908,7 +995,7 @@ "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#9", + "compName": "WireCrossPoint#8", "pinName": "" }, "name": "unnamedWire#45", @@ -944,7 +1031,7 @@ "compName": "_submodelinterface", "pinName": "C" }, - "name": "unnamedWire#48", + "name": "unnamedWire#47", "path": [ { "x": 10.0, @@ -965,7 +1052,7 @@ "compName": "dff#0", "pinName": "Q" }, - "name": "unnamedWire#49", + "name": "unnamedWire#48", "path": [ { "x": 200.0, @@ -985,18 +1072,6 @@ } ] }, - { - "pin1": { - "compName": "dff#4", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O10" - }, - "name": "unnamedWire#5", - "path": [] - }, { "pin1": { "compName": "dff#1", @@ -1006,7 +1081,7 @@ "compName": "Splitter#1", "pinName": "O14" }, - "name": "unnamedWire#50", + "name": "unnamedWire#49", "path": [ { "x": 195.0, @@ -1027,7 +1102,7 @@ "compName": "dff#3", "pinName": "Q" }, - "name": "unnamedWire#51", + "name": "unnamedWire#50", "path": [ { "x": 190.0, @@ -1056,7 +1131,7 @@ "compName": "dff#2", "pinName": "Q" }, - "name": "unnamedWire#52", + "name": "unnamedWire#51", "path": [ { "x": 185.0, @@ -1077,7 +1152,7 @@ "compName": "dff#6", "pinName": "Q" }, - "name": "unnamedWire#53", + "name": "unnamedWire#52", "path": [ { "x": 110.0, @@ -1098,7 +1173,7 @@ "compName": "Splitter#1", "pinName": "O10" }, - "name": "unnamedWire#54", + "name": "unnamedWire#53", "path": [] }, { @@ -1110,7 +1185,7 @@ "compName": "dff#7", "pinName": "Q" }, - "name": "unnamedWire#55", + "name": "unnamedWire#54", "path": [ { "x": 160.0, @@ -1139,7 +1214,7 @@ "compName": "Splitter#1", "pinName": "O8" }, - "name": "unnamedWire#56", + "name": "unnamedWire#55", "path": [ { "x": 165.0, @@ -1160,7 +1235,7 @@ "compName": "dff#8", "pinName": "Q" }, - "name": "unnamedWire#57", + "name": "unnamedWire#56", "path": [ { "x": 170.0, @@ -1189,7 +1264,7 @@ "compName": "Splitter#1", "pinName": "O6" }, - "name": "unnamedWire#58", + "name": "unnamedWire#57", "path": [ { "x": 175.0, @@ -1210,7 +1285,7 @@ "compName": "dff#15", "pinName": "Q" }, - "name": "unnamedWire#59", + "name": "unnamedWire#58", "path": [ { "x": 180.0, @@ -1230,18 +1305,6 @@ } ] }, - { - "pin1": { - "compName": "dff#7", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O9" - }, - "name": "unnamedWire#6", - "path": [] - }, { "pin1": { "compName": "Splitter#1", @@ -1251,7 +1314,7 @@ "compName": "dff#14", "pinName": "Q" }, - "name": "unnamedWire#60", + "name": "unnamedWire#59", "path": [ { "x": 185.0, @@ -1272,7 +1335,7 @@ "compName": "dff#12", "pinName": "Q" }, - "name": "unnamedWire#61", + "name": "unnamedWire#60", "path": [ { "x": 190.0, @@ -1301,7 +1364,7 @@ "compName": "Splitter#1", "pinName": "O2" }, - "name": "unnamedWire#62", + "name": "unnamedWire#61", "path": [ { "x": 195.0, @@ -1322,7 +1385,7 @@ "compName": "dff#11", "pinName": "Q" }, - "name": "unnamedWire#63", + "name": "unnamedWire#62", "path": [ { "x": 200.0, @@ -1351,7 +1414,7 @@ "compName": "Splitter#1", "pinName": "O0" }, - "name": "unnamedWire#64", + "name": "unnamedWire#63", "path": [ { "x": 205.0, @@ -1362,69 +1425,6 @@ "y": 200.0 } ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O8" - }, - "pin2": { - "compName": "dff#5", - "pinName": "D" - }, - "name": "unnamedWire#7", - "path": [ - { - "x": 60.0, - "y": 120.0 - }, - { - "x": 60.0, - "y": 130.0 - } - ] - }, - { - "pin1": { - "compName": "dff#8", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O7" - }, - "name": "unnamedWire#8", - "path": [ - { - "x": 55.0, - "y": 140.0 - }, - { - "x": 55.0, - "y": 130.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O6" - }, - "pin2": { - "compName": "dff#13", - "pinName": "D" - }, - "name": "unnamedWire#9", - "path": [ - { - "x": 50.0, - "y": 140.0 - }, - { - "x": 50.0, - "y": 160.0 - } - ] } ], "version": "0.1.1" @@ -1490,108 +1490,108 @@ "subStateID": "q" } }, - "q10": { + "q2": { "id": "delegating", "params": { - "delegateTarget": "dff#7", + "delegateTarget": "dff#11", "subStateID": "q" } }, - "q11": { + "q3": { "id": "delegating", "params": { - "delegateTarget": "dff#4", + "delegateTarget": "dff#9", "subStateID": "q" } }, - "q12": { + "q4": { "id": "delegating", "params": { - "delegateTarget": "dff#6", + "delegateTarget": "dff#12", "subStateID": "q" } }, - "q13": { + "q5": { "id": "delegating", "params": { - "delegateTarget": "dff#2", + "delegateTarget": "dff#14", "subStateID": "q" } }, - "q14": { + "q6": { "id": "delegating", "params": { - "delegateTarget": "dff#3", + "delegateTarget": "dff#15", "subStateID": "q" } }, - "q15": { + "q7": { "id": "delegating", "params": { - "delegateTarget": "dff#1", + "delegateTarget": "dff#13", "subStateID": "q" } }, - "q16": { + "q8": { "id": "delegating", "params": { - "delegateTarget": "dff#0", + "delegateTarget": "dff#8", "subStateID": "q" } }, - "q2": { + "q9": { "id": "delegating", "params": { - "delegateTarget": "dff#11", + "delegateTarget": "dff#5", "subStateID": "q" } }, - "q3": { + "q10": { "id": "delegating", "params": { - "delegateTarget": "dff#9", + "delegateTarget": "dff#7", "subStateID": "q" } }, - "q4": { + "q11": { "id": "delegating", "params": { - "delegateTarget": "dff#12", + "delegateTarget": "dff#4", "subStateID": "q" } }, - "q5": { + "q12": { "id": "delegating", "params": { - "delegateTarget": "dff#14", + "delegateTarget": "dff#6", "subStateID": "q" } }, - "q6": { + "q13": { "id": "delegating", "params": { - "delegateTarget": "dff#15", + "delegateTarget": "dff#2", "subStateID": "q" } }, - "q7": { + "q14": { "id": "delegating", "params": { - "delegateTarget": "dff#13", + "delegateTarget": "dff#3", "subStateID": "q" } }, - "q8": { + "q15": { "id": "delegating", "params": { - "delegateTarget": "dff#8", + "delegateTarget": "dff#1", "subStateID": "q" } }, - "q9": { + "q16": { "id": "delegating", "params": { - "delegateTarget": "dff#5", + "delegateTarget": "dff#0", "subStateID": "q" } }