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 / dff8.json

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff8.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff8.json
index 2251459..8c2a5b3 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff8.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff8.json
@@ -62,7 +62,7 @@
         "name": "WireCrossPoint#0",
         "pos": {
           "x": 39.0,
-          "y": 14.0
+          "y": 24.0
         },
         "params": 1
       },
@@ -71,7 +71,7 @@
         "name": "WireCrossPoint#10",
         "pos": {
           "x": 89.0,
-          "y": 54.0
+          "y": 74.0
         },
         "params": 1
       },
@@ -80,7 +80,7 @@
         "name": "WireCrossPoint#2",
         "pos": {
           "x": 39.0,
-          "y": 44.0
+          "y": 54.0
         },
         "params": 1
       },
@@ -89,7 +89,7 @@
         "name": "WireCrossPoint#3",
         "pos": {
           "x": 39.0,
-          "y": 74.0
+          "y": 84.0
         },
         "params": 1
       },
@@ -98,7 +98,7 @@
         "name": "WireCrossPoint#7",
         "pos": {
           "x": 89.0,
-          "y": 84.0
+          "y": 104.0
         },
         "params": 1
       },
@@ -107,7 +107,7 @@
         "name": "WireCrossPoint#9",
         "pos": {
           "x": 89.0,
-          "y": 24.0
+          "y": 44.0
         },
         "params": 1
       },
@@ -116,7 +116,7 @@
         "name": "dff#10",
         "pos": {
           "x": 95.0,
-          "y": 50.0
+          "y": 60.0
         }
       },
       {
@@ -140,7 +140,7 @@
         "name": "dff#5",
         "pos": {
           "x": 95.0,
-          "y": 80.0
+          "y": 90.0
         }
       },
       {
@@ -148,7 +148,7 @@
         "name": "dff#6",
         "pos": {
           "x": 95.0,
-          "y": 110.0
+          "y": 120.0
         }
       },
       {
@@ -172,7 +172,7 @@
         "name": "dff#9",
         "pos": {
           "x": 95.0,
-          "y": 20.0
+          "y": 30.0
         }
       }
     ],
@@ -208,16 +208,7 @@
           "pinName": "C"
         },
         "name": "unnamedWire#1",
-        "path": [
-          {
-            "x": 10.0,
-            "y": 15.0
-          },
-          {
-            "x": 10.0,
-            "y": 25.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
@@ -231,11 +222,11 @@
         "name": "unnamedWire#10",
         "path": [
           {
-            "x": 25.0,
-            "y": 55.0
+            "x": 30.0,
+            "y": 45.0
           },
           {
-            "x": 25.0,
+            "x": 30.0,
             "y": 60.0
           }
         ]
@@ -274,7 +265,7 @@
         "path": [
           {
             "x": 25.0,
-            "y": 85.0
+            "y": 75.0
           },
           {
             "x": 25.0,
@@ -316,7 +307,7 @@
         "path": [
           {
             "x": 25.0,
-            "y": 115.0
+            "y": 105.0
           },
           {
             "x": 25.0,
@@ -418,7 +409,7 @@
         "path": [
           {
             "x": 40.0,
-            "y": 105.0
+            "y": 115.0
           }
         ]
       },
@@ -435,7 +426,7 @@
         "path": [
           {
             "x": 90.0,
-            "y": 115.0
+            "y": 135.0
           }
         ]
       },
@@ -540,6 +531,14 @@
           },
           {
             "x": 155.0,
+            "y": 25.0
+          },
+          {
+            "x": 85.0,
+            "y": 25.0
+          },
+          {
+            "x": 85.0,
             "y": 15.0
           }
         ]
@@ -557,7 +556,7 @@
         "path": [
           {
             "x": 150.0,
-            "y": 25.0
+            "y": 35.0
           },
           {
             "x": 150.0,
@@ -582,6 +581,14 @@
           },
           {
             "x": 145.0,
+            "y": 55.0
+          },
+          {
+            "x": 85.0,
+            "y": 55.0
+          },
+          {
+            "x": 85.0,
             "y": 45.0
           }
         ]
@@ -603,7 +610,7 @@
           },
           {
             "x": 140.0,
-            "y": 55.0
+            "y": 65.0
           }
         ]
       },
@@ -624,6 +631,14 @@
           },
           {
             "x": 140.0,
+            "y": 85.0
+          },
+          {
+            "x": 85.0,
+            "y": 85.0
+          },
+          {
+            "x": 85.0,
             "y": 75.0
           }
         ]
@@ -641,7 +656,7 @@
         "path": [
           {
             "x": 140.0,
-            "y": 85.0
+            "y": 95.0
           },
           {
             "x": 140.0,
@@ -666,6 +681,14 @@
           },
           {
             "x": 140.0,
+            "y": 115.0
+          },
+          {
+            "x": 85.0,
+            "y": 115.0
+          },
+          {
+            "x": 85.0,
             "y": 105.0
           }
         ]
@@ -682,11 +705,11 @@
         "name": "unnamedWire#64",
         "path": [
           {
-            "x": 140.0,
-            "y": 115.0
+            "x": 150.0,
+            "y": 125.0
           },
           {
-            "x": 140.0,
+            "x": 150.0,
             "y": 110.0
           }
         ]
@@ -704,7 +727,7 @@
         "path": [
           {
             "x": 20.0,
-            "y": 25.0
+            "y": 15.0
           },
           {
             "x": 20.0,