WireArrayEnd now created with U and GUITest supports U
authorChristian Femers <femers@in.tum.de>
Sat, 18 May 2019 16:18:48 +0000 (18:18 +0200)
committerChristian Femers <femers@in.tum.de>
Sat, 18 May 2019 16:18:48 +0000 (18:18 +0200)
era.mi/src/era/mi/logic/tests/GUITest.java
era.mi/src/era/mi/logic/wires/WireArray.java

index 3fcb7a6..28dd67a 100644 (file)
@@ -240,6 +240,9 @@ public class GUITest extends JPanel
                case ZERO:\r
                        g.setColor(Color.BLACK);\r
                        break;\r
+               case U:\r
+                       g.setColor(Color.MAGENTA);\r
+                       break;\r
                default:\r
                        throw new IllegalArgumentException();\r
                }\r
@@ -279,7 +282,7 @@ public class GUITest extends JPanel
                                gt.repaint(12);\r
                        try\r
                        {\r
-                               Thread.sleep(Math.max(16 - System.currentTimeMillis() + lastFrame, 0));\r
+                               Thread.sleep(Math.max(updateT - System.currentTimeMillis() + lastFrame, 0));\r
                        }\r
                        catch (Exception e)\r
                        {\r
index 7599a98..39af936 100644 (file)
@@ -257,7 +257,7 @@ public class WireArray
 \r
                private void initValues()\r
                {\r
-                       inputValues = Bit.Z.makeArray(length);\r
+                       inputValues = Bit.U.makeArray(length);\r
                }\r
 \r
                /**\r