X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fcomponents%2FGUI_rsLatch.json;h=89eab0a4e124bd27a74e8d6d9431171df4e9da1d;hb=8e8d5776ccc95a08885789834abd55cc50e18a24;hp=6f679a91a33820d3eb71e47d8a07f72c0f8b0aff;hpb=7d79c13e0d6979b212b24ed21845f9178f01249a;p=Mograsim.git

diff --git a/net.mograsim.logic.model.am2900/components/GUI_rsLatch.json b/net.mograsim.logic.model.am2900/components/GUI_rsLatch.json
index 6f679a91..89eab0a4 100644
--- a/net.mograsim.logic.model.am2900/components/GUI_rsLatch.json
+++ b/net.mograsim.logic.model.am2900/components/GUI_rsLatch.json
@@ -1,4 +1,3 @@
-mograsim version: 0.1.3
 {
   "width": 35.0,
   "height": 20.0,
@@ -9,7 +8,8 @@ mograsim version: 0.1.3
         "y": 5.0
       },
       "name": "Q",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     },
     {
       "location": {
@@ -17,7 +17,8 @@ mograsim version: 0.1.3
         "y": 15.0
       },
       "name": "_Q",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     },
     {
       "location": {
@@ -25,7 +26,8 @@ mograsim version: 0.1.3
         "y": 15.0
       },
       "name": "_R",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
@@ -33,50 +35,63 @@ mograsim version: 0.1.3
         "y": 5.0
       },
       "name": "_S",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "INPUT"
     }
   ],
+  "innerScale": 0.4,
   "submodel": {
-    "innerScale": 0.4,
-    "subComps": [
+    "components": [
       {
         "id": "GUINandGate",
-        "name": "GUINandGate#1",
+        "name": "GUINandGate#0",
         "pos": {
-          "x": 40.0,
-          "y": 12.5
+          "x": 10.0,
+          "y": 7.5
         },
         "params": 1
       },
       {
         "id": "GUINandGate",
-        "name": "GUINandGate#0",
+        "name": "GUINandGate#1",
         "pos": {
-          "x": 10.0,
-          "y": 7.5
+          "x": 40.0,
+          "y": 12.5
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
+        "name": "WireCrossPoint#0",
         "pos": {
-          "x": 64.0,
-          "y": 36.5
+          "x": 34.0,
+          "y": 16.5
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
+        "name": "WireCrossPoint#1",
         "pos": {
-          "x": 34.0,
-          "y": 16.5
+          "x": 64.0,
+          "y": 36.5
         },
         "params": 1
       }
     ],
-    "innerWires": [
+    "wires": [
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "_Q"
+        },
+        "name": "_q",
+        "path": []
+      },
       {
         "pin1": {
           "compName": "WireCrossPoint#0",
@@ -108,14 +123,14 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "_S"
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "_Q"
+          "compName": "GUINandGate#0",
+          "pinName": "A"
         },
-        "name": "_q",
+        "name": "unnamedWire#0",
         "path": []
       },
       {
@@ -141,37 +156,29 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "_S"
+          "compName": "GUINandGate#0",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "A"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
         },
-        "name": "unnamedWire#0",
+        "name": "unnamedWire#2",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "GUINandGate#1",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "B"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
         },
-        "name": "unnamedWire#5",
+        "name": "unnamedWire#3",
         "path": [
           {
             "x": 65.0,
-            "y": 42.5
-          },
-          {
-            "x": 5.0,
-            "y": 42.5
-          },
-          {
-            "x": 5.0,
             "y": 22.5
           }
         ]
@@ -190,34 +197,31 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "GUINandGate#1",
-          "pinName": "Y"
-        },
-        "pin2": {
           "compName": "WireCrossPoint#1",
           "pinName": ""
         },
-        "name": "unnamedWire#3",
+        "pin2": {
+          "compName": "GUINandGate#0",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#5",
         "path": [
           {
             "x": 65.0,
+            "y": 42.5
+          },
+          {
+            "x": 5.0,
+            "y": 42.5
+          },
+          {
+            "x": 5.0,
             "y": 22.5
           }
         ]
-      },
-      {
-        "pin1": {
-          "compName": "GUINandGate#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "name": "unnamedWire#2",
-        "path": []
       }
-    ]
+    ],
+    "version": "0.1.1"
   },
   "symbolRendererSnippetID": "simpleRectangularLike",
   "symbolRendererParams": {
@@ -244,5 +248,6 @@ mograsim version: 0.1.3
         }
       }
     }
-  }
+  },
+  "version": "0.1.5"
 }
\ No newline at end of file