X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui.am2900%2Fcomponents%2FGUIand.json;h=0687592aaacce4135a4af1d1040935b4cee89741;hb=0e490475fa05c2f05ec875165fc6e38e543d6d65;hp=2ea368358a10c5a60232d7c396d3f6f41663a77d;hpb=78c6c20a637ade903ee41b9e557bde0c30c08218;p=Mograsim.git

diff --git a/net.mograsim.logic.ui.am2900/components/GUIand.json b/net.mograsim.logic.ui.am2900/components/GUIand.json
index 2ea36835..0687592a 100644
--- a/net.mograsim.logic.ui.am2900/components/GUIand.json
+++ b/net.mograsim.logic.ui.am2900/components/GUIand.json
@@ -1,7 +1,5 @@
-mograsim version: 0.1.2
+mograsim version: 0.1.3
 {
-  "type": "SimpleRectangularSubmodelComponent",
-  "name": "GUIand",
   "width": 35.0,
   "height": 20.0,
   "interfacePins": [
@@ -30,7 +28,7 @@ mograsim version: 0.1.2
       "logicWidth": 1
     }
   ],
-  "composition": {
+  "submodel": {
     "innerScale": 0.4,
     "subComps": [
       {
@@ -38,30 +36,24 @@ mograsim version: 0.1.2
           "x": 20.0,
           "y": 15.0
         },
-        "name": "GUINandGate",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "GUINandGate",
+        "params": 1
       },
       {
         "pos": {
           "x": 50.0,
           "y": 15.0
         },
-        "name": "GUINandGate",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "GUINandGate",
+        "params": 1
       },
       {
         "pos": {
           "x": 44.0,
           "y": 24.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "params": 1
       }
     ],
     "innerWires": [
@@ -139,16 +131,5 @@ mograsim version: 0.1.2
         }
       }
     ]
-  },
-  "specialized": {
-    "input_count": [
-      "A",
-      "B"
-    ],
-    "label": "GUIand",
-    "logic_width": 1,
-    "output_count": [
-      "Y"
-    ]
   }
 }
\ No newline at end of file