X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=tests%2Fnet.mograsim.logic.model.am2900.tests%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fam2904%2FTestableAm2904.json;h=811bcad3cc1120f797ee19931f7481d562a53bcc;hb=ace62eb5e445dd364a104eda0ce2ae06c9628dcd;hp=964d7d3d10964466b91f3759c5f1955db32f2105;hpb=7d05144c25daa53e60fc9ed9fd503546a86567f8;p=Mograsim.git

diff --git a/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2904/TestableAm2904.json b/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2904/TestableAm2904.json
index 964d7d3d..811bcad3 100644
--- a/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2904/TestableAm2904.json
+++ b/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2904/TestableAm2904.json
@@ -76,38 +76,38 @@
     },
     {
       "location": {
-        "x": -87.66482568016058,
-        "y": 58.834004835619645
+        "x": -85.0,
+        "y": 100.0
       },
-      "name": "I_10",
-      "logicWidth": 1,
+      "name": "I_5_0",
+      "logicWidth": 6,
       "usage": "INPUT"
     },
     {
       "location": {
-        "x": -80.0,
-        "y": 40.0
+        "x": -84.26853373181032,
+        "y": 78.72500503091884
       },
-      "name": "I_11_12",
-      "logicWidth": 2,
+      "name": "I_6_9",
+      "logicWidth": 4,
       "usage": "INPUT"
     },
     {
       "location": {
-        "x": -85.0,
-        "y": 100.0
+        "x": -87.66482568016058,
+        "y": 58.834004835619645
       },
-      "name": "I_5_0",
-      "logicWidth": 6,
+      "name": "I_10",
+      "logicWidth": 1,
       "usage": "INPUT"
     },
     {
       "location": {
-        "x": -84.26853373181032,
-        "y": 78.72500503091884
+        "x": -80.0,
+        "y": 40.0
       },
-      "name": "I_6_9",
-      "logicWidth": 4,
+      "name": "I_11_12",
+      "logicWidth": 2,
       "usage": "INPUT"
     },
     {
@@ -268,47 +268,59 @@
   "submodel": {
     "components": [
       {
-        "id": "Merger",
-        "name": "Merger#0",
+        "id": "Am2904",
+        "name": "Am2904#0",
+        "pos": {
+          "x": 20.0,
+          "y": 15.0
+        }
+      },
+      {
+        "id": "Splitter",
+        "name": "Splitter#0",
         "pos": {
           "x": -30.0,
           "y": 70.0
         },
-        "params": 13
+        "params": {
+          "logicWidth": 13,
+          "orientation": "LEFT"
+        }
       },
       {
         "id": "Splitter",
-        "name": "Splitter#0",
+        "name": "Splitter#1",
         "pos": {
           "x": -45.0,
           "y": 140.0
         },
-        "params": 6
+        "params": {
+          "logicWidth": 6,
+          "orientation": "RIGHT"
+        }
       },
       {
         "id": "Splitter",
-        "name": "Splitter#1",
+        "name": "Splitter#2",
         "pos": {
           "x": -45.0,
           "y": 100.0
         },
-        "params": 4
+        "params": {
+          "logicWidth": 4,
+          "orientation": "RIGHT"
+        }
       },
       {
         "id": "Splitter",
-        "name": "Splitter#2",
+        "name": "Splitter#3",
         "pos": {
           "x": -45.0,
           "y": 70.0
         },
-        "params": 2
-      },
-      {
-        "id": "Am2904",
-        "name": "Am2904#0",
-        "pos": {
-          "x": 20.0,
-          "y": 15.0
+        "params": {
+          "logicWidth": 2,
+          "orientation": "RIGHT"
         }
       }
     ],
@@ -337,6 +349,102 @@
         "name": "unnamedWire#1",
         "path": []
       },
+      {
+        "pin1": {
+          "compName": "Am2904#0",
+          "pinName": "IC"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "IC"
+        },
+        "name": "unnamedWire#2",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "IN"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "IN"
+        },
+        "name": "unnamedWire#3",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Am2904#0",
+          "pinName": "IOVR"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "IOVR"
+        },
+        "name": "unnamedWire#4",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "_CEM"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "_CEM"
+        },
+        "name": "unnamedWire#5",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Am2904#0",
+          "pinName": "_CEmu"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "_CEmu"
+        },
+        "name": "unnamedWire#6",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "_EC"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "_EC"
+        },
+        "name": "unnamedWire#7",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Am2904#0",
+          "pinName": "_EN"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "_EN"
+        },
+        "name": "unnamedWire#8",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "_EOVR"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "_EOVR"
+        },
+        "name": "unnamedWire#9",
+        "path": []
+      },
       {
         "pin1": {
           "compName": "_submodelinterface",
@@ -355,7 +463,7 @@
           "pinName": "I_5_0"
         },
         "pin2": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
           "pinName": "I"
         },
         "name": "unnamedWire#11",
@@ -363,11 +471,11 @@
       },
       {
         "pin1": {
-          "compName": "Merger#0",
-          "pinName": "I0"
+          "compName": "Splitter#0",
+          "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
           "pinName": "O0"
         },
         "name": "unnamedWire#12",
@@ -375,23 +483,23 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "Merger#0",
-          "pinName": "I1"
+          "compName": "Splitter#0",
+          "pinName": "O1"
         },
         "name": "unnamedWire#13",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Merger#0",
-          "pinName": "I2"
+          "compName": "Splitter#0",
+          "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
           "pinName": "O2"
         },
         "name": "unnamedWire#14",
@@ -399,23 +507,23 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "Merger#0",
-          "pinName": "I3"
+          "compName": "Splitter#0",
+          "pinName": "O3"
         },
         "name": "unnamedWire#15",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Merger#0",
-          "pinName": "I4"
+          "compName": "Splitter#0",
+          "pinName": "O4"
         },
         "pin2": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
           "pinName": "O4"
         },
         "name": "unnamedWire#16",
@@ -423,35 +531,35 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#0",
+          "compName": "Splitter#1",
           "pinName": "O5"
         },
         "pin2": {
-          "compName": "Merger#0",
-          "pinName": "I5"
+          "compName": "Splitter#0",
+          "pinName": "O5"
         },
         "name": "unnamedWire#17",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#2",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Merger#0",
-          "pinName": "I6"
+          "compName": "Splitter#0",
+          "pinName": "O6"
         },
         "name": "unnamedWire#18",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Merger#0",
-          "pinName": "I7"
+          "compName": "Splitter#0",
+          "pinName": "O7"
         },
         "pin2": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#2",
           "pinName": "O1"
         },
         "name": "unnamedWire#19",
@@ -459,35 +567,23 @@
       },
       {
         "pin1": {
-          "compName": "Am2904#0",
-          "pinName": "IC"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "IC"
-        },
-        "name": "unnamedWire#2",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#2",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Merger#0",
-          "pinName": "I8"
+          "compName": "Splitter#0",
+          "pinName": "O8"
         },
         "name": "unnamedWire#20",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Merger#0",
-          "pinName": "I9"
+          "compName": "Splitter#0",
+          "pinName": "O9"
         },
         "pin2": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#2",
           "pinName": "O3"
         },
         "name": "unnamedWire#21",
@@ -495,23 +591,23 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#2",
+          "compName": "Splitter#3",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Merger#0",
-          "pinName": "I11"
+          "compName": "Splitter#0",
+          "pinName": "O11"
         },
         "name": "unnamedWire#22",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Merger#0",
-          "pinName": "I12"
+          "compName": "Splitter#0",
+          "pinName": "O12"
         },
         "pin2": {
-          "compName": "Splitter#2",
+          "compName": "Splitter#3",
           "pinName": "O1"
         },
         "name": "unnamedWire#23",
@@ -523,7 +619,7 @@
           "pinName": "I_6_9"
         },
         "pin2": {
-          "compName": "Splitter#1",
+          "compName": "Splitter#2",
           "pinName": "I"
         },
         "name": "unnamedWire#24",
@@ -531,8 +627,8 @@
       },
       {
         "pin1": {
-          "compName": "Merger#0",
-          "pinName": "O"
+          "compName": "Splitter#0",
+          "pinName": "I"
         },
         "pin2": {
           "compName": "Am2904#0",
@@ -547,8 +643,8 @@
           "pinName": "I_10"
         },
         "pin2": {
-          "compName": "Merger#0",
-          "pinName": "I10"
+          "compName": "Splitter#0",
+          "pinName": "O10"
         },
         "name": "unnamedWire#26",
         "path": []
@@ -559,7 +655,7 @@
           "pinName": "I_11_12"
         },
         "pin2": {
-          "compName": "Splitter#2",
+          "compName": "Splitter#3",
           "pinName": "I"
         },
         "name": "unnamedWire#27",
@@ -589,18 +685,6 @@
         "name": "unnamedWire#29",
         "path": []
       },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "IN"
-        },
-        "pin2": {
-          "compName": "Am2904#0",
-          "pinName": "IN"
-        },
-        "name": "unnamedWire#3",
-        "path": []
-      },
       {
         "pin1": {
           "compName": "_submodelinterface",
@@ -721,18 +805,6 @@
         "name": "unnamedWire#39",
         "path": []
       },
-      {
-        "pin1": {
-          "compName": "Am2904#0",
-          "pinName": "IOVR"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "IOVR"
-        },
-        "name": "unnamedWire#4",
-        "path": []
-      },
       {
         "pin1": {
           "compName": "_submodelinterface",
@@ -756,66 +828,6 @@
         },
         "name": "unnamedWire#41",
         "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "_CEM"
-        },
-        "pin2": {
-          "compName": "Am2904#0",
-          "pinName": "_CEM"
-        },
-        "name": "unnamedWire#5",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Am2904#0",
-          "pinName": "_CEmu"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "_CEmu"
-        },
-        "name": "unnamedWire#6",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "_EC"
-        },
-        "pin2": {
-          "compName": "Am2904#0",
-          "pinName": "_EC"
-        },
-        "name": "unnamedWire#7",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Am2904#0",
-          "pinName": "_EN"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "_EN"
-        },
-        "name": "unnamedWire#8",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "_EOVR"
-        },
-        "pin2": {
-          "compName": "Am2904#0",
-          "pinName": "_EOVR"
-        },
-        "name": "unnamedWire#9",
-        "path": []
       }
     ],
     "version": "0.1.1"
@@ -825,18 +837,18 @@
   "highLevelStateHandlerSnippetID": "standard",
   "highLevelStateHandlerParams": {
     "subcomponentHighLevelStates": {
-      "musr": {
+      "msr": {
         "id": "delegating",
         "params": {
           "delegateTarget": "Am2904#0",
-          "prefix": "musr"
+          "prefix": "msr"
         }
       },
-      "msr": {
+      "musr": {
         "id": "delegating",
         "params": {
           "delegateTarget": "Am2904#0",
-          "prefix": "msr"
+          "prefix": "musr"
         }
       }
     },