X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fam2910%2FAm2910InstrPLA.json;h=862805a25a1fafc99acfeaae4406bcc906cb42ae;hb=2f4993ad065c0dc55345221f8fd8d05be4d37aa5;hp=5925fe78f54540a49226c73c072f9a9fab150fbf;hpb=8b9032058298903de7946205a08d59e7fbf3a986;p=Mograsim.git

diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910InstrPLA.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910InstrPLA.json
index 5925fe78..862805a2 100644
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910InstrPLA.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910InstrPLA.json
@@ -38,15 +38,6 @@
       "logicWidth": 1,
       "usage": "OUTPUT"
     },
-    {
-      "location": {
-        "x": 60.0,
-        "y": 5.0
-      },
-      "name": "RLD",
-      "logicWidth": 1,
-      "usage": "OUTPUT"
-    },
     {
       "location": {
         "x": 60.0,
@@ -119,6 +110,15 @@
       "logicWidth": 1,
       "usage": "OUTPUT"
     },
+    {
+      "location": {
+        "x": 60.0,
+        "y": 5.0
+      },
+      "name": "_RLD",
+      "logicWidth": 1,
+      "usage": "OUTPUT"
+    },
     {
       "location": {
         "x": 45.0,
@@ -506,7 +506,7 @@
         "name": "NandGate#41",
         "pos": {
           "x": 415.0,
-          "y": 660.0
+          "y": 665.0
         },
         "params": 1
       },
@@ -515,7 +515,7 @@
         "name": "NandGate#42",
         "pos": {
           "x": 445.0,
-          "y": 665.0
+          "y": 670.0
         },
         "params": 1
       },
@@ -587,7 +587,7 @@
         "name": "NandGate#50",
         "pos": {
           "x": 505.0,
-          "y": 620.0
+          "y": 625.0
         },
         "params": 1
       },
@@ -762,6 +762,15 @@
         },
         "params": 1
       },
+      {
+        "id": "NandGate",
+        "name": "NandGate#70",
+        "pos": {
+          "x": 390.0,
+          "y": 40.0
+        },
+        "params": 1
+      },
       {
         "id": "Splitter",
         "name": "Splitter#0",
@@ -1013,7 +1022,7 @@
         "name": "WireCrossPoint#26",
         "pos": {
           "x": 294.0,
-          "y": 684.0
+          "y": 689.0
         },
         "params": 1
       },
@@ -1499,7 +1508,7 @@
         "name": "WireCrossPoint#80",
         "pos": {
           "x": 259.0,
-          "y": 634.0
+          "y": 639.0
         },
         "params": 1
       },
@@ -1706,15 +1715,15 @@
         "name": "and#9",
         "pos": {
           "x": 355.0,
-          "y": 45.0
+          "y": 40.0
         }
       },
       {
         "id": "and",
         "name": "and#10",
         "pos": {
-          "x": 390.0,
-          "y": 45.0
+          "x": 385.0,
+          "y": 430.0
         }
       },
       {
@@ -1746,7 +1755,7 @@
         "name": "and#14",
         "pos": {
           "x": 385.0,
-          "y": 640.0
+          "y": 645.0
         }
       },
       {
@@ -1772,14 +1781,6 @@
           "x": 415.0,
           "y": 345.0
         }
-      },
-      {
-        "id": "and",
-        "name": "and#18",
-        "pos": {
-          "x": 385.0,
-          "y": 430.0
-        }
       }
     ],
     "wires": [
@@ -2724,12 +2725,12 @@
       },
       {
         "pin1": {
-          "compName": "and#10",
+          "compName": "NandGate#70",
           "pinName": "Y"
         },
         "pin2": {
           "compName": "_submodelinterface",
-          "pinName": "RLD"
+          "pinName": "_RLD"
         },
         "name": "unnamedWire#64",
         "path": []
@@ -2752,7 +2753,7 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "and#10",
+          "compName": "NandGate#70",
           "pinName": "A"
         },
         "name": "unnamedWire#66",
@@ -3263,7 +3264,7 @@
           },
           {
             "x": 350.0,
-            "y": 50.0
+            "y": 45.0
           }
         ]
       },
@@ -4200,7 +4201,7 @@
       },
       {
         "pin1": {
-          "compName": "and#10",
+          "compName": "NandGate#70",
           "pinName": "B"
         },
         "pin2": {
@@ -4211,7 +4212,7 @@
         "path": [
           {
             "x": 385.0,
-            "y": 60.0
+            "y": 55.0
           },
           {
             "x": 385.0,
@@ -4476,7 +4477,7 @@
         "path": [
           {
             "x": 275.0,
-            "y": 665.0
+            "y": 670.0
           }
         ]
       },
@@ -4517,11 +4518,11 @@
         "path": [
           {
             "x": 440.0,
-            "y": 685.0
+            "y": 690.0
           },
           {
             "x": 440.0,
-            "y": 680.0
+            "y": 685.0
           }
         ]
       },
@@ -4538,7 +4539,7 @@
         "path": [
           {
             "x": 470.0,
-            "y": 675.0
+            "y": 680.0
           },
           {
             "x": 470.0,
@@ -4556,16 +4557,7 @@
           "pinName": "Y"
         },
         "name": "unnamedWire#178",
-        "path": [
-          {
-            "x": 470.0,
-            "y": 650.0
-          },
-          {
-            "x": 470.0,
-            "y": 645.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
@@ -4580,7 +4572,7 @@
         "path": [
           {
             "x": 290.0,
-            "y": 655.0
+            "y": 660.0
           }
         ]
       },
@@ -4782,7 +4774,7 @@
           },
           {
             "x": 500.0,
-            "y": 625.0
+            "y": 630.0
           }
         ]
       },
@@ -4799,7 +4791,7 @@
         "path": [
           {
             "x": 530.0,
-            "y": 630.0
+            "y": 635.0
           },
           {
             "x": 530.0,
@@ -5316,7 +5308,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "and#18",
+          "compName": "and#10",
           "pinName": "A"
         },
         "name": "unnamedWire#227",
@@ -5328,7 +5320,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "and#18",
+          "compName": "and#10",
           "pinName": "B"
         },
         "name": "unnamedWire#228",
@@ -5336,7 +5328,7 @@
       },
       {
         "pin1": {
-          "compName": "and#18",
+          "compName": "and#10",
           "pinName": "Y"
         },
         "pin2": {
@@ -5663,7 +5655,7 @@
         "path": [
           {
             "x": 350.0,
-            "y": 60.0
+            "y": 55.0
           }
         ]
       },
@@ -6118,7 +6110,7 @@
         "path": [
           {
             "x": 300.0,
-            "y": 645.0
+            "y": 650.0
           }
         ]
       },
@@ -6135,7 +6127,7 @@
         "path": [
           {
             "x": 280.0,
-            "y": 675.0
+            "y": 680.0
           }
         ]
       },