projects / Mograsim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b7cd13e)
Cleaned dff4_finewe
authorDaniel Kirschten <daniel.kirschten@gmx.de>
Sun, 11 Oct 2020 16:43:19 +0000 (18:43 +0200)
committerDaniel Kirschten <daniel.kirschten@gmx.de>
Sun, 11 Oct 2020 16:43:19 +0000 (18:43 +0200)
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json patch | blob | history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json patch | blob | history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_finewe.json patch | blob | history

diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json
index 8ba60fb..9ee2541 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json
@@ -118,7 +118,7 @@
         "id": "NandGate",
         "name": "NandGate#0",
         "pos": {
-          "x": 170.0,
+          "x": 160.0,
           "y": 55.0
         },
         "params": 1
@@ -127,8 +127,8 @@
         "id": "Splitter",
         "name": "Splitter#0",
         "pos": {
-          "x": 260.0,
-          "y": 135.0
+          "x": 235.0,
+          "y": 85.0
         },
         "params": {
           "logicWidth": 4,
@@ -151,7 +151,7 @@
         "id": "Splitter",
         "name": "Splitter#2",
         "pos": {
-          "x": 45.0,
+          "x": 5.0,
           "y": 340.0
         },
         "params": {
@@ -175,8 +175,8 @@
         "id": "Splitter",
         "name": "Splitter#4",
         "pos": {
-          "x": 385.0,
-          "y": 85.0
+          "x": 230.0,
+          "y": 45.0
         },
         "params": {
           "logicWidth": 4,
@@ -199,7 +199,7 @@
         "id": "Splitter",
         "name": "Splitter#6",
         "pos": {
-          "x": 85.0,
+          "x": 100.0,
           "y": 275.0
         },
         "params": {
@@ -220,71 +220,68 @@
         }
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
+        "id": "Splitter",
+        "name": "Splitter#8",
         "pos": {
-          "x": 19.0,
-          "y": 224.0
+          "x": 310.0,
+          "y": 85.0
         },
-        "params": 1
+        "params": {
+          "logicWidth": 4,
+          "orientation": "LEFT"
+        }
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
+        "id": "Splitter",
+        "name": "Splitter#9",
         "pos": {
-          "x": 364.0,
-          "y": 84.0
+          "x": 25.0,
+          "y": 310.0
         },
-        "params": 1
+        "params": {
+          "logicWidth": 4,
+          "orientation": "UP"
+        }
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
+        "name": "WireCrossPoint#0",
         "pos": {
-          "x": 369.0,
-          "y": 94.0
+          "x": 19.0,
+          "y": 224.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
+        "name": "WireCrossPoint#1",
         "pos": {
           "x": 374.0,
-          "y": 104.0
+          "y": 99.0
         },
-        "params": 1
+        "params": 4
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
-        "pos": {
-          "x": 379.0,
-          "y": 114.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
+        "name": "WireCrossPoint#2",
         "pos": {
-          "x": 29.0,
+          "x": 34.0,
           "y": 284.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
+        "name": "WireCrossPoint#3",
         "pos": {
-          "x": 39.0,
+          "x": 54.0,
           "y": 304.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
+        "name": "WireCrossPoint#4",
         "pos": {
           "x": 19.0,
           "y": 194.0
@@ -293,7 +290,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#8",
+        "name": "WireCrossPoint#5",
         "pos": {
           "x": 79.0,
           "y": 254.0
@@ -302,7 +299,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
+        "name": "WireCrossPoint#6",
         "pos": {
           "x": 19.0,
           "y": 84.0
@@ -311,7 +308,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
+        "name": "WireCrossPoint#7",
         "pos": {
           "x": 54.0,
           "y": 54.0
@@ -320,7 +317,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#11",
+        "name": "WireCrossPoint#8",
         "pos": {
           "x": 54.0,
           "y": 64.0
@@ -329,7 +326,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#12",
+        "name": "WireCrossPoint#9",
         "pos": {
           "x": 34.0,
           "y": 234.0
@@ -338,16 +335,16 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#13",
+        "name": "WireCrossPoint#10",
         "pos": {
-          "x": 104.0,
+          "x": 119.0,
           "y": 184.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#14",
+        "name": "WireCrossPoint#11",
         "pos": {
           "x": 54.0,
           "y": 74.0
@@ -356,19 +353,19 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#15",
+        "name": "WireCrossPoint#12",
         "pos": {
-          "x": 164.0,
+          "x": 154.0,
           "y": 59.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#16",
+        "name": "WireCrossPoint#13",
         "pos": {
-          "x": 254.0,
-          "y": 39.0
+          "x": 259.0,
+          "y": 29.0
         },
         "params": 1
       },
@@ -376,7 +373,7 @@
         "id": "and",
         "name": "and#0",
         "pos": {
-          "x": 195.0,
+          "x": 190.0,
           "y": 50.0
         }
       },
@@ -384,16 +381,16 @@
         "id": "dff4_finewe",
         "name": "dff4_finewe#0",
         "pos": {
-          "x": 325.0,
-          "y": 80.0
+          "x": 335.0,
+          "y": 85.0
         }
       },
       {
         "id": "mux1",
         "name": "mux1#0",
         "pos": {
-          "x": 280.0,
-          "y": 175.0
+          "x": 265.0,
+          "y": 125.0
         }
       },
       {
@@ -417,14 +414,14 @@
         "name": "mux1_4#2",
         "pos": {
           "x": 180.0,
-          "y": 85.0
+          "y": 80.0
         }
       },
       {
         "id": "mux1_4",
         "name": "mux1_4#3",
         "pos": {
-          "x": 175.0,
+          "x": 190.0,
           "y": 180.0
         }
       },
@@ -432,7 +429,7 @@
         "id": "mux1_4",
         "name": "mux1_4#4",
         "pos": {
-          "x": 110.0,
+          "x": 130.0,
           "y": 220.0
         }
       },
@@ -440,7 +437,7 @@
         "id": "not4",
         "name": "not4#0",
         "pos": {
-          "x": 45.0,
+          "x": 60.0,
           "y": 270.0
         }
       },
@@ -470,12 +467,12 @@
             "y": 55.0
           },
           {
-            "x": 295.0,
+            "x": 330.0,
             "y": 55.0
           },
           {
-            "x": 295.0,
-            "y": 85.0
+            "x": 330.0,
+            "y": 90.0
           }
         ]
       },
@@ -485,22 +482,22 @@
           "pinName": "_EOVR"
         },
         "pin2": {
-          "compName": "dff4_finewe#0",
-          "pinName": "_WE1"
+          "compName": "Splitter#4",
+          "pinName": "O0"
         },
         "name": "unnamedWire#1",
         "path": [
           {
             "x": 200.0,
-            "y": 30.0
+            "y": 25.0
           },
           {
-            "x": 305.0,
-            "y": 30.0
+            "x": 225.0,
+            "y": 25.0
           },
           {
-            "x": 305.0,
-            "y": 125.0
+            "x": 225.0,
+            "y": 75.0
           }
         ]
       },
@@ -510,22 +507,22 @@
           "pinName": "_EN"
         },
         "pin2": {
-          "compName": "dff4_finewe#0",
-          "pinName": "_WE2"
+          "compName": "Splitter#4",
+          "pinName": "O1"
         },
         "name": "unnamedWire#2",
         "path": [
           {
             "x": 150.0,
-            "y": 25.0
+            "y": 20.0
           },
           {
-            "x": 310.0,
-            "y": 25.0
+            "x": 220.0,
+            "y": 20.0
           },
           {
-            "x": 310.0,
-            "y": 115.0
+            "x": 220.0,
+            "y": 65.0
           }
         ]
       },
@@ -542,102 +539,120 @@
         "path": [
           {
             "x": 100.0,
-            "y": 20.0
+            "y": 15.0
           },
           {
-            "x": 190.0,
-            "y": 20.0
+            "x": 185.0,
+            "y": 15.0
           },
           {
-            "x": 190.0,
+            "x": 185.0,
             "y": 55.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "_EZ"
+          "compName": "Splitter#4",
+          "pinName": "O3"
         },
         "pin2": {
-          "compName": "dff4_finewe#0",
-          "pinName": "_WE4"
+          "compName": "_submodelinterface",
+          "pinName": "_EZ"
         },
         "name": "unnamedWire#4",
         "path": [
           {
-            "x": 50.0,
-            "y": 15.0
+            "x": 210.0,
+            "y": 45.0
           },
           {
-            "x": 320.0,
-            "y": 15.0
+            "x": 210.0,
+            "y": 10.0
           },
           {
-            "x": 320.0,
-            "y": 95.0
+            "x": 50.0,
+            "y": 10.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "Splitter#4",
-          "pinName": "I"
+          "compName": "dff4_finewe#0",
+          "pinName": "Q"
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Q"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
         },
         "name": "unnamedWire#5",
         "path": []
       },
       {
         "pin1": {
-          "compName": "dff4_finewe#0",
-          "pinName": "Q4"
-        },
-        "pin2": {
           "compName": "WireCrossPoint#1",
           "pinName": ""
         },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Q"
+        },
         "name": "unnamedWire#6",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O0"
+          "compName": "Splitter#9",
+          "pinName": "I"
         },
         "name": "unnamedWire#7",
-        "path": []
+        "path": [
+          {
+            "x": 375.0,
+            "y": 325.0
+          },
+          {
+            "x": 40.0,
+            "y": 325.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "Splitter#4",
-          "pinName": "O1"
+          "compName": "and#0",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "Splitter#4",
+          "pinName": "O2"
         },
         "name": "unnamedWire#8",
         "path": []
       },
       {
         "pin1": {
-          "compName": "dff4_finewe#0",
-          "pinName": "Q3"
+          "compName": "Splitter#4",
+          "pinName": "I"
         },
         "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "dff4_finewe#0",
+          "pinName": "_WE"
         },
         "name": "unnamedWire#9",
-        "path": []
+        "path": [
+          {
+            "x": 325.0,
+            "y": 60.0
+          },
+          {
+            "x": 325.0,
+            "y": 110.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -694,18 +709,18 @@
         "path": [
           {
             "x": 175.0,
-            "y": 135.0
+            "y": 130.0
           },
           {
             "x": 175.0,
             "y": 175.0
           },
           {
-            "x": 230.0,
+            "x": 245.0,
             "y": 175.0
           },
           {
-            "x": 230.0,
+            "x": 245.0,
             "y": 200.0
           }
         ]
@@ -720,25 +735,16 @@
           "pinName": "I"
         },
         "name": "unnamedWire#13",
-        "path": [
-          {
-            "x": 235.0,
-            "y": 105.0
-          },
-          {
-            "x": 235.0,
-            "y": 150.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#8",
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "dff4_finewe#0",
-          "pinName": "D4"
+          "compName": "Splitter#0",
+          "pinName": "O3"
         },
         "name": "unnamedWire#14",
         "path": []
@@ -749,25 +755,25 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "dff4_finewe#0",
-          "pinName": "D3"
+          "compName": "Splitter#8",
+          "pinName": "O2"
         },
         "name": "unnamedWire#15",
         "path": [
           {
-            "x": 320.0,
-            "y": 180.0
+            "x": 305.0,
+            "y": 130.0
           },
           {
-            "x": 320.0,
-            "y": 145.0
+            "x": 305.0,
+            "y": 95.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "dff4_finewe#0",
-          "pinName": "D2"
+          "compName": "Splitter#8",
+          "pinName": "O1"
         },
         "pin2": {
           "compName": "Splitter#0",
@@ -782,8 +788,8 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "dff4_finewe#0",
-          "pinName": "D1"
+          "compName": "Splitter#8",
+          "pinName": "O0"
         },
         "name": "unnamedWire#17",
         "path": []
@@ -800,18 +806,18 @@
         "name": "unnamedWire#18",
         "path": [
           {
-            "x": 275.0,
-            "y": 145.0
+            "x": 255.0,
+            "y": 95.0
           },
           {
-            "x": 275.0,
-            "y": 190.0
+            "x": 255.0,
+            "y": 140.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#10",
           "pinName": ""
         },
         "pin2": {
@@ -839,7 +845,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "name": "unnamedWire#21",
@@ -889,17 +895,9 @@
         },
         "name": "unnamedWire#24",
         "path": [
-          {
-            "x": 60.0,
-            "y": 360.0
-          },
-          {
-            "x": 60.0,
-            "y": 335.0
-          },
           {
             "x": 20.0,
-            "y": 335.0
+            "y": 360.0
           }
         ]
       },
@@ -909,7 +907,7 @@
           "pinName": "A"
         },
         "pin2": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "name": "unnamedWire#25",
@@ -917,50 +915,14 @@
       },
       {
         "pin1": {
-          "compName": "dff4_finewe#0",
-          "pinName": "Q2"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "name": "unnamedWire#26",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O2"
-        },
-        "name": "unnamedWire#27",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#4",
-          "pinName": "O3"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "name": "unnamedWire#28",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "Splitter#8",
+          "pinName": "I"
         },
         "pin2": {
           "compName": "dff4_finewe#0",
-          "pinName": "Q1"
+          "pinName": "D"
         },
-        "name": "unnamedWire#29",
+        "name": "unnamedWire#26",
         "path": []
       },
       {
@@ -972,7 +934,7 @@
           "compName": "Splitter#6",
           "pinName": "O3"
         },
-        "name": "unnamedWire#30",
+        "name": "unnamedWire#27",
         "path": []
       },
       {
@@ -984,7 +946,7 @@
           "compName": "not4#0",
           "pinName": "Y2"
         },
-        "name": "unnamedWire#31",
+        "name": "unnamedWire#28",
         "path": []
       },
       {
@@ -996,7 +958,7 @@
           "compName": "Splitter#6",
           "pinName": "O1"
         },
-        "name": "unnamedWire#32",
+        "name": "unnamedWire#29",
         "path": []
       },
       {
@@ -1008,28 +970,20 @@
           "compName": "not4#0",
           "pinName": "Y4"
         },
-        "name": "unnamedWire#33",
+        "name": "unnamedWire#30",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "Splitter#9",
+          "pinName": "O3"
         },
         "pin2": {
           "compName": "not4#0",
           "pinName": "A1"
         },
-        "name": "unnamedWire#34",
+        "name": "unnamedWire#31",
         "path": [
-          {
-            "x": 365.0,
-            "y": 315.0
-          },
-          {
-            "x": 25.0,
-            "y": 315.0
-          },
           {
             "x": 25.0,
             "y": 275.0
@@ -1038,139 +992,113 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "Splitter#9",
+          "pinName": "O2"
         },
         "pin2": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
-        "name": "unnamedWire#35",
-        "path": [
-          {
-            "x": 370.0,
-            "y": 320.0
-          },
-          {
-            "x": 30.0,
-            "y": 320.0
-          }
-        ]
+        "name": "unnamedWire#32",
+        "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "Splitter#9",
+          "pinName": "O1"
         },
         "pin2": {
           "compName": "not4#0",
           "pinName": "A3"
         },
-        "name": "unnamedWire#36",
+        "name": "unnamedWire#33",
         "path": [
           {
-            "x": 375.0,
-            "y": 325.0
-          },
-          {
-            "x": 35.0,
-            "y": 325.0
-          },
-          {
-            "x": 35.0,
+            "x": 45.0,
             "y": 295.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "Splitter#9",
+          "pinName": "O0"
         },
         "pin2": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
-        "name": "unnamedWire#37",
-        "path": [
-          {
-            "x": 380.0,
-            "y": 330.0
-          },
-          {
-            "x": 40.0,
-            "y": 330.0
-          }
-        ]
+        "name": "unnamedWire#34",
+        "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "pin2": {
           "compName": "Splitter#3",
           "pinName": "O3"
         },
-        "name": "unnamedWire#38",
+        "name": "unnamedWire#35",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "pin2": {
           "compName": "Splitter#7",
           "pinName": "O0"
         },
-        "name": "unnamedWire#39",
+        "name": "unnamedWire#36",
         "path": [
           {
-            "x": 30.0,
+            "x": 35.0,
             "y": 265.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "pin2": {
           "compName": "Splitter#7",
           "pinName": "O2"
         },
-        "name": "unnamedWire#40",
+        "name": "unnamedWire#37",
         "path": [
           {
-            "x": 40.0,
+            "x": 55.0,
             "y": 245.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "pin2": {
           "compName": "Splitter#7",
           "pinName": "O1"
         },
-        "name": "unnamedWire#41",
+        "name": "unnamedWire#38",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
-        "name": "unnamedWire#42",
+        "name": "unnamedWire#39",
         "path": []
       },
       {
@@ -1182,7 +1110,7 @@
           "compName": "mux1_4#4",
           "pinName": "S0"
         },
-        "name": "unnamedWire#43",
+        "name": "unnamedWire#40",
         "path": []
       },
       {
@@ -1194,19 +1122,19 @@
           "compName": "mux1_4#0",
           "pinName": "I1"
         },
-        "name": "unnamedWire#44",
+        "name": "unnamedWire#41",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#11",
           "pinName": ""
         },
-        "name": "unnamedWire#45",
+        "name": "unnamedWire#42",
         "path": [
           {
             "x": 20.0,
@@ -1223,7 +1151,7 @@
           "compName": "mux1_4#2",
           "pinName": "I0"
         },
-        "name": "unnamedWire#46",
+        "name": "unnamedWire#43",
         "path": [
           {
             "x": 140.0,
@@ -1231,7 +1159,7 @@
           },
           {
             "x": 140.0,
-            "y": 105.0
+            "y": 100.0
           }
         ]
       },
@@ -1244,15 +1172,23 @@
           "compName": "mux1_4#2",
           "pinName": "S0"
         },
-        "name": "unnamedWire#47",
+        "name": "unnamedWire#44",
         "path": [
           {
-            "x": 170.0,
+            "x": 125.0,
             "y": 340.0
           },
           {
-            "x": 170.0,
-            "y": 90.0
+            "x": 125.0,
+            "y": 140.0
+          },
+          {
+            "x": 160.0,
+            "y": 140.0
+          },
+          {
+            "x": 160.0,
+            "y": 85.0
           }
         ]
       },
@@ -1262,82 +1198,82 @@
           "pinName": "S0"
         },
         "pin2": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
-        "name": "unnamedWire#48",
+        "name": "unnamedWire#45",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#11",
           "pinName": ""
         },
         "pin2": {
           "compName": "Splitter#5",
           "pinName": "O0"
         },
-        "name": "unnamedWire#49",
+        "name": "unnamedWire#46",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
-        "name": "unnamedWire#50",
+        "name": "unnamedWire#47",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#11",
           "pinName": ""
         },
-        "name": "unnamedWire#51",
+        "name": "unnamedWire#48",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "pin2": {
           "compName": "Splitter#5",
           "pinName": "O1"
         },
-        "name": "unnamedWire#52",
+        "name": "unnamedWire#49",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
         "pin2": {
           "compName": "Splitter#5",
           "pinName": "O2"
         },
-        "name": "unnamedWire#53",
+        "name": "unnamedWire#50",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
         "pin2": {
           "compName": "Splitter#5",
           "pinName": "O3"
         },
-        "name": "unnamedWire#54",
+        "name": "unnamedWire#51",
         "path": [
           {
             "x": 55.0,
@@ -1351,10 +1287,10 @@
           "pinName": "A4"
         },
         "pin2": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
-        "name": "unnamedWire#55",
+        "name": "unnamedWire#52",
         "path": []
       },
       {
@@ -1363,22 +1299,22 @@
           "pinName": "A2"
         },
         "pin2": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
-        "name": "unnamedWire#56",
+        "name": "unnamedWire#53",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "pin2": {
           "compName": "Splitter#7",
           "pinName": "O3"
         },
-        "name": "unnamedWire#57",
+        "name": "unnamedWire#54",
         "path": []
       },
       {
@@ -1387,10 +1323,10 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
-        "name": "unnamedWire#58",
+        "name": "unnamedWire#55",
         "path": []
       },
       {
@@ -1399,10 +1335,10 @@
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
-        "name": "unnamedWire#59",
+        "name": "unnamedWire#56",
         "path": [
           {
             "x": 35.0,
@@ -1419,19 +1355,19 @@
           "compName": "Splitter#1",
           "pinName": "O2"
         },
-        "name": "unnamedWire#60",
+        "name": "unnamedWire#57",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "pin2": {
           "compName": "Splitter#1",
           "pinName": "O1"
         },
-        "name": "unnamedWire#61",
+        "name": "unnamedWire#58",
         "path": [
           {
             "x": 80.0,
@@ -1448,7 +1384,7 @@
           "compName": "Splitter#1",
           "pinName": "O0"
         },
-        "name": "unnamedWire#62",
+        "name": "unnamedWire#59",
         "path": [
           {
             "x": 25.0,
@@ -1469,14 +1405,14 @@
           "compName": "mux1_4#4",
           "pinName": "Y"
         },
-        "name": "unnamedWire#63",
+        "name": "unnamedWire#60",
         "path": [
           {
-            "x": 165.0,
+            "x": 185.0,
             "y": 230.0
           },
           {
-            "x": 165.0,
+            "x": 185.0,
             "y": 240.0
           }
         ]
@@ -1490,7 +1426,7 @@
           "compName": "mux1_4#3",
           "pinName": "I0"
         },
-        "name": "unnamedWire#64",
+        "name": "unnamedWire#61",
         "path": []
       },
       {
@@ -1502,14 +1438,14 @@
           "compName": "mux1_4#4",
           "pinName": "I1"
         },
-        "name": "unnamedWire#65",
+        "name": "unnamedWire#62",
         "path": [
           {
-            "x": 100.0,
+            "x": 115.0,
             "y": 290.0
           },
           {
-            "x": 100.0,
+            "x": 115.0,
             "y": 270.0
           }
         ]
@@ -1523,14 +1459,14 @@
           "compName": "mux1_4#4",
           "pinName": "I0"
         },
-        "name": "unnamedWire#66",
+        "name": "unnamedWire#63",
         "path": [
           {
-            "x": 100.0,
+            "x": 115.0,
             "y": 250.0
           },
           {
-            "x": 100.0,
+            "x": 115.0,
             "y": 240.0
           }
         ]
@@ -1541,30 +1477,30 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#10",
           "pinName": ""
         },
-        "name": "unnamedWire#67",
+        "name": "unnamedWire#64",
         "path": [
           {
-            "x": 105.0,
+            "x": 120.0,
             "y": 350.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#10",
           "pinName": ""
         },
         "pin2": {
           "compName": "mux1_4#0",
           "pinName": "S0"
         },
-        "name": "unnamedWire#68",
+        "name": "unnamedWire#65",
         "path": [
           {
-            "x": 105.0,
+            "x": 120.0,
             "y": 140.0
           },
           {
@@ -1579,43 +1515,14 @@
       },
       {
         "pin1": {
-          "compName": "and#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "dff4_finewe#0",
-          "pinName": "_WE3"
-        },
-        "name": "unnamedWire#69",
-        "path": [
-          {
-            "x": 235.0,
-            "y": 55.0
-          },
-          {
-            "x": 235.0,
-            "y": 20.0
-          },
-          {
-            "x": 315.0,
-            "y": 20.0
-          },
-          {
-            "x": 315.0,
-            "y": 105.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#12",
           "pinName": ""
         },
         "pin2": {
           "compName": "NandGate#0",
           "pinName": "A"
         },
-        "name": "unnamedWire#70",
+        "name": "unnamedWire#66",
         "path": []
       },
       {
@@ -1624,31 +1531,31 @@
           "pinName": "COVD_EN"
         },
         "pin2": {
-          "compName": "WireCrossPoint#16",
+          "compName": "WireCrossPoint#13",
           "pinName": ""
         },
-        "name": "unnamedWire#71",
+        "name": "unnamedWire#67",
         "path": [
           {
             "x": 300.0,
-            "y": 40.0
+            "y": 30.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#16",
+          "compName": "WireCrossPoint#13",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#12",
           "pinName": ""
         },
-        "name": "unnamedWire#72",
+        "name": "unnamedWire#68",
         "path": [
           {
-            "x": 165.0,
-            "y": 40.0
+            "x": 155.0,
+            "y": 30.0
           }
         ]
       },
@@ -1661,7 +1568,7 @@
           "compName": "mux1#0",
           "pinName": "I1"
         },
-        "name": "unnamedWire#73",
+        "name": "unnamedWire#69",
         "path": [
           {
             "x": 350.0,
@@ -1673,7 +1580,7 @@
           },
           {
             "x": 250.0,
-            "y": 200.0
+            "y": 150.0
           }
         ]
       },
@@ -1686,40 +1593,40 @@
           "compName": "and#0",
           "pinName": "B"
         },
-        "name": "unnamedWire#74",
+        "name": "unnamedWire#70",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#12",
           "pinName": ""
         },
         "pin2": {
           "compName": "NandGate#0",
           "pinName": "B"
         },
-        "name": "unnamedWire#75",
+        "name": "unnamedWire#71",
         "path": [
           {
-            "x": 165.0,
+            "x": 155.0,
             "y": 70.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#16",
+          "compName": "WireCrossPoint#13",
           "pinName": ""
         },
         "pin2": {
           "compName": "mux1#0",
           "pinName": "S0"
         },
-        "name": "unnamedWire#76",
+        "name": "unnamedWire#72",
         "path": [
           {
-            "x": 255.0,
-            "y": 180.0
+            "x": 260.0,
+            "y": 130.0
           }
         ]
       },
@@ -1732,7 +1639,7 @@
           "compName": "mux1_4#0",
           "pinName": "I0"
         },
-        "name": "unnamedWire#77",
+        "name": "unnamedWire#73",
         "path": [
           {
             "x": 75.0,
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json
index 7105c0a..4f6c4c4 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json
@@ -172,14 +172,38 @@
         "id": "Splitter",
         "name": "Splitter#3",
         "pos": {
-          "x": 230.0,
-          "y": 30.0
+          "x": 160.0,
+          "y": 45.0
         },
         "params": {
           "logicWidth": 4,
           "orientation": "LEFT"
         }
       },
+      {
+        "id": "Splitter",
+        "name": "Splitter#4",
+        "pos": {
+          "x": 185.0,
+          "y": 80.0
+        },
+        "params": {
+          "logicWidth": 4,
+          "orientation": "LEFT"
+        }
+      },
+      {
+        "id": "Splitter",
+        "name": "Splitter#5",
+        "pos": {
+          "x": 210.0,
+          "y": 85.0
+        },
+        "params": {
+          "logicWidth": 4,
+          "orientation": "DOWN"
+        }
+      },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
@@ -211,8 +235,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#3",
         "pos": {
-          "x": 224.0,
-          "y": 59.0
+          "x": 159.0,
+          "y": 159.0
         },
         "params": 1
       },
@@ -220,8 +244,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#4",
         "pos": {
-          "x": 159.0,
-          "y": 159.0
+          "x": 59.0,
+          "y": 119.0
         },
         "params": 1
       },
@@ -229,17 +253,17 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#5",
         "pos": {
-          "x": 59.0,
-          "y": 119.0
+          "x": 224.0,
+          "y": 49.0
         },
-        "params": 1
+        "params": 4
       },
       {
         "id": "dff4_finewe",
         "name": "dff4_finewe#0",
         "pos": {
           "x": 185.0,
-          "y": 25.0
+          "y": 35.0
         }
       },
       {
@@ -271,72 +295,39 @@
       {
         "pin1": {
           "compName": "dff4_finewe#0",
-          "pinName": "Q4"
+          "pinName": "Q"
         },
         "pin2": {
-          "compName": "Splitter#3",
-          "pinName": "O3"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
         },
         "name": "unnamedWire#0",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O2"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "dff4_finewe#0",
-          "pinName": "Q3"
+          "compName": "_submodelinterface",
+          "pinName": "Q"
         },
         "name": "unnamedWire#1",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O1"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "dff4_finewe#0",
-          "pinName": "Q2"
+          "compName": "Splitter#5",
+          "pinName": "I"
         },
         "name": "unnamedWire#2",
         "path": []
       },
-      {
-        "pin1": {
-          "compName": "dff4_finewe#0",
-          "pinName": "Q1"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "name": "unnamedWire#3",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "I"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Q"
-        },
-        "name": "unnamedWire#4",
-        "path": [
-          {
-            "x": 245.0,
-            "y": 45.0
-          },
-          {
-            "x": 245.0,
-            "y": 50.0
-          }
-        ]
-      },
       {
         "pin1": {
           "compName": "_submodelinterface",
@@ -346,7 +337,7 @@
           "compName": "mux1_4#0",
           "pinName": "I0"
         },
-        "name": "unnamedWire#5",
+        "name": "unnamedWire#3",
         "path": []
       },
       {
@@ -358,7 +349,7 @@
           "compName": "mux1_4#0",
           "pinName": "I1"
         },
-        "name": "unnamedWire#6",
+        "name": "unnamedWire#4",
         "path": [
           {
             "x": 20.0,
@@ -379,7 +370,7 @@
           "compName": "mux1_4#0",
           "pinName": "S0"
         },
-        "name": "unnamedWire#7",
+        "name": "unnamedWire#5",
         "path": [
           {
             "x": 20.0,
@@ -400,7 +391,7 @@
           "compName": "mux1_4#0",
           "pinName": "Y"
         },
-        "name": "unnamedWire#8",
+        "name": "unnamedWire#6",
         "path": [
           {
             "x": 80.0,
@@ -414,14 +405,14 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "pin2": {
           "compName": "Splitter#0",
           "pinName": "O0"
         },
-        "name": "unnamedWire#9",
+        "name": "unnamedWire#7",
         "path": []
       },
       {
@@ -433,19 +424,7 @@
           "compName": "Splitter#0",
           "pinName": "O1"
         },
-        "name": "unnamedWire#10",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "Splitter#3",
-          "pinName": "O0"
-        },
-        "name": "unnamedWire#11",
+        "name": "unnamedWire#8",
         "path": []
       },
       {
@@ -457,7 +436,7 @@
           "compName": "Splitter#0",
           "pinName": "O2"
         },
-        "name": "unnamedWire#12",
+        "name": "unnamedWire#9",
         "path": []
       },
       {
@@ -469,7 +448,7 @@
           "compName": "Splitter#0",
           "pinName": "O3"
         },
-        "name": "unnamedWire#13",
+        "name": "unnamedWire#10",
         "path": [
           {
             "x": 60.0,
@@ -486,7 +465,7 @@
           "compName": "mux1_4#1",
           "pinName": "I0"
         },
-        "name": "unnamedWire#14",
+        "name": "unnamedWire#11",
         "path": [
           {
             "x": 80.0,
@@ -507,7 +486,7 @@
           "compName": "Splitter#2",
           "pinName": "I"
         },
-        "name": "unnamedWire#15",
+        "name": "unnamedWire#12",
         "path": []
       },
       {
@@ -519,7 +498,7 @@
           "compName": "WireCrossPoint#0",
           "pinName": ""
         },
-        "name": "unnamedWire#16",
+        "name": "unnamedWire#13",
         "path": [
           {
             "x": 30.0,
@@ -536,7 +515,7 @@
           "compName": "mux1_4#1",
           "pinName": "S0"
         },
-        "name": "unnamedWire#17",
+        "name": "unnamedWire#14",
         "path": [
           {
             "x": 30.0,
@@ -557,7 +536,7 @@
           "compName": "Splitter#1",
           "pinName": "I"
         },
-        "name": "unnamedWire#18",
+        "name": "unnamedWire#15",
         "path": []
       },
       {
@@ -566,10 +545,10 @@
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "dff4_finewe#0",
-          "pinName": "D4"
+          "compName": "Splitter#4",
+          "pinName": "O3"
         },
-        "name": "unnamedWire#19",
+        "name": "unnamedWire#16",
         "path": []
       },
       {
@@ -581,7 +560,7 @@
           "compName": "xor#0",
           "pinName": "A"
         },
-        "name": "unnamedWire#20",
+        "name": "unnamedWire#17",
         "path": [
           {
             "x": 165.0,
@@ -599,10 +578,10 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "dff4_finewe#0",
-          "pinName": "D2"
+          "compName": "Splitter#4",
+          "pinName": "O1"
         },
-        "name": "unnamedWire#21",
+        "name": "unnamedWire#18",
         "path": []
       },
       {
@@ -611,10 +590,10 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
-        "name": "unnamedWire#22",
+        "name": "unnamedWire#19",
         "path": [
           {
             "x": 160.0,
@@ -631,7 +610,7 @@
           "compName": "WireCrossPoint#2",
           "pinName": ""
         },
-        "name": "unnamedWire#23",
+        "name": "unnamedWire#20",
         "path": []
       },
       {
@@ -640,22 +619,22 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
-        "name": "unnamedWire#24",
+        "name": "unnamedWire#21",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "pin2": {
           "compName": "WireCrossPoint#1",
           "pinName": ""
         },
-        "name": "unnamedWire#25",
+        "name": "unnamedWire#22",
         "path": []
       },
       {
@@ -667,7 +646,7 @@
           "compName": "NandGate#0",
           "pinName": "A"
         },
-        "name": "unnamedWire#26",
+        "name": "unnamedWire#23",
         "path": []
       },
       {
@@ -679,7 +658,7 @@
           "compName": "NandGate#1",
           "pinName": "Y"
         },
-        "name": "unnamedWire#27",
+        "name": "unnamedWire#24",
         "path": [
           {
             "x": 190.0,
@@ -700,7 +679,7 @@
           "compName": "NandGate#1",
           "pinName": "A"
         },
-        "name": "unnamedWire#28",
+        "name": "unnamedWire#25",
         "path": [
           {
             "x": 155.0,
@@ -714,17 +693,17 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "Splitter#5",
+          "pinName": "O0"
         },
         "pin2": {
           "compName": "NandGate#1",
           "pinName": "B"
         },
-        "name": "unnamedWire#29",
+        "name": "unnamedWire#26",
         "path": [
           {
-            "x": 225.0,
+            "x": 240.0,
             "y": 205.0
           },
           {
@@ -746,7 +725,7 @@
           "compName": "xor#0",
           "pinName": "B"
         },
-        "name": "unnamedWire#30",
+        "name": "unnamedWire#27",
         "path": [
           {
             "x": 150.0,
@@ -760,26 +739,26 @@
       },
       {
         "pin1": {
-          "compName": "dff4_finewe#0",
-          "pinName": "_WE4"
+          "compName": "Splitter#3",
+          "pinName": "O3"
         },
         "pin2": {
           "compName": "_submodelinterface",
           "pinName": "_EZ"
         },
-        "name": "unnamedWire#31",
+        "name": "unnamedWire#28",
         "path": [
           {
-            "x": 180.0,
-            "y": 40.0
+            "x": 140.0,
+            "y": 45.0
           },
           {
-            "x": 180.0,
-            "y": 5.0
+            "x": 140.0,
+            "y": 25.0
           },
           {
             "x": 50.0,
-            "y": 5.0
+            "y": 25.0
           }
         ]
       },
@@ -792,7 +771,7 @@
           "compName": "dff4_finewe#0",
           "pinName": "C"
         },
-        "name": "unnamedWire#32",
+        "name": "unnamedWire#29",
         "path": [
           {
             "x": 55.0,
@@ -800,7 +779,7 @@
           },
           {
             "x": 55.0,
-            "y": 30.0
+            "y": 40.0
           }
         ]
       },
@@ -810,47 +789,39 @@
           "pinName": "_EOVR"
         },
         "pin2": {
-          "compName": "dff4_finewe#0",
-          "pinName": "_WE1"
+          "compName": "Splitter#3",
+          "pinName": "O0"
         },
-        "name": "unnamedWire#33",
+        "name": "unnamedWire#30",
         "path": [
           {
             "x": 200.0,
-            "y": 20.0
+            "y": 30.0
           },
           {
-            "x": 165.0,
-            "y": 20.0
+            "x": 155.0,
+            "y": 30.0
           },
           {
-            "x": 165.0,
-            "y": 70.0
+            "x": 155.0,
+            "y": 75.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "dff4_finewe#0",
-          "pinName": "_WE2"
-        },
-        "pin2": {
           "compName": "_submodelinterface",
           "pinName": "_EN"
         },
-        "name": "unnamedWire#34",
+        "pin2": {
+          "compName": "Splitter#3",
+          "pinName": "O1"
+        },
+        "name": "unnamedWire#31",
         "path": [
-          {
-            "x": 170.0,
-            "y": 60.0
-          },
-          {
-            "x": 170.0,
-            "y": 15.0
-          },
           {
             "x": 150.0,
-            "y": 15.0
+            "y": 65.0
           }
         ]
       },
@@ -860,22 +831,22 @@
           "pinName": "_EC"
         },
         "pin2": {
-          "compName": "dff4_finewe#0",
-          "pinName": "_WE3"
+          "compName": "Splitter#3",
+          "pinName": "O2"
         },
-        "name": "unnamedWire#35",
+        "name": "unnamedWire#32",
         "path": [
           {
             "x": 100.0,
-            "y": 10.0
+            "y": 30.0
           },
           {
-            "x": 175.0,
-            "y": 10.0
+            "x": 145.0,
+            "y": 30.0
           },
           {
-            "x": 175.0,
-            "y": 50.0
+            "x": 145.0,
+            "y": 55.0
           }
         ]
       },
@@ -885,10 +856,10 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "dff4_finewe#0",
-          "pinName": "D3"
+          "compName": "Splitter#4",
+          "pinName": "O2"
         },
-        "name": "unnamedWire#36",
+        "name": "unnamedWire#33",
         "path": [
           {
             "x": 210.0,
@@ -914,10 +885,10 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "dff4_finewe#0",
-          "pinName": "D1"
+          "compName": "Splitter#4",
+          "pinName": "O0"
         },
-        "name": "unnamedWire#37",
+        "name": "unnamedWire#34",
         "path": [
           {
             "x": 220.0,
@@ -939,32 +910,73 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "pin2": {
           "compName": "NandGate#2",
           "pinName": "A"
         },
-        "name": "unnamedWire#38",
+        "name": "unnamedWire#35",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "pin2": {
           "compName": "NandGate#2",
           "pinName": "B"
         },
-        "name": "unnamedWire#39",
+        "name": "unnamedWire#36",
         "path": [
           {
             "x": 160.0,
             "y": 170.0
           }
         ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#3",
+          "pinName": "I"
+        },
+        "pin2": {
+          "compName": "dff4_finewe#0",
+          "pinName": "_WE"
+        },
+        "name": "unnamedWire#37",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#4",
+          "pinName": "I"
+        },
+        "pin2": {
+          "compName": "dff4_finewe#0",
+          "pinName": "D"
+        },
+        "name": "unnamedWire#38",
+        "path": [
+          {
+            "x": 200.0,
+            "y": 95.0
+          },
+          {
+            "x": 200.0,
+            "y": 75.0
+          },
+          {
+            "x": 180.0,
+            "y": 75.0
+          },
+          {
+            "x": 180.0,
+            "y": 50.0
+          }
+        ]
       }
     ],
     "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_finewe.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_finewe.json
index 5b42800..40e905e 100755 (executable)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_finewe.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_finewe.json
@@ -1,6 +1,6 @@
 {
   "width": 35.0,
-  "height": 90.0,
+  "height": 35.0,
   "interfacePins": [
     {
       "location": {
@@ -14,121 +14,76 @@
     {
       "location": {
         "x": 0.0,
-        "y": 85.0
-      },
-      "name": "D1",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 75.0
-      },
-      "name": "D2",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 65.0
-      },
-      "name": "D3",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 55.0
+        "y": 15.0
       },
-      "name": "D4",
-      "logicWidth": 1,
+      "name": "D",
+      "logicWidth": 4,
       "usage": "INPUT"
     },
-    {
-      "location": {
-        "x": 35.0,
-        "y": 35.0
-      },
-      "name": "Q1",
-      "logicWidth": 1,
-      "usage": "OUTPUT"
-    },
-    {
-      "location": {
-        "x": 35.0,
-        "y": 25.0
-      },
-      "name": "Q2",
-      "logicWidth": 1,
-      "usage": "OUTPUT"
-    },
     {
       "location": {
         "x": 35.0,
         "y": 15.0
       },
-      "name": "Q3",
-      "logicWidth": 1,
-      "usage": "OUTPUT"
-    },
-    {
-      "location": {
-        "x": 35.0,
-        "y": 5.0
-      },
-      "name": "Q4",
-      "logicWidth": 1,
+      "name": "Q",
+      "logicWidth": 4,
       "usage": "OUTPUT"
     },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 45.0
-      },
-      "name": "_WE1",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 35.0
-      },
-      "name": "_WE2",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
     {
       "location": {
         "x": 0.0,
         "y": 25.0
       },
-      "name": "_WE3",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 15.0
-      },
-      "name": "_WE4",
-      "logicWidth": 1,
+      "name": "_WE",
+      "logicWidth": 4,
       "usage": "INPUT"
     }
   ],
   "innerScale": 0.2,
   "submodel": {
     "components": [
+      {
+        "id": "Splitter",
+        "name": "Splitter#0",
+        "pos": {
+          "x": 5.0,
+          "y": 110.0
+        },
+        "params": {
+          "logicWidth": 4,
+          "orientation": "RIGHT"
+        }
+      },
+      {
+        "id": "Splitter",
+        "name": "Splitter#1",
+        "pos": {
+          "x": 160.0,
+          "y": 60.0
+        },
+        "params": {
+          "logicWidth": 4,
+          "orientation": "LEFT"
+        }
+      },
+      {
+        "id": "Splitter",
+        "name": "Splitter#2",
+        "pos": {
+          "x": 5.0,
+          "y": 60.0
+        },
+        "params": {
+          "logicWidth": 4,
+          "orientation": "RIGHT"
+        }
+      },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
         "pos": {
-          "x": 109.0,
-          "y": 34.0
+          "x": 99.0,
+          "y": 24.0
         },
         "params": 1
       },
@@ -136,8 +91,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#1",
         "pos": {
-          "x": 109.0,
-          "y": 84.0
+          "x": 99.0,
+          "y": 64.0
         },
         "params": 1
       },
@@ -145,8 +100,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#2",
         "pos": {
-          "x": 109.0,
-          "y": 134.0
+          "x": 99.0,
+          "y": 104.0
         },
         "params": 1
       },
@@ -154,8 +109,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#3",
         "pos": {
-          "x": 159.0,
-          "y": 24.0
+          "x": 144.0,
+          "y": 14.0
         },
         "params": 1
       },
@@ -163,8 +118,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#4",
         "pos": {
-          "x": 159.0,
-          "y": 74.0
+          "x": 144.0,
+          "y": 54.0
         },
         "params": 1
       },
@@ -172,8 +127,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#5",
         "pos": {
-          "x": 159.0,
-          "y": 124.0
+          "x": 144.0,
+          "y": 94.0
         },
         "params": 1
       },
@@ -181,8 +136,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#6",
         "pos": {
-          "x": 159.0,
-          "y": 174.0
+          "x": 144.0,
+          "y": 134.0
         },
         "params": 1
       },
@@ -190,64 +145,64 @@
         "id": "dff",
         "name": "dff#0",
         "pos": {
-          "x": 115.0,
-          "y": 20.0
+          "x": 105.0,
+          "y": 10.0
         }
       },
       {
         "id": "dff",
         "name": "dff#1",
         "pos": {
-          "x": 115.0,
-          "y": 70.0
+          "x": 105.0,
+          "y": 50.0
         }
       },
       {
         "id": "dff",
         "name": "dff#2",
         "pos": {
-          "x": 115.0,
-          "y": 120.0
+          "x": 105.0,
+          "y": 90.0
         }
       },
       {
         "id": "dff",
         "name": "dff#3",
         "pos": {
-          "x": 115.0,
-          "y": 170.0
+          "x": 105.0,
+          "y": 130.0
         }
       },
       {
         "id": "mux1",
         "name": "mux1#0",
         "pos": {
-          "x": 65.0,
-          "y": 20.0
+          "x": 60.0,
+          "y": 10.0
         }
       },
       {
         "id": "mux1",
         "name": "mux1#1",
         "pos": {
-          "x": 65.0,
-          "y": 70.0
+          "x": 60.0,
+          "y": 50.0
         }
       },
       {
         "id": "mux1",
         "name": "mux1#2",
         "pos": {
-          "x": 65.0,
-          "y": 120.0
+          "x": 60.0,
+          "y": 90.0
         }
       },
       {
         "id": "mux1",
         "name": "mux1#3",
         "pos": {
-          "x": 65.0,
-          "y": 170.0
+          "x": 60.0,
+          "y": 130.0
         }
       }
     ],
@@ -300,8 +255,8 @@
         "name": "unnamedWire#3",
         "path": [
           {
-            "x": 110.0,
-            "y": 185.0
+            "x": 100.0,
+            "y": 145.0
           }
         ]
       },
@@ -370,11 +325,11 @@
           },
           {
             "x": 10.0,
-            "y": 15.0
+            "y": 5.0
           },
           {
-            "x": 110.0,
-            "y": 15.0
+            "x": 100.0,
+            "y": 5.0
           }
         ]
       },
@@ -414,16 +369,16 @@
         "name": "unnamedWire#11",
         "path": [
           {
-            "x": 60.0,
-            "y": 95.0
+            "x": 55.0,
+            "y": 75.0
           },
           {
-            "x": 60.0,
-            "y": 105.0
+            "x": 55.0,
+            "y": 85.0
           },
           {
-            "x": 160.0,
-            "y": 105.0
+            "x": 145.0,
+            "y": 85.0
           }
         ]
       },
@@ -439,16 +394,16 @@
         "name": "unnamedWire#12",
         "path": [
           {
-            "x": 160.0,
-            "y": 55.0
+            "x": 145.0,
+            "y": 45.0
           },
           {
-            "x": 60.0,
-            "y": 55.0
+            "x": 55.0,
+            "y": 45.0
           },
           {
-            "x": 60.0,
-            "y": 45.0
+            "x": 55.0,
+            "y": 35.0
           }
         ]
       },
@@ -466,27 +421,36 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "Q"
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Q4"
+          "compName": "Splitter#1",
+          "pinName": "I"
         },
         "name": "unnamedWire#14",
         "path": []
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "Q3"
+          "compName": "Splitter#1",
+          "pinName": "O3"
         },
         "pin2": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "name": "unnamedWire#15",
-        "path": []
+        "path": [
+          {
+            "x": 155.0,
+            "y": 60.0
+          },
+          {
+            "x": 155.0,
+            "y": 15.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -512,16 +476,16 @@
         "name": "unnamedWire#17",
         "path": [
           {
-            "x": 160.0,
-            "y": 155.0
+            "x": 145.0,
+            "y": 125.0
           },
           {
-            "x": 60.0,
-            "y": 155.0
+            "x": 55.0,
+            "y": 125.0
           },
           {
-            "x": 60.0,
-            "y": 145.0
+            "x": 55.0,
+            "y": 115.0
           }
         ]
       },
@@ -539,27 +503,45 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Q2"
+          "compName": "Splitter#1",
+          "pinName": "O2"
         },
         "name": "unnamedWire#19",
-        "path": []
+        "path": [
+          {
+            "x": 150.0,
+            "y": 55.0
+          },
+          {
+            "x": 150.0,
+            "y": 70.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
+          "compName": "Splitter#1",
+          "pinName": "O1"
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Q1"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
         },
         "name": "unnamedWire#20",
-        "path": []
+        "path": [
+          {
+            "x": 150.0,
+            "y": 80.0
+          },
+          {
+            "x": 150.0,
+            "y": 95.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -585,184 +567,229 @@
         "name": "unnamedWire#22",
         "path": [
           {
-            "x": 160.0,
-            "y": 205.0
+            "x": 145.0,
+            "y": 165.0
           },
           {
-            "x": 60.0,
-            "y": 205.0
+            "x": 55.0,
+            "y": 165.0
           },
           {
-            "x": 60.0,
-            "y": 195.0
+            "x": 55.0,
+            "y": 155.0
           }
         ]
       },
       {
         "pin1": {
           "compName": "_submodelinterface",
-          "pinName": "_WE4"
+          "pinName": "_WE"
         },
         "pin2": {
-          "compName": "mux1#0",
-          "pinName": "S0"
+          "compName": "Splitter#0",
+          "pinName": "I"
         },
         "name": "unnamedWire#23",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "D"
+        },
+        "pin2": {
+          "compName": "Splitter#2",
+          "pinName": "I"
+        },
+        "name": "unnamedWire#24",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#2",
+          "pinName": "O3"
+        },
+        "pin2": {
+          "compName": "mux1#0",
+          "pinName": "I0"
+        },
+        "name": "unnamedWire#25",
         "path": [
           {
-            "x": 15.0,
-            "y": 75.0
+            "x": 20.0,
+            "y": 60.0
           },
           {
-            "x": 15.0,
+            "x": 20.0,
             "y": 25.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "mux1#3",
-          "pinName": "I0"
+          "compName": "Splitter#2",
+          "pinName": "O2"
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "D1"
+          "compName": "mux1#1",
+          "pinName": "I0"
         },
-        "name": "unnamedWire#24",
+        "name": "unnamedWire#26",
         "path": [
           {
-            "x": 55.0,
-            "y": 185.0
+            "x": 20.0,
+            "y": 70.0
           },
           {
-            "x": 55.0,
-            "y": 425.0
+            "x": 20.0,
+            "y": 65.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D2"
+          "compName": "Splitter#2",
+          "pinName": "O1"
         },
         "pin2": {
           "compName": "mux1#2",
           "pinName": "I0"
         },
-        "name": "unnamedWire#25",
+        "name": "unnamedWire#27",
         "path": [
           {
-            "x": 50.0,
-            "y": 375.0
+            "x": 25.0,
+            "y": 80.0
           },
           {
-            "x": 50.0,
-            "y": 135.0
+            "x": 25.0,
+            "y": 105.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "mux1#1",
-          "pinName": "I0"
+          "compName": "Splitter#0",
+          "pinName": "O3"
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "D3"
+          "compName": "mux1#0",
+          "pinName": "S0"
         },
-        "name": "unnamedWire#26",
+        "name": "unnamedWire#28",
         "path": [
           {
-            "x": 45.0,
-            "y": 85.0
+            "x": 35.0,
+            "y": 110.0
           },
           {
-            "x": 45.0,
-            "y": 325.0
+            "x": 35.0,
+            "y": 15.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D4"
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "mux1#0",
-          "pinName": "I0"
+          "compName": "Splitter#1",
+          "pinName": "O0"
         },
-        "name": "unnamedWire#27",
+        "name": "unnamedWire#29",
         "path": [
           {
-            "x": 40.0,
-            "y": 275.0
+            "x": 155.0,
+            "y": 135.0
           },
           {
-            "x": 40.0,
-            "y": 35.0
+            "x": 155.0,
+            "y": 90.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "mux1#2",
+          "compName": "mux1#1",
           "pinName": "S0"
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "_WE2"
+          "compName": "Splitter#0",
+          "pinName": "O2"
         },
-        "name": "unnamedWire#28",
+        "name": "unnamedWire#30",
         "path": [
           {
-            "x": 25.0,
-            "y": 125.0
+            "x": 40.0,
+            "y": 55.0
           },
           {
-            "x": 25.0,
-            "y": 175.0
+            "x": 40.0,
+            "y": 120.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "_WE1"
+          "compName": "Splitter#0",
+          "pinName": "O1"
         },
         "pin2": {
-          "compName": "mux1#3",
+          "compName": "mux1#2",
           "pinName": "S0"
         },
-        "name": "unnamedWire#29",
+        "name": "unnamedWire#31",
         "path": [
           {
-            "x": 30.0,
-            "y": 225.0
+            "x": 45.0,
+            "y": 130.0
           },
           {
-            "x": 30.0,
-            "y": 175.0
+            "x": 45.0,
+            "y": 95.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "mux1#1",
+          "compName": "mux1#3",
           "pinName": "S0"
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "_WE3"
+          "compName": "Splitter#0",
+          "pinName": "O0"
         },
-        "name": "unnamedWire#30",
+        "name": "unnamedWire#32",
+        "path": [
+          {
+            "x": 45.0,
+            "y": 135.0
+          },
+          {
+            "x": 45.0,
+            "y": 140.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#2",
+          "pinName": "O0"
+        },
+        "pin2": {
+          "compName": "mux1#3",
+          "pinName": "I0"
+        },
+        "name": "unnamedWire#33",
         "path": [
           {
             "x": 20.0,
-            "y": 75.0
+            "y": 90.0
           },
           {
             "x": 20.0,
-            "y": 125.0
+            "y": 145.0
           }
         ]
       }
Mirror of https://github.com/Mograsim-Team/Mograsim