X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2FAm2900.json;h=27be70904095fe9e890bdfcbf47bed2f6a11e87c;hb=d953262602b4b7771472a14b0fb8fbb3cc5faaf0;hp=61e5e22cda6d02d2be72b9373190062f8c51e1e1;hpb=71639f35873d3b29a4b0f9574025ba9462c656a2;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 61e5e22c..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
@@ -322,7 +322,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
         "pos": {
-          "x": 200.0,
+          "x": 199.0,
           "y": 236.0
         },
         "params": 1
@@ -331,7 +331,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#1",
         "pos": {
-          "x": 400.0,
+          "x": 399.0,
           "y": 231.0
         },
         "params": 1
@@ -340,8 +340,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#10",
         "pos": {
-          "x": 415.0,
-          "y": 220.0
+          "x": 414.0,
+          "y": 219.0
         },
         "params": 4
       },
@@ -349,8 +349,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#11",
         "pos": {
-          "x": 410.0,
-          "y": 225.0
+          "x": 409.0,
+          "y": 224.0
         },
         "params": 4
       },
@@ -359,7 +359,7 @@
         "name": "WireCrossPoint#12",
         "pos": {
           "x": 266.0,
-          "y": 555.0
+          "y": 554.0
         },
         "params": 1
       },
@@ -367,8 +367,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#13",
         "pos": {
-          "x": 245.0,
-          "y": 490.0
+          "x": 244.0,
+          "y": 489.0
         },
         "params": 1
       },
@@ -377,15 +377,15 @@
         "name": "WireCrossPoint#14",
         "pos": {
           "x": 355.0,
-          "y": 505.0
+          "y": 510.0
         },
-        "params": 12
+        "params": 16
       },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#2",
         "pos": {
-          "x": 470.0,
+          "x": 469.0,
           "y": 231.0
         },
         "params": 1
@@ -394,7 +394,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#3",
         "pos": {
-          "x": 535.0,
+          "x": 534.0,
           "y": 231.0
         },
         "params": 1
@@ -403,7 +403,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#4",
         "pos": {
-          "x": 230.0,
+          "x": 229.0,
           "y": 176.0
         },
         "params": 1
@@ -412,7 +412,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#5",
         "pos": {
-          "x": 235.0,
+          "x": 234.0,
           "y": 281.0
         },
         "params": 1
@@ -421,8 +421,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#6",
         "pos": {
-          "x": 525.0,
-          "y": 225.0
+          "x": 524.0,
+          "y": 224.0
         },
         "params": 4
       },
@@ -430,8 +430,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#7",
         "pos": {
-          "x": 530.0,
-          "y": 220.0
+          "x": 529.0,
+          "y": 219.0
         },
         "params": 4
       },
@@ -439,8 +439,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#8",
         "pos": {
-          "x": 465.0,
-          "y": 220.0
+          "x": 464.0,
+          "y": 219.0
         },
         "params": 4
       },
@@ -448,8 +448,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#9",
         "pos": {
-          "x": 460.0,
-          "y": 225.0
+          "x": 459.0,
+          "y": 224.0
         },
         "params": 4
       },
@@ -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": []
       },
       {
@@ -2210,7 +2199,7 @@
   },
   "symbolRendererSnippetID": "simpleRectangularLike",
   "symbolRendererParams": {
-    "centerText": "_rsLatch",
+    "centerText": "Am2900",
     "centerTextHeight": 5.0,
     "horizontalComponentCenter": 17.5,
     "pinLabelHeight": 3.5,