Redo reserializing components since the problem doesn't lie there

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

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 70fbac0..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
@@ -403,78 +403,6 @@
           "orientation": "RIGHT_ALT"
         }
       },
-      {
-        "id": "and",
-        "name": "and#0",
-        "pos": {
-          "x": 190.0,
-          "y": 65.0
-        }
-      },
-      {
-        "id": "dff4",
-        "name": "dff4#0",
-        "pos": {
-          "x": 90.0,
-          "y": 2490.0
-        }
-      },
-      {
-        "id": "dlatch4",
-        "name": "dlatch4#0",
-        "pos": {
-          "x": 160.0,
-          "y": 2220.0
-        }
-      },
-      {
-        "id": "dlatch4",
-        "name": "dlatch4#1",
-        "pos": {
-          "x": 160.0,
-          "y": 2275.0
-        }
-      },
-      {
-        "id": "mux1_4",
-        "name": "mux1_4#0",
-        "pos": {
-          "x": 275.0,
-          "y": 135.0
-        }
-      },
-      {
-        "id": "or4",
-        "name": "or4#0",
-        "pos": {
-          "x": 275.0,
-          "y": 445.0
-        }
-      },
-      {
-        "id": "ram4",
-        "name": "ram4#0",
-        "pos": {
-          "x": 95.0,
-          "y": 2220.0
-        }
-      },
-      {
-        "id": "sel3_4",
-        "name": "sel3_4#0",
-        "pos": {
-          "x": 45.0,
-          "y": 2310.0
-        }
-      },
-      {
-        "id": "sel3_4",
-        "name": "sel3_4#1",
-        "pos": {
-          "x": 45.0,
-          "y": 2510.0
-        }
-      },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
@@ -906,6 +834,78 @@
           "y": 2244.0
         },
         "params": 1
+      },
+      {
+        "id": "and",
+        "name": "and#0",
+        "pos": {
+          "x": 190.0,
+          "y": 65.0
+        }
+      },
+      {
+        "id": "dff4",
+        "name": "dff4#0",
+        "pos": {
+          "x": 90.0,
+          "y": 2490.0
+        }
+      },
+      {
+        "id": "dlatch4",
+        "name": "dlatch4#0",
+        "pos": {
+          "x": 160.0,
+          "y": 2220.0
+        }
+      },
+      {
+        "id": "dlatch4",
+        "name": "dlatch4#1",
+        "pos": {
+          "x": 160.0,
+          "y": 2275.0
+        }
+      },
+      {
+        "id": "mux1_4",
+        "name": "mux1_4#0",
+        "pos": {
+          "x": 275.0,
+          "y": 135.0
+        }
+      },
+      {
+        "id": "or4",
+        "name": "or4#0",
+        "pos": {
+          "x": 275.0,
+          "y": 445.0
+        }
+      },
+      {
+        "id": "ram4",
+        "name": "ram4#0",
+        "pos": {
+          "x": 95.0,
+          "y": 2220.0
+        }
+      },
+      {
+        "id": "sel3_4",
+        "name": "sel3_4#0",
+        "pos": {
+          "x": 45.0,
+          "y": 2310.0
+        }
+      },
+      {
+        "id": "sel3_4",
+        "name": "sel3_4#1",
+        "pos": {
+          "x": 45.0,
+          "y": 2510.0
+        }
       }
     ],
     "wires": [
@@ -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",