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=9cb5b30c1629cb9027aa9e8e37fe5f32c999e993;hb=92ef68de7afb4f0e7f9c211c8ef297ffc1e9a341;hp=4ad69a192ab0d4483cca1dbe1967f4879fc1adb2;hpb=66ec8ddc6e89cf0a41e8b82b279b241bbdde59f2;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 4ad69a19..9cb5b30c 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,7 +280,7 @@
         "id": "dff12",
         "name": "dff12#0",
         "pos": {
-          "x": 240.0,
+          "x": 245.0,
           "y": 105.0
         }
       },
@@ -288,8 +288,8 @@
         "id": "inc",
         "name": "inc#0",
         "pos": {
-          "x": 240.0,
-          "y": 140.0
+          "x": 245.0,
+          "y": 155.0
         },
         "params": 12
       },
@@ -298,14 +298,14 @@
         "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
         }
       },
@@ -377,19 +377,41 @@
           "pinName": "D"
         },
         "name": "unnamedWire#4",
-        "path": []
+        "path": [
+          {
+            "x": 265.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 +478,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": 85.0,
-            "y": 75.0
+            "x": 70.0,
+            "y": 80.0
           }
         ]
       },
@@ -481,11 +503,11 @@
         "name": "unnamedWire#11",
         "path": [
           {
-            "x": 105.0,
+            "x": 115.0,
             "y": 95.0
           },
           {
-            "x": 105.0,
+            "x": 115.0,
             "y": 35.0
           }
         ]
@@ -502,11 +524,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 +545,7 @@
         "name": "unnamedWire#13",
         "path": [
           {
-            "x": 225.0,
+            "x": 230.0,
             "y": 155.0
           }
         ]
@@ -540,11 +562,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 +583,7 @@
         "name": "unnamedWire#15",
         "path": [
           {
-            "x": 225.0,
+            "x": 230.0,
             "y": 15.0
           }
         ]
@@ -602,8 +624,8 @@
         "name": "unnamedWire#18",
         "path": [
           {
-            "x": 260.0,
-            "y": 175.0
+            "x": 265.0,
+            "y": 180.0
           }
         ]
       },
@@ -764,6 +786,14 @@
           },
           {
             "x": 65.0,
+            "y": 85.0
+          },
+          {
+            "x": 25.0,
+            "y": 85.0
+          },
+          {
+            "x": 25.0,
             "y": 95.0
           }
         ]
@@ -866,8 +896,8 @@
         "name": "unnamedWire#35",
         "path": [
           {
-            "x": 235.0,
-            "y": 115.0
+            "x": 240.0,
+            "y": 110.0
           }
         ]
       },
@@ -941,7 +971,16 @@
           "pinName": "CI"
         },
         "name": "unnamedWire#41",
-        "path": []
+        "path": [
+          {
+            "x": 290.0,
+            "y": 165.0
+          },
+          {
+            "x": 290.0,
+            "y": 150.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -955,7 +994,7 @@
         "name": "unnamedWire#42",
         "path": [
           {
-            "x": 75.0,
+            "x": 45.0,
             "y": 180.0
           },
           {
@@ -976,7 +1015,7 @@
         "name": "unnamedWire#43",
         "path": [
           {
-            "x": 85.0,
+            "x": 55.0,
             "y": 185.0
           },
           {
@@ -997,12 +1036,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 +1057,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 +1127,7 @@
         "path": [
           {
             "x": 200.0,
-            "y": 200.0
+            "y": 205.0
           }
         ]
       },
@@ -1105,11 +1144,11 @@
         "path": [
           {
             "x": 230.0,
-            "y": 190.0
+            "y": 195.0
           },
           {
             "x": 230.0,
-            "y": 205.0
+            "y": 210.0
           }
         ]
       }