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=0519d7f0deb1f4d0694b015a15b827c30e2f8bba;hb=b50ebaed27cd6a86e79a637259c7798f7a6186fd;hp=222d6674c540d2a582dd8db31acf7acd01a8c799;hpb=5c03a4fa605a1c3946eddece3b566b5aa0677759;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 222d6674..0519d7f0 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 @@ -127,7 +127,7 @@ "id": "Am2910SP", "name": "Am2910SP#0", "pos": { - "x": 240.0, + "x": 245.0, "y": 10.0 } }, @@ -143,7 +143,7 @@ "id": "Am2910InstrPLA", "name": "Am2910InstrPLA#0", "pos": { - "x": 70.0, + "x": 30.0, "y": 90.0 } }, @@ -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, @@ -190,7 +190,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#0", "pos": { - "x": 259.0, + "x": 264.0, "y": 99.0 }, "params": 12 @@ -199,7 +199,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#1", "pos": { - "x": 224.0, + "x": 229.0, "y": 59.0 }, "params": 1 @@ -209,7 +209,7 @@ "name": "WireCrossPoint#2", "pos": { "x": 174.0, - "y": 174.0 + "y": 179.0 }, "params": 12 }, @@ -244,7 +244,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#6", "pos": { - "x": 234.0, + "x": 239.0, "y": 34.0 }, "params": 1 @@ -262,7 +262,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#8", "pos": { - "x": 234.0, + "x": 239.0, "y": 69.0 }, "params": 1 @@ -272,7 +272,7 @@ "name": "WireCrossPoint#9", "pos": { "x": 199.0, - "y": 209.0 + "y": 214.0 }, "params": 1 }, @@ -280,32 +280,31 @@ "id": "dff12", "name": "dff12#0", "pos": { - "x": 240.0, + "x": 245.0, "y": 105.0 } }, { - "id": "inc", - "name": "inc#0", + "id": "inc12", + "name": "inc12#0", "pos": { - "x": 240.0, - "y": 140.0 - }, - "params": 12 + "x": 255.0, + "y": 165.0 + } }, { "id": "nor12", "name": "nor12#0", "pos": { "x": 175.0, - "y": 50.0 + "y": 45.0 } }, { "id": "ram5_12", "name": "ram5_12#0", "pos": { - "x": 240.0, + "x": 245.0, "y": 55.0 } }, @@ -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": { @@ -456,36 +481,36 @@ "name": "unnamedWire#10", "path": [ { - "x": 215.0, + "x": 225.0, "y": 60.0 }, { - "x": 215.0, - "y": 75.0 + "x": 225.0, + "y": 80.0 }, { - "x": 85.0, - "y": 75.0 + "x": 70.0, + "y": 80.0 } ] }, { "pin1": { "compName": "Am2910InstrPLA#0", - "pinName": "RWE" + "pinName": "RLD" }, "pin2": { "compName": "Am2910RegCntr#0", - "pinName": "WE" + "pinName": "LD" }, "name": "unnamedWire#11", "path": [ { - "x": 105.0, + "x": 115.0, "y": 95.0 }, { - "x": 105.0, + "x": 115.0, "y": 35.0 } ] @@ -502,11 +527,11 @@ "name": "unnamedWire#12", "path": [ { - "x": 110.0, + "x": 120.0, "y": 105.0 }, { - "x": 110.0, + "x": 120.0, "y": 45.0 } ] @@ -523,7 +548,7 @@ "name": "unnamedWire#13", "path": [ { - "x": 225.0, + "x": 230.0, "y": 155.0 } ] @@ -540,11 +565,11 @@ "name": "unnamedWire#14", "path": [ { - "x": 230.0, + "x": 235.0, "y": 165.0 }, { - "x": 230.0, + "x": 235.0, "y": 25.0 } ] @@ -561,7 +586,7 @@ "name": "unnamedWire#15", "path": [ { - "x": 225.0, + "x": 230.0, "y": 15.0 } ] @@ -596,16 +621,11 @@ "pinName": "" }, "pin2": { - "compName": "inc#0", + "compName": "inc12#0", "pinName": "A" }, "name": "unnamedWire#18", - "path": [ - { - "x": 260.0, - "y": 175.0 - } - ] + "path": [] }, { "pin1": { @@ -764,6 +784,14 @@ }, { "x": 65.0, + "y": 85.0 + }, + { + "x": 25.0, + "y": 85.0 + }, + { + "x": 25.0, "y": 95.0 } ] @@ -866,8 +894,8 @@ "name": "unnamedWire#35", "path": [ { - "x": 235.0, - "y": 115.0 + "x": 240.0, + "y": 110.0 } ] }, @@ -933,7 +961,7 @@ }, { "pin1": { - "compName": "inc#0", + "compName": "inc12#0", "pinName": "CI" }, "pin2": { @@ -941,7 +969,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": { @@ -955,7 +1000,7 @@ "name": "unnamedWire#42", "path": [ { - "x": 75.0, + "x": 45.0, "y": 180.0 }, { @@ -976,7 +1021,7 @@ "name": "unnamedWire#43", "path": [ { - "x": 85.0, + "x": 55.0, "y": 185.0 }, { @@ -997,12 +1042,12 @@ "name": "unnamedWire#44", "path": [ { - "x": 95.0, - "y": 190.0 + "x": 65.0, + "y": 180.0 }, { "x": 100.0, - "y": 190.0 + "y": 180.0 } ] }, @@ -1018,11 +1063,11 @@ "name": "unnamedWire#45", "path": [ { - "x": 35.0, + "x": 25.0, "y": 125.0 }, { - "x": 35.0, + "x": 25.0, "y": 110.0 } ] @@ -1088,7 +1133,7 @@ "path": [ { "x": 200.0, - "y": 200.0 + "y": 205.0 } ] }, @@ -1105,11 +1150,11 @@ "path": [ { "x": 230.0, - "y": 190.0 + "y": 195.0 }, { "x": 230.0, - "y": 205.0 + "y": 210.0 } ] }