X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fam2904%2FAm2904MSR.json;h=927d41f8ebb17ff02dc83b4ed10cd14899df248f;hb=ad841126238b8b7653a311a9c89d3dada18ce3c5;hp=eff06115e4e34a260e0deb103d9662c6b4eb8bcd;hpb=b32414f8406634aca730d724a011023c0da8bf22;p=Mograsim.git

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 eff06115..927d41f8 100644
--- 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,103 +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
-        },
-        "params": 4
-      },
       {
         "id": "NandGate",
         "name": "NandGate#0",
         "pos": {
-          "x": 325.0,
-          "y": 90.0
+          "x": 170.0,
+          "y": 55.0
         },
         "params": 1
       },
@@ -211,41 +130,65 @@
           "x": 5.0,
           "y": 35.0
         },
-        "params": 4
+        "params": {
+          "logicWidth": 4,
+          "orientation": "RIGHT"
+        }
       },
       {
         "id": "Splitter",
         "name": "Splitter#1",
         "pos": {
           "x": 5.0,
-          "y": 165.0
+          "y": 135.0
         },
-        "params": 4
+        "params": {
+          "logicWidth": 4,
+          "orientation": "RIGHT"
+        }
       },
       {
         "id": "Splitter",
         "name": "Splitter#2",
         "pos": {
           "x": 45.0,
-          "y": 425.0
+          "y": 340.0
         },
-        "params": 3
+        "params": {
+          "logicWidth": 3,
+          "orientation": "RIGHT"
+        }
       },
       {
         "id": "Splitter",
         "name": "Splitter#3",
         "pos": {
           "x": 5.0,
-          "y": 295.0
+          "y": 235.0
+        },
+        "params": {
+          "logicWidth": 4,
+          "orientation": "RIGHT"
+        }
+      },
+      {
+        "id": "Splitter",
+        "name": "Splitter#4",
+        "pos": {
+          "x": 385.0,
+          "y": 85.0
         },
-        "params": 4
+        "params": {
+          "logicWidth": 4,
+          "orientation": "LEFT"
+        }
       },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
         "pos": {
-          "x": 29.0,
-          "y": 284.0
+          "x": 19.0,
+          "y": 224.0
         },
         "params": 1
       },
@@ -253,8 +196,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#1",
         "pos": {
-          "x": 414.0,
-          "y": 174.0
+          "x": 364.0,
+          "y": 84.0
         },
         "params": 1
       },
@@ -262,8 +205,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#10",
         "pos": {
-          "x": 89.0,
-          "y": 84.0
+          "x": 74.0,
+          "y": 54.0
         },
         "params": 1
       },
@@ -271,8 +214,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#11",
         "pos": {
-          "x": 89.0,
-          "y": 94.0
+          "x": 74.0,
+          "y": 64.0
         },
         "params": 1
       },
@@ -280,8 +223,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#12",
         "pos": {
-          "x": 19.0,
-          "y": 294.0
+          "x": 34.0,
+          "y": 234.0
         },
         "params": 1
       },
@@ -289,8 +232,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#13",
         "pos": {
-          "x": 194.0,
-          "y": 234.0
+          "x": 124.0,
+          "y": 174.0
         },
         "params": 1
       },
@@ -298,8 +241,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#14",
         "pos": {
-          "x": 89.0,
-          "y": 104.0
+          "x": 74.0,
+          "y": 74.0
         },
         "params": 1
       },
@@ -307,8 +250,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#15",
         "pos": {
-          "x": 319.0,
-          "y": 294.0
+          "x": 164.0,
+          "y": 59.0
         },
         "params": 1
       },
@@ -316,8 +259,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#16",
         "pos": {
-          "x": 319.0,
-          "y": 104.0
+          "x": 269.0,
+          "y": 39.0
         },
         "params": 1
       },
@@ -325,8 +268,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#2",
         "pos": {
-          "x": 419.0,
-          "y": 184.0
+          "x": 369.0,
+          "y": 94.0
         },
         "params": 1
       },
@@ -334,8 +277,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#3",
         "pos": {
-          "x": 424.0,
-          "y": 194.0
+          "x": 374.0,
+          "y": 104.0
         },
         "params": 1
       },
@@ -343,8 +286,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#4",
         "pos": {
-          "x": 429.0,
-          "y": 204.0
+          "x": 379.0,
+          "y": 114.0
         },
         "params": 1
       },
@@ -352,8 +295,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#5",
         "pos": {
-          "x": 84.0,
-          "y": 344.0
+          "x": 29.0,
+          "y": 284.0
         },
         "params": 1
       },
@@ -361,8 +304,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#6",
         "pos": {
-          "x": 94.0,
-          "y": 364.0
+          "x": 39.0,
+          "y": 304.0
         },
         "params": 1
       },
@@ -370,8 +313,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#7",
         "pos": {
-          "x": 29.0,
-          "y": 254.0
+          "x": 19.0,
+          "y": 194.0
         },
         "params": 1
       },
@@ -379,8 +322,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#8",
         "pos": {
-          "x": 74.0,
-          "y": 314.0
+          "x": 79.0,
+          "y": 254.0
         },
         "params": 1
       },
@@ -388,18 +331,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 +430,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 +447,16 @@
         "name": "unnamedWire#1",
         "path": [
           {
-            "x": 355.0,
+            "x": 200.0,
             "y": 30.0
           },
           {
-            "x": 355.0,
-            "y": 215.0
+            "x": 305.0,
+            "y": 30.0
+          },
+          {
+            "x": 305.0,
+            "y": 125.0
           }
         ]
       },
@@ -483,7 +486,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I0_1"
         },
         "pin2": {
@@ -494,7 +497,7 @@
         "path": [
           {
             "x": 35.0,
-            "y": 125.0
+            "y": 95.0
           },
           {
             "x": 35.0,
@@ -508,7 +511,7 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I0_2"
         },
         "name": "unnamedWire#13",
@@ -519,7 +522,7 @@
           },
           {
             "x": 30.0,
-            "y": 135.0
+            "y": 105.0
           }
         ]
       },
@@ -529,7 +532,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I0_3"
         },
         "name": "unnamedWire#14",
@@ -540,7 +543,7 @@
           },
           {
             "x": 25.0,
-            "y": 145.0
+            "y": 115.0
           }
         ]
       },
@@ -550,7 +553,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I0_4"
         },
         "name": "unnamedWire#15",
@@ -561,7 +564,7 @@
           },
           {
             "x": 20.0,
-            "y": 155.0
+            "y": 125.0
           }
         ]
       },
@@ -571,7 +574,7 @@
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I1_1"
         },
         "name": "unnamedWire#16",
@@ -579,7 +582,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I1_2"
         },
         "pin2": {
@@ -595,7 +598,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I1_3"
         },
         "name": "unnamedWire#18",
@@ -603,7 +606,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "I1_4"
         },
         "pin2": {
@@ -625,16 +628,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 +651,7 @@
           "pinName": "I"
         },
         "name": "unnamedWire#20",
-        "path": [
-          {
-            "x": 40.0,
-            "y": 435.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
@@ -685,18 +683,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 +711,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": {
@@ -755,16 +753,16 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Merger#0",
-          "pinName": "I2"
+          "compName": "Splitter#4",
+          "pinName": "O2"
         },
         "name": "unnamedWire#27",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Merger#0",
-          "pinName": "I3"
+          "compName": "Splitter#4",
+          "pinName": "O3"
         },
         "pin2": {
           "compName": "WireCrossPoint#1",
@@ -791,32 +789,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 +822,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 +834,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 +846,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 +862,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 +893,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 +908,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 +939,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 +962,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "mux1_4#1",
           "pinName": "I0_4"
         },
         "pin2": {
@@ -974,8 +972,8 @@
         "name": "unnamedWire#39",
         "path": [
           {
-            "x": 85.0,
-            "y": 325.0
+            "x": 30.0,
+            "y": 265.0
           }
         ]
       },
@@ -991,16 +989,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 +1008,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 +1043,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 +1058,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "mux1_4#1",
           "pinName": "S0"
         },
         "name": "unnamedWire#43",
@@ -1068,11 +1066,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 +1088,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 +1107,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 +1119,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 +1135,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "mux1_4#2",
           "pinName": "I0_4"
         },
         "name": "unnamedWire#49",
@@ -1145,8 +1143,8 @@
       },
       {
         "pin1": {
-          "compName": "Merger#0",
-          "pinName": "O"
+          "compName": "Splitter#4",
+          "pinName": "I"
         },
         "pin2": {
           "compName": "_submodelinterface",
@@ -1181,7 +1179,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "mux1_4#2",
           "pinName": "I0_3"
         },
         "pin2": {
@@ -1197,7 +1195,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "mux1_4#2",
           "pinName": "I0_2"
         },
         "name": "unnamedWire#53",
@@ -1205,7 +1203,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "mux1_4#2",
           "pinName": "I0_1"
         },
         "pin2": {
@@ -1215,14 +1213,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 +1232,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "not4#0",
           "pinName": "A2"
         },
         "pin2": {
@@ -1250,7 +1248,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "mux1_4#1",
           "pinName": "I0_1"
         },
         "name": "unnamedWire#57",
@@ -1274,14 +1272,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 +1297,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 +1309,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#3",
           "pinName": "I0_3"
         },
         "pin2": {
@@ -1321,8 +1319,8 @@
         "name": "unnamedWire#61",
         "path": [
           {
-            "x": 75.0,
-            "y": 265.0
+            "x": 80.0,
+            "y": 205.0
           }
         ]
       },
@@ -1332,28 +1330,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 +1359,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 +1371,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 +1383,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 +1405,8 @@
         "name": "unnamedWire#67",
         "path": [
           {
-            "x": 195.0,
-            "y": 435.0
+            "x": 125.0,
+            "y": 350.0
           }
         ]
       },
@@ -1418,7 +1416,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#3",
           "pinName": "S0"
         },
         "name": "unnamedWire#68",
@@ -1430,18 +1428,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
           }
         ]
       },
@@ -1451,15 +1449,15 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Merger#0",
-          "pinName": "I0"
+          "compName": "Splitter#4",
+          "pinName": "O0"
         },
         "name": "unnamedWire#7",
         "path": []
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "mux1_4#4",
           "pinName": "Y4"
         },
         "pin2": {
@@ -1469,12 +1467,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 +1482,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 +1509,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 +1532,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 +1561,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 +1573,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 +1585,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,50 +1597,50 @@
       },
       {
         "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
           }
         ]
       },
       {
         "pin1": {
-          "compName": "Merger#0",
-          "pinName": "I1"
+          "compName": "Splitter#4",
+          "pinName": "O1"
         },
         "pin2": {
           "compName": "WireCrossPoint#3",
@@ -1653,43 +1651,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 +1697,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 +1718,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 +1768,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 +1828,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 +1843,7 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "and#0",
           "pinName": "B"
         },
         "name": "unnamedWire#89",
@@ -1848,15 +1863,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 +1884,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 +1901,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "mux1_4#0",
           "pinName": "S0"
         },
         "name": "unnamedWire#93",