Changed sub-DFF names order in dff80

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff80.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff80.json
index 3deaa21..dddf204 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff80.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff80.json
@@ -315,15 +315,6 @@
         },
         "params": 1
       },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
-        "pos": {
-          "x": 44.0,
-          "y": 694.0
-        },
-        "params": 1
-      },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#2",
@@ -362,7 +353,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
+        "name": "WireCrossPoint#6",
         "pos": {
           "x": 44.0,
           "y": 614.0
@@ -371,19 +362,28 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
+        "name": "WireCrossPoint#7",
         "pos": {
           "x": 44.0,
           "y": 534.0
         },
         "params": 1
       },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#8",
+        "pos": {
+          "x": 44.0,
+          "y": 694.0
+        },
+        "params": 1
+      },
       {
         "id": "dff8",
         "name": "dff8#0",
         "pos": {
           "x": 50.0,
-          "y": 50.0
+          "y": 770.0
         }
       },
       {
@@ -391,7 +391,7 @@
         "name": "dff8#1",
         "pos": {
           "x": 50.0,
-          "y": 130.0
+          "y": 690.0
         }
       },
       {
@@ -399,7 +399,7 @@
         "name": "dff8#2",
         "pos": {
           "x": 50.0,
-          "y": 210.0
+          "y": 610.0
         }
       },
       {
@@ -407,7 +407,7 @@
         "name": "dff8#3",
         "pos": {
           "x": 50.0,
-          "y": 290.0
+          "y": 530.0
         }
       },
       {
@@ -415,7 +415,7 @@
         "name": "dff8#4",
         "pos": {
           "x": 50.0,
-          "y": 370.0
+          "y": 450.0
         }
       },
       {
@@ -423,7 +423,7 @@
         "name": "dff8#5",
         "pos": {
           "x": 50.0,
-          "y": 450.0
+          "y": 370.0
         }
       },
       {
@@ -431,7 +431,7 @@
         "name": "dff8#6",
         "pos": {
           "x": 50.0,
-          "y": 530.0
+          "y": 290.0
         }
       },
       {
@@ -439,7 +439,7 @@
         "name": "dff8#7",
         "pos": {
           "x": 50.0,
-          "y": 610.0
+          "y": 210.0
         }
       },
       {
@@ -447,7 +447,7 @@
         "name": "dff8#8",
         "pos": {
           "x": 50.0,
-          "y": 690.0
+          "y": 130.0
         }
       },
       {
@@ -455,7 +455,7 @@
         "name": "dff8#9",
         "pos": {
           "x": 50.0,
-          "y": 770.0
+          "y": 50.0
         }
       }
     ],
@@ -1294,7 +1294,7 @@
           "pinName": "I"
         },
         "pin2": {
-          "compName": "dff8#0",
+          "compName": "dff8#9",
           "pinName": "D"
         },
         "name": "unnamedWire#160",
@@ -1302,7 +1302,7 @@
       },
       {
         "pin1": {
-          "compName": "dff8#0",
+          "compName": "dff8#9",
           "pinName": "Q"
         },
         "pin2": {
@@ -1318,7 +1318,7 @@
           "pinName": "I"
         },
         "pin2": {
-          "compName": "dff8#1",
+          "compName": "dff8#8",
           "pinName": "D"
         },
         "name": "unnamedWire#162",
@@ -1330,7 +1330,7 @@
           "pinName": "I"
         },
         "pin2": {
-          "compName": "dff8#2",
+          "compName": "dff8#7",
           "pinName": "D"
         },
         "name": "unnamedWire#163",
@@ -1342,7 +1342,7 @@
           "pinName": "I"
         },
         "pin2": {
-          "compName": "dff8#3",
+          "compName": "dff8#6",
           "pinName": "D"
         },
         "name": "unnamedWire#164",
@@ -1354,7 +1354,7 @@
           "pinName": "I"
         },
         "pin2": {
-          "compName": "dff8#4",
+          "compName": "dff8#5",
           "pinName": "D"
         },
         "name": "unnamedWire#165",
@@ -1366,7 +1366,7 @@
           "pinName": "I"
         },
         "pin2": {
-          "compName": "dff8#5",
+          "compName": "dff8#4",
           "pinName": "D"
         },
         "name": "unnamedWire#166",
@@ -1378,7 +1378,7 @@
           "pinName": "I"
         },
         "pin2": {
-          "compName": "dff8#6",
+          "compName": "dff8#3",
           "pinName": "D"
         },
         "name": "unnamedWire#167",
@@ -1390,7 +1390,7 @@
           "pinName": "I"
         },
         "pin2": {
-          "compName": "dff8#7",
+          "compName": "dff8#2",
           "pinName": "D"
         },
         "name": "unnamedWire#168",
@@ -1402,7 +1402,7 @@
           "pinName": "I"
         },
         "pin2": {
-          "compName": "dff8#8",
+          "compName": "dff8#1",
           "pinName": "D"
         },
         "name": "unnamedWire#169",
@@ -1426,7 +1426,7 @@
           "pinName": "I"
         },
         "pin2": {
-          "compName": "dff8#9",
+          "compName": "dff8#0",
           "pinName": "D"
         },
         "name": "unnamedWire#170",
@@ -1438,7 +1438,7 @@
           "pinName": "I"
         },
         "pin2": {
-          "compName": "dff8#9",
+          "compName": "dff8#0",
           "pinName": "Q"
         },
         "name": "unnamedWire#171",
@@ -1446,7 +1446,7 @@
       },
       {
         "pin1": {
-          "compName": "dff8#8",
+          "compName": "dff8#1",
           "pinName": "Q"
         },
         "pin2": {
@@ -1462,7 +1462,7 @@
           "pinName": "I"
         },
         "pin2": {
-          "compName": "dff8#7",
+          "compName": "dff8#2",
           "pinName": "Q"
         },
         "name": "unnamedWire#173",
@@ -1470,7 +1470,7 @@
       },
       {
         "pin1": {
-          "compName": "dff8#6",
+          "compName": "dff8#3",
           "pinName": "Q"
         },
         "pin2": {
@@ -1486,7 +1486,7 @@
           "pinName": "I"
         },
         "pin2": {
-          "compName": "dff8#5",
+          "compName": "dff8#4",
           "pinName": "Q"
         },
         "name": "unnamedWire#175",
@@ -1494,7 +1494,7 @@
       },
       {
         "pin1": {
-          "compName": "dff8#4",
+          "compName": "dff8#5",
           "pinName": "Q"
         },
         "pin2": {
@@ -1510,7 +1510,7 @@
           "pinName": "I"
         },
         "pin2": {
-          "compName": "dff8#3",
+          "compName": "dff8#6",
           "pinName": "Q"
         },
         "name": "unnamedWire#177",
@@ -1518,7 +1518,7 @@
       },
       {
         "pin1": {
-          "compName": "dff8#2",
+          "compName": "dff8#7",
           "pinName": "Q"
         },
         "pin2": {
@@ -1534,7 +1534,7 @@
           "pinName": "I"
         },
         "pin2": {
-          "compName": "dff8#1",
+          "compName": "dff8#8",
           "pinName": "Q"
         },
         "name": "unnamedWire#179",
@@ -1599,7 +1599,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "dff8#0",
+          "compName": "dff8#9",
           "pinName": "C"
         },
         "name": "unnamedWire#183",
@@ -1611,7 +1611,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "dff8#1",
+          "compName": "dff8#8",
           "pinName": "C"
         },
         "name": "unnamedWire#184",
@@ -1647,7 +1647,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "dff8#2",
+          "compName": "dff8#7",
           "pinName": "C"
         },
         "name": "unnamedWire#187",
@@ -1671,7 +1671,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "dff8#3",
+          "compName": "dff8#6",
           "pinName": "C"
         },
         "name": "unnamedWire#189",
@@ -1707,7 +1707,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "dff8#4",
+          "compName": "dff8#5",
           "pinName": "C"
         },
         "name": "unnamedWire#191",
@@ -1731,7 +1731,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "dff8#5",
+          "compName": "dff8#4",
           "pinName": "C"
         },
         "name": "unnamedWire#193",
@@ -1743,7 +1743,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
         "name": "unnamedWire#194",
@@ -1751,11 +1751,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
         "pin2": {
-          "compName": "dff8#6",
+          "compName": "dff8#3",
           "pinName": "C"
         },
         "name": "unnamedWire#195",
@@ -1763,11 +1763,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
         "name": "unnamedWire#196",
@@ -1775,11 +1775,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
         "pin2": {
-          "compName": "dff8#7",
+          "compName": "dff8#2",
           "pinName": "C"
         },
         "name": "unnamedWire#197",
@@ -1787,11 +1787,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "name": "unnamedWire#198",
@@ -1799,11 +1799,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "pin2": {
-          "compName": "dff8#8",
+          "compName": "dff8#1",
           "pinName": "C"
         },
         "name": "unnamedWire#199",
@@ -1835,11 +1835,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "pin2": {
-          "compName": "dff8#9",
+          "compName": "dff8#0",
           "pinName": "C"
         },
         "name": "unnamedWire#200",