Undo reserializing components since something broke

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

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 91d1220..3a1507a 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,6 +69,30 @@
   "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",
@@ -80,7 +104,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
+        "name": "WireCrossPoint#1",
         "pos": {
           "x": 24.0,
           "y": 29.0
@@ -89,7 +113,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
+        "name": "WireCrossPoint#2",
         "pos": {
           "x": 24.0,
           "y": 49.0
@@ -98,46 +122,22 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
+        "name": "WireCrossPoint#3",
         "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#0",
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "name": "unnamedWire#0",
@@ -145,7 +145,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "pin2": {
@@ -157,7 +157,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "pin2": {
@@ -169,11 +169,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "pin2": {
-          "compName": "sel1#0",
+          "compName": "DeserializedSubmodelComponent#0",
           "pinName": "S2"
         },
         "name": "unnamedWire#11",
@@ -181,11 +181,11 @@
       },
       {
         "pin1": {
-          "compName": "sel1#0",
+          "compName": "DeserializedSubmodelComponent#0",
           "pinName": "S1"
         },
         "pin2": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "name": "unnamedWire#14",
@@ -193,7 +193,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "pin2": {
@@ -210,11 +210,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "pin2": {
-          "compName": "sel1#1",
+          "compName": "DeserializedSubmodelComponent#1",
           "pinName": "S2"
         },
         "name": "unnamedWire#16",
@@ -227,11 +227,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "pin2": {
-          "compName": "sel1#1",
+          "compName": "DeserializedSubmodelComponent#1",
           "pinName": "S1"
         },
         "name": "unnamedWire#17",
@@ -244,7 +244,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "pin2": {
@@ -265,7 +265,7 @@
           "pinName": "I00"
         },
         "pin2": {
-          "compName": "sel1#0",
+          "compName": "DeserializedSubmodelComponent#0",
           "pinName": "I1"
         },
         "name": "unnamedWire#2",
@@ -286,7 +286,7 @@
           "pinName": "I01"
         },
         "pin2": {
-          "compName": "sel1#0",
+          "compName": "DeserializedSubmodelComponent#0",
           "pinName": "I2"
         },
         "name": "unnamedWire#3",
@@ -307,7 +307,7 @@
           "pinName": "I10"
         },
         "pin2": {
-          "compName": "sel1#1",
+          "compName": "DeserializedSubmodelComponent#1",
           "pinName": "I1"
         },
         "name": "unnamedWire#4",
@@ -319,7 +319,7 @@
           "pinName": "I11"
         },
         "pin2": {
-          "compName": "sel1#1",
+          "compName": "DeserializedSubmodelComponent#1",
           "pinName": "I2"
         },
         "name": "unnamedWire#5",
@@ -336,7 +336,7 @@
       },
       {
         "pin1": {
-          "compName": "mux1#0",
+          "compName": "DeserializedSubmodelComponent#2",
           "pinName": "Y"
         },
         "pin2": {
@@ -348,11 +348,11 @@
       },
       {
         "pin1": {
-          "compName": "sel1#0",
+          "compName": "DeserializedSubmodelComponent#0",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "mux1#0",
+          "compName": "DeserializedSubmodelComponent#2",
           "pinName": "I0"
         },
         "name": "unnamedWire#7",
@@ -369,11 +369,11 @@
       },
       {
         "pin1": {
-          "compName": "sel1#1",
+          "compName": "DeserializedSubmodelComponent#1",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "mux1#0",
+          "compName": "DeserializedSubmodelComponent#2",
           "pinName": "I1"
         },
         "name": "unnamedWire#8",
@@ -394,7 +394,7 @@
           "pinName": "S1"
         },
         "pin2": {
-          "compName": "mux1#0",
+          "compName": "DeserializedSubmodelComponent#2",
           "pinName": "S0"
         },
         "name": "unnamedWire#9",