From 7f706a1a8f92bc316801f41ae70115ed11f2baeb Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Wed, 25 Sep 2019 15:26:43 +0200 Subject: [PATCH] Made clock overridable by a ManualSwitch --- .../logic/model/am2900/components/Am2900.json | 97 ++++++++++++++++--- 1 file changed, 84 insertions(+), 13 deletions(-) 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 df6fc2c0..8b2c9cf4 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,8 +100,8 @@ "id": "Clock", "name": "Clock#0", "pos": { - "x": 120.0, - "y": 355.0 + "x": 75.0, + "y": 365.0 }, "params": { "delta": 500, @@ -212,6 +212,24 @@ ] } }, + { + "id": "ManualSwitch", + "name": "ManualSwitch#0", + "pos": { + "x": 75.0, + "y": 347.5 + }, + "params": 1 + }, + { + "id": "ManualSwitch", + "name": "ManualSwitch#1", + "pos": { + "x": 75.0, + "y": 387.5 + }, + "params": 1 + }, { "id": "NandGate", "name": "NandGate#0", @@ -839,15 +857,6 @@ }, "params": "MPM addr" }, - { - "id": "TextComponent", - "name": "TextComponent#3", - "pos": { - "x": 110.0, - "y": 350.0 - }, - "params": "c" - }, { "id": "TriStateBuffer", "name": "TriStateBuffer#0", @@ -1527,6 +1536,14 @@ }, "params": 16 }, + { + "id": "mux1", + "name": "mux1#0", + "pos": { + "x": 105.0, + "y": 360.0 + } + }, { "id": "mux1_4", "name": "mux1_4#0", @@ -3169,8 +3186,8 @@ }, { "pin1": { - "compName": "Clock#0", - "pinName": "" + "compName": "mux1#0", + "pinName": "Y" }, "pin2": { "compName": "WireCrossPoint#40", @@ -7486,6 +7503,60 @@ "y": 255.0 } ] + }, + { + "pin1": { + "compName": "ManualSwitch#0", + "pinName": "" + }, + "pin2": { + "compName": "mux1#0", + "pinName": "S0" + }, + "name": "unnamedWire#380", + "path": [ + { + "x": 100.0, + "y": 355.0 + }, + { + "x": 100.0, + "y": 365.0 + } + ] + }, + { + "pin1": { + "compName": "ManualSwitch#1", + "pinName": "" + }, + "pin2": { + "compName": "mux1#0", + "pinName": "I1" + }, + "name": "unnamedWire#381", + "path": [ + { + "x": 100.0, + "y": 395.0 + }, + { + "x": 100.0, + "y": 385.0 + } + ] + }, + { + "pin1": { + "compName": "Clock#0", + "pinName": "" + }, + "pin2": { + "compName": "mux1#0", + "pinName": "I0" + }, + "name": "unnamedWire#382", + "path": [] } ], "version": "0.1.1" -- 2.17.1