X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fandor414.json;h=a9b97195ce5e67f406a9147069f8374ece56492b;hb=fd24001741bef589628e036e26cf3dba1dd7921c;hp=a2b45122cd72adcb85c3f9a2d9d4dad003dc76af;hpb=58babf45ae7d259a296656451d796dbe601377a4;p=Mograsim.git

diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/andor414.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/andor414.json
index a2b45122..a9b97195 100644
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/andor414.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/andor414.json
@@ -123,12 +123,36 @@
   "innerScale": 0.4,
   "submodel": {
     "components": [
+      {
+        "id": "Splitter",
+        "name": "Splitter#0",
+        "pos": {
+          "x": 20.0,
+          "y": 82.5
+        },
+        "params": {
+          "logicWidth": 4,
+          "orientation": "RIGHT"
+        }
+      },
+      {
+        "id": "Splitter",
+        "name": "Splitter#1",
+        "pos": {
+          "x": 15.0,
+          "y": 142.5
+        },
+        "params": {
+          "logicWidth": 4,
+          "orientation": "LEFT"
+        }
+      },
       {
         "id": "and41",
         "name": "and41#0",
         "pos": {
-          "x": 15.0,
-          "y": 137.5
+          "x": 35.0,
+          "y": 142.5
         }
       },
       {
@@ -143,132 +167,195 @@
     "wires": [
       {
         "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A4"
+        },
+        "pin2": {
+          "compName": "Splitter#1",
+          "pinName": "O3"
+        },
+        "name": "unnamedWire#0",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A3"
+        },
+        "pin2": {
+          "compName": "Splitter#1",
+          "pinName": "O2"
+        },
+        "name": "unnamedWire#1",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A2"
+        },
+        "pin2": {
+          "compName": "Splitter#1",
+          "pinName": "O1"
+        },
+        "name": "unnamedWire#2",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#1",
+          "pinName": "O0"
+        },
+        "pin2": {
           "compName": "_submodelinterface",
           "pinName": "A1"
         },
+        "name": "unnamedWire#3",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "B"
+        },
         "pin2": {
           "compName": "and41#0",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#4",
+        "path": [
+          {
+            "x": 30.0,
+            "y": 212.5
+          },
+          {
+            "x": 30.0,
+            "y": 172.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "C1"
+        },
+        "pin2": {
+          "compName": "or_4#0",
           "pinName": "A1"
         },
-        "name": "unnamedWire#0",
+        "name": "unnamedWire#5",
         "path": [
           {
             "x": 10.0,
-            "y": 112.5
+            "y": 12.5
           },
           {
             "x": 10.0,
-            "y": 142.5
+            "y": 42.5
           }
         ]
       },
       {
         "pin1": {
           "compName": "_submodelinterface",
-          "pinName": "A2"
+          "pinName": "C2"
         },
         "pin2": {
-          "compName": "and41#0",
+          "compName": "or_4#0",
           "pinName": "A2"
         },
-        "name": "unnamedWire#1",
+        "name": "unnamedWire#6",
         "path": [
           {
             "x": 5.0,
-            "y": 137.5
+            "y": 37.5
           },
           {
             "x": 5.0,
-            "y": 152.5
+            "y": 52.5
           }
         ]
       },
       {
         "pin1": {
-          "compName": "and41#0",
-          "pinName": "Y2"
+          "compName": "_submodelinterface",
+          "pinName": "C3"
         },
         "pin2": {
           "compName": "or_4#0",
-          "pinName": "B2"
+          "pinName": "A3"
         },
-        "name": "unnamedWire#10",
+        "name": "unnamedWire#7",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "C4"
+        },
+        "pin2": {
+          "compName": "or_4#0",
+          "pinName": "A4"
+        },
+        "name": "unnamedWire#8",
         "path": [
           {
-            "x": 65.0,
-            "y": 152.5
-          },
-          {
-            "x": 65.0,
-            "y": 125.0
-          },
-          {
-            "x": 25.0,
-            "y": 125.0
+            "x": 5.0,
+            "y": 87.5
           },
           {
-            "x": 25.0,
-            "y": 92.5
+            "x": 5.0,
+            "y": 72.5
           }
         ]
       },
       {
         "pin1": {
-          "compName": "and41#0",
-          "pinName": "Y3"
+          "compName": "Splitter#0",
+          "pinName": "O3"
+        },
+        "pin2": {
+          "compName": "or_4#0",
+          "pinName": "B4"
+        },
+        "name": "unnamedWire#9",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#0",
+          "pinName": "O2"
         },
         "pin2": {
           "compName": "or_4#0",
           "pinName": "B3"
         },
+        "name": "unnamedWire#10",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "or_4#0",
+          "pinName": "B2"
+        },
+        "pin2": {
+          "compName": "Splitter#0",
+          "pinName": "O1"
+        },
         "name": "unnamedWire#11",
-        "path": [
-          {
-            "x": 60.0,
-            "y": 162.5
-          },
-          {
-            "x": 60.0,
-            "y": 130.0
-          },
-          {
-            "x": 20.0,
-            "y": 130.0
-          },
-          {
-            "x": 20.0,
-            "y": 102.5
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
-          "compName": "and41#0",
-          "pinName": "Y4"
+          "compName": "Splitter#0",
+          "pinName": "O0"
         },
         "pin2": {
           "compName": "or_4#0",
-          "pinName": "B4"
+          "pinName": "B1"
         },
         "name": "unnamedWire#12",
-        "path": [
-          {
-            "x": 55.0,
-            "y": 172.5
-          },
-          {
-            "x": 55.0,
-            "y": 135.0
-          },
-          {
-            "x": 15.0,
-            "y": 135.0
-          },
-          {
-            "x": 15.0,
-            "y": 112.5
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
@@ -347,161 +434,44 @@
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A3"
-        },
-        "pin2": {
-          "compName": "and41#0",
-          "pinName": "A3"
-        },
-        "name": "unnamedWire#2",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A4"
-        },
-        "pin2": {
-          "compName": "and41#0",
-          "pinName": "A4"
-        },
-        "name": "unnamedWire#3",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 187.5
-          },
-          {
-            "x": 5.0,
-            "y": 172.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B"
+          "compName": "Splitter#0",
+          "pinName": "I"
         },
         "pin2": {
           "compName": "and41#0",
-          "pinName": "B"
+          "pinName": "Y"
         },
-        "name": "unnamedWire#4",
+        "name": "unnamedWire#17",
         "path": [
           {
-            "x": 10.0,
-            "y": 212.5
+            "x": 15.0,
+            "y": 97.5
           },
           {
-            "x": 10.0,
-            "y": 182.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "C1"
-        },
-        "pin2": {
-          "compName": "or_4#0",
-          "pinName": "A1"
-        },
-        "name": "unnamedWire#5",
-        "path": [
-          {
-            "x": 10.0,
-            "y": 12.5
+            "x": 15.0,
+            "y": 127.5
           },
           {
-            "x": 10.0,
-            "y": 42.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "C2"
-        },
-        "pin2": {
-          "compName": "or_4#0",
-          "pinName": "A2"
-        },
-        "name": "unnamedWire#6",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 37.5
+            "x": 75.0,
+            "y": 127.5
           },
           {
-            "x": 5.0,
-            "y": 52.5
+            "x": 75.0,
+            "y": 157.5
           }
         ]
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "C3"
-        },
-        "pin2": {
-          "compName": "or_4#0",
-          "pinName": "A3"
-        },
-        "name": "unnamedWire#7",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "C4"
+          "compName": "Splitter#1",
+          "pinName": "I"
         },
         "pin2": {
-          "compName": "or_4#0",
-          "pinName": "A4"
-        },
-        "name": "unnamedWire#8",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 87.5
-          },
-          {
-            "x": 5.0,
-            "y": 72.5
-          }
-        ]
-      },
-      {
-        "pin1": {
           "compName": "and41#0",
-          "pinName": "Y1"
+          "pinName": "A"
         },
-        "pin2": {
-          "compName": "or_4#0",
-          "pinName": "B1"
-        },
-        "name": "unnamedWire#9",
-        "path": [
-          {
-            "x": 70.0,
-            "y": 142.5
-          },
-          {
-            "x": 70.0,
-            "y": 120.0
-          },
-          {
-            "x": 30.0,
-            "y": 120.0
-          },
-          {
-            "x": 30.0,
-            "y": 82.5
-          }
-        ]
+        "name": "unnamedWire#18",
+        "path": []
       }
     ],
     "version": "0.1.1"