X-Git-Url: https://mograsim.net/gitweb/?p=Mograsim.git;a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fdff8.json;h=99b59a7a29bd96f0837ea026ece1b33befed80bb;hp=8c2a5b3bbdec5b821e7a601c960c295cd7ead674;hb=5c03a4fa605a1c3946eddece3b566b5aa0677759;hpb=9e8e8ae5414f52ec87f9247b10a525f41768c7dc

diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff8.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff8.json
index 8c2a5b3b..99b59a7a 100644
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff8.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff8.json
@@ -68,16 +68,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
-        "pos": {
-          "x": 89.0,
-          "y": 74.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
+        "name": "WireCrossPoint#1",
         "pos": {
           "x": 39.0,
           "y": 54.0
@@ -86,7 +77,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
+        "name": "WireCrossPoint#2",
         "pos": {
           "x": 39.0,
           "y": 84.0
@@ -95,7 +86,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
+        "name": "WireCrossPoint#3",
         "pos": {
           "x": 89.0,
           "y": 104.0
@@ -104,7 +95,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
+        "name": "WireCrossPoint#4",
         "pos": {
           "x": 89.0,
           "y": 44.0
@@ -112,24 +103,17 @@
         "params": 1
       },
       {
-        "id": "dff",
-        "name": "dff#10",
-        "pos": {
-          "x": 95.0,
-          "y": 60.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "dff#11",
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#5",
         "pos": {
-          "x": 45.0,
-          "y": 40.0
-        }
+          "x": 89.0,
+          "y": 74.0
+        },
+        "params": 1
       },
       {
         "id": "dff",
-        "name": "dff#4",
+        "name": "dff#0",
         "pos": {
           "x": 45.0,
           "y": 10.0
@@ -137,7 +121,7 @@
       },
       {
         "id": "dff",
-        "name": "dff#5",
+        "name": "dff#1",
         "pos": {
           "x": 95.0,
           "y": 90.0
@@ -145,7 +129,7 @@
       },
       {
         "id": "dff",
-        "name": "dff#6",
+        "name": "dff#2",
         "pos": {
           "x": 95.0,
           "y": 120.0
@@ -153,7 +137,7 @@
       },
       {
         "id": "dff",
-        "name": "dff#7",
+        "name": "dff#3",
         "pos": {
           "x": 45.0,
           "y": 100.0
@@ -161,7 +145,7 @@
       },
       {
         "id": "dff",
-        "name": "dff#8",
+        "name": "dff#4",
         "pos": {
           "x": 45.0,
           "y": 70.0
@@ -169,11 +153,27 @@
       },
       {
         "id": "dff",
-        "name": "dff#9",
+        "name": "dff#5",
         "pos": {
           "x": 95.0,
           "y": 30.0
         }
+      },
+      {
+        "id": "dff",
+        "name": "dff#6",
+        "pos": {
+          "x": 95.0,
+          "y": 60.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#7",
+        "pos": {
+          "x": 45.0,
+          "y": 40.0
+        }
       }
     ],
     "wires": [
@@ -183,7 +183,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "name": "unnamedWire#0",
@@ -212,14 +212,104 @@
       },
       {
         "pin1": {
-          "compName": "dff#11",
+          "compName": "_submodelinterface",
+          "pinName": "D"
+        },
+        "pin2": {
+          "compName": "Splitter#0",
+          "pinName": "I"
+        },
+        "name": "unnamedWire#2",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#1",
+          "pinName": "I"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Q"
+        },
+        "name": "unnamedWire#3",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "name": "unnamedWire#4",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "dff#0",
+          "pinName": "C"
+        },
+        "name": "unnamedWire#5",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "dff#0",
+          "pinName": "D"
+        },
+        "pin2": {
+          "compName": "Splitter#0",
+          "pinName": "O7"
+        },
+        "name": "unnamedWire#6",
+        "path": [
+          {
+            "x": 20.0,
+            "y": 15.0
+          },
+          {
+            "x": 20.0,
+            "y": 40.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#0",
+          "pinName": "O6"
+        },
+        "pin2": {
+          "compName": "dff#5",
+          "pinName": "D"
+        },
+        "name": "unnamedWire#7",
+        "path": [
+          {
+            "x": 25.0,
+            "y": 50.0
+          },
+          {
+            "x": 25.0,
+            "y": 35.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "dff#7",
           "pinName": "D"
         },
         "pin2": {
           "compName": "Splitter#0",
           "pinName": "O5"
         },
-        "name": "unnamedWire#10",
+        "name": "unnamedWire#8",
         "path": [
           {
             "x": 30.0,
@@ -237,10 +327,10 @@
           "pinName": "O4"
         },
         "pin2": {
-          "compName": "dff#10",
+          "compName": "dff#6",
           "pinName": "D"
         },
-        "name": "unnamedWire#11",
+        "name": "unnamedWire#9",
         "path": [
           {
             "x": 25.0,
@@ -254,14 +344,14 @@
       },
       {
         "pin1": {
-          "compName": "dff#8",
+          "compName": "dff#4",
           "pinName": "D"
         },
         "pin2": {
           "compName": "Splitter#0",
           "pinName": "O3"
         },
-        "name": "unnamedWire#12",
+        "name": "unnamedWire#10",
         "path": [
           {
             "x": 25.0,
@@ -279,10 +369,10 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "dff#5",
+          "compName": "dff#1",
           "pinName": "D"
         },
-        "name": "unnamedWire#13",
+        "name": "unnamedWire#11",
         "path": [
           {
             "x": 25.0,
@@ -296,14 +386,14 @@
       },
       {
         "pin1": {
-          "compName": "dff#7",
+          "compName": "dff#3",
           "pinName": "D"
         },
         "pin2": {
           "compName": "Splitter#0",
           "pinName": "O1"
         },
-        "name": "unnamedWire#14",
+        "name": "unnamedWire#12",
         "path": [
           {
             "x": 25.0,
@@ -321,10 +411,10 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "dff#6",
+          "compName": "dff#2",
           "pinName": "D"
         },
-        "name": "unnamedWire#15",
+        "name": "unnamedWire#13",
         "path": [
           {
             "x": 20.0,
@@ -338,74 +428,50 @@
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D"
-        },
-        "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "I"
-        },
-        "name": "unnamedWire#2",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "pin2": {
-          "compName": "dff#11",
+          "compName": "dff#7",
           "pinName": "C"
         },
-        "name": "unnamedWire#27",
+        "name": "unnamedWire#14",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
-        "name": "unnamedWire#28",
+        "name": "unnamedWire#15",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "pin2": {
-          "compName": "dff#8",
+          "compName": "dff#4",
           "pinName": "C"
         },
-        "name": "unnamedWire#29",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "I"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Q"
-        },
-        "name": "unnamedWire#3",
+        "name": "unnamedWire#16",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "pin2": {
-          "compName": "dff#7",
+          "compName": "dff#3",
           "pinName": "C"
         },
-        "name": "unnamedWire#30",
+        "name": "unnamedWire#17",
         "path": [
           {
             "x": 40.0,
@@ -415,14 +481,14 @@
       },
       {
         "pin1": {
-          "compName": "dff#6",
+          "compName": "dff#2",
           "pinName": "C"
         },
         "pin2": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
-        "name": "unnamedWire#31",
+        "name": "unnamedWire#18",
         "path": [
           {
             "x": 90.0,
@@ -432,86 +498,62 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "pin2": {
-          "compName": "dff#5",
+          "compName": "dff#1",
           "pinName": "C"
         },
-        "name": "unnamedWire#32",
+        "name": "unnamedWire#19",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
-        "name": "unnamedWire#33",
+        "name": "unnamedWire#20",
         "path": []
       },
       {
         "pin1": {
-          "compName": "dff#10",
+          "compName": "dff#6",
           "pinName": "C"
         },
         "pin2": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
-        },
-        "name": "unnamedWire#34",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
-        },
-        "name": "unnamedWire#35",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
-        "pin2": {
-          "compName": "dff#9",
-          "pinName": "C"
-        },
-        "name": "unnamedWire#36",
+        "name": "unnamedWire#21",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
-        "name": "unnamedWire#4",
+        "name": "unnamedWire#22",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "pin2": {
-          "compName": "dff#4",
+          "compName": "dff#5",
           "pinName": "C"
         },
-        "name": "unnamedWire#5",
+        "name": "unnamedWire#23",
         "path": []
       },
       {
@@ -520,10 +562,10 @@
           "pinName": "O7"
         },
         "pin2": {
-          "compName": "dff#4",
+          "compName": "dff#0",
           "pinName": "Q"
         },
-        "name": "unnamedWire#57",
+        "name": "unnamedWire#24",
         "path": [
           {
             "x": 155.0,
@@ -545,14 +587,14 @@
       },
       {
         "pin1": {
-          "compName": "dff#9",
+          "compName": "dff#5",
           "pinName": "Q"
         },
         "pin2": {
           "compName": "Splitter#1",
           "pinName": "O6"
         },
-        "name": "unnamedWire#58",
+        "name": "unnamedWire#25",
         "path": [
           {
             "x": 150.0,
@@ -570,10 +612,10 @@
           "pinName": "O5"
         },
         "pin2": {
-          "compName": "dff#11",
+          "compName": "dff#7",
           "pinName": "Q"
         },
-        "name": "unnamedWire#59",
+        "name": "unnamedWire#26",
         "path": [
           {
             "x": 145.0,
@@ -599,10 +641,10 @@
           "pinName": "O4"
         },
         "pin2": {
-          "compName": "dff#10",
+          "compName": "dff#6",
           "pinName": "Q"
         },
-        "name": "unnamedWire#60",
+        "name": "unnamedWire#27",
         "path": [
           {
             "x": 140.0,
@@ -620,10 +662,10 @@
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "dff#8",
+          "compName": "dff#4",
           "pinName": "Q"
         },
-        "name": "unnamedWire#61",
+        "name": "unnamedWire#28",
         "path": [
           {
             "x": 140.0,
@@ -645,14 +687,14 @@
       },
       {
         "pin1": {
-          "compName": "dff#5",
+          "compName": "dff#1",
           "pinName": "Q"
         },
         "pin2": {
           "compName": "Splitter#1",
           "pinName": "O2"
         },
-        "name": "unnamedWire#62",
+        "name": "unnamedWire#29",
         "path": [
           {
             "x": 140.0,
@@ -670,10 +712,10 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "dff#7",
+          "compName": "dff#3",
           "pinName": "Q"
         },
-        "name": "unnamedWire#63",
+        "name": "unnamedWire#30",
         "path": [
           {
             "x": 140.0,
@@ -695,14 +737,14 @@
       },
       {
         "pin1": {
-          "compName": "dff#6",
+          "compName": "dff#2",
           "pinName": "Q"
         },
         "pin2": {
           "compName": "Splitter#1",
           "pinName": "O0"
         },
-        "name": "unnamedWire#64",
+        "name": "unnamedWire#31",
         "path": [
           {
             "x": 150.0,
@@ -713,48 +755,6 @@
             "y": 110.0
           }
         ]
-      },
-      {
-        "pin1": {
-          "compName": "dff#4",
-          "pinName": "D"
-        },
-        "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O7"
-        },
-        "name": "unnamedWire#8",
-        "path": [
-          {
-            "x": 20.0,
-            "y": 15.0
-          },
-          {
-            "x": 20.0,
-            "y": 40.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O6"
-        },
-        "pin2": {
-          "compName": "dff#9",
-          "pinName": "D"
-        },
-        "name": "unnamedWire#9",
-        "path": [
-          {
-            "x": 25.0,
-            "y": 50.0
-          },
-          {
-            "x": 25.0,
-            "y": 35.0
-          }
-        ]
       }
     ],
     "version": "0.1.1"
@@ -800,56 +800,56 @@
       "q1": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "dff#6",
+          "delegateTarget": "dff#2",
           "subStateID": "q"
         }
       },
       "q2": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "dff#7",
+          "delegateTarget": "dff#3",
           "subStateID": "q"
         }
       },
       "q3": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "dff#5",
+          "delegateTarget": "dff#1",
           "subStateID": "q"
         }
       },
       "q4": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "dff#8",
+          "delegateTarget": "dff#4",
           "subStateID": "q"
         }
       },
       "q5": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "dff#10",
+          "delegateTarget": "dff#6",
           "subStateID": "q"
         }
       },
       "q6": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "dff#11",
+          "delegateTarget": "dff#7",
           "subStateID": "q"
         }
       },
       "q7": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "dff#9",
+          "delegateTarget": "dff#5",
           "subStateID": "q"
         }
       },
       "q8": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "dff#4",
+          "delegateTarget": "dff#0",
           "subStateID": "q"
         }
       }