X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fcomponents%2Fam2910%2FGUIAm2910.json;h=ae71c6d03715e264962fe8c7de3f9bbcd1531689;hb=fc5d2fbd1251cd3977976164390803b449e2342f;hp=b3ea0fb268a13ebd38e235dc4755f537e8fa0535;hpb=49cf2916316777983f240841fc2f76c9139f7961;p=Mograsim.git

diff --git a/net.mograsim.logic.model.am2900/components/am2910/GUIAm2910.json b/net.mograsim.logic.model.am2900/components/am2910/GUIAm2910.json
index b3ea0fb2..ae71c6d0 100644
--- a/net.mograsim.logic.model.am2900/components/am2910/GUIAm2910.json
+++ b/net.mograsim.logic.model.am2900/components/am2910/GUIAm2910.json
@@ -107,7 +107,7 @@ mograsim version: 0.1.3
         "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate",
         "name": "GUINandGate#1",
         "pos": {
-          "x": 20.0,
+          "x": 10.0,
           "y": 210.0
         },
         "params": 1
@@ -124,8 +124,8 @@ mograsim version: 0.1.3
         "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate",
         "name": "GUINandGate#0",
         "pos": {
-          "x": 50.0,
-          "y": 195.0
+          "x": 40.0,
+          "y": 185.0
         },
         "params": 1
       },
@@ -186,7 +186,7 @@ mograsim version: 0.1.3
         "name": "WireCrossPoint#2",
         "pos": {
           "x": 189.0,
-          "y": 224.0
+          "y": 274.0
         },
         "params": 12
       },
@@ -194,7 +194,7 @@ mograsim version: 0.1.3
         "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
         "name": "WireCrossPoint#5",
         "pos": {
-          "x": 9.0,
+          "x": 4.0,
           "y": 219.0
         },
         "params": 1
@@ -245,8 +245,8 @@ mograsim version: 0.1.3
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.am2900.components.GUImux4_12",
-        "name": "GUImux4_12#0",
+        "id": "class:net.mograsim.logic.model.am2900.components.GUIsel4_12",
+        "name": "GUIsel4_12#0",
         "pos": {
           "x": 150.0,
           "y": 175.0
@@ -274,7 +274,7 @@ mograsim version: 0.1.3
         "name": "GUIAm2910InstrPLA#0",
         "pos": {
           "x": 80.0,
-          "y": 200.0
+          "y": 155.0
         }
       },
       {
@@ -447,7 +447,7 @@ mograsim version: 0.1.3
           },
           {
             "x": 70.0,
-            "y": 220.0
+            "y": 175.0
           }
         ]
       },
@@ -574,20 +574,11 @@ mograsim version: 0.1.3
           "pinName": "YR"
         },
         "pin2": {
-          "compName": "GUImux4_12#0",
+          "compName": "GUIsel4_12#0",
           "pinName": "SB"
         },
         "name": "unnamedWire#1",
-        "path": [
-          {
-            "x": 130.0,
-            "y": 235.0
-          },
-          {
-            "x": 130.0,
-            "y": 190.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
@@ -607,20 +598,11 @@ mograsim version: 0.1.3
           "pinName": "YD"
         },
         "pin2": {
-          "compName": "GUImux4_12#0",
+          "compName": "GUIsel4_12#0",
           "pinName": "SA"
         },
         "name": "unnamedWire#0",
-        "path": [
-          {
-            "x": 125.0,
-            "y": 225.0
-          },
-          {
-            "x": 125.0,
-            "y": 180.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
@@ -689,20 +671,11 @@ mograsim version: 0.1.3
           "pinName": "YmuPC"
         },
         "pin2": {
-          "compName": "GUImux4_12#0",
+          "compName": "GUIsel4_12#0",
           "pinName": "SD"
         },
         "name": "unnamedWire#3",
-        "path": [
-          {
-            "x": 140.0,
-            "y": 255.0
-          },
-          {
-            "x": 140.0,
-            "y": 210.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
@@ -717,7 +690,7 @@ mograsim version: 0.1.3
         "path": [
           {
             "x": 120.0,
-            "y": 215.0
+            "y": 170.0
           },
           {
             "x": 120.0,
@@ -731,20 +704,11 @@ mograsim version: 0.1.3
           "pinName": "YF"
         },
         "pin2": {
-          "compName": "GUImux4_12#0",
+          "compName": "GUIsel4_12#0",
           "pinName": "SC"
         },
         "name": "unnamedWire#2",
-        "path": [
-          {
-            "x": 135.0,
-            "y": 245.0
-          },
-          {
-            "x": 135.0,
-            "y": 200.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
@@ -759,7 +723,7 @@ mograsim version: 0.1.3
         "path": [
           {
             "x": 115.0,
-            "y": 205.0
+            "y": 160.0
           },
           {
             "x": 115.0,
@@ -780,7 +744,7 @@ mograsim version: 0.1.3
         "path": [
           {
             "x": 290.0,
-            "y": 275.0
+            "y": 230.0
           },
           {
             "x": 290.0,
@@ -801,7 +765,7 @@ mograsim version: 0.1.3
         "path": [
           {
             "x": 295.0,
-            "y": 265.0
+            "y": 220.0
           }
         ]
       },
@@ -847,13 +811,13 @@ mograsim version: 0.1.3
         "path": [
           {
             "x": 325.0,
-            "y": 225.0
+            "y": 275.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "GUImux4_12#0",
+          "compName": "GUIsel4_12#0",
           "pinName": "Y"
         },
         "pin2": {
@@ -869,7 +833,7 @@ mograsim version: 0.1.3
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "GUImux4_12#0",
+          "compName": "GUIsel4_12#0",
           "pinName": "C"
         },
         "name": "unnamedWire#19",
@@ -886,7 +850,7 @@ mograsim version: 0.1.3
           "pinName": ""
         },
         "pin2": {
-          "compName": "GUImux4_12#0",
+          "compName": "GUIsel4_12#0",
           "pinName": "B"
         },
         "name": "unnamedWire#21",
@@ -898,7 +862,7 @@ mograsim version: 0.1.3
           "pinName": ""
         },
         "pin2": {
-          "compName": "GUImux4_12#0",
+          "compName": "GUIsel4_12#0",
           "pinName": "D"
         },
         "name": "unnamedWire#20",
@@ -939,7 +903,7 @@ mograsim version: 0.1.3
           "pinName": ""
         },
         "pin2": {
-          "compName": "GUImux4_12#0",
+          "compName": "GUIsel4_12#0",
           "pinName": "A"
         },
         "name": "unnamedWire#25",
@@ -1004,16 +968,7 @@ mograsim version: 0.1.3
           "pinName": "A"
         },
         "name": "unnamedWire#29",
-        "path": [
-          {
-            "x": 45.0,
-            "y": 190.0
-          },
-          {
-            "x": 45.0,
-            "y": 200.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
@@ -1025,7 +980,16 @@ mograsim version: 0.1.3
           "pinName": "PASS"
         },
         "name": "unnamedWire#28",
-        "path": []
+        "path": [
+          {
+            "x": 65.0,
+            "y": 195.0
+          },
+          {
+            "x": 65.0,
+            "y": 160.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1051,7 +1015,7 @@ mograsim version: 0.1.3
         "name": "unnamedWire#32",
         "path": [
           {
-            "x": 10.0,
+            "x": 5.0,
             "y": 225.0
           }
         ]
@@ -1068,7 +1032,7 @@ mograsim version: 0.1.3
         "name": "unnamedWire#31",
         "path": [
           {
-            "x": 10.0,
+            "x": 5.0,
             "y": 215.0
           }
         ]
@@ -1097,12 +1061,12 @@ mograsim version: 0.1.3
         "name": "unnamedWire#33",
         "path": [
           {
-            "x": 45.0,
+            "x": 35.0,
             "y": 220.0
           },
           {
-            "x": 45.0,
-            "y": 210.0
+            "x": 35.0,
+            "y": 200.0
           }
         ]
       }