Rebuilt component JSON files

[Mograsim.git] / net.mograsim.logic.ui.am2900 / components / GUIram4.json

diff --git a/net.mograsim.logic.ui.am2900/components/GUIram4.json b/net.mograsim.logic.ui.am2900/components/GUIram4.json
index 605b061..87c2892 100644 (file)
--- a/net.mograsim.logic.ui.am2900/components/GUIram4.json
+++ b/net.mograsim.logic.ui.am2900/components/GUIram4.json
@@ -1,7 +1,5 @@
-mograsim version: 0.1.2
+mograsim version: 0.1.3
 {
-  "type": "SimpleRectangularSubmodelComponent",
-  "name": "GUIram4",
   "width": 35.0,
   "height": 130.0,
   "interfacePins": [
@@ -174,7 +172,7 @@ mograsim version: 0.1.2
       "logicWidth": 1
     }
   ],
-  "composition": {
+  "submodel": {
     "innerScale": 0.1,
     "subComps": [
       {
@@ -182,400 +180,329 @@ mograsim version: 0.1.2
           "x": 55.0,
           "y": 45.0
         },
-        "name": "GUIdemux2",
-        "params": {}
+        "id": "GUIdemux2"
       },
       {
         "pos": {
           "x": 55.0,
           "y": 150.0
         },
-        "name": "GUIdemux2",
-        "params": {}
+        "id": "GUIdemux2"
       },
       {
         "pos": {
           "x": 235.0,
           "y": 150.0
         },
-        "name": "GUIand41",
-        "params": {}
+        "id": "GUIand41"
       },
       {
         "pos": {
           "x": 80.0,
           "y": 330.0
         },
-        "name": "GUIram2",
-        "params": {}
+        "id": "GUIram2"
       },
       {
         "pos": {
           "x": 80.0,
           "y": 480.0
         },
-        "name": "GUIram2",
-        "params": {}
+        "id": "GUIram2"
       },
       {
         "pos": {
           "x": 80.0,
           "y": 630.0
         },
-        "name": "GUIram2",
-        "params": {}
+        "id": "GUIram2"
       },
       {
         "pos": {
           "x": 80.0,
           "y": 780.0
         },
-        "name": "GUIram2",
-        "params": {}
+        "id": "GUIram2"
       },
       {
         "pos": {
           "x": 250.0,
           "y": 375.0
         },
-        "name": "GUIand41",
-        "params": {}
+        "id": "GUIand41"
       },
       {
         "pos": {
           "x": 250.0,
           "y": 485.0
         },
-        "name": "GUIandor414",
-        "params": {}
+        "id": "GUIandor414"
       },
       {
         "pos": {
           "x": 250.0,
           "y": 635.0
         },
-        "name": "GUIandor414",
-        "params": {}
+        "id": "GUIandor414"
       },
       {
         "pos": {
           "x": 250.0,
           "y": 785.0
         },
-        "name": "GUIandor414",
-        "params": {}
+        "id": "GUIandor414"
       },
       {
         "pos": {
           "x": 155.0,
           "y": 325.0
         },
-        "name": "GUIand41",
-        "params": {}
+        "id": "GUIand41"
       },
       {
         "pos": {
           "x": 155.0,
           "y": 435.0
         },
-        "name": "GUIandor414",
-        "params": {}
+        "id": "GUIandor414"
       },
       {
         "pos": {
           "x": 155.0,
           "y": 585.0
         },
-        "name": "GUIandor414",
-        "params": {}
+        "id": "GUIandor414"
       },
       {
         "pos": {
           "x": 155.0,
           "y": 735.0
         },
-        "name": "GUIandor414",
-        "params": {}
+        "id": "GUIandor414"
       },
       {
         "pos": {
           "x": 229.0,
           "y": 154.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "params": 1
       },
       {
         "pos": {
           "x": 224.0,
           "y": 164.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "params": 1
       },
       {
         "pos": {
           "x": 219.0,
           "y": 174.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "params": 1
       },
       {
         "pos": {
           "x": 214.0,
           "y": 184.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "params": 1
       },
       {
         "pos": {
           "x": 59.0,
           "y": 534.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "params": 1
       },
       {
         "pos": {
           "x": 64.0,
           "y": 544.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "params": 1
       },
       {
         "pos": {
           "x": 69.0,
           "y": 554.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "params": 1
       },
       {
         "pos": {
           "x": 74.0,
           "y": 564.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "params": 1
       },
       {
         "pos": {
           "x": 59.0,
           "y": 684.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "params": 1
       },
       {
         "pos": {
           "x": 64.0,
           "y": 694.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "params": 1
       },
       {
         "pos": {
           "x": 69.0,
           "y": 704.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "params": 1
       },
       {
         "pos": {
           "x": 74.0,
           "y": 714.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "params": 1
       },
       {
         "pos": {
           "x": 59.0,
           "y": 834.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "params": 1
       },
       {
         "pos": {
           "x": 64.0,
           "y": 844.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "params": 1
       },
       {
         "pos": {
           "x": 69.0,
           "y": 854.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "params": 1
       },
       {
         "pos": {
           "x": 74.0,
           "y": 864.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "params": 1
       },
       {
         "pos": {
           "x": 39.0,
           "y": 484.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "params": 1
       },
       {
         "pos": {
           "x": 44.0,
           "y": 494.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "params": 1
       },
       {
         "pos": {
           "x": 49.0,
           "y": 504.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "params": 1
       },
       {
         "pos": {
           "x": 54.0,
           "y": 514.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "params": 1
       },
       {
         "pos": {
           "x": 39.0,
           "y": 634.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "params": 1
       },
       {
         "pos": {
           "x": 44.0,
           "y": 644.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "params": 1
       },
       {
         "pos": {
           "x": 49.0,
           "y": 654.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "params": 1
       },
       {
         "pos": {
           "x": 54.0,
           "y": 664.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "params": 1
       },
       {
         "pos": {
           "x": 39.0,
           "y": 334.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "params": 1
       },
       {
         "pos": {
           "x": 44.0,
           "y": 349.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "params": 1
       },
       {
         "pos": {
           "x": 49.0,
           "y": 649.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "params": 1
       },
       {
         "pos": {
           "x": 54.0,
           "y": 749.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "params": 1
       }
     ],
     "innerWires": [
@@ -3215,34 +3142,5 @@ mograsim version: 0.1.2
         ]
       }
     ]
-  },
-  "specialized": {
-    "input_count": [
-      "A0",
-      "A1",
-      "A2",
-      "A3",
-      "B0",
-      "B1",
-      "B2",
-      "B3",
-      "WE",
-      "D1",
-      "D2",
-      "D3",
-      "D4"
-    ],
-    "label": "GUIram4",
-    "logic_width": 1,
-    "output_count": [
-      "QA1",
-      "QA2",
-      "QA3",
-      "QA4",
-      "QB1",
-      "QB2",
-      "QB3",
-      "QB4"
-    ]
   }
 }
\ No newline at end of file