X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2FGUIram5_12.java;h=173b2ee94f30c130cfb8641648937c0594b10941;hb=bbe38c55aaa999d025f534245f9207a88643f6e5;hp=7dcea02278823d679dd6c8f801729184832aaee7;hpb=bece76750849d1c9374aaa3772dcad552527f60b;p=Mograsim.git diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIram5_12.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIram5_12.java index 7dcea022..173b2ee9 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIram5_12.java +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIram5_12.java @@ -1,6 +1,10 @@ package net.mograsim.logic.model.am2900.components; -import static net.mograsim.logic.core.types.Bit.*; +import static net.mograsim.logic.core.types.Bit.ONE; +import static net.mograsim.logic.core.types.Bit.U; +import static net.mograsim.logic.core.types.Bit.X; +import static net.mograsim.logic.core.types.Bit.Z; +import static net.mograsim.logic.core.types.Bit.ZERO; import java.util.Arrays; import java.util.Map; @@ -12,6 +16,8 @@ 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; public class GUIram5_12 extends SimpleRectangularHardcodedGUIComponent @@ -20,12 +26,12 @@ public class GUIram5_12 extends SimpleRectangularHardcodedGUIComponent { super(model, name, "RAM\n5 x 12 Bit"); setSize(40, 40); - addPin(new Pin(this, "A", 3, 10, 0), Usage.INPUT, Position.BOTTOM); - addPin(new Pin(this, "B", 3, 30, 0), Usage.INPUT, Position.BOTTOM); - addPin(new Pin(this, "WE", 1, 0, 5), Usage.INPUT, Position.RIGHT); - addPin(new Pin(this, "C", 1, 0, 15), Usage.INPUT, Position.RIGHT); - addPin(new Pin(this, "Y", 12, 0, 30), Usage.OUTPUT, Position.RIGHT); - addPin(new Pin(this, "D", 12, 20, 40), Usage.INPUT, Position.TOP); + addPin(new Pin(this, "A", 3, PinUsage.INPUT, 10, 0), Position.BOTTOM); + addPin(new Pin(this, "B", 3, PinUsage.INPUT, 30, 0), Position.BOTTOM); + addPin(new Pin(this, "WE", 1, PinUsage.INPUT, 0, 5), Position.RIGHT); + addPin(new Pin(this, "C", 1, PinUsage.INPUT, 0, 15), Position.RIGHT); + addPin(new Pin(this, "Y", 12, PinUsage.OUTPUT, 0, 30), Position.RIGHT); + addPin(new Pin(this, "D", 12, PinUsage.INPUT, 20, 40), Position.TOP); } @Override @@ -76,4 +82,9 @@ public class GUIram5_12 extends SimpleRectangularHardcodedGUIComponent // TODO maybe this is the wrong way around return (bits[0] == ONE ? 4 : 0) + (bits[1] == ONE ? 2 : 0) + (bits[2] == ONE ? 1 : 0); } + + static + { + IndirectGUIComponentCreator.setComponentSupplier(GUIram5_12.class.getCanonicalName(), (m, p, n) -> new GUIram5_12(m, n)); + } } \ No newline at end of file