X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2FGUIdff4_finewe.java;h=db696f3df0621b7dd7e4737032624a1c06342c81;hb=30b24889d4ae001113c6cac543fb8c29d15d0ff2;hp=c4efe938a4f36f4578cbbff0b66757a815512225;hpb=926c74bcc4960f57b9af46d985c8702ac8216bea;p=Mograsim.git diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIdff4_finewe.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIdff4_finewe.java index c4efe938..db696f3d 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIdff4_finewe.java +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIdff4_finewe.java @@ -14,6 +14,7 @@ import net.mograsim.logic.core.wires.Wire.ReadWriteEnd; import net.mograsim.logic.model.model.ViewModelModifiable; import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedGUIComponent; import net.mograsim.logic.model.model.wires.Pin; +import net.mograsim.logic.model.model.wires.PinUsage; import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position; @@ -23,23 +24,23 @@ public class GUIdff4_finewe extends SimpleRectangularHardcodedGUIComponent { super(model, name, "D flip flop\n4 bits"); setSize(35, 90); - addPin(new Pin(this, "C", 1, 0, 5), Usage.INPUT, Position.RIGHT); - addPin(new Pin(this, "_WE1", 1, 0, 15), Usage.INPUT, Position.RIGHT); - addPin(new Pin(this, "_WE2", 1, 0, 25), Usage.INPUT, Position.RIGHT); - addPin(new Pin(this, "_WE3", 1, 0, 35), Usage.INPUT, Position.RIGHT); - addPin(new Pin(this, "_WE4", 1, 0, 45), Usage.INPUT, Position.RIGHT); - addPin(new Pin(this, "D1", 1, 0, 55), Usage.INPUT, Position.RIGHT); - addPin(new Pin(this, "D2", 1, 0, 65), Usage.INPUT, Position.RIGHT); - addPin(new Pin(this, "D3", 1, 0, 75), Usage.INPUT, Position.RIGHT); - addPin(new Pin(this, "D4", 1, 0, 85), Usage.INPUT, Position.RIGHT); - addPin(new Pin(this, "Q1", 1, 35, 5), Usage.OUTPUT, Position.LEFT); - addPin(new Pin(this, "Q2", 1, 35, 15), Usage.OUTPUT, Position.LEFT); - addPin(new Pin(this, "Q3", 1, 35, 25), Usage.OUTPUT, Position.LEFT); - addPin(new Pin(this, "Q4", 1, 35, 35), Usage.OUTPUT, Position.LEFT); + addPin(new Pin(this, "C", 1, PinUsage.INPUT, 0, 5), Position.RIGHT); + addPin(new Pin(this, "_WE1", 1, PinUsage.INPUT, 0, 15), Position.RIGHT); + addPin(new Pin(this, "_WE2", 1, PinUsage.INPUT, 0, 25), Position.RIGHT); + addPin(new Pin(this, "_WE3", 1, PinUsage.INPUT, 0, 35), Position.RIGHT); + addPin(new Pin(this, "_WE4", 1, PinUsage.INPUT, 0, 45), Position.RIGHT); + addPin(new Pin(this, "D1", 1, PinUsage.INPUT, 0, 55), Position.RIGHT); + addPin(new Pin(this, "D2", 1, PinUsage.INPUT, 0, 65), Position.RIGHT); + addPin(new Pin(this, "D3", 1, PinUsage.INPUT, 0, 75), Position.RIGHT); + addPin(new Pin(this, "D4", 1, PinUsage.INPUT, 0, 85), Position.RIGHT); + addPin(new Pin(this, "Q1", 1, PinUsage.OUTPUT, 35, 5), Position.LEFT); + addPin(new Pin(this, "Q2", 1, PinUsage.OUTPUT, 35, 15), Position.LEFT); + addPin(new Pin(this, "Q3", 1, PinUsage.OUTPUT, 35, 25), Position.LEFT); + addPin(new Pin(this, "Q4", 1, PinUsage.OUTPUT, 35, 35), Position.LEFT); } @Override - protected Object recalculate(Object lastState, Map readEnds, Map readWriteEnds) + public Object recalculate(Object lastState, Map readEnds, Map readWriteEnds) { Bit[] QC = (Bit[]) lastState; if (QC == null)