X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2FGUIsel4_12.java;h=ee7bc0ef5f4b7bea96f2dda1f3970604231d45ec;hb=30b24889d4ae001113c6cac543fb8c29d15d0ff2;hp=480a4b131aeb42f1b00208f04cfe48f3dfc34b7a;hpb=900b54a409bb115bcc04f46d904a96b539bf7b7d;p=Mograsim.git diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIsel4_12.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIsel4_12.java index 480a4b13..ee7bc0ef 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIsel4_12.java +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIsel4_12.java @@ -15,6 +15,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; @@ -24,19 +25,19 @@ public class GUIsel4_12 extends SimpleRectangularHardcodedGUIComponent { super(model, name, "4-way SEL\n12 bit"); setSize(80, 40); - addPin(new Pin(this, "SA", 1, 0, 5), Usage.INPUT, Position.RIGHT); - addPin(new Pin(this, "SB", 1, 0, 15), Usage.INPUT, Position.RIGHT); - addPin(new Pin(this, "SC", 1, 0, 25), Usage.INPUT, Position.RIGHT); - addPin(new Pin(this, "SD", 1, 0, 35), Usage.INPUT, Position.RIGHT); - addPin(new Pin(this, "A", 12, 10, 0), Usage.INPUT, Position.BOTTOM); - addPin(new Pin(this, "B", 12, 30, 0), Usage.INPUT, Position.BOTTOM); - addPin(new Pin(this, "C", 12, 50, 0), Usage.INPUT, Position.BOTTOM); - addPin(new Pin(this, "D", 12, 70, 0), Usage.INPUT, Position.BOTTOM); - addPin(new Pin(this, "Y", 12, 40, 40), Usage.OUTPUT, Position.TOP); + addPin(new Pin(this, "SA", 1, PinUsage.INPUT, 0, 5), Position.RIGHT); + addPin(new Pin(this, "SB", 1, PinUsage.INPUT, 0, 15), Position.RIGHT); + addPin(new Pin(this, "SC", 1, PinUsage.INPUT, 0, 25), Position.RIGHT); + addPin(new Pin(this, "SD", 1, PinUsage.INPUT, 0, 35), Position.RIGHT); + addPin(new Pin(this, "A", 12, PinUsage.INPUT, 10, 0), Position.BOTTOM); + addPin(new Pin(this, "B", 12, PinUsage.INPUT, 30, 0), Position.BOTTOM); + addPin(new Pin(this, "C", 12, PinUsage.INPUT, 50, 0), Position.BOTTOM); + addPin(new Pin(this, "D", 12, PinUsage.INPUT, 70, 0), Position.BOTTOM); + addPin(new Pin(this, "Y", 12, PinUsage.OUTPUT, 40, 40), Position.TOP); } @Override - protected Object recalculate(Object lastState, Map readEnds, Map readWriteEnds) + public Object recalculate(Object lastState, Map readEnds, Map readWriteEnds) { Bit SAVal = readEnds.get("SA").getValue(); Bit SBVal = readEnds.get("SB").getValue();