X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fcomponents%2Fam2910%2FGUIAm2910.json;h=647afc30d0f0a1ea92d6aba1612ae7f1e52dc7c4;hb=6530cff08253185e542e4d51aa5e62e27ab5089e;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..647afc30 100644
--- a/net.mograsim.logic.model.am2900/components/am2910/GUIAm2910.json
+++ b/net.mograsim.logic.model.am2900/components/am2910/GUIAm2910.json
@@ -1,24 +1,8 @@
 mograsim version: 0.1.3
 {
   "width": 72.0,
-  "height": 61.0,
+  "height": 67.0,
   "interfacePins": [
-    {
-      "location": {
-        "x": 19.0,
-        "y": 61.0
-      },
-      "name": "_MAP",
-      "logicWidth": 1
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 44.0
-      },
-      "name": "_CCEN",
-      "logicWidth": 1
-    },
     {
       "location": {
         "x": 60.0,
@@ -35,14 +19,6 @@ mograsim version: 0.1.3
       "name": "D",
       "logicWidth": 12
     },
-    {
-      "location": {
-        "x": 72.0,
-        "y": 14.0
-      },
-      "name": "_FULL",
-      "logicWidth": 1
-    },
     {
       "location": {
         "x": 72.0,
@@ -67,10 +43,42 @@ mograsim version: 0.1.3
       "name": "I",
       "logicWidth": 4
     },
+    {
+      "location": {
+        "x": 19.0,
+        "y": 67.0
+      },
+      "name": "_MAP",
+      "logicWidth": 1
+    },
+    {
+      "location": {
+        "x": 0.0,
+        "y": 44.0
+      },
+      "name": "_CCEN",
+      "logicWidth": 1
+    },
+    {
+      "location": {
+        "x": 49.0,
+        "y": 67.0
+      },
+      "name": "_OE",
+      "logicWidth": 1
+    },
+    {
+      "location": {
+        "x": 72.0,
+        "y": 14.0
+      },
+      "name": "_FULL",
+      "logicWidth": 1
+    },
     {
       "location": {
         "x": 38.0,
-        "y": 61.0
+        "y": 67.0
       },
       "name": "Y",
       "logicWidth": 12
@@ -78,7 +86,7 @@ mograsim version: 0.1.3
     {
       "location": {
         "x": 13.0,
-        "y": 61.0
+        "y": 67.0
       },
       "name": "_PL",
       "logicWidth": 1
@@ -86,7 +94,7 @@ mograsim version: 0.1.3
     {
       "location": {
         "x": 25.0,
-        "y": 61.0
+        "y": 67.0
       },
       "name": "_VECT",
       "logicWidth": 1
@@ -107,7 +115,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 +132,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 +194,7 @@ mograsim version: 0.1.3
         "name": "WireCrossPoint#2",
         "pos": {
           "x": 189.0,
-          "y": 224.0
+          "y": 274.0
         },
         "params": 12
       },
@@ -194,7 +202,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
@@ -217,6 +225,18 @@ mograsim version: 0.1.3
         },
         "params": 1
       },
+      {
+        "id": "class:net.mograsim.logic.model.model.components.atomic.GUITriStateBuffer",
+        "name": "GUITriStateBuffer#0",
+        "pos": {
+          "x": 180.0,
+          "y": 290.0
+        },
+        "params": {
+          "logicWidth": 12,
+          "orientation": "DOWN_ALT"
+        }
+      },
       {
         "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
         "name": "WireCrossPoint#6",
@@ -244,14 +264,6 @@ mograsim version: 0.1.3
         },
         "params": 1
       },
-      {
-        "id": "class:net.mograsim.logic.model.am2900.components.GUImux4_12",
-        "name": "GUImux4_12#0",
-        "pos": {
-          "x": 150.0,
-          "y": 175.0
-        }
-      },
       {
         "id": "class:net.mograsim.logic.model.am2900.components.GUInor12",
         "name": "GUInor12#0",
@@ -274,7 +286,7 @@ mograsim version: 0.1.3
         "name": "GUIAm2910InstrPLA#0",
         "pos": {
           "x": 80.0,
-          "y": 200.0
+          "y": 155.0
         }
       },
       {
@@ -303,6 +315,14 @@ mograsim version: 0.1.3
         },
         "params": 12
       },
+      {
+        "id": "class:net.mograsim.logic.model.am2900.components.GUIsel4_12",
+        "name": "GUIsel4_12#0",
+        "pos": {
+          "x": 150.0,
+          "y": 175.0
+        }
+      },
       {
         "id": "class:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910RegCntr",
         "name": "GUIAm2910RegCntr#0",
@@ -447,7 +467,7 @@ mograsim version: 0.1.3
           },
           {
             "x": 70.0,
-            "y": 220.0
+            "y": 175.0
           }
         ]
       },
@@ -574,20 +594,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 +618,23 @@ 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": {
+          "compName": "GUITriStateBuffer#0",
+          "pinName": "OUT"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Y"
+        },
+        "name": "unnamedWire#52",
+        "path": []
       },
       {
         "pin1": {
@@ -685,25 +699,33 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "GUIAm2910InstrPLA#0",
-          "pinName": "YmuPC"
+          "compName": "GUITriStateBuffer#0",
+          "pinName": "EN"
         },
         "pin2": {
-          "compName": "GUImux4_12#0",
-          "pinName": "SD"
+          "compName": "_submodelinterface",
+          "pinName": "_OE"
         },
-        "name": "unnamedWire#3",
+        "name": "unnamedWire#53",
         "path": [
           {
-            "x": 140.0,
-            "y": 255.0
-          },
-          {
-            "x": 140.0,
-            "y": 210.0
+            "x": 245.0,
+            "y": 300.0
           }
         ]
       },
+      {
+        "pin1": {
+          "compName": "GUIAm2910InstrPLA#0",
+          "pinName": "YmuPC"
+        },
+        "pin2": {
+          "compName": "GUIsel4_12#0",
+          "pinName": "SD"
+        },
+        "name": "unnamedWire#3",
+        "path": []
+      },
       {
         "pin1": {
           "compName": "GUIAm2910InstrPLA#0",
@@ -717,7 +739,7 @@ mograsim version: 0.1.3
         "path": [
           {
             "x": 120.0,
-            "y": 215.0
+            "y": 170.0
           },
           {
             "x": 120.0,
@@ -731,20 +753,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 +772,7 @@ mograsim version: 0.1.3
         "path": [
           {
             "x": 115.0,
-            "y": 205.0
+            "y": 160.0
           },
           {
             "x": 115.0,
@@ -780,7 +793,7 @@ mograsim version: 0.1.3
         "path": [
           {
             "x": 290.0,
-            "y": 275.0
+            "y": 230.0
           },
           {
             "x": 290.0,
@@ -801,7 +814,7 @@ mograsim version: 0.1.3
         "path": [
           {
             "x": 295.0,
-            "y": 265.0
+            "y": 220.0
           }
         ]
       },
@@ -847,13 +860,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 +882,7 @@ mograsim version: 0.1.3
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "GUImux4_12#0",
+          "compName": "GUIsel4_12#0",
           "pinName": "C"
         },
         "name": "unnamedWire#19",
@@ -886,7 +899,7 @@ mograsim version: 0.1.3
           "pinName": ""
         },
         "pin2": {
-          "compName": "GUImux4_12#0",
+          "compName": "GUIsel4_12#0",
           "pinName": "B"
         },
         "name": "unnamedWire#21",
@@ -898,7 +911,7 @@ mograsim version: 0.1.3
           "pinName": ""
         },
         "pin2": {
-          "compName": "GUImux4_12#0",
+          "compName": "GUIsel4_12#0",
           "pinName": "D"
         },
         "name": "unnamedWire#20",
@@ -939,7 +952,7 @@ mograsim version: 0.1.3
           "pinName": ""
         },
         "pin2": {
-          "compName": "GUImux4_12#0",
+          "compName": "GUIsel4_12#0",
           "pinName": "A"
         },
         "name": "unnamedWire#25",
@@ -972,12 +985,12 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "GUITriStateBuffer#0",
+          "pinName": "IN"
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
         },
         "name": "unnamedWire#27",
         "path": []
@@ -1004,16 +1017,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 +1029,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 +1064,7 @@ mograsim version: 0.1.3
         "name": "unnamedWire#32",
         "path": [
           {
-            "x": 10.0,
+            "x": 5.0,
             "y": 225.0
           }
         ]
@@ -1068,7 +1081,7 @@ mograsim version: 0.1.3
         "name": "unnamedWire#31",
         "path": [
           {
-            "x": 10.0,
+            "x": 5.0,
             "y": 215.0
           }
         ]
@@ -1097,12 +1110,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
           }
         ]
       }