X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fdff16.json;fp=net.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fdff16.json;h=6efc9033a91ff241911b1162df0c4ea5d2312a02;hb=8bed58cd47f4e53a0a83e066d38864aa6875502f;hp=3b2dbb49022efabebe54aceead2289bb382dab31;hpb=bafa81ee43f93f0cec0f3327fda6d3c98f049318;p=Mograsim.git

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16.json
index 3b2dbb49..6efc9033 100644
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16.json
@@ -61,8 +61,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
         "pos": {
-          "x": 74.0,
-          "y": 19.0
+          "x": 64.0,
+          "y": 29.0
         },
         "params": 1
       },
@@ -70,8 +70,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#1",
         "pos": {
-          "x": 74.0,
-          "y": 49.0
+          "x": 64.0,
+          "y": 59.0
         },
         "params": 1
       },
@@ -79,8 +79,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#10",
         "pos": {
-          "x": 119.0,
-          "y": 119.0
+          "x": 114.0,
+          "y": 139.0
         },
         "params": 1
       },
@@ -88,8 +88,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#11",
         "pos": {
-          "x": 119.0,
-          "y": 209.0
+          "x": 114.0,
+          "y": 229.0
         },
         "params": 1
       },
@@ -97,8 +97,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#12",
         "pos": {
-          "x": 119.0,
-          "y": 89.0
+          "x": 114.0,
+          "y": 109.0
         },
         "params": 1
       },
@@ -106,8 +106,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#13",
         "pos": {
-          "x": 119.0,
-          "y": 149.0
+          "x": 114.0,
+          "y": 169.0
         },
         "params": 1
       },
@@ -115,8 +115,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#14",
         "pos": {
-          "x": 119.0,
-          "y": 179.0
+          "x": 114.0,
+          "y": 199.0
         },
         "params": 1
       },
@@ -124,8 +124,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#2",
         "pos": {
-          "x": 74.0,
-          "y": 79.0
+          "x": 64.0,
+          "y": 89.0
         },
         "params": 1
       },
@@ -133,8 +133,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#3",
         "pos": {
-          "x": 74.0,
-          "y": 109.0
+          "x": 64.0,
+          "y": 119.0
         },
         "params": 1
       },
@@ -142,8 +142,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#4",
         "pos": {
-          "x": 74.0,
-          "y": 169.0
+          "x": 64.0,
+          "y": 179.0
         },
         "params": 1
       },
@@ -151,8 +151,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#5",
         "pos": {
-          "x": 74.0,
-          "y": 199.0
+          "x": 64.0,
+          "y": 209.0
         },
         "params": 1
       },
@@ -160,8 +160,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#6",
         "pos": {
-          "x": 74.0,
-          "y": 139.0
+          "x": 64.0,
+          "y": 149.0
         },
         "params": 1
       },
@@ -169,8 +169,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#8",
         "pos": {
-          "x": 119.0,
-          "y": 59.0
+          "x": 114.0,
+          "y": 79.0
         },
         "params": 1
       },
@@ -178,8 +178,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#9",
         "pos": {
-          "x": 119.0,
-          "y": 29.0
+          "x": 114.0,
+          "y": 49.0
         },
         "params": 1
       },
@@ -187,7 +187,7 @@
         "id": "dff",
         "name": "dff#0",
         "pos": {
-          "x": 80.0,
+          "x": 70.0,
           "y": 15.0
         }
       },
@@ -195,23 +195,23 @@
         "id": "dff",
         "name": "dff#1",
         "pos": {
-          "x": 125.0,
-          "y": 25.0
+          "x": 120.0,
+          "y": 35.0
         }
       },
       {
         "id": "dff",
         "name": "dff#10",
         "pos": {
-          "x": 125.0,
-          "y": 235.0
+          "x": 120.0,
+          "y": 245.0
         }
       },
       {
         "id": "dff",
         "name": "dff#11",
         "pos": {
-          "x": 80.0,
+          "x": 70.0,
           "y": 225.0
         }
       },
@@ -219,7 +219,7 @@
         "id": "dff",
         "name": "dff#12",
         "pos": {
-          "x": 80.0,
+          "x": 70.0,
           "y": 195.0
         }
       },
@@ -227,23 +227,23 @@
         "id": "dff",
         "name": "dff#13",
         "pos": {
-          "x": 125.0,
-          "y": 145.0
+          "x": 120.0,
+          "y": 155.0
         }
       },
       {
         "id": "dff",
         "name": "dff#14",
         "pos": {
-          "x": 125.0,
-          "y": 175.0
+          "x": 120.0,
+          "y": 185.0
         }
       },
       {
         "id": "dff",
         "name": "dff#15",
         "pos": {
-          "x": 80.0,
+          "x": 70.0,
           "y": 165.0
         }
       },
@@ -251,15 +251,15 @@
         "id": "dff",
         "name": "dff#2",
         "pos": {
-          "x": 125.0,
-          "y": 55.0
+          "x": 120.0,
+          "y": 65.0
         }
       },
       {
         "id": "dff",
         "name": "dff#3",
         "pos": {
-          "x": 80.0,
+          "x": 70.0,
           "y": 45.0
         }
       },
@@ -267,23 +267,23 @@
         "id": "dff",
         "name": "dff#4",
         "pos": {
-          "x": 125.0,
-          "y": 85.0
+          "x": 120.0,
+          "y": 95.0
         }
       },
       {
         "id": "dff",
         "name": "dff#5",
         "pos": {
-          "x": 125.0,
-          "y": 115.0
+          "x": 120.0,
+          "y": 125.0
         }
       },
       {
         "id": "dff",
         "name": "dff#6",
         "pos": {
-          "x": 80.0,
+          "x": 70.0,
           "y": 75.0
         }
       },
@@ -291,7 +291,7 @@
         "id": "dff",
         "name": "dff#7",
         "pos": {
-          "x": 80.0,
+          "x": 70.0,
           "y": 105.0
         }
       },
@@ -299,7 +299,7 @@
         "id": "dff",
         "name": "dff#8",
         "pos": {
-          "x": 80.0,
+          "x": 70.0,
           "y": 135.0
         }
       },
@@ -307,8 +307,8 @@
         "id": "dff",
         "name": "dff#9",
         "pos": {
-          "x": 125.0,
-          "y": 205.0
+          "x": 120.0,
+          "y": 215.0
         }
       }
     ],
@@ -330,7 +330,7 @@
           },
           {
             "x": 20.0,
-            "y": 30.0
+            "y": 20.0
           }
         ]
       },
@@ -368,7 +368,7 @@
         "path": [
           {
             "x": 45.0,
-            "y": 180.0
+            "y": 170.0
           },
           {
             "x": 45.0,
@@ -410,7 +410,7 @@
         "path": [
           {
             "x": 35.0,
-            "y": 210.0
+            "y": 200.0
           },
           {
             "x": 35.0,
@@ -452,7 +452,7 @@
         "path": [
           {
             "x": 25.0,
-            "y": 240.0
+            "y": 230.0
           },
           {
             "x": 25.0,
@@ -546,7 +546,7 @@
           },
           {
             "x": 30.0,
-            "y": 60.0
+            "y": 50.0
           }
         ]
       },
@@ -703,8 +703,8 @@
         "name": "unnamedWire#30",
         "path": [
           {
-            "x": 75.0,
-            "y": 230.0
+            "x": 65.0,
+            "y": 240.0
           }
         ]
       },
@@ -720,8 +720,8 @@
         "name": "unnamedWire#31",
         "path": [
           {
-            "x": 120.0,
-            "y": 240.0
+            "x": 115.0,
+            "y": 260.0
           }
         ]
       },
@@ -831,7 +831,16 @@
           "pinName": "D"
         },
         "name": "unnamedWire#4",
-        "path": []
+        "path": [
+          {
+            "x": 40.0,
+            "y": 90.0
+          },
+          {
+            "x": 40.0,
+            "y": 80.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -905,11 +914,11 @@
         "name": "unnamedWire#45",
         "path": [
           {
-            "x": 75.0,
+            "x": 65.0,
             "y": 10.0
           },
           {
-            "x": 120.0,
+            "x": 115.0,
             "y": 10.0
           }
         ]
@@ -939,7 +948,7 @@
         "path": [
           {
             "x": 10.0,
-            "y": 20.0
+            "y": 30.0
           },
           {
             "x": 10.0,
@@ -964,6 +973,14 @@
           },
           {
             "x": 200.0,
+            "y": 30.0
+          },
+          {
+            "x": 110.0,
+            "y": 30.0
+          },
+          {
+            "x": 110.0,
             "y": 20.0
           }
         ]
@@ -993,7 +1010,7 @@
         "path": [
           {
             "x": 195.0,
-            "y": 30.0
+            "y": 40.0
           },
           {
             "x": 195.0,
@@ -1018,6 +1035,14 @@
           },
           {
             "x": 190.0,
+            "y": 60.0
+          },
+          {
+            "x": 110.0,
+            "y": 60.0
+          },
+          {
+            "x": 110.0,
             "y": 50.0
           }
         ]
@@ -1039,7 +1064,7 @@
           },
           {
             "x": 185.0,
-            "y": 60.0
+            "y": 70.0
           }
         ]
       },
@@ -1055,11 +1080,11 @@
         "name": "unnamedWire#53",
         "path": [
           {
-            "x": 180.0,
+            "x": 110.0,
             "y": 90.0
           },
           {
-            "x": 180.0,
+            "x": 110.0,
             "y": 80.0
           }
         ]
@@ -1074,16 +1099,7 @@
           "pinName": "O10"
         },
         "name": "unnamedWire#54",
-        "path": [
-          {
-            "x": 175.0,
-            "y": 90.0
-          },
-          {
-            "x": 175.0,
-            "y": 100.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
@@ -1095,7 +1111,24 @@
           "pinName": "Q"
         },
         "name": "unnamedWire#55",
-        "path": []
+        "path": [
+          {
+            "x": 160.0,
+            "y": 110.0
+          },
+          {
+            "x": 160.0,
+            "y": 120.0
+          },
+          {
+            "x": 110.0,
+            "y": 120.0
+          },
+          {
+            "x": 110.0,
+            "y": 110.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1107,7 +1140,16 @@
           "pinName": "O8"
         },
         "name": "unnamedWire#56",
-        "path": []
+        "path": [
+          {
+            "x": 165.0,
+            "y": 130.0
+          },
+          {
+            "x": 165.0,
+            "y": 120.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1126,6 +1168,14 @@
           },
           {
             "x": 170.0,
+            "y": 150.0
+          },
+          {
+            "x": 110.0,
+            "y": 150.0
+          },
+          {
+            "x": 110.0,
             "y": 140.0
           }
         ]
@@ -1143,7 +1193,7 @@
         "path": [
           {
             "x": 175.0,
-            "y": 150.0
+            "y": 160.0
           },
           {
             "x": 175.0,
@@ -1168,6 +1218,14 @@
           },
           {
             "x": 180.0,
+            "y": 180.0
+          },
+          {
+            "x": 110.0,
+            "y": 180.0
+          },
+          {
+            "x": 110.0,
             "y": 170.0
           }
         ]
@@ -1182,16 +1240,7 @@
           "pinName": "O9"
         },
         "name": "unnamedWire#6",
-        "path": [
-          {
-            "x": 65.0,
-            "y": 120.0
-          },
-          {
-            "x": 65.0,
-            "y": 110.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
@@ -1210,7 +1259,7 @@
           },
           {
             "x": 185.0,
-            "y": 180.0
+            "y": 190.0
           }
         ]
       },
@@ -1231,6 +1280,14 @@
           },
           {
             "x": 190.0,
+            "y": 210.0
+          },
+          {
+            "x": 110.0,
+            "y": 210.0
+          },
+          {
+            "x": 110.0,
             "y": 200.0
           }
         ]
@@ -1248,7 +1305,7 @@
         "path": [
           {
             "x": 195.0,
-            "y": 210.0
+            "y": 220.0
           },
           {
             "x": 195.0,
@@ -1273,6 +1330,14 @@
           },
           {
             "x": 200.0,
+            "y": 240.0
+          },
+          {
+            "x": 110.0,
+            "y": 240.0
+          },
+          {
+            "x": 110.0,
             "y": 230.0
           }
         ]
@@ -1290,7 +1355,7 @@
         "path": [
           {
             "x": 205.0,
-            "y": 240.0
+            "y": 250.0
           },
           {
             "x": 205.0,
@@ -1332,7 +1397,7 @@
         "path": [
           {
             "x": 55.0,
-            "y": 150.0
+            "y": 140.0
           },
           {
             "x": 55.0,