Adjusted Am2910 to new Am2910InstrPLA layout

[Mograsim.git] / plugins / net.mograsim.logic.model.am2900 / components / net / mograsim / logic / model / am2900 / components / am2910 / Am2910.json

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 9cb5b30..70a7d77 100644 (file)
--- 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
@@ -285,13 +285,12 @@
         }
       },
       {
-        "id": "inc",
-        "name": "inc#0",
+        "id": "inc12",
+        "name": "inc12#0",
         "pos": {
-          "x": 245.0,
-          "y": 155.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": {
@@ -379,7 +378,11 @@
         "name": "unnamedWire#4",
         "path": [
           {
-            "x": 265.0,
+            "x": 280.0,
+            "y": 180.0
+          },
+          {
+            "x": 280.0,
             "y": 150.0
           },
           {
@@ -618,16 +621,11 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "inc#0",
+          "compName": "inc12#0",
           "pinName": "A"
         },
         "name": "unnamedWire#18",
-        "path": [
-          {
-            "x": 265.0,
-            "y": 180.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
@@ -789,12 +787,8 @@
             "y": 85.0
           },
           {
-            "x": 25.0,
+            "x": 35.0,
             "y": 85.0
-          },
-          {
-            "x": 25.0,
-            "y": 95.0
           }
         ]
       },
@@ -963,7 +957,7 @@
       },
       {
         "pin1": {
-          "compName": "inc#0",
+          "compName": "inc12#0",
           "pinName": "CI"
         },
         "pin2": {
@@ -972,9 +966,17 @@
         },
         "name": "unnamedWire#41",
         "path": [
+          {
+            "x": 250.0,
+            "y": 170.0
+          },
+          {
+            "x": 250.0,
+            "y": 160.0
+          },
           {
             "x": 290.0,
-            "y": 165.0
+            "y": 160.0
           },
           {
             "x": 290.0,
@@ -1015,7 +1017,7 @@
         "name": "unnamedWire#43",
         "path": [
           {
-            "x": 55.0,
+            "x": 60.0,
             "y": 185.0
           },
           {
@@ -1036,7 +1038,7 @@
         "name": "unnamedWire#44",
         "path": [
           {
-            "x": 65.0,
+            "x": 75.0,
             "y": 180.0
           },
           {
@@ -1062,7 +1064,7 @@
           },
           {
             "x": 25.0,
-            "y": 110.0
+            "y": 95.0
           }
         ]
       },