Shortened the memory test a bit because it was longer than necessary

[Mograsim.git] / net.mograsim.logic.model.am2900 / components / net / mograsim / logic / model / am2900 / components / ram2.json

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json
index 2dd4182..3732257 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json
@@ -159,126 +159,6 @@
   "innerScale": 0.1,
   "submodel": {
     "components": [
-      {
-        "id": "and41",
-        "name": "and41#0",
-        "pos": {
-          "x": 130.0,
-          "y": 150.0
-        }
-      },
-      {
-        "id": "and41",
-        "name": "and41#1",
-        "pos": {
-          "x": 235.0,
-          "y": 375.0
-        }
-      },
-      {
-        "id": "and41",
-        "name": "and41#2",
-        "pos": {
-          "x": 135.0,
-          "y": 325.0
-        }
-      },
-      {
-        "id": "andor414",
-        "name": "andor414#0",
-        "pos": {
-          "x": 235.0,
-          "y": 485.0
-        }
-      },
-      {
-        "id": "andor414",
-        "name": "andor414#1",
-        "pos": {
-          "x": 235.0,
-          "y": 635.0
-        }
-      },
-      {
-        "id": "andor414",
-        "name": "andor414#2",
-        "pos": {
-          "x": 235.0,
-          "y": 785.0
-        }
-      },
-      {
-        "id": "andor414",
-        "name": "andor414#3",
-        "pos": {
-          "x": 135.0,
-          "y": 435.0
-        }
-      },
-      {
-        "id": "andor414",
-        "name": "andor414#4",
-        "pos": {
-          "x": 135.0,
-          "y": 585.0
-        }
-      },
-      {
-        "id": "andor414",
-        "name": "andor414#5",
-        "pos": {
-          "x": 135.0,
-          "y": 735.0
-        }
-      },
-      {
-        "id": "demux2",
-        "name": "demux2#0",
-        "pos": {
-          "x": 55.0,
-          "y": 45.0
-        }
-      },
-      {
-        "id": "demux2",
-        "name": "demux2#1",
-        "pos": {
-          "x": 55.0,
-          "y": 150.0
-        }
-      },
-      {
-        "id": "dlatch4",
-        "name": "dlatch4#0",
-        "pos": {
-          "x": 55.0,
-          "y": 325.0
-        }
-      },
-      {
-        "id": "dlatch4",
-        "name": "dlatch4#1",
-        "pos": {
-          "x": 55.0,
-          "y": 475.0
-        }
-      },
-      {
-        "id": "dlatch4",
-        "name": "dlatch4#2",
-        "pos": {
-          "x": 55.0,
-          "y": 625.0
-        }
-      },
-      {
-        "id": "dlatch4",
-        "name": "dlatch4#3",
-        "pos": {
-          "x": 55.0,
-          "y": 775.0
-        }
-      },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
@@ -566,6 +446,126 @@
           "y": 489.0
         },
         "params": 1
+      },
+      {
+        "id": "and41",
+        "name": "and41#0",
+        "pos": {
+          "x": 130.0,
+          "y": 150.0
+        }
+      },
+      {
+        "id": "and41",
+        "name": "and41#1",
+        "pos": {
+          "x": 235.0,
+          "y": 375.0
+        }
+      },
+      {
+        "id": "and41",
+        "name": "and41#2",
+        "pos": {
+          "x": 135.0,
+          "y": 325.0
+        }
+      },
+      {
+        "id": "andor414",
+        "name": "andor414#0",
+        "pos": {
+          "x": 235.0,
+          "y": 485.0
+        }
+      },
+      {
+        "id": "andor414",
+        "name": "andor414#1",
+        "pos": {
+          "x": 235.0,
+          "y": 635.0
+        }
+      },
+      {
+        "id": "andor414",
+        "name": "andor414#2",
+        "pos": {
+          "x": 235.0,
+          "y": 785.0
+        }
+      },
+      {
+        "id": "andor414",
+        "name": "andor414#3",
+        "pos": {
+          "x": 135.0,
+          "y": 435.0
+        }
+      },
+      {
+        "id": "andor414",
+        "name": "andor414#4",
+        "pos": {
+          "x": 135.0,
+          "y": 585.0
+        }
+      },
+      {
+        "id": "andor414",
+        "name": "andor414#5",
+        "pos": {
+          "x": 135.0,
+          "y": 735.0
+        }
+      },
+      {
+        "id": "demux2",
+        "name": "demux2#0",
+        "pos": {
+          "x": 55.0,
+          "y": 45.0
+        }
+      },
+      {
+        "id": "demux2",
+        "name": "demux2#1",
+        "pos": {
+          "x": 55.0,
+          "y": 150.0
+        }
+      },
+      {
+        "id": "dlatch4",
+        "name": "dlatch4#0",
+        "pos": {
+          "x": 55.0,
+          "y": 325.0
+        }
+      },
+      {
+        "id": "dlatch4",
+        "name": "dlatch4#1",
+        "pos": {
+          "x": 55.0,
+          "y": 475.0
+        }
+      },
+      {
+        "id": "dlatch4",
+        "name": "dlatch4#2",
+        "pos": {
+          "x": 55.0,
+          "y": 625.0
+        }
+      },
+      {
+        "id": "dlatch4",
+        "name": "dlatch4#3",
+        "pos": {
+          "x": 55.0,
+          "y": 775.0
+        }
       }
     ],
     "wires": [
@@ -2986,10 +2986,10 @@
           "delegateTarget": "dlatch4#0"
         }
       },
-      "c11": {
+      "c01": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "dlatch4#3"
+          "delegateTarget": "dlatch4#1"
         }
       },
       "c10": {
@@ -2998,10 +2998,10 @@
           "delegateTarget": "dlatch4#2"
         }
       },
-      "c01": {
+      "c11": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "dlatch4#1"
+          "delegateTarget": "dlatch4#3"
         }
       }
     },