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=74c0beb840bd791cd79b42ba12279e61698bdc70;hb=3274bf1091e8c29cc3bff7f909bdd8b29220848d;hp=8534163cf31e932e513554ff20777cb6ef0e03c5;hpb=d094b43f1697af4586f135790919f866cc53a9a5;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 8534163c..74c0beb8 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
@@ -96,6 +96,18 @@
         },
         "params": 16
       },
+      {
+        "id": "Clock",
+        "name": "Clock#0",
+        "pos": {
+          "x": 70.0,
+          "y": 365.0
+        },
+        "params": {
+          "delta": 500,
+          "orientation": "RIGHT"
+        }
+      },
       {
         "id": "FixedOutput",
         "name": "FixedOutput#0",
@@ -204,8 +216,17 @@
         "id": "ManualSwitch",
         "name": "ManualSwitch#0",
         "pos": {
-          "x": 120.0,
-          "y": 355.0
+          "x": 70.0,
+          "y": 347.5
+        },
+        "params": 1
+      },
+      {
+        "id": "ManualSwitch",
+        "name": "ManualSwitch#1",
+        "pos": {
+          "x": 70.0,
+          "y": 387.5
         },
         "params": 1
       },
@@ -258,7 +279,7 @@
         "id": "NandGate",
         "name": "NandGate#5",
         "pos": {
-          "x": 100.0,
+          "x": 105.0,
           "y": 235.0
         },
         "params": 1
@@ -267,7 +288,7 @@
         "id": "NandGate",
         "name": "NandGate#6",
         "pos": {
-          "x": 150.0,
+          "x": 145.0,
           "y": 375.0
         },
         "params": 1
@@ -276,8 +297,8 @@
         "id": "NandGate",
         "name": "NandGate#7",
         "pos": {
-          "x": 105.0,
-          "y": 275.0
+          "x": 110.0,
+          "y": 270.0
         },
         "params": 1
       },
@@ -836,15 +857,6 @@
         },
         "params": "MPM addr"
       },
-      {
-        "id": "TextComponent",
-        "name": "TextComponent#3",
-        "pos": {
-          "x": 110.0,
-          "y": 355.0
-        },
-        "params": "c"
-      },
       {
         "id": "TriStateBuffer",
         "name": "TriStateBuffer#0",
@@ -907,7 +919,7 @@
       },
       {
         "id": "TriStateBuffer",
-        "name": "TriStateBuffer#6",
+        "name": "TriStateBuffer#5",
         "pos": {
           "x": 185.0,
           "y": 145.0
@@ -1263,7 +1275,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#38",
         "pos": {
-          "x": 174.0,
+          "x": 169.0,
           "y": 384.0
         },
         "params": 1
@@ -1272,7 +1284,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#39",
         "pos": {
-          "x": 179.0,
+          "x": 174.0,
           "y": 364.0
         },
         "params": 1
@@ -1281,7 +1293,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#40",
         "pos": {
-          "x": 144.0,
+          "x": 139.0,
           "y": 364.0
         },
         "params": 1
@@ -1290,7 +1302,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#41",
         "pos": {
-          "x": 144.0,
+          "x": 139.0,
           "y": 379.0
         },
         "params": 1
@@ -1300,7 +1312,7 @@
         "name": "WireCrossPoint#42",
         "pos": {
           "x": 364.0,
-          "y": 264.0
+          "y": 314.0
         },
         "params": 1
       },
@@ -1318,7 +1330,7 @@
         "name": "WireCrossPoint#44",
         "pos": {
           "x": 174.0,
-          "y": 264.0
+          "y": 254.0
         },
         "params": 1
       },
@@ -1327,49 +1339,49 @@
         "name": "WireCrossPoint#45",
         "pos": {
           "x": 174.0,
-          "y": 254.0
+          "y": 304.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#47",
+        "name": "WireCrossPoint#46",
         "pos": {
-          "x": 99.0,
-          "y": 299.0
+          "x": 174.0,
+          "y": 279.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#48",
+        "name": "WireCrossPoint#47",
         "pos": {
-          "x": 174.0,
-          "y": 284.0
+          "x": 104.0,
+          "y": 294.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#49",
+        "name": "WireCrossPoint#48",
         "pos": {
-          "x": 124.0,
+          "x": 129.0,
           "y": 244.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#50",
+        "name": "WireCrossPoint#49",
         "pos": {
-          "x": 99.0,
-          "y": 279.0
+          "x": 104.0,
+          "y": 274.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#51",
+        "name": "WireCrossPoint#50",
         "pos": {
           "x": 234.0,
           "y": 154.0
@@ -1378,7 +1390,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#52",
+        "name": "WireCrossPoint#51",
         "pos": {
           "x": 164.0,
           "y": 154.0
@@ -1387,19 +1399,10 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#53",
-        "pos": {
-          "x": 99.0,
-          "y": 289.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#54",
+        "name": "WireCrossPoint#52",
         "pos": {
-          "x": 174.0,
-          "y": 309.0
+          "x": 104.0,
+          "y": 284.0
         },
         "params": 1
       },
@@ -1431,7 +1434,7 @@
         "id": "and",
         "name": "and#3",
         "pos": {
-          "x": 130.0,
+          "x": 135.0,
           "y": 240.0
         }
       },
@@ -1439,8 +1442,8 @@
         "id": "and",
         "name": "and#4",
         "pos": {
-          "x": 130.0,
-          "y": 270.0
+          "x": 135.0,
+          "y": 265.0
         }
       },
       {
@@ -1472,7 +1475,7 @@
         "name": "dff#0",
         "pos": {
           "x": 180.0,
-          "y": 270.0
+          "y": 265.0
         }
       },
       {
@@ -1488,7 +1491,7 @@
         "name": "dff#2",
         "pos": {
           "x": 180.0,
-          "y": 295.0
+          "y": 290.0
         }
       },
       {
@@ -1516,6 +1519,14 @@
         },
         "params": 16
       },
+      {
+        "id": "mux1",
+        "name": "mux1#0",
+        "pos": {
+          "x": 100.0,
+          "y": 360.0
+        }
+      },
       {
         "id": "mux1_4",
         "name": "mux1_4#0",
@@ -3158,8 +3169,8 @@
       },
       {
         "pin1": {
-          "compName": "ManualSwitch#0",
-          "pinName": ""
+          "compName": "mux1#0",
+          "pinName": "Y"
         },
         "pin2": {
           "compName": "WireCrossPoint#40",
@@ -3192,7 +3203,7 @@
         "name": "unnamedWire#96",
         "path": [
           {
-            "x": 145.0,
+            "x": 140.0,
             "y": 390.0
           }
         ]
@@ -3233,7 +3244,7 @@
         "name": "unnamedWire#99",
         "path": [
           {
-            "x": 175.0,
+            "x": 170.0,
             "y": 485.0
           },
           {
@@ -3291,7 +3302,7 @@
         "name": "unnamedWire#102",
         "path": [
           {
-            "x": 180.0,
+            "x": 175.0,
             "y": 480.0
           },
           {
@@ -3630,11 +3641,11 @@
             "y": 325.0
           },
           {
-            "x": 95.0,
+            "x": 100.0,
             "y": 325.0
           },
           {
-            "x": 95.0,
+            "x": 100.0,
             "y": 250.0
           }
         ]
@@ -3712,7 +3723,7 @@
           "pinName": "D"
         },
         "pin2": {
-          "compName": "WireCrossPoint#52",
+          "compName": "WireCrossPoint#51",
           "pinName": ""
         },
         "name": "unnamedWire#126",
@@ -3872,7 +3883,7 @@
           "pinName": "OUT"
         },
         "pin2": {
-          "compName": "WireCrossPoint#51",
+          "compName": "WireCrossPoint#50",
           "pinName": ""
         },
         "name": "unnamedWire#135",
@@ -5326,7 +5337,7 @@
             "y": 320.0
           },
           {
-            "x": 100.0,
+            "x": 105.0,
             "y": 320.0
           }
         ]
@@ -6798,11 +6809,11 @@
         "name": "unnamedWire#335",
         "path": [
           {
-            "x": 95.0,
+            "x": 100.0,
             "y": 230.0
           },
           {
-            "x": 95.0,
+            "x": 100.0,
             "y": 240.0
           }
         ]
@@ -6910,7 +6921,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#53",
+          "compName": "WireCrossPoint#52",
           "pinName": ""
         },
         "pin2": {
@@ -6947,11 +6958,16 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#54",
+          "compName": "WireCrossPoint#42",
           "pinName": ""
         },
         "name": "unnamedWire#346",
-        "path": []
+        "path": [
+          {
+            "x": 170.0,
+            "y": 315.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -6983,7 +6999,7 @@
         "path": [
           {
             "x": 480.0,
-            "y": 265.0
+            "y": 315.0
           },
           {
             "x": 480.0,
@@ -7051,11 +7067,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#44",
+          "compName": "WireCrossPoint#46",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#42",
+          "compName": "WireCrossPoint#44",
           "pinName": ""
         },
         "name": "unnamedWire#352",
@@ -7063,11 +7079,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#44",
+          "compName": "WireCrossPoint#39",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#48",
+          "compName": "WireCrossPoint#45",
           "pinName": ""
         },
         "name": "unnamedWire#353",
@@ -7075,24 +7091,29 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#48",
+          "compName": "WireCrossPoint#44",
           "pinName": ""
         },
         "pin2": {
-          "compName": "dff#0",
+          "compName": "dff16#1",
           "pinName": "C"
         },
         "name": "unnamedWire#354",
-        "path": []
+        "path": [
+          {
+            "x": 175.0,
+            "y": 70.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#45",
+          "compName": "WireCrossPoint#44",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#44",
-          "pinName": ""
+          "compName": "dff#1",
+          "pinName": "C"
         },
         "name": "unnamedWire#355",
         "path": []
@@ -7103,7 +7124,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "dff#1",
+          "compName": "dff#2",
           "pinName": "C"
         },
         "name": "unnamedWire#356",
@@ -7115,16 +7136,11 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "dff16#1",
-          "pinName": "C"
+          "compName": "WireCrossPoint#46",
+          "pinName": ""
         },
         "name": "unnamedWire#357",
-        "path": [
-          {
-            "x": 175.0,
-            "y": 70.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
@@ -7157,14 +7173,14 @@
           "pinName": "Q"
         },
         "pin2": {
-          "compName": "TriStateBuffer#6",
+          "compName": "TriStateBuffer#5",
           "pinName": "EN"
         },
         "name": "unnamedWire#359",
         "path": [
           {
             "x": 225.0,
-            "y": 275.0
+            "y": 270.0
           },
           {
             "x": 225.0,
@@ -7182,7 +7198,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#53",
+          "compName": "WireCrossPoint#52",
           "pinName": ""
         },
         "name": "unnamedWire#360",
@@ -7190,7 +7206,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#50",
+          "compName": "WireCrossPoint#49",
           "pinName": ""
         },
         "pin2": {
@@ -7202,37 +7218,24 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#50",
+          "compName": "WireCrossPoint#48",
           "pinName": ""
         },
         "pin2": {
           "compName": "and#3",
-          "pinName": "B"
+          "pinName": "A"
         },
         "name": "unnamedWire#362",
-        "path": [
-          {
-            "x": 100.0,
-            "y": 265.0
-          },
-          {
-            "x": 120.0,
-            "y": 265.0
-          },
-          {
-            "x": 120.0,
-            "y": 255.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
-          "compName": "NandGate#7",
+          "compName": "and#4",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "and#4",
-          "pinName": "B"
+          "compName": "dff#0",
+          "pinName": "D"
         },
         "name": "unnamedWire#363",
         "path": []
@@ -7244,14 +7247,27 @@
         },
         "pin2": {
           "compName": "and#3",
-          "pinName": "A"
+          "pinName": "B"
         },
         "name": "unnamedWire#364",
-        "path": []
+        "path": [
+          {
+            "x": 105.0,
+            "y": 260.0
+          },
+          {
+            "x": 125.0,
+            "y": 260.0
+          },
+          {
+            "x": 125.0,
+            "y": 255.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#49",
+          "compName": "WireCrossPoint#48",
           "pinName": ""
         },
         "pin2": {
@@ -7261,8 +7277,8 @@
         "name": "unnamedWire#365",
         "path": [
           {
-            "x": 125.0,
-            "y": 275.0
+            "x": 130.0,
+            "y": 270.0
           }
         ]
       },
@@ -7272,7 +7288,7 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "WireCrossPoint#49",
+          "compName": "WireCrossPoint#48",
           "pinName": ""
         },
         "name": "unnamedWire#366",
@@ -7292,19 +7308,19 @@
       },
       {
         "pin1": {
-          "compName": "and#4",
+          "compName": "NandGate#7",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "dff#0",
-          "pinName": "D"
+          "compName": "and#4",
+          "pinName": "B"
         },
         "name": "unnamedWire#368",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#51",
+          "compName": "WireCrossPoint#50",
           "pinName": ""
         },
         "pin2": {
@@ -7321,11 +7337,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#52",
+          "compName": "WireCrossPoint#51",
           "pinName": ""
         },
         "pin2": {
-          "compName": "TriStateBuffer#6",
+          "compName": "TriStateBuffer#5",
           "pinName": "OUT"
         },
         "name": "unnamedWire#370",
@@ -7333,7 +7349,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#52",
+          "compName": "WireCrossPoint#51",
           "pinName": ""
         },
         "pin2": {
@@ -7350,11 +7366,11 @@
       },
       {
         "pin1": {
-          "compName": "TriStateBuffer#6",
+          "compName": "TriStateBuffer#5",
           "pinName": "IN"
         },
         "pin2": {
-          "compName": "WireCrossPoint#51",
+          "compName": "WireCrossPoint#50",
           "pinName": ""
         },
         "name": "unnamedWire#372",
@@ -7362,11 +7378,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#53",
+          "compName": "WireCrossPoint#52",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#50",
+          "compName": "WireCrossPoint#49",
           "pinName": ""
         },
         "name": "unnamedWire#373",
@@ -7386,28 +7402,16 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#54",
+          "compName": "WireCrossPoint#46",
           "pinName": ""
         },
         "pin2": {
-          "compName": "dff#2",
+          "compName": "dff#0",
           "pinName": "C"
         },
         "name": "unnamedWire#375",
         "path": []
       },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#54",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#48",
-          "pinName": ""
-        },
-        "name": "unnamedWire#376",
-        "path": []
-      },
       {
         "pin1": {
           "compName": "dff#2",
@@ -7417,11 +7421,11 @@
           "compName": "Am2900MainMemory#0",
           "pinName": "RW"
         },
-        "name": "unnamedWire#377",
+        "name": "unnamedWire#376",
         "path": [
           {
             "x": 230.0,
-            "y": 300.0
+            "y": 295.0
           },
           {
             "x": 230.0,
@@ -7436,6 +7440,60 @@
             "y": 140.0
           }
         ]
+      },
+      {
+        "pin1": {
+          "compName": "ManualSwitch#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "mux1#0",
+          "pinName": "S0"
+        },
+        "name": "unnamedWire#377",
+        "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#378",
+        "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#379",
+        "path": []
       }
     ],
     "version": "0.1.1"