X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fdff12_we.json;h=20f06642aa5cc1626993ade39855bbec009d8634;hb=71639f35873d3b29a4b0f9574025ba9462c656a2;hp=f5283a097b7ed11bd824097ea5eb04dc467a4983;hpb=a8ba08b067b7c5e449656fca56ac067d5d701270;p=Mograsim.git

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json
index f5283a09..20f06642 100644
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json
@@ -42,110 +42,6 @@
   "innerScale": 0.2,
   "submodel": {
     "components": [
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#10",
-        "pos": {
-          "x": 175.0,
-          "y": 170.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#11",
-        "pos": {
-          "x": 130.0,
-          "y": 160.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#12",
-        "pos": {
-          "x": 130.0,
-          "y": 130.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#13",
-        "pos": {
-          "x": 175.0,
-          "y": 80.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#14",
-        "pos": {
-          "x": 175.0,
-          "y": 110.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#15",
-        "pos": {
-          "x": 130.0,
-          "y": 100.0
-        }
-      },
-      {
-        "id": "mux1_12",
-        "name": "DeserializedSubmodelComponent#17",
-        "pos": {
-          "x": 15.0,
-          "y": 90.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#4",
-        "pos": {
-          "x": 175.0,
-          "y": 20.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#5",
-        "pos": {
-          "x": 175.0,
-          "y": 50.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#6",
-        "pos": {
-          "x": 130.0,
-          "y": 10.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#7",
-        "pos": {
-          "x": 130.0,
-          "y": 40.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#8",
-        "pos": {
-          "x": 130.0,
-          "y": 70.0
-        }
-      },
-      {
-        "id": "dff",
-        "name": "DeserializedSubmodelComponent#9",
-        "pos": {
-          "x": 175.0,
-          "y": 140.0
-        }
-      },
       {
         "id": "Merger",
         "name": "Merger#0",
@@ -175,112 +71,216 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#11",
+        "name": "WireCrossPoint#0",
         "pos": {
-          "x": 169.0,
-          "y": 54.0
+          "x": 124.0,
+          "y": 14.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#12",
+        "name": "WireCrossPoint#1",
         "pos": {
-          "x": 169.0,
-          "y": 144.0
+          "x": 124.0,
+          "y": 44.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#13",
+        "name": "WireCrossPoint#10",
         "pos": {
           "x": 169.0,
-          "y": 24.0
+          "y": 114.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#14",
+        "name": "WireCrossPoint#2",
         "pos": {
-          "x": 169.0,
-          "y": 84.0
+          "x": 124.0,
+          "y": 104.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#15",
+        "name": "WireCrossPoint#3",
         "pos": {
-          "x": 169.0,
-          "y": 114.0
+          "x": 124.0,
+          "y": 134.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
+        "name": "WireCrossPoint#4",
         "pos": {
           "x": 124.0,
-          "y": 14.0
+          "y": 74.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
+        "name": "WireCrossPoint#5",
         "pos": {
-          "x": 124.0,
-          "y": 44.0
+          "x": 264.0,
+          "y": 99.0
         },
-        "params": 1
+        "params": 12
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
+        "name": "WireCrossPoint#6",
         "pos": {
-          "x": 124.0,
-          "y": 104.0
+          "x": 169.0,
+          "y": 54.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
+        "name": "WireCrossPoint#7",
         "pos": {
-          "x": 124.0,
-          "y": 134.0
+          "x": 169.0,
+          "y": 144.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
+        "name": "WireCrossPoint#8",
         "pos": {
-          "x": 124.0,
-          "y": 74.0
+          "x": 169.0,
+          "y": 24.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#8",
+        "name": "WireCrossPoint#9",
         "pos": {
-          "x": 264.0,
-          "y": 99.0
+          "x": 169.0,
+          "y": 84.0
         },
-        "params": 12
+        "params": 1
+      },
+      {
+        "id": "dff",
+        "name": "dff#0",
+        "pos": {
+          "x": 175.0,
+          "y": 20.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#1",
+        "pos": {
+          "x": 175.0,
+          "y": 50.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#10",
+        "pos": {
+          "x": 175.0,
+          "y": 110.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#11",
+        "pos": {
+          "x": 130.0,
+          "y": 100.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#2",
+        "pos": {
+          "x": 130.0,
+          "y": 10.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#3",
+        "pos": {
+          "x": 130.0,
+          "y": 40.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#4",
+        "pos": {
+          "x": 130.0,
+          "y": 70.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#5",
+        "pos": {
+          "x": 175.0,
+          "y": 140.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#6",
+        "pos": {
+          "x": 175.0,
+          "y": 170.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#7",
+        "pos": {
+          "x": 130.0,
+          "y": 160.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#8",
+        "pos": {
+          "x": 130.0,
+          "y": 130.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#9",
+        "pos": {
+          "x": 175.0,
+          "y": 80.0
+        }
+      },
+      {
+        "id": "mux1_12",
+        "name": "mux1_12#0",
+        "pos": {
+          "x": 15.0,
+          "y": 90.0
+        }
       }
     ],
     "wires": [
       {
         "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "name": "unnamedWire#0",
@@ -297,7 +297,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "pin2": {
@@ -318,7 +318,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "dff#11",
           "pinName": "D"
         },
         "pin2": {
@@ -343,7 +343,7 @@
           "pinName": "O4"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#14",
+          "compName": "dff#10",
           "pinName": "D"
         },
         "name": "unnamedWire#11",
@@ -360,7 +360,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "dff#8",
           "pinName": "D"
         },
         "pin2": {
@@ -376,7 +376,7 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "dff#5",
           "pinName": "D"
         },
         "name": "unnamedWire#13",
@@ -384,7 +384,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "dff#7",
           "pinName": "D"
         },
         "pin2": {
@@ -409,7 +409,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "dff#6",
           "pinName": "D"
         },
         "name": "unnamedWire#15",
@@ -430,7 +430,7 @@
           "pinName": "WE"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#17",
+          "compName": "mux1_12#0",
           "pinName": "S"
         },
         "name": "unnamedWire#16",
@@ -451,7 +451,7 @@
           "pinName": "D"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#17",
+          "compName": "mux1_12#0",
           "pinName": "I1"
         },
         "name": "unnamedWire#17",
@@ -468,7 +468,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#17",
+          "compName": "mux1_12#0",
           "pinName": "Y"
         },
         "pin2": {
@@ -480,11 +480,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "dff#2",
           "pinName": "C"
         },
         "name": "unnamedWire#21",
@@ -492,11 +492,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "name": "unnamedWire#22",
@@ -504,11 +504,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "dff#3",
           "pinName": "C"
         },
         "pin2": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "name": "unnamedWire#23",
@@ -516,11 +516,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "name": "unnamedWire#24",
@@ -528,11 +528,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "dff#4",
           "pinName": "C"
         },
         "name": "unnamedWire#25",
@@ -540,11 +540,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "name": "unnamedWire#26",
@@ -552,11 +552,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "dff#11",
           "pinName": "C"
         },
         "name": "unnamedWire#27",
@@ -564,11 +564,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "name": "unnamedWire#28",
@@ -576,11 +576,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "dff#8",
           "pinName": "C"
         },
         "name": "unnamedWire#29",
@@ -588,11 +588,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#17",
+          "compName": "mux1_12#0",
           "pinName": "I0"
         },
         "pin2": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "name": "unnamedWire#3",
@@ -613,11 +613,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "dff#7",
           "pinName": "C"
         },
         "name": "unnamedWire#30",
@@ -630,11 +630,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "dff#6",
           "pinName": "C"
         },
         "pin2": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
         "name": "unnamedWire#31",
@@ -647,11 +647,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "dff#5",
           "pinName": "C"
         },
         "name": "unnamedWire#32",
@@ -659,11 +659,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#10",
           "pinName": ""
         },
         "name": "unnamedWire#33",
@@ -671,11 +671,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#14",
+          "compName": "dff#10",
           "pinName": "C"
         },
         "pin2": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#10",
           "pinName": ""
         },
         "name": "unnamedWire#34",
@@ -683,11 +683,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#10",
           "pinName": ""
         },
         "name": "unnamedWire#35",
@@ -695,11 +695,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "dff#9",
           "pinName": "C"
         },
         "name": "unnamedWire#36",
@@ -707,11 +707,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
         "name": "unnamedWire#37",
@@ -719,11 +719,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "dff#1",
           "pinName": "C"
         },
         "name": "unnamedWire#38",
@@ -731,11 +731,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
         "name": "unnamedWire#39",
@@ -747,7 +747,7 @@
           "pinName": "O11"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "dff#2",
           "pinName": "D"
         },
         "name": "unnamedWire#4",
@@ -764,11 +764,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "dff#0",
           "pinName": "C"
         },
         "name": "unnamedWire#40",
@@ -776,7 +776,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "dff#0",
           "pinName": "D"
         },
         "pin2": {
@@ -801,7 +801,7 @@
           "pinName": "I11"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "dff#2",
           "pinName": "Q"
         },
         "name": "unnamedWire#53",
@@ -818,7 +818,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "dff#0",
           "pinName": "Q"
         },
         "pin2": {
@@ -843,7 +843,7 @@
           "pinName": "I9"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "dff#3",
           "pinName": "Q"
         },
         "name": "unnamedWire#55",
@@ -860,7 +860,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "dff#1",
           "pinName": "Q"
         },
         "pin2": {
@@ -885,7 +885,7 @@
           "pinName": "I7"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "dff#4",
           "pinName": "Q"
         },
         "name": "unnamedWire#57",
@@ -902,7 +902,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "dff#9",
           "pinName": "Q"
         },
         "pin2": {
@@ -927,7 +927,7 @@
           "pinName": "I5"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "dff#11",
           "pinName": "Q"
         },
         "name": "unnamedWire#59",
@@ -935,7 +935,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "dff#3",
           "pinName": "D"
         },
         "pin2": {
@@ -960,7 +960,7 @@
           "pinName": "I4"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#14",
+          "compName": "dff#10",
           "pinName": "Q"
         },
         "name": "unnamedWire#60",
@@ -972,7 +972,7 @@
           "pinName": "I3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "dff#8",
           "pinName": "Q"
         },
         "name": "unnamedWire#61",
@@ -989,7 +989,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "dff#5",
           "pinName": "Q"
         },
         "pin2": {
@@ -1014,7 +1014,7 @@
           "pinName": "I1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "dff#7",
           "pinName": "Q"
         },
         "name": "unnamedWire#63",
@@ -1031,7 +1031,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "dff#6",
           "pinName": "Q"
         },
         "pin2": {
@@ -1056,7 +1056,7 @@
           "pinName": "O"
         },
         "pin2": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "name": "unnamedWire#65",
@@ -1064,7 +1064,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "pin2": {
@@ -1080,7 +1080,7 @@
           "pinName": "O8"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "dff#1",
           "pinName": "D"
         },
         "name": "unnamedWire#7",
@@ -1097,7 +1097,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "dff#4",
           "pinName": "D"
         },
         "pin2": {
@@ -1122,7 +1122,7 @@
           "pinName": "O6"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "dff#9",
           "pinName": "D"
         },
         "name": "unnamedWire#9",