projects / Mograsim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 18ca9fb)
Cleaned ram2 and ram4
authorDaniel Kirschten <daniel.kirschten@gmx.de>
Sun, 11 Oct 2020 21:59:36 +0000 (23:59 +0200)
committerDaniel Kirschten <daniel.kirschten@gmx.de>
Sun, 11 Oct 2020 21:59:36 +0000 (23:59 +0200)
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json patch | blob | history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json patch | blob | history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json patch | blob | history

diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
index b42171f..0249fd1 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
@@ -191,8 +191,8 @@
         "id": "Splitter",
         "name": "Splitter#1",
         "pos": {
-          "x": 670.0,
-          "y": 135.0
+          "x": 185.0,
+          "y": 730.0
         },
         "params": {
           "logicWidth": 4,
@@ -286,30 +286,6 @@
       {
         "id": "Splitter",
         "name": "Splitter#9",
-        "pos": {
-          "x": 695.0,
-          "y": 215.0
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "LEFT"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#10",
-        "pos": {
-          "x": 640.0,
-          "y": 215.0
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "RIGHT"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#11",
         "pos": {
           "x": 330.0,
           "y": 930.0
@@ -321,7 +297,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#12",
+        "name": "Splitter#10",
         "pos": {
           "x": 135.0,
           "y": 965.0
@@ -333,7 +309,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#13",
+        "name": "Splitter#11",
         "pos": {
           "x": 135.0,
           "y": 1035.0
@@ -345,7 +321,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#14",
+        "name": "Splitter#12",
         "pos": {
           "x": 840.0,
           "y": 760.0
@@ -357,19 +333,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#15",
-        "pos": {
-          "x": 695.0,
-          "y": 175.0
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "LEFT"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#16",
+        "name": "Splitter#13",
         "pos": {
           "x": 190.0,
           "y": 930.0
@@ -682,7 +646,7 @@
         "name": "dlatch4#0",
         "pos": {
           "x": 720.0,
-          "y": 175.0
+          "y": 160.0
         }
       },
       {
@@ -737,7 +701,7 @@
     "wires": [
       {
         "pin1": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#12",
           "pinName": "O0"
         },
         "pin2": {
@@ -953,7 +917,7 @@
           },
           {
             "x": 715.0,
-            "y": 210.0
+            "y": 195.0
           }
         ]
       },
@@ -963,7 +927,7 @@
           "pinName": "O7"
         },
         "pin2": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#12",
           "pinName": "O1"
         },
         "name": "unnamedWire#15",
@@ -1175,48 +1139,57 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "I"
+          "compName": "_submodelinterface",
+          "pinName": "A"
         },
         "pin2": {
-          "compName": "_submodelinterface",
+          "compName": "ram4#0",
           "pinName": "A"
         },
         "name": "unnamedWire#27",
-        "path": []
+        "path": [
+          {
+            "x": 650.0,
+            "y": 150.0
+          },
+          {
+            "x": 650.0,
+            "y": 175.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
-          "pinName": "O0"
+          "compName": "_submodelinterface",
+          "pinName": "B"
         },
         "pin2": {
           "compName": "ram4#0",
-          "pinName": "B0"
+          "pinName": "B"
         },
         "name": "unnamedWire#28",
-        "path": []
+        "path": [
+          {
+            "x": 650.0,
+            "y": 350.0
+          },
+          {
+            "x": 650.0,
+            "y": 185.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
-          "pinName": "I"
+          "compName": "sel3_4#0",
+          "pinName": "Y4"
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "B"
+          "compName": "Splitter#1",
+          "pinName": "O3"
         },
         "name": "unnamedWire#29",
-        "path": [
-          {
-            "x": 635.0,
-            "y": 230.0
-          },
-          {
-            "x": 635.0,
-            "y": 350.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
@@ -1307,98 +1280,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#15",
-          "pinName": "O3"
-        },
-        "pin2": {
           "compName": "ram4#0",
-          "pinName": "QA4"
-        },
-        "name": "unnamedWire#35",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#15",
-          "pinName": "O2"
-        },
-        "pin2": {
-          "compName": "ram4#0",
-          "pinName": "QA3"
-        },
-        "name": "unnamedWire#36",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#15",
-          "pinName": "O1"
-        },
-        "pin2": {
-          "compName": "ram4#0",
-          "pinName": "QA2"
-        },
-        "name": "unnamedWire#37",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "ram4#0",
-          "pinName": "QA1"
-        },
-        "pin2": {
-          "compName": "Splitter#15",
-          "pinName": "O0"
-        },
-        "name": "unnamedWire#38",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "ram4#0",
-          "pinName": "QB4"
-        },
-        "pin2": {
-          "compName": "Splitter#9",
-          "pinName": "O3"
-        },
-        "name": "unnamedWire#39",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#9",
-          "pinName": "O2"
-        },
-        "pin2": {
-          "compName": "ram4#0",
-          "pinName": "QB3"
-        },
-        "name": "unnamedWire#40",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "ram4#0",
-          "pinName": "QB2"
-        },
-        "pin2": {
-          "compName": "Splitter#9",
-          "pinName": "O1"
-        },
-        "name": "unnamedWire#41",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#9",
-          "pinName": "O0"
+          "pinName": "QA"
         },
         "pin2": {
-          "compName": "ram4#0",
-          "pinName": "QB1"
+          "compName": "dlatch4#0",
+          "pinName": "D"
         },
-        "name": "unnamedWire#42",
+        "name": "unnamedWire#35",
         "path": []
       },
       {
@@ -1410,7 +1299,7 @@
           "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
           "pinName": "Cn"
         },
-        "name": "unnamedWire#43",
+        "name": "unnamedWire#36",
         "path": [
           {
             "x": 55.0,
@@ -1428,45 +1317,27 @@
       },
       {
         "pin1": {
-          "compName": "ram4#0",
-          "pinName": "A0"
+          "compName": "sel3_4#0",
+          "pinName": "Y1"
         },
         "pin2": {
           "compName": "Splitter#1",
           "pinName": "O0"
         },
-        "name": "unnamedWire#44",
-        "path": [
-          {
-            "x": 650.0,
-            "y": 175.0
-          },
-          {
-            "x": 650.0,
-            "y": 165.0
-          }
-        ]
+        "name": "unnamedWire#37",
+        "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "O1"
+          "compName": "sel3_4#0",
+          "pinName": "Y2"
         },
         "pin2": {
-          "compName": "ram4#0",
-          "pinName": "A1"
+          "compName": "Splitter#1",
+          "pinName": "O1"
         },
-        "name": "unnamedWire#45",
-        "path": [
-          {
-            "x": 645.0,
-            "y": 155.0
-          },
-          {
-            "x": 645.0,
-            "y": 185.0
-          }
-        ]
+        "name": "unnamedWire#38",
+        "path": []
       },
       {
         "pin1": {
@@ -1474,68 +1345,67 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "ram4#0",
-          "pinName": "A2"
+          "compName": "sel3_4#0",
+          "pinName": "Y3"
         },
-        "name": "unnamedWire#46",
-        "path": [
-          {
-            "x": 640.0,
-            "y": 145.0
-          },
-          {
-            "x": 640.0,
-            "y": 195.0
-          }
-        ]
+        "name": "unnamedWire#39",
+        "path": []
       },
       {
         "pin1": {
           "compName": "Splitter#1",
-          "pinName": "O3"
+          "pinName": "I"
         },
         "pin2": {
           "compName": "ram4#0",
-          "pinName": "A3"
+          "pinName": "D"
         },
-        "name": "unnamedWire#47",
+        "name": "unnamedWire#40",
         "path": [
           {
-            "x": 635.0,
-            "y": 135.0
+            "x": 200.0,
+            "y": 745.0
           },
           {
-            "x": 635.0,
-            "y": 205.0
+            "x": 200.0,
+            "y": 290.0
+          },
+          {
+            "x": 630.0,
+            "y": 290.0
+          },
+          {
+            "x": 630.0,
+            "y": 210.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "Splitter#9",
-          "pinName": "I"
-        },
-        "pin2": {
           "compName": "dlatch4#1",
           "pinName": "D"
         },
-        "name": "unnamedWire#48",
+        "pin2": {
+          "compName": "ram4#0",
+          "pinName": "QB"
+        },
+        "name": "unnamedWire#41",
         "path": [
           {
-            "x": 710.0,
-            "y": 230.0
+            "x": 255.0,
+            "y": 690.0
           },
           {
-            "x": 710.0,
-            "y": 582.5
+            "x": 255.0,
+            "y": 580.0
           },
           {
-            "x": 255.0,
-            "y": 582.5
+            "x": 710.0,
+            "y": 580.0
           },
           {
-            "x": 255.0,
-            "y": 690.0
+            "x": 710.0,
+            "y": 185.0
           }
         ]
       },
@@ -1548,7 +1418,7 @@
           "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
           "pinName": "B"
         },
-        "name": "unnamedWire#49",
+        "name": "unnamedWire#42",
         "path": []
       },
       {
@@ -1560,7 +1430,7 @@
           "compName": "mux1_4#0",
           "pinName": "S0"
         },
-        "name": "unnamedWire#50",
+        "name": "unnamedWire#43",
         "path": [
           {
             "x": 435.0,
@@ -1581,7 +1451,7 @@
           "compName": "mux1_4#0",
           "pinName": "I0"
         },
-        "name": "unnamedWire#51",
+        "name": "unnamedWire#44",
         "path": []
       },
       {
@@ -1593,7 +1463,7 @@
           "compName": "mux1_4#0",
           "pinName": "I1"
         },
-        "name": "unnamedWire#52",
+        "name": "unnamedWire#45",
         "path": [
           {
             "x": 355.0,
@@ -1610,7 +1480,7 @@
           "compName": "dlatch4#0",
           "pinName": "Q"
         },
-        "name": "unnamedWire#53",
+        "name": "unnamedWire#46",
         "path": [
           {
             "x": 340.0,
@@ -1622,46 +1492,10 @@
           },
           {
             "x": 765.0,
-            "y": 190.0
+            "y": 175.0
           }
         ]
       },
-      {
-        "pin1": {
-          "compName": "Splitter#10",
-          "pinName": "O1"
-        },
-        "pin2": {
-          "compName": "ram4#0",
-          "pinName": "B1"
-        },
-        "name": "unnamedWire#54",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#10",
-          "pinName": "O2"
-        },
-        "pin2": {
-          "compName": "ram4#0",
-          "pinName": "B2"
-        },
-        "name": "unnamedWire#55",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#10",
-          "pinName": "O3"
-        },
-        "pin2": {
-          "compName": "ram4#0",
-          "pinName": "B3"
-        },
-        "name": "unnamedWire#56",
-        "path": []
-      },
       {
         "pin1": {
           "compName": "dff4_we#0",
@@ -1671,19 +1505,19 @@
           "compName": "WireCrossPoint#7",
           "pinName": ""
         },
-        "name": "unnamedWire#57",
+        "name": "unnamedWire#47",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#13",
           "pinName": "I"
         },
         "pin2": {
           "compName": "dff4_we#0",
           "pinName": "D"
         },
-        "name": "unnamedWire#58",
+        "name": "unnamedWire#48",
         "path": []
       },
       {
@@ -1692,10 +1526,10 @@
           "pinName": "Y4"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#13",
           "pinName": "O3"
         },
-        "name": "unnamedWire#59",
+        "name": "unnamedWire#49",
         "path": []
       },
       {
@@ -1704,10 +1538,10 @@
           "pinName": "Y3"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#13",
           "pinName": "O2"
         },
-        "name": "unnamedWire#60",
+        "name": "unnamedWire#50",
         "path": []
       },
       {
@@ -1716,10 +1550,10 @@
           "pinName": "Y2"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#13",
           "pinName": "O1"
         },
-        "name": "unnamedWire#61",
+        "name": "unnamedWire#51",
         "path": []
       },
       {
@@ -1731,7 +1565,7 @@
           "compName": "Splitter#8",
           "pinName": "O3"
         },
-        "name": "unnamedWire#62",
+        "name": "unnamedWire#52",
         "path": []
       },
       {
@@ -1743,7 +1577,7 @@
           "compName": "sel3_4#1",
           "pinName": "B3"
         },
-        "name": "unnamedWire#63",
+        "name": "unnamedWire#53",
         "path": []
       },
       {
@@ -1755,7 +1589,7 @@
           "compName": "WireCrossPoint#18",
           "pinName": ""
         },
-        "name": "unnamedWire#64",
+        "name": "unnamedWire#54",
         "path": [
           {
             "x": 80.0,
@@ -1769,26 +1603,26 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#11",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "C2"
         },
-        "name": "unnamedWire#65",
+        "name": "unnamedWire#55",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#11",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "C1"
         },
-        "name": "unnamedWire#66",
+        "name": "unnamedWire#56",
         "path": []
       },
       {
@@ -1797,10 +1631,10 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#11",
           "pinName": "I"
         },
-        "name": "unnamedWire#67",
+        "name": "unnamedWire#57",
         "path": []
       },
       {
@@ -1812,7 +1646,7 @@
           "compName": "WireCrossPoint#7",
           "pinName": ""
         },
-        "name": "unnamedWire#68",
+        "name": "unnamedWire#58",
         "path": [
           {
             "x": 130.0,
@@ -1833,7 +1667,7 @@
           "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
           "pinName": "Q"
         },
-        "name": "unnamedWire#69",
+        "name": "unnamedWire#59",
         "path": [
           {
             "x": 325.0,
@@ -1843,14 +1677,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#12",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "Splitter#0",
           "pinName": "O8"
         },
-        "name": "unnamedWire#70",
+        "name": "unnamedWire#60",
         "path": []
       },
       {
@@ -1862,7 +1696,7 @@
           "compName": "WireCrossPoint#19",
           "pinName": ""
         },
-        "name": "unnamedWire#71",
+        "name": "unnamedWire#61",
         "path": [
           {
             "x": 75.0,
@@ -1876,14 +1710,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#10",
           "pinName": "I"
         },
         "pin2": {
           "compName": "WireCrossPoint#8",
           "pinName": ""
         },
-        "name": "unnamedWire#72",
+        "name": "unnamedWire#62",
         "path": [
           {
             "x": 130.0,
@@ -1900,7 +1734,7 @@
           "compName": "WireCrossPoint#7",
           "pinName": ""
         },
-        "name": "unnamedWire#73",
+        "name": "unnamedWire#63",
         "path": []
       },
       {
@@ -1912,7 +1746,7 @@
           "compName": "Splitter#8",
           "pinName": "O1"
         },
-        "name": "unnamedWire#74",
+        "name": "unnamedWire#64",
         "path": []
       },
       {
@@ -1924,31 +1758,31 @@
           "compName": "sel3_4#1",
           "pinName": "B1"
         },
-        "name": "unnamedWire#75",
+        "name": "unnamedWire#65",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#10",
           "pinName": "O0"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "A2"
         },
-        "name": "unnamedWire#76",
+        "name": "unnamedWire#66",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#11",
           "pinName": "O3"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "C3"
         },
-        "name": "unnamedWire#77",
+        "name": "unnamedWire#67",
         "path": []
       },
       {
@@ -1960,7 +1794,7 @@
           "compName": "_submodelinterface",
           "pinName": "D"
         },
-        "name": "unnamedWire#78",
+        "name": "unnamedWire#68",
         "path": [
           {
             "x": 505.0,
@@ -1978,14 +1812,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#13",
           "pinName": "O0"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "Y1"
         },
-        "name": "unnamedWire#79",
+        "name": "unnamedWire#69",
         "path": []
       },
       {
@@ -1997,7 +1831,7 @@
           "compName": "_submodelinterface",
           "pinName": "Cn+4"
         },
-        "name": "unnamedWire#80",
+        "name": "unnamedWire#70",
         "path": [
           {
             "x": 615.0,
@@ -2018,7 +1852,7 @@
           "compName": "_submodelinterface",
           "pinName": "OVR"
         },
-        "name": "unnamedWire#81",
+        "name": "unnamedWire#71",
         "path": [
           {
             "x": 610.0,
@@ -2047,7 +1881,7 @@
           "compName": "TriStateBuffer#3",
           "pinName": "IN"
         },
-        "name": "unnamedWire#82",
+        "name": "unnamedWire#72",
         "path": [
           {
             "x": 365.0,
@@ -2064,7 +1898,7 @@
           "compName": "or4#0",
           "pinName": "A1"
         },
-        "name": "unnamedWire#83",
+        "name": "unnamedWire#73",
         "path": []
       },
       {
@@ -2076,7 +1910,7 @@
           "compName": "WireCrossPoint#11",
           "pinName": ""
         },
-        "name": "unnamedWire#84",
+        "name": "unnamedWire#74",
         "path": []
       },
       {
@@ -2088,7 +1922,7 @@
           "compName": "TriStateBuffer#3",
           "pinName": "EN"
         },
-        "name": "unnamedWire#85",
+        "name": "unnamedWire#75",
         "path": []
       },
       {
@@ -2100,7 +1934,7 @@
           "compName": "sel3_4#0",
           "pinName": "C4"
         },
-        "name": "unnamedWire#86",
+        "name": "unnamedWire#76",
         "path": [
           {
             "x": 435.0,
@@ -2133,7 +1967,7 @@
           "compName": "_submodelinterface",
           "pinName": "RAMn+3"
         },
-        "name": "unnamedWire#87",
+        "name": "unnamedWire#77",
         "path": [
           {
             "x": 455.0,
@@ -2154,7 +1988,7 @@
           "compName": "or4#0",
           "pinName": "A2"
         },
-        "name": "unnamedWire#88",
+        "name": "unnamedWire#78",
         "path": []
       },
       {
@@ -2166,7 +2000,7 @@
           "compName": "or4#0",
           "pinName": "A3"
         },
-        "name": "unnamedWire#89",
+        "name": "unnamedWire#79",
         "path": []
       },
       {
@@ -2178,7 +2012,7 @@
           "compName": "or4#0",
           "pinName": "A4"
         },
-        "name": "unnamedWire#90",
+        "name": "unnamedWire#80",
         "path": []
       },
       {
@@ -2190,7 +2024,7 @@
           "compName": "Splitter#4",
           "pinName": "I"
         },
-        "name": "unnamedWire#91",
+        "name": "unnamedWire#81",
         "path": []
       },
       {
@@ -2202,7 +2036,7 @@
           "compName": "WireCrossPoint#13",
           "pinName": ""
         },
-        "name": "unnamedWire#92",
+        "name": "unnamedWire#82",
         "path": []
       },
       {
@@ -2214,7 +2048,7 @@
           "compName": "WireCrossPoint#25",
           "pinName": ""
         },
-        "name": "unnamedWire#93",
+        "name": "unnamedWire#83",
         "path": [
           {
             "x": 380.0,
@@ -2231,7 +2065,7 @@
           "compName": "WireCrossPoint#13",
           "pinName": ""
         },
-        "name": "unnamedWire#94",
+        "name": "unnamedWire#84",
         "path": [
           {
             "x": 105.0,
@@ -2248,7 +2082,7 @@
           "compName": "Splitter#5",
           "pinName": "I"
         },
-        "name": "unnamedWire#95",
+        "name": "unnamedWire#85",
         "path": []
       },
       {
@@ -2260,7 +2094,7 @@
           "compName": "Splitter#5",
           "pinName": "O2"
         },
-        "name": "unnamedWire#96",
+        "name": "unnamedWire#86",
         "path": []
       },
       {
@@ -2272,7 +2106,7 @@
           "compName": "sel3_4#0",
           "pinName": "A3"
         },
-        "name": "unnamedWire#97",
+        "name": "unnamedWire#87",
         "path": []
       },
       {
@@ -2284,7 +2118,7 @@
           "compName": "sel3_4#0",
           "pinName": "A2"
         },
-        "name": "unnamedWire#98",
+        "name": "unnamedWire#88",
         "path": []
       },
       {
@@ -2296,7 +2130,7 @@
           "compName": "sel3_4#0",
           "pinName": "B1"
         },
-        "name": "unnamedWire#99",
+        "name": "unnamedWire#89",
         "path": []
       },
       {
@@ -2308,7 +2142,7 @@
           "compName": "sel3_4#0",
           "pinName": "B2"
         },
-        "name": "unnamedWire#100",
+        "name": "unnamedWire#90",
         "path": []
       },
       {
@@ -2320,7 +2154,7 @@
           "compName": "sel3_4#0",
           "pinName": "B3"
         },
-        "name": "unnamedWire#101",
+        "name": "unnamedWire#91",
         "path": []
       },
       {
@@ -2332,7 +2166,7 @@
           "compName": "WireCrossPoint#18",
           "pinName": ""
         },
-        "name": "unnamedWire#102",
+        "name": "unnamedWire#92",
         "path": [
           {
             "x": 100.0,
@@ -2349,7 +2183,7 @@
           "compName": "sel3_4#0",
           "pinName": "B4"
         },
-        "name": "unnamedWire#103",
+        "name": "unnamedWire#93",
         "path": []
       },
       {
@@ -2361,7 +2195,7 @@
           "compName": "WireCrossPoint#15",
           "pinName": ""
         },
-        "name": "unnamedWire#104",
+        "name": "unnamedWire#94",
         "path": []
       },
       {
@@ -2373,7 +2207,7 @@
           "compName": "WireCrossPoint#14",
           "pinName": ""
         },
-        "name": "unnamedWire#105",
+        "name": "unnamedWire#95",
         "path": []
       },
       {
@@ -2385,7 +2219,7 @@
           "compName": "sel3_4#0",
           "pinName": "C3"
         },
-        "name": "unnamedWire#106",
+        "name": "unnamedWire#96",
         "path": []
       },
       {
@@ -2397,7 +2231,7 @@
           "compName": "sel3_4#0",
           "pinName": "C2"
         },
-        "name": "unnamedWire#107",
+        "name": "unnamedWire#97",
         "path": []
       },
       {
@@ -2409,7 +2243,7 @@
           "compName": "sel3_4#0",
           "pinName": "C1"
         },
-        "name": "unnamedWire#108",
+        "name": "unnamedWire#98",
         "path": []
       },
       {
@@ -2421,7 +2255,7 @@
           "compName": "WireCrossPoint#16",
           "pinName": ""
         },
-        "name": "unnamedWire#109",
+        "name": "unnamedWire#99",
         "path": []
       },
       {
@@ -2433,31 +2267,31 @@
           "compName": "Splitter#7",
           "pinName": "I"
         },
-        "name": "unnamedWire#110",
+        "name": "unnamedWire#100",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#10",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "A3"
         },
-        "name": "unnamedWire#111",
+        "name": "unnamedWire#101",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#10",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "A4"
         },
-        "name": "unnamedWire#112",
+        "name": "unnamedWire#102",
         "path": []
       },
       {
@@ -2469,7 +2303,7 @@
           "compName": "WireCrossPoint#16",
           "pinName": ""
         },
-        "name": "unnamedWire#113",
+        "name": "unnamedWire#103",
         "path": [
           {
             "x": 105.0,
@@ -2486,7 +2320,7 @@
           "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
           "pinName": "F"
         },
-        "name": "unnamedWire#114",
+        "name": "unnamedWire#104",
         "path": [
           {
             "x": 610.0,
@@ -2500,100 +2334,16 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#9",
           "pinName": "O0"
         },
         "pin2": {
           "compName": "TriStateBuffer#0",
           "pinName": "IN"
         },
-        "name": "unnamedWire#115",
+        "name": "unnamedWire#105",
         "path": []
       },
-      {
-        "pin1": {
-          "compName": "sel3_4#0",
-          "pinName": "Y1"
-        },
-        "pin2": {
-          "compName": "ram4#0",
-          "pinName": "D1"
-        },
-        "name": "unnamedWire#116",
-        "path": [
-          {
-            "x": 195.0,
-            "y": 730.0
-          },
-          {
-            "x": 195.0,
-            "y": 265.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "sel3_4#0",
-          "pinName": "Y2"
-        },
-        "pin2": {
-          "compName": "ram4#0",
-          "pinName": "D2"
-        },
-        "name": "unnamedWire#117",
-        "path": [
-          {
-            "x": 200.0,
-            "y": 740.0
-          },
-          {
-            "x": 200.0,
-            "y": 275.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "sel3_4#0",
-          "pinName": "Y3"
-        },
-        "pin2": {
-          "compName": "ram4#0",
-          "pinName": "D3"
-        },
-        "name": "unnamedWire#118",
-        "path": [
-          {
-            "x": 205.0,
-            "y": 750.0
-          },
-          {
-            "x": 205.0,
-            "y": 285.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "sel3_4#0",
-          "pinName": "Y4"
-        },
-        "pin2": {
-          "compName": "ram4#0",
-          "pinName": "D4"
-        },
-        "name": "unnamedWire#119",
-        "path": [
-          {
-            "x": 210.0,
-            "y": 760.0
-          },
-          {
-            "x": 210.0,
-            "y": 295.0
-          }
-        ]
-      },
       {
         "pin1": {
           "compName": "Am2901DestDecode#0",
@@ -2603,7 +2353,7 @@
           "compName": "and#0",
           "pinName": "A"
         },
-        "name": "unnamedWire#120",
+        "name": "unnamedWire#106",
         "path": []
       },
       {
@@ -2615,7 +2365,7 @@
           "compName": "and#0",
           "pinName": "B"
         },
-        "name": "unnamedWire#121"
+        "name": "unnamedWire#107"
       },
       {
         "pin1": {
@@ -2626,7 +2376,7 @@
           "compName": "ram4#0",
           "pinName": "WE"
         },
-        "name": "unnamedWire#122",
+        "name": "unnamedWire#108",
         "path": [
           {
             "x": 630.0,
@@ -2634,7 +2384,7 @@
           },
           {
             "x": 630.0,
-            "y": 255.0
+            "y": 200.0
           }
         ]
       },
@@ -2647,7 +2397,7 @@
           "compName": "dff4_we#0",
           "pinName": "WE"
         },
-        "name": "unnamedWire#123",
+        "name": "unnamedWire#109",
         "path": [
           {
             "x": 450.0,
@@ -2669,14 +2419,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#9",
           "pinName": "O3"
         },
         "pin2": {
           "compName": "TriStateBuffer#2",
           "pinName": "IN"
         },
-        "name": "unnamedWire#124",
+        "name": "unnamedWire#110",
         "path": []
       },
       {
@@ -2688,7 +2438,7 @@
           "compName": "WireCrossPoint#17",
           "pinName": ""
         },
-        "name": "unnamedWire#125",
+        "name": "unnamedWire#111",
         "path": []
       },
       {
@@ -2700,7 +2450,7 @@
           "compName": "NandGate#1",
           "pinName": "A"
         },
-        "name": "unnamedWire#126",
+        "name": "unnamedWire#112",
         "path": [
           {
             "x": 415.0,
@@ -2717,7 +2467,7 @@
           "compName": "NandGate#1",
           "pinName": "B"
         },
-        "name": "unnamedWire#127",
+        "name": "unnamedWire#113",
         "path": [
           {
             "x": 415.0,
@@ -2734,7 +2484,7 @@
           "compName": "_submodelinterface",
           "pinName": "F\u003d0"
         },
-        "name": "unnamedWire#128",
+        "name": "unnamedWire#114",
         "path": [
           {
             "x": 445.0,
@@ -2763,7 +2513,7 @@
           "compName": "TriStateBuffer#0",
           "pinName": "OUT"
         },
-        "name": "unnamedWire#129",
+        "name": "unnamedWire#115",
         "path": [
           {
             "x": 100.0,
@@ -2785,10 +2535,10 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#9",
           "pinName": "I"
         },
-        "name": "unnamedWire#130",
+        "name": "unnamedWire#116",
         "path": []
       },
       {
@@ -2800,7 +2550,7 @@
           "compName": "sel3_4#0",
           "pinName": "A1"
         },
-        "name": "unnamedWire#131",
+        "name": "unnamedWire#117",
         "path": [
           {
             "x": 100.0,
@@ -2817,7 +2567,7 @@
           "compName": "TriStateBuffer#1",
           "pinName": "OUT"
         },
-        "name": "unnamedWire#132",
+        "name": "unnamedWire#118",
         "path": [
           {
             "x": 100.0,
@@ -2838,7 +2588,7 @@
           "compName": "WireCrossPoint#5",
           "pinName": ""
         },
-        "name": "unnamedWire#133",
+        "name": "unnamedWire#119",
         "path": []
       },
       {
@@ -2850,7 +2600,7 @@
           "compName": "TriStateBuffer#1",
           "pinName": "EN"
         },
-        "name": "unnamedWire#134",
+        "name": "unnamedWire#120",
         "path": [
           {
             "x": 395.0,
@@ -2871,7 +2621,7 @@
           "compName": "TriStateBuffer#0",
           "pinName": "EN"
         },
-        "name": "unnamedWire#135",
+        "name": "unnamedWire#121",
         "path": []
       },
       {
@@ -2883,7 +2633,7 @@
           "compName": "WireCrossPoint#20",
           "pinName": ""
         },
-        "name": "unnamedWire#136",
+        "name": "unnamedWire#122",
         "path": []
       },
       {
@@ -2895,7 +2645,7 @@
           "compName": "WireCrossPoint#3",
           "pinName": ""
         },
-        "name": "unnamedWire#137",
+        "name": "unnamedWire#123",
         "path": []
       },
       {
@@ -2907,7 +2657,7 @@
           "compName": "WireCrossPoint#23",
           "pinName": ""
         },
-        "name": "unnamedWire#138",
+        "name": "unnamedWire#124",
         "path": []
       },
       {
@@ -2919,7 +2669,7 @@
           "compName": "WireCrossPoint#23",
           "pinName": ""
         },
-        "name": "unnamedWire#139",
+        "name": "unnamedWire#125",
         "path": []
       },
       {
@@ -2931,7 +2681,7 @@
           "compName": "WireCrossPoint#24",
           "pinName": ""
         },
-        "name": "unnamedWire#140",
+        "name": "unnamedWire#126",
         "path": [
           {
             "x": 145.0,
@@ -2952,7 +2702,7 @@
           "compName": "TriStateBuffer#2",
           "pinName": "OUT"
         },
-        "name": "unnamedWire#141",
+        "name": "unnamedWire#127",
         "path": [
           {
             "x": 425.0,
@@ -2969,7 +2719,7 @@
           "compName": "_submodelinterface",
           "pinName": "Qn+3"
         },
-        "name": "unnamedWire#142",
+        "name": "unnamedWire#128",
         "path": [
           {
             "x": 425.0,
@@ -2986,19 +2736,19 @@
           "compName": "WireCrossPoint#25",
           "pinName": ""
         },
-        "name": "unnamedWire#143",
+        "name": "unnamedWire#129",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#12",
           "pinName": "I"
         },
         "pin2": {
           "compName": "Am2901DestDecode#0",
           "pinName": "I"
         },
-        "name": "unnamedWire#144",
+        "name": "unnamedWire#130",
         "path": [
           {
             "x": 835.0,
@@ -3017,18 +2767,6 @@
             "y": 175.0
           }
         ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#15",
-          "pinName": "I"
-        },
-        "pin2": {
-          "compName": "dlatch4#0",
-          "pinName": "D"
-        },
-        "name": "unnamedWire#145",
-        "path": []
       }
     ],
     "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json
index 8de3e2a..80b6c65 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json
@@ -1,14 +1,14 @@
 {
-  "width": 35.0,
-  "height": 90.0,
+  "width": 50.0,
+  "height": 75.0,
   "interfacePins": [
     {
       "location": {
         "x": 0.0,
         "y": 5.0
       },
-      "name": "A0",
-      "logicWidth": 1,
+      "name": "A",
+      "logicWidth": 2,
       "usage": "INPUT"
     },
     {
@@ -16,155 +16,56 @@
         "x": 0.0,
         "y": 15.0
       },
-      "name": "A1",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 25.0
-      },
-      "name": "B0",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 35.0
-      },
-      "name": "B1",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 55.0
-      },
-      "name": "D1",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 65.0
-      },
-      "name": "D2",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 75.0
-      },
-      "name": "D3",
-      "logicWidth": 1,
+      "name": "B",
+      "logicWidth": 2,
       "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 85.0
+        "y": 40.0
       },
-      "name": "D4",
-      "logicWidth": 1,
+      "name": "D",
+      "logicWidth": 4,
       "usage": "INPUT"
     },
     {
       "location": {
-        "x": 35.0,
+        "x": 50.0,
         "y": 5.0
       },
-      "name": "QA1",
-      "logicWidth": 1,
+      "name": "QA",
+      "logicWidth": 4,
       "usage": "OUTPUT"
     },
     {
       "location": {
-        "x": 35.0,
+        "x": 50.0,
         "y": 15.0
       },
-      "name": "QA2",
-      "logicWidth": 1,
-      "usage": "OUTPUT"
-    },
-    {
-      "location": {
-        "x": 35.0,
-        "y": 25.0
-      },
-      "name": "QA3",
-      "logicWidth": 1,
-      "usage": "OUTPUT"
-    },
-    {
-      "location": {
-        "x": 35.0,
-        "y": 35.0
-      },
-      "name": "QA4",
-      "logicWidth": 1,
-      "usage": "OUTPUT"
-    },
-    {
-      "location": {
-        "x": 35.0,
-        "y": 45.0
-      },
-      "name": "QB1",
-      "logicWidth": 1,
-      "usage": "OUTPUT"
-    },
-    {
-      "location": {
-        "x": 35.0,
-        "y": 55.0
-      },
-      "name": "QB2",
-      "logicWidth": 1,
-      "usage": "OUTPUT"
-    },
-    {
-      "location": {
-        "x": 35.0,
-        "y": 65.0
-      },
-      "name": "QB3",
-      "logicWidth": 1,
-      "usage": "OUTPUT"
-    },
-    {
-      "location": {
-        "x": 35.0,
-        "y": 75.0
-      },
-      "name": "QB4",
-      "logicWidth": 1,
+      "name": "QB",
+      "logicWidth": 4,
       "usage": "OUTPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 45.0
+        "y": 30.0
       },
       "name": "WE",
       "logicWidth": 1,
       "usage": "INPUT"
     }
   ],
-  "innerScale": 0.1,
+  "innerScale": 0.2,
   "submodel": {
     "components": [
       {
         "id": "Splitter",
         "name": "Splitter#0",
         "pos": {
-          "x": 45.0,
-          "y": 220.0
+          "x": 35.0,
+          "y": 110.0
         },
         "params": {
           "logicWidth": 4,
@@ -175,8 +76,8 @@
         "id": "Splitter",
         "name": "Splitter#1",
         "pos": {
-          "x": 135.0,
-          "y": 155.0
+          "x": 110.0,
+          "y": 70.0
         },
         "params": {
           "logicWidth": 4,
@@ -187,11 +88,11 @@
         "id": "Splitter",
         "name": "Splitter#2",
         "pos": {
-          "x": 305.0,
-          "y": 560.0
+          "x": 5.0,
+          "y": 20.0
         },
         "params": {
-          "logicWidth": 4,
+          "logicWidth": 2,
           "orientation": "RIGHT"
         }
       },
@@ -199,32 +100,20 @@
         "id": "Splitter",
         "name": "Splitter#3",
         "pos": {
-          "x": 285.0,
-          "y": 505.0
+          "x": 5.0,
+          "y": 70.0
         },
         "params": {
-          "logicWidth": 4,
+          "logicWidth": 2,
           "orientation": "RIGHT"
         }
       },
-      {
-        "id": "Splitter",
-        "name": "Splitter#4",
-        "pos": {
-          "x": 20.0,
-          "y": 600.0
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "LEFT"
-        }
-      },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
         "pos": {
-          "x": 129.0,
-          "y": 154.0
+          "x": 104.0,
+          "y": 99.0
         },
         "params": 1
       },
@@ -232,8 +121,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#1",
         "pos": {
-          "x": 124.0,
-          "y": 164.0
+          "x": 99.0,
+          "y": 89.0
         },
         "params": 1
       },
@@ -241,8 +130,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#2",
         "pos": {
-          "x": 119.0,
-          "y": 174.0
+          "x": 94.0,
+          "y": 79.0
         },
         "params": 1
       },
@@ -250,8 +139,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#3",
         "pos": {
-          "x": 114.0,
-          "y": 184.0
+          "x": 89.0,
+          "y": 69.0
         },
         "params": 1
       },
@@ -259,8 +148,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#4",
         "pos": {
-          "x": 49.0,
-          "y": 519.0
+          "x": 34.0,
+          "y": 289.0
         },
         "params": 4
       },
@@ -268,8 +157,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#5",
         "pos": {
-          "x": 49.0,
-          "y": 464.0
+          "x": 34.0,
+          "y": 234.0
         },
         "params": 4
       },
@@ -277,8 +166,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#6",
         "pos": {
-          "x": 49.0,
-          "y": 409.0
+          "x": 84.0,
+          "y": 169.0
         },
         "params": 4
       },
@@ -286,8 +175,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#7",
         "pos": {
-          "x": 109.0,
-          "y": 344.0
+          "x": 84.0,
+          "y": 234.0
         },
         "params": 4
       },
@@ -295,8 +184,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#8",
         "pos": {
-          "x": 109.0,
-          "y": 409.0
+          "x": 84.0,
+          "y": 289.0
         },
         "params": 4
       },
@@ -304,8 +193,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#9",
         "pos": {
-          "x": 109.0,
-          "y": 464.0
+          "x": 84.0,
+          "y": 344.0
         },
         "params": 4
       },
@@ -313,8 +202,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#10",
         "pos": {
-          "x": 109.0,
-          "y": 519.0
+          "x": 34.0,
+          "y": 199.0
         },
         "params": 4
       },
@@ -322,219 +211,192 @@
         "id": "and41",
         "name": "and41#0",
         "pos": {
-          "x": 150.0,
-          "y": 155.0
+          "x": 130.0,
+          "y": 70.0
         }
       },
       {
         "id": "and41",
         "name": "and41#1",
         "pos": {
-          "x": 235.0,
-          "y": 360.0
+          "x": 195.0,
+          "y": 175.0
         }
       },
       {
         "id": "and41",
         "name": "and41#2",
         "pos": {
-          "x": 135.0,
-          "y": 330.0
+          "x": 115.0,
+          "y": 145.0
         }
       },
       {
         "id": "andor414",
         "name": "andor414#0",
         "pos": {
-          "x": 240.0,
-          "y": 410.0
+          "x": 200.0,
+          "y": 225.0
         }
       },
       {
         "id": "andor414",
         "name": "andor414#1",
         "pos": {
-          "x": 240.0,
-          "y": 465.0
+          "x": 200.0,
+          "y": 280.0
         }
       },
       {
         "id": "andor414",
         "name": "andor414#2",
         "pos": {
-          "x": 240.0,
-          "y": 515.0
+          "x": 200.0,
+          "y": 330.0
         }
       },
       {
         "id": "andor414",
         "name": "andor414#3",
         "pos": {
-          "x": 140.0,
-          "y": 385.0
+          "x": 120.0,
+          "y": 200.0
         }
       },
       {
         "id": "andor414",
         "name": "andor414#4",
         "pos": {
-          "x": 140.0,
-          "y": 440.0
+          "x": 120.0,
+          "y": 255.0
         }
       },
       {
         "id": "andor414",
         "name": "andor414#5",
         "pos": {
-          "x": 140.0,
-          "y": 495.0
+          "x": 120.0,
+          "y": 310.0
         }
       },
       {
         "id": "demux2",
         "name": "demux2#0",
         "pos": {
-          "x": 55.0,
-          "y": 45.0
+          "x": 20.0,
+          "y": 15.0
         }
       },
       {
         "id": "demux2",
         "name": "demux2#1",
         "pos": {
-          "x": 55.0,
-          "y": 150.0
+          "x": 20.0,
+          "y": 65.0
         }
       },
       {
         "id": "dlatch4",
         "name": "dlatch4#0",
         "pos": {
-          "x": 55.0,
-          "y": 330.0
+          "x": 40.0,
+          "y": 155.0
         }
       },
       {
         "id": "dlatch4",
         "name": "dlatch4#1",
         "pos": {
-          "x": 55.0,
-          "y": 395.0
+          "x": 40.0,
+          "y": 220.0
         }
       },
       {
         "id": "dlatch4",
         "name": "dlatch4#2",
         "pos": {
-          "x": 55.0,
-          "y": 450.0
+          "x": 40.0,
+          "y": 275.0
         }
       },
       {
         "id": "dlatch4",
         "name": "dlatch4#3",
         "pos": {
-          "x": 55.0,
-          "y": 505.0
+          "x": 40.0,
+          "y": 330.0
         }
       }
     ],
     "wires": [
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A0"
+          "compName": "Splitter#2",
+          "pinName": "I"
         },
         "pin2": {
-          "compName": "demux2#0",
-          "pinName": "S0"
+          "compName": "_submodelinterface",
+          "pinName": "A"
         },
         "name": "unnamedWire#0",
         "path": []
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A1"
+          "compName": "Splitter#2",
+          "pinName": "O1"
         },
         "pin2": {
           "compName": "demux2#0",
           "pinName": "S1"
         },
         "name": "unnamedWire#1",
-        "path": [
-          {
-            "x": 10.0,
-            "y": 150.0
-          },
-          {
-            "x": 10.0,
-            "y": 60.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B0"
+          "compName": "Splitter#3",
+          "pinName": "O1"
         },
         "pin2": {
           "compName": "demux2#1",
-          "pinName": "S0"
+          "pinName": "S1"
         },
         "name": "unnamedWire#2",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 250.0
-          },
-          {
-            "x": 5.0,
-            "y": 155.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B1"
+          "compName": "demux2#1",
+          "pinName": "S0"
         },
         "pin2": {
-          "compName": "demux2#1",
-          "pinName": "S1"
+          "compName": "Splitter#3",
+          "pinName": "O0"
         },
         "name": "unnamedWire#3",
-        "path": [
-          {
-            "x": 10.0,
-            "y": 350.0
-          },
-          {
-            "x": 10.0,
-            "y": 165.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
-          "compName": "demux2#1",
-          "pinName": "Y00"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "demux2#1",
+          "pinName": "Y11"
         },
         "name": "unnamedWire#4",
         "path": []
       },
       {
         "pin1": {
-          "compName": "demux2#1",
-          "pinName": "Y01"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "demux2#1",
+          "pinName": "Y10"
         },
         "name": "unnamedWire#5",
         "path": []
@@ -542,10 +404,10 @@
       {
         "pin1": {
           "compName": "demux2#1",
-          "pinName": "Y10"
+          "pinName": "Y01"
         },
         "pin2": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "name": "unnamedWire#6",
@@ -553,12 +415,12 @@
       },
       {
         "pin1": {
-          "compName": "demux2#1",
-          "pinName": "Y11"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "demux2#1",
+          "pinName": "Y00"
         },
         "name": "unnamedWire#7",
         "path": []
@@ -577,13 +439,13 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "pin2": {
           "compName": "Splitter#1",
           "pinName": "O2"
         },
+        "pin2": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
         "name": "unnamedWire#9",
         "path": []
       },
@@ -601,13 +463,13 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
           "compName": "Splitter#1",
           "pinName": "O0"
         },
+        "pin2": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
         "name": "unnamedWire#11",
         "path": []
       },
@@ -623,41 +485,41 @@
         "name": "unnamedWire#12",
         "path": [
           {
-            "x": 5.0,
-            "y": 450.0
+            "x": 75.0,
+            "y": 150.0
           },
           {
-            "x": 5.0,
-            "y": 300.0
+            "x": 75.0,
+            "y": 115.0
           },
           {
-            "x": 145.0,
-            "y": 300.0
+            "x": 125.0,
+            "y": 115.0
           },
           {
-            "x": 145.0,
-            "y": 185.0
+            "x": 125.0,
+            "y": 100.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "dlatch4#0",
-          "pinName": "C"
-        },
-        "pin2": {
           "compName": "Splitter#0",
           "pinName": "O0"
         },
+        "pin2": {
+          "compName": "dlatch4#3",
+          "pinName": "C"
+        },
         "name": "unnamedWire#13",
         "path": [
           {
             "x": 30.0,
-            "y": 365.0
+            "y": 140.0
           },
           {
             "x": 30.0,
-            "y": 250.0
+            "y": 365.0
           }
         ]
       },
@@ -667,18 +529,18 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "dlatch4#1",
+          "compName": "dlatch4#2",
           "pinName": "C"
         },
         "name": "unnamedWire#14",
         "path": [
           {
             "x": 25.0,
-            "y": 240.0
+            "y": 130.0
           },
           {
             "x": 25.0,
-            "y": 430.0
+            "y": 310.0
           }
         ]
       },
@@ -688,18 +550,18 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "dlatch4#2",
+          "compName": "dlatch4#1",
           "pinName": "C"
         },
         "name": "unnamedWire#15",
         "path": [
           {
             "x": 20.0,
-            "y": 230.0
+            "y": 120.0
           },
           {
             "x": 20.0,
-            "y": 485.0
+            "y": 255.0
           }
         ]
       },
@@ -709,53 +571,58 @@
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "dlatch4#3",
+          "compName": "dlatch4#0",
           "pinName": "C"
         },
         "name": "unnamedWire#16",
         "path": [
           {
             "x": 15.0,
-            "y": 220.0
+            "y": 110.0
           },
           {
             "x": 15.0,
-            "y": 540.0
+            "y": 190.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D1"
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O0"
+          "compName": "dlatch4#3",
+          "pinName": "D"
         },
         "name": "unnamedWire#17",
-        "path": []
+        "path": [
+          {
+            "x": 35.0,
+            "y": 345.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "Splitter#4",
-          "pinName": "O1"
+          "compName": "demux2#0",
+          "pinName": "S0"
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "D2"
+          "compName": "Splitter#2",
+          "pinName": "O0"
         },
         "name": "unnamedWire#18",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#4",
-          "pinName": "O2"
+          "compName": "Splitter#3",
+          "pinName": "I"
         },
         "pin2": {
           "compName": "_submodelinterface",
-          "pinName": "D3"
+          "pinName": "B"
         },
         "name": "unnamedWire#19",
         "path": []
@@ -763,59 +630,80 @@
       {
         "pin1": {
           "compName": "_submodelinterface",
-          "pinName": "D4"
+          "pinName": "D"
         },
         "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O3"
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
         },
         "name": "unnamedWire#20",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#4",
-          "pinName": "I"
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "name": "unnamedWire#21",
-        "path": [
-          {
-            "x": 50.0,
-            "y": 615.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "andor414#2",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "dlatch4#3",
-          "pinName": "D"
+          "compName": "_submodelinterface",
+          "pinName": "QA"
         },
         "name": "unnamedWire#22",
-        "path": []
+        "path": [
+          {
+            "x": 240.0,
+            "y": 335.0
+          },
+          {
+            "x": 240.0,
+            "y": 25.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "andor414#5",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "QB"
         },
         "name": "unnamedWire#23",
-        "path": []
+        "path": [
+          {
+            "x": 165.0,
+            "y": 315.0
+          },
+          {
+            "x": 165.0,
+            "y": 150.0
+          },
+          {
+            "x": 210.0,
+            "y": 150.0
+          },
+          {
+            "x": 210.0,
+            "y": 75.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "pin2": {
@@ -827,11 +715,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "name": "unnamedWire#25",
@@ -843,7 +731,7 @@
           "pinName": "D"
         },
         "pin2": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "name": "unnamedWire#26",
@@ -851,7 +739,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#10",
           "pinName": ""
         },
         "pin2": {
@@ -861,14 +749,14 @@
         "name": "unnamedWire#27",
         "path": [
           {
-            "x": 50.0,
-            "y": 345.0
+            "x": 35.0,
+            "y": 170.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
         "pin2": {
@@ -884,7 +772,7 @@
           "pinName": "Q"
         },
         "pin2": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
         "name": "unnamedWire#29",
@@ -896,7 +784,7 @@
           "pinName": "Q"
         },
         "pin2": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "name": "unnamedWire#30",
@@ -908,7 +796,7 @@
           "pinName": "Q"
         },
         "pin2": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "name": "unnamedWire#31",
@@ -916,7 +804,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "pin2": {
@@ -924,11 +812,16 @@
           "pinName": "A"
         },
         "name": "unnamedWire#32",
-        "path": []
+        "path": [
+          {
+            "x": 85.0,
+            "y": 335.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "pin2": {
@@ -938,8 +831,8 @@
         "name": "unnamedWire#33",
         "path": [
           {
-            "x": 110.0,
-            "y": 540.0
+            "x": 85.0,
+            "y": 355.0
           }
         ]
       },
@@ -949,18 +842,18 @@
           "pinName": "Y00"
         },
         "pin2": {
-          "compName": "and41#1",
+          "compName": "andor414#2",
           "pinName": "B"
         },
         "name": "unnamedWire#34",
         "path": [
           {
-            "x": 210.0,
+            "x": 190.0,
             "y": 50.0
           },
           {
-            "x": 210.0,
-            "y": 390.0
+            "x": 190.0,
+            "y": 365.0
           }
         ]
       },
@@ -970,66 +863,66 @@
           "pinName": "Y01"
         },
         "pin2": {
-          "compName": "andor414#0",
+          "compName": "andor414#1",
           "pinName": "B"
         },
         "name": "unnamedWire#35",
         "path": [
           {
-            "x": 205.0,
-            "y": 60.0
+            "x": 185.0,
+            "y": 40.0
           },
           {
-            "x": 205.0,
-            "y": 445.0
+            "x": 185.0,
+            "y": 315.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "demux2#0",
-          "pinName": "Y10"
+          "compName": "andor414#0",
+          "pinName": "B"
         },
         "pin2": {
-          "compName": "andor414#1",
-          "pinName": "B"
+          "compName": "demux2#0",
+          "pinName": "Y10"
         },
         "name": "unnamedWire#36",
         "path": [
           {
-            "x": 200.0,
-            "y": 70.0
+            "x": 180.0,
+            "y": 260.0
           },
           {
-            "x": 200.0,
-            "y": 500.0
+            "x": 180.0,
+            "y": 30.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "demux2#0",
-          "pinName": "Y11"
+          "compName": "and41#1",
+          "pinName": "B"
         },
         "pin2": {
-          "compName": "andor414#2",
-          "pinName": "B"
+          "compName": "demux2#0",
+          "pinName": "Y11"
         },
         "name": "unnamedWire#37",
         "path": [
           {
-            "x": 195.0,
-            "y": 80.0
+            "x": 175.0,
+            "y": 205.0
           },
           {
-            "x": 195.0,
-            "y": 550.0
+            "x": 175.0,
+            "y": 20.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "pin2": {
@@ -1039,14 +932,14 @@
         "name": "unnamedWire#38",
         "path": [
           {
-            "x": 130.0,
-            "y": 360.0
+            "x": 90.0,
+            "y": 175.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "pin2": {
@@ -1056,14 +949,14 @@
         "name": "unnamedWire#39",
         "path": [
           {
-            "x": 125.0,
-            "y": 420.0
+            "x": 95.0,
+            "y": 235.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "pin2": {
@@ -1073,14 +966,14 @@
         "name": "unnamedWire#40",
         "path": [
           {
-            "x": 120.0,
-            "y": 475.0
+            "x": 100.0,
+            "y": 290.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "pin2": {
@@ -1090,14 +983,14 @@
         "name": "unnamedWire#41",
         "path": [
           {
-            "x": 115.0,
-            "y": 530.0
+            "x": 105.0,
+            "y": 345.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
         "pin2": {
@@ -1105,7 +998,12 @@
           "pinName": "A"
         },
         "name": "unnamedWire#42",
-        "path": []
+        "path": [
+          {
+            "x": 85.0,
+            "y": 160.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1113,14 +1011,14 @@
           "pinName": "A"
         },
         "pin2": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
         "name": "unnamedWire#43",
         "path": [
           {
-            "x": 110.0,
-            "y": 375.0
+            "x": 85.0,
+            "y": 190.0
           }
         ]
       },
@@ -1136,26 +1034,26 @@
         "name": "unnamedWire#44",
         "path": [
           {
-            "x": 175.0,
-            "y": 345.0
+            "x": 155.0,
+            "y": 160.0
           },
           {
-            "x": 175.0,
-            "y": 380.0
+            "x": 155.0,
+            "y": 195.0
           },
           {
-            "x": 135.0,
-            "y": 380.0
+            "x": 115.0,
+            "y": 195.0
           },
           {
-            "x": 135.0,
-            "y": 390.0
+            "x": 115.0,
+            "y": 205.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
         "pin2": {
@@ -1163,11 +1061,16 @@
           "pinName": "A"
         },
         "name": "unnamedWire#45",
-        "path": []
+        "path": [
+          {
+            "x": 85.0,
+            "y": 225.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
         "pin2": {
@@ -1177,14 +1080,14 @@
         "name": "unnamedWire#46",
         "path": [
           {
-            "x": 110.0,
-            "y": 435.0
+            "x": 85.0,
+            "y": 250.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "pin2": {
@@ -1192,7 +1095,12 @@
           "pinName": "A"
         },
         "name": "unnamedWire#47",
-        "path": []
+        "path": [
+          {
+            "x": 85.0,
+            "y": 280.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1206,20 +1114,20 @@
         "name": "unnamedWire#48",
         "path": [
           {
-            "x": 175.0,
-            "y": 390.0
+            "x": 155.0,
+            "y": 205.0
           },
           {
-            "x": 175.0,
-            "y": 430.0
+            "x": 155.0,
+            "y": 245.0
           },
           {
-            "x": 135.0,
-            "y": 430.0
+            "x": 115.0,
+            "y": 245.0
           },
           {
-            "x": 135.0,
-            "y": 445.0
+            "x": 115.0,
+            "y": 260.0
           }
         ]
       },
@@ -1235,79 +1143,37 @@
         "name": "unnamedWire#49",
         "path": [
           {
-            "x": 175.0,
-            "y": 445.0
+            "x": 155.0,
+            "y": 260.0
           },
           {
-            "x": 175.0,
-            "y": 485.0
-          },
-          {
-            "x": 135.0,
-            "y": 485.0
-          },
-          {
-            "x": 135.0,
-            "y": 500.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "andor414#5",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "I"
-        },
-        "name": "unnamedWire#50",
-        "path": [
-          {
-            "x": 175.0,
-            "y": 500.0
+            "x": 155.0,
+            "y": 300.0
           },
           {
-            "x": 175.0,
-            "y": 575.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O0"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QB1"
-        },
-        "name": "unnamedWire#51",
-        "path": [
-          {
-            "x": 335.0,
-            "y": 590.0
+            "x": 115.0,
+            "y": 300.0
           },
           {
-            "x": 335.0,
-            "y": 450.0
+            "x": 115.0,
+            "y": 315.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "pin2": {
           "compName": "andor414#1",
           "pinName": "A"
         },
-        "name": "unnamedWire#52",
+        "name": "unnamedWire#50",
         "path": [
           {
-            "x": 110.0,
-            "y": 490.0
+            "x": 85.0,
+            "y": 305.0
           }
         ]
       },
@@ -1320,23 +1186,23 @@
           "compName": "andor414#0",
           "pinName": "C"
         },
-        "name": "unnamedWire#53",
+        "name": "unnamedWire#51",
         "path": [
           {
-            "x": 275.0,
-            "y": 375.0
+            "x": 235.0,
+            "y": 190.0
           },
           {
-            "x": 275.0,
-            "y": 405.0
+            "x": 235.0,
+            "y": 220.0
           },
           {
-            "x": 235.0,
-            "y": 405.0
+            "x": 195.0,
+            "y": 220.0
           },
           {
-            "x": 235.0,
-            "y": 415.0
+            "x": 195.0,
+            "y": 230.0
           }
         ]
       },
@@ -1349,23 +1215,23 @@
           "compName": "andor414#1",
           "pinName": "C"
         },
-        "name": "unnamedWire#54",
+        "name": "unnamedWire#52",
         "path": [
           {
-            "x": 275.0,
-            "y": 415.0
+            "x": 235.0,
+            "y": 230.0
           },
           {
-            "x": 275.0,
-            "y": 460.0
+            "x": 235.0,
+            "y": 275.0
           },
           {
-            "x": 235.0,
-            "y": 460.0
+            "x": 195.0,
+            "y": 275.0
           },
           {
-            "x": 235.0,
-            "y": 470.0
+            "x": 195.0,
+            "y": 285.0
           }
         ]
       },
@@ -1378,182 +1244,23 @@
           "compName": "andor414#2",
           "pinName": "C"
         },
-        "name": "unnamedWire#55",
+        "name": "unnamedWire#53",
         "path": [
-          {
-            "x": 275.0,
-            "y": 470.0
-          },
-          {
-            "x": 275.0,
-            "y": 510.0
-          },
           {
             "x": 235.0,
-            "y": 510.0
+            "y": 285.0
           },
           {
             "x": 235.0,
-            "y": 520.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "andor414#2",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "Splitter#3",
-          "pinName": "I"
-        },
-        "name": "unnamedWire#56",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O0"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QA1"
-        },
-        "name": "unnamedWire#57",
-        "path": [
-          {
-            "x": 315.0,
-            "y": 535.0
-          },
-          {
-            "x": 317.5,
-            "y": 50.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "QA2"
-        },
-        "pin2": {
-          "compName": "Splitter#3",
-          "pinName": "O1"
-        },
-        "name": "unnamedWire#58",
-        "path": [
-          {
-            "x": 312.5,
-            "y": 150.0
-          },
-          {
-            "x": 310.0,
-            "y": 525.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O2"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QA3"
-        },
-        "name": "unnamedWire#59",
-        "path": [
-          {
-            "x": 305.0,
-            "y": 515.0
-          },
-          {
-            "x": 307.5,
-            "y": 250.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "QA4"
-        },
-        "pin2": {
-          "compName": "Splitter#3",
-          "pinName": "O3"
-        },
-        "name": "unnamedWire#60",
-        "path": [
-          {
-            "x": 300.0,
-            "y": 350.0
-          },
-          {
-            "x": 300.0,
-            "y": 505.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "QB2"
-        },
-        "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O1"
-        },
-        "name": "unnamedWire#61",
-        "path": [
-          {
-            "x": 330.0,
-            "y": 550.0
-          },
-          {
-            "x": 330.0,
-            "y": 580.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O2"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QB3"
-        },
-        "name": "unnamedWire#62",
-        "path": [
-          {
-            "x": 325.0,
-            "y": 570.0
+            "y": 325.0
           },
           {
-            "x": 325.0,
-            "y": 650.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "QB4"
-        },
-        "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O3"
-        },
-        "name": "unnamedWire#63",
-        "path": [
-          {
-            "x": 320.0,
-            "y": 750.0
+            "x": 195.0,
+            "y": 325.0
           },
           {
-            "x": 320.0,
-            "y": 560.0
+            "x": 195.0,
+            "y": 335.0
           }
         ]
       },
@@ -1566,15 +1273,15 @@
           "compName": "and41#0",
           "pinName": "Y"
         },
-        "name": "unnamedWire#64",
+        "name": "unnamedWire#54",
         "path": [
           {
-            "x": 190.0,
-            "y": 235.0
+            "x": 170.0,
+            "y": 125.0
           },
           {
-            "x": 190.0,
-            "y": 170.0
+            "x": 170.0,
+            "y": 85.0
           }
         ]
       },
@@ -1587,7 +1294,7 @@
           "compName": "and41#0",
           "pinName": "A"
         },
-        "name": "unnamedWire#65",
+        "name": "unnamedWire#55",
         "path": []
       }
     ],
@@ -1608,25 +1315,25 @@
       "c00": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "dlatch4#0"
+          "delegateTarget": "dlatch4#3"
         }
       },
       "c01": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "dlatch4#1"
+          "delegateTarget": "dlatch4#2"
         }
       },
       "c10": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "dlatch4#2"
+          "delegateTarget": "dlatch4#1"
         }
       },
       "c11": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "dlatch4#3"
+          "delegateTarget": "dlatch4#0"
         }
       }
     },
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json
index 91a2d7c..5f00fae 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json
@@ -1,14 +1,14 @@
 {
-  "width": 35.0,
-  "height": 130.0,
+  "width": 50.0,
+  "height": 95.0,
   "interfacePins": [
     {
       "location": {
         "x": 0.0,
         "y": 5.0
       },
-      "name": "A0",
-      "logicWidth": 1,
+      "name": "A",
+      "logicWidth": 4,
       "usage": "INPUT"
     },
     {
@@ -16,203 +16,68 @@
         "x": 0.0,
         "y": 15.0
       },
-      "name": "A1",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 25.0
-      },
-      "name": "A2",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 35.0
-      },
-      "name": "A3",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 45.0
-      },
-      "name": "B0",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 55.0
-      },
-      "name": "B1",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 65.0
-      },
-      "name": "B2",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 75.0
-      },
-      "name": "B3",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 95.0
-      },
-      "name": "D1",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 105.0
-      },
-      "name": "D2",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 115.0
-      },
-      "name": "D3",
-      "logicWidth": 1,
+      "name": "B",
+      "logicWidth": 4,
       "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 125.0
+        "y": 40.0
       },
-      "name": "D4",
-      "logicWidth": 1,
+      "name": "D",
+      "logicWidth": 4,
       "usage": "INPUT"
     },
     {
       "location": {
-        "x": 35.0,
+        "x": 50.0,
         "y": 5.0
       },
-      "name": "QA1",
-      "logicWidth": 1,
+      "name": "QA",
+      "logicWidth": 4,
       "usage": "OUTPUT"
     },
     {
       "location": {
-        "x": 35.0,
+        "x": 50.0,
         "y": 15.0
       },
-      "name": "QA2",
-      "logicWidth": 1,
-      "usage": "OUTPUT"
-    },
-    {
-      "location": {
-        "x": 35.0,
-        "y": 25.0
-      },
-      "name": "QA3",
-      "logicWidth": 1,
-      "usage": "OUTPUT"
-    },
-    {
-      "location": {
-        "x": 35.0,
-        "y": 35.0
-      },
-      "name": "QA4",
-      "logicWidth": 1,
-      "usage": "OUTPUT"
-    },
-    {
-      "location": {
-        "x": 35.0,
-        "y": 45.0
-      },
-      "name": "QB1",
-      "logicWidth": 1,
-      "usage": "OUTPUT"
-    },
-    {
-      "location": {
-        "x": 35.0,
-        "y": 55.0
-      },
-      "name": "QB2",
-      "logicWidth": 1,
-      "usage": "OUTPUT"
-    },
-    {
-      "location": {
-        "x": 35.0,
-        "y": 65.0
-      },
-      "name": "QB3",
-      "logicWidth": 1,
-      "usage": "OUTPUT"
-    },
-    {
-      "location": {
-        "x": 35.0,
-        "y": 75.0
-      },
-      "name": "QB4",
-      "logicWidth": 1,
+      "name": "QB",
+      "logicWidth": 4,
       "usage": "OUTPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 85.0
+        "y": 30.0
       },
       "name": "WE",
       "logicWidth": 1,
       "usage": "INPUT"
     }
   ],
-  "innerScale": 0.1,
+  "innerScale": 0.2,
   "submodel": {
     "components": [
       {
         "id": "Splitter",
         "name": "Splitter#0",
         "pos": {
-          "x": 295.0,
-          "y": 900.0
+          "x": 45.0,
+          "y": 100.0
         },
         "params": {
           "logicWidth": 4,
-          "orientation": "RIGHT"
+          "orientation": "LEFT"
         }
       },
       {
         "id": "Splitter",
         "name": "Splitter#1",
         "pos": {
-          "x": 135.0,
-          "y": 335.0
+          "x": 125.0,
+          "y": 60.0
         },
         "params": {
           "logicWidth": 4,
@@ -223,119 +88,47 @@
         "id": "Splitter",
         "name": "Splitter#2",
         "pos": {
-          "x": 135.0,
-          "y": 375.0
+          "x": 5.0,
+          "y": 10.0
         },
         "params": {
           "logicWidth": 4,
-          "orientation": "LEFT"
+          "orientation": "RIGHT"
         }
       },
       {
         "id": "Splitter",
         "name": "Splitter#3",
         "pos": {
-          "x": 295.0,
-          "y": 760.0
+          "x": 20.0,
+          "y": 30.0
         },
         "params": {
-          "logicWidth": 4,
-          "orientation": "RIGHT"
+          "logicWidth": 2,
+          "orientation": "LEFT"
         }
       },
       {
         "id": "Splitter",
         "name": "Splitter#4",
         "pos": {
-          "x": 40.0,
-          "y": 210.0
+          "x": 5.0,
+          "y": 60.0
         },
         "params": {
           "logicWidth": 4,
-          "orientation": "LEFT"
+          "orientation": "RIGHT"
         }
       },
       {
         "id": "Splitter",
         "name": "Splitter#5",
         "pos": {
-          "x": 235.0,
-          "y": 155.0
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "LEFT"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#6",
-        "pos": {
-          "x": 135.0,
-          "y": 485.0
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "LEFT"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#7",
-        "pos": {
-          "x": 135.0,
-          "y": 525.0
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "LEFT"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#8",
-        "pos": {
-          "x": 135.0,
-          "y": 635.0
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "LEFT"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#9",
-        "pos": {
-          "x": 135.0,
-          "y": 675.0
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "LEFT"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#10",
-        "pos": {
-          "x": 135.0,
-          "y": 785.0
+          "x": 20.0,
+          "y": 80.0
         },
         "params": {
-          "logicWidth": 4,
-          "orientation": "LEFT"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#11",
-        "pos": {
-          "x": 135.0,
-          "y": 825.0
-        },
-        "params": {
-          "logicWidth": 4,
+          "logicWidth": 2,
           "orientation": "LEFT"
         }
       },
@@ -343,8 +136,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
         "pos": {
-          "x": 229.0,
-          "y": 154.0
+          "x": 119.0,
+          "y": 89.0
         },
         "params": 1
       },
@@ -352,8 +145,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#1",
         "pos": {
-          "x": 224.0,
-          "y": 164.0
+          "x": 114.0,
+          "y": 79.0
         },
         "params": 1
       },
@@ -361,8 +154,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#2",
         "pos": {
-          "x": 219.0,
-          "y": 174.0
+          "x": 109.0,
+          "y": 69.0
         },
         "params": 1
       },
@@ -370,8 +163,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#3",
         "pos": {
-          "x": 214.0,
-          "y": 184.0
+          "x": 104.0,
+          "y": 59.0
         },
         "params": 1
       },
@@ -379,414 +172,252 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#4",
         "pos": {
-          "x": 59.0,
-          "y": 534.0
+          "x": 34.0,
+          "y": 169.0
         },
-        "params": 1
+        "params": 2
       },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#5",
         "pos": {
-          "x": 64.0,
-          "y": 544.0
+          "x": 39.0,
+          "y": 159.0
         },
-        "params": 1
+        "params": 2
       },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#6",
         "pos": {
-          "x": 69.0,
-          "y": 554.0
+          "x": 39.0,
+          "y": 239.0
         },
-        "params": 1
+        "params": 2
       },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#7",
         "pos": {
-          "x": 74.0,
-          "y": 564.0
+          "x": 34.0,
+          "y": 249.0
         },
-        "params": 1
+        "params": 2
       },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#8",
         "pos": {
-          "x": 59.0,
-          "y": 684.0
+          "x": 29.0,
+          "y": 199.0
         },
-        "params": 1
+        "params": 4
       },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#9",
         "pos": {
-          "x": 64.0,
-          "y": 694.0
+          "x": 29.0,
+          "y": 274.0
         },
-        "params": 1
+        "params": 4
       },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#10",
         "pos": {
-          "x": 69.0,
-          "y": 704.0
+          "x": 34.0,
+          "y": 329.0
         },
-        "params": 1
+        "params": 2
       },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#11",
         "pos": {
-          "x": 74.0,
-          "y": 714.0
+          "x": 39.0,
+          "y": 319.0
         },
-        "params": 1
+        "params": 2
       },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#12",
         "pos": {
-          "x": 59.0,
-          "y": 834.0
+          "x": 29.0,
+          "y": 354.0
         },
-        "params": 1
+        "params": 4
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#13",
+        "id": "and41",
+        "name": "and41#0",
         "pos": {
-          "x": 64.0,
-          "y": 844.0
-        },
-        "params": 1
+          "x": 190.0,
+          "y": 60.0
+        }
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#14",
+        "id": "and41",
+        "name": "and41#1",
         "pos": {
-          "x": 69.0,
-          "y": 854.0
-        },
-        "params": 1
+          "x": 125.0,
+          "y": 165.0
+        }
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#15",
+        "id": "and41",
+        "name": "and41#2",
         "pos": {
-          "x": 74.0,
-          "y": 864.0
-        },
-        "params": 1
+          "x": 190.0,
+          "y": 145.0
+        }
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#16",
+        "id": "andor414",
+        "name": "andor414#0",
         "pos": {
-          "x": 39.0,
-          "y": 484.0
-        },
-        "params": 1
+          "x": 130.0,
+          "y": 245.0
+        }
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#17",
+        "id": "andor414",
+        "name": "andor414#1",
         "pos": {
-          "x": 44.0,
-          "y": 494.0
-        },
-        "params": 1
+          "x": 130.0,
+          "y": 325.0
+        }
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#18",
+        "id": "andor414",
+        "name": "andor414#2",
         "pos": {
-          "x": 49.0,
-          "y": 504.0
-        },
-        "params": 1
+          "x": 130.0,
+          "y": 405.0
+        }
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#19",
+        "id": "andor414",
+        "name": "andor414#3",
         "pos": {
-          "x": 54.0,
-          "y": 514.0
-        },
-        "params": 1
+          "x": 195.0,
+          "y": 215.0
+        }
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#20",
+        "id": "andor414",
+        "name": "andor414#4",
         "pos": {
-          "x": 39.0,
-          "y": 634.0
-        },
-        "params": 1
+          "x": 195.0,
+          "y": 295.0
+        }
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#21",
+        "id": "andor414",
+        "name": "andor414#5",
         "pos": {
-          "x": 44.0,
-          "y": 644.0
-        },
-        "params": 1
+          "x": 195.0,
+          "y": 375.0
+        }
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#22",
+        "id": "demux2",
+        "name": "demux2#0",
         "pos": {
-          "x": 49.0,
-          "y": 654.0
-        },
-        "params": 1
+          "x": 45.0,
+          "y": 5.0
+        }
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#23",
+        "id": "demux2",
+        "name": "demux2#1",
         "pos": {
-          "x": 54.0,
-          "y": 664.0
-        },
-        "params": 1
+          "x": 45.0,
+          "y": 55.0
+        }
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#24",
+        "id": "ram2",
+        "name": "ram2#0",
         "pos": {
-          "x": 39.0,
-          "y": 334.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#25",
-        "pos": {
-          "x": 44.0,
-          "y": 349.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#26",
-        "pos": {
-          "x": 49.0,
-          "y": 649.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#27",
-        "pos": {
-          "x": 54.0,
-          "y": 749.0
-        },
-        "params": 1
-      },
-      {
-        "id": "and41",
-        "name": "and41#0",
-        "pos": {
-          "x": 250.0,
+          "x": 45.0,
           "y": 155.0
         }
       },
-      {
-        "id": "and41",
-        "name": "and41#1",
-        "pos": {
-          "x": 250.0,
-          "y": 375.0
-        }
-      },
-      {
-        "id": "and41",
-        "name": "and41#2",
-        "pos": {
-          "x": 155.0,
-          "y": 335.0
-        }
-      },
-      {
-        "id": "andor414",
-        "name": "andor414#0",
-        "pos": {
-          "x": 250.0,
-          "y": 515.0
-        }
-      },
-      {
-        "id": "andor414",
-        "name": "andor414#1",
-        "pos": {
-          "x": 250.0,
-          "y": 625.0
-        }
-      },
-      {
-        "id": "andor414",
-        "name": "andor414#2",
-        "pos": {
-          "x": 250.0,
-          "y": 770.0
-        }
-      },
-      {
-        "id": "andor414",
-        "name": "andor414#3",
-        "pos": {
-          "x": 160.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
+          "x": 45.0,
+          "y": 235.0
         }
       },
       {
         "id": "ram2",
         "name": "ram2#2",
         "pos": {
-          "x": 80.0,
-          "y": 630.0
+          "x": 45.0,
+          "y": 315.0
         }
       },
       {
         "id": "ram2",
         "name": "ram2#3",
         "pos": {
-          "x": 80.0,
-          "y": 780.0
+          "x": 45.0,
+          "y": 395.0
         }
       }
     ],
     "wires": [
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A0"
+          "compName": "Splitter#2",
+          "pinName": "O3"
         },
         "pin2": {
           "compName": "demux2#0",
-          "pinName": "S0"
+          "pinName": "S1"
         },
         "name": "unnamedWire#0",
         "path": []
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A1"
+          "compName": "demux2#0",
+          "pinName": "S0"
         },
         "pin2": {
-          "compName": "demux2#0",
-          "pinName": "S1"
+          "compName": "Splitter#2",
+          "pinName": "O2"
         },
         "name": "unnamedWire#1",
-        "path": [
-          {
-            "x": 10.0,
-            "y": 150.0
-          },
-          {
-            "x": 10.0,
-            "y": 60.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B0"
+          "compName": "Splitter#4",
+          "pinName": "O2"
         },
         "pin2": {
           "compName": "demux2#1",
           "pinName": "S0"
         },
         "name": "unnamedWire#2",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 450.0
-          },
-          {
-            "x": 5.0,
-            "y": 155.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B1"
+          "compName": "Splitter#4",
+          "pinName": "O3"
         },
         "pin2": {
           "compName": "demux2#1",
           "pinName": "S1"
         },
         "name": "unnamedWire#3",
-        "path": [
-          {
-            "x": 10.0,
-            "y": 550.0
-          },
-          {
-            "x": 10.0,
-            "y": 165.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
@@ -842,7 +473,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#1",
           "pinName": "O3"
         },
         "name": "unnamedWire#8",
@@ -854,7 +485,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#1",
           "pinName": "O2"
         },
         "name": "unnamedWire#9",
@@ -866,7 +497,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#1",
           "pinName": "O1"
         },
         "name": "unnamedWire#10",
@@ -878,7 +509,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#1",
           "pinName": "O0"
         },
         "name": "unnamedWire#11",
@@ -896,249 +527,236 @@
         "name": "unnamedWire#12",
         "path": [
           {
-            "x": 15.0,
-            "y": 850.0
-          },
-          {
-            "x": 15.0,
-            "y": 195.0
-          },
-          {
-            "x": 245.0,
-            "y": 195.0
+            "x": 140.0,
+            "y": 150.0
           },
           {
-            "x": 245.0,
-            "y": 185.0
+            "x": 140.0,
+            "y": 90.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#0",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "ram2#0",
+          "compName": "ram2#3",
           "pinName": "WE"
         },
         "name": "unnamedWire#13",
         "path": [
           {
-            "x": 35.0,
-            "y": 240.0
+            "x": 25.0,
+            "y": 130.0
           },
           {
-            "x": 35.0,
-            "y": 375.0
+            "x": 25.0,
+            "y": 425.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "Splitter#4",
-          "pinName": "O1"
+          "compName": "ram2#2",
+          "pinName": "WE"
         },
         "pin2": {
-          "compName": "ram2#1",
-          "pinName": "WE"
+          "compName": "Splitter#0",
+          "pinName": "O1"
         },
         "name": "unnamedWire#14",
         "path": [
           {
-            "x": 30.0,
-            "y": 230.0
+            "x": 20.0,
+            "y": 345.0
           },
           {
-            "x": 30.0,
-            "y": 525.0
+            "x": 20.0,
+            "y": 120.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#0",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "ram2#2",
+          "compName": "ram2#1",
           "pinName": "WE"
         },
         "name": "unnamedWire#15",
         "path": [
           {
-            "x": 25.0,
-            "y": 220.0
+            "x": 15.0,
+            "y": 110.0
           },
           {
-            "x": 25.0,
-            "y": 675.0
+            "x": 15.0,
+            "y": 265.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#0",
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "ram2#3",
+          "compName": "ram2#0",
           "pinName": "WE"
         },
         "name": "unnamedWire#16",
         "path": [
           {
-            "x": 20.0,
-            "y": 210.0
+            "x": 10.0,
+            "y": 100.0
           },
           {
-            "x": 20.0,
-            "y": 825.0
+            "x": 10.0,
+            "y": 185.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#16",
-          "pinName": ""
+          "compName": "Splitter#4",
+          "pinName": "O1"
         },
         "pin2": {
-          "compName": "WireCrossPoint#24",
-          "pinName": ""
+          "compName": "Splitter#5",
+          "pinName": "O1"
         },
         "name": "unnamedWire#17",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#24",
-          "pinName": ""
+          "compName": "Splitter#5",
+          "pinName": "O0"
         },
         "pin2": {
-          "compName": "ram2#0",
-          "pinName": "A0"
+          "compName": "Splitter#4",
+          "pinName": "O0"
         },
         "name": "unnamedWire#18",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#17",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "B"
         },
         "pin2": {
-          "compName": "WireCrossPoint#25",
-          "pinName": ""
+          "compName": "Splitter#4",
+          "pinName": "I"
         },
         "name": "unnamedWire#19",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#25",
-          "pinName": ""
+          "compName": "Splitter#5",
+          "pinName": "I"
         },
         "pin2": {
-          "compName": "ram2#0",
-          "pinName": "A1"
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
         },
         "name": "unnamedWire#20",
         "path": [
           {
-            "x": 45.0,
-            "y": 345.0
+            "x": 35.0,
+            "y": 85.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#18",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "pin2": {
-          "compName": "ram2#0",
-          "pinName": "B0"
+          "compName": "Splitter#3",
+          "pinName": "I"
         },
         "name": "unnamedWire#21",
         "path": [
           {
-            "x": 50.0,
-            "y": 355.0
+            "x": 40.0,
+            "y": 35.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#19",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "pin2": {
           "compName": "ram2#0",
-          "pinName": "B1"
+          "pinName": "A"
         },
         "name": "unnamedWire#22",
-        "path": [
-          {
-            "x": 55.0,
-            "y": 365.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#16",
-          "pinName": ""
+          "compName": "ram2#0",
+          "pinName": "B"
         },
         "pin2": {
-          "compName": "ram2#1",
-          "pinName": "A0"
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
         },
         "name": "unnamedWire#23",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#17",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
         "pin2": {
-          "compName": "ram2#1",
-          "pinName": "A1"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
         },
         "name": "unnamedWire#24",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#18",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "pin2": {
-          "compName": "ram2#1",
-          "pinName": "B0"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
         },
         "name": "unnamedWire#25",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#19",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
         "pin2": {
           "compName": "ram2#1",
-          "pinName": "B1"
+          "pinName": "A"
         },
         "name": "unnamedWire#26",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#16",
-          "pinName": ""
+          "compName": "ram2#1",
+          "pinName": "B"
         },
         "pin2": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
         "name": "unnamedWire#27",
@@ -1146,11 +764,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#17",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "D"
         },
         "pin2": {
-          "compName": "WireCrossPoint#21",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "name": "unnamedWire#28",
@@ -1158,23 +776,28 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#18",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#26",
-          "pinName": ""
+          "compName": "ram2#0",
+          "pinName": "D"
         },
         "name": "unnamedWire#29",
-        "path": []
+        "path": [
+          {
+            "x": 30.0,
+            "y": 195.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B2"
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#26",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "name": "unnamedWire#30",
@@ -1182,23 +805,23 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#26",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#22",
-          "pinName": ""
+          "compName": "ram2#1",
+          "pinName": "D"
         },
         "name": "unnamedWire#31",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#19",
+          "compName": "WireCrossPoint#11",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#23",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
         "name": "unnamedWire#32",
@@ -1206,1574 +829,641 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
         "pin2": {
-          "compName": "ram2#2",
-          "pinName": "A0"
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
         },
         "name": "unnamedWire#33",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#21",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "pin2": {
-          "compName": "ram2#2",
-          "pinName": "A1"
+          "compName": "WireCrossPoint#12",
+          "pinName": ""
         },
         "name": "unnamedWire#34",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#22",
+          "compName": "WireCrossPoint#11",
           "pinName": ""
         },
         "pin2": {
           "compName": "ram2#2",
-          "pinName": "B0"
+          "pinName": "A"
         },
         "name": "unnamedWire#35",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#23",
-          "pinName": ""
+          "compName": "ram2#2",
+          "pinName": "B"
         },
         "pin2": {
-          "compName": "ram2#2",
-          "pinName": "B1"
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
         },
         "name": "unnamedWire#36",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#12",
           "pinName": ""
         },
         "pin2": {
-          "compName": "ram2#3",
-          "pinName": "A0"
+          "compName": "ram2#2",
+          "pinName": "D"
         },
         "name": "unnamedWire#37",
-        "path": [
-          {
-            "x": 40.0,
-            "y": 785.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#21",
+          "compName": "WireCrossPoint#12",
           "pinName": ""
         },
         "pin2": {
           "compName": "ram2#3",
-          "pinName": "A1"
+          "pinName": "D"
         },
         "name": "unnamedWire#38",
         "path": [
           {
-            "x": 45.0,
-            "y": 795.0
+            "x": 30.0,
+            "y": 435.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#22",
+          "compName": "WireCrossPoint#10",
           "pinName": ""
         },
         "pin2": {
           "compName": "ram2#3",
-          "pinName": "B0"
+          "pinName": "B"
         },
         "name": "unnamedWire#39",
         "path": [
           {
-            "x": 50.0,
-            "y": 805.0
+            "x": 35.0,
+            "y": 410.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#23",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#27",
-          "pinName": ""
-        },
-        "name": "unnamedWire#40",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#27",
+          "compName": "WireCrossPoint#11",
           "pinName": ""
         },
         "pin2": {
           "compName": "ram2#3",
-          "pinName": "B1"
-        },
-        "name": "unnamedWire#41",
-        "path": [
-          {
-            "x": 55.0,
-            "y": 815.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A2"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#24",
-          "pinName": ""
+          "pinName": "A"
         },
-        "name": "unnamedWire#42",
+        "name": "unnamedWire#40",
         "path": [
           {
             "x": 40.0,
-            "y": 250.0
+            "y": 400.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A3"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#25",
-          "pinName": ""
-        },
-        "name": "unnamedWire#43",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B3"
+          "compName": "and41#2",
+          "pinName": "A"
         },
         "pin2": {
-          "compName": "WireCrossPoint#27",
-          "pinName": ""
+          "compName": "ram2#0",
+          "pinName": "QA"
         },
-        "name": "unnamedWire#44",
+        "name": "unnamedWire#41",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "andor414#5",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "ram2#0",
-          "pinName": "D1"
+          "compName": "_submodelinterface",
+          "pinName": "QA"
         },
-        "name": "unnamedWire#45",
+        "name": "unnamedWire#42",
         "path": [
           {
-            "x": 60.0,
-            "y": 385.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "ram2#0",
-          "pinName": "D2"
-        },
-        "name": "unnamedWire#46",
-        "path": [
+            "x": 240.0,
+            "y": 380.0
+          },
           {
-            "x": 65.0,
-            "y": 395.0
+            "x": 240.0,
+            "y": 25.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
+          "compName": "andor414#2",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "ram2#0",
-          "pinName": "D3"
+          "compName": "_submodelinterface",
+          "pinName": "QB"
         },
-        "name": "unnamedWire#47",
+        "name": "unnamedWire#43",
         "path": [
           {
-            "x": 70.0,
-            "y": 405.0
+            "x": 170.0,
+            "y": 410.0
+          },
+          {
+            "x": 170.0,
+            "y": 420.0
+          },
+          {
+            "x": 245.0,
+            "y": 420.0
+          },
+          {
+            "x": 245.0,
+            "y": 75.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
+          "compName": "ram2#0",
+          "pinName": "QB"
         },
         "pin2": {
-          "compName": "ram2#0",
-          "pinName": "D4"
+          "compName": "and41#1",
+          "pinName": "A"
         },
-        "name": "unnamedWire#48",
+        "name": "unnamedWire#44",
         "path": [
           {
-            "x": 75.0,
-            "y": 415.0
+            "x": 100.0,
+            "y": 170.0
+          },
+          {
+            "x": 100.0,
+            "y": 180.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "ram2#1",
-          "pinName": "D1"
-        },
-        "name": "unnamedWire#49",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
-        },
-        "pin2": {
           "compName": "ram2#1",
-          "pinName": "D2"
-        },
-        "name": "unnamedWire#50",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
+          "pinName": "QA"
         },
         "pin2": {
-          "compName": "ram2#1",
-          "pinName": "D3"
+          "compName": "andor414#3",
+          "pinName": "A"
         },
-        "name": "unnamedWire#51",
+        "name": "unnamedWire#45",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
-        },
-        "pin2": {
           "compName": "ram2#1",
-          "pinName": "D4"
-        },
-        "name": "unnamedWire#52",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
-        },
-        "name": "unnamedWire#53",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
-        },
-        "name": "unnamedWire#54",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
-        },
-        "name": "unnamedWire#55",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#11",
-          "pinName": ""
-        },
-        "name": "unnamedWire#56",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "ram2#2",
-          "pinName": "D1"
-        },
-        "name": "unnamedWire#57",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
+          "pinName": "QB"
         },
         "pin2": {
-          "compName": "ram2#2",
-          "pinName": "D2"
-        },
-        "name": "unnamedWire#58",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
+          "compName": "andor414#0",
+          "pinName": "A"
         },
-        "pin2": {
-          "compName": "ram2#2",
-          "pinName": "D3"
-        },
-        "name": "unnamedWire#59",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#11",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "ram2#2",
-          "pinName": "D4"
-        },
-        "name": "unnamedWire#60",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#12",
-          "pinName": ""
-        },
-        "name": "unnamedWire#61",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#13",
-          "pinName": ""
-        },
-        "name": "unnamedWire#62",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
-        },
-        "name": "unnamedWire#63",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#11",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#15",
-          "pinName": ""
-        },
-        "name": "unnamedWire#64",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#12",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "ram2#3",
-          "pinName": "D1"
-        },
-        "name": "unnamedWire#65",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#13",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "ram2#3",
-          "pinName": "D2"
-        },
-        "name": "unnamedWire#66",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "ram2#3",
-          "pinName": "D3"
-        },
-        "name": "unnamedWire#67",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#15",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "ram2#3",
-          "pinName": "D4"
-        },
-        "name": "unnamedWire#68",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D1"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#12",
-          "pinName": ""
-        },
-        "name": "unnamedWire#69",
-        "path": [
-          {
-            "x": 60.0,
-            "y": 950.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D2"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#13",
-          "pinName": ""
-        },
-        "name": "unnamedWire#70",
-        "path": [
-          {
-            "x": 65.0,
-            "y": 1050.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D3"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
-        },
-        "name": "unnamedWire#71",
-        "path": [
-          {
-            "x": 70.0,
-            "y": 1150.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D4"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#15",
-          "pinName": ""
-        },
-        "name": "unnamedWire#72",
-        "path": [
-          {
-            "x": 75.0,
-            "y": 1250.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "demux2#0",
-          "pinName": "Y00"
-        },
-        "pin2": {
-          "compName": "and41#2",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#73",
-        "path": [
-          {
-            "x": 150.0,
-            "y": 50.0
-          },
-          {
-            "x": 150.0,
-            "y": 365.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "demux2#0",
-          "pinName": "Y01"
-        },
-        "pin2": {
-          "compName": "andor414#3",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#74",
-        "path": [
-          {
-            "x": 130.0,
-            "y": 60.0
-          },
-          {
-            "x": 130.0,
-            "y": 470.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#8",
-          "pinName": "I"
-        },
-        "pin2": {
-          "compName": "andor414#4",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#75",
-        "path": [
-          {
-            "x": 150.0,
-            "y": 650.0
-          },
-          {
-            "x": 150.0,
-            "y": 610.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "andor414#5",
-          "pinName": "B"
-        },
-        "pin2": {
-          "compName": "demux2#0",
-          "pinName": "Y11"
-        },
-        "name": "unnamedWire#76",
-        "path": [
-          {
-            "x": 120.0,
-            "y": 770.0
-          },
-          {
-            "x": 120.0,
-            "y": 80.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "and41#1",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#77",
-        "path": [
-          {
-            "x": 230.0,
-            "y": 405.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "andor414#0",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#78",
-        "path": [
-          {
-            "x": 225.0,
-            "y": 550.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "andor414#1",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#79",
-        "path": [
-          {
-            "x": 220.0,
-            "y": 660.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "andor414#2",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#80",
-        "path": [
-          {
-            "x": 215.0,
-            "y": 805.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "ram2#0",
-          "pinName": "QB4"
-        },
-        "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O3"
-        },
-        "name": "unnamedWire#81",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O2"
-        },
-        "pin2": {
-          "compName": "ram2#0",
-          "pinName": "QB3"
-        },
-        "name": "unnamedWire#82",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "ram2#0",
-          "pinName": "QB2"
-        },
-        "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O1"
-        },
-        "name": "unnamedWire#83",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O0"
-        },
-        "pin2": {
-          "compName": "ram2#0",
-          "pinName": "QB1"
-        },
-        "name": "unnamedWire#84",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#7",
-          "pinName": "O0"
-        },
-        "pin2": {
-          "compName": "ram2#1",
-          "pinName": "QB1"
-        },
-        "name": "unnamedWire#85",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "ram2#1",
-          "pinName": "QB2"
-        },
-        "pin2": {
-          "compName": "Splitter#7",
-          "pinName": "O1"
-        },
-        "name": "unnamedWire#86",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#7",
-          "pinName": "O2"
-        },
-        "pin2": {
-          "compName": "ram2#1",
-          "pinName": "QB3"
-        },
-        "name": "unnamedWire#87",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "ram2#1",
-          "pinName": "QB4"
-        },
-        "pin2": {
-          "compName": "Splitter#7",
-          "pinName": "O3"
-        },
-        "name": "unnamedWire#88",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "ram2#2",
-          "pinName": "QB1"
-        },
-        "pin2": {
-          "compName": "Splitter#9",
-          "pinName": "O0"
-        },
-        "name": "unnamedWire#89",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#9",
-          "pinName": "O1"
-        },
-        "pin2": {
-          "compName": "ram2#2",
-          "pinName": "QB2"
-        },
-        "name": "unnamedWire#90",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "ram2#2",
-          "pinName": "QB3"
-        },
-        "pin2": {
-          "compName": "Splitter#9",
-          "pinName": "O2"
-        },
-        "name": "unnamedWire#91",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#9",
-          "pinName": "O3"
-        },
-        "pin2": {
-          "compName": "ram2#2",
-          "pinName": "QB4"
-        },
-        "name": "unnamedWire#92",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "ram2#3",
-          "pinName": "QB4"
-        },
-        "pin2": {
-          "compName": "Splitter#11",
-          "pinName": "O3"
-        },
-        "name": "unnamedWire#93",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#11",
-          "pinName": "O2"
-        },
-        "pin2": {
-          "compName": "ram2#3",
-          "pinName": "QB3"
-        },
-        "name": "unnamedWire#94",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "ram2#3",
-          "pinName": "QB2"
-        },
-        "pin2": {
-          "compName": "Splitter#11",
-          "pinName": "O1"
-        },
-        "name": "unnamedWire#95",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#11",
-          "pinName": "O0"
-        },
-        "pin2": {
-          "compName": "ram2#3",
-          "pinName": "QB1"
-        },
-        "name": "unnamedWire#96",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "ram2#0",
-          "pinName": "QA4"
-        },
-        "pin2": {
-          "compName": "Splitter#1",
-          "pinName": "O3"
-        },
-        "name": "unnamedWire#97",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "ram2#0",
-          "pinName": "QA3"
-        },
-        "pin2": {
-          "compName": "Splitter#1",
-          "pinName": "O2"
-        },
-        "name": "unnamedWire#98",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "O1"
-        },
-        "pin2": {
-          "compName": "ram2#0",
-          "pinName": "QA2"
-        },
-        "name": "unnamedWire#99",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "ram2#0",
-          "pinName": "QA1"
-        },
-        "pin2": {
-          "compName": "Splitter#1",
-          "pinName": "O0"
-        },
-        "name": "unnamedWire#100",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#6",
-          "pinName": "I"
-        },
-        "pin2": {
-          "compName": "andor414#3",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#101",
-        "path": [
-          {
-            "x": 155.0,
-            "y": 500.0
-          },
-          {
-            "x": 155.0,
-            "y": 460.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "ram2#1",
-          "pinName": "QA4"
-        },
-        "pin2": {
-          "compName": "Splitter#6",
-          "pinName": "O3"
-        },
-        "name": "unnamedWire#102",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#6",
-          "pinName": "O2"
-        },
-        "pin2": {
-          "compName": "ram2#1",
-          "pinName": "QA3"
-        },
-        "name": "unnamedWire#103",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "ram2#1",
-          "pinName": "QA2"
-        },
-        "pin2": {
-          "compName": "Splitter#6",
-          "pinName": "O1"
-        },
-        "name": "unnamedWire#104",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "demux2#0",
-          "pinName": "Y10"
-        },
-        "pin2": {
-          "compName": "andor414#4",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#105",
-        "path": [
-          {
-            "x": 125.0,
-            "y": 70.0
-          },
-          {
-            "x": 125.0,
-            "y": 620.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#8",
-          "pinName": "O0"
-        },
-        "pin2": {
-          "compName": "ram2#2",
-          "pinName": "QA1"
-        },
-        "name": "unnamedWire#106",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "ram2#2",
-          "pinName": "QA2"
-        },
-        "pin2": {
-          "compName": "Splitter#8",
-          "pinName": "O1"
-        },
-        "name": "unnamedWire#107",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#8",
-          "pinName": "O2"
-        },
-        "pin2": {
-          "compName": "ram2#2",
-          "pinName": "QA3"
-        },
-        "name": "unnamedWire#108",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#10",
-          "pinName": "O0"
-        },
-        "pin2": {
-          "compName": "ram2#3",
-          "pinName": "QA1"
-        },
-        "name": "unnamedWire#109",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#10",
-          "pinName": "O1"
-        },
-        "pin2": {
-          "compName": "ram2#3",
-          "pinName": "QA2"
-        },
-        "name": "unnamedWire#110",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "ram2#3",
-          "pinName": "QA3"
-        },
-        "pin2": {
-          "compName": "Splitter#10",
-          "pinName": "O2"
-        },
-        "name": "unnamedWire#111",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#10",
-          "pinName": "O3"
-        },
-        "pin2": {
-          "compName": "ram2#3",
-          "pinName": "QA4"
-        },
-        "name": "unnamedWire#112",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "and41#1",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "andor414#0",
-          "pinName": "C"
-        },
-        "name": "unnamedWire#113",
-        "path": [
-          {
-            "x": 290.0,
-            "y": 390.0
-          },
-          {
-            "x": 290.0,
-            "y": 455.0
-          },
-          {
-            "x": 245.0,
-            "y": 455.0
-          },
-          {
-            "x": 245.0,
-            "y": 520.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "andor414#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "andor414#1",
-          "pinName": "C"
-        },
-        "name": "unnamedWire#114",
-        "path": [
-          {
-            "x": 290.0,
-            "y": 520.0
-          },
-          {
-            "x": 290.0,
-            "y": 620.0
-          },
-          {
-            "x": 245.0,
-            "y": 620.0
-          },
-          {
-            "x": 245.0,
-            "y": 630.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "andor414#1",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "andor414#2",
-          "pinName": "C"
-        },
-        "name": "unnamedWire#115",
+        "name": "unnamedWire#46",
         "path": [
           {
-            "x": 290.0,
-            "y": 630.0
-          },
-          {
-            "x": 290.0,
-            "y": 765.0
-          },
-          {
-            "x": 245.0,
-            "y": 765.0
+            "x": 100.0,
+            "y": 250.0
           },
           {
-            "x": 245.0,
-            "y": 775.0
+            "x": 100.0,
+            "y": 270.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "andor414#2",
-          "pinName": "Y"
+          "compName": "ram2#2",
+          "pinName": "QA"
         },
         "pin2": {
-          "compName": "Splitter#3",
-          "pinName": "I"
+          "compName": "andor414#4",
+          "pinName": "A"
         },
-        "name": "unnamedWire#116",
+        "name": "unnamedWire#47",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O0"
+          "compName": "andor414#1",
+          "pinName": "A"
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QB1"
+          "compName": "ram2#2",
+          "pinName": "QB"
         },
-        "name": "unnamedWire#117",
+        "name": "unnamedWire#48",
         "path": [
           {
-            "x": 345.0,
-            "y": 790.0
+            "x": 100.0,
+            "y": 350.0
           },
           {
-            "x": 345.0,
-            "y": 450.0
+            "x": 100.0,
+            "y": 330.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "QB2"
+          "compName": "ram2#3",
+          "pinName": "QA"
         },
         "pin2": {
-          "compName": "Splitter#3",
-          "pinName": "O1"
+          "compName": "andor414#5",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#49",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "ram2#3",
+          "pinName": "QB"
+        },
+        "pin2": {
+          "compName": "andor414#2",
+          "pinName": "A"
         },
-        "name": "unnamedWire#118",
+        "name": "unnamedWire#50",
         "path": [
           {
-            "x": 340.0,
-            "y": 550.0
+            "x": 100.0,
+            "y": 410.0
           },
           {
-            "x": 340.0,
-            "y": 780.0
+            "x": 100.0,
+            "y": 430.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O2"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QB3"
+          "compName": "and41#1",
+          "pinName": "B"
         },
-        "name": "unnamedWire#119",
+        "name": "unnamedWire#51",
         "path": [
           {
-            "x": 335.0,
-            "y": 770.0
-          },
-          {
-            "x": 335.0,
-            "y": 650.0
+            "x": 105.0,
+            "y": 195.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "QB4"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#3",
-          "pinName": "O3"
+          "compName": "andor414#0",
+          "pinName": "B"
         },
-        "name": "unnamedWire#120",
+        "name": "unnamedWire#52",
         "path": [
           {
-            "x": 330.0,
-            "y": 750.0
-          },
-          {
-            "x": 330.0,
-            "y": 760.0
+            "x": 110.0,
+            "y": 280.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "Splitter#6",
-          "pinName": "O0"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "ram2#1",
-          "pinName": "QA1"
+          "compName": "andor414#1",
+          "pinName": "B"
         },
-        "name": "unnamedWire#121",
-        "path": []
+        "name": "unnamedWire#53",
+        "path": [
+          {
+            "x": 115.0,
+            "y": 360.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "Splitter#7",
-          "pinName": "I"
+          "compName": "andor414#2",
+          "pinName": "B"
         },
         "pin2": {
-          "compName": "andor414#0",
-          "pinName": "A"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
         },
-        "name": "unnamedWire#122",
-        "path": []
+        "name": "unnamedWire#54",
+        "path": [
+          {
+            "x": 120.0,
+            "y": 440.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "ram2#2",
-          "pinName": "QA4"
+          "compName": "demux2#0",
+          "pinName": "Y11"
         },
         "pin2": {
-          "compName": "Splitter#8",
-          "pinName": "O3"
+          "compName": "and41#2",
+          "pinName": "B"
         },
-        "name": "unnamedWire#123",
-        "path": []
+        "name": "unnamedWire#55",
+        "path": [
+          {
+            "x": 170.0,
+            "y": 10.0
+          },
+          {
+            "x": 170.0,
+            "y": 175.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "Splitter#9",
-          "pinName": "I"
+          "compName": "andor414#3",
+          "pinName": "B"
         },
         "pin2": {
-          "compName": "andor414#1",
-          "pinName": "A"
+          "compName": "demux2#0",
+          "pinName": "Y10"
         },
-        "name": "unnamedWire#124",
+        "name": "unnamedWire#56",
         "path": [
           {
-            "x": 235.0,
-            "y": 690.0
+            "x": 175.0,
+            "y": 250.0
           },
           {
-            "x": 235.0,
-            "y": 650.0
+            "x": 175.0,
+            "y": 20.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
-          "pinName": "I"
+          "compName": "demux2#0",
+          "pinName": "Y01"
         },
         "pin2": {
-          "compName": "andor414#5",
-          "pinName": "A"
+          "compName": "andor414#4",
+          "pinName": "B"
         },
-        "name": "unnamedWire#125",
+        "name": "unnamedWire#57",
         "path": [
           {
-            "x": 150.0,
-            "y": 800.0
+            "x": 180.0,
+            "y": 30.0
           },
           {
-            "x": 150.0,
-            "y": 760.0
+            "x": 180.0,
+            "y": 330.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "Splitter#11",
-          "pinName": "I"
+          "compName": "andor414#5",
+          "pinName": "B"
         },
         "pin2": {
-          "compName": "andor414#2",
-          "pinName": "A"
+          "compName": "demux2#0",
+          "pinName": "Y00"
         },
-        "name": "unnamedWire#126",
+        "name": "unnamedWire#58",
         "path": [
           {
-            "x": 240.0,
-            "y": 840.0
+            "x": 185.0,
+            "y": 410.0
           },
           {
-            "x": 240.0,
-            "y": 795.0
+            "x": 185.0,
+            "y": 40.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "and41#2",
+          "compName": "and41#1",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "andor414#3",
+          "compName": "andor414#0",
           "pinName": "C"
         },
-        "name": "unnamedWire#127",
+        "name": "unnamedWire#59",
         "path": [
           {
-            "x": 195.0,
-            "y": 350.0
+            "x": 165.0,
+            "y": 180.0
           },
           {
-            "x": 195.0,
-            "y": 385.0
+            "x": 165.0,
+            "y": 210.0
           },
           {
-            "x": 155.0,
-            "y": 385.0
+            "x": 125.0,
+            "y": 210.0
           },
           {
-            "x": 155.0,
-            "y": 440.0
+            "x": 125.0,
+            "y": 250.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "andor414#3",
+          "compName": "andor414#0",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "andor414#4",
+          "compName": "andor414#1",
           "pinName": "C"
         },
-        "name": "unnamedWire#128",
+        "name": "unnamedWire#60",
         "path": [
           {
-            "x": 195.0,
-            "y": 440.0
+            "x": 165.0,
+            "y": 250.0
           },
           {
-            "x": 195.0,
-            "y": 580.0
+            "x": 165.0,
+            "y": 290.0
           },
           {
-            "x": 150.0,
-            "y": 580.0
+            "x": 125.0,
+            "y": 290.0
           },
           {
-            "x": 150.0,
-            "y": 590.0
+            "x": 125.0,
+            "y": 330.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "andor414#4",
+          "compName": "andor414#1",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "andor414#5",
+          "compName": "andor414#2",
           "pinName": "C"
         },
-        "name": "unnamedWire#129",
+        "name": "unnamedWire#61",
         "path": [
           {
-            "x": 195.0,
-            "y": 590.0
+            "x": 165.0,
+            "y": 330.0
           },
           {
-            "x": 195.0,
-            "y": 730.0
+            "x": 165.0,
+            "y": 375.0
           },
           {
-            "x": 150.0,
-            "y": 730.0
+            "x": 125.0,
+            "y": 375.0
           },
           {
-            "x": 150.0,
-            "y": 740.0
+            "x": 125.0,
+            "y": 410.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "andor414#5",
+          "compName": "and41#2",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "I"
+          "compName": "andor414#3",
+          "pinName": "C"
         },
-        "name": "unnamedWire#130",
+        "name": "unnamedWire#62",
         "path": [
           {
-            "x": 195.0,
-            "y": 740.0
+            "x": 230.0,
+            "y": 160.0
           },
           {
-            "x": 195.0,
-            "y": 915.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O3"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QA4"
-        },
-        "name": "unnamedWire#131",
-        "path": [
+            "x": 230.0,
+            "y": 190.0
+          },
           {
-            "x": 310.0,
-            "y": 900.0
+            "x": 190.0,
+            "y": 190.0
           },
           {
-            "x": 310.0,
-            "y": 350.0
+            "x": 190.0,
+            "y": 220.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "QA3"
+          "compName": "andor414#3",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O2"
+          "compName": "andor414#4",
+          "pinName": "C"
         },
-        "name": "unnamedWire#132",
+        "name": "unnamedWire#63",
         "path": [
           {
-            "x": 315.0,
-            "y": 250.0
+            "x": 230.0,
+            "y": 220.0
+          },
+          {
+            "x": 230.0,
+            "y": 260.0
+          },
+          {
+            "x": 190.0,
+            "y": 260.0
           },
           {
-            "x": 315.0,
-            "y": 910.0
+            "x": 190.0,
+            "y": 300.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O1"
+          "compName": "andor414#4",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "QA2"
+          "compName": "andor414#5",
+          "pinName": "C"
         },
-        "name": "unnamedWire#133",
+        "name": "unnamedWire#64",
         "path": [
           {
-            "x": 320.0,
-            "y": 920.0
+            "x": 230.0,
+            "y": 300.0
           },
           {
-            "x": 320.0,
-            "y": 150.0
+            "x": 230.0,
+            "y": 340.0
+          },
+          {
+            "x": 190.0,
+            "y": 340.0
+          },
+          {
+            "x": 190.0,
+            "y": 380.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "QA1"
+          "compName": "and41#0",
+          "pinName": "Y"
         },
         "pin2": {
           "compName": "Splitter#0",
-          "pinName": "O0"
+          "pinName": "I"
         },
-        "name": "unnamedWire#134",
+        "name": "unnamedWire#65",
         "path": [
           {
-            "x": 325.0,
-            "y": 50.0
+            "x": 230.0,
+            "y": 75.0
           },
           {
-            "x": 325.0,
-            "y": 930.0
+            "x": 230.0,
+            "y": 115.0
           }
         ]
       },
@@ -2783,55 +1473,46 @@
           "pinName": "I"
         },
         "pin2": {
-          "compName": "and41#2",
+          "compName": "and41#0",
           "pinName": "A"
         },
-        "name": "unnamedWire#135",
+        "name": "unnamedWire#66",
         "path": []
       },
       {
         "pin1": {
           "compName": "Splitter#2",
-          "pinName": "I"
+          "pinName": "O1"
         },
         "pin2": {
-          "compName": "and41#1",
-          "pinName": "A"
+          "compName": "Splitter#3",
+          "pinName": "O1"
         },
-        "name": "unnamedWire#136",
+        "name": "unnamedWire#67",
         "path": []
       },
       {
         "pin1": {
-          "compName": "and41#0",
-          "pinName": "Y"
+          "compName": "Splitter#3",
+          "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "I"
+          "compName": "Splitter#2",
+          "pinName": "O0"
         },
-        "name": "unnamedWire#137",
-        "path": [
-          {
-            "x": 290.0,
-            "y": 170.0
-          },
-          {
-            "x": 290.0,
-            "y": 225.0
-          }
-        ]
+        "name": "unnamedWire#68",
+        "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#2",
           "pinName": "I"
         },
         "pin2": {
-          "compName": "and41#0",
+          "compName": "_submodelinterface",
           "pinName": "A"
         },
-        "name": "unnamedWire#138",
+        "name": "unnamedWire#69",
         "path": []
       }
     ],
@@ -2852,137 +1533,121 @@
       "c00": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#0"
+          "delegateTarget": "ram2#3"
         }
       },
       "c01": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#1"
+          "delegateTarget": "ram2#2"
         }
       },
       "c10": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#2"
+          "delegateTarget": "ram2#1"
         }
       },
       "c11": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#3"
+          "delegateTarget": "ram2#0"
         }
       },
       "c0000": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#0",
-          "prefix": "c00"
+          "prefix": "c00.c00"
         }
       },
       "c0001": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#1",
-          "prefix": "c00"
+          "prefix": "c00.c01"
         }
       },
       "c0010": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#2",
-          "prefix": "c00"
+          "prefix": "c00.c10"
         }
       },
       "c0011": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#3",
-          "prefix": "c00"
+          "prefix": "c00.c11"
         }
       },
       "c0100": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#0",
-          "prefix": "c01"
+          "prefix": "c01.c00"
         }
       },
       "c0101": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#1",
-          "prefix": "c01"
+          "prefix": "c01.c01"
         }
       },
       "c0110": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#2",
-          "prefix": "c01"
+          "prefix": "c01.c10"
         }
       },
       "c0111": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#3",
-          "prefix": "c01"
+          "prefix": "c01.c11"
         }
       },
       "c1000": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#0",
-          "prefix": "c10"
+          "prefix": "c10.c00"
         }
       },
       "c1001": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#1",
-          "prefix": "c10"
+          "prefix": "c10.c01"
         }
       },
       "c1010": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#2",
-          "prefix": "c10"
+          "prefix": "c10.c10"
         }
       },
       "c1011": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#3",
-          "prefix": "c10"
+          "prefix": "c10.c11"
         }
       },
       "c1100": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#0",
-          "prefix": "c11"
+          "prefix": "c11.c00"
         }
       },
       "c1101": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#1",
-          "prefix": "c11"
+          "prefix": "c11.c01"
         }
       },
       "c1110": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#2",
-          "prefix": "c11"
+          "prefix": "c11.c10"
         }
       },
       "c1111": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "ram2#3",
-          "prefix": "c11"
+          "prefix": "c11.c11"
         }
       }
     },
Mirror of https://github.com/Mograsim-Team/Mograsim