Fixed a bug in Am2900; created dlatch8/80; relayouted some components

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

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 7faf69d..2949d8d 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
@@ -105,15 +105,6 @@
   "innerScale": 0.2,
   "submodel": {
     "components": [
-      {
-        "id": "Merger",
-        "name": "Merger#0",
-        "pos": {
-          "x": 230.0,
-          "y": 30.0
-        },
-        "params": 4
-      },
       {
         "id": "NandGate",
         "name": "NandGate#0",
@@ -148,7 +139,10 @@
           "x": 5.0,
           "y": 135.0
         },
-        "params": 4
+        "params": {
+          "logicWidth": 4,
+          "orientation": "RIGHT"
+        }
       },
       {
         "id": "Splitter",
@@ -157,7 +151,10 @@
           "x": 5.0,
           "y": 185.0
         },
-        "params": 4
+        "params": {
+          "logicWidth": 4,
+          "orientation": "RIGHT"
+        }
       },
       {
         "id": "Splitter",
@@ -166,7 +163,22 @@
           "x": 5.0,
           "y": 95.0
         },
-        "params": 2
+        "params": {
+          "logicWidth": 2,
+          "orientation": "RIGHT"
+        }
+      },
+      {
+        "id": "Splitter",
+        "name": "Splitter#3",
+        "pos": {
+          "x": 230.0,
+          "y": 30.0
+        },
+        "params": {
+          "logicWidth": 4,
+          "orientation": "LEFT"
+        }
       },
       {
         "id": "WireCrossPoint",
@@ -262,16 +274,16 @@
           "pinName": "Q1"
         },
         "pin2": {
-          "compName": "Merger#0",
-          "pinName": "I3"
+          "compName": "Splitter#3",
+          "pinName": "O3"
         },
         "name": "unnamedWire#0",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Merger#0",
-          "pinName": "I2"
+          "compName": "Splitter#3",
+          "pinName": "O2"
         },
         "pin2": {
           "compName": "dff4_finewe#0",
@@ -307,8 +319,8 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Merger#0",
-          "pinName": "I0"
+          "compName": "Splitter#3",
+          "pinName": "O0"
         },
         "name": "unnamedWire#11",
         "path": []
@@ -443,8 +455,8 @@
       },
       {
         "pin1": {
-          "compName": "Merger#0",
-          "pinName": "I1"
+          "compName": "Splitter#3",
+          "pinName": "O1"
         },
         "pin2": {
           "compName": "dff4_finewe#0",
@@ -658,18 +670,6 @@
           }
         ]
       },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "name": "unnamedWire#33",
-        "path": []
-      },
       {
         "pin1": {
           "compName": "WireCrossPoint#3",
@@ -679,7 +679,7 @@
           "compName": "NandGate#1",
           "pinName": "B"
         },
-        "name": "unnamedWire#34",
+        "name": "unnamedWire#33",
         "path": [
           {
             "x": 225.0,
@@ -704,7 +704,7 @@
           "compName": "xor#0",
           "pinName": "A"
         },
-        "name": "unnamedWire#35",
+        "name": "unnamedWire#34",
         "path": [
           {
             "x": 125.0,
@@ -725,7 +725,7 @@
           "compName": "xor#0",
           "pinName": "B"
         },
-        "name": "unnamedWire#36",
+        "name": "unnamedWire#35",
         "path": [
           {
             "x": 105.0,
@@ -746,7 +746,7 @@
           "compName": "_submodelinterface",
           "pinName": "_EZ"
         },
-        "name": "unnamedWire#37",
+        "name": "unnamedWire#36",
         "path": [
           {
             "x": 180.0,
@@ -771,7 +771,7 @@
           "compName": "dff4_finewe#0",
           "pinName": "C"
         },
-        "name": "unnamedWire#38",
+        "name": "unnamedWire#37",
         "path": [
           {
             "x": 55.0,
@@ -792,7 +792,7 @@
           "compName": "dff4_finewe#0",
           "pinName": "_WE4"
         },
-        "name": "unnamedWire#39",
+        "name": "unnamedWire#38",
         "path": [
           {
             "x": 200.0,
@@ -810,47 +810,47 @@
       },
       {
         "pin1": {
-          "compName": "Merger#0",
-          "pinName": "O"
+          "compName": "dff4_finewe#0",
+          "pinName": "_WE3"
         },
         "pin2": {
           "compName": "_submodelinterface",
-          "pinName": "Q"
+          "pinName": "_EN"
         },
-        "name": "unnamedWire#4",
+        "name": "unnamedWire#39",
         "path": [
           {
-            "x": 245.0,
-            "y": 45.0
+            "x": 170.0,
+            "y": 60.0
           },
           {
-            "x": 245.0,
-            "y": 50.0
+            "x": 170.0,
+            "y": 15.0
+          },
+          {
+            "x": 150.0,
+            "y": 15.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "dff4_finewe#0",
-          "pinName": "_WE3"
+          "compName": "Splitter#3",
+          "pinName": "I"
         },
         "pin2": {
           "compName": "_submodelinterface",
-          "pinName": "_EN"
+          "pinName": "Q"
         },
-        "name": "unnamedWire#40",
+        "name": "unnamedWire#4",
         "path": [
           {
-            "x": 170.0,
-            "y": 60.0
-          },
-          {
-            "x": 170.0,
-            "y": 15.0
+            "x": 245.0,
+            "y": 45.0
           },
           {
-            "x": 150.0,
-            "y": 15.0
+            "x": 245.0,
+            "y": 50.0
           }
         ]
       },
@@ -863,7 +863,7 @@
           "compName": "dff4_finewe#0",
           "pinName": "_WE2"
         },
-        "name": "unnamedWire#41",
+        "name": "unnamedWire#40",
         "path": [
           {
             "x": 100.0,
@@ -888,7 +888,7 @@
           "compName": "mux1_4#1",
           "pinName": "Y1"
         },
-        "name": "unnamedWire#42",
+        "name": "unnamedWire#41",
         "path": []
       },
       {
@@ -900,7 +900,7 @@
           "compName": "dff4_finewe#0",
           "pinName": "D2"
         },
-        "name": "unnamedWire#43",
+        "name": "unnamedWire#42",
         "path": [
           {
             "x": 170.0,
@@ -921,7 +921,7 @@
           "compName": "mux1_4#1",
           "pinName": "Y3"
         },
-        "name": "unnamedWire#44",
+        "name": "unnamedWire#43",
         "path": []
       },
       {
@@ -933,7 +933,7 @@
           "compName": "mux1_4#1",
           "pinName": "Y4"
         },
-        "name": "unnamedWire#45",
+        "name": "unnamedWire#44",
         "path": [
           {
             "x": 115.0,
@@ -950,7 +950,7 @@
           "compName": "dff4_finewe#0",
           "pinName": "D4"
         },
-        "name": "unnamedWire#46",
+        "name": "unnamedWire#45",
         "path": [
           {
             "x": 180.0,
@@ -971,7 +971,7 @@
           "compName": "NandGate#2",
           "pinName": "A"
         },
-        "name": "unnamedWire#47",
+        "name": "unnamedWire#46",
         "path": []
       },
       {
@@ -983,7 +983,7 @@
           "compName": "NandGate#2",
           "pinName": "B"
         },
-        "name": "unnamedWire#48",
+        "name": "unnamedWire#47",
         "path": [
           {
             "x": 115.0,
@@ -1000,7 +1000,7 @@
           "compName": "mux1_4#0",
           "pinName": "I0_1"
         },
-        "name": "unnamedWire#49",
+        "name": "unnamedWire#48",
         "path": [
           {
             "x": 20.0,