From: Daniel Kirschten Date: Sat, 10 Oct 2020 20:06:57 +0000 (+0200) Subject: Replaced mux1_4_sb with mux1_4 in Am2904muSR X-Git-Url: https://mograsim.net/gitweb/?p=Mograsim.git;a=commitdiff_plain;h=d08f7f3c9a3534e2b62ec90bb58bbf7a0b865d21 Replaced mux1_4_sb with mux1_4 in Am2904muSR --- diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json index 94fe508a..7105c0ab 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json @@ -109,8 +109,8 @@ "id": "NandGate", "name": "NandGate#0", "pos": { - "x": 155.0, - "y": 135.0 + "x": 195.0, + "y": 160.0 }, "params": 1 }, @@ -118,8 +118,8 @@ "id": "NandGate", "name": "NandGate#1", "pos": { - "x": 125.0, - "y": 150.0 + "x": 165.0, + "y": 180.0 }, "params": 1 }, @@ -127,8 +127,8 @@ "id": "NandGate", "name": "NandGate#2", "pos": { - "x": 125.0, - "y": 130.0 + "x": 165.0, + "y": 155.0 }, "params": 1 }, @@ -136,20 +136,20 @@ "id": "Splitter", "name": "Splitter#0", "pos": { - "x": 5.0, - "y": 135.0 + "x": 65.0, + "y": 90.0 }, "params": { "logicWidth": 4, - "orientation": "RIGHT" + "orientation": "LEFT" } }, { "id": "Splitter", "name": "Splitter#1", "pos": { - "x": 5.0, - "y": 185.0 + "x": 145.0, + "y": 80.0 }, "params": { "logicWidth": 4, @@ -160,7 +160,7 @@ "id": "Splitter", "name": "Splitter#2", "pos": { - "x": 5.0, + "x": 15.0, "y": 95.0 }, "params": { @@ -184,7 +184,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#0", "pos": { - "x": 19.0, + "x": 29.0, "y": 119.0 }, "params": 1 @@ -220,8 +220,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#4", "pos": { - "x": 114.0, - "y": 134.0 + "x": 159.0, + "y": 159.0 }, "params": 1 }, @@ -243,18 +243,18 @@ } }, { - "id": "mux1_4_sb", - "name": "mux1_4_sb#0", + "id": "mux1_4", + "name": "mux1_4#0", "pos": { "x": 25.0, - "y": 125.0 + "y": 130.0 } }, { - "id": "mux1_4_sb", - "name": "mux1_4_sb#1", + "id": "mux1_4", + "name": "mux1_4#1", "pos": { - "x": 65.0, + "x": 85.0, "y": 75.0 } }, @@ -262,8 +262,8 @@ "id": "xor", "name": "xor#0", "pos": { - "x": 130.0, - "y": 105.0 + "x": 170.0, + "y": 130.0 } } ], @@ -343,8 +343,8 @@ "pinName": "M" }, "pin2": { - "compName": "Splitter#0", - "pinName": "I" + "compName": "mux1_4#0", + "pinName": "I0" }, "name": "unnamedWire#5", "path": [] @@ -355,26 +355,14 @@ "pinName": "I" }, "pin2": { - "compName": "Splitter#1", - "pinName": "I" + "compName": "mux1_4#0", + "pinName": "I1" }, "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O3" - }, - "pin2": { - "compName": "mux1_4_sb#0", - "pinName": "I1_1" - }, - "name": "unnamedWire#7", "path": [ { "x": 20.0, - "y": 185.0 + "y": 200.0 }, { "x": 20.0, @@ -384,66 +372,69 @@ }, { "pin1": { - "compName": "mux1_4_sb#0", - "pinName": "I1_2" + "compName": "WireCrossPoint#0", + "pinName": "" }, "pin2": { - "compName": "Splitter#1", - "pinName": "O2" + "compName": "mux1_4#0", + "pinName": "S0" }, - "name": "unnamedWire#8", + "name": "unnamedWire#7", "path": [ { "x": 20.0, - "y": 190.0 + "y": 120.0 }, { "x": 20.0, - "y": 195.0 + "y": 135.0 } ] }, { "pin1": { - "compName": "Splitter#1", - "pinName": "O1" + "compName": "mux1_4#1", + "pinName": "I1" }, "pin2": { - "compName": "mux1_4_sb#0", - "pinName": "I1_3" + "compName": "mux1_4#0", + "pinName": "Y" }, - "name": "unnamedWire#9", + "name": "unnamedWire#8", "path": [ { - "x": 20.0, - "y": 205.0 + "x": 80.0, + "y": 125.0 }, { - "x": 20.0, - "y": 200.0 + "x": 80.0, + "y": 150.0 } ] }, { "pin1": { - "compName": "mux1_4_sb#0", - "pinName": "I1_4" + "compName": "WireCrossPoint#5", + "pinName": "" }, "pin2": { - "compName": "Splitter#1", + "compName": "Splitter#0", "pinName": "O0" }, + "name": "unnamedWire#9", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#1", + "pinName": "" + }, + "pin2": { + "compName": "Splitter#0", + "pinName": "O1" + }, "name": "unnamedWire#10", - "path": [ - { - "x": 20.0, - "y": 210.0 - }, - { - "x": 20.0, - "y": 215.0 - } - ] + "path": [] }, { "pin1": { @@ -459,64 +450,51 @@ }, { "pin1": { - "compName": "Splitter#0", - "pinName": "O0" + "compName": "WireCrossPoint#2", + "pinName": "" }, "pin2": { - "compName": "mux1_4_sb#0", - "pinName": "I0_4" + "compName": "Splitter#0", + "pinName": "O2" }, "name": "unnamedWire#12", - "path": [ - { - "x": 20.0, - "y": 165.0 - }, - { - "x": 20.0, - "y": 170.0 - } - ] + "path": [] }, { "pin1": { - "compName": "Splitter#0", - "pinName": "O1" + "compName": "WireCrossPoint#2", + "pinName": "" }, "pin2": { - "compName": "mux1_4_sb#0", - "pinName": "I0_3" + "compName": "Splitter#0", + "pinName": "O3" }, "name": "unnamedWire#13", "path": [ { - "x": 20.0, - "y": 155.0 - }, - { - "x": 20.0, - "y": 160.0 + "x": 60.0, + "y": 90.0 } ] }, { "pin1": { "compName": "Splitter#0", - "pinName": "O2" + "pinName": "I" }, "pin2": { - "compName": "mux1_4_sb#0", - "pinName": "I0_2" + "compName": "mux1_4#1", + "pinName": "I0" }, "name": "unnamedWire#14", "path": [ { - "x": 20.0, - "y": 145.0 + "x": 80.0, + "y": 105.0 }, { - "x": 20.0, - "y": 150.0 + "x": 80.0, + "y": 95.0 } ] }, @@ -544,99 +522,105 @@ "name": "unnamedWire#16", "path": [ { - "x": 20.0, + "x": 30.0, "y": 105.0 } ] }, { "pin1": { - "compName": "mux1_4_sb#0", - "pinName": "Y4" + "compName": "Splitter#2", + "pinName": "O1" }, "pin2": { - "compName": "mux1_4_sb#1", - "pinName": "I1_4" + "compName": "mux1_4#1", + "pinName": "S0" }, "name": "unnamedWire#17", - "path": [] + "path": [ + { + "x": 30.0, + "y": 95.0 + }, + { + "x": 30.0, + "y": 80.0 + } + ] }, { "pin1": { - "compName": "mux1_4_sb#1", - "pinName": "I1_3" + "compName": "mux1_4#1", + "pinName": "Y" }, "pin2": { - "compName": "mux1_4_sb#0", - "pinName": "Y3" + "compName": "Splitter#1", + "pinName": "I" }, "name": "unnamedWire#18", "path": [] }, { "pin1": { - "compName": "mux1_4_sb#0", - "pinName": "Y2" + "compName": "Splitter#1", + "pinName": "O3" }, "pin2": { - "compName": "mux1_4_sb#1", - "pinName": "I1_2" + "compName": "dff4_finewe#0", + "pinName": "D4" }, "name": "unnamedWire#19", "path": [] }, { "pin1": { - "compName": "mux1_4_sb#0", - "pinName": "Y1" + "compName": "Splitter#1", + "pinName": "O2" }, "pin2": { - "compName": "mux1_4_sb#1", - "pinName": "I1_1" + "compName": "xor#0", + "pinName": "A" }, "name": "unnamedWire#20", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4_sb#1", - "pinName": "I0_1" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#21", "path": [ { - "x": 60.0, + "x": 165.0, "y": 90.0 + }, + { + "x": 165.0, + "y": 135.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" + "compName": "Splitter#1", + "pinName": "O1" }, "pin2": { - "compName": "mux1_4_sb#1", - "pinName": "I0_2" + "compName": "dff4_finewe#0", + "pinName": "D2" }, - "name": "unnamedWire#22", + "name": "unnamedWire#21", "path": [] }, { "pin1": { - "compName": "mux1_4_sb#1", - "pinName": "I0_3" + "compName": "Splitter#1", + "pinName": "O0" }, "pin2": { - "compName": "WireCrossPoint#1", + "compName": "WireCrossPoint#4", "pinName": "" }, - "name": "unnamedWire#23", - "path": [] + "name": "unnamedWire#22", + "path": [ + { + "x": 160.0, + "y": 110.0 + } + ] }, { "pin1": { @@ -647,7 +631,7 @@ "compName": "WireCrossPoint#2", "pinName": "" }, - "name": "unnamedWire#24", + "name": "unnamedWire#23", "path": [] }, { @@ -659,59 +643,9 @@ "compName": "WireCrossPoint#5", "pinName": "" }, - "name": "unnamedWire#25", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4_sb#1", - "pinName": "I0_4" - }, - "name": "unnamedWire#26", + "name": "unnamedWire#24", "path": [] }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4_sb#0", - "pinName": "S0" - }, - "name": "unnamedWire#27", - "path": [ - { - "x": 20.0, - "y": 130.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O1" - }, - "pin2": { - "compName": "mux1_4_sb#1", - "pinName": "S0" - }, - "name": "unnamedWire#28", - "path": [ - { - "x": 20.0, - "y": 95.0 - }, - { - "x": 20.0, - "y": 80.0 - } - ] - }, { "pin1": { "compName": "WireCrossPoint#5", @@ -721,7 +655,7 @@ "compName": "WireCrossPoint#1", "pinName": "" }, - "name": "unnamedWire#29", + "name": "unnamedWire#25", "path": [] }, { @@ -733,7 +667,7 @@ "compName": "NandGate#0", "pinName": "A" }, - "name": "unnamedWire#30", + "name": "unnamedWire#26", "path": [] }, { @@ -745,15 +679,15 @@ "compName": "NandGate#1", "pinName": "Y" }, - "name": "unnamedWire#31", + "name": "unnamedWire#27", "path": [ { - "x": 150.0, - "y": 150.0 + "x": 190.0, + "y": 175.0 }, { - "x": 150.0, - "y": 160.0 + "x": 190.0, + "y": 190.0 } ] }, @@ -766,15 +700,15 @@ "compName": "NandGate#1", "pinName": "A" }, - "name": "unnamedWire#32", + "name": "unnamedWire#28", "path": [ { - "x": 115.0, + "x": 155.0, "y": 300.0 }, { - "x": 115.0, - "y": 155.0 + "x": 155.0, + "y": 185.0 } ] }, @@ -787,40 +721,19 @@ "compName": "NandGate#1", "pinName": "B" }, - "name": "unnamedWire#33", + "name": "unnamedWire#29", "path": [ { "x": 225.0, - "y": 175.0 - }, - { - "x": 120.0, - "y": 175.0 + "y": 205.0 }, { - "x": 120.0, - "y": 165.0 - } - ] - }, - { - "pin1": { - "compName": "mux1_4_sb#1", - "pinName": "Y2" - }, - "pin2": { - "compName": "xor#0", - "pinName": "A" - }, - "name": "unnamedWire#34", - "path": [ - { - "x": 125.0, - "y": 90.0 + "x": 160.0, + "y": 205.0 }, { - "x": 125.0, - "y": 110.0 + "x": 160.0, + "y": 195.0 } ] }, @@ -833,15 +746,15 @@ "compName": "xor#0", "pinName": "B" }, - "name": "unnamedWire#35", + "name": "unnamedWire#30", "path": [ { - "x": 105.0, + "x": 150.0, "y": 250.0 }, { - "x": 105.0, - "y": 120.0 + "x": 150.0, + "y": 145.0 } ] }, @@ -854,7 +767,7 @@ "compName": "_submodelinterface", "pinName": "_EZ" }, - "name": "unnamedWire#36", + "name": "unnamedWire#31", "path": [ { "x": 180.0, @@ -879,7 +792,7 @@ "compName": "dff4_finewe#0", "pinName": "C" }, - "name": "unnamedWire#37", + "name": "unnamedWire#32", "path": [ { "x": 55.0, @@ -900,7 +813,7 @@ "compName": "dff4_finewe#0", "pinName": "_WE1" }, - "name": "unnamedWire#38", + "name": "unnamedWire#33", "path": [ { "x": 200.0, @@ -925,7 +838,7 @@ "compName": "_submodelinterface", "pinName": "_EN" }, - "name": "unnamedWire#39", + "name": "unnamedWire#34", "path": [ { "x": 170.0, @@ -950,7 +863,7 @@ "compName": "dff4_finewe#0", "pinName": "_WE3" }, - "name": "unnamedWire#40", + "name": "unnamedWire#35", "path": [ { "x": 100.0, @@ -966,18 +879,6 @@ } ] }, - { - "pin1": { - "compName": "dff4_finewe#0", - "pinName": "D4" - }, - "pin2": { - "compName": "mux1_4_sb#1", - "pinName": "Y1" - }, - "name": "unnamedWire#41", - "path": [] - }, { "pin1": { "compName": "xor#0", @@ -987,44 +888,23 @@ "compName": "dff4_finewe#0", "pinName": "D3" }, - "name": "unnamedWire#42", + "name": "unnamedWire#36", "path": [ { - "x": 170.0, - "y": 110.0 + "x": 210.0, + "y": 135.0 }, { - "x": 170.0, - "y": 90.0 - } - ] - }, - { - "pin1": { - "compName": "dff4_finewe#0", - "pinName": "D2" - }, - "pin2": { - "compName": "mux1_4_sb#1", - "pinName": "Y3" - }, - "name": "unnamedWire#43", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4_sb#1", - "pinName": "Y4" - }, - "name": "unnamedWire#44", - "path": [ + "x": 210.0, + "y": 125.0 + }, { - "x": 115.0, - "y": 110.0 + "x": 175.0, + "y": 125.0 + }, + { + "x": 175.0, + "y": 90.0 } ] }, @@ -1037,11 +917,19 @@ "compName": "dff4_finewe#0", "pinName": "D1" }, - "name": "unnamedWire#45", + "name": "unnamedWire#37", "path": [ + { + "x": 220.0, + "y": 170.0 + }, + { + "x": 220.0, + "y": 120.0 + }, { "x": 180.0, - "y": 145.0 + "y": 120.0 }, { "x": 180.0, @@ -1058,7 +946,7 @@ "compName": "NandGate#2", "pinName": "A" }, - "name": "unnamedWire#46", + "name": "unnamedWire#38", "path": [] }, { @@ -1070,32 +958,11 @@ "compName": "NandGate#2", "pinName": "B" }, - "name": "unnamedWire#47", - "path": [ - { - "x": 115.0, - "y": 145.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O3" - }, - "pin2": { - "compName": "mux1_4_sb#0", - "pinName": "I0_1" - }, - "name": "unnamedWire#48", + "name": "unnamedWire#39", "path": [ { - "x": 20.0, - "y": 135.0 - }, - { - "x": 20.0, - "y": 140.0 + "x": 160.0, + "y": 170.0 } ] }