X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Ftest%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fam2901%2FTestableAm2901Impl.java;fp=net.mograsim.logic.model.am2900%2Ftest%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fam2901%2FTestableAm2901Impl.java;h=43e01d43b317c732afc804181cea5985c53dc010;hb=c6181cf9a7b6a2f5dc927939d98d61c565f97917;hp=22ee120dc807e61d21b5640adff9def3befb63be;hpb=1ac46660b83b5282d32271494672ef3874de4fee;p=Mograsim.git

diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/TestableAm2901Impl.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/TestableAm2901Impl.java
index 22ee120d..43e01d43 100644
--- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/TestableAm2901Impl.java
+++ b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/TestableAm2901Impl.java
@@ -4,9 +4,10 @@ import net.mograsim.logic.core.components.BitDisplay;
 import net.mograsim.logic.core.components.ManualSwitch;
 import net.mograsim.logic.core.types.Bit;
 import net.mograsim.logic.core.types.BitVector;
+import net.mograsim.logic.model.am2900.util.SwitchWithDisplay;
 import net.mograsim.logic.model.am2900.util.TestEnvironmentHelper;
-import net.mograsim.logic.model.am2900.util.TestUtil;
 import net.mograsim.logic.model.am2900.util.TestEnvironmentHelper.DebugState;
+import net.mograsim.logic.model.am2900.util.TestUtil;
 import net.mograsim.logic.model.model.components.GUIComponent;
 
 public class TestableAm2901Impl implements TestableAm2901
@@ -18,10 +19,9 @@ public class TestableAm2901Impl implements TestableAm2901
 	private ManualSwitch D1, D2, D3, D4;
 	private ManualSwitch A0, A1, A2, A3;
 	private ManualSwitch B0, B1, B2, B3;
-	private ManualSwitch IRAMn, IRAMn_3, IQn, IQn_3;
 	private BitDisplay Y1, Y2, Y3, Y4;
 	private BitDisplay F_0, Cn_4, OVR, F3;
-	private BitDisplay ORAMn, ORAMn_3, OQn, OQn_3;
+	private SwitchWithDisplay RAMn, RAMn_3, Qn, Qn_3;
 
 	private final TestEnvironmentHelper testHelper = new TestEnvironmentHelper(this, "GUIAm2901");
 
@@ -109,25 +109,25 @@ public class TestableAm2901Impl implements TestableAm2901
 	@Override
 	public void setQ_0(String val_1_bit)
 	{
-		IQn.setState(Bit.parse(val_1_bit));
+		Qn.setState(Bit.parse(val_1_bit).toVector());
 	}
 
 	@Override
 	public void setQ_3(String val_1_bit)
 	{
-		IQn_3.setState(Bit.parse(val_1_bit));
+		Qn_3.setState(Bit.parse(val_1_bit).toVector());
 	}
 
 	@Override
 	public void setRAM_0(String val_1_bit)
 	{
-		IRAMn.setState(Bit.parse(val_1_bit));
+		RAMn.setState(Bit.parse(val_1_bit).toVector());
 	}
 
 	@Override
 	public void setRAM_3(String val_1_bit)
 	{
-		IRAMn_3.setState(Bit.parse(val_1_bit));
+		RAMn_3.setState(Bit.parse(val_1_bit).toVector());
 	}
 
 	@Override
@@ -139,25 +139,25 @@ public class TestableAm2901Impl implements TestableAm2901
 	@Override
 	public String getQ_0()
 	{
-		return OQn.getDisplayedValue().toString();
+		return Qn.getDisplayedValue().toString();
 	}
 
 	@Override
 	public String getQ_3()
 	{
-		return OQn_3.getDisplayedValue().toString();
+		return Qn_3.getDisplayedValue().toString();
 	}
 
 	@Override
 	public String getRAM_0()
 	{
-		return ORAMn.getDisplayedValue().toString();
+		return RAMn.getDisplayedValue().toString();
 	}
 
 	@Override
 	public String getRAM_3()
 	{
-		return ORAMn_3.getDisplayedValue().toString();
+		return RAMn_3.getDisplayedValue().toString();
 	}
 
 	@Override