From: Daniel Kirschten Date: Mon, 2 Sep 2019 10:31:33 +0000 (+0200) Subject: Am2904: Z is now the MSB X-Git-Url: https://mograsim.net/gitweb/?a=commitdiff_plain;h=29fb2e1d12ac7b43e1121ab54888b1d6f2d72024;p=Mograsim.git Am2904: Z is now the MSB --- diff --git a/net.mograsim.logic.model.am2900/GUIAm2904Testbench.json b/net.mograsim.logic.model.am2900/GUIAm2904Testbench.json index a36c8e03..b96609a8 100644 --- a/net.mograsim.logic.model.am2900/GUIAm2904Testbench.json +++ b/net.mograsim.logic.model.am2900/GUIAm2904Testbench.json @@ -582,7 +582,7 @@ "name": "TextComponent#10", "pos": { "x": 35.0, - "y": 120.0 + "y": 240.0 }, "params": "I0" }, @@ -591,7 +591,7 @@ "name": "TextComponent#11", "pos": { "x": 35.0, - "y": 240.0 + "y": 120.0 }, "params": "I12" }, @@ -600,7 +600,7 @@ "name": "TextComponent#12", "pos": { "x": 35.0, - "y": 140.0 + "y": 220.0 }, "params": "I2" }, @@ -609,7 +609,7 @@ "name": "TextComponent#13", "pos": { "x": 40.0, - "y": 170.0 + "y": 190.0 }, "params": "I5" }, @@ -618,7 +618,7 @@ "name": "TextComponent#14", "pos": { "x": 40.0, - "y": 130.0 + "y": 230.0 }, "params": "I1" }, @@ -627,7 +627,7 @@ "name": "TextComponent#15", "pos": { "x": 40.0, - "y": 150.0 + "y": 210.0 }, "params": "I3" }, @@ -636,7 +636,7 @@ "name": "TextComponent#16", "pos": { "x": 35.0, - "y": 160.0 + "y": 200.0 }, "params": "I4" }, @@ -654,7 +654,7 @@ "name": "TextComponent#18", "pos": { "x": 40.0, - "y": 190.0 + "y": 170.0 }, "params": "I7" }, @@ -663,7 +663,7 @@ "name": "TextComponent#19", "pos": { "x": 35.0, - "y": 200.0 + "y": 160.0 }, "params": "I8" }, @@ -681,7 +681,7 @@ "name": "TextComponent#20", "pos": { "x": 40.0, - "y": 210.0 + "y": 150.0 }, "params": "I9" }, @@ -690,7 +690,7 @@ "name": "TextComponent#21", "pos": { "x": 35.0, - "y": 220.0 + "y": 140.0 }, "params": "I10" }, @@ -699,7 +699,7 @@ "name": "TextComponent#22", "pos": { "x": 40.0, - "y": 230.0 + "y": 130.0 }, "params": "I11" }, @@ -1765,31 +1765,31 @@ }, "pin2": { "compName": "GUIMerger#0", - "pinName": "I0" + "pinName": "I12" }, "name": "unnamedWire#42", "path": [] }, { "pin1": { - "compName": "GUIManualSwitch#31", - "pinName": "" + "compName": "GUIMerger#0", + "pinName": "I11" }, "pin2": { - "compName": "GUIMerger#0", - "pinName": "I12" + "compName": "GUIManualSwitch#13", + "pinName": "" }, "name": "unnamedWire#43", "path": [] }, { "pin1": { - "compName": "GUIMerger#0", - "pinName": "I11" + "compName": "GUIManualSwitch#21", + "pinName": "" }, "pin2": { - "compName": "GUIManualSwitch#27", - "pinName": "" + "compName": "GUIMerger#0", + "pinName": "I10" }, "name": "unnamedWire#44", "path": [] @@ -1797,10 +1797,10 @@ { "pin1": { "compName": "GUIMerger#0", - "pinName": "I10" + "pinName": "I9" }, "pin2": { - "compName": "GUIManualSwitch#29", + "compName": "GUIManualSwitch#22", "pinName": "" }, "name": "unnamedWire#45", @@ -1808,12 +1808,12 @@ }, { "pin1": { - "compName": "GUIManualSwitch#30", + "compName": "GUIManualSwitch#24", "pinName": "" }, "pin2": { "compName": "GUIMerger#0", - "pinName": "I9" + "pinName": "I8" }, "name": "unnamedWire#46", "path": [] @@ -1821,10 +1821,10 @@ { "pin1": { "compName": "GUIMerger#0", - "pinName": "I8" + "pinName": "I7" }, "pin2": { - "compName": "GUIManualSwitch#28", + "compName": "GUIManualSwitch#23", "pinName": "" }, "name": "unnamedWire#47", @@ -1832,12 +1832,12 @@ }, { "pin1": { - "compName": "GUIManualSwitch#26", + "compName": "GUIManualSwitch#25", "pinName": "" }, "pin2": { "compName": "GUIMerger#0", - "pinName": "I7" + "pinName": "I6" }, "name": "unnamedWire#48", "path": [] @@ -1845,10 +1845,10 @@ { "pin1": { "compName": "GUIMerger#0", - "pinName": "I6" + "pinName": "I5" }, "pin2": { - "compName": "GUIManualSwitch#25", + "compName": "GUIManualSwitch#26", "pinName": "" }, "name": "unnamedWire#49", @@ -1877,12 +1877,12 @@ }, { "pin1": { - "compName": "GUIManualSwitch#23", + "compName": "GUIManualSwitch#28", "pinName": "" }, "pin2": { "compName": "GUIMerger#0", - "pinName": "I5" + "pinName": "I4" }, "name": "unnamedWire#50", "path": [] @@ -1890,10 +1890,10 @@ { "pin1": { "compName": "GUIMerger#0", - "pinName": "I4" + "pinName": "I3" }, "pin2": { - "compName": "GUIManualSwitch#24", + "compName": "GUIManualSwitch#30", "pinName": "" }, "name": "unnamedWire#51", @@ -1901,12 +1901,12 @@ }, { "pin1": { - "compName": "GUIManualSwitch#22", + "compName": "GUIManualSwitch#29", "pinName": "" }, "pin2": { "compName": "GUIMerger#0", - "pinName": "I3" + "pinName": "I2" }, "name": "unnamedWire#52", "path": [] @@ -1914,10 +1914,10 @@ { "pin1": { "compName": "GUIMerger#0", - "pinName": "I2" + "pinName": "I1" }, "pin2": { - "compName": "GUIManualSwitch#21", + "compName": "GUIManualSwitch#27", "pinName": "" }, "name": "unnamedWire#53", @@ -1925,12 +1925,12 @@ }, { "pin1": { - "compName": "GUIMerger#0", - "pinName": "I1" + "compName": "GUIManualSwitch#31", + "pinName": "" }, "pin2": { - "compName": "GUIManualSwitch#13", - "pinName": "" + "compName": "GUIMerger#0", + "pinName": "I0" }, "name": "unnamedWire#54", "path": [] diff --git a/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904.json b/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904.json index 82d233c7..b6a42db7 100644 --- a/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904.json +++ b/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904.json @@ -473,7 +473,7 @@ "name": "GUIMerger#0", "pos": { "x": 25.0, - "y": 245.0 + "y": 315.0 }, "params": 6 }, @@ -482,7 +482,7 @@ "name": "GUIMerger#1", "pos": { "x": 25.0, - "y": 305.0 + "y": 265.0 }, "params": 5 }, @@ -509,7 +509,7 @@ "name": "GUIMerger#4", "pos": { "x": 25.0, - "y": 355.0 + "y": 245.0 }, "params": 2 }, @@ -1175,7 +1175,7 @@ { "pin1": { "compName": "GUISplitter#3", - "pinName": "O3" + "pinName": "O0" }, "pin2": { "compName": "DeserializedSubmodelComponent#3", @@ -1199,7 +1199,7 @@ { "pin1": { "compName": "GUISplitter#4", - "pinName": "O0" + "pinName": "O3" }, "pin2": { "compName": "DeserializedSubmodelComponent#5", @@ -1210,37 +1210,37 @@ }, { "pin1": { - "compName": "GUISplitter#4", - "pinName": "O1" - }, - "pin2": { "compName": "DeserializedSubmodelComponent#5", "pinName": "I0_2" }, + "pin2": { + "compName": "GUISplitter#4", + "pinName": "O2" + }, "name": "unnamedWire#103", "path": [] }, { "pin1": { - "compName": "DeserializedSubmodelComponent#5", - "pinName": "I0_3" + "compName": "GUISplitter#4", + "pinName": "O1" }, "pin2": { - "compName": "GUISplitter#4", - "pinName": "O2" + "compName": "DeserializedSubmodelComponent#5", + "pinName": "I0_3" }, "name": "unnamedWire#104", "path": [] }, { "pin1": { - "compName": "GUISplitter#4", - "pinName": "O3" - }, - "pin2": { "compName": "DeserializedSubmodelComponent#5", "pinName": "I0_4" }, + "pin2": { + "compName": "GUISplitter#4", + "pinName": "O0" + }, "name": "unnamedWire#105", "path": [] }, @@ -1263,32 +1263,32 @@ }, "pin2": { "compName": "DeserializedSubmodelComponent#5", - "pinName": "I1_1" + "pinName": "I1_4" }, "name": "unnamedWire#107", "path": [] }, { "pin1": { - "compName": "GUISplitter#5", - "pinName": "O1" + "compName": "DeserializedSubmodelComponent#5", + "pinName": "I1_3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#5", - "pinName": "I1_2" + "compName": "GUISplitter#5", + "pinName": "O1" }, "name": "unnamedWire#108", "path": [] }, { "pin1": { - "compName": "DeserializedSubmodelComponent#5", - "pinName": "I1_3" - }, - "pin2": { "compName": "GUISplitter#5", "pinName": "O2" }, + "pin2": { + "compName": "DeserializedSubmodelComponent#5", + "pinName": "I1_2" + }, "name": "unnamedWire#109", "path": [] }, @@ -1306,12 +1306,12 @@ }, { "pin1": { - "compName": "GUISplitter#5", - "pinName": "O3" + "compName": "DeserializedSubmodelComponent#5", + "pinName": "I1_1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#5", - "pinName": "I1_4" + "compName": "GUISplitter#5", + "pinName": "O3" }, "name": "unnamedWire#110", "path": [] @@ -1631,7 +1631,7 @@ { "pin1": { "compName": "GUISplitter#8", - "pinName": "O2" + "pinName": "O1" }, "pin2": { "compName": "WireCrossPoint#27", @@ -1762,13 +1762,13 @@ }, { "pin1": { - "compName": "GUISplitter#10", - "pinName": "O1" - }, - "pin2": { "compName": "DeserializedSubmodelComponent#11", "pinName": "I0" }, + "pin2": { + "compName": "GUISplitter#10", + "pinName": "O2" + }, "name": "unnamedWire#145", "path": [] }, @@ -1965,11 +1965,11 @@ "path": [ { "x": 40.0, - "y": 395.0 + "y": 385.0 }, { "x": 40.0, - "y": 325.0 + "y": 285.0 } ] }, @@ -2100,19 +2100,10 @@ }, "pin2": { "compName": "GUIMerger#2", - "pinName": "I3" + "pinName": "I0" }, "name": "unnamedWire#17", - "path": [ - { - "x": 10.0, - "y": 125.0 - }, - { - "x": 10.0, - "y": 95.0 - } - ] + "path": [] }, { "pin1": { @@ -2140,12 +2131,12 @@ }, { "pin1": { - "compName": "WireCrossPoint#22", - "pinName": "" + "compName": "GUISplitter#8", + "pinName": "O2" }, "pin2": { - "compName": "GUISplitter#8", - "pinName": "O1" + "compName": "WireCrossPoint#22", + "pinName": "" }, "name": "unnamedWire#172", "path": [] @@ -2241,19 +2232,10 @@ }, "pin2": { "compName": "GUIMerger#2", - "pinName": "I2" + "pinName": "I1" }, "name": "unnamedWire#18", - "path": [ - { - "x": 5.0, - "y": 100.0 - }, - { - "x": 5.0, - "y": 85.0 - } - ] + "path": [] }, { "pin1": { @@ -2377,12 +2359,12 @@ }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "IC" + "compName": "GUIMerger#2", + "pinName": "I2" }, "pin2": { - "compName": "GUIMerger#2", - "pinName": "I1" + "compName": "_submodelinterface", + "pinName": "IC" }, "name": "unnamedWire#19", "path": [] @@ -2526,19 +2508,10 @@ }, "pin2": { "compName": "GUIMerger#2", - "pinName": "I0" + "pinName": "I3" }, "name": "unnamedWire#20", - "path": [ - { - "x": 5.0, - "y": 50.0 - }, - { - "x": 5.0, - "y": 65.0 - } - ] + "path": [] }, { "pin1": { @@ -2619,7 +2592,7 @@ }, "pin2": { "compName": "GUISplitter#7", - "pinName": "O3" + "pinName": "O0" }, "name": "unnamedWire#206", "path": [] @@ -3323,7 +3296,7 @@ { "pin1": { "compName": "GUISplitter#1", - "pinName": "O0" + "pinName": "O3" }, "pin2": { "compName": "_submodelinterface", @@ -3351,7 +3324,7 @@ }, "pin2": { "compName": "GUISplitter#1", - "pinName": "O1" + "pinName": "O2" }, "name": "unnamedWire#50", "path": [] @@ -3359,7 +3332,7 @@ { "pin1": { "compName": "GUISplitter#1", - "pinName": "O2" + "pinName": "O1" }, "pin2": { "compName": "_submodelinterface", @@ -3375,7 +3348,7 @@ }, "pin2": { "compName": "GUISplitter#1", - "pinName": "O3" + "pinName": "O0" }, "name": "unnamedWire#52", "path": [] @@ -3850,13 +3823,13 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#3", - "pinName": "Y1" - }, - "pin2": { "compName": "GUIMerger#3", "pinName": "I0" }, + "pin2": { + "compName": "DeserializedSubmodelComponent#3", + "pinName": "Y4" + }, "name": "unnamedWire#89", "path": [] }, @@ -3874,36 +3847,36 @@ }, { "pin1": { - "compName": "GUIMerger#3", - "pinName": "I1" + "compName": "DeserializedSubmodelComponent#3", + "pinName": "Y3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", - "pinName": "Y2" + "compName": "GUIMerger#3", + "pinName": "I1" }, "name": "unnamedWire#90", "path": [] }, { "pin1": { - "compName": "DeserializedSubmodelComponent#3", - "pinName": "Y3" - }, - "pin2": { "compName": "GUIMerger#3", "pinName": "I2" }, + "pin2": { + "compName": "DeserializedSubmodelComponent#3", + "pinName": "Y2" + }, "name": "unnamedWire#91", "path": [] }, { "pin1": { - "compName": "GUIMerger#3", - "pinName": "I3" + "compName": "DeserializedSubmodelComponent#3", + "pinName": "Y1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", - "pinName": "Y4" + "compName": "GUIMerger#3", + "pinName": "I3" }, "name": "unnamedWire#92", "path": [] @@ -3959,7 +3932,7 @@ { "pin1": { "compName": "GUISplitter#3", - "pinName": "O0" + "pinName": "O3" }, "pin2": { "compName": "DeserializedSubmodelComponent#3", @@ -3970,12 +3943,12 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#3", - "pinName": "I0_2" + "compName": "GUISplitter#3", + "pinName": "O2" }, "pin2": { - "compName": "GUISplitter#3", - "pinName": "O1" + "compName": "DeserializedSubmodelComponent#3", + "pinName": "I0_2" }, "name": "unnamedWire#98", "path": [] @@ -3987,7 +3960,7 @@ }, "pin2": { "compName": "GUISplitter#3", - "pinName": "O2" + "pinName": "O1" }, "name": "unnamedWire#99", "path": [] diff --git a/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904MSR.json b/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904MSR.json index 6e93abf4..c1b8cbc5 100644 --- a/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904MSR.json +++ b/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904MSR.json @@ -416,11 +416,11 @@ "path": [ { "x": 140.0, - "y": 415.0 + "y": 445.0 }, { "x": 255.0, - "y": 415.0 + "y": 445.0 }, { "x": 255.0, @@ -483,50 +483,50 @@ }, { "pin1": { - "compName": "GUISplitter#0", - "pinName": "O0" - }, - "pin2": { "compName": "DeserializedSubmodelComponent#0", "pinName": "I0_1" }, + "pin2": { + "compName": "GUISplitter#0", + "pinName": "O3" + }, "name": "unnamedWire#12", "path": [ { "x": 35.0, - "y": 35.0 + "y": 125.0 }, { "x": 35.0, - "y": 125.0 + "y": 35.0 } ] }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", - "pinName": "I0_2" + "compName": "GUISplitter#0", + "pinName": "O2" }, "pin2": { - "compName": "GUISplitter#0", - "pinName": "O1" + "compName": "DeserializedSubmodelComponent#0", + "pinName": "I0_2" }, "name": "unnamedWire#13", "path": [ { "x": 30.0, - "y": 135.0 + "y": 45.0 }, { "x": 30.0, - "y": 45.0 + "y": 135.0 } ] }, { "pin1": { "compName": "GUISplitter#0", - "pinName": "O2" + "pinName": "O1" }, "pin2": { "compName": "DeserializedSubmodelComponent#0", @@ -546,29 +546,29 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", - "pinName": "I0_4" + "compName": "GUISplitter#0", + "pinName": "O0" }, "pin2": { - "compName": "GUISplitter#0", - "pinName": "O3" + "compName": "DeserializedSubmodelComponent#0", + "pinName": "I0_4" }, "name": "unnamedWire#15", "path": [ { "x": 20.0, - "y": 155.0 + "y": 65.0 }, { "x": 20.0, - "y": 65.0 + "y": 155.0 } ] }, { "pin1": { "compName": "GUISplitter#1", - "pinName": "O0" + "pinName": "O3" }, "pin2": { "compName": "DeserializedSubmodelComponent#0", @@ -584,7 +584,7 @@ }, "pin2": { "compName": "GUISplitter#1", - "pinName": "O1" + "pinName": "O2" }, "name": "unnamedWire#17", "path": [] @@ -592,7 +592,7 @@ { "pin1": { "compName": "GUISplitter#1", - "pinName": "O2" + "pinName": "O1" }, "pin2": { "compName": "DeserializedSubmodelComponent#0", @@ -603,13 +603,13 @@ }, { "pin1": { - "compName": "GUISplitter#1", - "pinName": "O3" - }, - "pin2": { "compName": "DeserializedSubmodelComponent#0", "pinName": "I1_4" }, + "pin2": { + "compName": "GUISplitter#1", + "pinName": "O0" + }, "name": "unnamedWire#19", "path": [] }, @@ -682,7 +682,7 @@ { "pin1": { "compName": "GUISplitter#3", - "pinName": "O1" + "pinName": "O2" }, "pin2": { "compName": "DeserializedSubmodelComponent#1", @@ -713,7 +713,7 @@ "path": [ { "x": 60.0, - "y": 425.0 + "y": 445.0 }, { "x": 60.0, @@ -751,7 +751,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#3", + "compName": "WireCrossPoint#2", "pinName": "" }, "pin2": { @@ -767,7 +767,7 @@ "pinName": "I3" }, "pin2": { - "compName": "WireCrossPoint#4", + "compName": "WireCrossPoint#1", "pinName": "" }, "name": "unnamedWire#28", @@ -952,13 +952,13 @@ }, { "pin1": { - "compName": "GUISplitter#3", - "pinName": "O0" - }, - "pin2": { "compName": "WireCrossPoint#12", "pinName": "" }, + "pin2": { + "compName": "GUISplitter#3", + "pinName": "O3" + }, "name": "unnamedWire#38", "path": [] }, @@ -1259,7 +1259,7 @@ { "pin1": { "compName": "GUISplitter#3", - "pinName": "O2" + "pinName": "O1" }, "pin2": { "compName": "WireCrossPoint#8", @@ -1329,7 +1329,7 @@ { "pin1": { "compName": "GUISplitter#3", - "pinName": "O3" + "pinName": "O0" }, "pin2": { "compName": "DeserializedSubmodelComponent#5", @@ -1447,7 +1447,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#1", + "compName": "WireCrossPoint#4", "pinName": "" }, "pin2": { @@ -1645,7 +1645,7 @@ "pinName": "I1" }, "pin2": { - "compName": "WireCrossPoint#2", + "compName": "WireCrossPoint#3", "pinName": "" }, "name": "unnamedWire#8", @@ -1706,7 +1706,7 @@ "path": [ { "x": 245.0, - "y": 445.0 + "y": 425.0 }, { "x": 245.0, diff --git a/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904TestLogic.json b/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904TestLogic.json index 93b91e58..3acca4f7 100644 --- a/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904TestLogic.json +++ b/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904TestLogic.json @@ -273,12 +273,12 @@ }, { "pin1": { - "compName": "GUISplitter#0", - "pinName": "O2" + "compName": "WireCrossPoint#5", + "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" + "compName": "GUISplitter#0", + "pinName": "O2" }, "name": "unnamedWire#1", "path": [] @@ -435,28 +435,11 @@ "pinName": "O1" }, "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#19", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", + "compName": "WireCrossPoint#0", "pinName": "" }, - "pin2": { - "compName": "GUISplitter#0", - "pinName": "O3" - }, "name": "unnamedWire#2", - "path": [ - { - "x": 35.0, - "y": 140.0 - } - ] + "path": [] }, { "pin1": { @@ -476,14 +459,14 @@ "pinName": "O0" }, "pin2": { - "compName": "WireCrossPoint#4", + "compName": "WireCrossPoint#1", "pinName": "" }, "name": "unnamedWire#21", "path": [ { - "x": 20.0, - "y": 110.0 + "x": 35.0, + "y": 140.0 } ] }, @@ -677,6 +660,23 @@ } ] }, + { + "pin1": { + "compName": "GUISplitter#0", + "pinName": "O3" + }, + "pin2": { + "compName": "WireCrossPoint#4", + "pinName": "" + }, + "name": "unnamedWire#34", + "path": [ + { + "x": 20.0, + "y": 110.0 + } + ] + }, { "pin1": { "compName": "WireCrossPoint#1", diff --git a/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904muSR.json b/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904muSR.json index 05fbd4ee..b0993386 100644 --- a/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904muSR.json +++ b/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904muSR.json @@ -254,7 +254,7 @@ }, "pin2": { "compName": "GUIMerger#0", - "pinName": "I0" + "pinName": "I3" }, "name": "unnamedWire#0", "path": [] @@ -262,7 +262,7 @@ { "pin1": { "compName": "GUIMerger#0", - "pinName": "I1" + "pinName": "I2" }, "pin2": { "compName": "GUIdff4_finewe#0", @@ -274,7 +274,7 @@ { "pin1": { "compName": "DeserializedSubmodelComponent#0", - "pinName": "I1_1" + "pinName": "I1_4" }, "pin2": { "compName": "GUISplitter#1", @@ -283,16 +283,28 @@ "name": "unnamedWire#10", "path": [] }, + { + "pin1": { + "compName": "WireCrossPoint#3", + "pinName": "" + }, + "pin2": { + "compName": "GUIMerger#0", + "pinName": "I0" + }, + "name": "unnamedWire#11", + "path": [] + }, { "pin1": { "compName": "GUISplitter#0", - "pinName": "O3" + "pinName": "O0" }, "pin2": { "compName": "DeserializedSubmodelComponent#0", "pinName": "I0_4" }, - "name": "unnamedWire#11", + "name": "unnamedWire#12", "path": [ { "x": 20.0, @@ -306,35 +318,35 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", - "pinName": "I0_3" + "compName": "GUISplitter#0", + "pinName": "O1" }, "pin2": { - "compName": "GUISplitter#0", - "pinName": "O2" + "compName": "DeserializedSubmodelComponent#0", + "pinName": "I0_3" }, - "name": "unnamedWire#12", + "name": "unnamedWire#13", "path": [ { "x": 25.0, - "y": 275.0 + "y": 140.0 }, { "x": 25.0, - "y": 140.0 + "y": 275.0 } ] }, { "pin1": { "compName": "GUISplitter#0", - "pinName": "O1" + "pinName": "O2" }, "pin2": { "compName": "DeserializedSubmodelComponent#0", "pinName": "I0_2" }, - "name": "unnamedWire#13", + "name": "unnamedWire#14", "path": [ { "x": 30.0, @@ -346,27 +358,6 @@ } ] }, - { - "pin1": { - "compName": "DeserializedSubmodelComponent#0", - "pinName": "I0_1" - }, - "pin2": { - "compName": "GUISplitter#0", - "pinName": "O0" - }, - "name": "unnamedWire#14", - "path": [ - { - "x": 35.0, - "y": 255.0 - }, - { - "x": 35.0, - "y": 120.0 - } - ] - }, { "pin1": { "compName": "_submodelinterface", @@ -397,7 +388,7 @@ "path": [ { "x": 90.0, - "y": 430.0 + "y": 440.0 } ] }, @@ -439,12 +430,12 @@ }, { "pin1": { - "compName": "GUIdff4_finewe#0", - "pinName": "Q3" + "compName": "GUIMerger#0", + "pinName": "I1" }, "pin2": { - "compName": "GUIMerger#0", - "pinName": "I2" + "compName": "GUIdff4_finewe#0", + "pinName": "Q3" }, "name": "unnamedWire#2", "path": [] @@ -572,7 +563,7 @@ "path": [ { "x": 85.0, - "y": 440.0 + "y": 430.0 }, { "x": 85.0, @@ -580,18 +571,6 @@ } ] }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "GUIMerger#0", - "pinName": "I3" - }, - "name": "unnamedWire#29", - "path": [] - }, { "pin1": { "compName": "GUIdff4_finewe#0", @@ -1012,6 +991,27 @@ } ] }, + { + "pin1": { + "compName": "GUISplitter#0", + "pinName": "O3" + }, + "pin2": { + "compName": "DeserializedSubmodelComponent#0", + "pinName": "I0_1" + }, + "name": "unnamedWire#49", + "path": [ + { + "x": 35.0, + "y": 120.0 + }, + { + "x": 35.0, + "y": 255.0 + } + ] + }, { "pin1": { "compName": "_submodelinterface", @@ -1043,7 +1043,7 @@ }, "pin2": { "compName": "DeserializedSubmodelComponent#0", - "pinName": "I1_4" + "pinName": "I1_1" }, "name": "unnamedWire#7", "path": [] @@ -1051,7 +1051,7 @@ { "pin1": { "compName": "DeserializedSubmodelComponent#0", - "pinName": "I1_3" + "pinName": "I1_2" }, "pin2": { "compName": "GUISplitter#1", @@ -1067,7 +1067,7 @@ }, "pin2": { "compName": "DeserializedSubmodelComponent#0", - "pinName": "I1_2" + "pinName": "I1_3" }, "name": "unnamedWire#9", "path": [] diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/GUIAm2904RegCTInstrDecode.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/GUIAm2904RegCTInstrDecode.java index 7dea5b5b..447fef6c 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/GUIAm2904RegCTInstrDecode.java +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/GUIAm2904RegCTInstrDecode.java @@ -24,8 +24,8 @@ public class GUIAm2904RegCTInstrDecode extends SimpleRectangularHardcodedGUIComp { super(model, name, "Instruction\ndecode"); setSize(80, 80); - addPin(new Pin(this, "I5-0", 6, PinUsage.INPUT, 0, 30), Position.RIGHT); - addPin(new Pin(this, "I12-11", 2, PinUsage.INPUT, 0, 50), Position.RIGHT); + addPin(new Pin(this, "I12-11", 2, PinUsage.INPUT, 0, 30), Position.RIGHT); + addPin(new Pin(this, "I5-0", 6, PinUsage.INPUT, 0, 50), Position.RIGHT); // muSR MUX: // 00: 0 // 01: 1 diff --git a/net.mograsim.logic.model.editor/components/am2904/GUIAm2904.json b/net.mograsim.logic.model.editor/components/am2904/GUIAm2904.json index 82d233c7..b6a42db7 100644 --- a/net.mograsim.logic.model.editor/components/am2904/GUIAm2904.json +++ b/net.mograsim.logic.model.editor/components/am2904/GUIAm2904.json @@ -473,7 +473,7 @@ "name": "GUIMerger#0", "pos": { "x": 25.0, - "y": 245.0 + "y": 315.0 }, "params": 6 }, @@ -482,7 +482,7 @@ "name": "GUIMerger#1", "pos": { "x": 25.0, - "y": 305.0 + "y": 265.0 }, "params": 5 }, @@ -509,7 +509,7 @@ "name": "GUIMerger#4", "pos": { "x": 25.0, - "y": 355.0 + "y": 245.0 }, "params": 2 }, @@ -1175,7 +1175,7 @@ { "pin1": { "compName": "GUISplitter#3", - "pinName": "O3" + "pinName": "O0" }, "pin2": { "compName": "DeserializedSubmodelComponent#3", @@ -1199,7 +1199,7 @@ { "pin1": { "compName": "GUISplitter#4", - "pinName": "O0" + "pinName": "O3" }, "pin2": { "compName": "DeserializedSubmodelComponent#5", @@ -1210,37 +1210,37 @@ }, { "pin1": { - "compName": "GUISplitter#4", - "pinName": "O1" - }, - "pin2": { "compName": "DeserializedSubmodelComponent#5", "pinName": "I0_2" }, + "pin2": { + "compName": "GUISplitter#4", + "pinName": "O2" + }, "name": "unnamedWire#103", "path": [] }, { "pin1": { - "compName": "DeserializedSubmodelComponent#5", - "pinName": "I0_3" + "compName": "GUISplitter#4", + "pinName": "O1" }, "pin2": { - "compName": "GUISplitter#4", - "pinName": "O2" + "compName": "DeserializedSubmodelComponent#5", + "pinName": "I0_3" }, "name": "unnamedWire#104", "path": [] }, { "pin1": { - "compName": "GUISplitter#4", - "pinName": "O3" - }, - "pin2": { "compName": "DeserializedSubmodelComponent#5", "pinName": "I0_4" }, + "pin2": { + "compName": "GUISplitter#4", + "pinName": "O0" + }, "name": "unnamedWire#105", "path": [] }, @@ -1263,32 +1263,32 @@ }, "pin2": { "compName": "DeserializedSubmodelComponent#5", - "pinName": "I1_1" + "pinName": "I1_4" }, "name": "unnamedWire#107", "path": [] }, { "pin1": { - "compName": "GUISplitter#5", - "pinName": "O1" + "compName": "DeserializedSubmodelComponent#5", + "pinName": "I1_3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#5", - "pinName": "I1_2" + "compName": "GUISplitter#5", + "pinName": "O1" }, "name": "unnamedWire#108", "path": [] }, { "pin1": { - "compName": "DeserializedSubmodelComponent#5", - "pinName": "I1_3" - }, - "pin2": { "compName": "GUISplitter#5", "pinName": "O2" }, + "pin2": { + "compName": "DeserializedSubmodelComponent#5", + "pinName": "I1_2" + }, "name": "unnamedWire#109", "path": [] }, @@ -1306,12 +1306,12 @@ }, { "pin1": { - "compName": "GUISplitter#5", - "pinName": "O3" + "compName": "DeserializedSubmodelComponent#5", + "pinName": "I1_1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#5", - "pinName": "I1_4" + "compName": "GUISplitter#5", + "pinName": "O3" }, "name": "unnamedWire#110", "path": [] @@ -1631,7 +1631,7 @@ { "pin1": { "compName": "GUISplitter#8", - "pinName": "O2" + "pinName": "O1" }, "pin2": { "compName": "WireCrossPoint#27", @@ -1762,13 +1762,13 @@ }, { "pin1": { - "compName": "GUISplitter#10", - "pinName": "O1" - }, - "pin2": { "compName": "DeserializedSubmodelComponent#11", "pinName": "I0" }, + "pin2": { + "compName": "GUISplitter#10", + "pinName": "O2" + }, "name": "unnamedWire#145", "path": [] }, @@ -1965,11 +1965,11 @@ "path": [ { "x": 40.0, - "y": 395.0 + "y": 385.0 }, { "x": 40.0, - "y": 325.0 + "y": 285.0 } ] }, @@ -2100,19 +2100,10 @@ }, "pin2": { "compName": "GUIMerger#2", - "pinName": "I3" + "pinName": "I0" }, "name": "unnamedWire#17", - "path": [ - { - "x": 10.0, - "y": 125.0 - }, - { - "x": 10.0, - "y": 95.0 - } - ] + "path": [] }, { "pin1": { @@ -2140,12 +2131,12 @@ }, { "pin1": { - "compName": "WireCrossPoint#22", - "pinName": "" + "compName": "GUISplitter#8", + "pinName": "O2" }, "pin2": { - "compName": "GUISplitter#8", - "pinName": "O1" + "compName": "WireCrossPoint#22", + "pinName": "" }, "name": "unnamedWire#172", "path": [] @@ -2241,19 +2232,10 @@ }, "pin2": { "compName": "GUIMerger#2", - "pinName": "I2" + "pinName": "I1" }, "name": "unnamedWire#18", - "path": [ - { - "x": 5.0, - "y": 100.0 - }, - { - "x": 5.0, - "y": 85.0 - } - ] + "path": [] }, { "pin1": { @@ -2377,12 +2359,12 @@ }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "IC" + "compName": "GUIMerger#2", + "pinName": "I2" }, "pin2": { - "compName": "GUIMerger#2", - "pinName": "I1" + "compName": "_submodelinterface", + "pinName": "IC" }, "name": "unnamedWire#19", "path": [] @@ -2526,19 +2508,10 @@ }, "pin2": { "compName": "GUIMerger#2", - "pinName": "I0" + "pinName": "I3" }, "name": "unnamedWire#20", - "path": [ - { - "x": 5.0, - "y": 50.0 - }, - { - "x": 5.0, - "y": 65.0 - } - ] + "path": [] }, { "pin1": { @@ -2619,7 +2592,7 @@ }, "pin2": { "compName": "GUISplitter#7", - "pinName": "O3" + "pinName": "O0" }, "name": "unnamedWire#206", "path": [] @@ -3323,7 +3296,7 @@ { "pin1": { "compName": "GUISplitter#1", - "pinName": "O0" + "pinName": "O3" }, "pin2": { "compName": "_submodelinterface", @@ -3351,7 +3324,7 @@ }, "pin2": { "compName": "GUISplitter#1", - "pinName": "O1" + "pinName": "O2" }, "name": "unnamedWire#50", "path": [] @@ -3359,7 +3332,7 @@ { "pin1": { "compName": "GUISplitter#1", - "pinName": "O2" + "pinName": "O1" }, "pin2": { "compName": "_submodelinterface", @@ -3375,7 +3348,7 @@ }, "pin2": { "compName": "GUISplitter#1", - "pinName": "O3" + "pinName": "O0" }, "name": "unnamedWire#52", "path": [] @@ -3850,13 +3823,13 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#3", - "pinName": "Y1" - }, - "pin2": { "compName": "GUIMerger#3", "pinName": "I0" }, + "pin2": { + "compName": "DeserializedSubmodelComponent#3", + "pinName": "Y4" + }, "name": "unnamedWire#89", "path": [] }, @@ -3874,36 +3847,36 @@ }, { "pin1": { - "compName": "GUIMerger#3", - "pinName": "I1" + "compName": "DeserializedSubmodelComponent#3", + "pinName": "Y3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", - "pinName": "Y2" + "compName": "GUIMerger#3", + "pinName": "I1" }, "name": "unnamedWire#90", "path": [] }, { "pin1": { - "compName": "DeserializedSubmodelComponent#3", - "pinName": "Y3" - }, - "pin2": { "compName": "GUIMerger#3", "pinName": "I2" }, + "pin2": { + "compName": "DeserializedSubmodelComponent#3", + "pinName": "Y2" + }, "name": "unnamedWire#91", "path": [] }, { "pin1": { - "compName": "GUIMerger#3", - "pinName": "I3" + "compName": "DeserializedSubmodelComponent#3", + "pinName": "Y1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", - "pinName": "Y4" + "compName": "GUIMerger#3", + "pinName": "I3" }, "name": "unnamedWire#92", "path": [] @@ -3959,7 +3932,7 @@ { "pin1": { "compName": "GUISplitter#3", - "pinName": "O0" + "pinName": "O3" }, "pin2": { "compName": "DeserializedSubmodelComponent#3", @@ -3970,12 +3943,12 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#3", - "pinName": "I0_2" + "compName": "GUISplitter#3", + "pinName": "O2" }, "pin2": { - "compName": "GUISplitter#3", - "pinName": "O1" + "compName": "DeserializedSubmodelComponent#3", + "pinName": "I0_2" }, "name": "unnamedWire#98", "path": [] @@ -3987,7 +3960,7 @@ }, "pin2": { "compName": "GUISplitter#3", - "pinName": "O2" + "pinName": "O1" }, "name": "unnamedWire#99", "path": [] diff --git a/net.mograsim.logic.model.editor/components/am2904/GUIAm2904MSR.json b/net.mograsim.logic.model.editor/components/am2904/GUIAm2904MSR.json index 6e93abf4..c1b8cbc5 100644 --- a/net.mograsim.logic.model.editor/components/am2904/GUIAm2904MSR.json +++ b/net.mograsim.logic.model.editor/components/am2904/GUIAm2904MSR.json @@ -416,11 +416,11 @@ "path": [ { "x": 140.0, - "y": 415.0 + "y": 445.0 }, { "x": 255.0, - "y": 415.0 + "y": 445.0 }, { "x": 255.0, @@ -483,50 +483,50 @@ }, { "pin1": { - "compName": "GUISplitter#0", - "pinName": "O0" - }, - "pin2": { "compName": "DeserializedSubmodelComponent#0", "pinName": "I0_1" }, + "pin2": { + "compName": "GUISplitter#0", + "pinName": "O3" + }, "name": "unnamedWire#12", "path": [ { "x": 35.0, - "y": 35.0 + "y": 125.0 }, { "x": 35.0, - "y": 125.0 + "y": 35.0 } ] }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", - "pinName": "I0_2" + "compName": "GUISplitter#0", + "pinName": "O2" }, "pin2": { - "compName": "GUISplitter#0", - "pinName": "O1" + "compName": "DeserializedSubmodelComponent#0", + "pinName": "I0_2" }, "name": "unnamedWire#13", "path": [ { "x": 30.0, - "y": 135.0 + "y": 45.0 }, { "x": 30.0, - "y": 45.0 + "y": 135.0 } ] }, { "pin1": { "compName": "GUISplitter#0", - "pinName": "O2" + "pinName": "O1" }, "pin2": { "compName": "DeserializedSubmodelComponent#0", @@ -546,29 +546,29 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", - "pinName": "I0_4" + "compName": "GUISplitter#0", + "pinName": "O0" }, "pin2": { - "compName": "GUISplitter#0", - "pinName": "O3" + "compName": "DeserializedSubmodelComponent#0", + "pinName": "I0_4" }, "name": "unnamedWire#15", "path": [ { "x": 20.0, - "y": 155.0 + "y": 65.0 }, { "x": 20.0, - "y": 65.0 + "y": 155.0 } ] }, { "pin1": { "compName": "GUISplitter#1", - "pinName": "O0" + "pinName": "O3" }, "pin2": { "compName": "DeserializedSubmodelComponent#0", @@ -584,7 +584,7 @@ }, "pin2": { "compName": "GUISplitter#1", - "pinName": "O1" + "pinName": "O2" }, "name": "unnamedWire#17", "path": [] @@ -592,7 +592,7 @@ { "pin1": { "compName": "GUISplitter#1", - "pinName": "O2" + "pinName": "O1" }, "pin2": { "compName": "DeserializedSubmodelComponent#0", @@ -603,13 +603,13 @@ }, { "pin1": { - "compName": "GUISplitter#1", - "pinName": "O3" - }, - "pin2": { "compName": "DeserializedSubmodelComponent#0", "pinName": "I1_4" }, + "pin2": { + "compName": "GUISplitter#1", + "pinName": "O0" + }, "name": "unnamedWire#19", "path": [] }, @@ -682,7 +682,7 @@ { "pin1": { "compName": "GUISplitter#3", - "pinName": "O1" + "pinName": "O2" }, "pin2": { "compName": "DeserializedSubmodelComponent#1", @@ -713,7 +713,7 @@ "path": [ { "x": 60.0, - "y": 425.0 + "y": 445.0 }, { "x": 60.0, @@ -751,7 +751,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#3", + "compName": "WireCrossPoint#2", "pinName": "" }, "pin2": { @@ -767,7 +767,7 @@ "pinName": "I3" }, "pin2": { - "compName": "WireCrossPoint#4", + "compName": "WireCrossPoint#1", "pinName": "" }, "name": "unnamedWire#28", @@ -952,13 +952,13 @@ }, { "pin1": { - "compName": "GUISplitter#3", - "pinName": "O0" - }, - "pin2": { "compName": "WireCrossPoint#12", "pinName": "" }, + "pin2": { + "compName": "GUISplitter#3", + "pinName": "O3" + }, "name": "unnamedWire#38", "path": [] }, @@ -1259,7 +1259,7 @@ { "pin1": { "compName": "GUISplitter#3", - "pinName": "O2" + "pinName": "O1" }, "pin2": { "compName": "WireCrossPoint#8", @@ -1329,7 +1329,7 @@ { "pin1": { "compName": "GUISplitter#3", - "pinName": "O3" + "pinName": "O0" }, "pin2": { "compName": "DeserializedSubmodelComponent#5", @@ -1447,7 +1447,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#1", + "compName": "WireCrossPoint#4", "pinName": "" }, "pin2": { @@ -1645,7 +1645,7 @@ "pinName": "I1" }, "pin2": { - "compName": "WireCrossPoint#2", + "compName": "WireCrossPoint#3", "pinName": "" }, "name": "unnamedWire#8", @@ -1706,7 +1706,7 @@ "path": [ { "x": 245.0, - "y": 445.0 + "y": 425.0 }, { "x": 245.0, diff --git a/net.mograsim.logic.model.editor/components/am2904/GUIAm2904TestLogic.json b/net.mograsim.logic.model.editor/components/am2904/GUIAm2904TestLogic.json index 93b91e58..3acca4f7 100644 --- a/net.mograsim.logic.model.editor/components/am2904/GUIAm2904TestLogic.json +++ b/net.mograsim.logic.model.editor/components/am2904/GUIAm2904TestLogic.json @@ -273,12 +273,12 @@ }, { "pin1": { - "compName": "GUISplitter#0", - "pinName": "O2" + "compName": "WireCrossPoint#5", + "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" + "compName": "GUISplitter#0", + "pinName": "O2" }, "name": "unnamedWire#1", "path": [] @@ -435,28 +435,11 @@ "pinName": "O1" }, "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#19", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", + "compName": "WireCrossPoint#0", "pinName": "" }, - "pin2": { - "compName": "GUISplitter#0", - "pinName": "O3" - }, "name": "unnamedWire#2", - "path": [ - { - "x": 35.0, - "y": 140.0 - } - ] + "path": [] }, { "pin1": { @@ -476,14 +459,14 @@ "pinName": "O0" }, "pin2": { - "compName": "WireCrossPoint#4", + "compName": "WireCrossPoint#1", "pinName": "" }, "name": "unnamedWire#21", "path": [ { - "x": 20.0, - "y": 110.0 + "x": 35.0, + "y": 140.0 } ] }, @@ -677,6 +660,23 @@ } ] }, + { + "pin1": { + "compName": "GUISplitter#0", + "pinName": "O3" + }, + "pin2": { + "compName": "WireCrossPoint#4", + "pinName": "" + }, + "name": "unnamedWire#34", + "path": [ + { + "x": 20.0, + "y": 110.0 + } + ] + }, { "pin1": { "compName": "WireCrossPoint#1", diff --git a/net.mograsim.logic.model.editor/components/am2904/GUIAm2904muSR.json b/net.mograsim.logic.model.editor/components/am2904/GUIAm2904muSR.json index 05fbd4ee..b0993386 100644 --- a/net.mograsim.logic.model.editor/components/am2904/GUIAm2904muSR.json +++ b/net.mograsim.logic.model.editor/components/am2904/GUIAm2904muSR.json @@ -254,7 +254,7 @@ }, "pin2": { "compName": "GUIMerger#0", - "pinName": "I0" + "pinName": "I3" }, "name": "unnamedWire#0", "path": [] @@ -262,7 +262,7 @@ { "pin1": { "compName": "GUIMerger#0", - "pinName": "I1" + "pinName": "I2" }, "pin2": { "compName": "GUIdff4_finewe#0", @@ -274,7 +274,7 @@ { "pin1": { "compName": "DeserializedSubmodelComponent#0", - "pinName": "I1_1" + "pinName": "I1_4" }, "pin2": { "compName": "GUISplitter#1", @@ -283,16 +283,28 @@ "name": "unnamedWire#10", "path": [] }, + { + "pin1": { + "compName": "WireCrossPoint#3", + "pinName": "" + }, + "pin2": { + "compName": "GUIMerger#0", + "pinName": "I0" + }, + "name": "unnamedWire#11", + "path": [] + }, { "pin1": { "compName": "GUISplitter#0", - "pinName": "O3" + "pinName": "O0" }, "pin2": { "compName": "DeserializedSubmodelComponent#0", "pinName": "I0_4" }, - "name": "unnamedWire#11", + "name": "unnamedWire#12", "path": [ { "x": 20.0, @@ -306,35 +318,35 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", - "pinName": "I0_3" + "compName": "GUISplitter#0", + "pinName": "O1" }, "pin2": { - "compName": "GUISplitter#0", - "pinName": "O2" + "compName": "DeserializedSubmodelComponent#0", + "pinName": "I0_3" }, - "name": "unnamedWire#12", + "name": "unnamedWire#13", "path": [ { "x": 25.0, - "y": 275.0 + "y": 140.0 }, { "x": 25.0, - "y": 140.0 + "y": 275.0 } ] }, { "pin1": { "compName": "GUISplitter#0", - "pinName": "O1" + "pinName": "O2" }, "pin2": { "compName": "DeserializedSubmodelComponent#0", "pinName": "I0_2" }, - "name": "unnamedWire#13", + "name": "unnamedWire#14", "path": [ { "x": 30.0, @@ -346,27 +358,6 @@ } ] }, - { - "pin1": { - "compName": "DeserializedSubmodelComponent#0", - "pinName": "I0_1" - }, - "pin2": { - "compName": "GUISplitter#0", - "pinName": "O0" - }, - "name": "unnamedWire#14", - "path": [ - { - "x": 35.0, - "y": 255.0 - }, - { - "x": 35.0, - "y": 120.0 - } - ] - }, { "pin1": { "compName": "_submodelinterface", @@ -397,7 +388,7 @@ "path": [ { "x": 90.0, - "y": 430.0 + "y": 440.0 } ] }, @@ -439,12 +430,12 @@ }, { "pin1": { - "compName": "GUIdff4_finewe#0", - "pinName": "Q3" + "compName": "GUIMerger#0", + "pinName": "I1" }, "pin2": { - "compName": "GUIMerger#0", - "pinName": "I2" + "compName": "GUIdff4_finewe#0", + "pinName": "Q3" }, "name": "unnamedWire#2", "path": [] @@ -572,7 +563,7 @@ "path": [ { "x": 85.0, - "y": 440.0 + "y": 430.0 }, { "x": 85.0, @@ -580,18 +571,6 @@ } ] }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "GUIMerger#0", - "pinName": "I3" - }, - "name": "unnamedWire#29", - "path": [] - }, { "pin1": { "compName": "GUIdff4_finewe#0", @@ -1012,6 +991,27 @@ } ] }, + { + "pin1": { + "compName": "GUISplitter#0", + "pinName": "O3" + }, + "pin2": { + "compName": "DeserializedSubmodelComponent#0", + "pinName": "I0_1" + }, + "name": "unnamedWire#49", + "path": [ + { + "x": 35.0, + "y": 120.0 + }, + { + "x": 35.0, + "y": 255.0 + } + ] + }, { "pin1": { "compName": "_submodelinterface", @@ -1043,7 +1043,7 @@ }, "pin2": { "compName": "DeserializedSubmodelComponent#0", - "pinName": "I1_4" + "pinName": "I1_1" }, "name": "unnamedWire#7", "path": [] @@ -1051,7 +1051,7 @@ { "pin1": { "compName": "DeserializedSubmodelComponent#0", - "pinName": "I1_3" + "pinName": "I1_2" }, "pin2": { "compName": "GUISplitter#1", @@ -1067,7 +1067,7 @@ }, "pin2": { "compName": "DeserializedSubmodelComponent#0", - "pinName": "I1_2" + "pinName": "I1_3" }, "name": "unnamedWire#9", "path": []