Fixed a bug in Am2900; created dlatch8/80; relayouted some components

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

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json
index 51a7451..de91b6b 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json
@@ -195,126 +195,6 @@
   "innerScale": 0.1,
   "submodel": {
     "components": [
-      {
-        "id": "and41",
-        "name": "and41#0",
-        "pos": {
-          "x": 235.0,
-          "y": 150.0
-        }
-      },
-      {
-        "id": "and41",
-        "name": "and41#1",
-        "pos": {
-          "x": 250.0,
-          "y": 375.0
-        }
-      },
-      {
-        "id": "and41",
-        "name": "and41#2",
-        "pos": {
-          "x": 155.0,
-          "y": 325.0
-        }
-      },
-      {
-        "id": "andor414",
-        "name": "andor414#0",
-        "pos": {
-          "x": 250.0,
-          "y": 485.0
-        }
-      },
-      {
-        "id": "andor414",
-        "name": "andor414#1",
-        "pos": {
-          "x": 250.0,
-          "y": 635.0
-        }
-      },
-      {
-        "id": "andor414",
-        "name": "andor414#2",
-        "pos": {
-          "x": 250.0,
-          "y": 785.0
-        }
-      },
-      {
-        "id": "andor414",
-        "name": "andor414#3",
-        "pos": {
-          "x": 155.0,
-          "y": 435.0
-        }
-      },
-      {
-        "id": "andor414",
-        "name": "andor414#4",
-        "pos": {
-          "x": 155.0,
-          "y": 585.0
-        }
-      },
-      {
-        "id": "andor414",
-        "name": "andor414#5",
-        "pos": {
-          "x": 155.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": "ram2",
-        "name": "ram2#0",
-        "pos": {
-          "x": 80.0,
-          "y": 330.0
-        }
-      },
-      {
-        "id": "ram2",
-        "name": "ram2#1",
-        "pos": {
-          "x": 80.0,
-          "y": 480.0
-        }
-      },
-      {
-        "id": "ram2",
-        "name": "ram2#2",
-        "pos": {
-          "x": 80.0,
-          "y": 630.0
-        }
-      },
-      {
-        "id": "ram2",
-        "name": "ram2#3",
-        "pos": {
-          "x": 80.0,
-          "y": 780.0
-        }
-      },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
@@ -566,6 +446,126 @@
           "y": 694.0
         },
         "params": 1
+      },
+      {
+        "id": "and41",
+        "name": "and41#0",
+        "pos": {
+          "x": 235.0,
+          "y": 150.0
+        }
+      },
+      {
+        "id": "and41",
+        "name": "and41#1",
+        "pos": {
+          "x": 250.0,
+          "y": 375.0
+        }
+      },
+      {
+        "id": "and41",
+        "name": "and41#2",
+        "pos": {
+          "x": 155.0,
+          "y": 325.0
+        }
+      },
+      {
+        "id": "andor414",
+        "name": "andor414#0",
+        "pos": {
+          "x": 250.0,
+          "y": 485.0
+        }
+      },
+      {
+        "id": "andor414",
+        "name": "andor414#1",
+        "pos": {
+          "x": 250.0,
+          "y": 635.0
+        }
+      },
+      {
+        "id": "andor414",
+        "name": "andor414#2",
+        "pos": {
+          "x": 250.0,
+          "y": 785.0
+        }
+      },
+      {
+        "id": "andor414",
+        "name": "andor414#3",
+        "pos": {
+          "x": 155.0,
+          "y": 435.0
+        }
+      },
+      {
+        "id": "andor414",
+        "name": "andor414#4",
+        "pos": {
+          "x": 155.0,
+          "y": 585.0
+        }
+      },
+      {
+        "id": "andor414",
+        "name": "andor414#5",
+        "pos": {
+          "x": 155.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": "ram2",
+        "name": "ram2#0",
+        "pos": {
+          "x": 80.0,
+          "y": 330.0
+        }
+      },
+      {
+        "id": "ram2",
+        "name": "ram2#1",
+        "pos": {
+          "x": 80.0,
+          "y": 480.0
+        }
+      },
+      {
+        "id": "ram2",
+        "name": "ram2#2",
+        "pos": {
+          "x": 80.0,
+          "y": 630.0
+        }
+      },
+      {
+        "id": "ram2",
+        "name": "ram2#3",
+        "pos": {
+          "x": 80.0,
+          "y": 780.0
+        }
       }
     ],
     "wires": [
@@ -3370,133 +3370,133 @@
           "delegateTarget": "ram2#0"
         }
       },
-      "c11": {
+      "c0000": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#3"
+          "delegateTarget": "ram2#0",
+          "prefix": "c00"
         }
       },
-      "c10": {
+      "c0001": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#2"
+          "delegateTarget": "ram2#1",
+          "prefix": "c00"
         }
       },
-      "c01": {
+      "c0010": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#1"
+          "delegateTarget": "ram2#2",
+          "prefix": "c00"
         }
       },
-      "c1000": {
+      "c0011": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#0",
-          "prefix": "c10"
+          "delegateTarget": "ram2#3",
+          "prefix": "c00"
         }
       },
-      "c1011": {
+      "c01": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#3",
-          "prefix": "c10"
+          "delegateTarget": "ram2#1"
         }
       },
-      "c1110": {
+      "c0100": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#2",
-          "prefix": "c11"
+          "delegateTarget": "ram2#0",
+          "prefix": "c01"
         }
       },
-      "c1001": {
+      "c0101": {
         "id": "delegating",
         "params": {
           "delegateTarget": "ram2#1",
-          "prefix": "c10"
+          "prefix": "c01"
         }
       },
-      "c1100": {
+      "c0110": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#0",
-          "prefix": "c11"
+          "delegateTarget": "ram2#2",
+          "prefix": "c01"
         }
       },
-      "c1111": {
+      "c0111": {
         "id": "delegating",
         "params": {
           "delegateTarget": "ram2#3",
-          "prefix": "c11"
+          "prefix": "c01"
         }
       },
-      "c0000": {
+      "c10": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#0",
-          "prefix": "c00"
+          "delegateTarget": "ram2#2"
         }
       },
-      "c0011": {
+      "c1000": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#3",
-          "prefix": "c00"
+          "delegateTarget": "ram2#0",
+          "prefix": "c10"
         }
       },
-      "c0110": {
+      "c1001": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#2",
-          "prefix": "c01"
+          "delegateTarget": "ram2#1",
+          "prefix": "c10"
         }
       },
-      "c0010": {
+      "c1010": {
         "id": "delegating",
         "params": {
           "delegateTarget": "ram2#2",
-          "prefix": "c00"
+          "prefix": "c10"
         }
       },
-      "c1010": {
+      "c1011": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#2",
+          "delegateTarget": "ram2#3",
           "prefix": "c10"
         }
       },
-      "c0101": {
+      "c11": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#1",
-          "prefix": "c01"
+          "delegateTarget": "ram2#3"
         }
       },
-      "c0001": {
+      "c1100": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#1",
-          "prefix": "c00"
+          "delegateTarget": "ram2#0",
+          "prefix": "c11"
         }
       },
-      "c0100": {
+      "c1101": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#0",
-          "prefix": "c01"
+          "delegateTarget": "ram2#1",
+          "prefix": "c11"
         }
       },
-      "c0111": {
+      "c1110": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#3",
-          "prefix": "c01"
+          "delegateTarget": "ram2#2",
+          "prefix": "c11"
         }
       },
-      "c1101": {
+      "c1111": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#1",
+          "delegateTarget": "ram2#3",
           "prefix": "c11"
         }
       }