X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Ftests%2FGUITest.java;h=a135e58d9dd2543715f677cb36d8e65c081af3d3;hb=27e4465d9b23acd5d97dbb4789a70f30c86a9302;hp=b8c4937dcc41574894026bab1c1e8ea331face53;hpb=b1e7855af2dfc15b4d6c1253dd77db02925162f3;p=Mograsim.git

diff --git a/era.mi/src/era/mi/logic/tests/GUITest.java b/era.mi/src/era/mi/logic/tests/GUITest.java
index b8c4937d..a135e58d 100644
--- a/era.mi/src/era/mi/logic/tests/GUITest.java
+++ b/era.mi/src/era/mi/logic/tests/GUITest.java
@@ -38,13 +38,13 @@ public class GUITest extends JPanel
 	Wire q = new Wire(1, WIRE_DELAY);
 	Wire nq = new Wire(1, WIRE_DELAY);
 
-	ManualSwitch rIn = new ManualSwitch(r.createEnd());
-	ManualSwitch sIn = new ManualSwitch(s.createEnd());
+	ManualSwitch rIn = new ManualSwitch(r.createReadWriteEnd());
+	ManualSwitch sIn = new ManualSwitch(s.createReadWriteEnd());
 
-	OrGate or1 = new OrGate(OR_DELAY, t2.createEnd(), r.createEnd(), nq.createEnd());
-	OrGate or2 = new OrGate(OR_DELAY, t1.createEnd(), s.createEnd(), q.createEnd());
-	NotGate not1 = new NotGate(NOT_DELAY, t2.createEnd(), q.createEnd());
-	NotGate not2 = new NotGate(NOT_DELAY, t1.createEnd(), nq.createEnd());
+	OrGate or1 = new OrGate(OR_DELAY, t2.createReadWriteEnd(), r.createReadOnlyEnd(), nq.createReadOnlyEnd());
+	OrGate or2 = new OrGate(OR_DELAY, t1.createReadWriteEnd(), s.createReadOnlyEnd(), q.createReadOnlyEnd());
+	NotGate not1 = new NotGate(NOT_DELAY, t2.createReadOnlyEnd(), q.createReadWriteEnd());
+	NotGate not2 = new NotGate(NOT_DELAY, t1.createReadOnlyEnd(), nq.createReadWriteEnd());
 
 	Map<ManualSwitch, Rectangle> switchMap = new HashMap<>();
 
@@ -282,7 +282,7 @@ public class GUITest extends JPanel
 				gt.repaint(12);
 			try
 			{
-				Thread.sleep(Math.max(16 - System.currentTimeMillis() + lastFrame, 0));
+				Thread.sleep(Math.max(updateT - System.currentTimeMillis() + lastFrame, 0));
 			}
 			catch (Exception e)
 			{