Cleaned dff4

diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
index 2cf5fb1..8415f84 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
@@ -323,12 +323,12 @@
         "id": "Splitter",
         "name": "Splitter#12",
         "pos": {
-          "x": 240.0,
-          "y": 930.0
+          "x": 135.0,
+          "y": 965.0
         },
         "params": {
           "logicWidth": 4,
-          "orientation": "LEFT"
+          "orientation": "RIGHT"
         }
       },
       {
@@ -336,7 +336,7 @@
         "name": "Splitter#13",
         "pos": {
           "x": 135.0,
-          "y": 965.0
+          "y": 1035.0
         },
         "params": {
           "logicWidth": 4,
@@ -347,11 +347,11 @@
         "id": "Splitter",
         "name": "Splitter#14",
         "pos": {
-          "x": 135.0,
-          "y": 1035.0
+          "x": 840.0,
+          "y": 760.0
         },
         "params": {
-          "logicWidth": 4,
+          "logicWidth": 3,
           "orientation": "RIGHT"
         }
       },
@@ -359,20 +359,20 @@
         "id": "Splitter",
         "name": "Splitter#15",
         "pos": {
-          "x": 840.0,
-          "y": 760.0
+          "x": 695.0,
+          "y": 175.0
         },
         "params": {
-          "logicWidth": 3,
-          "orientation": "RIGHT"
+          "logicWidth": 4,
+          "orientation": "LEFT"
         }
       },
       {
         "id": "Splitter",
         "name": "Splitter#16",
         "pos": {
-          "x": 695.0,
-          "y": 175.0
+          "x": 190.0,
+          "y": 930.0
         },
         "params": {
           "logicWidth": 4,
@@ -494,7 +494,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#7",
         "pos": {
-          "x": 254.0,
+          "x": 259.0,
           "y": 944.0
         },
         "params": 4
@@ -673,8 +673,8 @@
         "id": "dff4",
         "name": "dff4#0",
         "pos": {
-          "x": 200.0,
-          "y": 925.0
+          "x": 220.0,
+          "y": 930.0
         }
       },
       {
@@ -737,7 +737,7 @@
     "wires": [
       {
         "pin1": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#14",
           "pinName": "O0"
         },
         "pin2": {
@@ -963,7 +963,7 @@
           "pinName": "O7"
         },
         "pin2": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#14",
           "pinName": "O1"
         },
         "name": "unnamedWire#15",
@@ -1002,12 +1002,12 @@
             "y": 900.0
           },
           {
-            "x": 195.0,
+            "x": 210.0,
             "y": 900.0
           },
           {
-            "x": 195.0,
-            "y": 970.0
+            "x": 210.0,
+            "y": 955.0
           }
         ]
       },
@@ -1307,7 +1307,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#15",
           "pinName": "O3"
         },
         "pin2": {
@@ -1319,7 +1319,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#15",
           "pinName": "O2"
         },
         "pin2": {
@@ -1331,7 +1331,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#15",
           "pinName": "O1"
         },
         "pin2": {
@@ -1347,7 +1347,7 @@
           "pinName": "QA1"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#15",
           "pinName": "O0"
         },
         "name": "unnamedWire#38",
@@ -1664,60 +1664,60 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#12",
-          "pinName": "O3"
+          "compName": "dff4#0",
+          "pinName": "Q"
         },
         "pin2": {
-          "compName": "dff4#0",
-          "pinName": "Q4"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
         },
         "name": "unnamedWire#57",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#12",
-          "pinName": "O2"
+          "compName": "Splitter#16",
+          "pinName": "I"
         },
         "pin2": {
           "compName": "dff4#0",
-          "pinName": "Q3"
+          "pinName": "D"
         },
         "name": "unnamedWire#58",
         "path": []
       },
       {
         "pin1": {
-          "compName": "dff4#0",
-          "pinName": "Q2"
+          "compName": "sel3_4#1",
+          "pinName": "Y4"
         },
         "pin2": {
-          "compName": "Splitter#12",
-          "pinName": "O1"
+          "compName": "Splitter#16",
+          "pinName": "O3"
         },
         "name": "unnamedWire#59",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#12",
-          "pinName": "O0"
+          "compName": "sel3_4#1",
+          "pinName": "Y3"
         },
         "pin2": {
-          "compName": "dff4#0",
-          "pinName": "Q1"
+          "compName": "Splitter#16",
+          "pinName": "O2"
         },
         "name": "unnamedWire#60",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#12",
-          "pinName": "I"
+          "compName": "sel3_4#1",
+          "pinName": "Y2"
         },
         "pin2": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
+          "compName": "Splitter#16",
+          "pinName": "O1"
         },
         "name": "unnamedWire#61",
         "path": []
@@ -1769,7 +1769,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#13",
           "pinName": "O2"
         },
         "pin2": {
@@ -1781,7 +1781,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#13",
           "pinName": "O1"
         },
         "pin2": {
@@ -1797,7 +1797,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#13",
           "pinName": "I"
         },
         "name": "unnamedWire#67",
@@ -1819,7 +1819,7 @@
             "y": 1090.0
           },
           {
-            "x": 255.0,
+            "x": 260.0,
             "y": 1090.0
           }
         ]
@@ -1843,7 +1843,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#14",
           "pinName": "O2"
         },
         "pin2": {
@@ -1876,7 +1876,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#12",
           "pinName": "I"
         },
         "pin2": {
@@ -1929,7 +1929,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#12",
           "pinName": "O0"
         },
         "pin2": {
@@ -1941,7 +1941,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#13",
           "pinName": "O3"
         },
         "pin2": {
@@ -1978,50 +1978,14 @@
       },
       {
         "pin1": {
-          "compName": "sel3_4#1",
-          "pinName": "Y1"
-        },
-        "pin2": {
-          "compName": "dff4#0",
-          "pinName": "D1"
-        },
-        "name": "unnamedWire#79",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "sel3_4#1",
-          "pinName": "Y2"
-        },
-        "pin2": {
-          "compName": "dff4#0",
-          "pinName": "D2"
-        },
-        "name": "unnamedWire#80",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "sel3_4#1",
-          "pinName": "Y3"
+          "compName": "Splitter#16",
+          "pinName": "O0"
         },
         "pin2": {
-          "compName": "dff4#0",
-          "pinName": "D3"
-        },
-        "name": "unnamedWire#81",
-        "path": []
-      },
-      {
-        "pin1": {
           "compName": "sel3_4#1",
-          "pinName": "Y4"
-        },
-        "pin2": {
-          "compName": "dff4#0",
-          "pinName": "D4"
+          "pinName": "Y1"
         },
-        "name": "unnamedWire#82",
+        "name": "unnamedWire#79",
         "path": []
       },
       {
@@ -2033,7 +1997,7 @@
           "compName": "_submodelinterface",
           "pinName": "Cn+4"
         },
-        "name": "unnamedWire#83",
+        "name": "unnamedWire#80",
         "path": [
           {
             "x": 615.0,
@@ -2054,7 +2018,7 @@
           "compName": "_submodelinterface",
           "pinName": "OVR"
         },
-        "name": "unnamedWire#84",
+        "name": "unnamedWire#81",
         "path": [
           {
             "x": 610.0,
@@ -2083,7 +2047,7 @@
           "compName": "TriStateBuffer#3",
           "pinName": "IN"
         },
-        "name": "unnamedWire#85",
+        "name": "unnamedWire#82",
         "path": [
           {
             "x": 365.0,
@@ -2100,7 +2064,7 @@
           "compName": "or4#0",
           "pinName": "A1"
         },
-        "name": "unnamedWire#86",
+        "name": "unnamedWire#83",
         "path": []
       },
       {
@@ -2112,7 +2076,7 @@
           "compName": "WireCrossPoint#11",
           "pinName": ""
         },
-        "name": "unnamedWire#87",
+        "name": "unnamedWire#84",
         "path": []
       },
       {
@@ -2124,7 +2088,7 @@
           "compName": "TriStateBuffer#3",
           "pinName": "EN"
         },
-        "name": "unnamedWire#88",
+        "name": "unnamedWire#85",
         "path": []
       },
       {
@@ -2136,7 +2100,7 @@
           "compName": "sel3_4#0",
           "pinName": "C4"
         },
-        "name": "unnamedWire#89",
+        "name": "unnamedWire#86",
         "path": [
           {
             "x": 435.0,
@@ -2169,7 +2133,7 @@
           "compName": "_submodelinterface",
           "pinName": "RAMn+3"
         },
-        "name": "unnamedWire#90",
+        "name": "unnamedWire#87",
         "path": [
           {
             "x": 455.0,
@@ -2190,7 +2154,7 @@
           "compName": "or4#0",
           "pinName": "A2"
         },
-        "name": "unnamedWire#91",
+        "name": "unnamedWire#88",
         "path": []
       },
       {
@@ -2202,7 +2166,7 @@
           "compName": "or4#0",
           "pinName": "A3"
         },
-        "name": "unnamedWire#92",
+        "name": "unnamedWire#89",
         "path": []
       },
       {
@@ -2214,7 +2178,7 @@
           "compName": "or4#0",
           "pinName": "A4"
         },
-        "name": "unnamedWire#93",
+        "name": "unnamedWire#90",
         "path": []
       },
       {
@@ -2226,7 +2190,7 @@
           "compName": "Splitter#4",
           "pinName": "I"
         },
-        "name": "unnamedWire#94",
+        "name": "unnamedWire#91",
         "path": []
       },
       {
@@ -2238,7 +2202,7 @@
           "compName": "WireCrossPoint#13",
           "pinName": ""
         },
-        "name": "unnamedWire#95",
+        "name": "unnamedWire#92",
         "path": []
       },
       {
@@ -2250,7 +2214,7 @@
           "compName": "WireCrossPoint#25",
           "pinName": ""
         },
-        "name": "unnamedWire#96",
+        "name": "unnamedWire#93",
         "path": [
           {
             "x": 380.0,
@@ -2267,7 +2231,7 @@
           "compName": "WireCrossPoint#13",
           "pinName": ""
         },
-        "name": "unnamedWire#97",
+        "name": "unnamedWire#94",
         "path": [
           {
             "x": 105.0,
@@ -2284,7 +2248,7 @@
           "compName": "Splitter#5",
           "pinName": "I"
         },
-        "name": "unnamedWire#98",
+        "name": "unnamedWire#95",
         "path": []
       },
       {
@@ -2296,7 +2260,7 @@
           "compName": "Splitter#5",
           "pinName": "O2"
         },
-        "name": "unnamedWire#99",
+        "name": "unnamedWire#96",
         "path": []
       },
       {
@@ -2308,7 +2272,7 @@
           "compName": "sel3_4#0",
           "pinName": "A3"
         },
-        "name": "unnamedWire#100",
+        "name": "unnamedWire#97",
         "path": []
       },
       {
@@ -2320,7 +2284,7 @@
           "compName": "sel3_4#0",
           "pinName": "A2"
         },
-        "name": "unnamedWire#101",
+        "name": "unnamedWire#98",
         "path": []
       },
       {
@@ -2332,7 +2296,7 @@
           "compName": "sel3_4#0",
           "pinName": "B1"
         },
-        "name": "unnamedWire#102",
+        "name": "unnamedWire#99",
         "path": []
       },
       {
@@ -2344,7 +2308,7 @@
           "compName": "sel3_4#0",
           "pinName": "B2"
         },
-        "name": "unnamedWire#103",
+        "name": "unnamedWire#100",
         "path": []
       },
       {
@@ -2356,7 +2320,7 @@
           "compName": "sel3_4#0",
           "pinName": "B3"
         },
-        "name": "unnamedWire#104",
+        "name": "unnamedWire#101",
         "path": []
       },
       {
@@ -2368,7 +2332,7 @@
           "compName": "WireCrossPoint#18",
           "pinName": ""
         },
-        "name": "unnamedWire#105",
+        "name": "unnamedWire#102",
         "path": [
           {
             "x": 100.0,
@@ -2385,7 +2349,7 @@
           "compName": "sel3_4#0",
           "pinName": "B4"
         },
-        "name": "unnamedWire#106",
+        "name": "unnamedWire#103",
         "path": []
       },
       {
@@ -2397,7 +2361,7 @@
           "compName": "WireCrossPoint#15",
           "pinName": ""
         },
-        "name": "unnamedWire#107",
+        "name": "unnamedWire#104",
         "path": []
       },
       {
@@ -2409,7 +2373,7 @@
           "compName": "WireCrossPoint#14",
           "pinName": ""
         },
-        "name": "unnamedWire#108",
+        "name": "unnamedWire#105",
         "path": []
       },
       {
@@ -2421,7 +2385,7 @@
           "compName": "sel3_4#0",
           "pinName": "C3"
         },
-        "name": "unnamedWire#109",
+        "name": "unnamedWire#106",
         "path": []
       },
       {
@@ -2433,7 +2397,7 @@
           "compName": "sel3_4#0",
           "pinName": "C2"
         },
-        "name": "unnamedWire#110",
+        "name": "unnamedWire#107",
         "path": []
       },
       {
@@ -2445,7 +2409,7 @@
           "compName": "sel3_4#0",
           "pinName": "C1"
         },
-        "name": "unnamedWire#111",
+        "name": "unnamedWire#108",
         "path": []
       },
       {
@@ -2457,7 +2421,7 @@
           "compName": "WireCrossPoint#16",
           "pinName": ""
         },
-        "name": "unnamedWire#112",
+        "name": "unnamedWire#109",
         "path": []
       },
       {
@@ -2469,31 +2433,31 @@
           "compName": "Splitter#7",
           "pinName": "I"
         },
-        "name": "unnamedWire#113",
+        "name": "unnamedWire#110",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#12",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "A3"
         },
-        "name": "unnamedWire#114",
+        "name": "unnamedWire#111",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#12",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "A4"
         },
-        "name": "unnamedWire#115",
+        "name": "unnamedWire#112",
         "path": []
       },
       {
@@ -2505,7 +2469,7 @@
           "compName": "WireCrossPoint#16",
           "pinName": ""
         },
-        "name": "unnamedWire#116",
+        "name": "unnamedWire#113",
         "path": [
           {
             "x": 105.0,
@@ -2522,7 +2486,7 @@
           "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
           "pinName": "F"
         },
-        "name": "unnamedWire#117",
+        "name": "unnamedWire#114",
         "path": [
           {
             "x": 610.0,
@@ -2543,7 +2507,7 @@
           "compName": "TriStateBuffer#0",
           "pinName": "IN"
         },
-        "name": "unnamedWire#118",
+        "name": "unnamedWire#115",
         "path": []
       },
       {
@@ -2555,7 +2519,7 @@
           "compName": "ram4#0",
           "pinName": "D1"
         },
-        "name": "unnamedWire#119",
+        "name": "unnamedWire#116",
         "path": [
           {
             "x": 195.0,
@@ -2576,7 +2540,7 @@
           "compName": "ram4#0",
           "pinName": "D2"
         },
-        "name": "unnamedWire#120",
+        "name": "unnamedWire#117",
         "path": [
           {
             "x": 200.0,
@@ -2597,7 +2561,7 @@
           "compName": "ram4#0",
           "pinName": "D3"
         },
-        "name": "unnamedWire#121",
+        "name": "unnamedWire#118",
         "path": [
           {
             "x": 205.0,
@@ -2618,7 +2582,7 @@
           "compName": "ram4#0",
           "pinName": "D4"
         },
-        "name": "unnamedWire#122",
+        "name": "unnamedWire#119",
         "path": [
           {
             "x": 210.0,
@@ -2639,7 +2603,7 @@
           "compName": "and#0",
           "pinName": "A"
         },
-        "name": "unnamedWire#123",
+        "name": "unnamedWire#120",
         "path": []
       },
       {
@@ -2651,7 +2615,7 @@
           "compName": "and#0",
           "pinName": "B"
         },
-        "name": "unnamedWire#124"
+        "name": "unnamedWire#121"
       },
       {
         "pin1": {
@@ -2662,7 +2626,7 @@
           "compName": "ram4#0",
           "pinName": "WE"
         },
-        "name": "unnamedWire#125",
+        "name": "unnamedWire#122",
         "path": [
           {
             "x": 630.0,
@@ -2683,7 +2647,7 @@
           "compName": "dff4#0",
           "pinName": "WE"
         },
-        "name": "unnamedWire#126",
+        "name": "unnamedWire#123",
         "path": [
           {
             "x": 450.0,
@@ -2694,12 +2658,12 @@
             "y": 245.0
           },
           {
-            "x": 190.0,
+            "x": 215.0,
             "y": 245.0
           },
           {
-            "x": 190.0,
-            "y": 980.0
+            "x": 215.0,
+            "y": 935.0
           }
         ]
       },
@@ -2712,7 +2676,7 @@
           "compName": "TriStateBuffer#2",
           "pinName": "IN"
         },
-        "name": "unnamedWire#127",
+        "name": "unnamedWire#124",
         "path": []
       },
       {
@@ -2724,7 +2688,7 @@
           "compName": "WireCrossPoint#17",
           "pinName": ""
         },
-        "name": "unnamedWire#128",
+        "name": "unnamedWire#125",
         "path": []
       },
       {
@@ -2736,7 +2700,7 @@
           "compName": "NandGate#1",
           "pinName": "A"
         },
-        "name": "unnamedWire#129",
+        "name": "unnamedWire#126",
         "path": [
           {
             "x": 415.0,
@@ -2753,7 +2717,7 @@
           "compName": "NandGate#1",
           "pinName": "B"
         },
-        "name": "unnamedWire#130",
+        "name": "unnamedWire#127",
         "path": [
           {
             "x": 415.0,
@@ -2770,7 +2734,7 @@
           "compName": "_submodelinterface",
           "pinName": "F\u003d0"
         },
-        "name": "unnamedWire#131",
+        "name": "unnamedWire#128",
         "path": [
           {
             "x": 445.0,
@@ -2799,7 +2763,7 @@
           "compName": "TriStateBuffer#0",
           "pinName": "OUT"
         },
-        "name": "unnamedWire#132",
+        "name": "unnamedWire#129",
         "path": [
           {
             "x": 100.0,
@@ -2824,7 +2788,7 @@
           "compName": "Splitter#11",
           "pinName": "I"
         },
-        "name": "unnamedWire#133",
+        "name": "unnamedWire#130",
         "path": []
       },
       {
@@ -2836,7 +2800,7 @@
           "compName": "sel3_4#0",
           "pinName": "A1"
         },
-        "name": "unnamedWire#134",
+        "name": "unnamedWire#131",
         "path": [
           {
             "x": 100.0,
@@ -2853,7 +2817,7 @@
           "compName": "TriStateBuffer#1",
           "pinName": "OUT"
         },
-        "name": "unnamedWire#135",
+        "name": "unnamedWire#132",
         "path": [
           {
             "x": 100.0,
@@ -2874,7 +2838,7 @@
           "compName": "WireCrossPoint#5",
           "pinName": ""
         },
-        "name": "unnamedWire#136",
+        "name": "unnamedWire#133",
         "path": []
       },
       {
@@ -2886,7 +2850,7 @@
           "compName": "TriStateBuffer#1",
           "pinName": "EN"
         },
-        "name": "unnamedWire#137",
+        "name": "unnamedWire#134",
         "path": [
           {
             "x": 395.0,
@@ -2907,7 +2871,7 @@
           "compName": "TriStateBuffer#0",
           "pinName": "EN"
         },
-        "name": "unnamedWire#138",
+        "name": "unnamedWire#135",
         "path": []
       },
       {
@@ -2919,7 +2883,7 @@
           "compName": "WireCrossPoint#20",
           "pinName": ""
         },
-        "name": "unnamedWire#139",
+        "name": "unnamedWire#136",
         "path": []
       },
       {
@@ -2931,7 +2895,7 @@
           "compName": "WireCrossPoint#3",
           "pinName": ""
         },
-        "name": "unnamedWire#140",
+        "name": "unnamedWire#137",
         "path": []
       },
       {
@@ -2943,7 +2907,7 @@
           "compName": "WireCrossPoint#23",
           "pinName": ""
         },
-        "name": "unnamedWire#141",
+        "name": "unnamedWire#138",
         "path": []
       },
       {
@@ -2955,7 +2919,7 @@
           "compName": "WireCrossPoint#23",
           "pinName": ""
         },
-        "name": "unnamedWire#142",
+        "name": "unnamedWire#139",
         "path": []
       },
       {
@@ -2967,7 +2931,7 @@
           "compName": "WireCrossPoint#24",
           "pinName": ""
         },
-        "name": "unnamedWire#143",
+        "name": "unnamedWire#140",
         "path": [
           {
             "x": 145.0,
@@ -2988,7 +2952,7 @@
           "compName": "TriStateBuffer#2",
           "pinName": "OUT"
         },
-        "name": "unnamedWire#144",
+        "name": "unnamedWire#141",
         "path": [
           {
             "x": 425.0,
@@ -3005,7 +2969,7 @@
           "compName": "_submodelinterface",
           "pinName": "Qn+3"
         },
-        "name": "unnamedWire#145",
+        "name": "unnamedWire#142",
         "path": [
           {
             "x": 425.0,
@@ -3022,19 +2986,19 @@
           "compName": "WireCrossPoint#25",
           "pinName": ""
         },
-        "name": "unnamedWire#146",
+        "name": "unnamedWire#143",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#14",
           "pinName": "I"
         },
         "pin2": {
           "compName": "Am2901DestDecode#0",
           "pinName": "I"
         },
-        "name": "unnamedWire#147",
+        "name": "unnamedWire#144",
         "path": [
           {
             "x": 835.0,
@@ -3056,14 +3020,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#15",
           "pinName": "I"
         },
         "pin2": {
           "compName": "dlatch4#0",
           "pinName": "D"
         },
-        "name": "unnamedWire#148",
+        "name": "unnamedWire#145",
         "path": []
       }
     ],

diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json
index cb73c0e..b7b85a9 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json
@@ -1,92 +1,38 @@
 {
   "width": 35.0,
-  "height": 60.0,
+  "height": 30.0,
   "interfacePins": [
     {
       "location": {
         "x": 0.0,
-        "y": 45.0
+        "y": 25.0
       },
       "name": "C",
       "logicWidth": 1,
       "usage": "INPUT"
     },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 5.0
-      },
-      "name": "D1",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
     {
       "location": {
         "x": 0.0,
         "y": 15.0
       },
-      "name": "D2",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 25.0
-      },
-      "name": "D3",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 35.0
-      },
-      "name": "D4",
-      "logicWidth": 1,
+      "name": "D",
+      "logicWidth": 4,
       "usage": "INPUT"
     },
-    {
-      "location": {
-        "x": 35.0,
-        "y": 5.0
-      },
-      "name": "Q1",
-      "logicWidth": 1,
-      "usage": "OUTPUT"
-    },
     {
       "location": {
         "x": 35.0,
         "y": 15.0
       },
-      "name": "Q2",
-      "logicWidth": 1,
-      "usage": "OUTPUT"
-    },
-    {
-      "location": {
-        "x": 35.0,
-        "y": 25.0
-      },
-      "name": "Q3",
-      "logicWidth": 1,
-      "usage": "OUTPUT"
-    },
-    {
-      "location": {
-        "x": 35.0,
-        "y": 35.0
-      },
-      "name": "Q4",
-      "logicWidth": 1,
+      "name": "Q",
+      "logicWidth": 4,
       "usage": "OUTPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 55.0
+        "y": 5.0
       },
       "name": "WE",
       "logicWidth": 1,
@@ -100,20 +46,8 @@
         "id": "Splitter",
         "name": "Splitter#0",
         "pos": {
-          "x": 140.0,
-          "y": 200.0
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "RIGHT"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#1",
-        "pos": {
-          "x": 25.0,
-          "y": 105.0
+          "x": 155.0,
+          "y": 60.0
         },
         "params": {
           "logicWidth": 4,
@@ -122,10 +56,10 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#2",
+        "name": "Splitter#1",
         "pos": {
-          "x": 75.0,
-          "y": 100.0
+          "x": 70.0,
+          "y": 25.0
         },
         "params": {
           "logicWidth": 4,
@@ -136,8 +70,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
         "pos": {
-          "x": 109.0,
-          "y": 184.0
+          "x": 99.0,
+          "y": 109.0
         },
         "params": 1
       },
@@ -145,8 +79,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#1",
         "pos": {
-          "x": 109.0,
-          "y": 84.0
+          "x": 99.0,
+          "y": 59.0
         },
         "params": 1
       },
@@ -154,8 +88,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#2",
         "pos": {
-          "x": 109.0,
-          "y": 134.0
+          "x": 99.0,
+          "y": 84.0
         },
         "params": 1
       },
@@ -164,42 +98,15 @@
         "name": "WireCrossPoint#3",
         "pos": {
           "x": 169.0,
-          "y": 24.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
-        "pos": {
-          "x": 164.0,
           "y": 74.0
         },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
-        "pos": {
-          "x": 159.0,
-          "y": 124.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
-        "pos": {
-          "x": 154.0,
-          "y": 174.0
-        },
-        "params": 1
+        "params": 4
       },
       {
         "id": "dff",
         "name": "dff#0",
         "pos": {
-          "x": 115.0,
+          "x": 105.0,
           "y": 20.0
         }
       },
@@ -207,32 +114,32 @@
         "id": "dff",
         "name": "dff#1",
         "pos": {
-          "x": 115.0,
-          "y": 70.0
+          "x": 105.0,
+          "y": 45.0
         }
       },
       {
         "id": "dff",
         "name": "dff#2",
         "pos": {
-          "x": 115.0,
-          "y": 120.0
+          "x": 105.0,
+          "y": 70.0
         }
       },
       {
         "id": "dff",
         "name": "dff#3",
         "pos": {
-          "x": 115.0,
-          "y": 170.0
+          "x": 105.0,
+          "y": 95.0
         }
       },
       {
         "id": "mux1_4",
         "name": "mux1_4#0",
         "pos": {
-          "x": 40.0,
-          "y": 5.0
+          "x": 15.0,
+          "y": 20.0
         }
       }
     ],
@@ -249,36 +156,27 @@
         "name": "unnamedWire#0",
         "path": [
           {
-            "x": 110.0,
+            "x": 100.0,
             "y": 35.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O0"
+          "compName": "Splitter#1",
+          "pinName": "O3"
         },
         "pin2": {
           "compName": "dff#0",
           "pinName": "D"
         },
         "name": "unnamedWire#1",
-        "path": [
-          {
-            "x": 105.0,
-            "y": 130.0
-          },
-          {
-            "x": 105.0,
-            "y": 25.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O1"
+          "compName": "Splitter#1",
+          "pinName": "O2"
         },
         "pin2": {
           "compName": "dff#1",
@@ -287,12 +185,12 @@
         "name": "unnamedWire#2",
         "path": [
           {
-            "x": 100.0,
-            "y": 120.0
+            "x": 95.0,
+            "y": 35.0
           },
           {
-            "x": 100.0,
-            "y": 75.0
+            "x": 95.0,
+            "y": 50.0
           }
         ]
       },
@@ -368,12 +266,8 @@
         "name": "unnamedWire#8",
         "path": [
           {
-            "x": 20.0,
-            "y": 225.0
-          },
-          {
-            "x": 20.0,
-            "y": 185.0
+            "x": 100.0,
+            "y": 125.0
           }
         ]
       },
@@ -387,401 +281,215 @@
           "pinName": "S0"
         },
         "name": "unnamedWire#9",
-        "path": [
-          {
-            "x": 45.0,
-            "y": 275.0
-          },
-          {
-            "x": 45.0,
-            "y": 95.0
-          },
-          {
-            "x": 30.0,
-            "y": 95.0
-          },
-          {
-            "x": 30.0,
-            "y": 10.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
           "compName": "_submodelinterface",
-          "pinName": "D1"
+          "pinName": "D"
         },
         "pin2": {
-          "compName": "Splitter#1",
-          "pinName": "O0"
+          "compName": "mux1_4#0",
+          "pinName": "I1"
         },
         "name": "unnamedWire#10",
         "path": [
           {
-            "x": 20.0,
-            "y": 25.0
-          },
-          {
-            "x": 20.0,
-            "y": 135.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D2"
-        },
-        "pin2": {
-          "compName": "Splitter#1",
-          "pinName": "O1"
-        },
-        "name": "unnamedWire#11",
-        "path": [
-          {
-            "x": 15.0,
+            "x": 5.0,
             "y": 75.0
           },
           {
-            "x": 15.0,
-            "y": 125.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D3"
-        },
-        "pin2": {
-          "compName": "Splitter#1",
-          "pinName": "O2"
-        },
-        "name": "unnamedWire#12",
-        "path": [
-          {
-            "x": 10.0,
-            "y": 125.0
-          },
-          {
-            "x": 10.0,
-            "y": 115.0
+            "x": 5.0,
+            "y": 70.0
           }
         ]
       },
-      {
-        "pin1": {
-          "compName": "dff#0",
-          "pinName": "Q"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "name": "unnamedWire#13",
-        "path": []
-      },
       {
         "pin1": {
           "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Q1"
-        },
-        "name": "unnamedWire#14",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "Q2"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "Splitter#0",
+          "pinName": "I"
         },
-        "name": "unnamedWire#15",
+        "name": "unnamedWire#11",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "pin2": {
-          "compName": "dff#1",
-          "pinName": "Q"
-        },
-        "name": "unnamedWire#16",
-        "path": []
-      },
-      {
-        "pin1": {
           "compName": "_submodelinterface",
-          "pinName": "D4"
-        },
-        "pin2": {
-          "compName": "Splitter#1",
-          "pinName": "O3"
-        },
-        "name": "unnamedWire#17",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 175.0
-          },
-          {
-            "x": 5.0,
-            "y": 105.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "dff#2",
           "pinName": "Q"
         },
-        "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
-        },
-        "name": "unnamedWire#18",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Q3"
-        },
-        "name": "unnamedWire#19",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Q4"
-        },
-        "name": "unnamedWire#20",
+        "name": "unnamedWire#12",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "pin2": {
-          "compName": "dff#3",
-          "pinName": "Q"
-        },
-        "name": "unnamedWire#21",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O2"
-        },
-        "pin2": {
-          "compName": "dff#2",
-          "pinName": "D"
+          "compName": "mux1_4#0",
+          "pinName": "I0"
         },
-        "name": "unnamedWire#22",
+        "name": "unnamedWire#13",
         "path": [
           {
-            "x": 95.0,
-            "y": 110.0
+            "x": 170.0,
+            "y": 140.0
           },
           {
-            "x": 95.0,
-            "y": 125.0
+            "x": 10.0,
+            "y": 140.0
+          },
+          {
+            "x": 10.0,
+            "y": 40.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O3"
+          "compName": "dff#2",
+          "pinName": "D"
         },
         "pin2": {
-          "compName": "dff#3",
-          "pinName": "D"
+          "compName": "Splitter#1",
+          "pinName": "O1"
         },
-        "name": "unnamedWire#23",
+        "name": "unnamedWire#14",
         "path": [
           {
             "x": 90.0,
-            "y": 100.0
+            "y": 75.0
           },
           {
             "x": 90.0,
-            "y": 175.0
+            "y": 45.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "dff#3",
+          "pinName": "D"
         },
-        "name": "unnamedWire#24",
+        "name": "unnamedWire#15",
         "path": [
           {
-            "x": 170.0,
-            "y": 230.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O1"
-        },
-        "name": "unnamedWire#25",
-        "path": [
+            "x": 85.0,
+            "y": 55.0
+          },
           {
-            "x": 165.0,
-            "y": 220.0
+            "x": 85.0,
+            "y": 100.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "dff#0",
+          "pinName": "Q"
         },
         "pin2": {
           "compName": "Splitter#0",
-          "pinName": "O2"
+          "pinName": "O3"
         },
-        "name": "unnamedWire#26",
+        "name": "unnamedWire#16",
         "path": [
           {
-            "x": 160.0,
-            "y": 210.0
+            "x": 150.0,
+            "y": 25.0
+          },
+          {
+            "x": 150.0,
+            "y": 60.0
           }
         ]
       },
       {
         "pin1": {
           "compName": "Splitter#0",
-          "pinName": "O3"
+          "pinName": "O2"
         },
         "pin2": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
+          "compName": "dff#1",
+          "pinName": "Q"
         },
-        "name": "unnamedWire#27",
+        "name": "unnamedWire#17",
         "path": [
           {
-            "x": 155.0,
-            "y": 200.0
+            "x": 145.0,
+            "y": 70.0
+          },
+          {
+            "x": 145.0,
+            "y": 50.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "I"
+          "compName": "dff#2",
+          "pinName": "Q"
         },
         "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "I0"
+          "compName": "Splitter#0",
+          "pinName": "O1"
         },
-        "name": "unnamedWire#28",
+        "name": "unnamedWire#18",
         "path": [
           {
-            "x": 50.0,
-            "y": 215.0
-          },
-          {
-            "x": 50.0,
-            "y": 90.0
-          },
-          {
-            "x": 35.0,
-            "y": 90.0
+            "x": 145.0,
+            "y": 75.0
           },
           {
-            "x": 35.0,
-            "y": 25.0
+            "x": 145.0,
+            "y": 80.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "I"
+          "compName": "Splitter#0",
+          "pinName": "O0"
         },
         "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "I1"
+          "compName": "dff#3",
+          "pinName": "Q"
         },
-        "name": "unnamedWire#29",
+        "name": "unnamedWire#19",
         "path": [
           {
-            "x": 40.0,
-            "y": 120.0
-          },
-          {
-            "x": 40.0,
-            "y": 100.0
+            "x": 145.0,
+            "y": 90.0
           },
           {
-            "x": 25.0,
+            "x": 145.0,
             "y": 100.0
-          },
-          {
-            "x": 25.0,
-            "y": 55.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "Splitter#2",
+          "compName": "Splitter#1",
           "pinName": "I"
         },
         "pin2": {
           "compName": "mux1_4#0",
           "pinName": "Y"
         },
-        "name": "unnamedWire#30",
-        "path": [
-          {
-            "x": 70.0,
-            "y": 115.0
-          },
-          {
-            "x": 70.0,
-            "y": 90.0
-          },
-          {
-            "x": 95.0,
-            "y": 90.0
-          },
-          {
-            "x": 95.0,
-            "y": 25.0
-          }
-        ]
+        "name": "unnamedWire#20",
+        "path": []
       }
     ],
     "version": "0.1.1"
@@ -819,28 +527,28 @@
       "q1": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "dff#0",
+          "delegateTarget": "dff#3",
           "subStateID": "q"
         }
       },
       "q2": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "dff#1",
+          "delegateTarget": "dff#2",
           "subStateID": "q"
         }
       },
       "q3": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "dff#2",
+          "delegateTarget": "dff#1",
           "subStateID": "q"
         }
       },
       "q4": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "dff#3",
+          "delegateTarget": "dff#0",
           "subStateID": "q"
         }
       }