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=3b88d72a5184ca7839e10e87b09da68de53952f4;hb=0a04a4ed66ecebd4254541c4977599f6052c115a;hp=480a4b131aeb42f1b00208f04cfe48f3dfc34b7a;hpb=feb82d306e86ae48cf48e93e9e96f119c8195196;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..3b88d72a 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
@@ -10,11 +10,12 @@ import java.util.Map;
 
 import net.mograsim.logic.core.types.Bit;
 import net.mograsim.logic.core.types.BitVector;
-import net.mograsim.logic.core.wires.Wire.ReadEnd;
-import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
+import net.mograsim.logic.core.wires.CoreWire.ReadEnd;
+import net.mograsim.logic.core.wires.CoreWire.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;
 
@@ -22,21 +23,21 @@ public class GUIsel4_12 extends SimpleRectangularHardcodedGUIComponent
 {
 	public GUIsel4_12(ViewModelModifiable model, String name)
 	{
-		super(model, name, "4-way SEL\n12 bit");
+		super(model, "GUIsel4_12", 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<String, ReadEnd> readEnds, Map<String, ReadWriteEnd> readWriteEnds)
+	public Object recalculate(Object lastState, Map<String, ReadEnd> readEnds, Map<String, ReadWriteEnd> readWriteEnds)
 	{
 		Bit SAVal = readEnds.get("SA").getValue();
 		Bit SBVal = readEnds.get("SB").getValue();