Merge branch 'development' of https://gitlab.lrz.de/lrr-tum/students/eragp-misim...

diff --git a/SWTHelper b/SWTHelper
index 675171d..7857458 160000 (submodule)
--- a/SWTHelper
+++ b/SWTHelper
@@ -1 +1 @@
-Subproject commit 675171d7c711e4d699b44c40d2b68d18709b7b90
+Subproject commit 7857458991642e998c691d9b65d5a9bf7f7bbfae

diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/CoreWire.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/CoreWire.java
index 7d81f6d..8b71a0c 100644 (file)
--- a/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/CoreWire.java
+++ b/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/CoreWire.java
@@ -445,6 +445,7 @@ public class CoreWire
                        feedSignals(BitVector.of(newValues));
                }
 
+               // TODO what if this is called multiple times at the same simulation time? (happens in component unit tests)
                public void feedSignals(BitVector newValues)
                {
                        if (newValues.length() != width)

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
index 8b6e7fb..7afc8a7 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
@@ -5,21 +5,9 @@
   "innerScale": 0.4,
   "submodel": {
     "components": [
-      {
-        "id": "Clock",
-        "name": "Clock#0",
-        "pos": {
-          "x": 155.0,
-          "y": 246.0
-        },
-        "params": {
-          "delta": 1000,
-          "orientation": "DOWN"
-        }
-      },
       {
         "id": "Am2901",
-        "name": "DeserializedSubmodelComponent#0",
+        "name": "Am2901#0",
         "pos": {
           "x": 420.0,
           "y": 240.0
@@ -27,47 +15,15 @@
       },
       {
         "id": "Am2901",
-        "name": "DeserializedSubmodelComponent#1",
+        "name": "Am2901#1",
         "pos": {
           "x": 485.0,
           "y": 240.0
         }
       },
-      {
-        "id": "mux1_4",
-        "name": "DeserializedSubmodelComponent#10",
-        "pos": {
-          "x": 320.0,
-          "y": 15.0
-        }
-      },
-      {
-        "id": "mux1_4",
-        "name": "DeserializedSubmodelComponent#11",
-        "pos": {
-          "x": 320.0,
-          "y": 120.0
-        }
-      },
-      {
-        "id": "dff12_we",
-        "name": "DeserializedSubmodelComponent#12",
-        "pos": {
-          "x": 290.0,
-          "y": 485.0
-        }
-      },
-      {
-        "id": "mux1_12",
-        "name": "DeserializedSubmodelComponent#13",
-        "pos": {
-          "x": 170.0,
-          "y": 495.0
-        }
-      },
       {
         "id": "Am2901",
-        "name": "DeserializedSubmodelComponent#2",
+        "name": "Am2901#2",
         "pos": {
           "x": 550.0,
           "y": 240.0
@@ -75,7 +31,7 @@
       },
       {
         "id": "Am2901",
-        "name": "DeserializedSubmodelComponent#3",
+        "name": "Am2901#3",
         "pos": {
           "x": 615.0,
           "y": 240.0
@@ -83,7 +39,7 @@
       },
       {
         "id": "Am2904",
-        "name": "DeserializedSubmodelComponent#4",
+        "name": "Am2904#0",
         "pos": {
           "x": 240.0,
           "y": 241.0
@@ -91,42 +47,22 @@
       },
       {
         "id": "Am2910",
-        "name": "DeserializedSubmodelComponent#5",
+        "name": "Am2910#0",
         "pos": {
           "x": 100.0,
           "y": 351.0
         }
       },
       {
-        "id": "and",
-        "name": "DeserializedSubmodelComponent#6",
-        "pos": {
-          "x": 665.0,
-          "y": 501.0
-        }
-      },
-      {
-        "id": "and",
-        "name": "DeserializedSubmodelComponent#7",
-        "pos": {
-          "x": 550.0,
-          "y": 541.0
-        }
-      },
-      {
-        "id": "and",
-        "name": "DeserializedSubmodelComponent#8",
-        "pos": {
-          "x": 730.0,
-          "y": 526.0
-        }
-      },
-      {
-        "id": "dff16_invwe",
-        "name": "DeserializedSubmodelComponent#9",
+        "id": "Clock",
+        "name": "Clock#0",
         "pos": {
-          "x": 135.0,
-          "y": 106.0
+          "x": 155.0,
+          "y": 246.0
+        },
+        "params": {
+          "delta": 1000,
+          "orientation": "DOWN"
         }
       },
       {
@@ -157,14 +93,14 @@
       },
       {
         "id": "FixedOutput",
-        "name": "FixedOutput#11",
+        "name": "FixedOutput#2",
         "pos": {
-          "x": 210.0,
-          "y": 281.0
+          "x": 70.0,
+          "y": 346.0
         },
         "params": {
           "bits": [
-            "ZERO"
+            "ONE"
           ]
         }
       },
@@ -172,8 +108,8 @@
         "id": "FixedOutput",
         "name": "FixedOutput#3",
         "pos": {
-          "x": 70.0,
-          "y": 346.0
+          "x": 175.0,
+          "y": 396.0
         },
         "params": {
           "bits": [
@@ -183,23 +119,23 @@
       },
       {
         "id": "FixedOutput",
-        "name": "FixedOutput#5",
+        "name": "FixedOutput#4",
         "pos": {
-          "x": 175.0,
-          "y": 396.0
+          "x": 140.0,
+          "y": 431.0
         },
         "params": {
           "bits": [
-            "ONE"
+            "ZERO"
           ]
         }
       },
       {
         "id": "FixedOutput",
-        "name": "FixedOutput#7",
+        "name": "FixedOutput#5",
         "pos": {
-          "x": 140.0,
-          "y": 431.0
+          "x": 210.0,
+          "y": 316.0
         },
         "params": {
           "bits": [
@@ -209,10 +145,10 @@
       },
       {
         "id": "FixedOutput",
-        "name": "FixedOutput#9",
+        "name": "FixedOutput#6",
         "pos": {
           "x": 210.0,
-          "y": 316.0
+          "y": 281.0
         },
         "params": {
           "bits": [
@@ -386,7 +322,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
         "pos": {
-          "x": 200.0,
+          "x": 199.0,
           "y": 236.0
         },
         "params": 1
@@ -395,7 +331,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#1",
         "pos": {
-          "x": 400.0,
+          "x": 399.0,
           "y": 231.0
         },
         "params": 1
@@ -404,8 +340,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#10",
         "pos": {
-          "x": 415.0,
-          "y": 220.0
+          "x": 414.0,
+          "y": 219.0
         },
         "params": 4
       },
@@ -413,8 +349,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#11",
         "pos": {
-          "x": 410.0,
-          "y": 225.0
+          "x": 409.0,
+          "y": 224.0
         },
         "params": 4
       },
@@ -423,7 +359,7 @@
         "name": "WireCrossPoint#12",
         "pos": {
           "x": 266.0,
-          "y": 555.0
+          "y": 554.0
         },
         "params": 1
       },
@@ -431,8 +367,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#13",
         "pos": {
-          "x": 245.0,
-          "y": 490.0
+          "x": 244.0,
+          "y": 489.0
         },
         "params": 1
       },
@@ -440,8 +376,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#14",
         "pos": {
-          "x": 355.0,
-          "y": 505.0
+          "x": 354.0,
+          "y": 504.0
         },
         "params": 12
       },
@@ -449,7 +385,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#2",
         "pos": {
-          "x": 470.0,
+          "x": 469.0,
           "y": 231.0
         },
         "params": 1
@@ -458,7 +394,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#3",
         "pos": {
-          "x": 535.0,
+          "x": 534.0,
           "y": 231.0
         },
         "params": 1
@@ -467,7 +403,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#4",
         "pos": {
-          "x": 230.0,
+          "x": 229.0,
           "y": 176.0
         },
         "params": 1
@@ -476,7 +412,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#5",
         "pos": {
-          "x": 235.0,
+          "x": 234.0,
           "y": 281.0
         },
         "params": 1
@@ -485,8 +421,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#6",
         "pos": {
-          "x": 525.0,
-          "y": 225.0
+          "x": 524.0,
+          "y": 224.0
         },
         "params": 4
       },
@@ -494,8 +430,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#7",
         "pos": {
-          "x": 530.0,
-          "y": 220.0
+          "x": 529.0,
+          "y": 219.0
         },
         "params": 4
       },
@@ -503,8 +439,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#8",
         "pos": {
-          "x": 465.0,
-          "y": 220.0
+          "x": 464.0,
+          "y": 219.0
         },
         "params": 4
       },
@@ -512,11 +448,51 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#9",
         "pos": {
-          "x": 460.0,
-          "y": 225.0
+          "x": 459.0,
+          "y": 224.0
         },
         "params": 4
       },
+      {
+        "id": "and",
+        "name": "and#0",
+        "pos": {
+          "x": 665.0,
+          "y": 501.0
+        }
+      },
+      {
+        "id": "and",
+        "name": "and#1",
+        "pos": {
+          "x": 550.0,
+          "y": 541.0
+        }
+      },
+      {
+        "id": "and",
+        "name": "and#2",
+        "pos": {
+          "x": 730.0,
+          "y": 526.0
+        }
+      },
+      {
+        "id": "dff12_we",
+        "name": "dff12_we#0",
+        "pos": {
+          "x": 290.0,
+          "y": 485.0
+        }
+      },
+      {
+        "id": "dff16_invwe",
+        "name": "dff16_invwe#0",
+        "pos": {
+          "x": 135.0,
+          "y": 106.0
+        }
+      },
       {
         "id": "inc12",
         "name": "inc12#0",
@@ -524,16 +500,40 @@
           "x": 245.0,
           "y": 525.0
         }
+      },
+      {
+        "id": "mux1_12",
+        "name": "mux1_12#0",
+        "pos": {
+          "x": 170.0,
+          "y": 495.0
+        }
+      },
+      {
+        "id": "mux1_4",
+        "name": "mux1_4#0",
+        "pos": {
+          "x": 320.0,
+          "y": 15.0
+        }
+      },
+      {
+        "id": "mux1_4",
+        "name": "mux1_4#1",
+        "pos": {
+          "x": 320.0,
+          "y": 120.0
+        }
       }
     ],
     "wires": [
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "Am2904#0",
           "pinName": "CT"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "Am2910#0",
           "pinName": "_CC"
         },
         "name": "unnamedWire#0",
@@ -541,11 +541,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2901#0",
           "pinName": "Qn+3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2901#1",
           "pinName": "Qn"
         },
         "name": "unnamedWire#1",
@@ -553,11 +553,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "Am2904#0",
           "pinName": "QIOn"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "Am2901#3",
           "pinName": "Qn+3"
         },
         "name": "unnamedWire#10",
@@ -565,7 +565,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "Am2901#2",
           "pinName": "B0"
         },
         "pin2": {
@@ -581,7 +581,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "Am2901#2",
           "pinName": "A3"
         },
         "name": "unnamedWire#101",
@@ -589,7 +589,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "Am2901#2",
           "pinName": "A2"
         },
         "pin2": {
@@ -605,7 +605,7 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "Am2901#2",
           "pinName": "A1"
         },
         "name": "unnamedWire#103",
@@ -613,7 +613,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "Am2901#2",
           "pinName": "A0"
         },
         "pin2": {
@@ -629,7 +629,7 @@
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "Am2901#3",
           "pinName": "A0"
         },
         "name": "unnamedWire#105",
@@ -637,7 +637,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "Am2901#3",
           "pinName": "A1"
         },
         "pin2": {
@@ -653,7 +653,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "Am2901#3",
           "pinName": "A2"
         },
         "name": "unnamedWire#107",
@@ -661,7 +661,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "Am2901#3",
           "pinName": "A3"
         },
         "pin2": {
@@ -677,7 +677,7 @@
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "Am2901#3",
           "pinName": "B0"
         },
         "name": "unnamedWire#109",
@@ -685,11 +685,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "Am2904#0",
           "pinName": "IN"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "Am2901#3",
           "pinName": "F3"
         },
         "name": "unnamedWire#11",
@@ -697,7 +697,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "Am2901#3",
           "pinName": "B1"
         },
         "pin2": {
@@ -713,7 +713,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "Am2901#3",
           "pinName": "B2"
         },
         "name": "unnamedWire#111",
@@ -721,7 +721,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "Am2901#3",
           "pinName": "B3"
         },
         "pin2": {
@@ -817,11 +817,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2901#0",
           "pinName": "F\u003d0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "and#1",
           "pinName": "B"
         },
         "name": "unnamedWire#12",
@@ -917,7 +917,7 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "dff12_we#0",
           "pinName": "WE"
         },
         "name": "unnamedWire#127",
@@ -929,7 +929,7 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "dff12_we#0",
           "pinName": "D"
         },
         "name": "unnamedWire#128",
@@ -941,7 +941,7 @@
           "pinName": "A"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "mux1_12#0",
           "pinName": "Y"
         },
         "name": "unnamedWire#129",
@@ -949,11 +949,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2901#1",
           "pinName": "F\u003d0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "and#1",
           "pinName": "A"
         },
         "name": "unnamedWire#13",
@@ -1009,7 +1009,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "mux1_12#0",
           "pinName": "I1"
         },
         "pin2": {
@@ -1021,7 +1021,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "mux1_12#0",
           "pinName": "S"
         },
         "pin2": {
@@ -1057,7 +1057,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "dff12_we#0",
           "pinName": "Q"
         },
         "pin2": {
@@ -1069,11 +1069,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "and#1",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "and#2",
           "pinName": "B"
         },
         "name": "unnamedWire#14",
@@ -1081,11 +1081,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "and#2",
           "pinName": "A"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "and#0",
           "pinName": "Y"
         },
         "name": "unnamedWire#15",
@@ -1093,11 +1093,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "and#0",
           "pinName": "B"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "Am2901#2",
           "pinName": "F\u003d0"
         },
         "name": "unnamedWire#16",
@@ -1105,11 +1105,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "Am2901#3",
           "pinName": "F\u003d0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "and#0",
           "pinName": "A"
         },
         "name": "unnamedWire#17",
@@ -1117,11 +1117,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "and#2",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "Am2904#0",
           "pinName": "IZ"
         },
         "name": "unnamedWire#18",
@@ -1129,11 +1129,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "Am2901#3",
           "pinName": "OVR"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "Am2904#0",
           "pinName": "IOVR"
         },
         "name": "unnamedWire#19",
@@ -1141,11 +1141,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2901#0",
           "pinName": "RAMn+3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2901#1",
           "pinName": "RAMn"
         },
         "name": "unnamedWire#2",
@@ -1153,11 +1153,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "Am2901#3",
           "pinName": "Cn+4"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "Am2904#0",
           "pinName": "IC"
         },
         "name": "unnamedWire#20",
@@ -1165,11 +1165,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2901#0",
           "pinName": "Cn+4"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2901#1",
           "pinName": "Cn"
         },
         "name": "unnamedWire#21",
@@ -1177,11 +1177,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2901#1",
           "pinName": "Cn+4"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "Am2901#2",
           "pinName": "Cn"
         },
         "name": "unnamedWire#22",
@@ -1189,11 +1189,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "Am2901#2",
           "pinName": "Cn+4"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "Am2901#3",
           "pinName": "Cn"
         },
         "name": "unnamedWire#23",
@@ -1201,7 +1201,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "Am2904#0",
           "pinName": "C"
         },
         "pin2": {
@@ -1229,7 +1229,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "Am2901#3",
           "pinName": "C"
         },
         "name": "unnamedWire#26",
@@ -1237,7 +1237,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "Am2901#2",
           "pinName": "C"
         },
         "pin2": {
@@ -1261,7 +1261,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2901#1",
           "pinName": "C"
         },
         "pin2": {
@@ -1273,11 +1273,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2901#1",
           "pinName": "Qn+3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "Am2901#2",
           "pinName": "Qn"
         },
         "name": "unnamedWire#3",
@@ -1301,7 +1301,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2901#0",
           "pinName": "C"
         },
         "name": "unnamedWire#31",
@@ -1321,11 +1321,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2901#0",
           "pinName": "Cn"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "Am2904#0",
           "pinName": "C0"
         },
         "name": "unnamedWire#33",
@@ -1333,7 +1333,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "Am2910#0",
           "pinName": "C"
         },
         "pin2": {
@@ -1349,7 +1349,7 @@
           "pinName": "out"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "Am2904#0",
           "pinName": "_OECT"
         },
         "name": "unnamedWire#35",
@@ -1357,11 +1357,11 @@
       },
       {
         "pin1": {
-          "compName": "FixedOutput#3",
+          "compName": "FixedOutput#2",
           "pinName": "out"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "Am2910#0",
           "pinName": "_RLD"
         },
         "name": "unnamedWire#36",
@@ -1369,11 +1369,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "Am2910#0",
           "pinName": "CI"
         },
         "pin2": {
-          "compName": "FixedOutput#5",
+          "compName": "FixedOutput#3",
           "pinName": "out"
         },
         "name": "unnamedWire#37",
@@ -1381,11 +1381,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "Am2910#0",
           "pinName": "_OE"
         },
         "pin2": {
-          "compName": "FixedOutput#7",
+          "compName": "FixedOutput#4",
           "pinName": "out"
         },
         "name": "unnamedWire#38",
@@ -1393,11 +1393,11 @@
       },
       {
         "pin1": {
-          "compName": "FixedOutput#9",
+          "compName": "FixedOutput#5",
           "pinName": "out"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "Am2904#0",
           "pinName": "_SE"
         },
         "name": "unnamedWire#39",
@@ -1405,11 +1405,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "Am2901#2",
           "pinName": "RAMn"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2901#1",
           "pinName": "RAMn+3"
         },
         "name": "unnamedWire#4",
@@ -1417,7 +1417,7 @@
       },
       {
         "pin1": {
-          "compName": "FixedOutput#11",
+          "compName": "FixedOutput#6",
           "pinName": "out"
         },
         "pin2": {
@@ -1429,7 +1429,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "Am2904#0",
           "pinName": "_EZ"
         },
         "pin2": {
@@ -1445,7 +1445,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "Am2904#0",
           "pinName": "_EOVR"
         },
         "name": "unnamedWire#42",
@@ -1453,7 +1453,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "Am2904#0",
           "pinName": "_EC"
         },
         "pin2": {
@@ -1469,7 +1469,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "Am2904#0",
           "pinName": "_EN"
         },
         "name": "unnamedWire#44",
@@ -1477,7 +1477,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "dff16_invwe#0",
           "pinName": "Q"
         },
         "pin2": {
@@ -1537,11 +1537,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "Am2901#3",
           "pinName": "RAMn"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "Am2901#2",
           "pinName": "RAMn+3"
         },
         "name": "unnamedWire#5",
@@ -1679,11 +1679,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "Am2901#2",
           "pinName": "Qn+3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "Am2901#3",
           "pinName": "Qn"
         },
         "name": "unnamedWire#6",
@@ -1731,7 +1731,7 @@
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "mux1_4#0",
           "pinName": "I0_1"
         },
         "name": "unnamedWire#63",
@@ -1739,7 +1739,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "mux1_4#0",
           "pinName": "I0_2"
         },
         "pin2": {
@@ -1755,7 +1755,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "mux1_4#0",
           "pinName": "I0_3"
         },
         "name": "unnamedWire#65",
@@ -1767,7 +1767,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "mux1_4#0",
           "pinName": "I0_4"
         },
         "name": "unnamedWire#66",
@@ -1779,7 +1779,7 @@
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "mux1_4#1",
           "pinName": "I0_1"
         },
         "name": "unnamedWire#67",
@@ -1787,7 +1787,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "mux1_4#1",
           "pinName": "I0_2"
         },
         "pin2": {
@@ -1803,7 +1803,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "mux1_4#1",
           "pinName": "I0_3"
         },
         "name": "unnamedWire#69",
@@ -1811,11 +1811,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2901#0",
           "pinName": "Qn"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "Am2904#0",
           "pinName": "QIO0"
         },
         "name": "unnamedWire#7",
@@ -1827,7 +1827,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "mux1_4#1",
           "pinName": "I0_4"
         },
         "name": "unnamedWire#70",
@@ -1859,7 +1859,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "mux1_4#0",
           "pinName": "Y1"
         },
         "pin2": {
@@ -1875,7 +1875,7 @@
           "pinName": "I2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "mux1_4#0",
           "pinName": "Y2"
         },
         "name": "unnamedWire#74",
@@ -1883,7 +1883,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "mux1_4#0",
           "pinName": "Y3"
         },
         "pin2": {
@@ -1899,7 +1899,7 @@
           "pinName": "I0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "mux1_4#0",
           "pinName": "Y4"
         },
         "name": "unnamedWire#76",
@@ -1907,7 +1907,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "mux1_4#1",
           "pinName": "Y1"
         },
         "pin2": {
@@ -1923,7 +1923,7 @@
           "pinName": "I2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "mux1_4#1",
           "pinName": "Y2"
         },
         "name": "unnamedWire#78",
@@ -1931,7 +1931,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "mux1_4#1",
           "pinName": "Y3"
         },
         "pin2": {
@@ -1943,11 +1943,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "Am2904#0",
           "pinName": "SIO0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2901#0",
           "pinName": "RAMn"
         },
         "name": "unnamedWire#8",
@@ -1959,7 +1959,7 @@
           "pinName": "I0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "mux1_4#1",
           "pinName": "Y4"
         },
         "name": "unnamedWire#80",
@@ -1967,7 +1967,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2901#0",
           "pinName": "B3"
         },
         "pin2": {
@@ -1983,7 +1983,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2901#0",
           "pinName": "B2"
         },
         "name": "unnamedWire#82",
@@ -1991,7 +1991,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2901#0",
           "pinName": "B1"
         },
         "pin2": {
@@ -2007,7 +2007,7 @@
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2901#0",
           "pinName": "B0"
         },
         "name": "unnamedWire#84",
@@ -2015,7 +2015,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2901#0",
           "pinName": "A3"
         },
         "pin2": {
@@ -2031,7 +2031,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2901#0",
           "pinName": "A2"
         },
         "name": "unnamedWire#86",
@@ -2039,7 +2039,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2901#0",
           "pinName": "A1"
         },
         "pin2": {
@@ -2051,7 +2051,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2901#0",
           "pinName": "A0"
         },
         "pin2": {
@@ -2067,7 +2067,7 @@
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2901#1",
           "pinName": "A0"
         },
         "name": "unnamedWire#89",
@@ -2075,11 +2075,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "Am2904#0",
           "pinName": "SIOn"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "Am2901#3",
           "pinName": "RAMn+3"
         },
         "name": "unnamedWire#9",
@@ -2087,7 +2087,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2901#1",
           "pinName": "A1"
         },
         "pin2": {
@@ -2103,7 +2103,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2901#1",
           "pinName": "A2"
         },
         "name": "unnamedWire#91",
@@ -2111,7 +2111,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2901#1",
           "pinName": "A3"
         },
         "pin2": {
@@ -2123,7 +2123,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2901#1",
           "pinName": "B0"
         },
         "pin2": {
@@ -2139,7 +2139,7 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2901#1",
           "pinName": "B1"
         },
         "name": "unnamedWire#94",
@@ -2147,7 +2147,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2901#1",
           "pinName": "B2"
         },
         "pin2": {
@@ -2163,7 +2163,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2901#1",
           "pinName": "B3"
         },
         "name": "unnamedWire#96",
@@ -2175,7 +2175,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "Am2901#2",
           "pinName": "B3"
         },
         "name": "unnamedWire#97",
@@ -2183,7 +2183,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "Am2901#2",
           "pinName": "B2"
         },
         "pin2": {
@@ -2199,7 +2199,7 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "Am2901#2",
           "pinName": "B1"
         },
         "name": "unnamedWire#99",
@@ -2210,7 +2210,7 @@
   },
   "symbolRendererSnippetID": "simpleRectangularLike",
   "symbolRendererParams": {
-    "centerText": "_rsLatch",
+    "centerText": "Am2900",
     "centerTextHeight": 5.0,
     "horizontalComponentCenter": 17.5,
     "pinLabelHeight": 3.5,

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
index e3e7243..2dd6a59 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
@@ -381,7 +381,7 @@
       },
       {
         "id": "TriStateBuffer",
-        "name": "TriStateBuffer#3",
+        "name": "TriStateBuffer#2",
         "pos": {
           "x": 300.0,
           "y": 2515.0
@@ -393,7 +393,7 @@
       },
       {
         "id": "TriStateBuffer",
-        "name": "TriStateBuffer#4",
+        "name": "TriStateBuffer#3",
         "pos": {
           "x": 300.0,
           "y": 2310.0
@@ -1480,7 +1480,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "TriStateBuffer#3",
+          "compName": "TriStateBuffer#2",
           "pinName": "IN"
         },
         "name": "unnamedWire#135",
@@ -1855,7 +1855,7 @@
       },
       {
         "pin1": {
-          "compName": "TriStateBuffer#3",
+          "compName": "TriStateBuffer#2",
           "pinName": "OUT"
         },
         "pin2": {
@@ -2098,7 +2098,7 @@
       },
       {
         "pin1": {
-          "compName": "TriStateBuffer#3",
+          "compName": "TriStateBuffer#2",
           "pinName": "EN"
         },
         "pin2": {
@@ -2114,7 +2114,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "TriStateBuffer#4",
+          "compName": "TriStateBuffer#3",
           "pinName": "IN"
         },
         "name": "unnamedWire#171",
@@ -3585,7 +3585,7 @@
       },
       {
         "pin1": {
-          "compName": "TriStateBuffer#4",
+          "compName": "TriStateBuffer#3",
           "pinName": "OUT"
         },
         "pin2": {
@@ -3601,7 +3601,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "TriStateBuffer#4",
+          "compName": "TriStateBuffer#3",
           "pinName": "EN"
         },
         "name": "unnamedWire#95",

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json
index 64a8478..836fe5c 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json
@@ -1,11 +1,11 @@
 {
   "width": 120.0,
-  "height": 178.0,
+  "height": 155.0,
   "interfacePins": [
     {
       "location": {
-        "x": 0.0,
-        "y": 5.0
+        "x": 55.0,
+        "y": 0.0
       },
       "name": "C",
       "logicWidth": 1,
@@ -14,7 +14,7 @@
     {
       "location": {
         "x": 120.0,
-        "y": 108.0
+        "y": 85.0
       },
       "name": "C0",
       "logicWidth": 1,
@@ -23,7 +23,7 @@
     {
       "location": {
         "x": 120.0,
-        "y": 60.0
+        "y": 55.0
       },
       "name": "CT",
       "logicWidth": 1,
@@ -32,7 +32,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 110.0
+        "y": 85.0
       },
       "name": "Cx",
       "logicWidth": 1,
@@ -41,7 +41,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 61.0
+        "y": 45.0
       },
       "name": "I",
       "logicWidth": 13,
@@ -86,7 +86,7 @@
     {
       "location": {
         "x": 120.0,
-        "y": 128.0
+        "y": 125.0
       },
       "name": "QIO0",
       "logicWidth": 1,
@@ -95,7 +95,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 128.0
+        "y": 125.0
       },
       "name": "QIOn",
       "logicWidth": 1,
@@ -104,7 +104,7 @@
     {
       "location": {
         "x": 120.0,
-        "y": 118.0
+        "y": 120.0
       },
       "name": "SIO0",
       "logicWidth": 1,
@@ -113,7 +113,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 119.0
+        "y": 120.0
       },
       "name": "SIOn",
       "logicWidth": 1,
@@ -122,7 +122,7 @@
     {
       "location": {
         "x": 120.0,
-        "y": 17.0
+        "y": 10.0
       },
       "name": "YC",
       "logicWidth": 1,
@@ -131,7 +131,7 @@
     {
       "location": {
         "x": 120.0,
-        "y": 21.0
+        "y": 15.0
       },
       "name": "YN",
       "logicWidth": 1,
@@ -140,7 +140,7 @@
     {
       "location": {
         "x": 120.0,
-        "y": 25.0
+        "y": 20.0
       },
       "name": "YOVR",
       "logicWidth": 1,
@@ -149,7 +149,7 @@
     {
       "location": {
         "x": 120.0,
-        "y": 11.0
+        "y": 5.0
       },
       "name": "YZ",
       "logicWidth": 1,
@@ -157,8 +157,8 @@
     },
     {
       "location": {
-        "x": 0.0,
-        "y": 30.0
+        "x": 5.0,
+        "y": 0.0
       },
       "name": "_CEM",
       "logicWidth": 1,
@@ -166,8 +166,8 @@
     },
     {
       "location": {
-        "x": 0.0,
-        "y": 33.0
+        "x": 45.0,
+        "y": 0.0
       },
       "name": "_CEmu",
       "logicWidth": 1,
@@ -175,8 +175,8 @@
     },
     {
       "location": {
-        "x": 0.0,
-        "y": 38.0
+        "x": 15.0,
+        "y": 0.0
       },
       "name": "_EC",
       "logicWidth": 1,
@@ -184,8 +184,8 @@
     },
     {
       "location": {
-        "x": 0.0,
-        "y": 40.0
+        "x": 20.0,
+        "y": 0.0
       },
       "name": "_EN",
       "logicWidth": 1,
@@ -193,8 +193,8 @@
     },
     {
       "location": {
-        "x": 0.0,
-        "y": 42.0
+        "x": 25.0,
+        "y": 0.0
       },
       "name": "_EOVR",
       "logicWidth": 1,
@@ -202,8 +202,8 @@
     },
     {
       "location": {
-        "x": 0.0,
-        "y": 36.0
+        "x": 10.0,
+        "y": 0.0
       },
       "name": "_EZ",
       "logicWidth": 1,
@@ -211,8 +211,8 @@
     },
     {
       "location": {
-        "x": 120.0,
-        "y": 51.0
+        "x": 110.0,
+        "y": 0.0
       },
       "name": "_OECT",
       "logicWidth": 1,
@@ -220,7 +220,7 @@
     },
     {
       "location": {
-        "x": 61.0,
+        "x": 90.0,
         "y": 0.0
       },
       "name": "_OEY",
@@ -230,7 +230,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 83.0
+        "y": 110.0
       },
       "name": "_SE",
       "logicWidth": 1,
@@ -240,240 +240,52 @@
   "innerScale": 0.2,
   "submodel": {
     "components": [
-      {
-        "id": "Am2904RegCTInstrDecode",
-        "name": "Am2904RegCTInstrDecode#0",
-        "pos": {
-          "x": 50.0,
-          "y": 240.0
-        }
-      },
-      {
-        "id": "Am2904ShiftInstrDecode",
-        "name": "Am2904ShiftInstrDecode#0",
-        "pos": {
-          "x": 50.0,
-          "y": 360.0
-        }
-      },
-      {
-        "id": "BitDisplay",
-        "name": "BitDisplay#0",
-        "pos": {
-          "x": 530.0,
-          "y": 70.0
-        },
-        "params": 4
-      },
-      {
-        "id": "BitDisplay",
-        "name": "BitDisplay#1",
-        "pos": {
-          "x": 565.0,
-          "y": 180.0
-        },
-        "params": 4
-      },
-      {
-        "id": "BitDisplay",
-        "name": "BitDisplay#2",
-        "pos": {
-          "x": 530.0,
-          "y": 200.0
-        },
-        "params": 4
-      },
-      {
-        "id": "BitDisplay",
-        "name": "BitDisplay#3",
-        "pos": {
-          "x": 560.0,
-          "y": 150.0
-        },
-        "params": 1
-      },
       {
         "id": "Am2904MSR",
-        "name": "DeserializedSubmodelComponent#0",
-        "pos": {
-          "x": 225.0,
-          "y": 95.0
-        }
-      },
-      {
-        "id": "Am2904muSR",
-        "name": "DeserializedSubmodelComponent#1",
-        "pos": {
-          "x": 270.0,
-          "y": 250.0
-        }
-      },
-      {
-        "id": "xor",
-        "name": "DeserializedSubmodelComponent#10",
-        "pos": {
-          "x": 455.0,
-          "y": 355.0
-        }
-      },
-      {
-        "id": "mux1",
-        "name": "DeserializedSubmodelComponent#11",
-        "pos": {
-          "x": 265.0,
-          "y": 515.0
-        }
-      },
-      {
-        "id": "xor",
-        "name": "DeserializedSubmodelComponent#12",
-        "pos": {
-          "x": 315.0,
-          "y": 505.0
-        }
-      },
-      {
-        "id": "mux1",
-        "name": "DeserializedSubmodelComponent#13",
-        "pos": {
-          "x": 365.0,
-          "y": 485.0
-        }
-      },
-      {
-        "id": "mux1",
-        "name": "DeserializedSubmodelComponent#14",
-        "pos": {
-          "x": 415.0,
-          "y": 465.0
-        }
-      },
-      {
-        "id": "mux2",
-        "name": "DeserializedSubmodelComponent#15",
-        "pos": {
-          "x": 435.0,
-          "y": 575.0
-        }
-      },
-      {
-        "id": "mux2",
-        "name": "DeserializedSubmodelComponent#16",
-        "pos": {
-          "x": 435.0,
-          "y": 655.0
-        }
-      },
-      {
-        "id": "mux1",
-        "name": "DeserializedSubmodelComponent#17",
-        "pos": {
-          "x": 190.0,
-          "y": 460.0
-        }
-      },
-      {
-        "id": "mux1",
-        "name": "DeserializedSubmodelComponent#18",
-        "pos": {
-          "x": 135.0,
-          "y": 470.0
-        }
-      },
-      {
-        "id": "and",
-        "name": "DeserializedSubmodelComponent#2",
-        "pos": {
-          "x": 380.0,
-          "y": 125.0
-        }
-      },
-      {
-        "id": "xor",
-        "name": "DeserializedSubmodelComponent#21",
-        "pos": {
-          "x": 250.0,
-          "y": 820.0
-        }
-      },
-      {
-        "id": "mux2",
-        "name": "DeserializedSubmodelComponent#22",
+        "name": "Am2904MSR#0",
         "pos": {
-          "x": 120.0,
-          "y": 720.0
-        }
-      },
-      {
-        "id": "mux3",
-        "name": "DeserializedSubmodelComponent#23",
-        "pos": {
-          "x": 300.0,
-          "y": 715.0
-        }
-      },
-      {
-        "id": "mux1_4",
-        "name": "DeserializedSubmodelComponent#3",
-        "pos": {
-          "x": 470.0,
-          "y": 160.0
+          "x": 205.0,
+          "y": 90.0
         }
       },
       {
-        "id": "not4",
-        "name": "DeserializedSubmodelComponent#4",
+        "id": "Am2904RegCTInstrDecode",
+        "name": "Am2904RegCTInstrDecode#0",
         "pos": {
-          "x": 135.0,
-          "y": 40.0
+          "x": 180.0,
+          "y": 190.0
         }
       },
       {
-        "id": "mux1_4",
-        "name": "DeserializedSubmodelComponent#5",
+        "id": "Am2904ShiftInstrDecode",
+        "name": "Am2904ShiftInstrDecode#0",
         "pos": {
-          "x": 415.0,
-          "y": 210.0
+          "x": 100.0,
+          "y": 495.0
         }
       },
       {
         "id": "Am2904TestLogic",
-        "name": "DeserializedSubmodelComponent#6",
-        "pos": {
-          "x": 225.0,
-          "y": 340.0
-        }
-      },
-      {
-        "id": "mux3",
-        "name": "DeserializedSubmodelComponent#7",
-        "pos": {
-          "x": 300.0,
-          "y": 310.0
-        }
-      },
-      {
-        "id": "xor",
-        "name": "DeserializedSubmodelComponent#8",
+        "name": "Am2904TestLogic#0",
         "pos": {
-          "x": 495.0,
-          "y": 295.0
+          "x": 260.0,
+          "y": 330.0
         }
       },
       {
-        "id": "mux1",
-        "name": "DeserializedSubmodelComponent#9",
+        "id": "Am2904muSR",
+        "name": "Am2904muSR#0",
         "pos": {
-          "x": 450.0,
-          "y": 310.0
+          "x": 350.0,
+          "y": 95.0
         }
       },
       {
         "id": "Merger",
         "name": "Merger#0",
         "pos": {
-          "x": 25.0,
-          "y": 315.0
+          "x": 20.0,
+          "y": 235.0
         },
         "params": 6
       },
@@ -481,8 +293,8 @@
         "id": "Merger",
         "name": "Merger#1",
         "pos": {
-          "x": 25.0,
-          "y": 265.0
+          "x": 20.0,
+          "y": 185.0
         },
         "params": 5
       },
@@ -499,8 +311,8 @@
         "id": "Merger",
         "name": "Merger#3",
         "pos": {
-          "x": 510.0,
-          "y": 165.0
+          "x": 520.0,
+          "y": 90.0
         },
         "params": 4
       },
@@ -508,8 +320,8 @@
         "id": "Merger",
         "name": "Merger#4",
         "pos": {
-          "x": 25.0,
-          "y": 245.0
+          "x": 20.0,
+          "y": 165.0
         },
         "params": 2
       },
@@ -517,8 +329,8 @@
         "id": "NandGate",
         "name": "NandGate#0",
         "pos": {
-          "x": 190.0,
-          "y": 145.0
+          "x": 230.0,
+          "y": 10.0
         },
         "params": 1
       },
@@ -526,7 +338,7 @@
         "id": "NandGate",
         "name": "NandGate#1",
         "pos": {
-          "x": 130.0,
+          "x": 140.0,
           "y": 5.0
         },
         "params": 1
@@ -535,17 +347,17 @@
         "id": "NandGate",
         "name": "NandGate#10",
         "pos": {
-          "x": 340.0,
-          "y": 120.0
+          "x": 455.0,
+          "y": 55.0
         },
         "params": 1
       },
       {
         "id": "NandGate",
-        "name": "NandGate#12",
+        "name": "NandGate#11",
         "pos": {
-          "x": 540.0,
-          "y": 265.0
+          "x": 555.0,
+          "y": 235.0
         },
         "params": 1
       },
@@ -553,8 +365,8 @@
         "id": "NandGate",
         "name": "NandGate#2",
         "pos": {
-          "x": 225.0,
-          "y": 195.0
+          "x": 325.0,
+          "y": 55.0
         },
         "params": 1
       },
@@ -562,8 +374,8 @@
         "id": "NandGate",
         "name": "NandGate#3",
         "pos": {
-          "x": 225.0,
-          "y": 215.0
+          "x": 325.0,
+          "y": 75.0
         },
         "params": 1
       },
@@ -571,8 +383,8 @@
         "id": "NandGate",
         "name": "NandGate#4",
         "pos": {
-          "x": 225.0,
-          "y": 155.0
+          "x": 325.0,
+          "y": 15.0
         },
         "params": 1
       },
@@ -580,8 +392,8 @@
         "id": "NandGate",
         "name": "NandGate#5",
         "pos": {
-          "x": 225.0,
-          "y": 175.0
+          "x": 325.0,
+          "y": 35.0
         },
         "params": 1
       },
@@ -589,7 +401,7 @@
         "id": "NandGate",
         "name": "NandGate#6",
         "pos": {
-          "x": 205.0,
+          "x": 185.0,
           "y": 70.0
         },
         "params": 1
@@ -598,7 +410,7 @@
         "id": "NandGate",
         "name": "NandGate#7",
         "pos": {
-          "x": 205.0,
+          "x": 185.0,
           "y": 50.0
         },
         "params": 1
@@ -607,7 +419,7 @@
         "id": "NandGate",
         "name": "NandGate#8",
         "pos": {
-          "x": 205.0,
+          "x": 185.0,
           "y": 30.0
         },
         "params": 1
@@ -616,7 +428,7 @@
         "id": "NandGate",
         "name": "NandGate#9",
         "pos": {
-          "x": 205.0,
+          "x": 185.0,
           "y": 10.0
         },
         "params": 1
@@ -625,8 +437,8 @@
         "id": "Splitter",
         "name": "Splitter#0",
         "pos": {
-          "x": 10.0,
-          "y": 245.0
+          "x": 5.0,
+          "y": 165.0
         },
         "params": 13
       },
@@ -634,8 +446,8 @@
         "id": "Splitter",
         "name": "Splitter#1",
         "pos": {
-          "x": 555.0,
-          "y": 80.0
+          "x": 575.0,
+          "y": 40.0
         },
         "params": 4
       },
@@ -643,8 +455,8 @@
         "id": "Splitter",
         "name": "Splitter#10",
         "pos": {
-          "x": 420.0,
-          "y": 410.0
+          "x": 445.0,
+          "y": 300.0
         },
         "params": 4
       },
@@ -652,8 +464,8 @@
         "id": "Splitter",
         "name": "Splitter#11",
         "pos": {
-          "x": 405.0,
-          "y": 585.0
+          "x": 455.0,
+          "y": 635.0
         },
         "params": 3
       },
@@ -661,8 +473,8 @@
         "id": "Splitter",
         "name": "Splitter#12",
         "pos": {
-          "x": 410.0,
-          "y": 665.0
+          "x": 455.0,
+          "y": 710.0
         },
         "params": 3
       },
@@ -670,8 +482,8 @@
         "id": "Splitter",
         "name": "Splitter#13",
         "pos": {
-          "x": 265.0,
-          "y": 725.0
+          "x": 135.0,
+          "y": 645.0
         },
         "params": 3
       },
@@ -679,8 +491,8 @@
         "id": "Splitter",
         "name": "Splitter#14",
         "pos": {
-          "x": 90.0,
-          "y": 730.0
+          "x": 310.0,
+          "y": 645.0
         },
         "params": 3
       },
@@ -688,8 +500,8 @@
         "id": "Splitter",
         "name": "Splitter#15",
         "pos": {
-          "x": 120.0,
-          "y": 455.0
+          "x": 430.0,
+          "y": 535.0
         },
         "params": 2
       },
@@ -697,8 +509,8 @@
         "id": "Splitter",
         "name": "Splitter#2",
         "pos": {
-          "x": 395.0,
-          "y": 195.0
+          "x": 440.0,
+          "y": 90.0
         },
         "params": 2
       },
@@ -706,8 +518,8 @@
         "id": "Splitter",
         "name": "Splitter#3",
         "pos": {
-          "x": 450.0,
-          "y": 175.0
+          "x": 465.0,
+          "y": 100.0
         },
         "params": 4
       },
@@ -715,8 +527,8 @@
         "id": "Splitter",
         "name": "Splitter#4",
         "pos": {
-          "x": 395.0,
-          "y": 225.0
+          "x": 425.0,
+          "y": 150.0
         },
         "params": 4
       },
@@ -724,8 +536,8 @@
         "id": "Splitter",
         "name": "Splitter#5",
         "pos": {
-          "x": 395.0,
-          "y": 265.0
+          "x": 425.0,
+          "y": 190.0
         },
         "params": 4
       },
@@ -733,8 +545,8 @@
         "id": "Splitter",
         "name": "Splitter#6",
         "pos": {
-          "x": 285.0,
-          "y": 320.0
+          "x": 320.0,
+          "y": 310.0
         },
         "params": 3
       },
@@ -742,8 +554,8 @@
         "id": "Splitter",
         "name": "Splitter#7",
         "pos": {
-          "x": 420.0,
-          "y": 325.0
+          "x": 445.0,
+          "y": 340.0
         },
         "params": 4
       },
@@ -751,8 +563,8 @@
         "id": "Splitter",
         "name": "Splitter#8",
         "pos": {
-          "x": 420.0,
-          "y": 365.0
+          "x": 445.0,
+          "y": 380.0
         },
         "params": 4
       },
@@ -760,8 +572,8 @@
         "id": "Splitter",
         "name": "Splitter#9",
         "pos": {
-          "x": 240.0,
-          "y": 475.0
+          "x": 255.0,
+          "y": 430.0
         },
         "params": 4
       },
@@ -769,8 +581,8 @@
         "id": "TriStateBuffer",
         "name": "TriStateBuffer#0",
         "pos": {
-          "x": 535.0,
-          "y": 165.0
+          "x": 540.0,
+          "y": 70.0
         },
         "params": {
           "logicWidth": 4,
@@ -781,8 +593,8 @@
         "id": "TriStateBuffer",
         "name": "TriStateBuffer#1",
         "pos": {
-          "x": 10.0,
-          "y": 650.0
+          "x": 400.0,
+          "y": 635.0
         },
         "params": {
           "logicWidth": 1,
@@ -793,8 +605,8 @@
         "id": "TriStateBuffer",
         "name": "TriStateBuffer#2",
         "pos": {
-          "x": 10.0,
-          "y": 605.0
+          "x": 240.0,
+          "y": 635.0
         },
         "params": {
           "logicWidth": 1,
@@ -805,8 +617,8 @@
         "id": "TriStateBuffer",
         "name": "TriStateBuffer#3",
         "pos": {
-          "x": 560.0,
-          "y": 595.0
+          "x": 550.0,
+          "y": 625.0
         },
         "params": {
           "logicWidth": 1,
@@ -817,8 +629,8 @@
         "id": "TriStateBuffer",
         "name": "TriStateBuffer#4",
         "pos": {
-          "x": 565.0,
-          "y": 655.0
+          "x": 550.0,
+          "y": 650.0
         },
         "params": {
           "logicWidth": 1,
@@ -829,8 +641,8 @@
         "id": "TriStateBuffer",
         "name": "TriStateBuffer#5",
         "pos": {
-          "x": 560.0,
-          "y": 290.0
+          "x": 575.0,
+          "y": 265.0
         },
         "params": {
           "logicWidth": 1,
@@ -841,8 +653,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
         "pos": {
-          "x": 165.0,
-          "y": 150.0
+          "x": 274.0,
+          "y": 59.0
         },
         "params": 1
       },
@@ -850,8 +662,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#1",
         "pos": {
-          "x": 180.0,
-          "y": 135.0
+          "x": 189.0,
+          "y": 139.0
         },
         "params": 4
       },
@@ -859,8 +671,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#10",
         "pos": {
-          "x": 195.0,
-          "y": 55.0
+          "x": 179.0,
+          "y": 54.0
         },
         "params": 1
       },
@@ -868,8 +680,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#11",
         "pos": {
-          "x": 195.0,
-          "y": 15.0
+          "x": 179.0,
+          "y": 14.0
         },
         "params": 1
       },
@@ -877,8 +689,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#12",
         "pos": {
-          "x": 195.0,
-          "y": 35.0
+          "x": 179.0,
+          "y": 34.0
         },
         "params": 1
       },
@@ -886,8 +698,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#13",
         "pos": {
-          "x": 330.0,
-          "y": 125.0
+          "x": 449.0,
+          "y": 59.0
         },
         "params": 1
       },
@@ -895,8 +707,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#14",
         "pos": {
-          "x": 520.0,
-          "y": 190.0
+          "x": 534.0,
+          "y": 104.0
         },
         "params": 4
       },
@@ -904,8 +716,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#15",
         "pos": {
-          "x": 255.0,
-          "y": 265.0
+          "x": 334.0,
+          "y": 174.0
         },
         "params": 4
       },
@@ -913,8 +725,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#16",
         "pos": {
-          "x": 255.0,
-          "y": 255.0
+          "x": 384.0,
+          "y": 164.0
         },
         "params": 4
       },
@@ -922,8 +734,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#17",
         "pos": {
-          "x": 360.0,
-          "y": 495.0
+          "x": 349.0,
+          "y": 439.0
         },
         "params": 1
       },
@@ -931,8 +743,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#18",
         "pos": {
-          "x": 35.0,
-          "y": 640.0
+          "x": 434.0,
+          "y": 674.0
         },
         "params": 1
       },
@@ -940,8 +752,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#19",
         "pos": {
-          "x": 35.0,
-          "y": 595.0
+          "x": 264.0,
+          "y": 619.0
         },
         "params": 1
       },
@@ -949,8 +761,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#2",
         "pos": {
-          "x": 295.0,
-          "y": 120.0
+          "x": 329.0,
+          "y": 124.0
         },
         "params": 4
       },
@@ -958,8 +770,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#20",
         "pos": {
-          "x": 585.0,
-          "y": 590.0
+          "x": 289.0,
+          "y": 609.0
         },
         "params": 1
       },
@@ -967,8 +779,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#21",
         "pos": {
-          "x": 585.0,
-          "y": 640.0
+          "x": 294.0,
+          "y": 614.0
         },
         "params": 1
       },
@@ -976,8 +788,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#22",
         "pos": {
-          "x": 250.0,
-          "y": 540.0
+          "x": 359.0,
+          "y": 514.0
         },
         "params": 1
       },
@@ -985,8 +797,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#23",
         "pos": {
-          "x": 330.0,
-          "y": 640.0
+          "x": 359.0,
+          "y": 594.0
         },
         "params": 1
       },
@@ -994,8 +806,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#24",
         "pos": {
-          "x": 285.0,
-          "y": 745.0
+          "x": 149.0,
+          "y": 664.0
         },
         "params": 1
       },
@@ -1003,8 +815,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#25",
         "pos": {
-          "x": 285.0,
-          "y": 755.0
+          "x": 149.0,
+          "y": 674.0
         },
         "params": 1
       },
@@ -1012,8 +824,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#26",
         "pos": {
-          "x": 290.0,
-          "y": 805.0
+          "x": 299.0,
+          "y": 584.0
         },
         "params": 1
       },
@@ -1021,8 +833,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#27",
         "pos": {
-          "x": 440.0,
-          "y": 385.0
+          "x": 464.0,
+          "y": 399.0
         },
         "params": 1
       },
@@ -1030,89 +842,179 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#28",
         "pos": {
-          "x": 440.0,
-          "y": 345.0
+          "x": 459.0,
+          "y": 349.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
+        "name": "WireCrossPoint#29",
         "pos": {
-          "x": 335.0,
-          "y": 270.0
+          "x": 559.0,
+          "y": 619.0
         },
-        "params": 4
+        "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#30",
+        "name": "WireCrossPoint#3",
         "pos": {
-          "x": 550.0,
-          "y": 570.0
+          "x": 404.0,
+          "y": 114.0
         },
-        "params": 1
+        "params": 4
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#32",
+        "name": "WireCrossPoint#30",
         "pos": {
-          "x": 85.0,
-          "y": 590.0
+          "x": 249.0,
+          "y": 629.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#33",
+        "name": "WireCrossPoint#31",
         "pos": {
-          "x": 530.0,
-          "y": 270.0
+          "x": 549.0,
+          "y": 239.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
+        "name": "WireCrossPoint#32",
         "pos": {
-          "x": 150.0,
-          "y": 160.0
+          "x": 404.0,
+          "y": 169.0
         },
-        "params": 1
+        "params": 4
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
+        "name": "WireCrossPoint#33",
         "pos": {
-          "x": 530.0,
-          "y": 100.0
+          "x": 389.0,
+          "y": 204.0
         },
         "params": 4
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
+        "name": "WireCrossPoint#34",
         "pos": {
-          "x": 120.0,
-          "y": 15.0
+          "x": 439.0,
+          "y": 684.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
+        "name": "WireCrossPoint#35",
         "pos": {
-          "x": 215.0,
-          "y": 180.0
+          "x": 429.0,
+          "y": 664.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#8",
+        "name": "WireCrossPoint#36",
         "pos": {
-          "x": 215.0,
-          "y": 160.0
+          "x": 429.0,
+          "y": 619.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#37",
+        "pos": {
+          "x": 434.0,
+          "y": 644.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#38",
+        "pos": {
+          "x": 579.0,
+          "y": 609.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#39",
+        "pos": {
+          "x": 429.0,
+          "y": 609.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#4",
+        "pos": {
+          "x": 224.0,
+          "y": 14.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#40",
+        "pos": {
+          "x": 584.0,
+          "y": 624.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#41",
+        "pos": {
+          "x": 434.0,
+          "y": 614.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#5",
+        "pos": {
+          "x": 569.0,
+          "y": 54.0
+        },
+        "params": 4
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#6",
+        "pos": {
+          "x": 134.0,
+          "y": 19.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#7",
+        "pos": {
+          "x": 319.0,
+          "y": 39.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#8",
+        "pos": {
+          "x": 319.0,
+          "y": 19.0
         },
         "params": 1
       },
@@ -1120,10 +1022,162 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#9",
         "pos": {
-          "x": 215.0,
-          "y": 200.0
+          "x": 319.0,
+          "y": 59.0
         },
         "params": 1
+      },
+      {
+        "id": "and",
+        "name": "and#0",
+        "pos": {
+          "x": 495.0,
+          "y": 60.0
+        }
+      },
+      {
+        "id": "mux1",
+        "name": "mux1#0",
+        "pos": {
+          "x": 495.0,
+          "y": 280.0
+        }
+      },
+      {
+        "id": "mux1",
+        "name": "mux1#1",
+        "pos": {
+          "x": 275.0,
+          "y": 475.0
+        }
+      },
+      {
+        "id": "mux1",
+        "name": "mux1#2",
+        "pos": {
+          "x": 355.0,
+          "y": 445.0
+        }
+      },
+      {
+        "id": "mux1",
+        "name": "mux1#3",
+        "pos": {
+          "x": 395.0,
+          "y": 425.0
+        }
+      },
+      {
+        "id": "mux1",
+        "name": "mux1#4",
+        "pos": {
+          "x": 490.0,
+          "y": 530.0
+        }
+      },
+      {
+        "id": "mux1",
+        "name": "mux1#5",
+        "pos": {
+          "x": 445.0,
+          "y": 540.0
+        }
+      },
+      {
+        "id": "mux1_4",
+        "name": "mux1_4#0",
+        "pos": {
+          "x": 480.0,
+          "y": 85.0
+        }
+      },
+      {
+        "id": "mux1_4",
+        "name": "mux1_4#1",
+        "pos": {
+          "x": 440.0,
+          "y": 135.0
+        }
+      },
+      {
+        "id": "mux2",
+        "name": "mux2#0",
+        "pos": {
+          "x": 470.0,
+          "y": 625.0
+        }
+      },
+      {
+        "id": "mux2",
+        "name": "mux2#1",
+        "pos": {
+          "x": 470.0,
+          "y": 700.0
+        }
+      },
+      {
+        "id": "mux2",
+        "name": "mux2#2",
+        "pos": {
+          "x": 325.0,
+          "y": 635.0
+        }
+      },
+      {
+        "id": "mux3",
+        "name": "mux3#0",
+        "pos": {
+          "x": 335.0,
+          "y": 300.0
+        }
+      },
+      {
+        "id": "mux3",
+        "name": "mux3#1",
+        "pos": {
+          "x": 155.0,
+          "y": 635.0
+        }
+      },
+      {
+        "id": "not4",
+        "name": "not4#0",
+        "pos": {
+          "x": 130.0,
+          "y": 40.0
+        }
+      },
+      {
+        "id": "xor",
+        "name": "xor#0",
+        "pos": {
+          "x": 535.0,
+          "y": 270.0
+        }
+      },
+      {
+        "id": "xor",
+        "name": "xor#1",
+        "pos": {
+          "x": 475.0,
+          "y": 320.0
+        }
+      },
+      {
+        "id": "xor",
+        "name": "xor#2",
+        "pos": {
+          "x": 315.0,
+          "y": 465.0
+        }
+      },
+      {
+        "id": "xor",
+        "name": "xor#3",
+        "pos": {
+          "x": 115.0,
+          "y": 740.0
+        }
       }
     ],
     "wires": [
@@ -1137,16 +1191,7 @@
           "pinName": ""
         },
         "name": "unnamedWire#0",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 25.0
-          },
-          {
-            "x": 5.0,
-            "y": 10.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
@@ -1154,11 +1199,20 @@
           "pinName": "muSR_MUX"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2904muSR#0",
           "pinName": "MUX"
         },
         "name": "unnamedWire#1",
-        "path": []
+        "path": [
+          {
+            "x": 325.0,
+            "y": 200.0
+          },
+          {
+            "x": 325.0,
+            "y": 115.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1178,7 +1232,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux1_4#0",
           "pinName": "I0_4"
         },
         "name": "unnamedWire#100",
@@ -1202,7 +1256,7 @@
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#1",
           "pinName": "I0_1"
         },
         "name": "unnamedWire#102",
@@ -1210,7 +1264,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#1",
           "pinName": "I0_2"
         },
         "pin2": {
@@ -1226,7 +1280,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#1",
           "pinName": "I0_3"
         },
         "name": "unnamedWire#104",
@@ -1234,7 +1288,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#1",
           "pinName": "I0_4"
         },
         "pin2": {
@@ -1246,15 +1300,20 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#4",
-          "pinName": "I"
+          "compName": "WireCrossPoint#16",
+          "pinName": ""
         },
         "pin2": {
           "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "name": "unnamedWire#106",
-        "path": []
+        "path": [
+          {
+            "x": 330.0,
+            "y": 165.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1262,7 +1321,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#1",
           "pinName": "I1_4"
         },
         "name": "unnamedWire#107",
@@ -1270,7 +1329,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#1",
           "pinName": "I1_3"
         },
         "pin2": {
@@ -1286,7 +1345,7 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#1",
           "pinName": "I1_2"
         },
         "name": "unnamedWire#109",
@@ -1306,7 +1365,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#1",
           "pinName": "I1_1"
         },
         "pin2": {
@@ -1318,15 +1377,28 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#7",
           "pinName": "I"
         },
         "pin2": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#33",
           "pinName": ""
         },
         "name": "unnamedWire#111",
-        "path": []
+        "path": [
+          {
+            "x": 435.0,
+            "y": 355.0
+          },
+          {
+            "x": 435.0,
+            "y": 245.0
+          },
+          {
+            "x": 390.0,
+            "y": 245.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1338,7 +1410,12 @@
           "pinName": "IN"
         },
         "name": "unnamedWire#112",
-        "path": []
+        "path": [
+          {
+            "x": 535.0,
+            "y": 80.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1346,19 +1423,40 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "Am2904TestLogic#0",
           "pinName": "I"
         },
         "name": "unnamedWire#113",
-        "path": []
+        "path": [
+          {
+            "x": 535.0,
+            "y": 260.0
+          },
+          {
+            "x": 385.0,
+            "y": 260.0
+          },
+          {
+            "x": 385.0,
+            "y": 290.0
+          },
+          {
+            "x": 255.0,
+            "y": 290.0
+          },
+          {
+            "x": 255.0,
+            "y": 380.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "Am2904TestLogic#0",
           "pinName": "Y111"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "mux3#0",
           "pinName": "I111"
         },
         "name": "unnamedWire#114",
@@ -1366,11 +1464,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "mux3#0",
           "pinName": "I110"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "Am2904TestLogic#0",
           "pinName": "Y110"
         },
         "name": "unnamedWire#115",
@@ -1378,11 +1476,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "Am2904TestLogic#0",
           "pinName": "Y101"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "mux3#0",
           "pinName": "I101"
         },
         "name": "unnamedWire#116",
@@ -1390,11 +1488,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "mux3#0",
           "pinName": "I100"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "Am2904TestLogic#0",
           "pinName": "Y100"
         },
         "name": "unnamedWire#117",
@@ -1402,11 +1500,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "Am2904TestLogic#0",
           "pinName": "Y011"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "mux3#0",
           "pinName": "I011"
         },
         "name": "unnamedWire#118",
@@ -1414,11 +1512,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "Am2904TestLogic#0",
           "pinName": "Y010"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "mux3#0",
           "pinName": "I010"
         },
         "name": "unnamedWire#119",
@@ -1438,11 +1536,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "mux3#0",
           "pinName": "I001"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "Am2904TestLogic#0",
           "pinName": "Y001"
         },
         "name": "unnamedWire#120",
@@ -1450,11 +1548,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "Am2904TestLogic#0",
           "pinName": "Y000"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "mux3#0",
           "pinName": "I000"
         },
         "name": "unnamedWire#121",
@@ -1462,7 +1560,7 @@
       },
       {
         "pin1": {
-          "compName": "NandGate#12",
+          "compName": "NandGate#11",
           "pinName": "Y"
         },
         "pin2": {
@@ -1470,15 +1568,20 @@
           "pinName": "EN"
         },
         "name": "unnamedWire#122",
-        "path": []
+        "path": [
+          {
+            "x": 585.0,
+            "y": 245.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "mux1#0",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "xor#0",
           "pinName": "B"
         },
         "name": "unnamedWire#123",
@@ -1494,7 +1597,12 @@
           "pinName": "CT_MUX"
         },
         "name": "unnamedWire#124",
-        "path": []
+        "path": [
+          {
+            "x": 210.0,
+            "y": 320.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1502,7 +1610,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "mux3#0",
           "pinName": "S0"
         },
         "name": "unnamedWire#125",
@@ -1510,7 +1618,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "mux3#0",
           "pinName": "S1"
         },
         "pin2": {
@@ -1526,7 +1634,7 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "mux3#0",
           "pinName": "S2"
         },
         "name": "unnamedWire#127",
@@ -1538,27 +1646,41 @@
           "pinName": "CT_EXP"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "mux1#0",
           "pinName": "S0"
         },
         "name": "unnamedWire#128",
-        "path": []
+        "path": [
+          {
+            "x": 230.0,
+            "y": 285.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "mux3#0",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "mux1#0",
           "pinName": "I0"
         },
         "name": "unnamedWire#129",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Merger#1",
+        "path": [
+          {
+            "x": 420.0,
+            "y": 310.0
+          },
+          {
+            "x": 420.0,
+            "y": 295.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Merger#1",
           "pinName": "I3"
         },
         "pin2": {
@@ -1570,7 +1692,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "xor#0",
           "pinName": "A"
         },
         "pin2": {
@@ -1578,19 +1700,49 @@
           "pinName": "CT_INV"
         },
         "name": "unnamedWire#130",
-        "path": []
+        "path": [
+          {
+            "x": 415.0,
+            "y": 275.0
+          },
+          {
+            "x": 415.0,
+            "y": 280.0
+          },
+          {
+            "x": 220.0,
+            "y": 280.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "xor#1",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "mux1#0",
           "pinName": "I1"
         },
         "name": "unnamedWire#131",
-        "path": []
+        "path": [
+          {
+            "x": 515.0,
+            "y": 325.0
+          },
+          {
+            "x": 515.0,
+            "y": 315.0
+          },
+          {
+            "x": 490.0,
+            "y": 315.0
+          },
+          {
+            "x": 490.0,
+            "y": 305.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1598,23 +1750,33 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2904muSR#0",
           "pinName": "I"
         },
         "name": "unnamedWire#132",
-        "path": []
+        "path": [
+          {
+            "x": 335.0,
+            "y": 135.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#33",
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#7",
-          "pinName": "I"
+          "compName": "WireCrossPoint#15",
+          "pinName": ""
         },
         "name": "unnamedWire#133",
-        "path": []
+        "path": [
+          {
+            "x": 390.0,
+            "y": 175.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1642,12 +1804,12 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#16",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
-          "pinName": "M"
+          "compName": "WireCrossPoint#32",
+          "pinName": ""
         },
         "name": "unnamedWire#136",
         "path": []
@@ -1662,7 +1824,20 @@
           "pinName": "I"
         },
         "name": "unnamedWire#137",
-        "path": []
+        "path": [
+          {
+            "x": 385.0,
+            "y": 250.0
+          },
+          {
+            "x": 430.0,
+            "y": 250.0
+          },
+          {
+            "x": 430.0,
+            "y": 395.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1670,11 +1845,32 @@
           "pinName": "OEN"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "and#0",
           "pinName": "B"
         },
         "name": "unnamedWire#138",
-        "path": []
+        "path": [
+          {
+            "x": 240.0,
+            "y": 185.0
+          },
+          {
+            "x": 410.0,
+            "y": 185.0
+          },
+          {
+            "x": 410.0,
+            "y": 80.0
+          },
+          {
+            "x": 485.0,
+            "y": 80.0
+          },
+          {
+            "x": 485.0,
+            "y": 75.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1722,7 +1918,16 @@
           "pinName": "I12-11"
         },
         "name": "unnamedWire#141",
-        "path": []
+        "path": [
+          {
+            "x": 105.0,
+            "y": 170.0
+          },
+          {
+            "x": 105.0,
+            "y": 220.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1734,11 +1939,16 @@
           "pinName": "I"
         },
         "name": "unnamedWire#142",
-        "path": []
+        "path": [
+          {
+            "x": 250.0,
+            "y": 445.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "mux1#1",
           "pinName": "I1"
         },
         "pin2": {
@@ -1746,23 +1956,41 @@
           "pinName": ""
         },
         "name": "unnamedWire#143",
-        "path": []
+        "path": [
+          {
+            "x": 270.0,
+            "y": 500.0
+          },
+          {
+            "x": 270.0,
+            "y": 515.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
-          "pinName": "I"
+          "compName": "WireCrossPoint#32",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "Am2904MSR#0",
+          "pinName": "mu"
         },
         "name": "unnamedWire#144",
-        "path": []
+        "path": [
+          {
+            "x": 185.0,
+            "y": 170.0
+          },
+          {
+            "x": 185.0,
+            "y": 100.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "mux1#1",
           "pinName": "I0"
         },
         "pin2": {
@@ -1770,7 +1998,32 @@
           "pinName": "O2"
         },
         "name": "unnamedWire#145",
-        "path": []
+        "path": [
+          {
+            "x": 265.0,
+            "y": 490.0
+          },
+          {
+            "x": 265.0,
+            "y": 510.0
+          },
+          {
+            "x": 480.0,
+            "y": 510.0
+          },
+          {
+            "x": 480.0,
+            "y": 350.0
+          },
+          {
+            "x": 470.0,
+            "y": 350.0
+          },
+          {
+            "x": 470.0,
+            "y": 310.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1778,19 +2031,28 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "mux1#1",
           "pinName": "S0"
         },
         "name": "unnamedWire#146",
-        "path": []
+        "path": [
+          {
+            "x": 270.0,
+            "y": 450.0
+          },
+          {
+            "x": 270.0,
+            "y": 480.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "mux1#1",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "xor#2",
           "pinName": "B"
         },
         "name": "unnamedWire#147",
@@ -1798,7 +2060,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "xor#2",
           "pinName": "A"
         },
         "pin2": {
@@ -1806,7 +2068,16 @@
           "pinName": "O0"
         },
         "name": "unnamedWire#148",
-        "path": []
+        "path": [
+          {
+            "x": 290.0,
+            "y": 470.0
+          },
+          {
+            "x": 290.0,
+            "y": 460.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1830,7 +2101,16 @@
           "pinName": "I5-0"
         },
         "name": "unnamedWire#15",
-        "path": []
+        "path": [
+          {
+            "x": 105.0,
+            "y": 260.0
+          },
+          {
+            "x": 105.0,
+            "y": 240.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1838,19 +2118,24 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "mux1#2",
           "pinName": "S0"
         },
         "name": "unnamedWire#150",
-        "path": []
+        "path": [
+          {
+            "x": 350.0,
+            "y": 450.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "xor#2",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "mux1#2",
           "pinName": "I1"
         },
         "name": "unnamedWire#151",
@@ -1858,7 +2143,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "mux1#2",
           "pinName": "I0"
         },
         "pin2": {
@@ -1866,15 +2151,32 @@
           "pinName": "Cx"
         },
         "name": "unnamedWire#152",
-        "path": []
+        "path": [
+          {
+            "x": 300.0,
+            "y": 460.0
+          },
+          {
+            "x": 300.0,
+            "y": 465.0
+          },
+          {
+            "x": 240.0,
+            "y": 465.0
+          },
+          {
+            "x": 240.0,
+            "y": 425.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "mux1#2",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#14",
+          "compName": "mux1#3",
           "pinName": "I1"
         },
         "name": "unnamedWire#153",
@@ -1882,7 +2184,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#14",
+          "compName": "mux1#3",
           "pinName": "I0"
         },
         "pin2": {
@@ -1894,7 +2196,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#14",
+          "compName": "mux1#3",
           "pinName": "S0"
         },
         "pin2": {
@@ -1906,7 +2208,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#14",
+          "compName": "mux1#3",
           "pinName": "Y"
         },
         "pin2": {
@@ -1914,19 +2216,37 @@
           "pinName": "C0"
         },
         "name": "unnamedWire#156",
-        "path": []
+        "path": [
+          {
+            "x": 560.0,
+            "y": 430.0
+          },
+          {
+            "x": 560.0,
+            "y": 425.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "QIOn"
+          "compName": "mux1#4",
+          "pinName": "I1"
         },
         "pin2": {
-          "compName": "WireCrossPoint#18",
+          "compName": "WireCrossPoint#36",
           "pinName": ""
         },
         "name": "unnamedWire#157",
-        "path": []
+        "path": [
+          {
+            "x": 485.0,
+            "y": 555.0
+          },
+          {
+            "x": 485.0,
+            "y": 620.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1938,11 +2258,20 @@
           "pinName": "SIOn"
         },
         "name": "unnamedWire#158",
-        "path": []
+        "path": [
+          {
+            "x": 55.0,
+            "y": 620.0
+          },
+          {
+            "x": 55.0,
+            "y": 600.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#38",
           "pinName": ""
         },
         "pin2": {
@@ -1950,7 +2279,12 @@
           "pinName": "SIO0"
         },
         "name": "unnamedWire#159",
-        "path": []
+        "path": [
+          {
+            "x": 580.0,
+            "y": 600.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1964,58 +2298,73 @@
         "name": "unnamedWire#16",
         "path": [
           {
-            "x": 40.0,
-            "y": 385.0
+            "x": 75.0,
+            "y": 520.0
           },
           {
-            "x": 40.0,
-            "y": 285.0
+            "x": 75.0,
+            "y": 205.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "QIO0"
+          "compName": "mux1#5",
+          "pinName": "I1"
         },
         "pin2": {
-          "compName": "WireCrossPoint#21",
+          "compName": "WireCrossPoint#41",
           "pinName": ""
         },
         "name": "unnamedWire#160",
-        "path": []
+        "path": [
+          {
+            "x": 435.0,
+            "y": 565.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "TriStateBuffer#1",
-          "pinName": "OUT"
+          "compName": "WireCrossPoint#37",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#18",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "QIOn"
         },
         "name": "unnamedWire#161",
-        "path": []
+        "path": [
+          {
+            "x": 435.0,
+            "y": 625.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "TriStateBuffer#2",
+          "compName": "TriStateBuffer#3",
           "pinName": "OUT"
         },
         "pin2": {
-          "compName": "WireCrossPoint#19",
+          "compName": "WireCrossPoint#38",
           "pinName": ""
         },
         "name": "unnamedWire#162",
-        "path": []
+        "path": [
+          {
+            "x": 580.0,
+            "y": 635.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "TriStateBuffer#3",
-          "pinName": "OUT"
+          "compName": "WireCrossPoint#38",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#39",
           "pinName": ""
         },
         "name": "unnamedWire#163",
@@ -2023,8 +2372,8 @@
       },
       {
         "pin1": {
-          "compName": "TriStateBuffer#4",
-          "pinName": "OUT"
+          "compName": "WireCrossPoint#41",
+          "pinName": ""
         },
         "pin2": {
           "compName": "WireCrossPoint#21",
@@ -2039,7 +2388,7 @@
           "pinName": "IN"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "mux2#0",
           "pinName": "Y"
         },
         "name": "unnamedWire#165",
@@ -2055,7 +2404,24 @@
           "pinName": "I"
         },
         "name": "unnamedWire#166",
-        "path": []
+        "path": [
+          {
+            "x": 165.0,
+            "y": 500.0
+          },
+          {
+            "x": 165.0,
+            "y": 575.0
+          },
+          {
+            "x": 450.0,
+            "y": 575.0
+          },
+          {
+            "x": 450.0,
+            "y": 645.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2063,7 +2429,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "mux2#0",
           "pinName": "I00"
         },
         "name": "unnamedWire#167",
@@ -2075,7 +2441,7 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "mux2#0",
           "pinName": "S1"
         },
         "name": "unnamedWire#168",
@@ -2083,7 +2449,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "mux2#0",
           "pinName": "S0"
         },
         "pin2": {
@@ -2103,7 +2469,16 @@
           "pinName": "I0"
         },
         "name": "unnamedWire#17",
-        "path": []
+        "path": [
+          {
+            "x": 10.0,
+            "y": 125.0
+          },
+          {
+            "x": 10.0,
+            "y": 95.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2111,8 +2486,8 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#15",
-          "pinName": "I01"
+          "compName": "WireCrossPoint#36",
+          "pinName": ""
         },
         "name": "unnamedWire#170",
         "path": []
@@ -2123,7 +2498,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "mux2#0",
           "pinName": "I10"
         },
         "name": "unnamedWire#171",
@@ -2139,7 +2514,16 @@
           "pinName": ""
         },
         "name": "unnamedWire#172",
-        "path": []
+        "path": [
+          {
+            "x": 485.0,
+            "y": 390.0
+          },
+          {
+            "x": 485.0,
+            "y": 515.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2159,7 +2543,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#16",
+          "compName": "mux2#1",
           "pinName": "S0"
         },
         "name": "unnamedWire#174",
@@ -2167,7 +2551,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#16",
+          "compName": "mux2#1",
           "pinName": "S1"
         },
         "pin2": {
@@ -2183,7 +2567,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#16",
+          "compName": "mux2#1",
           "pinName": "I00"
         },
         "name": "unnamedWire#176",
@@ -2191,7 +2575,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#16",
+          "compName": "mux2#1",
           "pinName": "Y"
         },
         "pin2": {
@@ -2199,9 +2583,18 @@
           "pinName": "IN"
         },
         "name": "unnamedWire#177",
-        "path": []
-      },
-      {
+        "path": [
+          {
+            "x": 545.0,
+            "y": 710.0
+          },
+          {
+            "x": 545.0,
+            "y": 660.0
+          }
+        ]
+      },
+      {
         "pin1": {
           "compName": "Splitter#12",
           "pinName": "I"
@@ -2211,16 +2604,33 @@
           "pinName": "QIO0_MUX"
         },
         "name": "unnamedWire#178",
-        "path": []
+        "path": [
+          {
+            "x": 445.0,
+            "y": 720.0
+          },
+          {
+            "x": 445.0,
+            "y": 580.0
+          },
+          {
+            "x": 175.0,
+            "y": 580.0
+          },
+          {
+            "x": 175.0,
+            "y": 520.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#19",
+          "compName": "WireCrossPoint#36",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#16",
-          "pinName": "I01"
+          "compName": "WireCrossPoint#35",
+          "pinName": ""
         },
         "name": "unnamedWire#179",
         "path": []
@@ -2235,7 +2645,16 @@
           "pinName": "I1"
         },
         "name": "unnamedWire#18",
-        "path": []
+        "path": [
+          {
+            "x": 5.0,
+            "y": 100.0
+          },
+          {
+            "x": 5.0,
+            "y": 85.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2243,35 +2662,45 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#16",
+          "compName": "mux2#1",
           "pinName": "I10"
         },
         "name": "unnamedWire#180",
-        "path": []
+        "path": [
+          {
+            "x": 435.0,
+            "y": 750.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#23",
+          "compName": "WireCrossPoint#35",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#16",
-          "pinName": "I11"
+          "compName": "mux2#0",
+          "pinName": "I01"
         },
         "name": "unnamedWire#181",
         "path": []
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#15",
-          "pinName": "I11"
+          "compName": "WireCrossPoint#34",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#23",
-          "pinName": ""
+          "compName": "mux2#1",
+          "pinName": "I11"
         },
         "name": "unnamedWire#182",
-        "path": []
+        "path": [
+          {
+            "x": 440.0,
+            "y": 760.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2291,7 +2720,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#23",
+          "compName": "mux3#1",
           "pinName": "S0"
         },
         "name": "unnamedWire#184",
@@ -2315,7 +2744,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#23",
+          "compName": "mux3#1",
           "pinName": "I000"
         },
         "name": "unnamedWire#186",
@@ -2323,7 +2752,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#23",
+          "compName": "mux3#1",
           "pinName": "I001"
         },
         "pin2": {
@@ -2331,7 +2760,12 @@
           "pinName": ""
         },
         "name": "unnamedWire#187",
-        "path": []
+        "path": [
+          {
+            "x": 150.0,
+            "y": 685.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2343,7 +2777,24 @@
           "pinName": "SIOn_MUX"
         },
         "name": "unnamedWire#188",
-        "path": []
+        "path": [
+          {
+            "x": 130.0,
+            "y": 655.0
+          },
+          {
+            "x": 130.0,
+            "y": 580.0
+          },
+          {
+            "x": 170.0,
+            "y": 580.0
+          },
+          {
+            "x": 170.0,
+            "y": 510.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2351,7 +2802,7 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#23",
+          "compName": "mux3#1",
           "pinName": "S2"
         },
         "name": "unnamedWire#189",
@@ -2375,7 +2826,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#23",
+          "compName": "mux3#1",
           "pinName": "S1"
         },
         "name": "unnamedWire#190",
@@ -2383,7 +2834,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#23",
+          "compName": "mux3#1",
           "pinName": "I010"
         },
         "pin2": {
@@ -2391,7 +2842,16 @@
           "pinName": ""
         },
         "name": "unnamedWire#191",
-        "path": []
+        "path": [
+          {
+            "x": 105.0,
+            "y": 695.0
+          },
+          {
+            "x": 105.0,
+            "y": 610.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2399,15 +2859,24 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#23",
+          "compName": "mux3#1",
           "pinName": "I011"
         },
         "name": "unnamedWire#192",
-        "path": []
+        "path": [
+          {
+            "x": 110.0,
+            "y": 615.0
+          },
+          {
+            "x": 110.0,
+            "y": 705.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#23",
+          "compName": "mux3#1",
           "pinName": "I100"
         },
         "pin2": {
@@ -2415,15 +2884,24 @@
           "pinName": ""
         },
         "name": "unnamedWire#193",
-        "path": []
+        "path": [
+          {
+            "x": 115.0,
+            "y": 715.0
+          },
+          {
+            "x": 115.0,
+            "y": 595.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#21",
+          "compName": "xor#3",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#23",
+          "compName": "mux3#1",
           "pinName": "I111"
         },
         "name": "unnamedWire#194",
@@ -2439,11 +2917,24 @@
           "pinName": ""
         },
         "name": "unnamedWire#195",
-        "path": []
+        "path": [
+          {
+            "x": 465.0,
+            "y": 495.0
+          },
+          {
+            "x": 345.0,
+            "y": 495.0
+          },
+          {
+            "x": 345.0,
+            "y": 585.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#23",
+          "compName": "mux3#1",
           "pinName": "I110"
         },
         "pin2": {
@@ -2451,11 +2942,36 @@
           "pinName": "O1"
         },
         "name": "unnamedWire#196",
-        "path": []
+        "path": [
+          {
+            "x": 125.0,
+            "y": 735.0
+          },
+          {
+            "x": 125.0,
+            "y": 605.0
+          },
+          {
+            "x": 350.0,
+            "y": 605.0
+          },
+          {
+            "x": 350.0,
+            "y": 500.0
+          },
+          {
+            "x": 470.0,
+            "y": 500.0
+          },
+          {
+            "x": 470.0,
+            "y": 360.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#22",
+          "compName": "mux2#2",
           "pinName": "I01"
         },
         "pin2": {
@@ -2463,11 +2979,16 @@
           "pinName": ""
         },
         "name": "unnamedWire#197",
-        "path": []
+        "path": [
+          {
+            "x": 290.0,
+            "y": 675.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#22",
+          "compName": "mux2#2",
           "pinName": "I10"
         },
         "pin2": {
@@ -2475,7 +2996,12 @@
           "pinName": ""
         },
         "name": "unnamedWire#198",
-        "path": []
+        "path": [
+          {
+            "x": 295.0,
+            "y": 685.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2483,11 +3009,20 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#23",
+          "compName": "mux3#1",
           "pinName": "I101"
         },
         "name": "unnamedWire#199",
-        "path": []
+        "path": [
+          {
+            "x": 120.0,
+            "y": 585.0
+          },
+          {
+            "x": 120.0,
+            "y": 725.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2495,11 +3030,20 @@
           "pinName": "muSR_OVRRET"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2904muSR#0",
           "pinName": "OVRRET"
         },
         "name": "unnamedWire#2",
-        "path": []
+        "path": [
+          {
+            "x": 345.0,
+            "y": 210.0
+          },
+          {
+            "x": 345.0,
+            "y": 155.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2511,7 +3055,16 @@
           "pinName": "I3"
         },
         "name": "unnamedWire#20",
-        "path": []
+        "path": [
+          {
+            "x": 5.0,
+            "y": 50.0
+          },
+          {
+            "x": 5.0,
+            "y": 65.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2519,11 +3072,16 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "xor#1",
           "pinName": "B"
         },
         "name": "unnamedWire#200",
-        "path": []
+        "path": [
+          {
+            "x": 465.0,
+            "y": 335.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2531,15 +3089,20 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#22",
+          "compName": "mux2#2",
           "pinName": "I11"
         },
         "name": "unnamedWire#201",
-        "path": []
+        "path": [
+          {
+            "x": 300.0,
+            "y": 695.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#32",
+          "compName": "WireCrossPoint#30",
           "pinName": ""
         },
         "pin2": {
@@ -2547,7 +3110,12 @@
           "pinName": "OEn"
         },
         "name": "unnamedWire#202",
-        "path": []
+        "path": [
+          {
+            "x": 250.0,
+            "y": 540.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2555,11 +3123,24 @@
           "pinName": "OE0"
         },
         "pin2": {
-          "compName": "WireCrossPoint#30",
+          "compName": "WireCrossPoint#29",
           "pinName": ""
         },
         "name": "unnamedWire#203",
-        "path": []
+        "path": [
+          {
+            "x": 390.0,
+            "y": 550.0
+          },
+          {
+            "x": 390.0,
+            "y": 585.0
+          },
+          {
+            "x": 560.0,
+            "y": 585.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2567,11 +3148,16 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "xor#1",
           "pinName": "A"
         },
         "name": "unnamedWire#204",
-        "path": []
+        "path": [
+          {
+            "x": 460.0,
+            "y": 325.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2579,15 +3165,36 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#21",
+          "compName": "xor#3",
           "pinName": "A"
         },
         "name": "unnamedWire#205",
-        "path": []
+        "path": [
+          {
+            "x": 460.0,
+            "y": 490.0
+          },
+          {
+            "x": 340.0,
+            "y": 490.0
+          },
+          {
+            "x": 340.0,
+            "y": 600.0
+          },
+          {
+            "x": 100.0,
+            "y": 600.0
+          },
+          {
+            "x": 100.0,
+            "y": 745.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#21",
+          "compName": "xor#3",
           "pinName": "B"
         },
         "pin2": {
@@ -2595,11 +3202,36 @@
           "pinName": "O0"
         },
         "name": "unnamedWire#206",
-        "path": []
+        "path": [
+          {
+            "x": 95.0,
+            "y": 755.0
+          },
+          {
+            "x": 95.0,
+            "y": 590.0
+          },
+          {
+            "x": 355.0,
+            "y": 590.0
+          },
+          {
+            "x": 355.0,
+            "y": 505.0
+          },
+          {
+            "x": 475.0,
+            "y": 505.0
+          },
+          {
+            "x": 475.0,
+            "y": 370.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#22",
+          "compName": "mux2#2",
           "pinName": "Y"
         },
         "pin2": {
@@ -2615,7 +3247,7 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#22",
+          "compName": "mux2#2",
           "pinName": "S1"
         },
         "name": "unnamedWire#208",
@@ -2627,7 +3259,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#22",
+          "compName": "mux2#2",
           "pinName": "S0"
         },
         "name": "unnamedWire#209",
@@ -2639,11 +3271,20 @@
           "pinName": "muSR_CINV"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2904muSR#0",
           "pinName": "CINV"
         },
         "name": "unnamedWire#21",
-        "path": []
+        "path": [
+          {
+            "x": 340.0,
+            "y": 220.0
+          },
+          {
+            "x": 340.0,
+            "y": 145.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2655,7 +3296,16 @@
           "pinName": "QIOn_MUX"
         },
         "name": "unnamedWire#210",
-        "path": []
+        "path": [
+          {
+            "x": 305.0,
+            "y": 655.0
+          },
+          {
+            "x": 305.0,
+            "y": 530.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2663,7 +3313,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#22",
+          "compName": "mux2#2",
           "pinName": "I00"
         },
         "name": "unnamedWire#211",
@@ -2675,7 +3325,7 @@
           "pinName": "IN"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#23",
+          "compName": "mux3#1",
           "pinName": "Y"
         },
         "name": "unnamedWire#212",
@@ -2699,7 +3349,7 @@
           "pinName": "EN"
         },
         "pin2": {
-          "compName": "WireCrossPoint#30",
+          "compName": "WireCrossPoint#29",
           "pinName": ""
         },
         "name": "unnamedWire#214",
@@ -2707,7 +3357,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#30",
+          "compName": "WireCrossPoint#29",
           "pinName": ""
         },
         "pin2": {
@@ -2715,15 +3365,65 @@
           "pinName": "EN"
         },
         "name": "unnamedWire#215",
+        "path": [
+          {
+            "x": 575.0,
+            "y": 620.0
+          },
+          {
+            "x": 575.0,
+            "y": 645.0
+          },
+          {
+            "x": 560.0,
+            "y": 645.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "Am2904muSR#0",
+          "pinName": "M"
+        },
+        "name": "unnamedWire#216",
         "path": []
       },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#32",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "Splitter#10",
+          "pinName": "I"
+        },
+        "name": "unnamedWire#217",
+        "path": [
+          {
+            "x": 405.0,
+            "y": 240.0
+          },
+          {
+            "x": 440.0,
+            "y": 240.0
+          },
+          {
+            "x": 440.0,
+            "y": 315.0
+          }
+        ]
+      },
       {
         "pin1": {
           "compName": "TriStateBuffer#2",
           "pinName": "EN"
         },
         "pin2": {
-          "compName": "WireCrossPoint#32",
+          "compName": "WireCrossPoint#30",
           "pinName": ""
         },
         "name": "unnamedWire#218",
@@ -2731,7 +3431,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#32",
+          "compName": "WireCrossPoint#30",
           "pinName": ""
         },
         "pin2": {
@@ -2739,7 +3439,12 @@
           "pinName": "EN"
         },
         "name": "unnamedWire#219",
-        "path": []
+        "path": [
+          {
+            "x": 410.0,
+            "y": 630.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2751,15 +3456,41 @@
           "pinName": ""
         },
         "name": "unnamedWire#22",
-        "path": []
+        "path": [
+          {
+            "x": 105.0,
+            "y": 80.0
+          },
+          {
+            "x": 105.0,
+            "y": 140.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#23",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#34",
+          "pinName": ""
+        },
+        "name": "unnamedWire#220",
+        "path": [
+          {
+            "x": 440.0,
+            "y": 595.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#18",
+          "compName": "mux1#5",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#17",
+          "compName": "mux1#4",
           "pinName": "I0"
         },
         "name": "unnamedWire#221",
@@ -2767,51 +3498,78 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#17",
+          "compName": "mux1#4",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2904MSR#0",
           "pinName": "COVD_V"
         },
         "name": "unnamedWire#222",
-        "path": []
+        "path": [
+          {
+            "x": 530.0,
+            "y": 535.0
+          },
+          {
+            "x": 530.0,
+            "y": 525.0
+          },
+          {
+            "x": 230.0,
+            "y": 525.0
+          },
+          {
+            "x": 230.0,
+            "y": 310.0
+          },
+          {
+            "x": 295.0,
+            "y": 310.0
+          },
+          {
+            "x": 295.0,
+            "y": 85.0
+          },
+          {
+            "x": 275.0,
+            "y": 85.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#17",
-          "pinName": "I1"
-        },
-        "pin2": {
           "compName": "WireCrossPoint#19",
           "pinName": ""
         },
+        "pin2": {
+          "compName": "TriStateBuffer#2",
+          "pinName": "OUT"
+        },
         "name": "unnamedWire#223",
-        "path": []
+        "path": [
+          {
+            "x": 265.0,
+            "y": 645.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#18",
-          "pinName": "I0"
+          "compName": "TriStateBuffer#4",
+          "pinName": "OUT"
         },
         "pin2": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#40",
           "pinName": ""
         },
         "name": "unnamedWire#224",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#21",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "DeserializedSubmodelComponent#18",
-          "pinName": "I1"
-        },
-        "name": "unnamedWire#225",
-        "path": []
+        "path": [
+          {
+            "x": 585.0,
+            "y": 660.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2823,7 +3581,16 @@
           "pinName": "I"
         },
         "name": "unnamedWire#226",
-        "path": []
+        "path": [
+          {
+            "x": 410.0,
+            "y": 560.0
+          },
+          {
+            "x": 410.0,
+            "y": 540.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2831,7 +3598,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#18",
+          "compName": "mux1#5",
           "pinName": "S0"
         },
         "name": "unnamedWire#227",
@@ -2843,7 +3610,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#17",
+          "compName": "mux1#4",
           "pinName": "S0"
         },
         "name": "unnamedWire#228",
@@ -2851,12 +3618,12 @@
       },
       {
         "pin1": {
-          "compName": "BitDisplay#0",
+          "compName": "WireCrossPoint#34",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "mux2#0",
+          "pinName": "I11"
         },
         "name": "unnamedWire#229",
         "path": []
@@ -2867,7 +3634,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2904MSR#0",
           "pinName": "I"
         },
         "name": "unnamedWire#23",
@@ -2875,23 +3642,28 @@
       },
       {
         "pin1": {
-          "compName": "TriStateBuffer#0",
-          "pinName": "OUT"
+          "compName": "WireCrossPoint#35",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "BitDisplay#1",
-          "pinName": ""
+          "compName": "mux2#1",
+          "pinName": "I01"
         },
         "name": "unnamedWire#230",
-        "path": []
+        "path": [
+          {
+            "x": 430.0,
+            "y": 740.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "TriStateBuffer#0",
-          "pinName": "IN"
+          "compName": "WireCrossPoint#18",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "BitDisplay#2",
+          "compName": "WireCrossPoint#37",
           "pinName": ""
         },
         "name": "unnamedWire#231",
@@ -2899,23 +3671,23 @@
       },
       {
         "pin1": {
-          "compName": "TriStateBuffer#0",
-          "pinName": "EN"
+          "compName": "WireCrossPoint#37",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "BitDisplay#3",
-          "pinName": ""
+          "compName": "TriStateBuffer#1",
+          "pinName": "OUT"
         },
         "name": "unnamedWire#232",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#33",
+          "compName": "WireCrossPoint#31",
           "pinName": ""
         },
         "pin2": {
-          "compName": "NandGate#12",
+          "compName": "NandGate#11",
           "pinName": "A"
         },
         "name": "unnamedWire#233",
@@ -2923,19 +3695,24 @@
       },
       {
         "pin1": {
-          "compName": "NandGate#12",
+          "compName": "NandGate#11",
           "pinName": "B"
         },
         "pin2": {
-          "compName": "WireCrossPoint#33",
+          "compName": "WireCrossPoint#31",
           "pinName": ""
         },
         "name": "unnamedWire#234",
-        "path": []
+        "path": [
+          {
+            "x": 550.0,
+            "y": 250.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#33",
+          "compName": "WireCrossPoint#31",
           "pinName": ""
         },
         "pin2": {
@@ -2943,7 +3720,24 @@
           "pinName": "_OECT"
         },
         "name": "unnamedWire#235",
-        "path": []
+        "path": [
+          {
+            "x": 550.0,
+            "y": 215.0
+          },
+          {
+            "x": 565.0,
+            "y": 215.0
+          },
+          {
+            "x": 565.0,
+            "y": 25.0
+          },
+          {
+            "x": 550.0,
+            "y": 25.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2963,12 +3757,41 @@
           "pinName": "IN"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "xor#0",
           "pinName": "Y"
         },
         "name": "unnamedWire#237",
         "path": []
       },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#39",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "mux1#5",
+          "pinName": "I0"
+        },
+        "name": "unnamedWire#238",
+        "path": [
+          {
+            "x": 430.0,
+            "y": 555.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#39",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#20",
+          "pinName": ""
+        },
+        "name": "unnamedWire#239",
+        "path": []
+      },
       {
         "pin1": {
           "compName": "WireCrossPoint#15",
@@ -2979,11 +3802,45 @@
           "pinName": ""
         },
         "name": "unnamedWire#24",
+        "path": [
+          {
+            "x": 190.0,
+            "y": 175.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#40",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "QIO0"
+        },
+        "name": "unnamedWire#240",
         "path": []
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "WireCrossPoint#41",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#40",
+          "pinName": ""
+        },
+        "name": "unnamedWire#242",
+        "path": [
+          {
+            "x": 585.0,
+            "y": 615.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Am2904MSR#0",
           "pinName": "Q"
         },
         "pin2": {
@@ -2991,23 +3848,32 @@
           "pinName": ""
         },
         "name": "unnamedWire#25",
-        "path": []
+        "path": [
+          {
+            "x": 300.0,
+            "y": 110.0
+          },
+          {
+            "x": 300.0,
+            "y": 125.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#16",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#16",
-          "pinName": ""
+          "compName": "Splitter#4",
+          "pinName": "I"
         },
         "name": "unnamedWire#26",
         "path": []
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2904muSR#0",
           "pinName": "Q"
         },
         "pin2": {
@@ -3015,16 +3881,21 @@
           "pinName": ""
         },
         "name": "unnamedWire#27",
-        "path": []
+        "path": [
+          {
+            "x": 405.0,
+            "y": 105.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#33",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
-          "pinName": "mu"
+          "compName": "Splitter#5",
+          "pinName": "I"
         },
         "name": "unnamedWire#28",
         "path": []
@@ -3035,11 +3906,16 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2904MSR#0",
           "pinName": "C"
         },
         "name": "unnamedWire#29",
-        "path": []
+        "path": [
+          {
+            "x": 255.0,
+            "y": 60.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3059,11 +3935,20 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2904muSR#0",
           "pinName": "C"
         },
         "name": "unnamedWire#30",
-        "path": []
+        "path": [
+          {
+            "x": 300.0,
+            "y": 60.0
+          },
+          {
+            "x": 300.0,
+            "y": 105.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3071,11 +3956,16 @@
           "pinName": "MSR_MUX"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2904MSR#0",
           "pinName": "MUX"
         },
         "name": "unnamedWire#31",
-        "path": []
+        "path": [
+          {
+            "x": 200.0,
+            "y": 160.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3083,11 +3973,32 @@
           "pinName": "MC_EN"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2904MSR#0",
           "pinName": "COVD_EN"
         },
         "name": "unnamedWire#32",
-        "path": []
+        "path": [
+          {
+            "x": 225.0,
+            "y": 570.0
+          },
+          {
+            "x": 225.0,
+            "y": 305.0
+          },
+          {
+            "x": 290.0,
+            "y": 305.0
+          },
+          {
+            "x": 290.0,
+            "y": 80.0
+          },
+          {
+            "x": 265.0,
+            "y": 80.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3111,7 +4022,12 @@
           "pinName": "B"
         },
         "name": "unnamedWire#34",
-        "path": []
+        "path": [
+          {
+            "x": 225.0,
+            "y": 25.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3219,7 +4135,12 @@
           "pinName": ""
         },
         "name": "unnamedWire#42",
-        "path": []
+        "path": [
+          {
+            "x": 320.0,
+            "y": 80.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3227,11 +4148,16 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2904muSR#0",
           "pinName": "_EOVR"
         },
         "name": "unnamedWire#43",
-        "path": []
+        "path": [
+          {
+            "x": 390.0,
+            "y": 85.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3239,15 +4165,20 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2904muSR#0",
           "pinName": "_EN"
         },
         "name": "unnamedWire#44",
-        "path": []
+        "path": [
+          {
+            "x": 380.0,
+            "y": 65.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2904muSR#0",
           "pinName": "_EC"
         },
         "pin2": {
@@ -3255,7 +4186,12 @@
           "pinName": "Y"
         },
         "name": "unnamedWire#45",
-        "path": []
+        "path": [
+          {
+            "x": 370.0,
+            "y": 45.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3263,11 +4199,16 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2904muSR#0",
           "pinName": "_EZ"
         },
         "name": "unnamedWire#46",
-        "path": []
+        "path": [
+          {
+            "x": 360.0,
+            "y": 25.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3279,7 +4220,16 @@
           "pinName": "muSR_WEZ"
         },
         "name": "unnamedWire#47",
-        "path": []
+        "path": [
+          {
+            "x": 305.0,
+            "y": 30.0
+          },
+          {
+            "x": 305.0,
+            "y": 230.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3291,7 +4241,16 @@
           "pinName": "B"
         },
         "name": "unnamedWire#48",
-        "path": []
+        "path": [
+          {
+            "x": 310.0,
+            "y": 240.0
+          },
+          {
+            "x": 310.0,
+            "y": 50.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3303,7 +4262,16 @@
           "pinName": "YZ"
         },
         "name": "unnamedWire#49",
-        "path": []
+        "path": [
+          {
+            "x": 595.0,
+            "y": 40.0
+          },
+          {
+            "x": 595.0,
+            "y": 25.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3339,7 +4307,16 @@
           "pinName": "YN"
         },
         "name": "unnamedWire#51",
-        "path": []
+        "path": [
+          {
+            "x": 595.0,
+            "y": 60.0
+          },
+          {
+            "x": 595.0,
+            "y": 75.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3351,7 +4328,16 @@
           "pinName": "O0"
         },
         "name": "unnamedWire#52",
-        "path": []
+        "path": [
+          {
+            "x": 590.0,
+            "y": 100.0
+          },
+          {
+            "x": 590.0,
+            "y": 70.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3371,11 +4357,32 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2904MSR#0",
           "pinName": "Y"
         },
         "name": "unnamedWire#54",
-        "path": []
+        "path": [
+          {
+            "x": 570.0,
+            "y": 50.0
+          },
+          {
+            "x": 415.0,
+            "y": 50.0
+          },
+          {
+            "x": 415.0,
+            "y": 180.0
+          },
+          {
+            "x": 195.0,
+            "y": 180.0
+          },
+          {
+            "x": 195.0,
+            "y": 120.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3387,7 +4394,12 @@
           "pinName": "A"
         },
         "name": "unnamedWire#55",
-        "path": []
+        "path": [
+          {
+            "x": 135.0,
+            "y": 10.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3411,7 +4423,12 @@
           "pinName": ""
         },
         "name": "unnamedWire#57",
-        "path": []
+        "path": [
+          {
+            "x": 25.0,
+            "y": 20.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3423,7 +4440,16 @@
           "pinName": "muSR_WEN"
         },
         "name": "unnamedWire#58",
-        "path": []
+        "path": [
+          {
+            "x": 315.0,
+            "y": 70.0
+          },
+          {
+            "x": 315.0,
+            "y": 250.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3435,7 +4461,16 @@
           "pinName": "B"
         },
         "name": "unnamedWire#59",
-        "path": []
+        "path": [
+          {
+            "x": 320.0,
+            "y": 260.0
+          },
+          {
+            "x": 320.0,
+            "y": 90.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3459,7 +4494,12 @@
           "pinName": "A"
         },
         "name": "unnamedWire#60",
-        "path": []
+        "path": [
+          {
+            "x": 180.0,
+            "y": 75.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3527,15 +4567,20 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2904MSR#0",
           "pinName": "_EOVR"
         },
         "name": "unnamedWire#66",
-        "path": []
+        "path": [
+          {
+            "x": 245.0,
+            "y": 80.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2904MSR#0",
           "pinName": "_EN"
         },
         "pin2": {
@@ -3543,7 +4588,12 @@
           "pinName": "Y"
         },
         "name": "unnamedWire#67",
-        "path": []
+        "path": [
+          {
+            "x": 235.0,
+            "y": 60.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3551,11 +4601,16 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2904MSR#0",
           "pinName": "_EC"
         },
         "name": "unnamedWire#68",
-        "path": []
+        "path": [
+          {
+            "x": 225.0,
+            "y": 40.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3563,11 +4618,16 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2904MSR#0",
           "pinName": "_EZ"
         },
         "name": "unnamedWire#69",
-        "path": []
+        "path": [
+          {
+            "x": 215.0,
+            "y": 20.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3595,7 +4655,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "not4#0",
           "pinName": "Y1"
         },
         "pin2": {
@@ -3603,7 +4663,16 @@
           "pinName": "B"
         },
         "name": "unnamedWire#71",
-        "path": []
+        "path": [
+          {
+            "x": 170.0,
+            "y": 45.0
+          },
+          {
+            "x": 170.0,
+            "y": 25.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3611,15 +4680,24 @@
           "pinName": "B"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "not4#0",
           "pinName": "Y2"
         },
         "name": "unnamedWire#72",
-        "path": []
+        "path": [
+          {
+            "x": 175.0,
+            "y": 45.0
+          },
+          {
+            "x": 175.0,
+            "y": 55.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "not4#0",
           "pinName": "Y3"
         },
         "pin2": {
@@ -3631,7 +4709,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "not4#0",
           "pinName": "Y4"
         },
         "pin2": {
@@ -3639,11 +4717,20 @@
           "pinName": "B"
         },
         "name": "unnamedWire#74",
-        "path": []
+        "path": [
+          {
+            "x": 175.0,
+            "y": 75.0
+          },
+          {
+            "x": 175.0,
+            "y": 85.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "not4#0",
           "pinName": "A1"
         },
         "pin2": {
@@ -3651,7 +4738,12 @@
           "pinName": "_EZ"
         },
         "name": "unnamedWire#75",
-        "path": []
+        "path": [
+          {
+            "x": 50.0,
+            "y": 45.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3659,15 +4751,20 @@
           "pinName": "_EC"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "not4#0",
           "pinName": "A2"
         },
         "name": "unnamedWire#76",
-        "path": []
+        "path": [
+          {
+            "x": 75.0,
+            "y": 55.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "not4#0",
           "pinName": "A3"
         },
         "pin2": {
@@ -3675,7 +4772,12 @@
           "pinName": "_EN"
         },
         "name": "unnamedWire#77",
-        "path": []
+        "path": [
+          {
+            "x": 100.0,
+            "y": 65.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3683,11 +4785,16 @@
           "pinName": "_EOVR"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "not4#0",
           "pinName": "A4"
         },
         "name": "unnamedWire#78",
-        "path": []
+        "path": [
+          {
+            "x": 125.0,
+            "y": 75.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3699,7 +4806,12 @@
           "pinName": ""
         },
         "name": "unnamedWire#79",
-        "path": []
+        "path": [
+          {
+            "x": 570.0,
+            "y": 80.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3735,7 +4847,12 @@
           "pinName": ""
         },
         "name": "unnamedWire#81",
-        "path": []
+        "path": [
+          {
+            "x": 450.0,
+            "y": 70.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3755,7 +4872,7 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "and#0",
           "pinName": "A"
         },
         "name": "unnamedWire#83",
@@ -3763,7 +4880,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "and#0",
           "pinName": "Y"
         },
         "pin2": {
@@ -3771,15 +4888,20 @@
           "pinName": "EN"
         },
         "name": "unnamedWire#84",
-        "path": []
+        "path": [
+          {
+            "x": 550.0,
+            "y": 65.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#1",
           "pinName": "Y1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux1_4#0",
           "pinName": "I1_1"
         },
         "name": "unnamedWire#85",
@@ -3787,11 +4909,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux1_4#0",
           "pinName": "I1_2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#1",
           "pinName": "Y2"
         },
         "name": "unnamedWire#86",
@@ -3799,11 +4921,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#1",
           "pinName": "Y3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux1_4#0",
           "pinName": "I1_3"
         },
         "name": "unnamedWire#87",
@@ -3811,11 +4933,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux1_4#0",
           "pinName": "I1_4"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#1",
           "pinName": "Y4"
         },
         "name": "unnamedWire#88",
@@ -3827,7 +4949,7 @@
           "pinName": "I0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux1_4#0",
           "pinName": "Y4"
         },
         "name": "unnamedWire#89",
@@ -3847,7 +4969,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux1_4#0",
           "pinName": "Y3"
         },
         "pin2": {
@@ -3863,7 +4985,7 @@
           "pinName": "I2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux1_4#0",
           "pinName": "Y2"
         },
         "name": "unnamedWire#91",
@@ -3871,7 +4993,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux1_4#0",
           "pinName": "Y1"
         },
         "pin2": {
@@ -3883,13 +5005,13 @@
       },
       {
         "pin1": {
-          "compName": "Merger#3",
-          "pinName": "O"
-        },
-        "pin2": {
           "compName": "WireCrossPoint#14",
           "pinName": ""
         },
+        "pin2": {
+          "compName": "Merger#3",
+          "pinName": "O"
+        },
         "name": "unnamedWire#93",
         "path": []
       },
@@ -3903,7 +5025,28 @@
           "pinName": "I"
         },
         "name": "unnamedWire#94",
-        "path": []
+        "path": [
+          {
+            "x": 190.0,
+            "y": 275.0
+          },
+          {
+            "x": 360.0,
+            "y": 275.0
+          },
+          {
+            "x": 360.0,
+            "y": 225.0
+          },
+          {
+            "x": 420.0,
+            "y": 225.0
+          },
+          {
+            "x": 420.0,
+            "y": 95.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3911,11 +5054,28 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#1",
           "pinName": "S0"
         },
         "name": "unnamedWire#95",
-        "path": []
+        "path": [
+          {
+            "x": 455.0,
+            "y": 100.0
+          },
+          {
+            "x": 455.0,
+            "y": 130.0
+          },
+          {
+            "x": 435.0,
+            "y": 130.0
+          },
+          {
+            "x": 435.0,
+            "y": 140.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3923,7 +5083,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux1_4#0",
           "pinName": "S0"
         },
         "name": "unnamedWire#96",
@@ -3935,7 +5095,7 @@
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux1_4#0",
           "pinName": "I0_1"
         },
         "name": "unnamedWire#97",
@@ -3947,7 +5107,7 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux1_4#0",
           "pinName": "I0_2"
         },
         "name": "unnamedWire#98",
@@ -3955,7 +5115,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux1_4#0",
           "pinName": "I0_3"
         },
         "pin2": {
@@ -3983,13 +5143,13 @@
       "musr": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "DeserializedSubmodelComponent#1"
+          "delegateTarget": "Am2904muSR#0"
         }
       },
       "msr": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "DeserializedSubmodelComponent#0"
+          "delegateTarget": "Am2904MSR#0"
         }
       }
     },

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json
index eff0611..a5b084d 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json
@@ -1,11 +1,11 @@
 {
-  "width": 45.0,
-  "height": 46.0,
+  "width": 80.0,
+  "height": 75.0,
   "interfacePins": [
     {
       "location": {
-        "x": 14.0,
-        "y": 46.0
+        "x": 50.0,
+        "y": 0.0
       },
       "name": "C",
       "logicWidth": 1,
@@ -13,8 +13,8 @@
     },
     {
       "location": {
-        "x": 27.5,
-        "y": 46.0
+        "x": 60.0,
+        "y": 0.0
       },
       "name": "COVD_EN",
       "logicWidth": 1,
@@ -22,8 +22,8 @@
     },
     {
       "location": {
-        "x": 37.5,
-        "y": 46.0
+        "x": 70.0,
+        "y": 0.0
       },
       "name": "COVD_V",
       "logicWidth": 1,
@@ -32,7 +32,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 31.0
+        "y": 50.0
       },
       "name": "I",
       "logicWidth": 4,
@@ -40,8 +40,8 @@
     },
     {
       "location": {
-        "x": 4.0,
-        "y": 46.0
+        "x": 0.0,
+        "y": 70.0
       },
       "name": "MUX",
       "logicWidth": 3,
@@ -49,8 +49,8 @@
     },
     {
       "location": {
-        "x": 45.0,
-        "y": 19.0
+        "x": 80.0,
+        "y": 20.0
       },
       "name": "Q",
       "logicWidth": 4,
@@ -59,7 +59,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 18.0
+        "y": 30.0
       },
       "name": "Y",
       "logicWidth": 4,
@@ -67,7 +67,7 @@
     },
     {
       "location": {
-        "x": 15.5,
+        "x": 20.0,
         "y": 0.0
       },
       "name": "_EC",
@@ -76,7 +76,7 @@
     },
     {
       "location": {
-        "x": 25.5,
+        "x": 30.0,
         "y": 0.0
       },
       "name": "_EN",
@@ -85,8 +85,8 @@
     },
     {
       "location": {
-        "x": 35.5,
-        "y": 0.2
+        "x": 40.0,
+        "y": 0.0
       },
       "name": "_EOVR",
       "logicWidth": 1,
@@ -94,7 +94,7 @@
     },
     {
       "location": {
-        "x": 5.5,
+        "x": 10.0,
         "y": 0.0
       },
       "name": "_EZ",
@@ -104,94 +104,22 @@
     {
       "location": {
         "x": 0.0,
-        "y": 5.0
+        "y": 10.0
       },
       "name": "mu",
       "logicWidth": 4,
       "usage": "INPUT"
     }
   ],
-  "innerScale": 0.1,
+  "innerScale": 0.2,
   "submodel": {
     "components": [
-      {
-        "id": "mux1_4",
-        "name": "DeserializedSubmodelComponent#0",
-        "pos": {
-          "x": 55.0,
-          "y": 110.0
-        }
-      },
-      {
-        "id": "xor",
-        "name": "DeserializedSubmodelComponent#1",
-        "pos": {
-          "x": 35.0,
-          "y": 250.0
-        }
-      },
-      {
-        "id": "mux1_4",
-        "name": "DeserializedSubmodelComponent#2",
-        "pos": {
-          "x": 150.0,
-          "y": 280.0
-        }
-      },
-      {
-        "id": "not4",
-        "name": "DeserializedSubmodelComponent#3",
-        "pos": {
-          "x": 100.0,
-          "y": 330.0
-        }
-      },
-      {
-        "id": "mux1_4",
-        "name": "DeserializedSubmodelComponent#4",
-        "pos": {
-          "x": 110.0,
-          "y": 60.0
-        }
-      },
-      {
-        "id": "mux1_4",
-        "name": "DeserializedSubmodelComponent#5",
-        "pos": {
-          "x": 200.0,
-          "y": 230.0
-        }
-      },
-      {
-        "id": "mux1_4",
-        "name": "DeserializedSubmodelComponent#6",
-        "pos": {
-          "x": 250.0,
-          "y": 180.0
-        }
-      },
-      {
-        "id": "mux1",
-        "name": "DeserializedSubmodelComponent#7",
-        "pos": {
-          "x": 325.0,
-          "y": 290.0
-        }
-      },
-      {
-        "id": "and",
-        "name": "DeserializedSubmodelComponent#8",
-        "pos": {
-          "x": 380.0,
-          "y": 85.0
-        }
-      },
       {
         "id": "Merger",
         "name": "Merger#0",
         "pos": {
-          "x": 435.0,
-          "y": 175.0
+          "x": 385.0,
+          "y": 85.0
         },
         "params": 4
       },
@@ -199,8 +127,8 @@
         "id": "NandGate",
         "name": "NandGate#0",
         "pos": {
-          "x": 325.0,
-          "y": 90.0
+          "x": 170.0,
+          "y": 55.0
         },
         "params": 1
       },
@@ -218,7 +146,7 @@
         "name": "Splitter#1",
         "pos": {
           "x": 5.0,
-          "y": 165.0
+          "y": 135.0
         },
         "params": 4
       },
@@ -227,7 +155,7 @@
         "name": "Splitter#2",
         "pos": {
           "x": 45.0,
-          "y": 425.0
+          "y": 340.0
         },
         "params": 3
       },
@@ -236,7 +164,7 @@
         "name": "Splitter#3",
         "pos": {
           "x": 5.0,
-          "y": 295.0
+          "y": 235.0
         },
         "params": 4
       },
@@ -244,8 +172,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
         "pos": {
-          "x": 29.0,
-          "y": 284.0
+          "x": 19.0,
+          "y": 224.0
         },
         "params": 1
       },
@@ -253,8 +181,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#1",
         "pos": {
-          "x": 414.0,
-          "y": 174.0
+          "x": 364.0,
+          "y": 84.0
         },
         "params": 1
       },
@@ -262,8 +190,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#10",
         "pos": {
-          "x": 89.0,
-          "y": 84.0
+          "x": 74.0,
+          "y": 54.0
         },
         "params": 1
       },
@@ -271,8 +199,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#11",
         "pos": {
-          "x": 89.0,
-          "y": 94.0
+          "x": 74.0,
+          "y": 64.0
         },
         "params": 1
       },
@@ -280,8 +208,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#12",
         "pos": {
-          "x": 19.0,
-          "y": 294.0
+          "x": 34.0,
+          "y": 234.0
         },
         "params": 1
       },
@@ -289,8 +217,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#13",
         "pos": {
-          "x": 194.0,
-          "y": 234.0
+          "x": 124.0,
+          "y": 174.0
         },
         "params": 1
       },
@@ -298,8 +226,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#14",
         "pos": {
-          "x": 89.0,
-          "y": 104.0
+          "x": 74.0,
+          "y": 74.0
         },
         "params": 1
       },
@@ -307,8 +235,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#15",
         "pos": {
-          "x": 319.0,
-          "y": 294.0
+          "x": 164.0,
+          "y": 59.0
         },
         "params": 1
       },
@@ -316,8 +244,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#16",
         "pos": {
-          "x": 319.0,
-          "y": 104.0
+          "x": 269.0,
+          "y": 39.0
         },
         "params": 1
       },
@@ -325,8 +253,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#2",
         "pos": {
-          "x": 419.0,
-          "y": 184.0
+          "x": 369.0,
+          "y": 94.0
         },
         "params": 1
       },
@@ -334,8 +262,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#3",
         "pos": {
-          "x": 424.0,
-          "y": 194.0
+          "x": 374.0,
+          "y": 104.0
         },
         "params": 1
       },
@@ -343,8 +271,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#4",
         "pos": {
-          "x": 429.0,
-          "y": 204.0
+          "x": 379.0,
+          "y": 114.0
         },
         "params": 1
       },
@@ -352,8 +280,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#5",
         "pos": {
-          "x": 84.0,
-          "y": 344.0
+          "x": 29.0,
+          "y": 284.0
         },
         "params": 1
       },
@@ -361,8 +289,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#6",
         "pos": {
-          "x": 94.0,
-          "y": 364.0
+          "x": 39.0,
+          "y": 304.0
         },
         "params": 1
       },
@@ -370,8 +298,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#7",
         "pos": {
-          "x": 29.0,
-          "y": 254.0
+          "x": 19.0,
+          "y": 194.0
         },
         "params": 1
       },
@@ -379,8 +307,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#8",
         "pos": {
-          "x": 74.0,
-          "y": 314.0
+          "x": 79.0,
+          "y": 254.0
         },
         "params": 1
       },
@@ -388,18 +316,90 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#9",
         "pos": {
-          "x": 49.0,
-          "y": 114.0
+          "x": 39.0,
+          "y": 84.0
         },
         "params": 1
       },
+      {
+        "id": "and",
+        "name": "and#0",
+        "pos": {
+          "x": 195.0,
+          "y": 50.0
+        }
+      },
       {
         "id": "dff4_finewe",
         "name": "dff4_finewe#0",
         "pos": {
-          "x": 375.0,
+          "x": 325.0,
+          "y": 80.0
+        }
+      },
+      {
+        "id": "mux1",
+        "name": "mux1#0",
+        "pos": {
+          "x": 280.0,
+          "y": 175.0
+        }
+      },
+      {
+        "id": "mux1_4",
+        "name": "mux1_4#0",
+        "pos": {
+          "x": 45.0,
+          "y": 80.0
+        }
+      },
+      {
+        "id": "mux1_4",
+        "name": "mux1_4#1",
+        "pos": {
+          "x": 85.0,
+          "y": 220.0
+        }
+      },
+      {
+        "id": "mux1_4",
+        "name": "mux1_4#2",
+        "pos": {
+          "x": 90.0,
+          "y": 30.0
+        }
+      },
+      {
+        "id": "mux1_4",
+        "name": "mux1_4#3",
+        "pos": {
+          "x": 130.0,
           "y": 170.0
         }
+      },
+      {
+        "id": "mux1_4",
+        "name": "mux1_4#4",
+        "pos": {
+          "x": 175.0,
+          "y": 120.0
+        }
+      },
+      {
+        "id": "not4",
+        "name": "not4#0",
+        "pos": {
+          "x": 45.0,
+          "y": 270.0
+        }
+      },
+      {
+        "id": "xor",
+        "name": "xor#0",
+        "pos": {
+          "x": 40.0,
+          "y": 190.0
+        }
       }
     ],
     "wires": [
@@ -415,24 +415,8 @@
         "name": "unnamedWire#0",
         "path": [
           {
-            "x": 140.0,
-            "y": 445.0
-          },
-          {
-            "x": 255.0,
-            "y": 445.0
-          },
-          {
-            "x": 255.0,
-            "y": 280.0
-          },
-          {
-            "x": 340.0,
-            "y": 280.0
-          },
-          {
-            "x": 340.0,
-            "y": 175.0
+            "x": 250.0,
+            "y": 85.0
           }
         ]
       },
@@ -448,12 +432,16 @@
         "name": "unnamedWire#1",
         "path": [
           {
-            "x": 355.0,
+            "x": 200.0,
+            "y": 30.0
+          },
+          {
+            "x": 305.0,
             "y": 30.0
           },
           {
-            "x": 355.0,
-            "y": 215.0
+            "x": 305.0,
+            "y": 125.0
           }
         ]
       },
@@ -483,7 +471,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I0_1"
         },
         "pin2": {
@@ -494,7 +482,7 @@
         "path": [
           {
             "x": 35.0,
-            "y": 125.0
+            "y": 95.0
           },
           {
             "x": 35.0,
@@ -508,7 +496,7 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I0_2"
         },
         "name": "unnamedWire#13",
@@ -519,7 +507,7 @@
           },
           {
             "x": 30.0,
-            "y": 135.0
+            "y": 105.0
           }
         ]
       },
@@ -529,7 +517,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I0_3"
         },
         "name": "unnamedWire#14",
@@ -540,7 +528,7 @@
           },
           {
             "x": 25.0,
-            "y": 145.0
+            "y": 115.0
           }
         ]
       },
@@ -550,7 +538,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I0_4"
         },
         "name": "unnamedWire#15",
@@ -561,7 +549,7 @@
           },
           {
             "x": 20.0,
-            "y": 155.0
+            "y": 125.0
           }
         ]
       },
@@ -571,7 +559,7 @@
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I1_1"
         },
         "name": "unnamedWire#16",
@@ -579,7 +567,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I1_2"
         },
         "pin2": {
@@ -595,7 +583,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I1_3"
         },
         "name": "unnamedWire#18",
@@ -603,7 +591,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I1_4"
         },
         "pin2": {
@@ -625,16 +613,16 @@
         "name": "unnamedWire#2",
         "path": [
           {
-            "x": 255.0,
+            "x": 150.0,
             "y": 25.0
           },
           {
-            "x": 360.0,
+            "x": 310.0,
             "y": 25.0
           },
           {
-            "x": 360.0,
-            "y": 205.0
+            "x": 310.0,
+            "y": 115.0
           }
         ]
       },
@@ -648,12 +636,7 @@
           "pinName": "I"
         },
         "name": "unnamedWire#20",
-        "path": [
-          {
-            "x": 40.0,
-            "y": 435.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
@@ -685,18 +668,18 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "xor#0",
           "pinName": "B"
         },
         "name": "unnamedWire#23",
         "path": [
           {
-            "x": 25.0,
-            "y": 305.0
+            "x": 30.0,
+            "y": 245.0
           },
           {
-            "x": 25.0,
-            "y": 265.0
+            "x": 30.0,
+            "y": 205.0
           }
         ]
       },
@@ -713,21 +696,21 @@
         "path": [
           {
             "x": 60.0,
-            "y": 445.0
+            "y": 360.0
           },
           {
             "x": 60.0,
-            "y": 415.0
+            "y": 335.0
           },
           {
-            "x": 30.0,
-            "y": 415.0
+            "x": 20.0,
+            "y": 335.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "xor#0",
           "pinName": "A"
         },
         "pin2": {
@@ -791,32 +774,32 @@
           "pinName": "_EC"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "and#0",
           "pinName": "A"
         },
         "name": "unnamedWire#3",
         "path": [
           {
-            "x": 155.0,
+            "x": 100.0,
             "y": 20.0
           },
           {
-            "x": 365.0,
+            "x": 190.0,
             "y": 20.0
           },
           {
-            "x": 365.0,
-            "y": 90.0
+            "x": 190.0,
+            "y": 55.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "not4#0",
           "pinName": "Y1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "mux1_4#1",
           "pinName": "I1_1"
         },
         "name": "unnamedWire#30",
@@ -824,11 +807,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "mux1_4#1",
           "pinName": "I1_2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "not4#0",
           "pinName": "Y2"
         },
         "name": "unnamedWire#31",
@@ -836,11 +819,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "not4#0",
           "pinName": "Y3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "mux1_4#1",
           "pinName": "I1_3"
         },
         "name": "unnamedWire#32",
@@ -848,11 +831,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "mux1_4#1",
           "pinName": "I1_4"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "not4#0",
           "pinName": "Y4"
         },
         "name": "unnamedWire#33",
@@ -864,22 +847,22 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "not4#0",
           "pinName": "A1"
         },
         "name": "unnamedWire#34",
         "path": [
           {
-            "x": 415.0,
-            "y": 380.0
+            "x": 365.0,
+            "y": 315.0
           },
           {
-            "x": 80.0,
-            "y": 380.0
+            "x": 25.0,
+            "y": 315.0
           },
           {
-            "x": 80.0,
-            "y": 335.0
+            "x": 25.0,
+            "y": 275.0
           }
         ]
       },
@@ -895,12 +878,12 @@
         "name": "unnamedWire#35",
         "path": [
           {
-            "x": 420.0,
-            "y": 385.0
+            "x": 370.0,
+            "y": 320.0
           },
           {
-            "x": 85.0,
-            "y": 385.0
+            "x": 30.0,
+            "y": 320.0
           }
         ]
       },
@@ -910,22 +893,22 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "not4#0",
           "pinName": "A3"
         },
         "name": "unnamedWire#36",
         "path": [
           {
-            "x": 425.0,
-            "y": 390.0
+            "x": 375.0,
+            "y": 325.0
           },
           {
-            "x": 90.0,
-            "y": 390.0
+            "x": 35.0,
+            "y": 325.0
           },
           {
-            "x": 90.0,
-            "y": 355.0
+            "x": 35.0,
+            "y": 295.0
           }
         ]
       },
@@ -941,12 +924,12 @@
         "name": "unnamedWire#37",
         "path": [
           {
-            "x": 430.0,
-            "y": 395.0
+            "x": 380.0,
+            "y": 330.0
           },
           {
-            "x": 95.0,
-            "y": 395.0
+            "x": 40.0,
+            "y": 330.0
           }
         ]
       },
@@ -964,7 +947,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "mux1_4#1",
           "pinName": "I0_4"
         },
         "pin2": {
@@ -974,8 +957,8 @@
         "name": "unnamedWire#39",
         "path": [
           {
-            "x": 85.0,
-            "y": 325.0
+            "x": 30.0,
+            "y": 265.0
           }
         ]
       },
@@ -991,16 +974,16 @@
         "name": "unnamedWire#4",
         "path": [
           {
-            "x": 55.0,
+            "x": 50.0,
             "y": 15.0
           },
           {
-            "x": 370.0,
+            "x": 320.0,
             "y": 15.0
           },
           {
-            "x": 370.0,
-            "y": 185.0
+            "x": 320.0,
+            "y": 95.0
           }
         ]
       },
@@ -1010,20 +993,20 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "mux1_4#1",
           "pinName": "I0_2"
         },
         "name": "unnamedWire#40",
         "path": [
           {
-            "x": 95.0,
-            "y": 305.0
+            "x": 40.0,
+            "y": 245.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "mux1_4#1",
           "pinName": "I0_3"
         },
         "pin2": {
@@ -1045,12 +1028,12 @@
         "name": "unnamedWire#42",
         "path": [
           {
-            "x": 30.0,
-            "y": 230.0
+            "x": 20.0,
+            "y": 175.0
           },
           {
-            "x": 50.0,
-            "y": 230.0
+            "x": 40.0,
+            "y": 175.0
           }
         ]
       },
@@ -1060,7 +1043,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "mux1_4#1",
           "pinName": "S0"
         },
         "name": "unnamedWire#43",
@@ -1068,11 +1051,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "Y1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "mux1_4#2",
           "pinName": "I1_1"
         },
         "name": "unnamedWire#44",
@@ -1090,18 +1073,18 @@
         "name": "unnamedWire#45",
         "path": [
           {
-            "x": 50.0,
-            "y": 105.0
+            "x": 40.0,
+            "y": 75.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "mux1_4#2",
           "pinName": "I1_2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "Y2"
         },
         "name": "unnamedWire#46",
@@ -1109,11 +1092,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "Y3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "mux1_4#2",
           "pinName": "I1_3"
         },
         "name": "unnamedWire#47",
@@ -1121,11 +1104,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "mux1_4#2",
           "pinName": "I1_4"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "Y4"
         },
         "name": "unnamedWire#48",
@@ -1137,7 +1120,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "mux1_4#2",
           "pinName": "I0_4"
         },
         "name": "unnamedWire#49",
@@ -1181,7 +1164,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "mux1_4#2",
           "pinName": "I0_3"
         },
         "pin2": {
@@ -1197,7 +1180,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "mux1_4#2",
           "pinName": "I0_2"
         },
         "name": "unnamedWire#53",
@@ -1205,7 +1188,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "mux1_4#2",
           "pinName": "I0_1"
         },
         "pin2": {
@@ -1215,14 +1198,14 @@
         "name": "unnamedWire#54",
         "path": [
           {
-            "x": 90.0,
-            "y": 75.0
+            "x": 75.0,
+            "y": 45.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "not4#0",
           "pinName": "A4"
         },
         "pin2": {
@@ -1234,7 +1217,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "not4#0",
           "pinName": "A2"
         },
         "pin2": {
@@ -1250,7 +1233,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "mux1_4#1",
           "pinName": "I0_1"
         },
         "name": "unnamedWire#57",
@@ -1274,14 +1257,14 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#3",
           "pinName": "I0_1"
         },
         "name": "unnamedWire#59",
         "path": [
           {
-            "x": 20.0,
-            "y": 245.0
+            "x": 35.0,
+            "y": 185.0
           }
         ]
       },
@@ -1299,11 +1282,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#3",
           "pinName": "I0_2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "xor#0",
           "pinName": "Y"
         },
         "name": "unnamedWire#60",
@@ -1311,7 +1294,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#3",
           "pinName": "I0_3"
         },
         "pin2": {
@@ -1321,8 +1304,8 @@
         "name": "unnamedWire#61",
         "path": [
           {
-            "x": 75.0,
-            "y": 265.0
+            "x": 80.0,
+            "y": 205.0
           }
         ]
       },
@@ -1332,28 +1315,28 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#3",
           "pinName": "I0_4"
         },
         "name": "unnamedWire#62",
         "path": [
           {
-            "x": 80.0,
-            "y": 325.0
+            "x": 25.0,
+            "y": 265.0
           },
           {
-            "x": 80.0,
-            "y": 275.0
+            "x": 25.0,
+            "y": 215.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "mux1_4#1",
           "pinName": "Y1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#3",
           "pinName": "I1_1"
         },
         "name": "unnamedWire#63",
@@ -1361,11 +1344,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#3",
           "pinName": "I1_2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "mux1_4#1",
           "pinName": "Y2"
         },
         "name": "unnamedWire#64",
@@ -1373,11 +1356,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "mux1_4#1",
           "pinName": "Y3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#3",
           "pinName": "I1_3"
         },
         "name": "unnamedWire#65",
@@ -1385,11 +1368,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#3",
           "pinName": "I1_4"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "mux1_4#1",
           "pinName": "Y4"
         },
         "name": "unnamedWire#66",
@@ -1407,8 +1390,8 @@
         "name": "unnamedWire#67",
         "path": [
           {
-            "x": 195.0,
-            "y": 435.0
+            "x": 125.0,
+            "y": 350.0
           }
         ]
       },
@@ -1418,7 +1401,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#3",
           "pinName": "S0"
         },
         "name": "unnamedWire#68",
@@ -1430,18 +1413,18 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "mux1_4#2",
           "pinName": "S0"
         },
         "name": "unnamedWire#69",
         "path": [
           {
-            "x": 105.0,
-            "y": 235.0
+            "x": 85.0,
+            "y": 175.0
           },
           {
-            "x": 105.0,
-            "y": 65.0
+            "x": 85.0,
+            "y": 35.0
           }
         ]
       },
@@ -1459,7 +1442,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "mux1_4#4",
           "pinName": "Y4"
         },
         "pin2": {
@@ -1469,12 +1452,12 @@
         "name": "unnamedWire#70",
         "path": [
           {
-            "x": 295.0,
-            "y": 215.0
+            "x": 235.0,
+            "y": 155.0
           },
           {
-            "x": 295.0,
-            "y": 255.0
+            "x": 235.0,
+            "y": 165.0
           }
         ]
       },
@@ -1484,24 +1467,24 @@
           "pinName": "D3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "mux1_4#4",
           "pinName": "Y3"
         },
         "name": "unnamedWire#71",
         "path": [
           {
-            "x": 300.0,
-            "y": 245.0
+            "x": 240.0,
+            "y": 155.0
           },
           {
-            "x": 300.0,
-            "y": 205.0
+            "x": 240.0,
+            "y": 145.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "and#0",
           "pinName": "Y"
         },
         "pin2": {
@@ -1511,20 +1494,20 @@
         "name": "unnamedWire#72",
         "path": [
           {
-            "x": 420.0,
-            "y": 90.0
+            "x": 235.0,
+            "y": 55.0
           },
           {
-            "x": 420.0,
-            "y": 110.0
+            "x": 235.0,
+            "y": 20.0
           },
           {
-            "x": 365.0,
-            "y": 110.0
+            "x": 315.0,
+            "y": 20.0
           },
           {
-            "x": 365.0,
-            "y": 195.0
+            "x": 315.0,
+            "y": 105.0
           }
         ]
       },
@@ -1534,28 +1517,28 @@
           "pinName": "D1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "mux1_4#4",
           "pinName": "Y1"
         },
         "name": "unnamedWire#73",
         "path": [
           {
-            "x": 310.0,
-            "y": 225.0
+            "x": 250.0,
+            "y": 135.0
           },
           {
-            "x": 310.0,
-            "y": 185.0
+            "x": 250.0,
+            "y": 125.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "mux1_4#4",
           "pinName": "I1_4"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#3",
           "pinName": "Y4"
         },
         "name": "unnamedWire#74",
@@ -1563,11 +1546,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#3",
           "pinName": "Y3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "mux1_4#4",
           "pinName": "I1_3"
         },
         "name": "unnamedWire#75",
@@ -1575,11 +1558,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "mux1_4#4",
           "pinName": "I1_2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#3",
           "pinName": "Y2"
         },
         "name": "unnamedWire#76",
@@ -1587,11 +1570,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#3",
           "pinName": "Y1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "mux1_4#4",
           "pinName": "I1_1"
         },
         "name": "unnamedWire#77",
@@ -1599,43 +1582,43 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "mux1_4#4",
           "pinName": "I0_4"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "mux1_4#2",
           "pinName": "Y4"
         },
         "name": "unnamedWire#78",
         "path": [
           {
-            "x": 200.0,
-            "y": 225.0
+            "x": 140.0,
+            "y": 165.0
           },
           {
-            "x": 200.0,
-            "y": 95.0
+            "x": 140.0,
+            "y": 65.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "mux1_4#2",
           "pinName": "Y3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "mux1_4#4",
           "pinName": "I0_3"
         },
         "name": "unnamedWire#79",
         "path": [
           {
-            "x": 205.0,
-            "y": 85.0
+            "x": 145.0,
+            "y": 55.0
           },
           {
-            "x": 205.0,
-            "y": 215.0
+            "x": 145.0,
+            "y": 155.0
           }
         ]
       },
@@ -1653,43 +1636,43 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "mux1_4#4",
           "pinName": "I0_2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "mux1_4#2",
           "pinName": "Y2"
         },
         "name": "unnamedWire#80",
         "path": [
           {
-            "x": 210.0,
-            "y": 205.0
+            "x": 150.0,
+            "y": 145.0
           },
           {
-            "x": 210.0,
-            "y": 75.0
+            "x": 150.0,
+            "y": 45.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "mux1_4#2",
           "pinName": "Y1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "mux1_4#4",
           "pinName": "I0_1"
         },
         "name": "unnamedWire#81",
         "path": [
           {
-            "x": 215.0,
-            "y": 65.0
+            "x": 155.0,
+            "y": 35.0
           },
           {
-            "x": 215.0,
-            "y": 195.0
+            "x": 155.0,
+            "y": 135.0
           }
         ]
       },
@@ -1699,18 +1682,18 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "mux1_4#4",
           "pinName": "S0"
         },
         "name": "unnamedWire#82",
         "path": [
           {
-            "x": 245.0,
-            "y": 425.0
+            "x": 170.0,
+            "y": 340.0
           },
           {
-            "x": 245.0,
-            "y": 185.0
+            "x": 170.0,
+            "y": 125.0
           }
         ]
       },
@@ -1720,40 +1703,49 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#15",
-          "pinName": ""
+          "compName": "NandGate#0",
+          "pinName": "A"
         },
         "name": "unnamedWire#83",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#15",
-          "pinName": ""
-        },
-        "pin2": {
           "compName": "_submodelinterface",
           "pinName": "COVD_EN"
         },
+        "pin2": {
+          "compName": "WireCrossPoint#16",
+          "pinName": ""
+        },
         "name": "unnamedWire#84",
         "path": [
           {
-            "x": 275.0,
-            "y": 295.0
+            "x": 300.0,
+            "y": 10.0
+          },
+          {
+            "x": 270.0,
+            "y": 10.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#16",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
-          "pinName": "S0"
+          "compName": "WireCrossPoint#15",
+          "pinName": ""
         },
         "name": "unnamedWire#85",
-        "path": []
+        "path": [
+          {
+            "x": 165.0,
+            "y": 40.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1761,49 +1753,57 @@
           "pinName": "COVD_V"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "mux1#0",
           "pinName": "I1"
         },
         "name": "unnamedWire#86",
         "path": [
           {
-            "x": 375.0,
-            "y": 325.0
+            "x": 350.0,
+            "y": 70.0
           },
           {
-            "x": 320.0,
-            "y": 325.0
+            "x": 265.0,
+            "y": 70.0
           },
           {
-            "x": 320.0,
-            "y": 315.0
+            "x": 265.0,
+            "y": 200.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "mux1_4#4",
           "pinName": "Y2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "mux1#0",
           "pinName": "I0"
         },
         "name": "unnamedWire#87",
         "path": [
           {
-            "x": 305.0,
-            "y": 195.0
+            "x": 245.0,
+            "y": 135.0
           },
           {
-            "x": 305.0,
-            "y": 305.0
+            "x": 245.0,
+            "y": 145.0
+          },
+          {
+            "x": 275.0,
+            "y": 145.0
+          },
+          {
+            "x": 275.0,
+            "y": 190.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "mux1#0",
           "pinName": "Y"
         },
         "pin2": {
@@ -1813,12 +1813,12 @@
         "name": "unnamedWire#88",
         "path": [
           {
-            "x": 365.0,
-            "y": 295.0
+            "x": 320.0,
+            "y": 180.0
           },
           {
-            "x": 365.0,
-            "y": 235.0
+            "x": 320.0,
+            "y": 145.0
           }
         ]
       },
@@ -1828,7 +1828,7 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "and#0",
           "pinName": "B"
         },
         "name": "unnamedWire#89",
@@ -1848,15 +1848,20 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#16",
+          "compName": "WireCrossPoint#15",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#15",
-          "pinName": ""
+          "compName": "NandGate#0",
+          "pinName": "B"
         },
         "name": "unnamedWire#90",
-        "path": []
+        "path": [
+          {
+            "x": 165.0,
+            "y": 70.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1864,26 +1869,14 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "NandGate#0",
-          "pinName": "B"
+          "compName": "mux1#0",
+          "pinName": "S0"
         },
         "name": "unnamedWire#91",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "NandGate#0",
-          "pinName": "A"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#16",
-          "pinName": ""
-        },
-        "name": "unnamedWire#92",
         "path": [
           {
-            "x": 320.0,
-            "y": 95.0
+            "x": 270.0,
+            "y": 180.0
           }
         ]
       },
@@ -1893,7 +1886,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "S0"
         },
         "name": "unnamedWire#93",

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904TestLogic.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904TestLogic.json
index 3ec88ac..ab44304 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904TestLogic.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904TestLogic.json
@@ -87,14 +87,6 @@
   "innerScale": 0.4,
   "submodel": {
     "components": [
-      {
-        "id": "xor",
-        "name": "DeserializedSubmodelComponent#0",
-        "pos": {
-          "x": 40.0,
-          "y": 20.0
-        }
-      },
       {
         "id": "NandGate",
         "name": "NandGate#0",
@@ -256,6 +248,14 @@
           "y": 149.0
         },
         "params": 1
+      },
+      {
+        "id": "xor",
+        "name": "xor#0",
+        "pos": {
+          "x": 40.0,
+          "y": 20.0
+        }
       }
     ],
     "wires": [
@@ -581,7 +581,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "xor#0",
           "pinName": "A"
         },
         "name": "unnamedWire#3",
@@ -683,7 +683,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "xor#0",
           "pinName": "B"
         },
         "name": "unnamedWire#4",
@@ -696,7 +696,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "xor#0",
           "pinName": "Y"
         },
         "pin2": {
@@ -766,10 +766,6 @@
     "pinLabelMargin": 0.5
   },
   "outlineRendererSnippetID": "default",
-  "highLevelStateHandlerSnippetID": "standard",
-  "highLevelStateHandlerParams": {
-    "subcomponentHighLevelStates": {},
-    "atomicHighLevelStates": {}
-  },
+  "highLevelStateHandlerSnippetID": "default",
   "version": "0.1.5"
 }
\ No newline at end of file

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json
index a199100..7faf69d 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json
@@ -1,11 +1,11 @@
 {
-  "width": 45.0,
-  "height": 46.0,
+  "width": 50.0,
+  "height": 65.0,
   "interfacePins": [
     {
       "location": {
-        "x": 14.0,
-        "y": 46.0
+        "x": 0.0,
+        "y": 10.0
       },
       "name": "C",
       "logicWidth": 1,
@@ -13,8 +13,8 @@
     },
     {
       "location": {
-        "x": 27.5,
-        "y": 46.0
+        "x": 0.0,
+        "y": 50.0
       },
       "name": "CINV",
       "logicWidth": 1,
@@ -23,7 +23,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 31.0
+        "y": 40.0
       },
       "name": "I",
       "logicWidth": 4,
@@ -32,7 +32,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 13.5
+        "y": 30.0
       },
       "name": "M",
       "logicWidth": 4,
@@ -40,8 +40,8 @@
     },
     {
       "location": {
-        "x": 4.0,
-        "y": 46.0
+        "x": 0.0,
+        "y": 20.0
       },
       "name": "MUX",
       "logicWidth": 2,
@@ -49,8 +49,8 @@
     },
     {
       "location": {
-        "x": 37.5,
-        "y": 46.0
+        "x": 0.0,
+        "y": 60.0
       },
       "name": "OVRRET",
       "logicWidth": 1,
@@ -58,8 +58,8 @@
     },
     {
       "location": {
-        "x": 45.0,
-        "y": 19.0
+        "x": 50.0,
+        "y": 10.0
       },
       "name": "Q",
       "logicWidth": 4,
@@ -67,7 +67,7 @@
     },
     {
       "location": {
-        "x": 15.5,
+        "x": 20.0,
         "y": 0.0
       },
       "name": "_EC",
@@ -76,7 +76,7 @@
     },
     {
       "location": {
-        "x": 25.5,
+        "x": 30.0,
         "y": 0.0
       },
       "name": "_EN",
@@ -85,7 +85,7 @@
     },
     {
       "location": {
-        "x": 35.5,
+        "x": 40.0,
         "y": 0.0
       },
       "name": "_EOVR",
@@ -94,7 +94,7 @@
     },
     {
       "location": {
-        "x": 5.5,
+        "x": 10.0,
         "y": 0.0
       },
       "name": "_EZ",
@@ -102,39 +102,15 @@
       "usage": "INPUT"
     }
   ],
-  "innerScale": 0.1,
+  "innerScale": 0.2,
   "submodel": {
     "components": [
-      {
-        "id": "mux1_4",
-        "name": "DeserializedSubmodelComponent#0",
-        "pos": {
-          "x": 45.0,
-          "y": 240.0
-        }
-      },
-      {
-        "id": "mux1_4",
-        "name": "DeserializedSubmodelComponent#1",
-        "pos": {
-          "x": 100.0,
-          "y": 190.0
-        }
-      },
-      {
-        "id": "xor",
-        "name": "DeserializedSubmodelComponent#2",
-        "pos": {
-          "x": 215.0,
-          "y": 200.0
-        }
-      },
       {
         "id": "Merger",
         "name": "Merger#0",
         "pos": {
-          "x": 435.0,
-          "y": 175.0
+          "x": 230.0,
+          "y": 30.0
         },
         "params": 4
       },
@@ -142,8 +118,8 @@
         "id": "NandGate",
         "name": "NandGate#0",
         "pos": {
-          "x": 245.0,
-          "y": 245.0
+          "x": 155.0,
+          "y": 135.0
         },
         "params": 1
       },
@@ -151,8 +127,8 @@
         "id": "NandGate",
         "name": "NandGate#1",
         "pos": {
-          "x": 215.0,
-          "y": 255.0
+          "x": 125.0,
+          "y": 150.0
         },
         "params": 1
       },
@@ -160,8 +136,8 @@
         "id": "NandGate",
         "name": "NandGate#2",
         "pos": {
-          "x": 215.0,
-          "y": 235.0
+          "x": 125.0,
+          "y": 130.0
         },
         "params": 1
       },
@@ -170,7 +146,7 @@
         "name": "Splitter#0",
         "pos": {
           "x": 5.0,
-          "y": 120.0
+          "y": 135.0
         },
         "params": 4
       },
@@ -179,7 +155,7 @@
         "name": "Splitter#1",
         "pos": {
           "x": 5.0,
-          "y": 295.0
+          "y": 185.0
         },
         "params": 4
       },
@@ -187,8 +163,8 @@
         "id": "Splitter",
         "name": "Splitter#2",
         "pos": {
-          "x": 45.0,
-          "y": 430.0
+          "x": 5.0,
+          "y": 95.0
         },
         "params": 2
       },
@@ -196,8 +172,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
         "pos": {
-          "x": 89.0,
-          "y": 234.0
+          "x": 19.0,
+          "y": 119.0
         },
         "params": 1
       },
@@ -205,8 +181,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#1",
         "pos": {
-          "x": 89.0,
-          "y": 224.0
+          "x": 59.0,
+          "y": 109.0
         },
         "params": 1
       },
@@ -214,8 +190,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#2",
         "pos": {
-          "x": 89.0,
-          "y": 214.0
+          "x": 59.0,
+          "y": 99.0
         },
         "params": 1
       },
@@ -223,8 +199,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#3",
         "pos": {
-          "x": 429.0,
-          "y": 204.0
+          "x": 224.0,
+          "y": 59.0
         },
         "params": 1
       },
@@ -232,8 +208,17 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#4",
         "pos": {
-          "x": 209.0,
-          "y": 244.0
+          "x": 114.0,
+          "y": 134.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#5",
+        "pos": {
+          "x": 59.0,
+          "y": 119.0
         },
         "params": 1
       },
@@ -241,8 +226,32 @@
         "id": "dff4_finewe",
         "name": "dff4_finewe#0",
         "pos": {
-          "x": 375.0,
-          "y": 170.0
+          "x": 185.0,
+          "y": 25.0
+        }
+      },
+      {
+        "id": "mux1_4",
+        "name": "mux1_4#0",
+        "pos": {
+          "x": 25.0,
+          "y": 125.0
+        }
+      },
+      {
+        "id": "mux1_4",
+        "name": "mux1_4#1",
+        "pos": {
+          "x": 65.0,
+          "y": 75.0
+        }
+      },
+      {
+        "id": "xor",
+        "name": "xor#0",
+        "pos": {
+          "x": 130.0,
+          "y": 105.0
         }
       }
     ],
@@ -273,7 +282,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I1_4"
         },
         "pin2": {
@@ -281,7 +290,16 @@
           "pinName": "O0"
         },
         "name": "unnamedWire#10",
-        "path": []
+        "path": [
+          {
+            "x": 20.0,
+            "y": 210.0
+          },
+          {
+            "x": 20.0,
+            "y": 215.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -301,18 +319,18 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I0_4"
         },
         "name": "unnamedWire#12",
         "path": [
           {
             "x": 20.0,
-            "y": 150.0
+            "y": 165.0
           },
           {
             "x": 20.0,
-            "y": 285.0
+            "y": 170.0
           }
         ]
       },
@@ -322,18 +340,18 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I0_3"
         },
         "name": "unnamedWire#13",
         "path": [
           {
-            "x": 25.0,
-            "y": 140.0
+            "x": 20.0,
+            "y": 155.0
           },
           {
-            "x": 25.0,
-            "y": 275.0
+            "x": 20.0,
+            "y": 160.0
           }
         ]
       },
@@ -343,18 +361,18 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I0_2"
         },
         "name": "unnamedWire#14",
         "path": [
           {
-            "x": 30.0,
-            "y": 130.0
+            "x": 20.0,
+            "y": 145.0
           },
           {
-            "x": 30.0,
-            "y": 265.0
+            "x": 20.0,
+            "y": 150.0
           }
         ]
       },
@@ -368,12 +386,7 @@
           "pinName": "I"
         },
         "name": "unnamedWire#15",
-        "path": [
-          {
-            "x": 40.0,
-            "y": 435.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
@@ -387,18 +400,18 @@
         "name": "unnamedWire#16",
         "path": [
           {
-            "x": 90.0,
-            "y": 440.0
+            "x": 20.0,
+            "y": 105.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "Y4"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "mux1_4#1",
           "pinName": "I1_4"
         },
         "name": "unnamedWire#17",
@@ -406,11 +419,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "mux1_4#1",
           "pinName": "I1_3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "Y3"
         },
         "name": "unnamedWire#18",
@@ -418,11 +431,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "Y2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "mux1_4#1",
           "pinName": "I1_2"
         },
         "name": "unnamedWire#19",
@@ -442,11 +455,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "Y1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "mux1_4#1",
           "pinName": "I1_1"
         },
         "name": "unnamedWire#20",
@@ -454,7 +467,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "mux1_4#1",
           "pinName": "I0_1"
         },
         "pin2": {
@@ -464,8 +477,8 @@
         "name": "unnamedWire#21",
         "path": [
           {
-            "x": 90.0,
-            "y": 205.0
+            "x": 60.0,
+            "y": 90.0
           }
         ]
       },
@@ -475,7 +488,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "mux1_4#1",
           "pinName": "I0_2"
         },
         "name": "unnamedWire#22",
@@ -483,7 +496,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "mux1_4#1",
           "pinName": "I0_3"
         },
         "pin2": {
@@ -507,11 +520,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "name": "unnamedWire#25",
@@ -519,11 +532,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "mux1_4#1",
           "pinName": "I0_4"
         },
         "name": "unnamedWire#26",
@@ -535,18 +548,14 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "S0"
         },
         "name": "unnamedWire#27",
         "path": [
           {
-            "x": 40.0,
-            "y": 235.0
-          },
-          {
-            "x": 40.0,
-            "y": 245.0
+            "x": 20.0,
+            "y": 130.0
           }
         ]
       },
@@ -556,21 +565,33 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "mux1_4#1",
           "pinName": "S0"
         },
         "name": "unnamedWire#28",
         "path": [
           {
-            "x": 85.0,
-            "y": 430.0
+            "x": 20.0,
+            "y": 95.0
           },
           {
-            "x": 85.0,
-            "y": 195.0
+            "x": 20.0,
+            "y": 80.0
           }
         ]
       },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "name": "unnamedWire#29",
+        "path": []
+      },
       {
         "pin1": {
           "compName": "dff4_finewe#0",
@@ -593,16 +614,7 @@
           "pinName": "A"
         },
         "name": "unnamedWire#30",
-        "path": [
-          {
-            "x": 240.0,
-            "y": 245.0
-          },
-          {
-            "x": 240.0,
-            "y": 250.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
@@ -616,12 +628,12 @@
         "name": "unnamedWire#31",
         "path": [
           {
-            "x": 240.0,
-            "y": 260.0
+            "x": 150.0,
+            "y": 150.0
           },
           {
-            "x": 240.0,
-            "y": 265.0
+            "x": 150.0,
+            "y": 160.0
           }
         ]
       },
@@ -637,16 +649,12 @@
         "name": "unnamedWire#32",
         "path": [
           {
-            "x": 375.0,
-            "y": 360.0
+            "x": 115.0,
+            "y": 300.0
           },
           {
-            "x": 205.0,
-            "y": 360.0
-          },
-          {
-            "x": 205.0,
-            "y": 260.0
+            "x": 115.0,
+            "y": 155.0
           }
         ]
       },
@@ -674,30 +682,39 @@
         "name": "unnamedWire#34",
         "path": [
           {
-            "x": 430.0,
-            "y": 280.0
+            "x": 225.0,
+            "y": 175.0
           },
           {
-            "x": 210.0,
-            "y": 280.0
+            "x": 120.0,
+            "y": 175.0
           },
           {
-            "x": 210.0,
-            "y": 270.0
+            "x": 120.0,
+            "y": 165.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "mux1_4#1",
           "pinName": "Y2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "xor#0",
           "pinName": "A"
         },
         "name": "unnamedWire#35",
-        "path": []
+        "path": [
+          {
+            "x": 125.0,
+            "y": 90.0
+          },
+          {
+            "x": 125.0,
+            "y": 110.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -705,22 +722,18 @@
           "pinName": "CINV"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "xor#0",
           "pinName": "B"
         },
         "name": "unnamedWire#36",
         "path": [
           {
-            "x": 275.0,
-            "y": 390.0
-          },
-          {
-            "x": 190.0,
-            "y": 390.0
+            "x": 105.0,
+            "y": 250.0
           },
           {
-            "x": 190.0,
-            "y": 215.0
+            "x": 105.0,
+            "y": 120.0
           }
         ]
       },
@@ -736,15 +749,15 @@
         "name": "unnamedWire#37",
         "path": [
           {
-            "x": 370.0,
-            "y": 185.0
+            "x": 180.0,
+            "y": 40.0
           },
           {
-            "x": 370.0,
+            "x": 180.0,
             "y": 5.0
           },
           {
-            "x": 55.0,
+            "x": 50.0,
             "y": 5.0
           }
         ]
@@ -761,16 +774,12 @@
         "name": "unnamedWire#38",
         "path": [
           {
-            "x": 140.0,
-            "y": 325.0
-          },
-          {
-            "x": 345.0,
-            "y": 325.0
+            "x": 55.0,
+            "y": 50.0
           },
           {
-            "x": 345.0,
-            "y": 175.0
+            "x": 55.0,
+            "y": 30.0
           }
         ]
       },
@@ -786,8 +795,16 @@
         "name": "unnamedWire#39",
         "path": [
           {
-            "x": 355.0,
-            "y": 215.0
+            "x": 200.0,
+            "y": 20.0
+          },
+          {
+            "x": 165.0,
+            "y": 20.0
+          },
+          {
+            "x": 165.0,
+            "y": 70.0
           }
         ]
       },
@@ -801,7 +818,16 @@
           "pinName": "Q"
         },
         "name": "unnamedWire#4",
-        "path": []
+        "path": [
+          {
+            "x": 245.0,
+            "y": 45.0
+          },
+          {
+            "x": 245.0,
+            "y": 50.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -815,15 +841,15 @@
         "name": "unnamedWire#40",
         "path": [
           {
-            "x": 360.0,
-            "y": 205.0
+            "x": 170.0,
+            "y": 60.0
           },
           {
-            "x": 360.0,
+            "x": 170.0,
             "y": 15.0
           },
           {
-            "x": 255.0,
+            "x": 150.0,
             "y": 15.0
           }
         ]
@@ -840,16 +866,16 @@
         "name": "unnamedWire#41",
         "path": [
           {
-            "x": 155.0,
+            "x": 100.0,
             "y": 10.0
           },
           {
-            "x": 365.0,
+            "x": 175.0,
             "y": 10.0
           },
           {
-            "x": 365.0,
-            "y": 195.0
+            "x": 175.0,
+            "y": 50.0
           }
         ]
       },
@@ -859,24 +885,15 @@
           "pinName": "D1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "mux1_4#1",
           "pinName": "Y1"
         },
         "name": "unnamedWire#42",
-        "path": [
-          {
-            "x": 315.0,
-            "y": 225.0
-          },
-          {
-            "x": 315.0,
-            "y": 195.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "xor#0",
           "pinName": "Y"
         },
         "pin2": {
@@ -886,12 +903,12 @@
         "name": "unnamedWire#43",
         "path": [
           {
-            "x": 310.0,
-            "y": 205.0
+            "x": 170.0,
+            "y": 110.0
           },
           {
-            "x": 310.0,
-            "y": 235.0
+            "x": 170.0,
+            "y": 90.0
           }
         ]
       },
@@ -901,28 +918,11 @@
           "pinName": "D3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "mux1_4#1",
           "pinName": "Y3"
         },
         "name": "unnamedWire#44",
-        "path": [
-          {
-            "x": 305.0,
-            "y": 245.0
-          },
-          {
-            "x": 305.0,
-            "y": 225.0
-          },
-          {
-            "x": 170.0,
-            "y": 225.0
-          },
-          {
-            "x": 170.0,
-            "y": 215.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
@@ -930,18 +930,14 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "mux1_4#1",
           "pinName": "Y4"
         },
         "name": "unnamedWire#45",
         "path": [
           {
-            "x": 160.0,
-            "y": 245.0
-          },
-          {
-            "x": 160.0,
-            "y": 225.0
+            "x": 115.0,
+            "y": 110.0
           }
         ]
       },
@@ -955,7 +951,16 @@
           "pinName": "D4"
         },
         "name": "unnamedWire#46",
-        "path": []
+        "path": [
+          {
+            "x": 180.0,
+            "y": 145.0
+          },
+          {
+            "x": 180.0,
+            "y": 110.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -967,12 +972,7 @@
           "pinName": "A"
         },
         "name": "unnamedWire#47",
-        "path": [
-          {
-            "x": 210.0,
-            "y": 240.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
@@ -986,8 +986,8 @@
         "name": "unnamedWire#48",
         "path": [
           {
-            "x": 210.0,
-            "y": 250.0
+            "x": 115.0,
+            "y": 145.0
           }
         ]
       },
@@ -997,18 +997,18 @@
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I0_1"
         },
         "name": "unnamedWire#49",
         "path": [
           {
-            "x": 35.0,
-            "y": 120.0
+            "x": 20.0,
+            "y": 135.0
           },
           {
-            "x": 35.0,
-            "y": 255.0
+            "x": 20.0,
+            "y": 140.0
           }
         ]
       },
@@ -1042,15 +1042,24 @@
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I1_1"
         },
         "name": "unnamedWire#7",
-        "path": []
+        "path": [
+          {
+            "x": 20.0,
+            "y": 185.0
+          },
+          {
+            "x": 20.0,
+            "y": 180.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I1_2"
         },
         "pin2": {
@@ -1058,7 +1067,16 @@
           "pinName": "O2"
         },
         "name": "unnamedWire#8",
-        "path": []
+        "path": [
+          {
+            "x": 20.0,
+            "y": 190.0
+          },
+          {
+            "x": 20.0,
+            "y": 195.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1066,18 +1084,27 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I1_3"
         },
         "name": "unnamedWire#9",
-        "path": []
+        "path": [
+          {
+            "x": 20.0,
+            "y": 205.0
+          },
+          {
+            "x": 20.0,
+            "y": 200.0
+          }
+        ]
       }
     ],
     "version": "0.1.1"
   },
   "symbolRendererSnippetID": "simpleRectangularLike",
   "symbolRendererParams": {
-    "centerText": "muSR",
+    "centerText": "µSR",
     "centerTextHeight": 5.0,
     "horizontalComponentCenter": 17.5,
     "pinLabelHeight": 3.5,

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json
index 2a91d76..55256c7 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json
@@ -1,10 +1,10 @@
 {
-  "width": 72.0,
-  "height": 67.0,
+  "width": 60.0,
+  "height": 45.0,
   "interfacePins": [
     {
       "location": {
-        "x": 60.0,
+        "x": 40.0,
         "y": 0.0
       },
       "name": "C",
@@ -13,8 +13,8 @@
     },
     {
       "location": {
-        "x": 72.0,
-        "y": 40.0
+        "x": 60.0,
+        "y": 30.0
       },
       "name": "CI",
       "logicWidth": 1,
@@ -22,7 +22,7 @@
     },
     {
       "location": {
-        "x": 36.0,
+        "x": 30.0,
         "y": 0.0
       },
       "name": "D",
@@ -32,7 +32,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 50.0
+        "y": 25.0
       },
       "name": "I",
       "logicWidth": 4,
@@ -40,8 +40,8 @@
     },
     {
       "location": {
-        "x": 38.0,
-        "y": 67.0
+        "x": 35.0,
+        "y": 45.0
       },
       "name": "Y",
       "logicWidth": 12,
@@ -50,7 +50,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 38.0
+        "y": 10.0
       },
       "name": "_CC",
       "logicWidth": 1,
@@ -59,7 +59,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 44.0
+        "y": 15.0
       },
       "name": "_CCEN",
       "logicWidth": 1,
@@ -67,8 +67,8 @@
     },
     {
       "location": {
-        "x": 72.0,
-        "y": 14.0
+        "x": 60.0,
+        "y": 5.0
       },
       "name": "_FULL",
       "logicWidth": 1,
@@ -76,8 +76,8 @@
     },
     {
       "location": {
-        "x": 19.0,
-        "y": 67.0
+        "x": 15.0,
+        "y": 45.0
       },
       "name": "_MAP",
       "logicWidth": 1,
@@ -85,8 +85,8 @@
     },
     {
       "location": {
-        "x": 49.0,
-        "y": 67.0
+        "x": 40.0,
+        "y": 45.0
       },
       "name": "_OE",
       "logicWidth": 1,
@@ -94,8 +94,8 @@
     },
     {
       "location": {
-        "x": 13.0,
-        "y": 67.0
+        "x": 10.0,
+        "y": 45.0
       },
       "name": "_PL",
       "logicWidth": 1,
@@ -104,7 +104,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 6.0
+        "y": 5.0
       },
       "name": "_RLD",
       "logicWidth": 1,
@@ -112,8 +112,8 @@
     },
     {
       "location": {
-        "x": 25.0,
-        "y": 67.0
+        "x": 20.0,
+        "y": 45.0
       },
       "name": "_VECT",
       "logicWidth": 1,
@@ -127,86 +127,32 @@
         "id": "Am2910InstrPLA",
         "name": "Am2910InstrPLA#0",
         "pos": {
-          "x": 80.0,
-          "y": 155.0
+          "x": 70.0,
+          "y": 90.0
         }
       },
       {
         "id": "Am2910RegCntr",
         "name": "Am2910RegCntr#0",
         "pos": {
-          "x": 160.0,
-          "y": 25.0
+          "x": 130.0,
+          "y": 15.0
         }
       },
       {
         "id": "Am2910SP",
         "name": "Am2910SP#0",
         "pos": {
-          "x": 305.0,
-          "y": 55.0
+          "x": 240.0,
+          "y": 10.0
         }
       },
-      {
-        "id": "BitDisplay",
-        "name": "BitDisplay#0",
-        "pos": {
-          "x": 160.0,
-          "y": 95.0
-        },
-        "params": 12
-      },
-      {
-        "id": "BitDisplay",
-        "name": "BitDisplay#1",
-        "pos": {
-          "x": 260.0,
-          "y": 115.0
-        },
-        "params": 12
-      },
-      {
-        "id": "BitDisplay",
-        "name": "BitDisplay#2",
-        "pos": {
-          "x": 345.0,
-          "y": 180.0
-        },
-        "params": 12
-      },
-      {
-        "id": "BitDisplay",
-        "name": "BitDisplay#3",
-        "pos": {
-          "x": 265.0,
-          "y": 150.0
-        },
-        "params": 12
-      },
-      {
-        "id": "BitDisplay",
-        "name": "BitDisplay#4",
-        "pos": {
-          "x": 260.0,
-          "y": 85.0
-        },
-        "params": 3
-      },
-      {
-        "id": "BitDisplay",
-        "name": "BitDisplay#5",
-        "pos": {
-          "x": 260.0,
-          "y": 70.0
-        },
-        "params": 3
-      },
       {
         "id": "NandGate",
         "name": "NandGate#0",
         "pos": {
           "x": 40.0,
-          "y": 185.0
+          "y": 45.0
         },
         "params": 1
       },
@@ -215,7 +161,7 @@
         "name": "NandGate#1",
         "pos": {
           "x": 10.0,
-          "y": 210.0
+          "y": 60.0
         },
         "params": 1
       },
@@ -223,8 +169,8 @@
         "id": "NandGate",
         "name": "NandGate#2",
         "pos": {
-          "x": 250.0,
-          "y": 305.0
+          "x": 205.0,
+          "y": 195.0
         },
         "params": 1
       },
@@ -232,8 +178,8 @@
         "id": "TriStateBuffer",
         "name": "TriStateBuffer#0",
         "pos": {
-          "x": 180.0,
-          "y": 290.0
+          "x": 165.0,
+          "y": 180.0
         },
         "params": {
           "logicWidth": 12,
@@ -244,8 +190,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
         "pos": {
-          "x": 324.0,
-          "y": 149.0
+          "x": 259.0,
+          "y": 99.0
         },
         "params": 12
       },
@@ -253,8 +199,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#1",
         "pos": {
-          "x": 294.0,
-          "y": 104.0
+          "x": 224.0,
+          "y": 59.0
         },
         "params": 1
       },
@@ -262,8 +208,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#10",
         "pos": {
-          "x": 244.0,
-          "y": 319.0
+          "x": 199.0,
+          "y": 209.0
         },
         "params": 1
       },
@@ -271,8 +217,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#2",
         "pos": {
-          "x": 189.0,
-          "y": 274.0
+          "x": 174.0,
+          "y": 174.0
         },
         "params": 12
       },
@@ -280,8 +226,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#3",
         "pos": {
-          "x": 179.0,
-          "y": 89.0
+          "x": 164.0,
+          "y": 59.0
         },
         "params": 12
       },
@@ -289,8 +235,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#4",
         "pos": {
-          "x": 179.0,
-          "y": 14.0
+          "x": 149.0,
+          "y": 9.0
         },
         "params": 12
       },
@@ -299,7 +245,7 @@
         "name": "WireCrossPoint#5",
         "pos": {
           "x": 4.0,
-          "y": 219.0
+          "y": 74.0
         },
         "params": 1
       },
@@ -307,8 +253,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#6",
         "pos": {
-          "x": 299.0,
-          "y": 79.0
+          "x": 234.0,
+          "y": 34.0
         },
         "params": 1
       },
@@ -316,17 +262,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#7",
         "pos": {
-          "x": 299.0,
-          "y": 44.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#8",
-        "pos": {
-          "x": 299.0,
-          "y": 169.0
+          "x": 199.0,
+          "y": 34.0
         },
         "params": 1
       },
@@ -334,8 +271,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#9",
         "pos": {
-          "x": 299.0,
-          "y": 114.0
+          "x": 234.0,
+          "y": 69.0
         },
         "params": 1
       },
@@ -343,40 +280,40 @@
         "id": "dff12",
         "name": "dff12#0",
         "pos": {
-          "x": 305.0,
-          "y": 160.0
+          "x": 240.0,
+          "y": 105.0
         }
       },
       {
         "id": "inc12",
         "name": "inc12#0",
         "pos": {
-          "x": 305.0,
-          "y": 190.0
+          "x": 240.0,
+          "y": 140.0
         }
       },
       {
         "id": "nor12",
         "name": "nor12#0",
         "pos": {
-          "x": 190.0,
-          "y": 80.0
+          "x": 175.0,
+          "y": 50.0
         }
       },
       {
         "id": "ram5_12",
         "name": "ram5_12#0",
         "pos": {
-          "x": 305.0,
-          "y": 100.0
+          "x": 240.0,
+          "y": 55.0
         }
       },
       {
         "id": "sel4_12",
         "name": "sel4_12#0",
         "pos": {
-          "x": 150.0,
-          "y": 175.0
+          "x": 135.0,
+          "y": 110.0
         }
       }
     ],
@@ -417,16 +354,16 @@
         "name": "unnamedWire#10",
         "path": [
           {
-            "x": 230.0,
-            "y": 90.0
+            "x": 215.0,
+            "y": 60.0
           },
           {
-            "x": 230.0,
-            "y": 120.0
+            "x": 215.0,
+            "y": 75.0
           },
           {
-            "x": 95.0,
-            "y": 120.0
+            "x": 85.0,
+            "y": 75.0
           }
         ]
       },
@@ -442,12 +379,12 @@
         "name": "unnamedWire#11",
         "path": [
           {
-            "x": 115.0,
-            "y": 160.0
+            "x": 105.0,
+            "y": 95.0
           },
           {
-            "x": 115.0,
-            "y": 45.0
+            "x": 105.0,
+            "y": 35.0
           }
         ]
       },
@@ -463,12 +400,12 @@
         "name": "unnamedWire#12",
         "path": [
           {
-            "x": 120.0,
-            "y": 170.0
+            "x": 110.0,
+            "y": 105.0
           },
           {
-            "x": 120.0,
-            "y": 55.0
+            "x": 110.0,
+            "y": 45.0
           }
         ]
       },
@@ -484,8 +421,8 @@
         "name": "unnamedWire#13",
         "path": [
           {
-            "x": 295.0,
-            "y": 220.0
+            "x": 225.0,
+            "y": 155.0
           }
         ]
       },
@@ -501,12 +438,12 @@
         "name": "unnamedWire#14",
         "path": [
           {
-            "x": 290.0,
-            "y": 230.0
+            "x": 230.0,
+            "y": 165.0
           },
           {
-            "x": 290.0,
-            "y": 70.0
+            "x": 230.0,
+            "y": 25.0
           }
         ]
       },
@@ -522,8 +459,8 @@
         "name": "unnamedWire#15",
         "path": [
           {
-            "x": 295.0,
-            "y": 60.0
+            "x": 225.0,
+            "y": 15.0
           }
         ]
       },
@@ -563,8 +500,8 @@
         "name": "unnamedWire#18",
         "path": [
           {
-            "x": 325.0,
-            "y": 275.0
+            "x": 260.0,
+            "y": 175.0
           }
         ]
       },
@@ -580,8 +517,8 @@
         "name": "unnamedWire#19",
         "path": [
           {
-            "x": 200.0,
-            "y": 130.0
+            "x": 185.0,
+            "y": 85.0
           }
         ]
       },
@@ -609,8 +546,8 @@
         "name": "unnamedWire#20",
         "path": [
           {
-            "x": 220.0,
-            "y": 150.0
+            "x": 205.0,
+            "y": 100.0
           }
         ]
       },
@@ -674,16 +611,16 @@
         "name": "unnamedWire#25",
         "path": [
           {
-            "x": 145.0,
-            "y": 15.0
+            "x": 125.0,
+            "y": 10.0
           },
           {
-            "x": 145.0,
-            "y": 150.0
+            "x": 125.0,
+            "y": 65.0
           },
           {
-            "x": 160.0,
-            "y": 150.0
+            "x": 145.0,
+            "y": 65.0
           }
         ]
       },
@@ -724,11 +661,11 @@
         "path": [
           {
             "x": 65.0,
-            "y": 195.0
+            "y": 55.0
           },
           {
             "x": 65.0,
-            "y": 160.0
+            "y": 95.0
           }
         ]
       },
@@ -781,7 +718,7 @@
         "path": [
           {
             "x": 5.0,
-            "y": 215.0
+            "y": 65.0
           }
         ]
       },
@@ -795,12 +732,7 @@
           "pinName": "B"
         },
         "name": "unnamedWire#32",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 225.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
@@ -815,11 +747,11 @@
         "path": [
           {
             "x": 35.0,
-            "y": 220.0
+            "y": 70.0
           },
           {
             "x": 35.0,
-            "y": 200.0
+            "y": 60.0
           }
         ]
       },
@@ -837,7 +769,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "pin2": {
@@ -845,7 +777,12 @@
           "pinName": "C"
         },
         "name": "unnamedWire#35",
-        "path": []
+        "path": [
+          {
+            "x": 235.0,
+            "y": 115.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -943,12 +880,12 @@
         "name": "unnamedWire#42",
         "path": [
           {
-            "x": 85.0,
-            "y": 290.0
+            "x": 75.0,
+            "y": 180.0
           },
           {
-            "x": 65.0,
-            "y": 290.0
+            "x": 50.0,
+            "y": 180.0
           }
         ]
       },
@@ -962,7 +899,16 @@
           "pinName": "_MAP"
         },
         "name": "unnamedWire#43",
-        "path": []
+        "path": [
+          {
+            "x": 85.0,
+            "y": 185.0
+          },
+          {
+            "x": 75.0,
+            "y": 185.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -976,12 +922,12 @@
         "name": "unnamedWire#44",
         "path": [
           {
-            "x": 105.0,
-            "y": 290.0
+            "x": 95.0,
+            "y": 190.0
           },
           {
-            "x": 125.0,
-            "y": 290.0
+            "x": 100.0,
+            "y": 190.0
           }
         ]
       },
@@ -997,63 +943,15 @@
         "name": "unnamedWire#45",
         "path": [
           {
-            "x": 70.0,
-            "y": 250.0
+            "x": 35.0,
+            "y": 125.0
           },
           {
-            "x": 70.0,
-            "y": 175.0
+            "x": 35.0,
+            "y": 110.0
           }
         ]
       },
-      {
-        "pin1": {
-          "compName": "Am2910RegCntr#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "BitDisplay#0",
-          "pinName": ""
-        },
-        "name": "unnamedWire#46",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "ram5_12#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "BitDisplay#1",
-          "pinName": ""
-        },
-        "name": "unnamedWire#47",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "inc12#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "BitDisplay#2",
-          "pinName": ""
-        },
-        "name": "unnamedWire#48",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "dff12#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "BitDisplay#3",
-          "pinName": ""
-        },
-        "name": "unnamedWire#49",
-        "path": []
-      },
       {
         "pin1": {
           "compName": "dff12#0",
@@ -1078,18 +976,6 @@
         "name": "unnamedWire#50",
         "path": []
       },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
-        },
-        "name": "unnamedWire#51",
-        "path": []
-      },
       {
         "pin1": {
           "compName": "TriStateBuffer#0",
@@ -1114,30 +1000,6 @@
         "name": "unnamedWire#53",
         "path": []
       },
-      {
-        "pin1": {
-          "compName": "Am2910SP#0",
-          "pinName": "A"
-        },
-        "pin2": {
-          "compName": "BitDisplay#5",
-          "pinName": ""
-        },
-        "name": "unnamedWire#54",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Am2910SP#0",
-          "pinName": "B"
-        },
-        "pin2": {
-          "compName": "BitDisplay#4",
-          "pinName": ""
-        },
-        "name": "unnamedWire#55",
-        "path": []
-      },
       {
         "pin1": {
           "compName": "WireCrossPoint#10",
@@ -1162,8 +1024,8 @@
         "name": "unnamedWire#57",
         "path": [
           {
-            "x": 245.0,
-            "y": 310.0
+            "x": 200.0,
+            "y": 200.0
           }
         ]
       },
@@ -1179,12 +1041,12 @@
         "name": "unnamedWire#58",
         "path": [
           {
-            "x": 275.0,
-            "y": 300.0
+            "x": 230.0,
+            "y": 190.0
           },
           {
-            "x": 275.0,
-            "y": 315.0
+            "x": 230.0,
+            "y": 205.0
           }
         ]
       },
@@ -1234,7 +1096,12 @@
           "pinName": ""
         },
         "name": "unnamedWire#9",
-        "path": []
+        "path": [
+          {
+            "x": 150.0,
+            "y": 60.0
+          }
+        ]
       }
     ],
     "version": "0.1.1"

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json
index f5283a0..20f0664 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json
@@ -42,110 +42,6 @@
   "innerScale": 0.2,
   "submodel": {
     "components": [
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#10",
-        "pos": {
-          "x": 175.0,
-          "y": 170.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#11",
-        "pos": {
-          "x": 130.0,
-          "y": 160.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#12",
-        "pos": {
-          "x": 130.0,
-          "y": 130.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#13",
-        "pos": {
-          "x": 175.0,
-          "y": 80.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#14",
-        "pos": {
-          "x": 175.0,
-          "y": 110.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#15",
-        "pos": {
-          "x": 130.0,
-          "y": 100.0
-        }
-      },
-      {
-        "id": "mux1_12",
-        "name": "DeserializedSubmodelComponent#17",
-        "pos": {
-          "x": 15.0,
-          "y": 90.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#4",
-        "pos": {
-          "x": 175.0,
-          "y": 20.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#5",
-        "pos": {
-          "x": 175.0,
-          "y": 50.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#6",
-        "pos": {
-          "x": 130.0,
-          "y": 10.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#7",
-        "pos": {
-          "x": 130.0,
-          "y": 40.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#8",
-        "pos": {
-          "x": 130.0,
-          "y": 70.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#9",
-        "pos": {
-          "x": 175.0,
-          "y": 140.0
-        }
-      },
       {
         "id": "Merger",
         "name": "Merger#0",
@@ -175,112 +71,216 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#11",
+        "name": "WireCrossPoint#0",
         "pos": {
-          "x": 169.0,
-          "y": 54.0
+          "x": 124.0,
+          "y": 14.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#12",
+        "name": "WireCrossPoint#1",
         "pos": {
-          "x": 169.0,
-          "y": 144.0
+          "x": 124.0,
+          "y": 44.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#13",
+        "name": "WireCrossPoint#10",
         "pos": {
           "x": 169.0,
-          "y": 24.0
+          "y": 114.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#14",
+        "name": "WireCrossPoint#2",
         "pos": {
-          "x": 169.0,
-          "y": 84.0
+          "x": 124.0,
+          "y": 104.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#15",
+        "name": "WireCrossPoint#3",
         "pos": {
-          "x": 169.0,
-          "y": 114.0
+          "x": 124.0,
+          "y": 134.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
+        "name": "WireCrossPoint#4",
         "pos": {
           "x": 124.0,
-          "y": 14.0
+          "y": 74.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
+        "name": "WireCrossPoint#5",
         "pos": {
-          "x": 124.0,
-          "y": 44.0
+          "x": 264.0,
+          "y": 99.0
         },
-        "params": 1
+        "params": 12
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
+        "name": "WireCrossPoint#6",
         "pos": {
-          "x": 124.0,
-          "y": 104.0
+          "x": 169.0,
+          "y": 54.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
+        "name": "WireCrossPoint#7",
         "pos": {
-          "x": 124.0,
-          "y": 134.0
+          "x": 169.0,
+          "y": 144.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
+        "name": "WireCrossPoint#8",
         "pos": {
-          "x": 124.0,
-          "y": 74.0
+          "x": 169.0,
+          "y": 24.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#8",
+        "name": "WireCrossPoint#9",
         "pos": {
-          "x": 264.0,
-          "y": 99.0
+          "x": 169.0,
+          "y": 84.0
         },
-        "params": 12
+        "params": 1
+      },
+      {
+        "id": "dff",
+        "name": "dff#0",
+        "pos": {
+          "x": 175.0,
+          "y": 20.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#1",
+        "pos": {
+          "x": 175.0,
+          "y": 50.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#10",
+        "pos": {
+          "x": 175.0,
+          "y": 110.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#11",
+        "pos": {
+          "x": 130.0,
+          "y": 100.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#2",
+        "pos": {
+          "x": 130.0,
+          "y": 10.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#3",
+        "pos": {
+          "x": 130.0,
+          "y": 40.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#4",
+        "pos": {
+          "x": 130.0,
+          "y": 70.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#5",
+        "pos": {
+          "x": 175.0,
+          "y": 140.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#6",
+        "pos": {
+          "x": 175.0,
+          "y": 170.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#7",
+        "pos": {
+          "x": 130.0,
+          "y": 160.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#8",
+        "pos": {
+          "x": 130.0,
+          "y": 130.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#9",
+        "pos": {
+          "x": 175.0,
+          "y": 80.0
+        }
+      },
+      {
+        "id": "mux1_12",
+        "name": "mux1_12#0",
+        "pos": {
+          "x": 15.0,
+          "y": 90.0
+        }
       }
     ],
     "wires": [
       {
         "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "name": "unnamedWire#0",
@@ -297,7 +297,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "pin2": {
@@ -318,7 +318,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "dff#11",
           "pinName": "D"
         },
         "pin2": {
@@ -343,7 +343,7 @@
           "pinName": "O4"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#14",
+          "compName": "dff#10",
           "pinName": "D"
         },
         "name": "unnamedWire#11",
@@ -360,7 +360,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "dff#8",
           "pinName": "D"
         },
         "pin2": {
@@ -376,7 +376,7 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "dff#5",
           "pinName": "D"
         },
         "name": "unnamedWire#13",
@@ -384,7 +384,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "dff#7",
           "pinName": "D"
         },
         "pin2": {
@@ -409,7 +409,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "dff#6",
           "pinName": "D"
         },
         "name": "unnamedWire#15",
@@ -430,7 +430,7 @@
           "pinName": "WE"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#17",
+          "compName": "mux1_12#0",
           "pinName": "S"
         },
         "name": "unnamedWire#16",
@@ -451,7 +451,7 @@
           "pinName": "D"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#17",
+          "compName": "mux1_12#0",
           "pinName": "I1"
         },
         "name": "unnamedWire#17",
@@ -468,7 +468,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#17",
+          "compName": "mux1_12#0",
           "pinName": "Y"
         },
         "pin2": {
@@ -480,11 +480,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "dff#2",
           "pinName": "C"
         },
         "name": "unnamedWire#21",
@@ -492,11 +492,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "name": "unnamedWire#22",
@@ -504,11 +504,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "dff#3",
           "pinName": "C"
         },
         "pin2": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "name": "unnamedWire#23",
@@ -516,11 +516,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "name": "unnamedWire#24",
@@ -528,11 +528,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "dff#4",
           "pinName": "C"
         },
         "name": "unnamedWire#25",
@@ -540,11 +540,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "name": "unnamedWire#26",
@@ -552,11 +552,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "dff#11",
           "pinName": "C"
         },
         "name": "unnamedWire#27",
@@ -564,11 +564,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "name": "unnamedWire#28",
@@ -576,11 +576,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "dff#8",
           "pinName": "C"
         },
         "name": "unnamedWire#29",
@@ -588,11 +588,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#17",
+          "compName": "mux1_12#0",
           "pinName": "I0"
         },
         "pin2": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "name": "unnamedWire#3",
@@ -613,11 +613,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "dff#7",
           "pinName": "C"
         },
         "name": "unnamedWire#30",
@@ -630,11 +630,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "dff#6",
           "pinName": "C"
         },
         "pin2": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
         "name": "unnamedWire#31",
@@ -647,11 +647,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "dff#5",
           "pinName": "C"
         },
         "name": "unnamedWire#32",
@@ -659,11 +659,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#10",
           "pinName": ""
         },
         "name": "unnamedWire#33",
@@ -671,11 +671,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#14",
+          "compName": "dff#10",
           "pinName": "C"
         },
         "pin2": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#10",
           "pinName": ""
         },
         "name": "unnamedWire#34",
@@ -683,11 +683,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#10",
           "pinName": ""
         },
         "name": "unnamedWire#35",
@@ -695,11 +695,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "dff#9",
           "pinName": "C"
         },
         "name": "unnamedWire#36",
@@ -707,11 +707,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
         "name": "unnamedWire#37",
@@ -719,11 +719,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "dff#1",
           "pinName": "C"
         },
         "name": "unnamedWire#38",
@@ -731,11 +731,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
         "name": "unnamedWire#39",
@@ -747,7 +747,7 @@
           "pinName": "O11"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "dff#2",
           "pinName": "D"
         },
         "name": "unnamedWire#4",
@@ -764,11 +764,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "dff#0",
           "pinName": "C"
         },
         "name": "unnamedWire#40",
@@ -776,7 +776,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "dff#0",
           "pinName": "D"
         },
         "pin2": {
@@ -801,7 +801,7 @@
           "pinName": "I11"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "dff#2",
           "pinName": "Q"
         },
         "name": "unnamedWire#53",
@@ -818,7 +818,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "dff#0",
           "pinName": "Q"
         },
         "pin2": {
@@ -843,7 +843,7 @@
           "pinName": "I9"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "dff#3",
           "pinName": "Q"
         },
         "name": "unnamedWire#55",
@@ -860,7 +860,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "dff#1",
           "pinName": "Q"
         },
         "pin2": {
@@ -885,7 +885,7 @@
           "pinName": "I7"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "dff#4",
           "pinName": "Q"
         },
         "name": "unnamedWire#57",
@@ -902,7 +902,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "dff#9",
           "pinName": "Q"
         },
         "pin2": {
@@ -927,7 +927,7 @@
           "pinName": "I5"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "dff#11",
           "pinName": "Q"
         },
         "name": "unnamedWire#59",
@@ -935,7 +935,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "dff#3",
           "pinName": "D"
         },
         "pin2": {
@@ -960,7 +960,7 @@
           "pinName": "I4"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#14",
+          "compName": "dff#10",
           "pinName": "Q"
         },
         "name": "unnamedWire#60",
@@ -972,7 +972,7 @@
           "pinName": "I3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "dff#8",
           "pinName": "Q"
         },
         "name": "unnamedWire#61",
@@ -989,7 +989,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "dff#5",
           "pinName": "Q"
         },
         "pin2": {
@@ -1014,7 +1014,7 @@
           "pinName": "I1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "dff#7",
           "pinName": "Q"
         },
         "name": "unnamedWire#63",
@@ -1031,7 +1031,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "dff#6",
           "pinName": "Q"
         },
         "pin2": {
@@ -1056,7 +1056,7 @@
           "pinName": "O"
         },
         "pin2": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "name": "unnamedWire#65",
@@ -1064,7 +1064,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "pin2": {
@@ -1080,7 +1080,7 @@
           "pinName": "O8"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "dff#1",
           "pinName": "D"
         },
         "name": "unnamedWire#7",
@@ -1097,7 +1097,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "dff#4",
           "pinName": "D"
         },
         "pin2": {
@@ -1122,7 +1122,7 @@
           "pinName": "O6"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "dff#9",
           "pinName": "D"
         },
         "name": "unnamedWire#9",

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_invwe.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_invwe.json
index af3897d..11bc97c 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_invwe.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_invwe.json
@@ -42,142 +42,6 @@
   "innerScale": 0.2,
   "submodel": {
     "components": [
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#0",
-        "pos": {
-          "x": 140.0,
-          "y": 15.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#1",
-        "pos": {
-          "x": 190.0,
-          "y": 25.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#10",
-        "pos": {
-          "x": 190.0,
-          "y": 235.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#11",
-        "pos": {
-          "x": 140.0,
-          "y": 225.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#12",
-        "pos": {
-          "x": 140.0,
-          "y": 195.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#13",
-        "pos": {
-          "x": 190.0,
-          "y": 145.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#14",
-        "pos": {
-          "x": 190.0,
-          "y": 175.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#15",
-        "pos": {
-          "x": 140.0,
-          "y": 165.0
-        }
-      },
-      {
-        "id": "mux1_16",
-        "name": "DeserializedSubmodelComponent#16",
-        "pos": {
-          "x": 15.0,
-          "y": 95.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#2",
-        "pos": {
-          "x": 190.0,
-          "y": 55.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#3",
-        "pos": {
-          "x": 140.0,
-          "y": 45.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#4",
-        "pos": {
-          "x": 190.0,
-          "y": 85.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#5",
-        "pos": {
-          "x": 190.0,
-          "y": 115.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#6",
-        "pos": {
-          "x": 140.0,
-          "y": 75.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#7",
-        "pos": {
-          "x": 140.0,
-          "y": 105.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#8",
-        "pos": {
-          "x": 140.0,
-          "y": 135.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#9",
-        "pos": {
-          "x": 190.0,
-          "y": 205.0
-        }
-      },
       {
         "id": "Merger",
         "name": "Merger#0",
@@ -217,15 +81,6 @@
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#10",
-        "pos": {
-          "x": 184.0,
-          "y": 29.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#11",
         "pos": {
           "x": 184.0,
           "y": 119.0
@@ -234,7 +89,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#12",
+        "name": "WireCrossPoint#11",
         "pos": {
           "x": 184.0,
           "y": 209.0
@@ -243,7 +98,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#13",
+        "name": "WireCrossPoint#12",
         "pos": {
           "x": 184.0,
           "y": 89.0
@@ -252,7 +107,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#14",
+        "name": "WireCrossPoint#13",
         "pos": {
           "x": 184.0,
           "y": 149.0
@@ -261,7 +116,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#15",
+        "name": "WireCrossPoint#14",
         "pos": {
           "x": 184.0,
           "y": 179.0
@@ -288,7 +143,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
+        "name": "WireCrossPoint#4",
         "pos": {
           "x": 134.0,
           "y": 169.0
@@ -297,7 +152,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
+        "name": "WireCrossPoint#5",
         "pos": {
           "x": 134.0,
           "y": 199.0
@@ -306,7 +161,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
+        "name": "WireCrossPoint#6",
         "pos": {
           "x": 134.0,
           "y": 139.0
@@ -315,7 +170,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#8",
+        "name": "WireCrossPoint#7",
         "pos": {
           "x": 289.0,
           "y": 124.0
@@ -324,12 +179,157 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
+        "name": "WireCrossPoint#8",
         "pos": {
           "x": 184.0,
           "y": 59.0
         },
         "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#9",
+        "pos": {
+          "x": 184.0,
+          "y": 29.0
+        },
+        "params": 1
+      },
+      {
+        "id": "dff",
+        "name": "dff#0",
+        "pos": {
+          "x": 140.0,
+          "y": 15.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#1",
+        "pos": {
+          "x": 190.0,
+          "y": 25.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#10",
+        "pos": {
+          "x": 190.0,
+          "y": 235.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#11",
+        "pos": {
+          "x": 140.0,
+          "y": 225.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#12",
+        "pos": {
+          "x": 140.0,
+          "y": 195.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#13",
+        "pos": {
+          "x": 190.0,
+          "y": 145.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#14",
+        "pos": {
+          "x": 190.0,
+          "y": 175.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#15",
+        "pos": {
+          "x": 140.0,
+          "y": 165.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#2",
+        "pos": {
+          "x": 190.0,
+          "y": 55.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#3",
+        "pos": {
+          "x": 140.0,
+          "y": 45.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#4",
+        "pos": {
+          "x": 190.0,
+          "y": 85.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#5",
+        "pos": {
+          "x": 190.0,
+          "y": 115.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#6",
+        "pos": {
+          "x": 140.0,
+          "y": 75.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#7",
+        "pos": {
+          "x": 140.0,
+          "y": 105.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#8",
+        "pos": {
+          "x": 140.0,
+          "y": 135.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#9",
+        "pos": {
+          "x": 190.0,
+          "y": 205.0
+        }
+      },
+      {
+        "id": "mux1_16",
+        "name": "mux1_16#0",
+        "pos": {
+          "x": 15.0,
+          "y": 95.0
+        }
       }
     ],
     "wires": [
@@ -339,7 +339,7 @@
           "pinName": "O15"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "dff#0",
           "pinName": "D"
         },
         "name": "unnamedWire#0",
@@ -356,7 +356,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "dff#1",
           "pinName": "D"
         },
         "pin2": {
@@ -377,7 +377,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "dff#15",
           "pinName": "D"
         },
         "pin2": {
@@ -402,7 +402,7 @@
           "pinName": "O4"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#14",
+          "compName": "dff#14",
           "pinName": "D"
         },
         "name": "unnamedWire#11",
@@ -419,7 +419,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "dff#12",
           "pinName": "D"
         },
         "pin2": {
@@ -444,7 +444,7 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "dff#9",
           "pinName": "D"
         },
         "name": "unnamedWire#13",
@@ -461,7 +461,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "dff#11",
           "pinName": "D"
         },
         "pin2": {
@@ -486,7 +486,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "dff#10",
           "pinName": "D"
         },
         "name": "unnamedWire#15",
@@ -503,7 +503,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#16",
+          "compName": "mux1_16#0",
           "pinName": "Y"
         },
         "pin2": {
@@ -519,7 +519,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "dff#0",
           "pinName": "C"
         },
         "name": "unnamedWire#17",
@@ -543,7 +543,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "dff#3",
           "pinName": "C"
         },
         "name": "unnamedWire#19",
@@ -555,7 +555,7 @@
           "pinName": "O13"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "dff#3",
           "pinName": "D"
         },
         "name": "unnamedWire#2",
@@ -588,7 +588,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "dff#6",
           "pinName": "C"
         },
         "name": "unnamedWire#21",
@@ -608,7 +608,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "dff#7",
           "pinName": "C"
         },
         "pin2": {
@@ -624,7 +624,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
         "name": "unnamedWire#24",
@@ -632,11 +632,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "dff#8",
           "pinName": "C"
         },
         "name": "unnamedWire#25",
@@ -644,11 +644,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "name": "unnamedWire#26",
@@ -656,11 +656,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "dff#15",
           "pinName": "C"
         },
         "name": "unnamedWire#27",
@@ -668,11 +668,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "name": "unnamedWire#28",
@@ -680,11 +680,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "dff#12",
           "pinName": "C"
         },
         "name": "unnamedWire#29",
@@ -692,7 +692,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "dff#2",
           "pinName": "D"
         },
         "pin2": {
@@ -713,11 +713,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "dff#11",
           "pinName": "C"
         },
         "name": "unnamedWire#30",
@@ -730,11 +730,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "dff#10",
           "pinName": "C"
         },
         "pin2": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#11",
           "pinName": ""
         },
         "name": "unnamedWire#31",
@@ -747,11 +747,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#11",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "dff#9",
           "pinName": "C"
         },
         "name": "unnamedWire#32",
@@ -759,11 +759,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#11",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#14",
           "pinName": ""
         },
         "name": "unnamedWire#33",
@@ -771,11 +771,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#14",
+          "compName": "dff#14",
           "pinName": "C"
         },
         "pin2": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#14",
           "pinName": ""
         },
         "name": "unnamedWire#34",
@@ -783,11 +783,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#13",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#14",
           "pinName": ""
         },
         "name": "unnamedWire#35",
@@ -795,11 +795,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#13",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "dff#13",
           "pinName": "C"
         },
         "name": "unnamedWire#36",
@@ -807,11 +807,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#13",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#10",
           "pinName": ""
         },
         "name": "unnamedWire#37",
@@ -819,11 +819,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#10",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "dff#5",
           "pinName": "C"
         },
         "name": "unnamedWire#38",
@@ -831,11 +831,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#12",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#10",
           "pinName": ""
         },
         "name": "unnamedWire#39",
@@ -847,7 +847,7 @@
           "pinName": "O11"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "dff#6",
           "pinName": "D"
         },
         "name": "unnamedWire#4",
@@ -864,11 +864,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#12",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "dff#4",
           "pinName": "C"
         },
         "name": "unnamedWire#40",
@@ -876,11 +876,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#12",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "name": "unnamedWire#41",
@@ -888,11 +888,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "dff#2",
           "pinName": "C"
         },
         "name": "unnamedWire#42",
@@ -900,11 +900,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "name": "unnamedWire#43",
@@ -912,11 +912,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "dff#1",
           "pinName": "C"
         },
         "name": "unnamedWire#44",
@@ -928,7 +928,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "name": "unnamedWire#45",
@@ -949,7 +949,7 @@
           "pinName": "_WE"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#16",
+          "compName": "mux1_16#0",
           "pinName": "S"
         },
         "name": "unnamedWire#47",
@@ -982,7 +982,7 @@
           "pinName": "I15"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "dff#0",
           "pinName": "Q"
         },
         "name": "unnamedWire#49",
@@ -999,7 +999,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "dff#4",
           "pinName": "D"
         },
         "pin2": {
@@ -1020,7 +1020,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "dff#1",
           "pinName": "Q"
         },
         "pin2": {
@@ -1045,7 +1045,7 @@
           "pinName": "I13"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "dff#3",
           "pinName": "Q"
         },
         "name": "unnamedWire#51",
@@ -1066,7 +1066,7 @@
           "pinName": "I12"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "dff#2",
           "pinName": "Q"
         },
         "name": "unnamedWire#52",
@@ -1087,7 +1087,7 @@
           "pinName": "I11"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "dff#6",
           "pinName": "Q"
         },
         "name": "unnamedWire#53",
@@ -1104,7 +1104,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "dff#4",
           "pinName": "Q"
         },
         "pin2": {
@@ -1129,7 +1129,7 @@
           "pinName": "I9"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "dff#7",
           "pinName": "Q"
         },
         "name": "unnamedWire#55",
@@ -1137,7 +1137,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "dff#5",
           "pinName": "Q"
         },
         "pin2": {
@@ -1153,7 +1153,7 @@
           "pinName": "I7"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "dff#8",
           "pinName": "Q"
         },
         "name": "unnamedWire#57",
@@ -1170,7 +1170,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "dff#13",
           "pinName": "Q"
         },
         "pin2": {
@@ -1195,7 +1195,7 @@
           "pinName": "I5"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "dff#15",
           "pinName": "Q"
         },
         "name": "unnamedWire#59",
@@ -1212,7 +1212,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "dff#7",
           "pinName": "D"
         },
         "pin2": {
@@ -1237,7 +1237,7 @@
           "pinName": "I4"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#14",
+          "compName": "dff#14",
           "pinName": "Q"
         },
         "name": "unnamedWire#60",
@@ -1258,7 +1258,7 @@
           "pinName": "I3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "dff#12",
           "pinName": "Q"
         },
         "name": "unnamedWire#61",
@@ -1275,7 +1275,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "dff#9",
           "pinName": "Q"
         },
         "pin2": {
@@ -1300,7 +1300,7 @@
           "pinName": "I1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "dff#11",
           "pinName": "Q"
         },
         "name": "unnamedWire#63",
@@ -1317,7 +1317,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "dff#10",
           "pinName": "Q"
         },
         "pin2": {
@@ -1342,7 +1342,7 @@
           "pinName": "O"
         },
         "pin2": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
         "name": "unnamedWire#65",
@@ -1350,7 +1350,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
         "pin2": {
@@ -1362,11 +1362,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#16",
+          "compName": "mux1_16#0",
           "pinName": "I1"
         },
         "name": "unnamedWire#67",
@@ -1391,7 +1391,7 @@
           "pinName": "D"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#16",
+          "compName": "mux1_16#0",
           "pinName": "I0"
         },
         "name": "unnamedWire#68",
@@ -1412,7 +1412,7 @@
           "pinName": "O8"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "dff#5",
           "pinName": "D"
         },
         "name": "unnamedWire#7",
@@ -1429,7 +1429,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "dff#8",
           "pinName": "D"
         },
         "pin2": {
@@ -1445,7 +1445,7 @@
           "pinName": "O6"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "dff#13",
           "pinName": "D"
         },
         "name": "unnamedWire#9",

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json
index d54a34e..ac0a451 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json
@@ -96,14 +96,6 @@
   "innerScale": 0.2,
   "submodel": {
     "components": [
-      {
-        "id": "mux1_4",
-        "name": "DeserializedSubmodelComponent#0",
-        "pos": {
-          "x": 55.0,
-          "y": 70.0
-        }
-      },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
@@ -198,6 +190,14 @@
           "x": 115.0,
           "y": 170.0
         }
+      },
+      {
+        "id": "mux1_4",
+        "name": "mux1_4#0",
+        "pos": {
+          "x": 55.0,
+          "y": 70.0
+        }
       }
     ],
     "wires": [
@@ -215,7 +215,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "Y1"
         },
         "pin2": {
@@ -240,7 +240,7 @@
           "pinName": "D1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I1_1"
         },
         "name": "unnamedWire#10",
@@ -252,7 +252,7 @@
           "pinName": "D2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I1_2"
         },
         "name": "unnamedWire#11",
@@ -273,7 +273,7 @@
           "pinName": "D3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I1_3"
         },
         "name": "unnamedWire#12",
@@ -342,7 +342,7 @@
           "pinName": "D4"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I1_4"
         },
         "name": "unnamedWire#17",
@@ -383,7 +383,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "Y2"
         },
         "pin2": {
@@ -419,7 +419,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "Y3"
         },
         "pin2": {
@@ -440,7 +440,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "Y4"
         },
         "pin2": {
@@ -465,7 +465,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I0_1"
         },
         "name": "unnamedWire#24",
@@ -490,7 +490,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I0_2"
         },
         "name": "unnamedWire#25",
@@ -515,7 +515,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I0_3"
         },
         "name": "unnamedWire#26",
@@ -552,7 +552,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I0_4"
         },
         "name": "unnamedWire#28",
@@ -654,7 +654,7 @@
           "pinName": "WE"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "S0"
         },
         "name": "unnamedWire#9",

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json
index 2902594..0320f12 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json
@@ -96,14 +96,6 @@
   "innerScale": 0.2,
   "submodel": {
     "components": [
-      {
-        "id": "mux1_4",
-        "name": "DeserializedSubmodelComponent#0",
-        "pos": {
-          "x": 55.0,
-          "y": 70.0
-        }
-      },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
@@ -198,6 +190,14 @@
           "x": 115.0,
           "y": 170.0
         }
+      },
+      {
+        "id": "mux1_4",
+        "name": "mux1_4#0",
+        "pos": {
+          "x": 55.0,
+          "y": 70.0
+        }
       }
     ],
     "wires": [
@@ -215,7 +215,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "Y1"
         },
         "pin2": {
@@ -240,7 +240,7 @@
           "pinName": "D1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I0_1"
         },
         "name": "unnamedWire#10",
@@ -261,7 +261,7 @@
           "pinName": "D2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I0_2"
         },
         "name": "unnamedWire#11",
@@ -282,7 +282,7 @@
           "pinName": "D3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I0_3"
         },
         "name": "unnamedWire#12",
@@ -351,7 +351,7 @@
           "pinName": "D4"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I0_4"
         },
         "name": "unnamedWire#17",
@@ -392,7 +392,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "Y2"
         },
         "pin2": {
@@ -428,7 +428,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "Y3"
         },
         "pin2": {
@@ -449,7 +449,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "Y4"
         },
         "pin2": {
@@ -474,7 +474,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I1_1"
         },
         "name": "unnamedWire#24",
@@ -499,7 +499,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I1_2"
         },
         "name": "unnamedWire#25",
@@ -524,7 +524,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I1_3"
         },
         "name": "unnamedWire#26",
@@ -561,7 +561,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I1_4"
         },
         "name": "unnamedWire#28",
@@ -663,7 +663,7 @@
           "pinName": "_WE"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "S0"
         },
         "name": "unnamedWire#9",

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_12.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_12.json
index 0d1cb5a..faeaeb5 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_12.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_12.json
@@ -42,102 +42,6 @@
   "innerScale": 0.2,
   "submodel": {
     "components": [
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#10",
-        "pos": {
-          "x": 95.0,
-          "y": 145.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#11",
-        "pos": {
-          "x": 95.0,
-          "y": 205.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#12",
-        "pos": {
-          "x": 150.0,
-          "y": 285.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#13",
-        "pos": {
-          "x": 150.0,
-          "y": 225.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#14",
-        "pos": {
-          "x": 95.0,
-          "y": 265.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#15",
-        "pos": {
-          "x": 150.0,
-          "y": 345.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#4",
-        "pos": {
-          "x": 150.0,
-          "y": 45.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#5",
-        "pos": {
-          "x": 95.0,
-          "y": 85.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#6",
-        "pos": {
-          "x": 150.0,
-          "y": 105.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#7",
-        "pos": {
-          "x": 95.0,
-          "y": 25.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#8",
-        "pos": {
-          "x": 95.0,
-          "y": 325.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#9",
-        "pos": {
-          "x": 150.0,
-          "y": 165.0
-        }
-      },
       {
         "id": "Merger",
         "name": "Merger#0",
@@ -176,43 +80,25 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
-        "pos": {
-          "x": 144.0,
-          "y": 239.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#11",
+        "name": "WireCrossPoint#0",
         "pos": {
           "x": 139.0,
-          "y": 229.0
+          "y": 49.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#12",
+        "name": "WireCrossPoint#1",
         "pos": {
           "x": 144.0,
-          "y": 299.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#13",
-        "pos": {
-          "x": 139.0,
-          "y": 289.0
+          "y": 59.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#14",
+        "name": "WireCrossPoint#10",
         "pos": {
           "x": 89.0,
           "y": 4.0
@@ -221,7 +107,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#15",
+        "name": "WireCrossPoint#11",
         "pos": {
           "x": 84.0,
           "y": 19.0
@@ -230,7 +116,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#16",
+        "name": "WireCrossPoint#12",
         "pos": {
           "x": 49.0,
           "y": 24.0
@@ -239,7 +125,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#17",
+        "name": "WireCrossPoint#13",
         "pos": {
           "x": 49.0,
           "y": 14.0
@@ -248,7 +134,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#18",
+        "name": "WireCrossPoint#14",
         "pos": {
           "x": 84.0,
           "y": 269.0
@@ -257,7 +143,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#19",
+        "name": "WireCrossPoint#15",
         "pos": {
           "x": 89.0,
           "y": 279.0
@@ -266,7 +152,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#20",
+        "name": "WireCrossPoint#16",
         "pos": {
           "x": 84.0,
           "y": 209.0
@@ -275,7 +161,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#21",
+        "name": "WireCrossPoint#17",
         "pos": {
           "x": 89.0,
           "y": 219.0
@@ -284,7 +170,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#22",
+        "name": "WireCrossPoint#18",
         "pos": {
           "x": 89.0,
           "y": 159.0
@@ -293,7 +179,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#23",
+        "name": "WireCrossPoint#19",
         "pos": {
           "x": 84.0,
           "y": 149.0
@@ -302,7 +188,16 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#24",
+        "name": "WireCrossPoint#2",
+        "pos": {
+          "x": 144.0,
+          "y": 119.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#20",
         "pos": {
           "x": 84.0,
           "y": 89.0
@@ -311,7 +206,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#25",
+        "name": "WireCrossPoint#21",
         "pos": {
           "x": 89.0,
           "y": 99.0
@@ -320,7 +215,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#26",
+        "name": "WireCrossPoint#22",
         "pos": {
           "x": 84.0,
           "y": 29.0
@@ -329,19 +224,28 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#27",
+        "name": "WireCrossPoint#23",
         "pos": {
           "x": 89.0,
           "y": 39.0
         },
         "params": 1
       },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#3",
+        "pos": {
+          "x": 139.0,
+          "y": 109.0
+        },
+        "params": 1
+      },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#4",
         "pos": {
           "x": 139.0,
-          "y": 49.0
+          "y": 169.0
         },
         "params": 1
       },
@@ -350,7 +254,7 @@
         "name": "WireCrossPoint#5",
         "pos": {
           "x": 144.0,
-          "y": 59.0
+          "y": 179.0
         },
         "params": 1
       },
@@ -359,7 +263,7 @@
         "name": "WireCrossPoint#6",
         "pos": {
           "x": 144.0,
-          "y": 119.0
+          "y": 239.0
         },
         "params": 1
       },
@@ -368,7 +272,7 @@
         "name": "WireCrossPoint#7",
         "pos": {
           "x": 139.0,
-          "y": 109.0
+          "y": 229.0
         },
         "params": 1
       },
@@ -376,8 +280,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#8",
         "pos": {
-          "x": 139.0,
-          "y": 169.0
+          "x": 144.0,
+          "y": 299.0
         },
         "params": 1
       },
@@ -385,20 +289,116 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#9",
         "pos": {
-          "x": 144.0,
-          "y": 179.0
+          "x": 139.0,
+          "y": 289.0
         },
         "params": 1
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#0",
+        "pos": {
+          "x": 150.0,
+          "y": 45.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#1",
+        "pos": {
+          "x": 95.0,
+          "y": 85.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#10",
+        "pos": {
+          "x": 95.0,
+          "y": 265.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#11",
+        "pos": {
+          "x": 150.0,
+          "y": 345.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#2",
+        "pos": {
+          "x": 150.0,
+          "y": 105.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#3",
+        "pos": {
+          "x": 95.0,
+          "y": 25.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#4",
+        "pos": {
+          "x": 95.0,
+          "y": 325.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#5",
+        "pos": {
+          "x": 150.0,
+          "y": 165.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#6",
+        "pos": {
+          "x": 95.0,
+          "y": 145.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#7",
+        "pos": {
+          "x": 95.0,
+          "y": 205.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#8",
+        "pos": {
+          "x": 150.0,
+          "y": 285.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#9",
+        "pos": {
+          "x": 150.0,
+          "y": 225.0
+        }
       }
     ],
     "wires": [
       {
         "pin1": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#11",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#26",
+          "compName": "WireCrossPoint#22",
           "pinName": ""
         },
         "name": "unnamedWire#0",
@@ -406,11 +406,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#10",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#27",
+          "compName": "WireCrossPoint#23",
           "pinName": ""
         },
         "name": "unnamedWire#1",
@@ -418,11 +418,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#16",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "sel1#7",
           "pinName": "S1"
         },
         "name": "unnamedWire#10",
@@ -430,7 +430,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "sel1#3",
           "pinName": "Y"
         },
         "pin2": {
@@ -451,7 +451,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "sel1#0",
           "pinName": "Y"
         },
         "pin2": {
@@ -476,7 +476,7 @@
           "pinName": "I9"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "sel1#1",
           "pinName": "Y"
         },
         "name": "unnamedWire#105",
@@ -493,7 +493,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "sel1#2",
           "pinName": "Y"
         },
         "pin2": {
@@ -518,7 +518,7 @@
           "pinName": "I7"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "sel1#6",
           "pinName": "Y"
         },
         "name": "unnamedWire#107",
@@ -535,7 +535,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "sel1#5",
           "pinName": "Y"
         },
         "pin2": {
@@ -560,7 +560,7 @@
           "pinName": "I5"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "sel1#7",
           "pinName": "Y"
         },
         "name": "unnamedWire#109",
@@ -577,11 +577,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#21",
+          "compName": "WireCrossPoint#17",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "sel1#7",
           "pinName": "S2"
         },
         "name": "unnamedWire#11",
@@ -589,7 +589,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "sel1#9",
           "pinName": "Y"
         },
         "pin2": {
@@ -614,7 +614,7 @@
           "pinName": "I3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#14",
+          "compName": "sel1#10",
           "pinName": "Y"
         },
         "name": "unnamedWire#111",
@@ -631,7 +631,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "sel1#8",
           "pinName": "Y"
         },
         "pin2": {
@@ -656,7 +656,7 @@
           "pinName": "I1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "sel1#4",
           "pinName": "Y"
         },
         "name": "unnamedWire#113",
@@ -673,7 +673,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "sel1#11",
           "pinName": "Y"
         },
         "pin2": {
@@ -706,11 +706,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#10",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#17",
+          "compName": "WireCrossPoint#13",
           "pinName": ""
         },
         "name": "unnamedWire#116",
@@ -723,11 +723,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#14",
+          "compName": "sel1#10",
           "pinName": "S1"
         },
         "pin2": {
-          "compName": "WireCrossPoint#18",
+          "compName": "WireCrossPoint#14",
           "pinName": ""
         },
         "name": "unnamedWire#12",
@@ -735,11 +735,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#19",
+          "compName": "WireCrossPoint#15",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#14",
+          "compName": "sel1#10",
           "pinName": "S2"
         },
         "name": "unnamedWire#13",
@@ -747,11 +747,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "sel1#11",
           "pinName": "S1"
         },
         "name": "unnamedWire#16",
@@ -764,11 +764,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "sel1#8",
           "pinName": "S2"
         },
         "pin2": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "name": "unnamedWire#18",
@@ -776,11 +776,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "sel1#8",
           "pinName": "S1"
         },
         "name": "unnamedWire#19",
@@ -788,11 +788,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#11",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "name": "unnamedWire#2",
@@ -805,11 +805,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "sel1#9",
           "pinName": "S2"
         },
         "pin2": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
         "name": "unnamedWire#20",
@@ -817,11 +817,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "sel1#9",
           "pinName": "S1"
         },
         "name": "unnamedWire#21",
@@ -829,11 +829,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "sel1#5",
           "pinName": "S2"
         },
         "pin2": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "name": "unnamedWire#22",
@@ -841,11 +841,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "sel1#5",
           "pinName": "S1"
         },
         "name": "unnamedWire#23",
@@ -853,11 +853,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "sel1#2",
           "pinName": "S2"
         },
         "pin2": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "name": "unnamedWire#24",
@@ -865,11 +865,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "sel1#2",
           "pinName": "S1"
         },
         "pin2": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "name": "unnamedWire#25",
@@ -877,11 +877,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "sel1#0",
           "pinName": "S2"
         },
         "pin2": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "name": "unnamedWire#26",
@@ -889,11 +889,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "sel1#0",
           "pinName": "S1"
         },
         "name": "unnamedWire#27",
@@ -901,11 +901,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#10",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "name": "unnamedWire#3",
@@ -918,11 +918,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "name": "unnamedWire#35",
@@ -930,11 +930,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "name": "unnamedWire#36",
@@ -942,11 +942,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
         "name": "unnamedWire#37",
@@ -954,11 +954,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "name": "unnamedWire#38",
@@ -966,11 +966,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "name": "unnamedWire#39",
@@ -978,11 +978,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#26",
+          "compName": "WireCrossPoint#22",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "sel1#3",
           "pinName": "S1"
         },
         "name": "unnamedWire#4",
@@ -990,11 +990,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "name": "unnamedWire#40",
@@ -1002,11 +1002,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
         "name": "unnamedWire#41",
@@ -1014,11 +1014,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "name": "unnamedWire#42",
@@ -1026,11 +1026,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "sel1#11",
           "pinName": "S2"
         },
         "name": "unnamedWire#43",
@@ -1043,11 +1043,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#26",
+          "compName": "WireCrossPoint#22",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#24",
+          "compName": "WireCrossPoint#20",
           "pinName": ""
         },
         "name": "unnamedWire#44",
@@ -1055,11 +1055,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#24",
+          "compName": "WireCrossPoint#20",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#23",
+          "compName": "WireCrossPoint#19",
           "pinName": ""
         },
         "name": "unnamedWire#45",
@@ -1067,11 +1067,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#23",
+          "compName": "WireCrossPoint#19",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#16",
           "pinName": ""
         },
         "name": "unnamedWire#46",
@@ -1079,11 +1079,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#16",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#18",
+          "compName": "WireCrossPoint#14",
           "pinName": ""
         },
         "name": "unnamedWire#47",
@@ -1091,11 +1091,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#18",
+          "compName": "WireCrossPoint#14",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "sel1#4",
           "pinName": "S1"
         },
         "name": "unnamedWire#48",
@@ -1108,11 +1108,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#19",
+          "compName": "WireCrossPoint#15",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "sel1#4",
           "pinName": "S2"
         },
         "name": "unnamedWire#49",
@@ -1125,11 +1125,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#27",
+          "compName": "WireCrossPoint#23",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "sel1#3",
           "pinName": "S2"
         },
         "name": "unnamedWire#5",
@@ -1137,11 +1137,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#19",
+          "compName": "WireCrossPoint#15",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#21",
+          "compName": "WireCrossPoint#17",
           "pinName": ""
         },
         "name": "unnamedWire#50",
@@ -1149,11 +1149,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#21",
+          "compName": "WireCrossPoint#17",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#22",
+          "compName": "WireCrossPoint#18",
           "pinName": ""
         },
         "name": "unnamedWire#51",
@@ -1161,11 +1161,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#25",
+          "compName": "WireCrossPoint#21",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#22",
+          "compName": "WireCrossPoint#18",
           "pinName": ""
         },
         "name": "unnamedWire#52",
@@ -1173,11 +1173,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#25",
+          "compName": "WireCrossPoint#21",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#27",
+          "compName": "WireCrossPoint#23",
           "pinName": ""
         },
         "name": "unnamedWire#53",
@@ -1185,11 +1185,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#24",
+          "compName": "WireCrossPoint#20",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "sel1#1",
           "pinName": "S1"
         },
         "name": "unnamedWire#6",
@@ -1201,7 +1201,7 @@
           "pinName": "O11"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "sel1#3",
           "pinName": "I1"
         },
         "name": "unnamedWire#64",
@@ -1222,7 +1222,7 @@
           "pinName": "O10"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "sel1#0",
           "pinName": "I1"
         },
         "name": "unnamedWire#65",
@@ -1243,7 +1243,7 @@
           "pinName": "O9"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "sel1#1",
           "pinName": "I1"
         },
         "name": "unnamedWire#66",
@@ -1264,7 +1264,7 @@
           "pinName": "O8"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "sel1#2",
           "pinName": "I1"
         },
         "name": "unnamedWire#67",
@@ -1285,7 +1285,7 @@
           "pinName": "O7"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "sel1#6",
           "pinName": "I1"
         },
         "name": "unnamedWire#68",
@@ -1306,7 +1306,7 @@
           "pinName": "O6"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "sel1#5",
           "pinName": "I1"
         },
         "name": "unnamedWire#69",
@@ -1323,11 +1323,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "sel1#1",
           "pinName": "S2"
         },
         "pin2": {
-          "compName": "WireCrossPoint#25",
+          "compName": "WireCrossPoint#21",
           "pinName": ""
         },
         "name": "unnamedWire#7",
@@ -1339,7 +1339,7 @@
           "pinName": "O5"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "sel1#7",
           "pinName": "I1"
         },
         "name": "unnamedWire#70",
@@ -1360,7 +1360,7 @@
           "pinName": "O4"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "sel1#9",
           "pinName": "I1"
         },
         "name": "unnamedWire#71",
@@ -1381,7 +1381,7 @@
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#14",
+          "compName": "sel1#10",
           "pinName": "I1"
         },
         "name": "unnamedWire#72",
@@ -1402,7 +1402,7 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "sel1#8",
           "pinName": "I1"
         },
         "name": "unnamedWire#73",
@@ -1423,7 +1423,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "sel1#4",
           "pinName": "I1"
         },
         "name": "unnamedWire#74",
@@ -1444,7 +1444,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "sel1#11",
           "pinName": "I1"
         },
         "name": "unnamedWire#75",
@@ -1485,11 +1485,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#23",
+          "compName": "WireCrossPoint#19",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "sel1#6",
           "pinName": "S1"
         },
         "name": "unnamedWire#8",
@@ -1501,7 +1501,7 @@
           "pinName": "O11"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "sel1#3",
           "pinName": "I2"
         },
         "name": "unnamedWire#82",
@@ -1522,7 +1522,7 @@
           "pinName": "O10"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "sel1#0",
           "pinName": "I2"
         },
         "name": "unnamedWire#83",
@@ -1543,7 +1543,7 @@
           "pinName": "O9"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "sel1#1",
           "pinName": "I2"
         },
         "name": "unnamedWire#84",
@@ -1564,7 +1564,7 @@
           "pinName": "O8"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "sel1#2",
           "pinName": "I2"
         },
         "name": "unnamedWire#85",
@@ -1585,7 +1585,7 @@
           "pinName": "O7"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "sel1#6",
           "pinName": "I2"
         },
         "name": "unnamedWire#86",
@@ -1606,7 +1606,7 @@
           "pinName": "O6"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "sel1#5",
           "pinName": "I2"
         },
         "name": "unnamedWire#87",
@@ -1627,7 +1627,7 @@
           "pinName": "O5"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "sel1#7",
           "pinName": "I2"
         },
         "name": "unnamedWire#88",
@@ -1648,7 +1648,7 @@
           "pinName": "O4"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "sel1#9",
           "pinName": "I2"
         },
         "name": "unnamedWire#89",
@@ -1665,11 +1665,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "sel1#6",
           "pinName": "S2"
         },
         "pin2": {
-          "compName": "WireCrossPoint#22",
+          "compName": "WireCrossPoint#18",
           "pinName": ""
         },
         "name": "unnamedWire#9",
@@ -1681,7 +1681,7 @@
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#14",
+          "compName": "sel1#10",
           "pinName": "I2"
         },
         "name": "unnamedWire#90",
@@ -1702,7 +1702,7 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "sel1#8",
           "pinName": "I2"
         },
         "name": "unnamedWire#91",
@@ -1723,7 +1723,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "sel1#4",
           "pinName": "I2"
         },
         "name": "unnamedWire#92",
@@ -1744,7 +1744,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "sel1#11",
           "pinName": "I2"
         },
         "name": "unnamedWire#93",
@@ -1765,7 +1765,7 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#11",
           "pinName": ""
         },
         "name": "unnamedWire#94",
@@ -1773,11 +1773,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#16",
+          "compName": "WireCrossPoint#12",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#17",
+          "compName": "WireCrossPoint#13",
           "pinName": ""
         },
         "name": "unnamedWire#95",
@@ -1785,7 +1785,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#16",
+          "compName": "WireCrossPoint#12",
           "pinName": ""
         },
         "pin2": {
@@ -1797,7 +1797,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#17",
+          "compName": "WireCrossPoint#13",
           "pinName": ""
         },
         "pin2": {
@@ -1813,7 +1813,7 @@
           "pinName": "S"
         },
         "pin2": {
-          "compName": "WireCrossPoint#16",
+          "compName": "WireCrossPoint#12",
           "pinName": ""
         },
         "name": "unnamedWire#98",

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_16.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_16.json
index 65ce55c..c282fa5 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_16.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_16.json
@@ -42,134 +42,6 @@
   "innerScale": 0.2,
   "submodel": {
     "components": [
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#0",
-        "pos": {
-          "x": 115.0,
-          "y": 25.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#1",
-        "pos": {
-          "x": 175.0,
-          "y": 45.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#10",
-        "pos": {
-          "x": 115.0,
-          "y": 265.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#11",
-        "pos": {
-          "x": 115.0,
-          "y": 325.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#12",
-        "pos": {
-          "x": 175.0,
-          "y": 405.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#13",
-        "pos": {
-          "x": 175.0,
-          "y": 345.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#14",
-        "pos": {
-          "x": 115.0,
-          "y": 385.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#15",
-        "pos": {
-          "x": 175.0,
-          "y": 465.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#2",
-        "pos": {
-          "x": 115.0,
-          "y": 85.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#3",
-        "pos": {
-          "x": 175.0,
-          "y": 105.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#4",
-        "pos": {
-          "x": 175.0,
-          "y": 165.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#5",
-        "pos": {
-          "x": 115.0,
-          "y": 205.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#6",
-        "pos": {
-          "x": 175.0,
-          "y": 225.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#7",
-        "pos": {
-          "x": 115.0,
-          "y": 145.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#8",
-        "pos": {
-          "x": 115.0,
-          "y": 445.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#9",
-        "pos": {
-          "x": 175.0,
-          "y": 285.0
-        }
-      },
       {
         "id": "Merger",
         "name": "Merger#0",
@@ -493,6 +365,134 @@
           "y": 299.0
         },
         "params": 1
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#0",
+        "pos": {
+          "x": 115.0,
+          "y": 25.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#1",
+        "pos": {
+          "x": 175.0,
+          "y": 45.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#10",
+        "pos": {
+          "x": 115.0,
+          "y": 265.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#11",
+        "pos": {
+          "x": 115.0,
+          "y": 325.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#12",
+        "pos": {
+          "x": 175.0,
+          "y": 405.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#13",
+        "pos": {
+          "x": 175.0,
+          "y": 345.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#14",
+        "pos": {
+          "x": 115.0,
+          "y": 385.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#15",
+        "pos": {
+          "x": 175.0,
+          "y": 465.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#2",
+        "pos": {
+          "x": 115.0,
+          "y": 85.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#3",
+        "pos": {
+          "x": 175.0,
+          "y": 105.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#4",
+        "pos": {
+          "x": 175.0,
+          "y": 165.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#5",
+        "pos": {
+          "x": 115.0,
+          "y": 205.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#6",
+        "pos": {
+          "x": 175.0,
+          "y": 225.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#7",
+        "pos": {
+          "x": 115.0,
+          "y": 145.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#8",
+        "pos": {
+          "x": 115.0,
+          "y": 445.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#9",
+        "pos": {
+          "x": 175.0,
+          "y": 285.0
+        }
       }
     ],
     "wires": [
@@ -502,7 +502,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "sel1#0",
           "pinName": "S1"
         },
         "name": "unnamedWire#0",
@@ -514,7 +514,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "sel1#0",
           "pinName": "S2"
         },
         "name": "unnamedWire#1",
@@ -526,7 +526,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "sel1#11",
           "pinName": "S1"
         },
         "name": "unnamedWire#10",
@@ -538,7 +538,7 @@
           "pinName": "I14"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "sel1#1",
           "pinName": "Y"
         },
         "name": "unnamedWire#100",
@@ -555,7 +555,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "sel1#2",
           "pinName": "Y"
         },
         "pin2": {
@@ -580,7 +580,7 @@
           "pinName": "I12"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "sel1#3",
           "pinName": "Y"
         },
         "name": "unnamedWire#102",
@@ -597,7 +597,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "sel1#7",
           "pinName": "Y"
         },
         "pin2": {
@@ -618,7 +618,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "sel1#4",
           "pinName": "Y"
         },
         "pin2": {
@@ -643,7 +643,7 @@
           "pinName": "I9"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "sel1#5",
           "pinName": "Y"
         },
         "name": "unnamedWire#105",
@@ -660,7 +660,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "sel1#6",
           "pinName": "Y"
         },
         "pin2": {
@@ -685,7 +685,7 @@
           "pinName": "I7"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "sel1#10",
           "pinName": "Y"
         },
         "name": "unnamedWire#107",
@@ -702,7 +702,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "sel1#9",
           "pinName": "Y"
         },
         "pin2": {
@@ -727,7 +727,7 @@
           "pinName": "I5"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "sel1#11",
           "pinName": "Y"
         },
         "name": "unnamedWire#109",
@@ -748,7 +748,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "sel1#11",
           "pinName": "S2"
         },
         "name": "unnamedWire#11",
@@ -756,7 +756,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "sel1#13",
           "pinName": "Y"
         },
         "pin2": {
@@ -781,7 +781,7 @@
           "pinName": "I3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#14",
+          "compName": "sel1#14",
           "pinName": "Y"
         },
         "name": "unnamedWire#111",
@@ -798,7 +798,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "sel1#12",
           "pinName": "Y"
         },
         "pin2": {
@@ -823,7 +823,7 @@
           "pinName": "I1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "sel1#8",
           "pinName": "Y"
         },
         "name": "unnamedWire#113",
@@ -840,7 +840,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "sel1#15",
           "pinName": "Y"
         },
         "pin2": {
@@ -890,7 +890,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#14",
+          "compName": "sel1#14",
           "pinName": "S1"
         },
         "pin2": {
@@ -906,7 +906,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#14",
+          "compName": "sel1#14",
           "pinName": "S2"
         },
         "name": "unnamedWire#13",
@@ -942,7 +942,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "sel1#15",
           "pinName": "S1"
         },
         "name": "unnamedWire#16",
@@ -967,7 +967,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "sel1#12",
           "pinName": "S2"
         },
         "pin2": {
@@ -983,7 +983,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "sel1#12",
           "pinName": "S1"
         },
         "name": "unnamedWire#19",
@@ -995,7 +995,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "sel1#2",
           "pinName": "S1"
         },
         "name": "unnamedWire#2",
@@ -1003,7 +1003,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "sel1#13",
           "pinName": "S2"
         },
         "pin2": {
@@ -1019,7 +1019,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "sel1#13",
           "pinName": "S1"
         },
         "name": "unnamedWire#21",
@@ -1027,7 +1027,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "sel1#9",
           "pinName": "S2"
         },
         "pin2": {
@@ -1043,7 +1043,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "sel1#9",
           "pinName": "S1"
         },
         "name": "unnamedWire#23",
@@ -1051,7 +1051,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "sel1#6",
           "pinName": "S2"
         },
         "pin2": {
@@ -1063,7 +1063,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "sel1#6",
           "pinName": "S1"
         },
         "pin2": {
@@ -1075,7 +1075,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "sel1#4",
           "pinName": "S2"
         },
         "pin2": {
@@ -1091,7 +1091,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "sel1#4",
           "pinName": "S1"
         },
         "name": "unnamedWire#27",
@@ -1099,7 +1099,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "sel1#3",
           "pinName": "S2"
         },
         "pin2": {
@@ -1115,7 +1115,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "sel1#3",
           "pinName": "S1"
         },
         "name": "unnamedWire#29",
@@ -1127,7 +1127,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "sel1#2",
           "pinName": "S2"
         },
         "name": "unnamedWire#3",
@@ -1135,7 +1135,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "sel1#1",
           "pinName": "S2"
         },
         "pin2": {
@@ -1151,7 +1151,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "sel1#1",
           "pinName": "S1"
         },
         "name": "unnamedWire#31",
@@ -1259,7 +1259,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "sel1#7",
           "pinName": "S1"
         },
         "name": "unnamedWire#4",
@@ -1307,7 +1307,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "sel1#15",
           "pinName": "S2"
         },
         "name": "unnamedWire#43",
@@ -1372,7 +1372,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "sel1#8",
           "pinName": "S1"
         },
         "name": "unnamedWire#48",
@@ -1389,7 +1389,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "sel1#8",
           "pinName": "S2"
         },
         "name": "unnamedWire#49",
@@ -1406,7 +1406,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "sel1#7",
           "pinName": "S2"
         },
         "name": "unnamedWire#5",
@@ -1548,7 +1548,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "sel1#5",
           "pinName": "S1"
         },
         "name": "unnamedWire#6",
@@ -1560,7 +1560,7 @@
           "pinName": "O15"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "sel1#0",
           "pinName": "I1"
         },
         "name": "unnamedWire#60",
@@ -1572,7 +1572,7 @@
           "pinName": "O14"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "sel1#1",
           "pinName": "I1"
         },
         "name": "unnamedWire#61",
@@ -1593,7 +1593,7 @@
           "pinName": "O13"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "sel1#2",
           "pinName": "I1"
         },
         "name": "unnamedWire#62",
@@ -1614,7 +1614,7 @@
           "pinName": "O12"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "sel1#3",
           "pinName": "I1"
         },
         "name": "unnamedWire#63",
@@ -1635,7 +1635,7 @@
           "pinName": "O11"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "sel1#7",
           "pinName": "I1"
         },
         "name": "unnamedWire#64",
@@ -1656,7 +1656,7 @@
           "pinName": "O10"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "sel1#4",
           "pinName": "I1"
         },
         "name": "unnamedWire#65",
@@ -1677,7 +1677,7 @@
           "pinName": "O9"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "sel1#5",
           "pinName": "I1"
         },
         "name": "unnamedWire#66",
@@ -1698,7 +1698,7 @@
           "pinName": "O8"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "sel1#6",
           "pinName": "I1"
         },
         "name": "unnamedWire#67",
@@ -1719,7 +1719,7 @@
           "pinName": "O7"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "sel1#10",
           "pinName": "I1"
         },
         "name": "unnamedWire#68",
@@ -1740,7 +1740,7 @@
           "pinName": "O6"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "sel1#9",
           "pinName": "I1"
         },
         "name": "unnamedWire#69",
@@ -1757,7 +1757,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "sel1#5",
           "pinName": "S2"
         },
         "pin2": {
@@ -1773,7 +1773,7 @@
           "pinName": "O5"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "sel1#11",
           "pinName": "I1"
         },
         "name": "unnamedWire#70",
@@ -1794,7 +1794,7 @@
           "pinName": "O4"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "sel1#13",
           "pinName": "I1"
         },
         "name": "unnamedWire#71",
@@ -1815,7 +1815,7 @@
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#14",
+          "compName": "sel1#14",
           "pinName": "I1"
         },
         "name": "unnamedWire#72",
@@ -1836,7 +1836,7 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "sel1#12",
           "pinName": "I1"
         },
         "name": "unnamedWire#73",
@@ -1857,7 +1857,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "sel1#8",
           "pinName": "I1"
         },
         "name": "unnamedWire#74",
@@ -1878,7 +1878,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "sel1#15",
           "pinName": "I1"
         },
         "name": "unnamedWire#75",
@@ -1923,7 +1923,7 @@
           "pinName": "O15"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "sel1#0",
           "pinName": "I2"
         },
         "name": "unnamedWire#78",
@@ -1944,7 +1944,7 @@
           "pinName": "O14"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "sel1#1",
           "pinName": "I2"
         },
         "name": "unnamedWire#79",
@@ -1965,7 +1965,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "sel1#10",
           "pinName": "S1"
         },
         "name": "unnamedWire#8",
@@ -1977,7 +1977,7 @@
           "pinName": "O13"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "sel1#2",
           "pinName": "I2"
         },
         "name": "unnamedWire#80",
@@ -1998,7 +1998,7 @@
           "pinName": "O12"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "sel1#3",
           "pinName": "I2"
         },
         "name": "unnamedWire#81",
@@ -2019,7 +2019,7 @@
           "pinName": "O11"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "sel1#7",
           "pinName": "I2"
         },
         "name": "unnamedWire#82",
@@ -2040,7 +2040,7 @@
           "pinName": "O10"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "sel1#4",
           "pinName": "I2"
         },
         "name": "unnamedWire#83",
@@ -2061,7 +2061,7 @@
           "pinName": "O9"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "sel1#5",
           "pinName": "I2"
         },
         "name": "unnamedWire#84",
@@ -2082,7 +2082,7 @@
           "pinName": "O8"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "sel1#6",
           "pinName": "I2"
         },
         "name": "unnamedWire#85",
@@ -2103,7 +2103,7 @@
           "pinName": "O7"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "sel1#10",
           "pinName": "I2"
         },
         "name": "unnamedWire#86",
@@ -2124,7 +2124,7 @@
           "pinName": "O6"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "sel1#9",
           "pinName": "I2"
         },
         "name": "unnamedWire#87",
@@ -2145,7 +2145,7 @@
           "pinName": "O5"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "sel1#11",
           "pinName": "I2"
         },
         "name": "unnamedWire#88",
@@ -2166,7 +2166,7 @@
           "pinName": "O4"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "sel1#13",
           "pinName": "I2"
         },
         "name": "unnamedWire#89",
@@ -2183,7 +2183,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "sel1#10",
           "pinName": "S2"
         },
         "pin2": {
@@ -2199,7 +2199,7 @@
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#14",
+          "compName": "sel1#14",
           "pinName": "I2"
         },
         "name": "unnamedWire#90",
@@ -2220,7 +2220,7 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "sel1#12",
           "pinName": "I2"
         },
         "name": "unnamedWire#91",
@@ -2241,7 +2241,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "sel1#8",
           "pinName": "I2"
         },
         "name": "unnamedWire#92",
@@ -2262,7 +2262,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "sel1#15",
           "pinName": "I2"
         },
         "name": "unnamedWire#93",
@@ -2339,7 +2339,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "sel1#0",
           "pinName": "Y"
         },
         "pin2": {

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux2.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux2.json
index 3a1507a..91d1220 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux2.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux2.json
@@ -69,30 +69,6 @@
   "innerScale": 0.4,
   "submodel": {
     "components": [
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#0",
-        "pos": {
-          "x": 60.0,
-          "y": 35.0
-        }
-      },
-      {
-        "id": "sel1",
-        "name": "DeserializedSubmodelComponent#1",
-        "pos": {
-          "x": 60.0,
-          "y": 100.0
-        }
-      },
-      {
-        "id": "mux1",
-        "name": "DeserializedSubmodelComponent#2",
-        "pos": {
-          "x": 115.0,
-          "y": 20.0
-        }
-      },
       {
         "id": "NandGate",
         "name": "NandGate#0",
@@ -104,7 +80,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
+        "name": "WireCrossPoint#0",
         "pos": {
           "x": 24.0,
           "y": 29.0
@@ -113,7 +89,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
+        "name": "WireCrossPoint#1",
         "pos": {
           "x": 24.0,
           "y": 49.0
@@ -122,22 +98,46 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
+        "name": "WireCrossPoint#2",
         "pos": {
           "x": 54.0,
           "y": 39.0
         },
         "params": 1
+      },
+      {
+        "id": "mux1",
+        "name": "mux1#0",
+        "pos": {
+          "x": 115.0,
+          "y": 20.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#0",
+        "pos": {
+          "x": 60.0,
+          "y": 35.0
+        }
+      },
+      {
+        "id": "sel1",
+        "name": "sel1#1",
+        "pos": {
+          "x": 60.0,
+          "y": 100.0
+        }
       }
     ],
     "wires": [
       {
         "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "name": "unnamedWire#0",
@@ -145,7 +145,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "pin2": {
@@ -157,7 +157,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "pin2": {
@@ -169,11 +169,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "sel1#0",
           "pinName": "S2"
         },
         "name": "unnamedWire#11",
@@ -181,11 +181,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "sel1#0",
           "pinName": "S1"
         },
         "pin2": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "name": "unnamedWire#14",
@@ -193,7 +193,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "pin2": {
@@ -210,11 +210,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "sel1#1",
           "pinName": "S2"
         },
         "name": "unnamedWire#16",
@@ -227,11 +227,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "sel1#1",
           "pinName": "S1"
         },
         "name": "unnamedWire#17",
@@ -244,7 +244,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "pin2": {
@@ -265,7 +265,7 @@
           "pinName": "I00"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "sel1#0",
           "pinName": "I1"
         },
         "name": "unnamedWire#2",
@@ -286,7 +286,7 @@
           "pinName": "I01"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "sel1#0",
           "pinName": "I2"
         },
         "name": "unnamedWire#3",
@@ -307,7 +307,7 @@
           "pinName": "I10"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "sel1#1",
           "pinName": "I1"
         },
         "name": "unnamedWire#4",
@@ -319,7 +319,7 @@
           "pinName": "I11"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "sel1#1",
           "pinName": "I2"
         },
         "name": "unnamedWire#5",
@@ -336,7 +336,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "mux1#0",
           "pinName": "Y"
         },
         "pin2": {
@@ -348,11 +348,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "sel1#0",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "mux1#0",
           "pinName": "I0"
         },
         "name": "unnamedWire#7",
@@ -369,11 +369,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "sel1#1",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "mux1#0",
           "pinName": "I1"
         },
         "name": "unnamedWire#8",
@@ -394,7 +394,7 @@
           "pinName": "S1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "mux1#0",
           "pinName": "S0"
         },
         "name": "unnamedWire#9",

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux2_4.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux2_4.json
deleted file mode 100644 (file)
index 5f8c0c8..0000000
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux2_4.json
+++ /dev/null
@@ -1,700 +0,0 @@
-{
-  "width": 62.0,
-  "height": 90.0,
-  "interfacePins": [
-    {
-      "location": {
-        "x": 0.0,
-        "y": 30.0
-      },
-      "name": "I00",
-      "logicWidth": 4,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 40.0
-      },
-      "name": "I01",
-      "logicWidth": 4,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 50.0
-      },
-      "name": "I10",
-      "logicWidth": 4,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 60.0
-      },
-      "name": "I11",
-      "logicWidth": 4,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 10.0
-      },
-      "name": "S0",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 20.0
-      },
-      "name": "S1",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 62.0,
-        "y": 16.0
-      },
-      "name": "Y",
-      "logicWidth": 4,
-      "usage": "OUTPUT"
-    }
-  ],
-  "innerScale": 0.4,
-  "submodel": {
-    "components": [
-      {
-        "id": "mux1_4",
-        "name": "DeserializedSubmodelComponent#0",
-        "pos": {
-          "x": 40.0,
-          "y": 30.0
-        }
-      },
-      {
-        "id": "mux1_4",
-        "name": "DeserializedSubmodelComponent#1",
-        "pos": {
-          "x": 40.0,
-          "y": 125.0
-        }
-      },
-      {
-        "id": "mux1_4",
-        "name": "DeserializedSubmodelComponent#2",
-        "pos": {
-          "x": 100.0,
-          "y": 20.0
-        }
-      },
-      {
-        "id": "Merger",
-        "name": "Merger#0",
-        "pos": {
-          "x": 140.0,
-          "y": 25.0
-        },
-        "params": 4
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#0",
-        "pos": {
-          "x": 25.0,
-          "y": 45.0
-        },
-        "params": 4
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#1",
-        "pos": {
-          "x": 25.0,
-          "y": 85.0
-        },
-        "params": 4
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#2",
-        "pos": {
-          "x": 25.0,
-          "y": 140.0
-        },
-        "params": 4
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#3",
-        "pos": {
-          "x": 25.0,
-          "y": 180.0
-        },
-        "params": 4
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
-        "pos": {
-          "x": 19.0,
-          "y": 34.0
-        },
-        "params": 1
-      }
-    ],
-    "wires": [
-      {
-        "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O0"
-        },
-        "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
-          "pinName": "I0_1"
-        },
-        "name": "unnamedWire#0",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "DeserializedSubmodelComponent#1",
-          "pinName": "I0_2"
-        },
-        "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O1"
-        },
-        "name": "unnamedWire#1",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
-          "pinName": "I1_1"
-        },
-        "pin2": {
-          "compName": "Splitter#1",
-          "pinName": "O0"
-        },
-        "name": "unnamedWire#10",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "O3"
-        },
-        "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
-          "pinName": "I1_4"
-        },
-        "name": "unnamedWire#11",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
-          "pinName": "I0_4"
-        },
-        "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O3"
-        },
-        "name": "unnamedWire#12",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
-          "pinName": "I0_3"
-        },
-        "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O2"
-        },
-        "name": "unnamedWire#13",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
-          "pinName": "I0_2"
-        },
-        "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O1"
-        },
-        "name": "unnamedWire#14",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
-          "pinName": "I0_1"
-        },
-        "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O0"
-        },
-        "name": "unnamedWire#15",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "S0"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "name": "unnamedWire#16",
-        "path": [
-          {
-            "x": 20.0,
-            "y": 25.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
-          "pinName": "S0"
-        },
-        "name": "unnamedWire#17",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
-          "pinName": "S0"
-        },
-        "name": "unnamedWire#18",
-        "path": [
-          {
-            "x": 20.0,
-            "y": 130.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "I"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "I00"
-        },
-        "name": "unnamedWire#19",
-        "path": [
-          {
-            "x": 15.0,
-            "y": 60.0
-          },
-          {
-            "x": 15.0,
-            "y": 75.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O2"
-        },
-        "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
-          "pinName": "I0_3"
-        },
-        "name": "unnamedWire#2",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I01"
-        },
-        "pin2": {
-          "compName": "Splitter#1",
-          "pinName": "I"
-        },
-        "name": "unnamedWire#20",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "I"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "I10"
-        },
-        "name": "unnamedWire#21",
-        "path": [
-          {
-            "x": 15.0,
-            "y": 155.0
-          },
-          {
-            "x": 15.0,
-            "y": 125.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I11"
-        },
-        "pin2": {
-          "compName": "Splitter#3",
-          "pinName": "I"
-        },
-        "name": "unnamedWire#22",
-        "path": [
-          {
-            "x": 10.0,
-            "y": 150.0
-          },
-          {
-            "x": 10.0,
-            "y": 195.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
-          "pinName": "Y1"
-        },
-        "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
-          "pinName": "I0_1"
-        },
-        "name": "unnamedWire#23",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
-          "pinName": "I0_2"
-        },
-        "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
-          "pinName": "Y2"
-        },
-        "name": "unnamedWire#24",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
-          "pinName": "Y3"
-        },
-        "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
-          "pinName": "I0_3"
-        },
-        "name": "unnamedWire#25",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
-          "pinName": "I0_4"
-        },
-        "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
-          "pinName": "Y4"
-        },
-        "name": "unnamedWire#26",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
-          "pinName": "I1_1"
-        },
-        "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
-          "pinName": "Y1"
-        },
-        "name": "unnamedWire#27",
-        "path": [
-          {
-            "x": 80.0,
-            "y": 75.0
-          },
-          {
-            "x": 80.0,
-            "y": 130.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "DeserializedSubmodelComponent#1",
-          "pinName": "Y2"
-        },
-        "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
-          "pinName": "I1_2"
-        },
-        "name": "unnamedWire#28",
-        "path": [
-          {
-            "x": 85.0,
-            "y": 140.0
-          },
-          {
-            "x": 85.0,
-            "y": 85.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
-          "pinName": "I1_3"
-        },
-        "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
-          "pinName": "Y3"
-        },
-        "name": "unnamedWire#29",
-        "path": [
-          {
-            "x": 90.0,
-            "y": 95.0
-          },
-          {
-            "x": 90.0,
-            "y": 150.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O0"
-        },
-        "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
-          "pinName": "I1_1"
-        },
-        "name": "unnamedWire#3",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "DeserializedSubmodelComponent#1",
-          "pinName": "Y4"
-        },
-        "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
-          "pinName": "I1_4"
-        },
-        "name": "unnamedWire#30",
-        "path": [
-          {
-            "x": 95.0,
-            "y": 160.0
-          },
-          {
-            "x": 95.0,
-            "y": 105.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Merger#0",
-          "pinName": "O"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y"
-        },
-        "name": "unnamedWire#31",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Merger#0",
-          "pinName": "I0"
-        },
-        "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
-          "pinName": "Y1"
-        },
-        "name": "unnamedWire#32",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
-          "pinName": "Y2"
-        },
-        "pin2": {
-          "compName": "Merger#0",
-          "pinName": "I1"
-        },
-        "name": "unnamedWire#33",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Merger#0",
-          "pinName": "I2"
-        },
-        "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
-          "pinName": "Y3"
-        },
-        "name": "unnamedWire#34",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
-          "pinName": "Y4"
-        },
-        "pin2": {
-          "compName": "Merger#0",
-          "pinName": "I3"
-        },
-        "name": "unnamedWire#35",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "S1"
-        },
-        "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
-          "pinName": "S0"
-        },
-        "name": "unnamedWire#36",
-        "path": [
-          {
-            "x": 15.0,
-            "y": 50.0
-          },
-          {
-            "x": 15.0,
-            "y": 20.0
-          },
-          {
-            "x": 60.0,
-            "y": 20.0
-          },
-          {
-            "x": 60.0,
-            "y": 25.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "DeserializedSubmodelComponent#1",
-          "pinName": "I0_4"
-        },
-        "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O3"
-        },
-        "name": "unnamedWire#4",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O1"
-        },
-        "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
-          "pinName": "I1_2"
-        },
-        "name": "unnamedWire#5",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "DeserializedSubmodelComponent#1",
-          "pinName": "I1_3"
-        },
-        "pin2": {
-          "compName": "Splitter#3",
-          "pinName": "O2"
-        },
-        "name": "unnamedWire#6",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O3"
-        },
-        "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
-          "pinName": "I1_4"
-        },
-        "name": "unnamedWire#7",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "O2"
-        },
-        "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
-          "pinName": "I1_3"
-        },
-        "name": "unnamedWire#8",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "O1"
-        },
-        "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
-          "pinName": "I1_2"
-        },
-        "name": "unnamedWire#9",
-        "path": []
-      }
-    ],
-    "version": "0.1.1"
-  },
-  "symbolRendererSnippetID": "simpleRectangularLike",
-  "symbolRendererParams": {
-    "centerText": "mux1_4",
-    "centerTextHeight": 5.0,
-    "horizontalComponentCenter": 17.5,
-    "pinLabelHeight": 3.5,
-    "pinLabelMargin": 0.5
-  },
-  "outlineRendererSnippetID": "default",
-  "highLevelStateHandlerSnippetID": "default",
-  "version": "0.1.5"
-}
\ No newline at end of file

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux3.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux3.json
index 7b54b5d..ac5aa8a 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux3.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux3.json
@@ -115,16 +115,26 @@
   "submodel": {
     "components": [
       {
-        "id": "mux2",
-        "name": "DeserializedSubmodelComponent#0",
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
         "pos": {
-          "x": 35.0,
-          "y": 185.0
-        }
+          "x": 19.0,
+          "y": 104.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
+        "pos": {
+          "x": 24.0,
+          "y": 94.0
+        },
+        "params": 1
       },
       {
         "id": "mux1",
-        "name": "DeserializedSubmodelComponent#2",
+        "name": "mux1#0",
         "pos": {
           "x": 125.0,
           "y": 20.0
@@ -132,29 +142,19 @@
       },
       {
         "id": "mux2",
-        "name": "DeserializedSubmodelComponent#3",
+        "name": "mux2#0",
         "pos": {
           "x": 35.0,
-          "y": 85.0
+          "y": 185.0
         }
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
-        "pos": {
-          "x": 19.0,
-          "y": 104.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
+        "id": "mux2",
+        "name": "mux2#1",
         "pos": {
-          "x": 24.0,
-          "y": 94.0
-        },
-        "params": 1
+          "x": 35.0,
+          "y": 85.0
+        }
       }
     ],
     "wires": [
@@ -194,7 +194,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux2#1",
           "pinName": "I11"
         },
         "pin2": {
@@ -215,7 +215,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux2#0",
           "pinName": "I00"
         },
         "pin2": {
@@ -240,7 +240,7 @@
           "pinName": "I101"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux2#0",
           "pinName": "I01"
         },
         "name": "unnamedWire#12",
@@ -248,7 +248,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux2#0",
           "pinName": "I10"
         },
         "pin2": {
@@ -273,7 +273,7 @@
           "pinName": "I111"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux2#0",
           "pinName": "I11"
         },
         "name": "unnamedWire#14",
@@ -290,11 +290,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux2#0",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "mux1#0",
           "pinName": "I1"
         },
         "name": "unnamedWire#15",
@@ -311,11 +311,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux2#1",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "mux1#0",
           "pinName": "I0"
         },
         "name": "unnamedWire#16",
@@ -332,7 +332,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "mux1#0",
           "pinName": "S0"
         },
         "pin2": {
@@ -348,7 +348,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux2#1",
           "pinName": "S1"
         },
         "name": "unnamedWire#2",
@@ -356,7 +356,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux2#1",
           "pinName": "S0"
         },
         "pin2": {
@@ -368,7 +368,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux2#0",
           "pinName": "S1"
         },
         "pin2": {
@@ -385,7 +385,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux2#0",
           "pinName": "S0"
         },
         "pin2": {
@@ -402,7 +402,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "mux1#0",
           "pinName": "Y"
         },
         "pin2": {
@@ -418,7 +418,7 @@
           "pinName": "I000"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux2#1",
           "pinName": "I00"
         },
         "name": "unnamedWire#7",
@@ -435,7 +435,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux2#1",
           "pinName": "I01"
         },
         "pin2": {
@@ -451,7 +451,7 @@
           "pinName": "I010"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux2#1",
           "pinName": "I10"
         },
         "name": "unnamedWire#9",

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel1.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel1.json
index d53f4c8..afd89f1 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel1.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel1.json
@@ -53,7 +53,7 @@
     "components": [
       {
         "id": "NandGate",
-        "name": "NandGate#1",
+        "name": "NandGate#0",
         "pos": {
           "x": 35.0,
           "y": 30.0
@@ -62,7 +62,7 @@
       },
       {
         "id": "NandGate",
-        "name": "NandGate#2",
+        "name": "NandGate#1",
         "pos": {
           "x": 35.0,
           "y": 55.0
@@ -71,7 +71,7 @@
       },
       {
         "id": "NandGate",
-        "name": "NandGate#3",
+        "name": "NandGate#2",
         "pos": {
           "x": 60.0,
           "y": 40.0
@@ -86,7 +86,7 @@
           "pinName": "S1"
         },
         "pin2": {
-          "compName": "NandGate#1",
+          "compName": "NandGate#0",
           "pinName": "A"
         },
         "name": "unnamedWire#0",
@@ -107,7 +107,7 @@
           "pinName": "S2"
         },
         "pin2": {
-          "compName": "NandGate#2",
+          "compName": "NandGate#1",
           "pinName": "A"
         },
         "name": "unnamedWire#1",
@@ -124,7 +124,7 @@
       },
       {
         "pin1": {
-          "compName": "NandGate#3",
+          "compName": "NandGate#2",
           "pinName": "Y"
         },
         "pin2": {
@@ -139,7 +139,7 @@
           "pinName": "I1"
         },
         "pin2": {
-          "compName": "NandGate#1",
+          "compName": "NandGate#0",
           "pinName": "B"
         },
         "name": "unnamedWire#5",
@@ -160,7 +160,7 @@
           "pinName": "I2"
         },
         "pin2": {
-          "compName": "NandGate#2",
+          "compName": "NandGate#1",
           "pinName": "B"
         },
         "name": "unnamedWire#7",
@@ -177,22 +177,22 @@
       },
       {
         "pin1": {
-          "compName": "NandGate#1",
+          "compName": "NandGate#0",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "NandGate#3",
+          "compName": "NandGate#2",
           "pinName": "A"
         },
         "name": "unnamedWire#8"
       },
       {
         "pin1": {
-          "compName": "NandGate#2",
+          "compName": "NandGate#1",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "NandGate#3",
+          "compName": "NandGate#2",
           "pinName": "B"
         },
         "name": "unnamedWire#9"

diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/standardComponentIDMapping.json b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/standardComponentIDMapping.json
index bcfae4a..6ab00c4 100644 (file)
--- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/standardComponentIDMapping.json
+++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/standardComponentIDMapping.json
@@ -12,6 +12,7 @@ mograsim version: 0.1.3
   "ram5_12": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.Modelram5_12",
   "sel4_12": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.Modelsel4_12",
   
+  "Am2900": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/Am2900.json",
   "Am2901": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2901/Am2901.json",
   "Am2901ALUFuncDecode": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2901/Am2901ALUFuncDecode.json",
   "Am2901ALUInclDecode": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclDecode.json",
@@ -43,7 +44,6 @@ mograsim version: 0.1.3
   "mux1_16": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/mux1_16.json",
   "mux1_4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/mux1_4.json",
   "mux2": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/mux2.json",
-  "mux2_4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/mux2_4.json",
   "mux3": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/mux3.json",
   "nand3": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/nand3.json",
   "not4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/not4.json",

diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ModelComponentTestbench.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ModelComponentTestbench.java
index 38d362e..1e654c8 100644 (file)
--- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ModelComponentTestbench.java
+++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ModelComponentTestbench.java
@@ -26,8 +26,7 @@ public class ModelComponentTestbench
        public static void createTestbench(LogicModelModifiable model)
        {
                Am2900Loader.setup();
-               ModelComponent comp = IndirectModelComponentCreator.createComponent(model,
-                               "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dff16_invwe.json");
+               ModelComponent comp = IndirectModelComponentCreator.createComponent(model, "Am2900");
 
                List<String> inputPinNames = new ArrayList<>();
                List<String> outputPinNames = new ArrayList<>();

diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ReserializeJSONsSettingUsages.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ReserializeJSONsSettingUsages.java
index f1e90aa..0788589 100644 (file)
--- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ReserializeJSONsSettingUsages.java
+++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ReserializeJSONsSettingUsages.java
@@ -15,12 +15,14 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
 import net.mograsim.logic.model.am2900.Am2900Loader;
 import net.mograsim.logic.model.model.LogicModelModifiable;
 import net.mograsim.logic.model.model.components.ModelComponent;
 import net.mograsim.logic.model.model.components.submodels.SubmodelComponent;
 import net.mograsim.logic.model.model.components.submodels.SubmodelInterface;
 import net.mograsim.logic.model.model.wires.ModelWire;
+import net.mograsim.logic.model.model.wires.ModelWireCrossPoint;
 import net.mograsim.logic.model.model.wires.MovablePin;
 import net.mograsim.logic.model.model.wires.Pin;
 import net.mograsim.logic.model.model.wires.PinUsage;
@@ -28,11 +30,15 @@ import net.mograsim.logic.model.serializing.DeserializedSubmodelComponent;
 import net.mograsim.logic.model.serializing.IdentifyParams;
 import net.mograsim.logic.model.serializing.IndirectModelComponentCreator;
 import net.mograsim.logic.model.serializing.SubmodelComponentSerializer;
+import net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler;
 
 public class ReserializeJSONsSettingUsages
 {
+       public static double GRIDSIZE = 2.5;
        public static boolean changePinUsages = false;
-       public static boolean changeComponentNames = true;
+       public static boolean changeComponentNames = false;
+       public static boolean snapWCPs = true;
+       public static boolean warnNonSnappedPoints = true;
 
        public static void main(String[] args) throws IOException
        {
@@ -58,13 +64,13 @@ public class ReserializeJSONsSettingUsages
                }
        }
 
-       public static void reserializeJSON(Path json, Scanner sysin)
+       public static void reserializeJSON(Path componentPath, Scanner sysin)
        {
                try
                {
                        DeserializedSubmodelComponent comp = (DeserializedSubmodelComponent) IndirectModelComponentCreator
-                                       .createComponent(new LogicModelModifiable(), "jsonfile:" + json.toString());
-                       System.out.println("Reserializing " + json);
+                                       .createComponent(new LogicModelModifiable(), "jsonfile:" + componentPath.toString());
+                       System.out.println("Reserializing " + componentPath);
                        if (changePinUsages)
                                comp.getSupermodelPins().entrySet().stream().sorted(Comparator.comparing(Entry::getKey)).map(Entry::getValue).forEach(pin ->
                                {
@@ -86,9 +92,9 @@ public class ReserializeJSONsSettingUsages
                                        setInterfacePinUsage(comp, pin, usage);
                                });
                        LogicModelModifiable submodelModifiable = comp.getSubmodelModifiable();
+                       Map<String, String> componentNameRemapping = new HashMap<>();
                        if (changeComponentNames)
                        {
-                               Map<String, String> componentNameRemapping = new HashMap<>();
                                componentNameRemapping.put(SubmodelComponent.SUBMODEL_INTERFACE_NAME, SubmodelComponent.SUBMODEL_INTERFACE_NAME);
                                LogicModelModifiable tempModel = new LogicModelModifiable();
                                IdentifyParams iP = new IdentifyParams();
@@ -126,21 +132,66 @@ public class ReserializeJSONsSettingUsages
 
                                Optional<ModelComponent> o;
                                while ((o = submodelModifiable.getComponentsByName().values().stream()
-                                               .filter(c -> !c.name.equals(SubmodelComponent.SUBMODEL_INTERFACE_NAME)).findAny()).isPresent())
+                                               .filter(c -> !c.getName().equals(SubmodelComponent.SUBMODEL_INTERFACE_NAME)).findAny()).isPresent())
                                        submodelModifiable.destroyComponent(o.get());
 
-                               tempModel.getComponentsByName().values().stream().filter(c -> !c.name.equals(SubmodelComponent.SUBMODEL_INTERFACE_NAME))
-                                               .forEach(c -> IndirectModelComponentCreator
-                                                               .createComponent(submodelModifiable, c.getIDForSerializing(iP), c.getParamsForSerializingJSON(iP), c.name)
-                                                               .moveTo(c.getPosX(), c.getPosY()));
+                               tempModel.getComponentsByName().values().stream()
+                                               .filter(c -> !c.getName().equals(SubmodelComponent.SUBMODEL_INTERFACE_NAME))
+                                               .forEach(c -> IndirectModelComponentCreator.createComponent(submodelModifiable, c.getIDForSerializing(iP),
+                                                               c.getParamsForSerializingJSON(iP), c.getName()).moveTo(c.getPosX(), c.getPosY()));
                                for (ModelWire w : tempModel.getWiresByName().values())
                                        createWire(Function.identity(), submodelModifiable, w);
                        }
-                       SubmodelComponentSerializer.serialize(comp, json.toString());
+                       if (snapWCPs)
+                               submodelModifiable.getComponentsByName().values().stream().filter(c -> c instanceof ModelWireCrossPoint).forEach(c ->
+                               {
+                                       double x = c.getPosX();
+                                       double y = c.getPosY();
+                                       c.moveTo(x % GRIDSIZE == 0 ? x - 1 : x, y % GRIDSIZE == 0 ? y - 1 : y);
+                               });
+                       if (warnNonSnappedPoints)
+                       {
+                               submodelModifiable.getComponentsByName().values().forEach(c ->
+                               {
+                                       double x = c.getPosX();
+                                       double y = c.getPosY();
+                                       if (c instanceof ModelWireCrossPoint)
+                                       {
+                                               x++;
+                                               y++;
+                                       }
+                                       if (x % GRIDSIZE != 0 || y % GRIDSIZE != 0)
+                                               System.out.println("  Component " + c.getName() + " (type " + c.getIDForSerializing(new IdentifyParams())
+                                                               + ") is not snapped to grid: " + x + "," + y);
+                               });
+                               submodelModifiable.getWiresByName().values().stream().forEach(w ->
+                               {
+                                       Point[] p = w.getPath();
+                                       if (p != null)
+                                               for (int i = 0; i < p.length; i++)
+                                                       if (p[i].x % GRIDSIZE != 0 || p[i].y % GRIDSIZE != 0)
+                                                               System.out.println(
+                                                                               "  Wire " + w.name + " path point #" + i + " is not snapped to grid: " + p[i].x + "," + p[i].y);
+                               });
+                               comp.getPins().values().forEach(p ->
+                               {
+                                       if (p.getRelX() % GRIDSIZE != 0 || p.getRelY() % GRIDSIZE != 0)
+                                               System.out.println("  Interface point " + p.name + " is not snapped to grid: " + p.getRelX() + "," + p.getRelY());
+                               });
+                       }
+                       SubmodelComponentSerializer.serialize(comp, componentPath.toString());
+                       if (changeComponentNames && (comp.getHighLevelStateHandler() == null
+                                       || !(comp.getHighLevelStateHandler() instanceof DefaultHighLevelStateHandler)))
+                       {
+                               System.out.println("  A non-default HighLevelStateHandler was detected. Check for changes there manually.");
+                               System.out.print("  Empty line to continue to next component, old component name to get new component name >");
+                               for (String line = sysin.nextLine(); !line.equals(""); line = sysin.nextLine())
+                                       System.out.println("  " + line + "->" + componentNameRemapping.get(line) + " >");
+                       }
                }
                catch (Exception e)
                {
-                       System.err.println("An error occurred visiting " + json + ":");
+                       System.err.println("An error occurred visiting " + componentPath + ":");
                        e.printStackTrace();
                }
        }
@@ -156,7 +207,7 @@ public class ReserializeJSONsSettingUsages
        private static Pin getRemappedPin(Function<String, String> componentNameRemapping, LogicModelModifiable tempModelForDefaultNames,
                        Pin pin)
        {
-               return tempModelForDefaultNames.getComponentsByName().get(componentNameRemapping.apply(pin.component.name)).getPin(pin.name);
+               return tempModelForDefaultNames.getComponentsByName().get(componentNameRemapping.apply(pin.component.getName())).getPin(pin.name);
        }
 
        private static int compareStringsWithIntegers(String a, String b)

diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/TestableAm2904.json b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/TestableAm2904.json
new file mode 100644 (file)
index 0000000..964d7d3
--- /dev/null
+++ b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/TestableAm2904.json
@@ -0,0 +1,846 @@
+{
+  "width": 0.0,
+  "height": 0.0,
+  "interfacePins": [
+    {
+      "location": {
+        "x": 10.0,
+        "y": 20.0
+      },
+      "name": "C",
+      "logicWidth": 1,
+      "usage": "INPUT"
+    },
+    {
+      "location": {
+        "x": 145.0,
+        "y": 125.0
+      },
+      "name": "C0",
+      "logicWidth": 1,
+      "usage": "OUTPUT"
+    },
+    {
+      "location": {
+        "x": 145.0,
+        "y": 75.0
+      },
+      "name": "CT",
+      "logicWidth": 1,
+      "usage": "OUTPUT"
+    },
+    {
+      "location": {
+        "x": 10.0,
+        "y": 125.0
+      },
+      "name": "Cx",
+      "logicWidth": 1,
+      "usage": "INPUT"
+    },
+    {
+      "location": {
+        "x": 10.0,
+        "y": 30.0
+      },
+      "name": "IC",
+      "logicWidth": 1,
+      "usage": "INPUT"
+    },
+    {
+      "location": {
+        "x": 10.0,
+        "y": 35.0
+      },
+      "name": "IN",
+      "logicWidth": 1,
+      "usage": "INPUT"
+    },
+    {
+      "location": {
+        "x": 10.0,
+        "y": 40.0
+      },
+      "name": "IOVR",
+      "logicWidth": 1,
+      "usage": "INPUT"
+    },
+    {
+      "location": {
+        "x": 10.0,
+        "y": 25.0
+      },
+      "name": "IZ",
+      "logicWidth": 1,
+      "usage": "INPUT"
+    },
+    {
+      "location": {
+        "x": -87.66482568016058,
+        "y": 58.834004835619645
+      },
+      "name": "I_10",
+      "logicWidth": 1,
+      "usage": "INPUT"
+    },
+    {
+      "location": {
+        "x": -80.0,
+        "y": 40.0
+      },
+      "name": "I_11_12",
+      "logicWidth": 2,
+      "usage": "INPUT"
+    },
+    {
+      "location": {
+        "x": -85.0,
+        "y": 100.0
+      },
+      "name": "I_5_0",
+      "logicWidth": 6,
+      "usage": "INPUT"
+    },
+    {
+      "location": {
+        "x": -84.26853373181032,
+        "y": 78.72500503091884
+      },
+      "name": "I_6_9",
+      "logicWidth": 4,
+      "usage": "INPUT"
+    },
+    {
+      "location": {
+        "x": 145.0,
+        "y": 145.0
+      },
+      "name": "QIO0",
+      "logicWidth": 1,
+      "usage": "TRISTATE"
+    },
+    {
+      "location": {
+        "x": 10.0,
+        "y": 145.0
+      },
+      "name": "QIOn",
+      "logicWidth": 1,
+      "usage": "TRISTATE"
+    },
+    {
+      "location": {
+        "x": 145.0,
+        "y": 135.0
+      },
+      "name": "SIO0",
+      "logicWidth": 1,
+      "usage": "TRISTATE"
+    },
+    {
+      "location": {
+        "x": 10.0,
+        "y": 135.0
+      },
+      "name": "SIOn",
+      "logicWidth": 1,
+      "usage": "TRISTATE"
+    },
+    {
+      "location": {
+        "x": 145.0,
+        "y": 30.0
+      },
+      "name": "YC",
+      "logicWidth": 1,
+      "usage": "TRISTATE"
+    },
+    {
+      "location": {
+        "x": 145.0,
+        "y": 35.0
+      },
+      "name": "YN",
+      "logicWidth": 1,
+      "usage": "TRISTATE"
+    },
+    {
+      "location": {
+        "x": 145.0,
+        "y": 40.0
+      },
+      "name": "YOVR",
+      "logicWidth": 1,
+      "usage": "TRISTATE"
+    },
+    {
+      "location": {
+        "x": 145.0,
+        "y": 25.0
+      },
+      "name": "YZ",
+      "logicWidth": 1,
+      "usage": "TRISTATE"
+    },
+    {
+      "location": {
+        "x": 10.0,
+        "y": 45.0
+      },
+      "name": "_CEM",
+      "logicWidth": 1,
+      "usage": "INPUT"
+    },
+    {
+      "location": {
+        "x": 10.0,
+        "y": 50.0
+      },
+      "name": "_CEmu",
+      "logicWidth": 1,
+      "usage": "INPUT"
+    },
+    {
+      "location": {
+        "x": 10.0,
+        "y": 60.0
+      },
+      "name": "_EC",
+      "logicWidth": 1,
+      "usage": "INPUT"
+    },
+    {
+      "location": {
+        "x": 10.0,
+        "y": 65.0
+      },
+      "name": "_EN",
+      "logicWidth": 1,
+      "usage": "INPUT"
+    },
+    {
+      "location": {
+        "x": 10.0,
+        "y": 70.0
+      },
+      "name": "_EOVR",
+      "logicWidth": 1,
+      "usage": "INPUT"
+    },
+    {
+      "location": {
+        "x": 10.0,
+        "y": 55.0
+      },
+      "name": "_EZ",
+      "logicWidth": 1,
+      "usage": "INPUT"
+    },
+    {
+      "location": {
+        "x": 145.0,
+        "y": 65.0
+      },
+      "name": "_OECT",
+      "logicWidth": 1,
+      "usage": "INPUT"
+    },
+    {
+      "location": {
+        "x": 80.0,
+        "y": 10.0
+      },
+      "name": "_OEY",
+      "logicWidth": 1,
+      "usage": "INPUT"
+    },
+    {
+      "location": {
+        "x": 10.0,
+        "y": 100.0
+      },
+      "name": "_SE",
+      "logicWidth": 1,
+      "usage": "INPUT"
+    }
+  ],
+  "innerScale": 1.0,
+  "submodel": {
+    "components": [
+      {
+        "id": "Merger",
+        "name": "Merger#0",
+        "pos": {
+          "x": -30.0,
+          "y": 70.0
+        },
+        "params": 13
+      },
+      {
+        "id": "Splitter",
+        "name": "Splitter#0",
+        "pos": {
+          "x": -45.0,
+          "y": 140.0
+        },
+        "params": 6
+      },
+      {
+        "id": "Splitter",
+        "name": "Splitter#1",
+        "pos": {
+          "x": -45.0,
+          "y": 100.0
+        },
+        "params": 4
+      },
+      {
+        "id": "Splitter",
+        "name": "Splitter#2",
+        "pos": {
+          "x": -45.0,
+          "y": 70.0
+        },
+        "params": 2
+      },
+      {
+        "id": "Am2904",
+        "name": "Am2904#0",
+        "pos": {
+          "x": 20.0,
+          "y": 15.0
+        }
+      }
+    ],
+    "wires": [
+      {
+        "pin1": {
+          "compName": "Am2904#0",
+          "pinName": "C"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "C"
+        },
+        "name": "unnamedWire#0",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "IZ"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "IZ"
+        },
+        "name": "unnamedWire#1",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "_EZ"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "_EZ"
+        },
+        "name": "unnamedWire#10",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "I_5_0"
+        },
+        "pin2": {
+          "compName": "Splitter#0",
+          "pinName": "I"
+        },
+        "name": "unnamedWire#11",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Merger#0",
+          "pinName": "I0"
+        },
+        "pin2": {
+          "compName": "Splitter#0",
+          "pinName": "O0"
+        },
+        "name": "unnamedWire#12",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#0",
+          "pinName": "O1"
+        },
+        "pin2": {
+          "compName": "Merger#0",
+          "pinName": "I1"
+        },
+        "name": "unnamedWire#13",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Merger#0",
+          "pinName": "I2"
+        },
+        "pin2": {
+          "compName": "Splitter#0",
+          "pinName": "O2"
+        },
+        "name": "unnamedWire#14",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#0",
+          "pinName": "O3"
+        },
+        "pin2": {
+          "compName": "Merger#0",
+          "pinName": "I3"
+        },
+        "name": "unnamedWire#15",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Merger#0",
+          "pinName": "I4"
+        },
+        "pin2": {
+          "compName": "Splitter#0",
+          "pinName": "O4"
+        },
+        "name": "unnamedWire#16",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#0",
+          "pinName": "O5"
+        },
+        "pin2": {
+          "compName": "Merger#0",
+          "pinName": "I5"
+        },
+        "name": "unnamedWire#17",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#1",
+          "pinName": "O0"
+        },
+        "pin2": {
+          "compName": "Merger#0",
+          "pinName": "I6"
+        },
+        "name": "unnamedWire#18",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Merger#0",
+          "pinName": "I7"
+        },
+        "pin2": {
+          "compName": "Splitter#1",
+          "pinName": "O1"
+        },
+        "name": "unnamedWire#19",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Am2904#0",
+          "pinName": "IC"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "IC"
+        },
+        "name": "unnamedWire#2",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#1",
+          "pinName": "O2"
+        },
+        "pin2": {
+          "compName": "Merger#0",
+          "pinName": "I8"
+        },
+        "name": "unnamedWire#20",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Merger#0",
+          "pinName": "I9"
+        },
+        "pin2": {
+          "compName": "Splitter#1",
+          "pinName": "O3"
+        },
+        "name": "unnamedWire#21",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#2",
+          "pinName": "O0"
+        },
+        "pin2": {
+          "compName": "Merger#0",
+          "pinName": "I11"
+        },
+        "name": "unnamedWire#22",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Merger#0",
+          "pinName": "I12"
+        },
+        "pin2": {
+          "compName": "Splitter#2",
+          "pinName": "O1"
+        },
+        "name": "unnamedWire#23",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "I_6_9"
+        },
+        "pin2": {
+          "compName": "Splitter#1",
+          "pinName": "I"
+        },
+        "name": "unnamedWire#24",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Merger#0",
+          "pinName": "O"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "I"
+        },
+        "name": "unnamedWire#25",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "I_10"
+        },
+        "pin2": {
+          "compName": "Merger#0",
+          "pinName": "I10"
+        },
+        "name": "unnamedWire#26",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "I_11_12"
+        },
+        "pin2": {
+          "compName": "Splitter#2",
+          "pinName": "I"
+        },
+        "name": "unnamedWire#27",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "_SE"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "_SE"
+        },
+        "name": "unnamedWire#28",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "Cx"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "Cx"
+        },
+        "name": "unnamedWire#29",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "IN"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "IN"
+        },
+        "name": "unnamedWire#3",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "SIOn"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "SIOn"
+        },
+        "name": "unnamedWire#30",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "QIOn"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "QIOn"
+        },
+        "name": "unnamedWire#31",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "QIO0"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "QIO0"
+        },
+        "name": "unnamedWire#32",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "SIO0"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "SIO0"
+        },
+        "name": "unnamedWire#33",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "C0"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "C0"
+        },
+        "name": "unnamedWire#34",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "CT"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "CT"
+        },
+        "name": "unnamedWire#35",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "_OECT"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "_OECT"
+        },
+        "name": "unnamedWire#36",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "YOVR"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "YOVR"
+        },
+        "name": "unnamedWire#37",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "YN"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "YN"
+        },
+        "name": "unnamedWire#38",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "YC"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "YC"
+        },
+        "name": "unnamedWire#39",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Am2904#0",
+          "pinName": "IOVR"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "IOVR"
+        },
+        "name": "unnamedWire#4",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "YZ"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "YZ"
+        },
+        "name": "unnamedWire#40",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "_OEY"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "_OEY"
+        },
+        "name": "unnamedWire#41",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "_CEM"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "_CEM"
+        },
+        "name": "unnamedWire#5",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Am2904#0",
+          "pinName": "_CEmu"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "_CEmu"
+        },
+        "name": "unnamedWire#6",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "_EC"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "_EC"
+        },
+        "name": "unnamedWire#7",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Am2904#0",
+          "pinName": "_EN"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "_EN"
+        },
+        "name": "unnamedWire#8",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "_EOVR"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "_EOVR"
+        },
+        "name": "unnamedWire#9",
+        "path": []
+      }
+    ],
+    "version": "0.1.1"
+  },
+  "symbolRendererSnippetID": "default",
+  "outlineRendererSnippetID": "default",
+  "highLevelStateHandlerSnippetID": "standard",
+  "highLevelStateHandlerParams": {
+    "subcomponentHighLevelStates": {
+      "musr": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "Am2904#0",
+          "prefix": "musr"
+        }
+      },
+      "msr": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "Am2904#0",
+          "prefix": "msr"
+        }
+      }
+    },
+    "atomicHighLevelStates": {}
+  },
+  "version": "0.1.5"
+}
\ No newline at end of file

diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/TestableAm2904Impl.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/TestableAm2904Impl.java
index 677a3e1..b43f130 100644 (file)
--- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/TestableAm2904Impl.java
+++ b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/TestableAm2904Impl.java
@@ -13,7 +13,10 @@ public class TestableAm2904Impl implements TestableAm2904
 {
 
        private ModelComponent am2904;
-       private CoreManualSwitch I;
+       private CoreManualSwitch I_5_0;
+       private CoreManualSwitch I_6_9;
+       private CoreManualSwitch I_10;
+       private CoreManualSwitch I_11_12;
        private CoreManualSwitch C;
        private CoreManualSwitch Cx;
        private CoreManualSwitch IC, IN, IOVR, IZ;
@@ -26,7 +29,8 @@ public class TestableAm2904Impl implements TestableAm2904
        private SwitchWithDisplay SIO0, SIOn, QIO0, QIOn;
        private SwitchWithDisplay YC, YN, YOVR, YZ;
 
-       private final TestEnvironmentHelper testHelper = new TestEnvironmentHelper(this, "Am2904");
+       private final TestEnvironmentHelper testHelper = new TestEnvironmentHelper(this,
+                       "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/am2904/TestableAm2904.json");
 
        @Override
        public void setup()
@@ -52,33 +56,25 @@ public class TestableAm2904Impl implements TestableAm2904
        @Override
        public void setInstruction(Am2904_Inst inst)
        {
-               var old = I.getValues();
-               var newPart = BitVector.from(inst.ordinal(), 6);
-               I.setState(old.subVector(0, 7).concat(newPart));
+               I_5_0.setState(BitVector.from(inst.ordinal(), 6));
        }
 
        @Override
        public void setShiftCode(String val_4_bit)
        {
-               var old = I.getValues();
-               var newPart = BitVector.parse(val_4_bit);
-               I.setState(old.subVector(0, 3).concat(newPart).concat(old.subVector(7)));
+               I_6_9.setState(BitVector.parse(val_4_bit));
        }
 
        @Override
        public void setI10(Am2904_ShiftDir dir)
        {
-               var old = I.getValues();
-               var newPart = BitVector.from(dir.ordinal(), 1);
-               I.setState(old.subVector(0, 2).concat(newPart).concat(old.subVector(3)));
+               I_10.setState(BitVector.from(dir.ordinal(), 1));
        }
 
        @Override
        public void setCarry(Am2904_Carry carry)
        {
-               var old = I.getValues();
-               var newPart = BitVector.from(carry.ordinal(), 2);
-               I.setState(newPart.concat(old.subVector(2)));
+               I_11_12.setState(BitVector.from(carry.ordinal(), 2));
        }
 
        @Override

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUICanvas.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUICanvas.java
index b14a69e..15346c6 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUICanvas.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUICanvas.java
@@ -38,7 +38,7 @@ import net.mograsim.preferences.Preferences;
  */
 public class LogicUICanvas extends ZoomableCanvas
 {
-       private static final boolean OPEN_DEBUG_SETHIGHLEVELSTATE_SHELL = true;
+       private static final boolean OPEN_DEBUG_SETHIGHLEVELSTATE_SHELL = false;
 
        private final LogicModel model;
 
@@ -224,11 +224,11 @@ public class LogicUICanvas extends ZoomableCanvas
        private void addComponentSelectorItems(List<ModelComponent> componentsByItemIndex, String base, Combo componentSelector,
                        LogicModel model)
        {
-               model.getComponentsByName().values().stream().sorted((c1, c2) -> c1.name.compareTo(c2.name)).forEach(c ->
+               model.getComponentsByName().values().stream().sorted((c1, c2) -> c1.getName().compareTo(c2.getName())).forEach(c ->
                {
                        if (!(c instanceof ModelWireCrossPoint || c instanceof SubmodelInterface))
                        {
-                               String item = base + c.name;
+                               String item = base + c.getName();
                                componentsByItemIndex.add(c);
                                componentSelector.add(item);
                                if (c instanceof SubmodelComponent)

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/LogicModel.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/LogicModel.java
index 227d9b1..839d5f9 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/LogicModel.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/LogicModel.java
@@ -51,10 +51,10 @@ public class LogicModel
         */
        protected void componentCreated(ModelComponent component, Runnable destroyed)
        {
-               if (components.containsKey(component.name))
+               if (components.containsKey(component.getName()))
                        throw new IllegalStateException("Don't add the same component twice!");
-               components.put(component.name, component);
-               componentDestroyFunctions.put(component.name, destroyed);
+               components.put(component.getName(), component);
+               componentDestroyFunctions.put(component.getName(), destroyed);
                callComponentAddedListeners(component);
                requestRedraw();
        }
@@ -66,10 +66,10 @@ public class LogicModel
         */
        protected void destroyComponent(ModelComponent component)
        {
-               componentDestroyFunctions.get(component.name).run();
-               if (!components.containsKey(component.name))
+               componentDestroyFunctions.get(component.getName()).run();
+               if (!components.containsKey(component.getName()))
                        throw new IllegalStateException("Don't remove the same component twice!");
-               components.remove(component.name);
+               components.remove(component.getName());
                callComponentRemovedListeners(component);
                requestRedraw();
        }

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/ModelComponent.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/ModelComponent.java
index 6fcfa9a..9171ee8 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/ModelComponent.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/ModelComponent.java
@@ -30,9 +30,10 @@ public abstract class ModelComponent implements JSONSerializable
         */
        protected final LogicModelModifiable model;
        /**
-        * The name of this component. Is unique for all components in its model.
+        * The name of this component. Is unique for all components in its model.<br>
+        * Does never change, but can't be final since it is set in {@link #init()}.
         */
-       public final String name;
+       private String name;
        private final Rectangle bounds;
        /**
         * The list of all pins of this component by name.
@@ -66,7 +67,7 @@ public abstract class ModelComponent implements JSONSerializable
        protected ModelComponent(LogicModelModifiable model, String name, boolean callInit)
        {
                this.model = model;
-               this.name = name == null ? model.getDefaultComponentName(this) : name;
+               this.name = name;
                this.bounds = new Rectangle(0, 0, 0, 0);
                this.pinsByName = new HashMap<>();
                this.pinsUnmodifiable = Collections.unmodifiableMap(pinsByName);
@@ -82,13 +83,25 @@ public abstract class ModelComponent implements JSONSerializable
 
        /**
         * Initializes this component. This method should be called exactly once in this component's constructor.<br>
-        * Currently, this method only registers this component in the model.
+        * <ul>
+        * <li>If <code>{@link #name}==null</code>, sets {@link #name} to {@link LogicModelModifiable#getDefaultComponentName(ModelComponent)}.
+        * <li>Registers this component in the model.
+        * </ul>
         */
        protected void init()
        {
+               if (name == null)
+                       name = model.getDefaultComponentName(this);
                model.componentCreated(this, this::destroyed);
        }
 
+       // basic getters
+
+       public String getName()
+       {
+               return name;
+       }
+
        /**
         * Destroys this component. This method is called from {@link LogicModelModifiable#componentDestroyed(ModelComponent)
         * destroyComponent()} of the model this component is a part of.<br>

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/LegacySubmodelComponentSerializer.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/LegacySubmodelComponentSerializer.java
index b41fc52..93fc945 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/LegacySubmodelComponentSerializer.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/LegacySubmodelComponentSerializer.java
@@ -234,7 +234,7 @@ public final class LegacySubmodelComponentSerializer
                        innerComponentParams.pos = new Point(innerComponent.getPosX(), innerComponent.getPosY());
                        innerComponentParams.id = innerComponent.getIDForSerializing(idParams);
                        innerComponentParams.params = innerComponent.getParamsForSerializingJSON(idParams);
-                       innerComponentParams.name = innerComponent.name;
+                       innerComponentParams.name = innerComponent.getName();
                        i1++;
                }
                submodelParams.subComps = componentParams;
@@ -249,9 +249,9 @@ public final class LegacySubmodelComponentSerializer
                        LegacyInnerPinParams pin1Params = new LegacyInnerPinParams(), pin2Params = new LegacyInnerPinParams();
 
                        pin1Params.pinName = innerWire.getPin1().name;
-                       pin1Params.compName = innerWire.getPin1().component.name;
+                       pin1Params.compName = innerWire.getPin1().component.getName();
                        pin2Params.pinName = innerWire.getPin2().name;
-                       pin2Params.compName = innerWire.getPin2().component.name;
+                       pin2Params.compName = innerWire.getPin2().component.getName();
                        innerWireParams.name = innerWire.name;
                        innerWireParams.pin1 = pin1Params;
                        innerWireParams.pin2 = pin2Params;

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/LogicModelSerializer.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/LogicModelSerializer.java
index f871c87..97b84ce 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/LogicModelSerializer.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/LogicModelSerializer.java
@@ -142,7 +142,7 @@ public class LogicModelSerializer
                        compParams.pos = new Point(component.getPosX(), component.getPosY());
                        compParams.id = component.getIDForSerializing(idParams);
                        compParams.params = component.getParamsForSerializingJSON(idParams);
-                       compParams.name = component.name;
+                       compParams.name = component.getName();
                }
                modelParams.components = componentsParams.toArray(ComponentParams[]::new);
                Arrays.sort(modelParams.components, Comparator.comparing(c -> c.name));
@@ -156,9 +156,9 @@ public class LogicModelSerializer
                        PinParams pin1Params = new PinParams(), pin2Params = new PinParams();
 
                        pin1Params.pinName = innerWire.getPin1().name;
-                       pin1Params.compName = innerWire.getPin1().component.name;
+                       pin1Params.compName = innerWire.getPin1().component.getName();
                        pin2Params.pinName = innerWire.getPin2().name;
-                       pin2Params.compName = innerWire.getPin2().component.name;
+                       pin2Params.compName = innerWire.getPin2().component.getName();
                        innerWireParams.name = innerWire.name;
                        innerWireParams.pin1 = pin1Params;
                        innerWireParams.pin2 = pin2Params;

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/atomic/DelegatingAtomicHighLevelStateHandler.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/atomic/DelegatingAtomicHighLevelStateHandler.java
index 7a56882..621dde3 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/atomic/DelegatingAtomicHighLevelStateHandler.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/atomic/DelegatingAtomicHighLevelStateHandler.java
@@ -42,7 +42,7 @@ public class DelegatingAtomicHighLevelStateHandler implements AtomicHighLevelSta
        {
                if (delegateTarget == null)
                        this.delegateTarget = parentComponent;
-               else if (parentComponent.submodel.getComponentsByName().get(delegateTarget.name) != delegateTarget)
+               else if (parentComponent.submodel.getComponentsByName().get(delegateTarget.getName()) != delegateTarget)
                        throw new IllegalArgumentException(
                                        "Can only set components belonging to the submodel of the parent component of this handler as the delegate target");
                this.delegateTarget = delegateTarget;
@@ -75,7 +75,7 @@ public class DelegatingAtomicHighLevelStateHandler implements AtomicHighLevelSta
        public DelegatingAtomicHighLevelStateHandlerParams getParamsForSerializing(IdentifyParams idParams)
        {
                DelegatingAtomicHighLevelStateHandlerParams params = new DelegatingAtomicHighLevelStateHandlerParams();
-               params.delegateTarget = delegateTarget.name;
+               params.delegateTarget = delegateTarget.getName();
                params.subStateID = subStateID;
                return params;
        }

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/subcomponent/DelegatingSubcomponentHighLevelStateHandler.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/subcomponent/DelegatingSubcomponentHighLevelStateHandler.java
index 0d1fd65..fc3c6bd 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/subcomponent/DelegatingSubcomponentHighLevelStateHandler.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/subcomponent/DelegatingSubcomponentHighLevelStateHandler.java
@@ -43,7 +43,7 @@ public class DelegatingSubcomponentHighLevelStateHandler implements Subcomponent
        {
                if (delegateTarget == null)
                        this.delegateTarget = parentComponent;
-               else if (parentComponent.submodel.getComponentsByName().get(delegateTarget.name) != delegateTarget)
+               else if (parentComponent.submodel.getComponentsByName().get(delegateTarget.getName()) != delegateTarget)
                        throw new IllegalArgumentException(
                                        "Can only set components belonging to the submodel of the parent component of this handler as the delegate target");
                this.delegateTarget = delegateTarget;
@@ -81,7 +81,7 @@ public class DelegatingSubcomponentHighLevelStateHandler implements Subcomponent
        public DelegatingSubcomponentHighLevelStateHandlerParams getParamsForSerializing(IdentifyParams idParams)
        {
                DelegatingSubcomponentHighLevelStateHandlerParams params = new DelegatingSubcomponentHighLevelStateHandlerParams();
-               params.delegateTarget = delegateTarget.name;
+               params.delegateTarget = delegateTarget.getName();
                params.prefix = prefix;
                return params;
        }

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/util/JsonHandler.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/util/JsonHandler.java
index 0f151b9..20491ce 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/util/JsonHandler.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/util/JsonHandler.java
@@ -6,6 +6,7 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.stream.Collectors;
 
 import com.google.gson.Gson;
@@ -29,7 +30,8 @@ public class JsonHandler
         */
        public static <T> T readJson(InputStream input, Class<T> type) throws IOException
        {
-               try (InputStreamReader reader = new InputStreamReader(input); BufferedReader bf = new BufferedReader(reader))
+               try (InputStreamReader reader = new InputStreamReader(input, StandardCharsets.UTF_8);
+                               BufferedReader bf = new BufferedReader(reader))
                {
                        return fromJson(bf.lines().collect(Collectors.joining("\n")), type);
                }
@@ -64,4 +66,4 @@ public class JsonHandler
        {
                return parser.toJsonTree(o);
        }
-}
+}
\ No newline at end of file

diff --git a/net.mograsim.plugin.feature/feature.xml b/net.mograsim.plugin.feature/feature.xml
index 8be2c4e..7e12101 100644 (file)
--- a/net.mograsim.plugin.feature/feature.xml
+++ b/net.mograsim.plugin.feature/feature.xml
@@ -760,4 +760,11 @@ exception as provided by Oracle in the LICENSE file that accompanied this code.&
          version="0.1.0.qualifier"
          unpack="false"/>
 
+   <plugin
+         id="net.mograsim.machine"
+         download-size="1"
+         install-size="1"
+         version="0.1.0.qualifier"
+         unpack="false"/>
+
 </feature>