From d953262602b4b7771472a14b0fb8fbb3cc5faaf0 Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Wed, 11 Sep 2019 15:43:02 +0200 Subject: [PATCH] Changed BZ to 16 bit --- .../logic/model/am2900/components/Am2900.json | 54 +- .../model/am2900/components/dff16_we.json | 1468 +++++++++++++++++ .../am2900/standardComponentIDMapping.json | 1 + 3 files changed, 1490 insertions(+), 33 deletions(-) create mode 100644 net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_we.json diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json index 81891382..27be7090 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json @@ -376,10 +376,10 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#14", "pos": { - "x": 354.0, - "y": 504.0 + "x": 355.0, + "y": 510.0 }, - "params": 12 + "params": 16 }, { "id": "WireCrossPoint", @@ -477,14 +477,6 @@ "y": 526.0 } }, - { - "id": "dff12_we", - "name": "dff12_we#0", - "pos": { - "x": 290.0, - "y": 485.0 - } - }, { "id": "dff16_invwe", "name": "dff16_invwe#0", @@ -493,6 +485,14 @@ "y": 106.0 } }, + { + "id": "dff16_we", + "name": "dff16_we#1", + "pos": { + "x": 290.0, + "y": 485.0 + } + }, { "id": "inc", "name": "inc#0", @@ -500,11 +500,11 @@ "x": 245.0, "y": 525.0 }, - "params": 12 + "params": 16 }, { - "id": "mux1_12", - "name": "mux1_12#0", + "id": "mux1_16", + "name": "mux1_16#0", "pos": { "x": 170.0, "y": 495.0 @@ -918,7 +918,7 @@ "pinName": "Y" }, "pin2": { - "compName": "dff12_we#0", + "compName": "dff16_we#1", "pinName": "WE" }, "name": "unnamedWire#127", @@ -930,7 +930,7 @@ "pinName": "Y" }, "pin2": { - "compName": "dff12_we#0", + "compName": "dff16_we#1", "pinName": "D" }, "name": "unnamedWire#128", @@ -942,7 +942,7 @@ "pinName": "A" }, "pin2": { - "compName": "mux1_12#0", + "compName": "mux1_16#0", "pinName": "Y" }, "name": "unnamedWire#129", @@ -1010,7 +1010,7 @@ }, { "pin1": { - "compName": "mux1_12#0", + "compName": "mux1_16#0", "pinName": "I1" }, "pin2": { @@ -1022,7 +1022,7 @@ }, { "pin1": { - "compName": "mux1_12#0", + "compName": "mux1_16#0", "pinName": "S" }, "pin2": { @@ -1046,26 +1046,14 @@ }, { "pin1": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "name": "unnamedWire#137", - "path": [] - }, - { - "pin1": { - "compName": "dff12_we#0", + "compName": "dff16_we#1", "pinName": "Q" }, "pin2": { "compName": "WireCrossPoint#14", "pinName": "" }, - "name": "unnamedWire#138", + "name": "unnamedWire#137", "path": [] }, { diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_we.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_we.json new file mode 100644 index 00000000..bbc264b6 --- /dev/null +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_we.json @@ -0,0 +1,1468 @@ +{ + "width": 60.0, + "height": 60.0, + "interfacePins": [ + { + "location": { + "x": 0.0, + "y": 5.0 + }, + "name": "C", + "logicWidth": 1, + "usage": "INPUT" + }, + { + "location": { + "x": 0.0, + "y": 35.0 + }, + "name": "D", + "logicWidth": 16, + "usage": "INPUT" + }, + { + "location": { + "x": 60.0, + "y": 25.0 + }, + "name": "Q", + "logicWidth": 16, + "usage": "TRISTATE" + }, + { + "location": { + "x": 0.0, + "y": 20.0 + }, + "name": "WE", + "logicWidth": 1, + "usage": "INPUT" + } + ], + "innerScale": 0.2, + "submodel": { + "components": [ + { + "id": "Merger", + "name": "Merger#0", + "pos": { + "x": 275.0, + "y": 50.0 + }, + "params": 16 + }, + { + "id": "Splitter", + "name": "Splitter#0", + "pos": { + "x": 75.0, + "y": 70.0 + }, + "params": 16 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#0", + "pos": { + "x": 134.0, + "y": 19.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#1", + "pos": { + "x": 134.0, + "y": 49.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#10", + "pos": { + "x": 184.0, + "y": 119.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#11", + "pos": { + "x": 184.0, + "y": 209.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#12", + "pos": { + "x": 184.0, + "y": 89.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#13", + "pos": { + "x": 184.0, + "y": 149.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#14", + "pos": { + "x": 184.0, + "y": 179.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#2", + "pos": { + "x": 134.0, + "y": 79.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#3", + "pos": { + "x": 134.0, + "y": 109.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#4", + "pos": { + "x": 134.0, + "y": 169.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#5", + "pos": { + "x": 134.0, + "y": 199.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#6", + "pos": { + "x": 134.0, + "y": 139.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#7", + "pos": { + "x": 289.0, + "y": 124.0 + }, + "params": 16 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#8", + "pos": { + "x": 184.0, + "y": 59.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#9", + "pos": { + "x": 184.0, + "y": 29.0 + }, + "params": 1 + }, + { + "id": "dff", + "name": "dff#0", + "pos": { + "x": 140.0, + "y": 15.0 + } + }, + { + "id": "dff", + "name": "dff#1", + "pos": { + "x": 190.0, + "y": 25.0 + } + }, + { + "id": "dff", + "name": "dff#10", + "pos": { + "x": 190.0, + "y": 235.0 + } + }, + { + "id": "dff", + "name": "dff#11", + "pos": { + "x": 140.0, + "y": 225.0 + } + }, + { + "id": "dff", + "name": "dff#12", + "pos": { + "x": 140.0, + "y": 195.0 + } + }, + { + "id": "dff", + "name": "dff#13", + "pos": { + "x": 190.0, + "y": 145.0 + } + }, + { + "id": "dff", + "name": "dff#14", + "pos": { + "x": 190.0, + "y": 175.0 + } + }, + { + "id": "dff", + "name": "dff#15", + "pos": { + "x": 140.0, + "y": 165.0 + } + }, + { + "id": "dff", + "name": "dff#2", + "pos": { + "x": 190.0, + "y": 55.0 + } + }, + { + "id": "dff", + "name": "dff#3", + "pos": { + "x": 140.0, + "y": 45.0 + } + }, + { + "id": "dff", + "name": "dff#4", + "pos": { + "x": 190.0, + "y": 85.0 + } + }, + { + "id": "dff", + "name": "dff#5", + "pos": { + "x": 190.0, + "y": 115.0 + } + }, + { + "id": "dff", + "name": "dff#6", + "pos": { + "x": 140.0, + "y": 75.0 + } + }, + { + "id": "dff", + "name": "dff#7", + "pos": { + "x": 140.0, + "y": 105.0 + } + }, + { + "id": "dff", + "name": "dff#8", + "pos": { + "x": 140.0, + "y": 135.0 + } + }, + { + "id": "dff", + "name": "dff#9", + "pos": { + "x": 190.0, + "y": 205.0 + } + }, + { + "id": "mux1_16", + "name": "mux1_16#0", + "pos": { + "x": 15.0, + "y": 95.0 + } + } + ], + "wires": [ + { + "pin1": { + "compName": "Splitter#0", + "pinName": "O15" + }, + "pin2": { + "compName": "dff#0", + "pinName": "D" + }, + "name": "unnamedWire#0", + "path": [ + { + "x": 90.0, + "y": 70.0 + }, + { + "x": 90.0, + "y": 30.0 + } + ] + }, + { + "pin1": { + "compName": "dff#1", + "pinName": "D" + }, + "pin2": { + "compName": "Splitter#0", + "pinName": "O14" + }, + "name": "unnamedWire#1", + "path": [ + { + "x": 95.0, + "y": 40.0 + }, + { + "x": 95.0, + "y": 80.0 + } + ] + }, + { + "pin1": { + "compName": "dff#15", + "pinName": "D" + }, + "pin2": { + "compName": "Splitter#0", + "pinName": "O5" + }, + "name": "unnamedWire#10", + "path": [ + { + "x": 120.0, + "y": 180.0 + }, + { + "x": 120.0, + "y": 170.0 + } + ] + }, + { + "pin1": { + "compName": "Splitter#0", + "pinName": "O4" + }, + "pin2": { + "compName": "dff#14", + "pinName": "D" + }, + "name": "unnamedWire#11", + "path": [ + { + "x": 115.0, + "y": 180.0 + }, + { + "x": 115.0, + "y": 190.0 + } + ] + }, + { + "pin1": { + "compName": "dff#12", + "pinName": "D" + }, + "pin2": { + "compName": "Splitter#0", + "pinName": "O3" + }, + "name": "unnamedWire#12", + "path": [ + { + "x": 110.0, + "y": 210.0 + }, + { + "x": 110.0, + "y": 190.0 + } + ] + }, + { + "pin1": { + "compName": "Splitter#0", + "pinName": "O2" + }, + "pin2": { + "compName": "dff#9", + "pinName": "D" + }, + "name": "unnamedWire#13", + "path": [ + { + "x": 105.0, + "y": 200.0 + }, + { + "x": 105.0, + "y": 220.0 + } + ] + }, + { + "pin1": { + "compName": "dff#11", + "pinName": "D" + }, + "pin2": { + "compName": "Splitter#0", + "pinName": "O1" + }, + "name": "unnamedWire#14", + "path": [ + { + "x": 100.0, + "y": 240.0 + }, + { + "x": 100.0, + "y": 210.0 + } + ] + }, + { + "pin1": { + "compName": "Splitter#0", + "pinName": "O0" + }, + "pin2": { + "compName": "dff#10", + "pinName": "D" + }, + "name": "unnamedWire#15", + "path": [ + { + "x": 95.0, + "y": 220.0 + }, + { + "x": 95.0, + "y": 250.0 + } + ] + }, + { + "pin1": { + "compName": "mux1_16#0", + "pinName": "Y" + }, + "pin2": { + "compName": "Splitter#0", + "pinName": "I" + }, + "name": "unnamedWire#16", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#0", + "pinName": "" + }, + "pin2": { + "compName": "dff#0", + "pinName": "C" + }, + "name": "unnamedWire#17", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#0", + "pinName": "" + }, + "pin2": { + "compName": "WireCrossPoint#1", + "pinName": "" + }, + "name": "unnamedWire#18", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#1", + "pinName": "" + }, + "pin2": { + "compName": "dff#3", + "pinName": "C" + }, + "name": "unnamedWire#19", + "path": [] + }, + { + "pin1": { + "compName": "Splitter#0", + "pinName": "O13" + }, + "pin2": { + "compName": "dff#3", + "pinName": "D" + }, + "name": "unnamedWire#2", + "path": [ + { + "x": 100.0, + "y": 90.0 + }, + { + "x": 100.0, + "y": 60.0 + } + ] + }, + { + "pin1": { + "compName": "WireCrossPoint#1", + "pinName": "" + }, + "pin2": { + "compName": "WireCrossPoint#2", + "pinName": "" + }, + "name": "unnamedWire#20", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#2", + "pinName": "" + }, + "pin2": { + "compName": "dff#6", + "pinName": "C" + }, + "name": "unnamedWire#21", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#2", + "pinName": "" + }, + "pin2": { + "compName": "WireCrossPoint#3", + "pinName": "" + }, + "name": "unnamedWire#22", + "path": [] + }, + { + "pin1": { + "compName": "dff#7", + "pinName": "C" + }, + "pin2": { + "compName": "WireCrossPoint#3", + "pinName": "" + }, + "name": "unnamedWire#23", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#3", + "pinName": "" + }, + "pin2": { + "compName": "WireCrossPoint#6", + "pinName": "" + }, + "name": "unnamedWire#24", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#6", + "pinName": "" + }, + "pin2": { + "compName": "dff#8", + "pinName": "C" + }, + "name": "unnamedWire#25", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#6", + "pinName": "" + }, + "pin2": { + "compName": "WireCrossPoint#4", + "pinName": "" + }, + "name": "unnamedWire#26", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#4", + "pinName": "" + }, + "pin2": { + "compName": "dff#15", + "pinName": "C" + }, + "name": "unnamedWire#27", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#4", + "pinName": "" + }, + "pin2": { + "compName": "WireCrossPoint#5", + "pinName": "" + }, + "name": "unnamedWire#28", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#5", + "pinName": "" + }, + "pin2": { + "compName": "dff#12", + "pinName": "C" + }, + "name": "unnamedWire#29", + "path": [] + }, + { + "pin1": { + "compName": "dff#2", + "pinName": "D" + }, + "pin2": { + "compName": "Splitter#0", + "pinName": "O12" + }, + "name": "unnamedWire#3", + "path": [ + { + "x": 105.0, + "y": 70.0 + }, + { + "x": 105.0, + "y": 100.0 + } + ] + }, + { + "pin1": { + "compName": "WireCrossPoint#5", + "pinName": "" + }, + "pin2": { + "compName": "dff#11", + "pinName": "C" + }, + "name": "unnamedWire#30", + "path": [ + { + "x": 135.0, + "y": 230.0 + } + ] + }, + { + "pin1": { + "compName": "dff#10", + "pinName": "C" + }, + "pin2": { + "compName": "WireCrossPoint#11", + "pinName": "" + }, + "name": "unnamedWire#31", + "path": [ + { + "x": 185.0, + "y": 240.0 + } + ] + }, + { + "pin1": { + "compName": "WireCrossPoint#11", + "pinName": "" + }, + "pin2": { + "compName": "dff#9", + "pinName": "C" + }, + "name": "unnamedWire#32", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#11", + "pinName": "" + }, + "pin2": { + "compName": "WireCrossPoint#14", + "pinName": "" + }, + "name": "unnamedWire#33", + "path": [] + }, + { + "pin1": { + "compName": "dff#14", + "pinName": "C" + }, + "pin2": { + "compName": "WireCrossPoint#14", + "pinName": "" + }, + "name": "unnamedWire#34", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#13", + "pinName": "" + }, + "pin2": { + "compName": "WireCrossPoint#14", + "pinName": "" + }, + "name": "unnamedWire#35", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#13", + "pinName": "" + }, + "pin2": { + "compName": "dff#13", + "pinName": "C" + }, + "name": "unnamedWire#36", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#13", + "pinName": "" + }, + "pin2": { + "compName": "WireCrossPoint#10", + "pinName": "" + }, + "name": "unnamedWire#37", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#10", + "pinName": "" + }, + "pin2": { + "compName": "dff#5", + "pinName": "C" + }, + "name": "unnamedWire#38", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#12", + "pinName": "" + }, + "pin2": { + "compName": "WireCrossPoint#10", + "pinName": "" + }, + "name": "unnamedWire#39", + "path": [] + }, + { + "pin1": { + "compName": "Splitter#0", + "pinName": "O11" + }, + "pin2": { + "compName": "dff#6", + "pinName": "D" + }, + "name": "unnamedWire#4", + "path": [ + { + "x": 110.0, + "y": 110.0 + }, + { + "x": 110.0, + "y": 90.0 + } + ] + }, + { + "pin1": { + "compName": "WireCrossPoint#12", + "pinName": "" + }, + "pin2": { + "compName": "dff#4", + "pinName": "C" + }, + "name": "unnamedWire#40", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#12", + "pinName": "" + }, + "pin2": { + "compName": "WireCrossPoint#8", + "pinName": "" + }, + "name": "unnamedWire#41", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#8", + "pinName": "" + }, + "pin2": { + "compName": "dff#2", + "pinName": "C" + }, + "name": "unnamedWire#42", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#8", + "pinName": "" + }, + "pin2": { + "compName": "WireCrossPoint#9", + "pinName": "" + }, + "name": "unnamedWire#43", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#9", + "pinName": "" + }, + "pin2": { + "compName": "dff#1", + "pinName": "C" + }, + "name": "unnamedWire#44", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#0", + "pinName": "" + }, + "pin2": { + "compName": "WireCrossPoint#9", + "pinName": "" + }, + "name": "unnamedWire#45", + "path": [ + { + "x": 135.0, + "y": 10.0 + }, + { + "x": 185.0, + "y": 10.0 + } + ] + }, + { + "pin1": { + "compName": "_submodelinterface", + "pinName": "WE" + }, + "pin2": { + "compName": "mux1_16#0", + "pinName": "S" + }, + "name": "unnamedWire#47", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#0", + "pinName": "" + }, + "pin2": { + "compName": "_submodelinterface", + "pinName": "C" + }, + "name": "unnamedWire#48", + "path": [ + { + "x": 35.0, + "y": 20.0 + }, + { + "x": 35.0, + "y": 25.0 + } + ] + }, + { + "pin1": { + "compName": "Merger#0", + "pinName": "I15" + }, + "pin2": { + "compName": "dff#0", + "pinName": "Q" + }, + "name": "unnamedWire#49", + "path": [ + { + "x": 265.0, + "y": 50.0 + }, + { + "x": 265.0, + "y": 20.0 + } + ] + }, + { + "pin1": { + "compName": "dff#4", + "pinName": "D" + }, + "pin2": { + "compName": "Splitter#0", + "pinName": "O10" + }, + "name": "unnamedWire#5", + "path": [ + { + "x": 115.0, + "y": 100.0 + }, + { + "x": 115.0, + "y": 120.0 + } + ] + }, + { + "pin1": { + "compName": "dff#1", + "pinName": "Q" + }, + "pin2": { + "compName": "Merger#0", + "pinName": "I14" + }, + "name": "unnamedWire#50", + "path": [ + { + "x": 260.0, + "y": 30.0 + }, + { + "x": 260.0, + "y": 60.0 + } + ] + }, + { + "pin1": { + "compName": "Merger#0", + "pinName": "I13" + }, + "pin2": { + "compName": "dff#3", + "pinName": "Q" + }, + "name": "unnamedWire#51", + "path": [ + { + "x": 255.0, + "y": 70.0 + }, + { + "x": 255.0, + "y": 50.0 + } + ] + }, + { + "pin1": { + "compName": "Merger#0", + "pinName": "I12" + }, + "pin2": { + "compName": "dff#2", + "pinName": "Q" + }, + "name": "unnamedWire#52", + "path": [ + { + "x": 250.0, + "y": 80.0 + }, + { + "x": 250.0, + "y": 60.0 + } + ] + }, + { + "pin1": { + "compName": "Merger#0", + "pinName": "I11" + }, + "pin2": { + "compName": "dff#6", + "pinName": "Q" + }, + "name": "unnamedWire#53", + "path": [ + { + "x": 245.0, + "y": 90.0 + }, + { + "x": 245.0, + "y": 80.0 + } + ] + }, + { + "pin1": { + "compName": "dff#4", + "pinName": "Q" + }, + "pin2": { + "compName": "Merger#0", + "pinName": "I10" + }, + "name": "unnamedWire#54", + "path": [ + { + "x": 240.0, + "y": 90.0 + }, + { + "x": 240.0, + "y": 100.0 + } + ] + }, + { + "pin1": { + "compName": "Merger#0", + "pinName": "I9" + }, + "pin2": { + "compName": "dff#7", + "pinName": "Q" + }, + "name": "unnamedWire#55", + "path": [] + }, + { + "pin1": { + "compName": "dff#5", + "pinName": "Q" + }, + "pin2": { + "compName": "Merger#0", + "pinName": "I8" + }, + "name": "unnamedWire#56", + "path": [] + }, + { + "pin1": { + "compName": "Merger#0", + "pinName": "I7" + }, + "pin2": { + "compName": "dff#8", + "pinName": "Q" + }, + "name": "unnamedWire#57", + "path": [ + { + "x": 235.0, + "y": 130.0 + }, + { + "x": 235.0, + "y": 140.0 + } + ] + }, + { + "pin1": { + "compName": "dff#13", + "pinName": "Q" + }, + "pin2": { + "compName": "Merger#0", + "pinName": "I6" + }, + "name": "unnamedWire#58", + "path": [ + { + "x": 240.0, + "y": 150.0 + }, + { + "x": 240.0, + "y": 140.0 + } + ] + }, + { + "pin1": { + "compName": "Merger#0", + "pinName": "I5" + }, + "pin2": { + "compName": "dff#15", + "pinName": "Q" + }, + "name": "unnamedWire#59", + "path": [ + { + "x": 245.0, + "y": 150.0 + }, + { + "x": 245.0, + "y": 170.0 + } + ] + }, + { + "pin1": { + "compName": "dff#7", + "pinName": "D" + }, + "pin2": { + "compName": "Splitter#0", + "pinName": "O9" + }, + "name": "unnamedWire#6", + "path": [ + { + "x": 120.0, + "y": 120.0 + }, + { + "x": 120.0, + "y": 130.0 + } + ] + }, + { + "pin1": { + "compName": "Merger#0", + "pinName": "I4" + }, + "pin2": { + "compName": "dff#14", + "pinName": "Q" + }, + "name": "unnamedWire#60", + "path": [ + { + "x": 250.0, + "y": 160.0 + }, + { + "x": 250.0, + "y": 180.0 + } + ] + }, + { + "pin1": { + "compName": "Merger#0", + "pinName": "I3" + }, + "pin2": { + "compName": "dff#12", + "pinName": "Q" + }, + "name": "unnamedWire#61", + "path": [ + { + "x": 255.0, + "y": 170.0 + }, + { + "x": 255.0, + "y": 200.0 + } + ] + }, + { + "pin1": { + "compName": "dff#9", + "pinName": "Q" + }, + "pin2": { + "compName": "Merger#0", + "pinName": "I2" + }, + "name": "unnamedWire#62", + "path": [ + { + "x": 260.0, + "y": 210.0 + }, + { + "x": 260.0, + "y": 180.0 + } + ] + }, + { + "pin1": { + "compName": "Merger#0", + "pinName": "I1" + }, + "pin2": { + "compName": "dff#11", + "pinName": "Q" + }, + "name": "unnamedWire#63", + "path": [ + { + "x": 265.0, + "y": 190.0 + }, + { + "x": 265.0, + "y": 230.0 + } + ] + }, + { + "pin1": { + "compName": "dff#10", + "pinName": "Q" + }, + "pin2": { + "compName": "Merger#0", + "pinName": "I0" + }, + "name": "unnamedWire#64", + "path": [ + { + "x": 270.0, + "y": 240.0 + }, + { + "x": 270.0, + "y": 200.0 + } + ] + }, + { + "pin1": { + "compName": "Merger#0", + "pinName": "O" + }, + "pin2": { + "compName": "WireCrossPoint#7", + "pinName": "" + }, + "name": "unnamedWire#65", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#7", + "pinName": "" + }, + "pin2": { + "compName": "_submodelinterface", + "pinName": "Q" + }, + "name": "unnamedWire#66", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#7", + "pinName": "" + }, + "pin2": { + "compName": "mux1_16#0", + "pinName": "I0" + }, + "name": "unnamedWire#67", + "path": [ + { + "x": 290.0, + "y": 275.0 + }, + { + "x": 10.0, + "y": 275.0 + }, + { + "x": 10.0, + "y": 120.0 + } + ] + }, + { + "pin1": { + "compName": "_submodelinterface", + "pinName": "D" + }, + "pin2": { + "compName": "mux1_16#0", + "pinName": "I1" + }, + "name": "unnamedWire#68", + "path": [ + { + "x": 5.0, + "y": 175.0 + }, + { + "x": 5.0, + "y": 185.0 + } + ] + }, + { + "pin1": { + "compName": "Splitter#0", + "pinName": "O8" + }, + "pin2": { + "compName": "dff#5", + "pinName": "D" + }, + "name": "unnamedWire#7", + "path": [ + { + "x": 125.0, + "y": 140.0 + }, + { + "x": 125.0, + "y": 130.0 + } + ] + }, + { + "pin1": { + "compName": "dff#8", + "pinName": "D" + }, + "pin2": { + "compName": "Splitter#0", + "pinName": "O7" + }, + "name": "unnamedWire#8", + "path": [] + }, + { + "pin1": { + "compName": "Splitter#0", + "pinName": "O6" + }, + "pin2": { + "compName": "dff#13", + "pinName": "D" + }, + "name": "unnamedWire#9", + "path": [] + } + ], + "version": "0.1.1" + }, + "symbolRendererSnippetID": "simpleRectangularLike", + "symbolRendererParams": { + "centerText": "D flip flop\n16 bit", + "centerTextHeight": 5.0, + "horizontalComponentCenter": 30.0, + "pinLabelHeight": 3.5, + "pinLabelMargin": 0.5 + }, + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "default", + "version": "0.1.5" +} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/standardComponentIDMapping.json b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/standardComponentIDMapping.json index 02f9aacf..4ecaf4a2 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/standardComponentIDMapping.json +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/standardComponentIDMapping.json @@ -32,6 +32,7 @@ mograsim version: 0.1.3 "demux2": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/demux2.json", "dff": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dff.json", "dff12_we": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dff12_we.json", + "dff16_we": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dff16_we.json", "dff16_invwe": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dff16_invwe.json", "dff4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dff4.json", "dff4_invwe": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dff4_invwe.json", -- 2.17.1