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=814b575a59afb4d015e93b0a83d5d3fc740d8c1f;hpb=3d193572e38e513ea46006be509d099fdda48495;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 814b575a..e410f3b4 100644
--- a/net.mograsim.logic.model.am2900/components/am2910/GUIAm2910.json
+++ b/net.mograsim.logic.model.am2900/components/am2910/GUIAm2910.json
@@ -1,92 +1,100 @@
 mograsim version: 0.1.3
 {
-  "width": 36.0,
-  "height": 30.5,
+  "width": 72.0,
+  "height": 67.0,
   "interfacePins": [
     {
       "location": {
-        "x": 9.5,
-        "y": 30.5
+        "x": 60.0,
+        "y": 0.0
       },
-      "name": "_MAP",
+      "name": "C",
       "logicWidth": 1
     },
     {
       "location": {
-        "x": 0.0,
-        "y": 22.0
+        "x": 36.0,
+        "y": 0.0
       },
-      "name": "_CCEN",
+      "name": "D",
+      "logicWidth": 12
+    },
+    {
+      "location": {
+        "x": 72.0,
+        "y": 40.0
+      },
+      "name": "CI",
       "logicWidth": 1
     },
     {
       "location": {
-        "x": 30.0,
-        "y": 0.0
+        "x": 0.0,
+        "y": 6.0
       },
-      "name": "C",
+      "name": "_RLD",
       "logicWidth": 1
     },
     {
       "location": {
-        "x": 18.0,
-        "y": 0.0
+        "x": 0.0,
+        "y": 50.0
       },
-      "name": "D",
-      "logicWidth": 12
+      "name": "I",
+      "logicWidth": 4
     },
     {
       "location": {
-        "x": 36.0,
-        "y": 7.0
+        "x": 19.0,
+        "y": 67.0
       },
-      "name": "_FULL",
+      "name": "_MAP",
       "logicWidth": 1
     },
     {
       "location": {
-        "x": 36.0,
-        "y": 20.0
+        "x": 0.0,
+        "y": 44.0
       },
-      "name": "CI",
+      "name": "_CCEN",
       "logicWidth": 1
     },
     {
       "location": {
-        "x": 0.0,
-        "y": 3.0
+        "x": 49.0,
+        "y": 67.0
       },
-      "name": "_RLD",
+      "name": "_OE",
       "logicWidth": 1
     },
     {
       "location": {
-        "x": 0.0,
-        "y": 25.0
+        "x": 72.0,
+        "y": 14.0
       },
-      "name": "I",
-      "logicWidth": 4
+      "name": "_FULL",
+      "logicWidth": 1
     },
     {
       "location": {
-        "x": 19.0,
-        "y": 30.5
+        "x": 38.0,
+        "y": 67.0
       },
       "name": "Y",
       "logicWidth": 12
     },
     {
       "location": {
-        "x": 6.5,
-        "y": 30.5
+        "x": 13.0,
+        "y": 67.0
       },
       "name": "_PL",
       "logicWidth": 1
     },
     {
       "location": {
-        "x": 12.5,
-        "y": 30.5
+        "x": 25.0,
+        "y": 67.0
       },
       "name": "_VECT",
       "logicWidth": 1
@@ -94,26 +102,26 @@ mograsim version: 0.1.3
     {
       "location": {
         "x": 0.0,
-        "y": 19.0
+        "y": 38.0
       },
       "name": "_CC",
       "logicWidth": 1
     }
   ],
   "submodel": {
-    "innerScale": 0.1,
+    "innerScale": 0.2,
     "subComps": [
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate",
+        "id": "GUINandGate",
         "name": "GUINandGate#1",
         "pos": {
-          "x": 20.0,
+          "x": 10.0,
           "y": 210.0
         },
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.am2900.components.GUIram5_12",
+        "id": "GUIram5_12",
         "name": "GUIram5_12#0",
         "pos": {
           "x": 305.0,
@@ -121,16 +129,16 @@ mograsim version: 0.1.3
         }
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate",
+        "id": "GUINandGate",
         "name": "GUINandGate#0",
         "pos": {
-          "x": 50.0,
-          "y": 195.0
+          "x": 40.0,
+          "y": 185.0
         },
         "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,25 +190,25 @@ 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,
-          "y": 224.0
+          "y": 274.0
         },
         "params": 12
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#5",
         "pos": {
-          "x": 9.0,
+          "x": 4.0,
           "y": 219.0
         },
         "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,15 +282,15 @@ 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,
-          "y": 200.0
+          "y": 155.0
         }
       },
       {
-        "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,
@@ -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,27 +1110,27 @@ 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
           }
         ]
       }
     ]
   },
-  "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer",
+  "symbolRendererSnippetID": "simpleRectangularLike",
   "symbolRendererParams": {
-    "centerText": "GUIAm2901",
+    "centerText": "Am2910",
     "centerTextHeight": 5.0,
     "horizontalComponentCenter": 17.5,
     "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": {}