X-Git-Url: https://mograsim.net/gitweb/?p=Mograsim.git;a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fam2904%2FAm2904TestLogic.json;h=c6cbfe4686703423e6489b1a792eb7108637bb24;hp=2c007e546fa59f122ea43d8dea8252467990a91a;hb=5c03a4fa605a1c3946eddece3b566b5aa0677759;hpb=9e8e8ae5414f52ec87f9247b10a525f41768c7dc

diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904TestLogic.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904TestLogic.json
index 2c007e54..c6cbfe46 100644
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904TestLogic.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904TestLogic.json
@@ -171,15 +171,6 @@
         },
         "params": 1
       },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
-        "pos": {
-          "x": 39.0,
-          "y": 109.0
-        },
-        "params": 1
-      },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#2",
@@ -252,6 +243,15 @@
         },
         "params": 1
       },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#10",
+        "pos": {
+          "x": 39.0,
+          "y": 109.0
+        },
+        "params": 1
+      },
       {
         "id": "xor",
         "name": "xor#0",
@@ -286,6 +286,112 @@
         "name": "unnamedWire#1",
         "path": []
       },
+      {
+        "pin1": {
+          "compName": "Splitter#0",
+          "pinName": "O1"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "name": "unnamedWire#2",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "xor#0",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#3",
+        "path": [
+          {
+            "x": 30.0,
+            "y": 25.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "xor#0",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#4",
+        "path": [
+          {
+            "x": 35.0,
+            "y": 35.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "xor#0",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "name": "unnamedWire#5",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#0",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#6",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "NandGate#0",
+          "pinName": "B"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "name": "unnamedWire#7",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "name": "unnamedWire#8",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "NandGate#1",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
+        },
+        "name": "unnamedWire#9",
+        "path": []
+      },
       {
         "pin1": {
           "compName": "NandGate#2",
@@ -432,18 +538,6 @@
         "name": "unnamedWire#18",
         "path": []
       },
-      {
-        "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O1"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "name": "unnamedWire#2",
-        "path": []
-      },
       {
         "pin1": {
           "compName": "WireCrossPoint#1",
@@ -453,7 +547,7 @@
           "compName": "_submodelinterface",
           "pinName": "Y011"
         },
-        "name": "unnamedWire#20",
+        "name": "unnamedWire#19",
         "path": []
       },
       {
@@ -465,7 +559,7 @@
           "compName": "WireCrossPoint#1",
           "pinName": ""
         },
-        "name": "unnamedWire#21",
+        "name": "unnamedWire#20",
         "path": [
           {
             "x": 35.0,
@@ -482,7 +576,7 @@
           "compName": "_submodelinterface",
           "pinName": "Y010"
         },
-        "name": "unnamedWire#22",
+        "name": "unnamedWire#21",
         "path": []
       },
       {
@@ -494,7 +588,7 @@
           "compName": "_submodelinterface",
           "pinName": "Y100"
         },
-        "name": "unnamedWire#23",
+        "name": "unnamedWire#22",
         "path": []
       },
       {
@@ -506,7 +600,7 @@
           "compName": "NandGate#4",
           "pinName": "B"
         },
-        "name": "unnamedWire#24",
+        "name": "unnamedWire#23",
         "path": [
           {
             "x": 70.0,
@@ -527,7 +621,7 @@
           "compName": "WireCrossPoint#8",
           "pinName": ""
         },
-        "name": "unnamedWire#25",
+        "name": "unnamedWire#24",
         "path": []
       },
       {
@@ -539,7 +633,7 @@
           "compName": "NandGate#4",
           "pinName": "A"
         },
-        "name": "unnamedWire#26",
+        "name": "unnamedWire#25",
         "path": []
       },
       {
@@ -551,7 +645,7 @@
           "compName": "NandGate#3",
           "pinName": "A"
         },
-        "name": "unnamedWire#27",
+        "name": "unnamedWire#26",
         "path": []
       },
       {
@@ -563,7 +657,7 @@
           "compName": "WireCrossPoint#9",
           "pinName": ""
         },
-        "name": "unnamedWire#28",
+        "name": "unnamedWire#27",
         "path": []
       },
       {
@@ -575,26 +669,9 @@
           "compName": "NandGate#5",
           "pinName": "Y"
         },
-        "name": "unnamedWire#29",
+        "name": "unnamedWire#28",
         "path": []
       },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "xor#0",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#3",
-        "path": [
-          {
-            "x": 30.0,
-            "y": 25.0
-          }
-        ]
-      },
       {
         "pin1": {
           "compName": "NandGate#5",
@@ -604,7 +681,7 @@
           "compName": "WireCrossPoint#8",
           "pinName": ""
         },
-        "name": "unnamedWire#30",
+        "name": "unnamedWire#29",
         "path": [
           {
             "x": 75.0,
@@ -621,7 +698,7 @@
           "compName": "WireCrossPoint#10",
           "pinName": ""
         },
-        "name": "unnamedWire#31",
+        "name": "unnamedWire#30",
         "path": [
           {
             "x": 40.0,
@@ -638,7 +715,7 @@
           "compName": "NandGate#5",
           "pinName": "B"
         },
-        "name": "unnamedWire#32",
+        "name": "unnamedWire#31",
         "path": [
           {
             "x": 25.0,
@@ -655,7 +732,7 @@
           "compName": "WireCrossPoint#0",
           "pinName": ""
         },
-        "name": "unnamedWire#33",
+        "name": "unnamedWire#32",
         "path": [
           {
             "x": 30.0,
@@ -672,90 +749,13 @@
           "compName": "WireCrossPoint#4",
           "pinName": ""
         },
-        "name": "unnamedWire#34",
+        "name": "unnamedWire#33",
         "path": [
           {
             "x": 20.0,
             "y": 110.0
           }
         ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "xor#0",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#4",
-        "path": [
-          {
-            "x": 35.0,
-            "y": 35.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "xor#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "name": "unnamedWire#5",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#0",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#6",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "NandGate#0",
-          "pinName": "B"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "name": "unnamedWire#7",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "name": "unnamedWire#8",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "NandGate#1",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
-        },
-        "name": "unnamedWire#9",
-        "path": []
       }
     ],
     "version": "0.1.1"