From 1e84d778315446625629e67f19028532b4acd074 Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Thu, 8 Oct 2020 16:51:11 +0200 Subject: [PATCH] Cleaned Am290DestDecode --- .../am2900/components/am2901/Am2901.json | 120 +++++----- .../components/am2901/Am2901DestDecode.json | 210 +++++++++--------- 2 files changed, 163 insertions(+), 167 deletions(-) diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json index b3e633d4..df8e1587 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json @@ -403,6 +403,18 @@ "orientation": "RIGHT" } }, + { + "id": "Splitter", + "name": "Splitter#19", + "pos": { + "x": 840.0, + "y": 760.0 + }, + "params": { + "logicWidth": 3, + "orientation": "RIGHT" + } + }, { "id": "TriStateBuffer", "name": "TriStateBuffer#0", @@ -761,32 +773,15 @@ "wires": [ { "pin1": { - "compName": "Splitter#0", - "pinName": "O6" + "compName": "Splitter#19", + "pinName": "O0" }, "pin2": { - "compName": "Am2901DestDecode#0", - "pinName": "I6" + "compName": "Splitter#0", + "pinName": "O6" }, "name": "unnamedWire#0", - "path": [ - { - "x": 845.0, - "y": 780.0 - }, - { - "x": 845.0, - "y": 305.0 - }, - { - "x": 375.0, - "y": 305.0 - }, - { - "x": 375.0, - "y": 185.0 - } - ] + "path": [] }, { "pin1": { @@ -1017,31 +1012,14 @@ { "pin1": { "compName": "Splitter#0", - "pinName": "O8" + "pinName": "O7" }, "pin2": { - "compName": "Am2901DestDecode#0", - "pinName": "I8" + "compName": "Splitter#19", + "pinName": "O1" }, "name": "unnamedWire#15", - "path": [ - { - "x": 835.0, - "y": 760.0 - }, - { - "x": 835.0, - "y": 315.0 - }, - { - "x": 365.0, - "y": 315.0 - }, - { - "x": 365.0, - "y": 165.0 - } - ] + "path": [] }, { "pin1": { @@ -2034,32 +2012,15 @@ }, { "pin1": { - "compName": "Splitter#0", - "pinName": "O7" + "compName": "Splitter#19", + "pinName": "O2" }, "pin2": { - "compName": "Am2901DestDecode#0", - "pinName": "I7" + "compName": "Splitter#0", + "pinName": "O8" }, "name": "unnamedWire#77", - "path": [ - { - "x": 840.0, - "y": 770.0 - }, - { - "x": 840.0, - "y": 310.0 - }, - { - "x": 370.0, - "y": 310.0 - }, - { - "x": 370.0, - "y": 175.0 - } - ] + "path": [] }, { "pin1": { @@ -3454,6 +3415,35 @@ }, "name": "unnamedWire#165", "path": [] + }, + { + "pin1": { + "compName": "Splitter#19", + "pinName": "I" + }, + "pin2": { + "compName": "Am2901DestDecode#0", + "pinName": "I" + }, + "name": "unnamedWire#166", + "path": [ + { + "x": 835.0, + "y": 770.0 + }, + { + "x": 835.0, + "y": 330.0 + }, + { + "x": 375.0, + "y": 330.0 + }, + { + "x": 375.0, + "y": 175.0 + } + ] } ], "version": "0.1.1" diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901DestDecode.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901DestDecode.json index c23fb79a..1a7b414d 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901DestDecode.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901DestDecode.json @@ -1,37 +1,19 @@ { - "width": 35.0, + "width": 40.0, "height": 60.0, "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "I6", - "logicWidth": 1, - "usage": "INPUT" - }, { "location": { "x": 0.0, "y": 15.0 }, - "name": "I7", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "I8", - "logicWidth": 1, + "name": "I", + "logicWidth": 3, "usage": "INPUT" }, { "location": { - "x": 35.0, + "x": 40.0, "y": 45.0 }, "name": "LSH", @@ -40,7 +22,7 @@ }, { "location": { - "x": 35.0, + "x": 40.0, "y": 5.0 }, "name": "NSH", @@ -49,7 +31,7 @@ }, { "location": { - "x": 35.0, + "x": 40.0, "y": 55.0 }, "name": "QWE", @@ -58,7 +40,7 @@ }, { "location": { - "x": 35.0, + "x": 40.0, "y": 25.0 }, "name": "RAMWE", @@ -67,7 +49,7 @@ }, { "location": { - "x": 35.0, + "x": 40.0, "y": 15.0 }, "name": "RSH", @@ -76,7 +58,7 @@ }, { "location": { - "x": 35.0, + "x": 40.0, "y": 35.0 }, "name": "YF", @@ -91,7 +73,7 @@ "id": "NandGate", "name": "NandGate#0", "pos": { - "x": 15.0, + "x": 35.0, "y": 10.0 }, "params": 1 @@ -100,7 +82,7 @@ "id": "NandGate", "name": "NandGate#1", "pos": { - "x": 15.0, + "x": 35.0, "y": 50.0 }, "params": 1 @@ -109,7 +91,7 @@ "id": "NandGate", "name": "NandGate#2", "pos": { - "x": 15.0, + "x": 35.0, "y": 90.0 }, "params": 1 @@ -118,7 +100,7 @@ "id": "NandGate", "name": "NandGate#3", "pos": { - "x": 15.0, + "x": 35.0, "y": 150.0 }, "params": 1 @@ -127,7 +109,7 @@ "id": "NandGate", "name": "NandGate#4", "pos": { - "x": 50.0, + "x": 70.0, "y": 10.0 }, "params": 1 @@ -136,7 +118,7 @@ "id": "NandGate", "name": "NandGate#5", "pos": { - "x": 50.0, + "x": 70.0, "y": 50.0 }, "params": 1 @@ -145,7 +127,7 @@ "id": "NandGate", "name": "NandGate#6", "pos": { - "x": 50.0, + "x": 70.0, "y": 90.0 }, "params": 1 @@ -154,7 +136,7 @@ "id": "NandGate", "name": "NandGate#7", "pos": { - "x": 50.0, + "x": 70.0, "y": 130.0 }, "params": 1 @@ -163,7 +145,7 @@ "id": "NandGate", "name": "NandGate#8", "pos": { - "x": 80.0, + "x": 100.0, "y": 10.0 }, "params": 1 @@ -172,7 +154,7 @@ "id": "NandGate", "name": "NandGate#9", "pos": { - "x": 80.0, + "x": 100.0, "y": 90.0 }, "params": 1 @@ -181,7 +163,7 @@ "id": "NandGate", "name": "NandGate#10", "pos": { - "x": 80.0, + "x": 100.0, "y": 145.0 }, "params": 1 @@ -190,7 +172,7 @@ "id": "NandGate", "name": "NandGate#11", "pos": { - "x": 110.0, + "x": 130.0, "y": 105.0 }, "params": 1 @@ -199,17 +181,29 @@ "id": "NandGate", "name": "NandGate#12", "pos": { - "x": 115.0, + "x": 135.0, "y": 210.0 }, "params": 1 }, + { + "id": "Splitter", + "name": "Splitter#0", + "pos": { + "x": 5.0, + "y": 50.0 + }, + "params": { + "logicWidth": 3, + "orientation": "RIGHT" + } + }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", "pos": { - "x": 4.0, - "y": 19.0 + "x": 19.0, + "y": 24.0 }, "params": 1 }, @@ -217,7 +211,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#1", "pos": { - "x": 4.0, + "x": 19.0, "y": 14.0 }, "params": 1 @@ -226,8 +220,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#2", "pos": { - "x": 4.0, - "y": 24.0 + "x": 19.0, + "y": 49.0 }, "params": 1 }, @@ -235,7 +229,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#3", "pos": { - "x": 9.0, + "x": 24.0, "y": 59.0 }, "params": 1 @@ -244,7 +238,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#4", "pos": { - "x": 9.0, + "x": 24.0, "y": 64.0 }, "params": 1 @@ -253,7 +247,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#5", "pos": { - "x": 9.0, + "x": 24.0, "y": 104.0 }, "params": 1 @@ -262,7 +256,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#6", "pos": { - "x": 4.0, + "x": 29.0, "y": 154.0 }, "params": 1 @@ -271,7 +265,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#7", "pos": { - "x": 39.0, + "x": 59.0, "y": 59.0 }, "params": 1 @@ -280,7 +274,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#8", "pos": { - "x": 44.0, + "x": 64.0, "y": 19.0 }, "params": 1 @@ -289,7 +283,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#9", "pos": { - "x": 44.0, + "x": 64.0, "y": 54.0 }, "params": 1 @@ -298,7 +292,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#10", "pos": { - "x": 39.0, + "x": 59.0, "y": 134.0 }, "params": 1 @@ -307,7 +301,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#11", "pos": { - "x": 74.0, + "x": 94.0, "y": 19.0 }, "params": 1 @@ -316,7 +310,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#12", "pos": { - "x": 74.0, + "x": 94.0, "y": 99.0 }, "params": 1 @@ -325,7 +319,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#13", "pos": { - "x": 74.0, + "x": 94.0, "y": 104.0 }, "params": 1 @@ -334,7 +328,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#14", "pos": { - "x": 74.0, + "x": 94.0, "y": 159.0 }, "params": 1 @@ -343,7 +337,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#15", "pos": { - "x": 109.0, + "x": 129.0, "y": 214.0 }, "params": 1 @@ -352,11 +346,11 @@ "wires": [ { "pin1": { - "compName": "_submodelinterface", - "pinName": "I8" + "compName": "Splitter#0", + "pinName": "O2" }, "pin2": { - "compName": "WireCrossPoint#0", + "compName": "WireCrossPoint#2", "pinName": "" }, "name": "unnamedWire#0", @@ -400,7 +394,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#2", + "compName": "WireCrossPoint#0", "pinName": "" }, "pin2": { @@ -412,8 +406,8 @@ }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "I7" + "compName": "Splitter#0", + "pinName": "O1" }, "pin2": { "compName": "WireCrossPoint#3", @@ -434,7 +428,7 @@ "name": "unnamedWire#6", "path": [ { - "x": 10.0, + "x": 25.0, "y": 55.0 } ] @@ -499,25 +493,25 @@ "name": "unnamedWire#11", "path": [ { - "x": 5.0, + "x": 20.0, "y": 95.0 } ] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "I6" - }, - "pin2": { "compName": "WireCrossPoint#6", "pinName": "" }, + "pin2": { + "compName": "Splitter#0", + "pinName": "O0" + }, "name": "unnamedWire#12", "path": [ { - "x": 5.0, - "y": 100.0 + "x": 30.0, + "y": 70.0 } ] }, @@ -545,7 +539,7 @@ "name": "unnamedWire#14", "path": [ { - "x": 5.0, + "x": 30.0, "y": 165.0 } ] @@ -562,15 +556,15 @@ "name": "unnamedWire#15", "path": [ { - "x": 5.0, + "x": 20.0, "y": 5.0 }, { - "x": 40.0, + "x": 60.0, "y": 5.0 }, { - "x": 40.0, + "x": 60.0, "y": 15.0 } ] @@ -599,7 +593,7 @@ "name": "unnamedWire#17", "path": [ { - "x": 40.0, + "x": 60.0, "y": 25.0 } ] @@ -616,7 +610,7 @@ "name": "unnamedWire#18", "path": [ { - "x": 40.0, + "x": 60.0, "y": 65.0 } ] @@ -645,15 +639,15 @@ "name": "unnamedWire#20", "path": [ { - "x": 45.0, + "x": 65.0, "y": 5.0 }, { - "x": 135.0, + "x": 155.0, "y": 5.0 }, { - "x": 135.0, + "x": 155.0, "y": 20.0 } ] @@ -694,7 +688,7 @@ "name": "unnamedWire#23", "path": [ { - "x": 45.0, + "x": 65.0, "y": 95.0 } ] @@ -711,15 +705,15 @@ "name": "unnamedWire#24", "path": [ { - "x": 10.0, + "x": 25.0, "y": 115.0 }, { - "x": 45.0, + "x": 65.0, "y": 115.0 }, { - "x": 45.0, + "x": 65.0, "y": 105.0 } ] @@ -736,7 +730,7 @@ "name": "unnamedWire#25", "path": [ { - "x": 40.0, + "x": 60.0, "y": 100.0 } ] @@ -765,7 +759,7 @@ "name": "unnamedWire#27", "path": [ { - "x": 40.0, + "x": 60.0, "y": 145.0 } ] @@ -794,7 +788,7 @@ "name": "unnamedWire#29", "path": [ { - "x": 75.0, + "x": 95.0, "y": 15.0 } ] @@ -811,7 +805,7 @@ "name": "unnamedWire#30", "path": [ { - "x": 75.0, + "x": 95.0, "y": 25.0 } ] @@ -828,11 +822,11 @@ "name": "unnamedWire#31", "path": [ { - "x": 125.0, + "x": 145.0, "y": 60.0 }, { - "x": 125.0, + "x": 145.0, "y": 100.0 } ] @@ -861,7 +855,7 @@ "name": "unnamedWire#33", "path": [ { - "x": 75.0, + "x": 95.0, "y": 95.0 } ] @@ -902,11 +896,11 @@ "name": "unnamedWire#36", "path": [ { - "x": 125.0, + "x": 145.0, "y": 140.0 }, { - "x": 125.0, + "x": 145.0, "y": 180.0 } ] @@ -923,7 +917,7 @@ "name": "unnamedWire#37", "path": [ { - "x": 75.0, + "x": 95.0, "y": 150.0 } ] @@ -964,11 +958,11 @@ "name": "unnamedWire#40", "path": [ { - "x": 130.0, + "x": 150.0, "y": 20.0 }, { - "x": 130.0, + "x": 150.0, "y": 60.0 } ] @@ -996,15 +990,15 @@ "name": "unnamedWire#42", "path": [ { - "x": 75.0, + "x": 95.0, "y": 170.0 }, { - "x": 105.0, + "x": 125.0, "y": 170.0 }, { - "x": 105.0, + "x": 125.0, "y": 120.0 } ] @@ -1021,7 +1015,7 @@ "name": "unnamedWire#43", "path": [ { - "x": 110.0, + "x": 130.0, "y": 155.0 } ] @@ -1050,7 +1044,7 @@ "name": "unnamedWire#45", "path": [ { - "x": 110.0, + "x": 130.0, "y": 225.0 } ] @@ -1077,6 +1071,18 @@ }, "name": "unnamedWire#47", "path": [] + }, + { + "pin1": { + "compName": "_submodelinterface", + "pinName": "I" + }, + "pin2": { + "compName": "Splitter#0", + "pinName": "I" + }, + "name": "unnamedWire#48", + "path": [] } ], "version": "0.1.1" -- 2.17.1