X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fam2901%2FAm2901SourceDecode.json;h=926bc764f4f0fa9814d46c8f6bfdb29def0b4dcb;hb=989cf7da1ea37c4174bea281ae56ead12cb725be;hp=3d347c528f00de500a8096e4695b7651949cc3b0;hpb=d094b43f1697af4586f135790919f866cc53a9a5;p=Mograsim.git

diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901SourceDecode.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901SourceDecode.json
index 3d347c52..926bc764 100644
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901SourceDecode.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901SourceDecode.json
@@ -1,37 +1,19 @@
 {
-  "width": 35.0,
+  "width": 40.0,
   "height": 50.0,
   "interfacePins": [
-    {
-      "location": {
-        "x": 0.0,
-        "y": 25.0
-      },
-      "name": "I0",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
     {
       "location": {
         "x": 0.0,
         "y": 15.0
       },
-      "name": "I1",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 5.0
-      },
-      "name": "I2",
-      "logicWidth": 1,
+      "name": "I",
+      "logicWidth": 3,
       "usage": "INPUT"
     },
     {
       "location": {
-        "x": 35.0,
+        "x": 40.0,
         "y": 15.0
       },
       "name": "RA",
@@ -40,7 +22,7 @@
     },
     {
       "location": {
-        "x": 35.0,
+        "x": 40.0,
         "y": 45.0
       },
       "name": "RD",
@@ -49,7 +31,7 @@
     },
     {
       "location": {
-        "x": 35.0,
+        "x": 40.0,
         "y": 35.0
       },
       "name": "SA",
@@ -58,7 +40,7 @@
     },
     {
       "location": {
-        "x": 35.0,
+        "x": 40.0,
         "y": 25.0
       },
       "name": "SB",
@@ -67,7 +49,7 @@
     },
     {
       "location": {
-        "x": 35.0,
+        "x": 40.0,
         "y": 5.0
       },
       "name": "SQ",
@@ -82,7 +64,7 @@
         "id": "NandGate",
         "name": "NandGate#0",
         "pos": {
-          "x": 10.0,
+          "x": 35.0,
           "y": 10.0
         },
         "params": 1
@@ -91,7 +73,7 @@
         "id": "NandGate",
         "name": "NandGate#1",
         "pos": {
-          "x": 10.0,
+          "x": 35.0,
           "y": 50.0
         },
         "params": 1
@@ -100,7 +82,7 @@
         "id": "NandGate",
         "name": "NandGate#2",
         "pos": {
-          "x": 10.0,
+          "x": 35.0,
           "y": 90.0
         },
         "params": 1
@@ -109,7 +91,7 @@
         "id": "NandGate",
         "name": "NandGate#3",
         "pos": {
-          "x": 40.0,
+          "x": 75.0,
           "y": 10.0
         },
         "params": 1
@@ -118,7 +100,7 @@
         "id": "NandGate",
         "name": "NandGate#4",
         "pos": {
-          "x": 40.0,
+          "x": 75.0,
           "y": 50.0
         },
         "params": 1
@@ -127,7 +109,7 @@
         "id": "NandGate",
         "name": "NandGate#5",
         "pos": {
-          "x": 40.0,
+          "x": 75.0,
           "y": 90.0
         },
         "params": 1
@@ -136,7 +118,7 @@
         "id": "NandGate",
         "name": "NandGate#6",
         "pos": {
-          "x": 40.0,
+          "x": 75.0,
           "y": 130.0
         },
         "params": 1
@@ -145,7 +127,7 @@
         "id": "NandGate",
         "name": "NandGate#7",
         "pos": {
-          "x": 40.0,
+          "x": 75.0,
           "y": 170.0
         },
         "params": 1
@@ -154,7 +136,7 @@
         "id": "NandGate",
         "name": "NandGate#8",
         "pos": {
-          "x": 70.0,
+          "x": 105.0,
           "y": 10.0
         },
         "params": 1
@@ -163,7 +145,7 @@
         "id": "NandGate",
         "name": "NandGate#9",
         "pos": {
-          "x": 70.0,
+          "x": 105.0,
           "y": 50.0
         },
         "params": 1
@@ -172,7 +154,7 @@
         "id": "NandGate",
         "name": "NandGate#10",
         "pos": {
-          "x": 70.0,
+          "x": 105.0,
           "y": 90.0
         },
         "params": 1
@@ -181,7 +163,7 @@
         "id": "NandGate",
         "name": "NandGate#11",
         "pos": {
-          "x": 70.0,
+          "x": 105.0,
           "y": 130.0
         },
         "params": 1
@@ -190,7 +172,7 @@
         "id": "NandGate",
         "name": "NandGate#12",
         "pos": {
-          "x": 70.0,
+          "x": 105.0,
           "y": 170.0
         },
         "params": 1
@@ -199,7 +181,7 @@
         "id": "NandGate",
         "name": "NandGate#13",
         "pos": {
-          "x": 100.0,
+          "x": 135.0,
           "y": 10.0
         },
         "params": 1
@@ -208,16 +190,28 @@
         "id": "NandGate",
         "name": "NandGate#14",
         "pos": {
-          "x": 100.0,
+          "x": 135.0,
           "y": 170.0
         },
         "params": 1
       },
+      {
+        "id": "Splitter",
+        "name": "Splitter#0",
+        "pos": {
+          "x": 5.0,
+          "y": 50.0
+        },
+        "params": {
+          "logicWidth": 3,
+          "orientation": "RIGHT"
+        }
+      },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
         "pos": {
-          "x": 4.0,
+          "x": 19.0,
           "y": 19.0
         },
         "params": 1
@@ -226,7 +220,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#1",
         "pos": {
-          "x": 6.5,
+          "x": 29.0,
           "y": 19.0
         },
         "params": 1
@@ -235,7 +229,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#2",
         "pos": {
-          "x": 4.0,
+          "x": 19.0,
           "y": 144.0
         },
         "params": 1
@@ -244,7 +238,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#3",
         "pos": {
-          "x": 6.5,
+          "x": 29.0,
           "y": 59.0
         },
         "params": 1
@@ -253,8 +247,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#4",
         "pos": {
-          "x": 6.5,
-          "y": 99.0
+          "x": 29.0,
+          "y": 94.0
         },
         "params": 1
       },
@@ -262,7 +256,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#5",
         "pos": {
-          "x": 6.5,
+          "x": 29.0,
           "y": 104.0
         },
         "params": 1
@@ -271,7 +265,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#6",
         "pos": {
-          "x": 31.5,
+          "x": 59.0,
           "y": 54.0
         },
         "params": 1
@@ -280,7 +274,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#7",
         "pos": {
-          "x": 34.0,
+          "x": 64.0,
           "y": 59.0
         },
         "params": 1
@@ -289,7 +283,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#8",
         "pos": {
-          "x": 34.0,
+          "x": 64.0,
           "y": 64.0
         },
         "params": 1
@@ -298,7 +292,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#9",
         "pos": {
-          "x": 34.0,
+          "x": 64.0,
           "y": 134.0
         },
         "params": 1
@@ -307,7 +301,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#10",
         "pos": {
-          "x": 36.5,
+          "x": 69.0,
           "y": 99.0
         },
         "params": 1
@@ -316,7 +310,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#11",
         "pos": {
-          "x": 64.0,
+          "x": 99.0,
           "y": 59.0
         },
         "params": 1
@@ -325,7 +319,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#12",
         "pos": {
-          "x": 64.0,
+          "x": 99.0,
           "y": 99.0
         },
         "params": 1
@@ -334,7 +328,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#13",
         "pos": {
-          "x": 64.0,
+          "x": 99.0,
           "y": 139.0
         },
         "params": 1
@@ -343,7 +337,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#14",
         "pos": {
-          "x": 94.0,
+          "x": 129.0,
           "y": 19.0
         },
         "params": 1
@@ -352,24 +346,38 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#15",
         "pos": {
-          "x": 94.0,
+          "x": 129.0,
           "y": 179.0
         },
         "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#16",
+        "pos": {
+          "x": 19.0,
+          "y": 49.0
+        },
+        "params": 1
       }
     ],
     "wires": [
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I2"
+          "compName": "Splitter#0",
+          "pinName": "O0"
         },
         "pin2": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "name": "unnamedWire#0",
-        "path": []
+        "path": [
+          {
+            "x": 30.0,
+            "y": 70.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -383,15 +391,15 @@
         "name": "unnamedWire#1",
         "path": [
           {
-            "x": 5.0,
+            "x": 20.0,
             "y": 5.0
           },
           {
-            "x": 35.0,
+            "x": 70.0,
             "y": 5.0
           },
           {
-            "x": 35.0,
+            "x": 70.0,
             "y": 15.0
           }
         ]
@@ -420,7 +428,7 @@
         "name": "unnamedWire#3",
         "path": [
           {
-            "x": 7.5,
+            "x": 30.0,
             "y": 15.0
           }
         ]
@@ -437,18 +445,18 @@
         "name": "unnamedWire#4",
         "path": [
           {
-            "x": 7.5,
+            "x": 30.0,
             "y": 25.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#16",
           "pinName": ""
         },
         "name": "unnamedWire#5",
@@ -478,23 +486,23 @@
         "name": "unnamedWire#7",
         "path": [
           {
-            "x": 5.0,
+            "x": 20.0,
             "y": 195.0
           },
           {
-            "x": 65.0,
+            "x": 100.0,
             "y": 195.0
           },
           {
-            "x": 65.0,
+            "x": 100.0,
             "y": 185.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I1"
+          "compName": "Splitter#0",
+          "pinName": "O1"
         },
         "pin2": {
           "compName": "WireCrossPoint#3",
@@ -515,7 +523,7 @@
         "name": "unnamedWire#9",
         "path": [
           {
-            "x": 7.5,
+            "x": 30.0,
             "y": 55.0
           }
         ]
@@ -532,7 +540,7 @@
         "name": "unnamedWire#10",
         "path": [
           {
-            "x": 7.5,
+            "x": 30.0,
             "y": 65.0
           }
         ]
@@ -540,11 +548,11 @@
       {
         "pin1": {
           "compName": "_submodelinterface",
-          "pinName": "I0"
+          "pinName": "I"
         },
         "pin2": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "Splitter#0",
+          "pinName": "I"
         },
         "name": "unnamedWire#11",
         "path": []
@@ -559,12 +567,7 @@
           "pinName": "A"
         },
         "name": "unnamedWire#12",
-        "path": [
-          {
-            "x": 7.5,
-            "y": 95.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
@@ -602,15 +605,15 @@
         "name": "unnamedWire#15",
         "path": [
           {
-            "x": 7.5,
-            "y": 112.5
+            "x": 30.0,
+            "y": 115.0
           },
           {
-            "x": 32.5,
-            "y": 112.5
+            "x": 60.0,
+            "y": 115.0
           },
           {
-            "x": 32.5,
+            "x": 60.0,
             "y": 105.0
           }
         ]
@@ -627,7 +630,7 @@
         "name": "unnamedWire#16",
         "path": [
           {
-            "x": 32.5,
+            "x": 60.0,
             "y": 20.0
           }
         ]
@@ -656,7 +659,7 @@
         "name": "unnamedWire#18",
         "path": [
           {
-            "x": 32.5,
+            "x": 60.0,
             "y": 95.0
           }
         ]
@@ -685,7 +688,7 @@
         "name": "unnamedWire#20",
         "path": [
           {
-            "x": 35.0,
+            "x": 65.0,
             "y": 25.0
           }
         ]
@@ -750,7 +753,7 @@
         "name": "unnamedWire#25",
         "path": [
           {
-            "x": 35.0,
+            "x": 65.0,
             "y": 175.0
           }
         ]
@@ -779,15 +782,15 @@
         "name": "unnamedWire#27",
         "path": [
           {
-            "x": 37.5,
+            "x": 70.0,
             "y": 35.0
           },
           {
-            "x": 65.0,
+            "x": 100.0,
             "y": 35.0
           },
           {
-            "x": 65.0,
+            "x": 100.0,
             "y": 25.0
           }
         ]
@@ -804,7 +807,7 @@
         "name": "unnamedWire#28",
         "path": [
           {
-            "x": 37.5,
+            "x": 70.0,
             "y": 185.0
           }
         ]
@@ -844,7 +847,7 @@
         "name": "unnamedWire#31",
         "path": [
           {
-            "x": 65.0,
+            "x": 100.0,
             "y": 55.0
           }
         ]
@@ -861,7 +864,7 @@
         "name": "unnamedWire#32",
         "path": [
           {
-            "x": 65.0,
+            "x": 100.0,
             "y": 65.0
           }
         ]
@@ -890,7 +893,7 @@
         "name": "unnamedWire#34",
         "path": [
           {
-            "x": 65.0,
+            "x": 100.0,
             "y": 95.0
           }
         ]
@@ -907,7 +910,7 @@
         "name": "unnamedWire#35",
         "path": [
           {
-            "x": 65.0,
+            "x": 100.0,
             "y": 105.0
           }
         ]
@@ -936,7 +939,7 @@
         "name": "unnamedWire#37",
         "path": [
           {
-            "x": 65.0,
+            "x": 100.0,
             "y": 135.0
           }
         ]
@@ -953,7 +956,7 @@
         "name": "unnamedWire#38",
         "path": [
           {
-            "x": 65.0,
+            "x": 100.0,
             "y": 145.0
           }
         ]
@@ -993,7 +996,7 @@
         "name": "unnamedWire#41",
         "path": [
           {
-            "x": 95.0,
+            "x": 130.0,
             "y": 15.0
           }
         ]
@@ -1010,7 +1013,7 @@
         "name": "unnamedWire#42",
         "path": [
           {
-            "x": 95.0,
+            "x": 130.0,
             "y": 25.0
           }
         ]
@@ -1075,7 +1078,7 @@
         "name": "unnamedWire#47",
         "path": [
           {
-            "x": 95.0,
+            "x": 130.0,
             "y": 175.0
           }
         ]
@@ -1092,7 +1095,7 @@
         "name": "unnamedWire#48",
         "path": [
           {
-            "x": 95.0,
+            "x": 130.0,
             "y": 185.0
           }
         ]
@@ -1120,13 +1123,37 @@
         },
         "name": "unnamedWire#50",
         "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#16",
+          "pinName": ""
+        },
+        "name": "unnamedWire#51",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#0",
+          "pinName": "O2"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#16",
+          "pinName": ""
+        },
+        "name": "unnamedWire#52",
+        "path": []
       }
     ],
     "version": "0.1.1"
   },
   "symbolRendererSnippetID": "simpleRectangularLike",
   "symbolRendererParams": {
-    "centerText": "Am2901SourceDecode",
+    "centerText": "Source\ndecode",
     "centerTextHeight": 5.0,
     "horizontalComponentCenter": 17.5,
     "pinLabelHeight": 3.5,