X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fcomponents%2Fam2910%2FGUIAm2910.json;h=e410f3b4c7b68ec7a40a66857ee3154a167963d8;hb=4c9a2240352c246c76a056687a2d68208137b667;hp=e236c042c3eddbd916fd89c4c5f5df81bbd77103;hpb=4f042bf2baac8c68087cd554eb188efaf544a1ba;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 e236c042..e410f3b4 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
@@ -104,7 +112,7 @@ mograsim version: 0.1.3
     "innerScale": 0.2,
     "subComps": [
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate",
+        "id": "GUINandGate",
         "name": "GUINandGate#1",
         "pos": {
           "x": 10.0,
@@ -113,7 +121,7 @@ mograsim version: 0.1.3
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.am2900.components.GUIram5_12",
+        "id": "GUIram5_12",
         "name": "GUIram5_12#0",
         "pos": {
           "x": 305.0,
@@ -121,7 +129,7 @@ mograsim version: 0.1.3
         }
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate",
+        "id": "GUINandGate",
         "name": "GUINandGate#0",
         "pos": {
           "x": 40.0,
@@ -130,7 +138,7 @@ mograsim version: 0.1.3
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.am2900.components.GUIdff12",
+        "id": "GUIdff12",
         "name": "GUIdff12#0",
         "pos": {
           "x": 305.0,
@@ -138,7 +146,7 @@ mograsim version: 0.1.3
         }
       },
       {
-        "id": "class:net.mograsim.logic.model.am2900.components.GUIinc12",
+        "id": "GUIinc12",
         "name": "GUIinc12#0",
         "pos": {
           "x": 305.0,
@@ -146,7 +154,7 @@ mograsim version: 0.1.3
         }
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIBitDisplay",
+        "id": "GUIBitDisplay",
         "name": "GUIBitDisplay#3",
         "pos": {
           "x": 265.0,
@@ -155,7 +163,7 @@ mograsim version: 0.1.3
         "params": 12
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#1",
         "pos": {
           "x": 294.0,
@@ -164,7 +172,7 @@ mograsim version: 0.1.3
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
         "pos": {
           "x": 324.0,
@@ -173,7 +181,7 @@ mograsim version: 0.1.3
         "params": 12
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#3",
         "pos": {
           "x": 179.0,
@@ -182,7 +190,7 @@ mograsim version: 0.1.3
         "params": 12
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#2",
         "pos": {
           "x": 189.0,
@@ -191,7 +199,7 @@ mograsim version: 0.1.3
         "params": 12
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#5",
         "pos": {
           "x": 4.0,
@@ -200,7 +208,7 @@ mograsim version: 0.1.3
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#4",
         "pos": {
           "x": 179.0,
@@ -209,7 +217,7 @@ mograsim version: 0.1.3
         "params": 12
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#7",
         "pos": {
           "x": 299.0,
@@ -218,7 +226,19 @@ mograsim version: 0.1.3
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "GUITriStateBuffer",
+        "name": "GUITriStateBuffer#0",
+        "pos": {
+          "x": 180.0,
+          "y": 290.0
+        },
+        "params": {
+          "logicWidth": 12,
+          "orientation": "DOWN_ALT"
+        }
+      },
+      {
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#6",
         "pos": {
           "x": 299.0,
@@ -227,7 +247,7 @@ mograsim version: 0.1.3
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#9",
         "pos": {
           "x": 299.0,
@@ -236,7 +256,7 @@ mograsim version: 0.1.3
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#8",
         "pos": {
           "x": 299.0,
@@ -245,15 +265,7 @@ 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",
+        "id": "GUInor12",
         "name": "GUInor12#0",
         "pos": {
           "x": 190.0,
@@ -261,7 +273,7 @@ mograsim version: 0.1.3
         }
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIBitDisplay",
+        "id": "GUIBitDisplay",
         "name": "GUIBitDisplay#0",
         "pos": {
           "x": 160.0,
@@ -270,7 +282,7 @@ mograsim version: 0.1.3
         "params": 12
       },
       {
-        "id": "class:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910InstrPLA",
+        "id": "GUIAm2910InstrPLA",
         "name": "GUIAm2910InstrPLA#0",
         "pos": {
           "x": 80.0,
@@ -278,7 +290,7 @@ mograsim version: 0.1.3
         }
       },
       {
-        "id": "class:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910SP",
+        "id": "GUIAm2910SP",
         "name": "GUIAm2910SP#0",
         "pos": {
           "x": 305.0,
@@ -286,7 +298,7 @@ mograsim version: 0.1.3
         }
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIBitDisplay",
+        "id": "GUIBitDisplay",
         "name": "GUIBitDisplay#1",
         "pos": {
           "x": 260.0,
@@ -295,7 +307,7 @@ mograsim version: 0.1.3
         "params": 12
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIBitDisplay",
+        "id": "GUIBitDisplay",
         "name": "GUIBitDisplay#2",
         "pos": {
           "x": 345.0,
@@ -304,7 +316,15 @@ mograsim version: 0.1.3
         "params": 12
       },
       {
-        "id": "class:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910RegCntr",
+        "id": "GUIsel4_12",
+        "name": "GUIsel4_12#0",
+        "pos": {
+          "x": 150.0,
+          "y": 175.0
+        }
+      },
+      {
+        "id": "GUIAm2910RegCntr",
         "name": "GUIAm2910RegCntr#0",
         "pos": {
           "x": 160.0,
@@ -574,7 +594,7 @@ mograsim version: 0.1.3
           "pinName": "YR"
         },
         "pin2": {
-          "compName": "GUImux4_12#0",
+          "compName": "GUIsel4_12#0",
           "pinName": "SB"
         },
         "name": "unnamedWire#1",
@@ -598,12 +618,24 @@ mograsim version: 0.1.3
           "pinName": "YD"
         },
         "pin2": {
-          "compName": "GUImux4_12#0",
+          "compName": "GUIsel4_12#0",
           "pinName": "SA"
         },
         "name": "unnamedWire#0",
         "path": []
       },
+      {
+        "pin1": {
+          "compName": "GUITriStateBuffer#0",
+          "pinName": "OUT"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Y"
+        },
+        "name": "unnamedWire#52",
+        "path": []
+      },
       {
         "pin1": {
           "compName": "WireCrossPoint#9",
@@ -665,13 +697,30 @@ mograsim version: 0.1.3
         "name": "unnamedWire#4",
         "path": []
       },
+      {
+        "pin1": {
+          "compName": "GUITriStateBuffer#0",
+          "pinName": "EN"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "_OE"
+        },
+        "name": "unnamedWire#53",
+        "path": [
+          {
+            "x": 245.0,
+            "y": 300.0
+          }
+        ]
+      },
       {
         "pin1": {
           "compName": "GUIAm2910InstrPLA#0",
           "pinName": "YmuPC"
         },
         "pin2": {
-          "compName": "GUImux4_12#0",
+          "compName": "GUIsel4_12#0",
           "pinName": "SD"
         },
         "name": "unnamedWire#3",
@@ -704,7 +753,7 @@ mograsim version: 0.1.3
           "pinName": "YF"
         },
         "pin2": {
-          "compName": "GUImux4_12#0",
+          "compName": "GUIsel4_12#0",
           "pinName": "SC"
         },
         "name": "unnamedWire#2",
@@ -817,7 +866,7 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "GUImux4_12#0",
+          "compName": "GUIsel4_12#0",
           "pinName": "Y"
         },
         "pin2": {
@@ -833,7 +882,7 @@ mograsim version: 0.1.3
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "GUImux4_12#0",
+          "compName": "GUIsel4_12#0",
           "pinName": "C"
         },
         "name": "unnamedWire#19",
@@ -850,7 +899,7 @@ mograsim version: 0.1.3
           "pinName": ""
         },
         "pin2": {
-          "compName": "GUImux4_12#0",
+          "compName": "GUIsel4_12#0",
           "pinName": "B"
         },
         "name": "unnamedWire#21",
@@ -862,7 +911,7 @@ mograsim version: 0.1.3
           "pinName": ""
         },
         "pin2": {
-          "compName": "GUImux4_12#0",
+          "compName": "GUIsel4_12#0",
           "pinName": "D"
         },
         "name": "unnamedWire#20",
@@ -903,7 +952,7 @@ mograsim version: 0.1.3
           "pinName": ""
         },
         "pin2": {
-          "compName": "GUImux4_12#0",
+          "compName": "GUIsel4_12#0",
           "pinName": "A"
         },
         "name": "unnamedWire#25",
@@ -936,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": []
@@ -1072,7 +1121,7 @@ mograsim version: 0.1.3
       }
     ]
   },
-  "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer",
+  "symbolRendererSnippetID": "simpleRectangularLike",
   "symbolRendererParams": {
     "centerText": "Am2910",
     "centerTextHeight": 5.0,
@@ -1080,8 +1129,8 @@ mograsim version: 0.1.3
     "pinLabelHeight": 3.5,
     "pinLabelMargin": 0.5
   },
-  "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer",
-  "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler",
+  "outlineRendererSnippetID": "default",
+  "highLevelStateHandlerSnippetID": "standard",
   "highLevelStateHandlerParams": {
     "subcomponentHighLevelStates": {},
     "atomicHighLevelStates": {}