X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2FAm2900.json;h=ae825b13b20d7123ed19bbcc2a9a8a408a072d2c;hb=dfbf9cf4df0295315e19474ac5da109444c5d417;hp=730810ecd7aa34fb85c66ceeb5ab16d201f68d71;hpb=6d4548400697464922346338386d5f3d20e13e0d;p=Mograsim.git

diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
index 730810ec..ae825b13 100644
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
@@ -100,7 +100,7 @@
         "name": "BitDisplay#2",
         "pos": {
           "x": 280.0,
-          "y": 60.0
+          "y": 65.0
         },
         "params": 16
       },
@@ -108,11 +108,11 @@
         "id": "Clock",
         "name": "Clock#0",
         "pos": {
-          "x": 70.0,
-          "y": 365.0
+          "x": 115.0,
+          "y": 355.0
         },
         "params": {
-          "delta": 500,
+          "delta": 7000,
           "orientation": "RIGHT"
         }
       },
@@ -120,7 +120,7 @@
         "id": "FixedOutput",
         "name": "FixedOutput#0",
         "pos": {
-          "x": 540.0,
+          "x": 555.0,
           "y": 270.0
         },
         "params": {
@@ -133,8 +133,8 @@
         "id": "FixedOutput",
         "name": "FixedOutput#1",
         "pos": {
-          "x": 635.0,
-          "y": 380.0
+          "x": 645.0,
+          "y": 390.0
         },
         "params": {
           "bits": [
@@ -146,8 +146,8 @@
         "id": "FixedOutput",
         "name": "FixedOutput#2",
         "pos": {
-          "x": 370.0,
-          "y": 505.0
+          "x": 385.0,
+          "y": 510.0
         },
         "params": {
           "bits": [
@@ -172,7 +172,7 @@
         "id": "FixedOutput",
         "name": "FixedOutput#4",
         "pos": {
-          "x": 420.0,
+          "x": 430.0,
           "y": 570.0
         },
         "params": {
@@ -185,8 +185,8 @@
         "id": "FixedOutput",
         "name": "FixedOutput#5",
         "pos": {
-          "x": 475.0,
-          "y": 505.0
+          "x": 485.0,
+          "y": 510.0
         },
         "params": {
           "bits": [
@@ -198,8 +198,8 @@
         "id": "FixedOutput",
         "name": "FixedOutput#6",
         "pos": {
-          "x": 535.0,
-          "y": 370.0
+          "x": 545.0,
+          "y": 380.0
         },
         "params": {
           "bits": [
@@ -211,8 +211,8 @@
         "id": "FixedOutput",
         "name": "FixedOutput#7",
         "pos": {
-          "x": 260.0,
-          "y": 370.0
+          "x": 270.0,
+          "y": 380.0
         },
         "params": {
           "bits": [
@@ -220,24 +220,6 @@
           ]
         }
       },
-      {
-        "id": "ManualSwitch",
-        "name": "ManualSwitch#0",
-        "pos": {
-          "x": 70.0,
-          "y": 347.5
-        },
-        "params": 1
-      },
-      {
-        "id": "ManualSwitch",
-        "name": "ManualSwitch#1",
-        "pos": {
-          "x": 70.0,
-          "y": 387.5
-        },
-        "params": 1
-      },
       {
         "id": "NandGate",
         "name": "NandGate#0",
@@ -834,7 +816,7 @@
         "name": "TextComponent#0",
         "pos": {
           "x": 305.0,
-          "y": 30.0
+          "y": 25.0
         },
         "params": "D bus"
       },
@@ -843,7 +825,7 @@
         "name": "TextComponent#1",
         "pos": {
           "x": 305.0,
-          "y": 60.0
+          "y": 55.0
         },
         "params": "A bus"
       },
@@ -1286,8 +1268,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#42",
         "pos": {
-          "x": 364.0,
-          "y": 359.0
+          "x": 479.0,
+          "y": 364.0
         },
         "params": 1
       },
@@ -1304,8 +1286,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#44",
         "pos": {
-          "x": 169.0,
-          "y": 359.0
+          "x": 364.0,
+          "y": 364.0
         },
         "params": 1
       },
@@ -1374,14 +1356,6 @@
         },
         "params": 16
       },
-      {
-        "id": "mux1",
-        "name": "mux1#0",
-        "pos": {
-          "x": 100.0,
-          "y": 360.0
-        }
-      },
       {
         "id": "mux1_4",
         "name": "mux1_4#0",
@@ -2199,7 +2173,7 @@
         "path": [
           {
             "x": 660.0,
-            "y": 390.0
+            "y": 395.0
           }
         ]
       },
@@ -2227,12 +2201,12 @@
         "name": "unnamedWire#37",
         "path": [
           {
-            "x": 480.0,
+            "x": 470.0,
             "y": 540.0
           },
           {
-            "x": 480.0,
-            "y": 570.0
+            "x": 470.0,
+            "y": 565.0
           }
         ]
       },
@@ -2249,7 +2223,7 @@
         "path": [
           {
             "x": 445.0,
-            "y": 580.0
+            "y": 575.0
           }
         ]
       },
@@ -2278,7 +2252,7 @@
         "path": [
           {
             "x": 560.0,
-            "y": 380.0
+            "y": 385.0
           }
         ]
       },
@@ -2456,7 +2430,7 @@
         "path": [
           {
             "x": 570.0,
-            "y": 280.0
+            "y": 275.0
           }
         ]
       },
@@ -3016,7 +2990,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#42",
           "pinName": ""
         },
         "name": "unnamedWire#93",
@@ -3024,8 +2998,8 @@
       },
       {
         "pin1": {
-          "compName": "mux1#0",
-          "pinName": "Y"
+          "compName": "Clock#0",
+          "pinName": ""
         },
         "pin2": {
           "compName": "WireCrossPoint#40",
@@ -3118,7 +3092,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#44",
           "pinName": ""
         },
         "name": "unnamedWire#100",
@@ -3731,7 +3705,7 @@
         "path": [
           {
             "x": 285.0,
-            "y": 380.0
+            "y": 385.0
           }
         ]
       },
@@ -6620,7 +6594,12 @@
           "pinName": ""
         },
         "name": "unnamedWire#330",
-        "path": []
+        "path": [
+          {
+            "x": 275.0,
+            "y": 35.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -6661,7 +6640,12 @@
           "pinName": ""
         },
         "name": "unnamedWire#333",
-        "path": []
+        "path": [
+          {
+            "x": 275.0,
+            "y": 70.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -6854,11 +6838,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#38",
+          "compName": "WireCrossPoint#44",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#44",
+          "compName": "WireCrossPoint#20",
           "pinName": ""
         },
         "name": "unnamedWire#346",
@@ -6866,7 +6850,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#42",
+          "compName": "WireCrossPoint#44",
           "pinName": ""
         },
         "pin2": {
@@ -6892,10 +6876,6 @@
         },
         "name": "unnamedWire#348",
         "path": [
-          {
-            "x": 480.0,
-            "y": 360.0
-          },
           {
             "x": 480.0,
             "y": 170.0
@@ -6978,7 +6958,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#44",
+          "compName": "WireCrossPoint#38",
           "pinName": ""
         },
         "pin2": {
@@ -6990,68 +6970,14 @@
       },
       {
         "pin1": {
-          "compName": "ManualSwitch#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "mux1#0",
-          "pinName": "S0"
-        },
-        "name": "unnamedWire#355",
-        "path": [
-          {
-            "x": 95.0,
-            "y": 355.0
-          },
-          {
-            "x": 95.0,
-            "y": 365.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "ManualSwitch#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "mux1#0",
-          "pinName": "I1"
-        },
-        "name": "unnamedWire#356",
-        "path": [
-          {
-            "x": 95.0,
-            "y": 395.0
-          },
-          {
-            "x": 95.0,
-            "y": 385.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Clock#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "mux1#0",
-          "pinName": "I0"
-        },
-        "name": "unnamedWire#357",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#44",
+          "compName": "WireCrossPoint#20",
           "pinName": ""
         },
         "pin2": {
           "compName": "WireCrossPoint#42",
           "pinName": ""
         },
-        "name": "unnamedWire#358",
+        "name": "unnamedWire#355",
         "path": []
       }
     ],
@@ -7142,7 +7068,17 @@
         }
       }
     },
-    "atomicHighLevelStates": {}
+    "atomicHighLevelStates": {
+      "mpm_address": {
+        "id": "wireForcing",
+        "params": {
+          "wiresToForce": [
+            "unnamedWire#163"
+          ],
+          "wiresToForceInverted": []
+        }
+      }
+    }
   },
   "version": "0.1.5"
 }
\ No newline at end of file