X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2FAm2900.json;h=b1c31270f47d75a7cf626af698a0571fc661422d;hb=314420475e3daefa7ab0bf68c765820f2d866bb4;hp=b8eb665f436fd64081399e7b51fcdfb6c6c518e3;hpb=356a1650802ad3270a541656bd26935d83b717f9;p=Mograsim.git

diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
index b8eb665f..b1c31270 100644
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
@@ -120,40 +120,28 @@
         "id": "FixedOutput",
         "name": "FixedOutput#0",
         "pos": {
-          "x": 540.0,
+          "x": 555.0,
           "y": 270.0
         },
-        "params": {
-          "bits": [
-            "ZERO"
-          ]
-        }
+        "params": "0"
       },
       {
         "id": "FixedOutput",
         "name": "FixedOutput#1",
         "pos": {
-          "x": 635.0,
-          "y": 380.0
+          "x": 645.0,
+          "y": 390.0
         },
-        "params": {
-          "bits": [
-            "ZERO"
-          ]
-        }
+        "params": "0"
       },
       {
         "id": "FixedOutput",
         "name": "FixedOutput#2",
         "pos": {
-          "x": 370.0,
-          "y": 505.0
+          "x": 385.0,
+          "y": 510.0
         },
-        "params": {
-          "bits": [
-            "ONE"
-          ]
-        }
+        "params": "1"
       },
       {
         "id": "FixedOutput",
@@ -162,63 +150,43 @@
           "x": 455.0,
           "y": 560.0
         },
-        "params": {
-          "bits": [
-            "ONE"
-          ]
-        }
+        "params": "1"
       },
       {
         "id": "FixedOutput",
         "name": "FixedOutput#4",
         "pos": {
-          "x": 420.0,
+          "x": 430.0,
           "y": 570.0
         },
-        "params": {
-          "bits": [
-            "ZERO"
-          ]
-        }
+        "params": "0"
       },
       {
         "id": "FixedOutput",
         "name": "FixedOutput#5",
         "pos": {
-          "x": 475.0,
-          "y": 505.0
+          "x": 485.0,
+          "y": 510.0
         },
-        "params": {
-          "bits": [
-            "ZERO"
-          ]
-        }
+        "params": "0"
       },
       {
         "id": "FixedOutput",
         "name": "FixedOutput#6",
         "pos": {
-          "x": 535.0,
-          "y": 370.0
+          "x": 545.0,
+          "y": 380.0
         },
-        "params": {
-          "bits": [
-            "ZERO"
-          ]
-        }
+        "params": "0"
       },
       {
         "id": "FixedOutput",
         "name": "FixedOutput#7",
         "pos": {
-          "x": 260.0,
-          "y": 370.0
+          "x": 270.0,
+          "y": 380.0
         },
-        "params": {
-          "bits": [
-            "ZERO"
-          ]
-        }
+        "params": "0"
       },
       {
         "id": "NandGate",
@@ -1348,13 +1316,12 @@
         }
       },
       {
-        "id": "inc",
-        "name": "inc#0",
+        "id": "inc16",
+        "name": "inc16#0",
         "pos": {
-          "x": 315.0,
-          "y": 135.0
-        },
-        "params": 16
+          "x": 335.0,
+          "y": 115.0
+        }
       },
       {
         "id": "mux1_4",
@@ -2173,7 +2140,7 @@
         "path": [
           {
             "x": 660.0,
-            "y": 390.0
+            "y": 395.0
           }
         ]
       },
@@ -2201,12 +2168,12 @@
         "name": "unnamedWire#37",
         "path": [
           {
-            "x": 480.0,
+            "x": 470.0,
             "y": 540.0
           },
           {
-            "x": 480.0,
-            "y": 570.0
+            "x": 470.0,
+            "y": 565.0
           }
         ]
       },
@@ -2223,7 +2190,7 @@
         "path": [
           {
             "x": 445.0,
-            "y": 580.0
+            "y": 575.0
           }
         ]
       },
@@ -2252,7 +2219,7 @@
         "path": [
           {
             "x": 560.0,
-            "y": 380.0
+            "y": 385.0
           }
         ]
       },
@@ -2430,7 +2397,7 @@
         "path": [
           {
             "x": 570.0,
-            "y": 280.0
+            "y": 275.0
           }
         ]
       },
@@ -3610,7 +3577,7 @@
       },
       {
         "pin1": {
-          "compName": "inc#0",
+          "compName": "inc16#0",
           "pinName": "Y"
         },
         "pin2": {
@@ -3618,16 +3585,11 @@
           "pinName": "D"
         },
         "name": "unnamedWire#128",
-        "path": [
-          {
-            "x": 335.0,
-            "y": 130.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
-          "compName": "inc#0",
+          "compName": "inc16#0",
           "pinName": "A"
         },
         "pin2": {
@@ -3637,14 +3599,18 @@
         "name": "unnamedWire#129",
         "path": [
           {
-            "x": 335.0,
+            "x": 315.0,
+            "y": 130.0
+          },
+          {
+            "x": 315.0,
             "y": 160.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "inc#0",
+          "compName": "inc16#0",
           "pinName": "CI"
         },
         "pin2": {
@@ -3654,9 +3620,17 @@
         "name": "unnamedWire#130",
         "path": [
           {
-            "x": 360.0,
+            "x": 330.0,
             "y": 145.0
           },
+          {
+            "x": 330.0,
+            "y": 160.0
+          },
+          {
+            "x": 360.0,
+            "y": 160.0
+          },
           {
             "x": 360.0,
             "y": 175.0
@@ -3705,7 +3679,7 @@
         "path": [
           {
             "x": 285.0,
-            "y": 380.0
+            "y": 385.0
           }
         ]
       },