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 1e0b915..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
@@ -127,7 +127,7 @@
         "id": "Am2910SP",
         "name": "Am2910SP#0",
         "pos": {
-          "x": 240.0,
+          "x": 245.0,
           "y": 10.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,16 +481,16 @@
         "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": 70.0,
-            "y": 75.0
+            "y": 80.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": {
@@ -767,12 +787,8 @@
             "y": 85.0
           },
           {
-            "x": 25.0,
+            "x": 35.0,
             "y": 85.0
-          },
-          {
-            "x": 25.0,
-            "y": 95.0
           }
         ]
       },
@@ -874,8 +890,8 @@
         "name": "unnamedWire#35",
         "path": [
           {
-            "x": 235.0,
-            "y": 115.0
+            "x": 240.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
           }
         ]
       }