X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fhalfadder.json;h=2888e909a49a72eb6748831edf9dde95d3582b93;hb=e2afca47e58e69b03378537c5f1d1a15a806a10d;hp=d56f83e074229d0813afcf50283d53712623287a;hpb=7d05144c25daa53e60fc9ed9fd503546a86567f8;p=Mograsim.git

diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/halfadder.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/halfadder.json
index d56f83e0..2888e909 100644
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/halfadder.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/halfadder.json
@@ -1,11 +1,11 @@
 {
-  "width": 35.0,
-  "height": 20.0,
+  "width": 30.0,
+  "height": 30.0,
   "interfacePins": [
     {
       "location": {
         "x": 0.0,
-        "y": 5.0
+        "y": 15.0
       },
       "name": "A",
       "logicWidth": 1,
@@ -14,7 +14,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 15.0
+        "y": 25.0
       },
       "name": "B",
       "logicWidth": 1,
@@ -22,7 +22,7 @@
     },
     {
       "location": {
-        "x": 35.0,
+        "x": 30.0,
         "y": 5.0
       },
       "name": "Y",
@@ -31,50 +31,23 @@
     },
     {
       "location": {
-        "x": 35.0,
-        "y": 15.0
+        "x": 0.0,
+        "y": 5.0
       },
-      "name": "_Z",
+      "name": "Z",
       "logicWidth": 1,
       "usage": "OUTPUT"
     }
   ],
-  "innerScale": 0.4,
+  "innerScale": 0.5,
   "submodel": {
     "components": [
       {
         "id": "NandGate",
         "name": "NandGate#0",
         "pos": {
-          "x": 10.0,
-          "y": 15.0
-        },
-        "params": 1
-      },
-      {
-        "id": "NandGate",
-        "name": "NandGate#1",
-        "pos": {
-          "x": 40.0,
-          "y": 2.5
-        },
-        "params": 1
-      },
-      {
-        "id": "NandGate",
-        "name": "NandGate#2",
-        "pos": {
-          "x": 40.0,
-          "y": 27.5
-        },
-        "params": 1
-      },
-      {
-        "id": "NandGate",
-        "name": "NandGate#3",
-        "pos": {
-          "x": 65.0,
-          "y": 2.5
+          "x": 25.0,
+          "y": 7.5
         },
         "params": 1
       },
@@ -82,114 +55,46 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
         "pos": {
-          "x": 4.0,
-          "y": 11.5
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
-        "pos": {
-          "x": 4.0,
-          "y": 36.5
+          "x": 19.0,
+          "y": 21.5
         },
         "params": 1
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
+        "id": "halfadder_invz",
+        "name": "halfadder_invz#0",
         "pos": {
-          "x": 34.0,
-          "y": 24.0
-        },
-        "params": 1
+          "x": 10.0,
+          "y": 35.0
+        }
       }
     ],
     "wires": [
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A"
+          "compName": "halfadder_invz#0",
+          "pinName": "_Z"
         },
         "pin2": {
           "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "name": "unnamedWire#0",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#1",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#1",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 7.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "NandGate#1",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "NandGate#3",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#10",
         "path": [
           {
-            "x": 62.5,
-            "y": 12.5
+            "x": 50.0,
+            "y": 50.0
           },
           {
-            "x": 62.5,
-            "y": 7.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "NandGate#2",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "NandGate#3",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#11",
-        "path": [
-          {
-            "x": 62.5,
-            "y": 37.5
+            "x": 50.0,
+            "y": 30.0
           },
           {
-            "x": 62.5,
-            "y": 17.5
+            "x": 20.0,
+            "y": 30.0
           }
         ]
       },
-      {
-        "pin1": {
-          "compName": "NandGate#3",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y"
-        },
-        "name": "unnamedWire#12",
-        "path": []
-      },
       {
         "pin1": {
           "compName": "WireCrossPoint#0",
@@ -199,124 +104,106 @@
           "compName": "NandGate#0",
           "pinName": "A"
         },
-        "name": "unnamedWire#2",
+        "name": "unnamedWire#1",
         "path": [
           {
-            "x": 5.0,
-            "y": 20.0
+            "x": 20.0,
+            "y": 12.5
           }
         ]
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "name": "unnamedWire#3",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "pin2": {
-          "compName": "NandGate#2",
+          "compName": "NandGate#0",
           "pinName": "B"
         },
-        "name": "unnamedWire#4",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 42.5
-          }
-        ]
+        "name": "unnamedWire#2",
+        "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "A"
         },
         "pin2": {
-          "compName": "NandGate#0",
-          "pinName": "B"
+          "compName": "halfadder_invz#0",
+          "pinName": "A"
         },
-        "name": "unnamedWire#5",
+        "name": "unnamedWire#3",
         "path": [
           {
             "x": 5.0,
             "y": 30.0
+          },
+          {
+            "x": 5.0,
+            "y": 40.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "NandGate#0",
-          "pinName": "Y"
+          "compName": "_submodelinterface",
+          "pinName": "B"
         },
         "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "halfadder_invz#0",
+          "pinName": "B"
         },
-        "name": "unnamedWire#6",
+        "name": "unnamedWire#4",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "NandGate#0",
+          "pinName": "Y"
         },
         "pin2": {
           "compName": "_submodelinterface",
-          "pinName": "_Z"
+          "pinName": "Z"
         },
-        "name": "unnamedWire#7",
+        "name": "unnamedWire#5",
         "path": [
           {
-            "x": 80.0,
-            "y": 25.0
+            "x": 50.0,
+            "y": 17.5
           },
           {
-            "x": 80.0,
-            "y": 37.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "NandGate#1",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#8",
-        "path": [
+            "x": 50.0,
+            "y": 5.0
+          },
           {
-            "x": 35.0,
-            "y": 17.5
+            "x": 5.0,
+            "y": 5.0
+          },
+          {
+            "x": 5.0,
+            "y": 10.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "halfadder_invz#0",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "NandGate#2",
-          "pinName": "A"
+          "compName": "_submodelinterface",
+          "pinName": "Y"
         },
-        "name": "unnamedWire#9",
+        "name": "unnamedWire#6",
         "path": [
           {
-            "x": 35.0,
-            "y": 32.5
+            "x": 55.0,
+            "y": 40.0
+          },
+          {
+            "x": 55.0,
+            "y": 10.0
           }
         ]
       }
@@ -327,7 +214,7 @@
   "symbolRendererParams": {
     "centerText": "halfadder",
     "centerTextHeight": 5.0,
-    "horizontalComponentCenter": 17.5,
+    "horizontalComponentCenter": 15.0,
     "pinLabelHeight": 3.5,
     "pinLabelMargin": 0.5
   },