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%2Fdff12_we.json;h=0ec197532fabe47019964ec66ceba9ec216aca0a;hp=188770f4becf91fb28808b18039bcfd2aa51d9b4;hb=5c03a4fa605a1c3946eddece3b566b5aa0677759;hpb=9e8e8ae5414f52ec87f9247b10a525f41768c7dc

diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json
index 188770f4..0ec19753 100644
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json
@@ -84,15 +84,6 @@
         },
         "params": 1
       },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
-        "pos": {
-          "x": 179.0,
-          "y": 134.0
-        },
-        "params": 1
-      },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#2",
@@ -165,6 +156,15 @@
         },
         "params": 1
       },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#10",
+        "pos": {
+          "x": 179.0,
+          "y": 134.0
+        },
+        "params": 1
+      },
       {
         "id": "dff",
         "name": "dff#0",
@@ -181,22 +181,6 @@
           "y": 60.0
         }
       },
-      {
-        "id": "dff",
-        "name": "dff#10",
-        "pos": {
-          "x": 185.0,
-          "y": 120.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "dff#11",
-        "pos": {
-          "x": 130.0,
-          "y": 100.0
-        }
-      },
       {
         "id": "dff",
         "name": "dff#2",
@@ -261,6 +245,22 @@
           "y": 90.0
         }
       },
+      {
+        "id": "dff",
+        "name": "dff#10",
+        "pos": {
+          "x": 185.0,
+          "y": 120.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#11",
+        "pos": {
+          "x": 130.0,
+          "y": 100.0
+        }
+      },
       {
         "id": "mux1_12",
         "name": "mux1_12#0",
@@ -304,6 +304,160 @@
         "name": "unnamedWire#1",
         "path": []
       },
+      {
+        "pin1": {
+          "compName": "mux1_12#0",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "Splitter#0",
+          "pinName": "I"
+        },
+        "name": "unnamedWire#2",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "mux1_12#0",
+          "pinName": "I0"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
+        },
+        "name": "unnamedWire#3",
+        "path": [
+          {
+            "x": 10.0,
+            "y": 90.0
+          },
+          {
+            "x": 10.0,
+            "y": 205.0
+          },
+          {
+            "x": 270.0,
+            "y": 205.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#0",
+          "pinName": "O11"
+        },
+        "pin2": {
+          "compName": "dff#2",
+          "pinName": "D"
+        },
+        "name": "unnamedWire#4",
+        "path": [
+          {
+            "x": 85.0,
+            "y": 45.0
+          },
+          {
+            "x": 85.0,
+            "y": 15.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "dff#0",
+          "pinName": "D"
+        },
+        "pin2": {
+          "compName": "Splitter#0",
+          "pinName": "O10"
+        },
+        "name": "unnamedWire#5",
+        "path": [
+          {
+            "x": 90.0,
+            "y": 35.0
+          },
+          {
+            "x": 90.0,
+            "y": 55.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "dff#3",
+          "pinName": "D"
+        },
+        "pin2": {
+          "compName": "Splitter#0",
+          "pinName": "O9"
+        },
+        "name": "unnamedWire#6",
+        "path": [
+          {
+            "x": 95.0,
+            "y": 45.0
+          },
+          {
+            "x": 95.0,
+            "y": 65.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#0",
+          "pinName": "O8"
+        },
+        "pin2": {
+          "compName": "dff#1",
+          "pinName": "D"
+        },
+        "name": "unnamedWire#7",
+        "path": [
+          {
+            "x": 100.0,
+            "y": 75.0
+          },
+          {
+            "x": 100.0,
+            "y": 65.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "dff#4",
+          "pinName": "D"
+        },
+        "pin2": {
+          "compName": "Splitter#0",
+          "pinName": "O7"
+        },
+        "name": "unnamedWire#8",
+        "path": [
+          {
+            "x": 105.0,
+            "y": 75.0
+          },
+          {
+            "x": 105.0,
+            "y": 85.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#0",
+          "pinName": "O6"
+        },
+        "pin2": {
+          "compName": "dff#9",
+          "pinName": "D"
+        },
+        "name": "unnamedWire#9",
+        "path": []
+      },
       {
         "pin1": {
           "compName": "dff#11",
@@ -463,18 +617,6 @@
           }
         ]
       },
-      {
-        "pin1": {
-          "compName": "mux1_12#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "I"
-        },
-        "name": "unnamedWire#2",
-        "path": []
-      },
       {
         "pin1": {
           "compName": "WireCrossPoint#0",
@@ -484,7 +626,7 @@
           "compName": "dff#2",
           "pinName": "C"
         },
-        "name": "unnamedWire#21",
+        "name": "unnamedWire#18",
         "path": []
       },
       {
@@ -496,7 +638,7 @@
           "compName": "WireCrossPoint#1",
           "pinName": ""
         },
-        "name": "unnamedWire#22",
+        "name": "unnamedWire#19",
         "path": []
       },
       {
@@ -508,7 +650,7 @@
           "compName": "WireCrossPoint#1",
           "pinName": ""
         },
-        "name": "unnamedWire#23",
+        "name": "unnamedWire#20",
         "path": []
       },
       {
@@ -520,7 +662,7 @@
           "compName": "WireCrossPoint#4",
           "pinName": ""
         },
-        "name": "unnamedWire#24",
+        "name": "unnamedWire#21",
         "path": []
       },
       {
@@ -532,7 +674,7 @@
           "compName": "dff#4",
           "pinName": "C"
         },
-        "name": "unnamedWire#25",
+        "name": "unnamedWire#22",
         "path": []
       },
       {
@@ -544,7 +686,7 @@
           "compName": "WireCrossPoint#2",
           "pinName": ""
         },
-        "name": "unnamedWire#26",
+        "name": "unnamedWire#23",
         "path": []
       },
       {
@@ -556,7 +698,7 @@
           "compName": "dff#11",
           "pinName": "C"
         },
-        "name": "unnamedWire#27",
+        "name": "unnamedWire#24",
         "path": []
       },
       {
@@ -568,7 +710,7 @@
           "compName": "WireCrossPoint#3",
           "pinName": ""
         },
-        "name": "unnamedWire#28",
+        "name": "unnamedWire#25",
         "path": []
       },
       {
@@ -580,34 +722,9 @@
           "compName": "dff#8",
           "pinName": "C"
         },
-        "name": "unnamedWire#29",
+        "name": "unnamedWire#26",
         "path": []
       },
-      {
-        "pin1": {
-          "compName": "mux1_12#0",
-          "pinName": "I0"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
-        },
-        "name": "unnamedWire#3",
-        "path": [
-          {
-            "x": 10.0,
-            "y": 90.0
-          },
-          {
-            "x": 10.0,
-            "y": 205.0
-          },
-          {
-            "x": 270.0,
-            "y": 205.0
-          }
-        ]
-      },
       {
         "pin1": {
           "compName": "WireCrossPoint#3",
@@ -617,7 +734,7 @@
           "compName": "dff#7",
           "pinName": "C"
         },
-        "name": "unnamedWire#30",
+        "name": "unnamedWire#27",
         "path": [
           {
             "x": 125.0,
@@ -634,7 +751,7 @@
           "compName": "WireCrossPoint#7",
           "pinName": ""
         },
-        "name": "unnamedWire#31",
+        "name": "unnamedWire#28",
         "path": [
           {
             "x": 180.0,
@@ -651,7 +768,7 @@
           "compName": "dff#5",
           "pinName": "C"
         },
-        "name": "unnamedWire#32",
+        "name": "unnamedWire#29",
         "path": []
       },
       {
@@ -663,7 +780,7 @@
           "compName": "WireCrossPoint#10",
           "pinName": ""
         },
-        "name": "unnamedWire#33",
+        "name": "unnamedWire#30",
         "path": []
       },
       {
@@ -675,7 +792,7 @@
           "compName": "WireCrossPoint#10",
           "pinName": ""
         },
-        "name": "unnamedWire#34",
+        "name": "unnamedWire#31",
         "path": []
       },
       {
@@ -687,7 +804,7 @@
           "compName": "WireCrossPoint#10",
           "pinName": ""
         },
-        "name": "unnamedWire#35",
+        "name": "unnamedWire#32",
         "path": []
       },
       {
@@ -699,7 +816,7 @@
           "compName": "dff#9",
           "pinName": "C"
         },
-        "name": "unnamedWire#36",
+        "name": "unnamedWire#33",
         "path": []
       },
       {
@@ -711,7 +828,7 @@
           "compName": "WireCrossPoint#6",
           "pinName": ""
         },
-        "name": "unnamedWire#37",
+        "name": "unnamedWire#34",
         "path": []
       },
       {
@@ -723,7 +840,7 @@
           "compName": "dff#1",
           "pinName": "C"
         },
-        "name": "unnamedWire#38",
+        "name": "unnamedWire#35",
         "path": []
       },
       {
@@ -735,30 +852,9 @@
           "compName": "WireCrossPoint#6",
           "pinName": ""
         },
-        "name": "unnamedWire#39",
+        "name": "unnamedWire#36",
         "path": []
       },
-      {
-        "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O11"
-        },
-        "pin2": {
-          "compName": "dff#2",
-          "pinName": "D"
-        },
-        "name": "unnamedWire#4",
-        "path": [
-          {
-            "x": 85.0,
-            "y": 45.0
-          },
-          {
-            "x": 85.0,
-            "y": 15.0
-          }
-        ]
-      },
       {
         "pin1": {
           "compName": "WireCrossPoint#8",
@@ -768,30 +864,9 @@
           "compName": "dff#0",
           "pinName": "C"
         },
-        "name": "unnamedWire#40",
+        "name": "unnamedWire#37",
         "path": []
       },
-      {
-        "pin1": {
-          "compName": "dff#0",
-          "pinName": "D"
-        },
-        "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O10"
-        },
-        "name": "unnamedWire#5",
-        "path": [
-          {
-            "x": 90.0,
-            "y": 35.0
-          },
-          {
-            "x": 90.0,
-            "y": 55.0
-          }
-        ]
-      },
       {
         "pin1": {
           "compName": "Splitter#1",
@@ -801,7 +876,7 @@
           "compName": "dff#2",
           "pinName": "Q"
         },
-        "name": "unnamedWire#53",
+        "name": "unnamedWire#38",
         "path": [
           {
             "x": 250.0,
@@ -830,7 +905,7 @@
           "compName": "Splitter#1",
           "pinName": "O10"
         },
-        "name": "unnamedWire#54",
+        "name": "unnamedWire#39",
         "path": [
           {
             "x": 240.0,
@@ -851,7 +926,7 @@
           "compName": "dff#3",
           "pinName": "Q"
         },
-        "name": "unnamedWire#55",
+        "name": "unnamedWire#40",
         "path": [
           {
             "x": 235.0,
@@ -880,7 +955,7 @@
           "compName": "Splitter#1",
           "pinName": "O8"
         },
-        "name": "unnamedWire#56",
+        "name": "unnamedWire#41",
         "path": [
           {
             "x": 230.0,
@@ -901,7 +976,7 @@
           "compName": "dff#4",
           "pinName": "Q"
         },
-        "name": "unnamedWire#57",
+        "name": "unnamedWire#42",
         "path": [
           {
             "x": 170.0,
@@ -922,7 +997,7 @@
           "compName": "Splitter#1",
           "pinName": "O6"
         },
-        "name": "unnamedWire#58",
+        "name": "unnamedWire#43",
         "path": []
       },
       {
@@ -934,7 +1009,7 @@
           "compName": "dff#11",
           "pinName": "Q"
         },
-        "name": "unnamedWire#59",
+        "name": "unnamedWire#44",
         "path": [
           {
             "x": 225.0,
@@ -954,27 +1029,6 @@
           }
         ]
       },
-      {
-        "pin1": {
-          "compName": "dff#3",
-          "pinName": "D"
-        },
-        "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O9"
-        },
-        "name": "unnamedWire#6",
-        "path": [
-          {
-            "x": 95.0,
-            "y": 45.0
-          },
-          {
-            "x": 95.0,
-            "y": 65.0
-          }
-        ]
-      },
       {
         "pin1": {
           "compName": "Splitter#1",
@@ -984,7 +1038,7 @@
           "compName": "dff#10",
           "pinName": "Q"
         },
-        "name": "unnamedWire#60",
+        "name": "unnamedWire#45",
         "path": [
           {
             "x": 230.0,
@@ -1005,7 +1059,7 @@
           "compName": "dff#8",
           "pinName": "Q"
         },
-        "name": "unnamedWire#61",
+        "name": "unnamedWire#46",
         "path": [
           {
             "x": 235.0,
@@ -1034,7 +1088,7 @@
           "compName": "Splitter#1",
           "pinName": "O2"
         },
-        "name": "unnamedWire#62",
+        "name": "unnamedWire#47",
         "path": [
           {
             "x": 240.0,
@@ -1055,7 +1109,7 @@
           "compName": "dff#7",
           "pinName": "Q"
         },
-        "name": "unnamedWire#63",
+        "name": "unnamedWire#48",
         "path": [
           {
             "x": 245.0,
@@ -1084,7 +1138,7 @@
           "compName": "Splitter#1",
           "pinName": "O0"
         },
-        "name": "unnamedWire#64",
+        "name": "unnamedWire#49",
         "path": [
           {
             "x": 250.0,
@@ -1105,7 +1159,7 @@
           "compName": "WireCrossPoint#5",
           "pinName": ""
         },
-        "name": "unnamedWire#65",
+        "name": "unnamedWire#50",
         "path": []
       },
       {
@@ -1117,61 +1171,7 @@
           "compName": "_submodelinterface",
           "pinName": "Q"
         },
-        "name": "unnamedWire#66",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O8"
-        },
-        "pin2": {
-          "compName": "dff#1",
-          "pinName": "D"
-        },
-        "name": "unnamedWire#7",
-        "path": [
-          {
-            "x": 100.0,
-            "y": 75.0
-          },
-          {
-            "x": 100.0,
-            "y": 65.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "dff#4",
-          "pinName": "D"
-        },
-        "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O7"
-        },
-        "name": "unnamedWire#8",
-        "path": [
-          {
-            "x": 105.0,
-            "y": 75.0
-          },
-          {
-            "x": 105.0,
-            "y": 85.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O6"
-        },
-        "pin2": {
-          "compName": "dff#9",
-          "pinName": "D"
-        },
-        "name": "unnamedWire#9",
+        "name": "unnamedWire#51",
         "path": []
       }
     ],
@@ -1230,27 +1230,6 @@
           "subStateID": "q"
         }
       },
-      "q10": {
-        "id": "delegating",
-        "params": {
-          "delegateTarget": "dff#3",
-          "subStateID": "q"
-        }
-      },
-      "q11": {
-        "id": "delegating",
-        "params": {
-          "delegateTarget": "dff#0",
-          "subStateID": "q"
-        }
-      },
-      "q12": {
-        "id": "delegating",
-        "params": {
-          "delegateTarget": "dff#2",
-          "subStateID": "q"
-        }
-      },
       "q2": {
         "id": "delegating",
         "params": {
@@ -1306,6 +1285,27 @@
           "delegateTarget": "dff#1",
           "subStateID": "q"
         }
+      },
+      "q10": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dff#3",
+          "subStateID": "q"
+        }
+      },
+      "q11": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dff#0",
+          "subStateID": "q"
+        }
+      },
+      "q12": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dff#2",
+          "subStateID": "q"
+        }
       }
     }
   },