Fixed a bug in Am2900; created dlatch8/80; relayouted some components

[Mograsim.git] / net.mograsim.logic.model.am2900 / components / net / mograsim / logic / model / am2900 / components / dff.json

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff.json
index 298101f..2c771c0 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff.json
@@ -5,7 +5,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 5.0
+        "y": 15.0
       },
       "name": "C",
       "logicWidth": 1,
@@ -14,7 +14,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 15.0
+        "y": 5.0
       },
       "name": "D",
       "logicWidth": 1,
@@ -47,7 +47,7 @@
         "name": "NandGate#0",
         "pos": {
           "x": 120.0,
-          "y": 60.0
+          "y": 20.0
         },
         "params": 1
       },
@@ -56,7 +56,7 @@
         "name": "WireCrossPoint#0",
         "pos": {
           "x": 9.0,
-          "y": 24.0
+          "y": 74.0
         },
         "params": 1
       },
@@ -65,7 +65,7 @@
         "name": "WireCrossPoint#1",
         "pos": {
           "x": 19.0,
-          "y": 64.0
+          "y": 54.0
         },
         "params": 1
       },
@@ -73,8 +73,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#2",
         "pos": {
-          "x": 99.0,
-          "y": 34.0
+          "x": 94.0,
+          "y": 64.0
         },
         "params": 1
       },
@@ -82,8 +82,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#3",
         "pos": {
-          "x": 99.0,
-          "y": 44.0
+          "x": 104.0,
+          "y": 34.0
         },
         "params": 1
       },
@@ -92,7 +92,7 @@
         "name": "_rsLatch#0",
         "pos": {
           "x": 40.0,
-          "y": 10.0
+          "y": 70.0
         }
       },
       {
@@ -100,7 +100,7 @@
         "name": "_rsLatch#1",
         "pos": {
           "x": 120.0,
-          "y": 30.0
+          "y": 45.0
         }
       },
       {
@@ -108,7 +108,7 @@
         "name": "nand3#0",
         "pos": {
           "x": 40.0,
-          "y": 40.0
+          "y": 30.0
         }
       }
     ],
@@ -135,7 +135,12 @@
           "pinName": "_R"
         },
         "name": "unnamedWire#1",
-        "path": []
+        "path": [
+          {
+            "x": 10.0,
+            "y": 85.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -159,7 +164,12 @@
           "pinName": "_R"
         },
         "name": "unnamedWire#11",
-        "path": []
+        "path": [
+          {
+            "x": 105.0,
+            "y": 60.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -168,15 +178,10 @@
         },
         "pin2": {
           "compName": "NandGate#0",
-          "pinName": "A"
+          "pinName": "B"
         },
         "name": "unnamedWire#12",
-        "path": [
-          {
-            "x": 100.0,
-            "y": 65.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
@@ -213,7 +218,7 @@
         "path": [
           {
             "x": 10.0,
-            "y": 55.0
+            "y": 45.0
           }
         ]
       },
@@ -224,7 +229,7 @@
         },
         "pin2": {
           "compName": "NandGate#0",
-          "pinName": "B"
+          "pinName": "A"
         },
         "name": "unnamedWire#3",
         "path": []
@@ -242,15 +247,15 @@
         "path": [
           {
             "x": 145.0,
-            "y": 70.0
+            "y": 30.0
           },
           {
             "x": 145.0,
-            "y": 85.0
+            "y": 10.0
           },
           {
             "x": 20.0,
-            "y": 85.0
+            "y": 10.0
           }
         ]
       },
@@ -267,7 +272,7 @@
         "path": [
           {
             "x": 20.0,
-            "y": 15.0
+            "y": 75.0
           }
         ]
       },
@@ -295,8 +300,8 @@
         "name": "unnamedWire#7",
         "path": [
           {
-            "x": 100.0,
-            "y": 25.0
+            "x": 95.0,
+            "y": 85.0
           }
         ]
       },
@@ -313,11 +318,11 @@
         "path": [
           {
             "x": 30.0,
-            "y": 35.0
+            "y": 65.0
           },
           {
             "x": 30.0,
-            "y": 45.0
+            "y": 35.0
           }
         ]
       },
@@ -331,7 +336,12 @@
           "pinName": "_S"
         },
         "name": "unnamedWire#9",
-        "path": []
+        "path": [
+          {
+            "x": 95.0,
+            "y": 50.0
+          }
+        ]
       }
     ],
     "version": "0.1.1"