X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fam2910%2FAm2910.json;h=70a7d771a31e8fa9e313e60eb51201aac36d2e10;hb=7a03e04de8a8ee23c12e10ec43e46fb7c77f88f7;hp=a8a587800dff7708e6a223001c0071b9b7158692;hpb=3a0a2ed5e5522243d1f22fbb320c9b3a5e9a217e;p=Mograsim.git diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json index a8a58780..70a7d771 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json @@ -170,7 +170,7 @@ "name": "NandGate#2", "pos": { "x": 205.0, - "y": 195.0 + "y": 200.0 }, "params": 1 }, @@ -179,7 +179,7 @@ "name": "TriStateBuffer#0", "pos": { "x": 165.0, - "y": 180.0 + "y": 185.0 }, "params": { "logicWidth": 12, @@ -209,7 +209,7 @@ "name": "WireCrossPoint#2", "pos": { "x": 174.0, - "y": 174.0 + "y": 179.0 }, "params": 12 }, @@ -272,7 +272,7 @@ "name": "WireCrossPoint#9", "pos": { "x": 199.0, - "y": 209.0 + "y": 214.0 }, "params": 1 }, @@ -285,13 +285,12 @@ } }, { - "id": "inc", - "name": "inc#0", + "id": "inc12", + "name": "inc12#0", "pos": { - "x": 245.0, - "y": 140.0 - }, - "params": 12 + "x": 255.0, + "y": 165.0 + } }, { "id": "nor12", @@ -369,7 +368,7 @@ }, { "pin1": { - "compName": "inc#0", + "compName": "inc12#0", "pinName": "Y" }, "pin2": { @@ -377,19 +376,45 @@ "pinName": "D" }, "name": "unnamedWire#4", - "path": [] + "path": [ + { + "x": 280.0, + "y": 180.0 + }, + { + "x": 280.0, + "y": 150.0 + }, + { + "x": 240.0, + "y": 150.0 + }, + { + "x": 240.0, + "y": 125.0 + } + ] }, { "pin1": { "compName": "dff12#0", - "pinName": "Y" + "pinName": "Q" }, "pin2": { "compName": "WireCrossPoint#0", "pinName": "" }, "name": "unnamedWire#5", - "path": [] + "path": [ + { + "x": 290.0, + "y": 125.0 + }, + { + "x": 290.0, + "y": 100.0 + } + ] }, { "pin1": { @@ -596,16 +621,11 @@ "pinName": "" }, "pin2": { - "compName": "inc#0", + "compName": "inc12#0", "pinName": "A" }, "name": "unnamedWire#18", - "path": [ - { - "x": 265.0, - "y": 175.0 - } - ] + "path": [] }, { "pin1": { @@ -767,12 +787,8 @@ "y": 85.0 }, { - "x": 25.0, + "x": 35.0, "y": 85.0 - }, - { - "x": 25.0, - "y": 95.0 } ] }, @@ -875,7 +891,7 @@ "path": [ { "x": 240.0, - "y": 115.0 + "y": 110.0 } ] }, @@ -941,7 +957,7 @@ }, { "pin1": { - "compName": "inc#0", + "compName": "inc12#0", "pinName": "CI" }, "pin2": { @@ -949,7 +965,24 @@ "pinName": "CI" }, "name": "unnamedWire#41", - "path": [] + "path": [ + { + "x": 250.0, + "y": 170.0 + }, + { + "x": 250.0, + "y": 160.0 + }, + { + "x": 290.0, + "y": 160.0 + }, + { + "x": 290.0, + "y": 150.0 + } + ] }, { "pin1": { @@ -984,7 +1017,7 @@ "name": "unnamedWire#43", "path": [ { - "x": 55.0, + "x": 60.0, "y": 185.0 }, { @@ -1005,7 +1038,7 @@ "name": "unnamedWire#44", "path": [ { - "x": 65.0, + "x": 75.0, "y": 180.0 }, { @@ -1031,7 +1064,7 @@ }, { "x": 25.0, - "y": 110.0 + "y": 95.0 } ] }, @@ -1096,7 +1129,7 @@ "path": [ { "x": 200.0, - "y": 200.0 + "y": 205.0 } ] }, @@ -1113,11 +1146,11 @@ "path": [ { "x": 230.0, - "y": 190.0 + "y": 195.0 }, { "x": 230.0, - "y": 205.0 + "y": 210.0 } ] }