X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fam2904%2FAm2904muSR.json;h=3a5ec33802b9ee8889bad7468b2ab083438defa0;hb=fc9aa186002edc06aa30f573239966264a214b62;hp=2949d8da6d1ca9d5f2cd5d848a7d6fd084af9ef4;hpb=58babf45ae7d259a296656451d796dbe601377a4;p=Mograsim.git

diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json
index 2949d8da..3a5ec338 100644
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json
@@ -271,7 +271,7 @@
       {
         "pin1": {
           "compName": "dff4_finewe#0",
-          "pinName": "Q1"
+          "pinName": "Q4"
         },
         "pin2": {
           "compName": "Splitter#3",
@@ -287,11 +287,143 @@
         },
         "pin2": {
           "compName": "dff4_finewe#0",
-          "pinName": "Q2"
+          "pinName": "Q3"
         },
         "name": "unnamedWire#1",
         "path": []
       },
+      {
+        "pin1": {
+          "compName": "Splitter#3",
+          "pinName": "O1"
+        },
+        "pin2": {
+          "compName": "dff4_finewe#0",
+          "pinName": "Q2"
+        },
+        "name": "unnamedWire#2",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "dff4_finewe#0",
+          "pinName": "Q1"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "name": "unnamedWire#3",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#3",
+          "pinName": "I"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Q"
+        },
+        "name": "unnamedWire#4",
+        "path": [
+          {
+            "x": 245.0,
+            "y": 45.0
+          },
+          {
+            "x": 245.0,
+            "y": 50.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "M"
+        },
+        "pin2": {
+          "compName": "Splitter#0",
+          "pinName": "I"
+        },
+        "name": "unnamedWire#5",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "I"
+        },
+        "pin2": {
+          "compName": "Splitter#1",
+          "pinName": "I"
+        },
+        "name": "unnamedWire#6",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#1",
+          "pinName": "O3"
+        },
+        "pin2": {
+          "compName": "mux1_4#0",
+          "pinName": "I1_1"
+        },
+        "name": "unnamedWire#7",
+        "path": [
+          {
+            "x": 20.0,
+            "y": 185.0
+          },
+          {
+            "x": 20.0,
+            "y": 180.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "mux1_4#0",
+          "pinName": "I1_2"
+        },
+        "pin2": {
+          "compName": "Splitter#1",
+          "pinName": "O2"
+        },
+        "name": "unnamedWire#8",
+        "path": [
+          {
+            "x": 20.0,
+            "y": 190.0
+          },
+          {
+            "x": 20.0,
+            "y": 195.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#1",
+          "pinName": "O1"
+        },
+        "pin2": {
+          "compName": "mux1_4#0",
+          "pinName": "I1_3"
+        },
+        "name": "unnamedWire#9",
+        "path": [
+          {
+            "x": 20.0,
+            "y": 205.0
+          },
+          {
+            "x": 20.0,
+            "y": 200.0
+          }
+        ]
+      },
       {
         "pin1": {
           "compName": "mux1_4#0",
@@ -453,18 +585,6 @@
         "name": "unnamedWire#19",
         "path": []
       },
-      {
-        "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O1"
-        },
-        "pin2": {
-          "compName": "dff4_finewe#0",
-          "pinName": "Q3"
-        },
-        "name": "unnamedWire#2",
-        "path": []
-      },
       {
         "pin1": {
           "compName": "mux1_4#0",
@@ -604,18 +724,6 @@
         "name": "unnamedWire#29",
         "path": []
       },
-      {
-        "pin1": {
-          "compName": "dff4_finewe#0",
-          "pinName": "Q4"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "name": "unnamedWire#3",
-        "path": []
-      },
       {
         "pin1": {
           "compName": "NandGate#2",
@@ -740,7 +848,7 @@
       {
         "pin1": {
           "compName": "dff4_finewe#0",
-          "pinName": "_WE1"
+          "pinName": "_WE4"
         },
         "pin2": {
           "compName": "_submodelinterface",
@@ -790,7 +898,7 @@
         },
         "pin2": {
           "compName": "dff4_finewe#0",
-          "pinName": "_WE4"
+          "pinName": "_WE1"
         },
         "name": "unnamedWire#38",
         "path": [
@@ -811,7 +919,7 @@
       {
         "pin1": {
           "compName": "dff4_finewe#0",
-          "pinName": "_WE3"
+          "pinName": "_WE2"
         },
         "pin2": {
           "compName": "_submodelinterface",
@@ -833,27 +941,6 @@
           }
         ]
       },
-      {
-        "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "I"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Q"
-        },
-        "name": "unnamedWire#4",
-        "path": [
-          {
-            "x": 245.0,
-            "y": 45.0
-          },
-          {
-            "x": 245.0,
-            "y": 50.0
-          }
-        ]
-      },
       {
         "pin1": {
           "compName": "_submodelinterface",
@@ -861,7 +948,7 @@
         },
         "pin2": {
           "compName": "dff4_finewe#0",
-          "pinName": "_WE2"
+          "pinName": "_WE3"
         },
         "name": "unnamedWire#40",
         "path": [
@@ -882,7 +969,7 @@
       {
         "pin1": {
           "compName": "dff4_finewe#0",
-          "pinName": "D1"
+          "pinName": "D4"
         },
         "pin2": {
           "compName": "mux1_4#1",
@@ -898,7 +985,7 @@
         },
         "pin2": {
           "compName": "dff4_finewe#0",
-          "pinName": "D2"
+          "pinName": "D3"
         },
         "name": "unnamedWire#42",
         "path": [
@@ -915,7 +1002,7 @@
       {
         "pin1": {
           "compName": "dff4_finewe#0",
-          "pinName": "D3"
+          "pinName": "D2"
         },
         "pin2": {
           "compName": "mux1_4#1",
@@ -948,7 +1035,7 @@
         },
         "pin2": {
           "compName": "dff4_finewe#0",
-          "pinName": "D4"
+          "pinName": "D1"
         },
         "name": "unnamedWire#45",
         "path": [
@@ -1011,100 +1098,13 @@
             "y": 140.0
           }
         ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "M"
-        },
-        "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "I"
-        },
-        "name": "unnamedWire#5",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I"
-        },
-        "pin2": {
-          "compName": "Splitter#1",
-          "pinName": "I"
-        },
-        "name": "unnamedWire#6",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "O3"
-        },
-        "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "I1_1"
-        },
-        "name": "unnamedWire#7",
-        "path": [
-          {
-            "x": 20.0,
-            "y": 185.0
-          },
-          {
-            "x": 20.0,
-            "y": 180.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "mux1_4#0",
-          "pinName": "I1_2"
-        },
-        "pin2": {
-          "compName": "Splitter#1",
-          "pinName": "O2"
-        },
-        "name": "unnamedWire#8",
-        "path": [
-          {
-            "x": 20.0,
-            "y": 190.0
-          },
-          {
-            "x": 20.0,
-            "y": 195.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "O1"
-        },
-        "pin2": {
-          "compName": "mux1_4#0",
-          "pinName": "I1_3"
-        },
-        "name": "unnamedWire#9",
-        "path": [
-          {
-            "x": 20.0,
-            "y": 205.0
-          },
-          {
-            "x": 20.0,
-            "y": 200.0
-          }
-        ]
       }
     ],
     "version": "0.1.1"
   },
   "symbolRendererSnippetID": "simpleRectangularLike",
   "symbolRendererParams": {
-    "centerText": "µSR",
+    "centerText": "\u00b5SR",
     "centerTextHeight": 5.0,
     "horizontalComponentCenter": 17.5,
     "pinLabelHeight": 3.5,
@@ -1121,6 +1121,34 @@
           "delegateTarget": "dff4_finewe#0",
           "subStateID": "q"
         }
+      },
+      "q1": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dff4_finewe#0",
+          "subStateID": "q1"
+        }
+      },
+      "q2": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dff4_finewe#0",
+          "subStateID": "q2"
+        }
+      },
+      "q3": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dff4_finewe#0",
+          "subStateID": "q3"
+        }
+      },
+      "q4": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dff4_finewe#0",
+          "subStateID": "q4"
+        }
       }
     }
   },