X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=net.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2FAm2900.json;h=27be70904095fe9e890bdfcbf47bed2f6a11e87c;hb=d953262602b4b7771472a14b0fb8fbb3cc5faaf0;hp=7afc8a7aec221248c387c4d57a8ec927f8e287eb;hpb=da41b8caf9b5b0016ecc029a5988d0b81766ef2c;p=Mograsim.git 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 7afc8a7a..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", @@ -494,16 +486,25 @@ } }, { - "id": "inc12", - "name": "inc12#0", + "id": "dff16_we", + "name": "dff16_we#1", + "pos": { + "x": 290.0, + "y": 485.0 + } + }, + { + "id": "inc", + "name": "inc#0", "pos": { "x": 245.0, "y": 525.0 - } + }, + "params": 16 }, { - "id": "mux1_12", - "name": "mux1_12#0", + "id": "mux1_16", + "name": "mux1_16#0", "pos": { "x": 170.0, "y": 495.0 @@ -917,7 +918,7 @@ "pinName": "Y" }, "pin2": { - "compName": "dff12_we#0", + "compName": "dff16_we#1", "pinName": "WE" }, "name": "unnamedWire#127", @@ -925,11 +926,11 @@ }, { "pin1": { - "compName": "inc12#0", + "compName": "inc#0", "pinName": "Y" }, "pin2": { - "compName": "dff12_we#0", + "compName": "dff16_we#1", "pinName": "D" }, "name": "unnamedWire#128", @@ -937,11 +938,11 @@ }, { "pin1": { - "compName": "inc12#0", + "compName": "inc#0", "pinName": "A" }, "pin2": { - "compName": "mux1_12#0", + "compName": "mux1_16#0", "pinName": "Y" }, "name": "unnamedWire#129", @@ -961,7 +962,7 @@ }, { "pin1": { - "compName": "inc12#0", + "compName": "inc#0", "pinName": "CI" }, "pin2": { @@ -1009,7 +1010,7 @@ }, { "pin1": { - "compName": "mux1_12#0", + "compName": "mux1_16#0", "pinName": "I1" }, "pin2": { @@ -1021,7 +1022,7 @@ }, { "pin1": { - "compName": "mux1_12#0", + "compName": "mux1_16#0", "pinName": "S" }, "pin2": { @@ -1045,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": [] }, {