From 6ede33fd3243c7fcea07f2334b8fb46d9adb9ffc Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sun, 27 Dec 2015 00:02:16 -0500 Subject: [PATCH] auto-sync --- .../autotest/src/com/rusefi/AutoTest.java | 24 +++++++++---------- .../src/com/rusefi/ui/ConnectionStatus.java | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/java_console/autotest/src/com/rusefi/AutoTest.java b/java_console/autotest/src/com/rusefi/AutoTest.java index 73800fda7f..9fcf511d8a 100644 --- a/java_console/autotest/src/com/rusefi/AutoTest.java +++ b/java_console/autotest/src/com/rusefi/AutoTest.java @@ -124,10 +124,10 @@ public class AutoTest { // todo: why is width precision so low here? is that because of loaded Windows with 1ms precision? double widthRatio = 0.25; // WAT? this was just 0.009733333333333387? - assertWave(true, msg, chart, EngineChart.INJECTOR_1, 0.006266666666666905, 0.01, widthRatio, x, x + 180, x + 360, x + 540); - assertWave(true, msg, chart, EngineChart.INJECTOR_2, 0.006266666666666905, 0.01, widthRatio, x, x + 180, x + 360, x + 540); - assertWave(true, msg, chart, EngineChart.INJECTOR_3, 0.006266666666666905, 0.01, widthRatio, x, x + 180, x + 360, x + 540); - assertWave(true, msg, chart, EngineChart.INJECTOR_4, 0.006266666666666905, 0.01, widthRatio, x, x + 180, x + 360, x + 540); + assertWave(true, msg, chart, EngineChart.INJECTOR_1, 0.006266666666666905, 0.02, widthRatio, x, x + 180, x + 360, x + 540); + assertWave(true, msg, chart, EngineChart.INJECTOR_2, 0.006266666666666905, 0.02, widthRatio, x, x + 180, x + 360, x + 540); + assertWave(true, msg, chart, EngineChart.INJECTOR_3, 0.006266666666666905, 0.02, widthRatio, x, x + 180, x + 360, x + 540); + assertWave(true, msg, chart, EngineChart.INJECTOR_4, 0.006266666666666905, 0.02, widthRatio, x, x + 180, x + 360, x + 540); msg = "2003 Neon running"; IoUtil.changeRpm(2000); @@ -139,18 +139,18 @@ public class AutoTest { assertWaveNull(msg, chart, EngineChart.SPARK_4); x = 124.12; - assertWave(true, msg, chart, EngineChart.INJECTOR_1, 0.1553333333333329, 0.01, 0.1, x + 360); - assertWave(true, msg, chart, EngineChart.INJECTOR_2, 0.1553333333333329, 0.01, 0.1, x + 180); - assertWave(true, msg, chart, EngineChart.INJECTOR_3, 0.1553333333333329, 0.01, 0.1, x + 540); - assertWave(true, msg, chart, EngineChart.INJECTOR_4, 0.1553333333333329, 0.01, 0.1, x); + assertWave(true, msg, chart, EngineChart.INJECTOR_1, 0.1553333333333329, 0.02, 0.2, x + 360); + assertWave(true, msg, chart, EngineChart.INJECTOR_2, 0.1553333333333329, 0.02, 0.2, x + 180); + assertWave(true, msg, chart, EngineChart.INJECTOR_3, 0.1553333333333329, 0.02, 0.2, x + 540); + assertWave(true, msg, chart, EngineChart.INJECTOR_4, 0.1553333333333329, 0.02, 0.2, x); sendCommand("enable trigger_only_front"); chart = nextChart(); x = 124.12; - assertWave(true, msg, chart, EngineChart.INJECTOR_1, 0.1553333333333329, 0.02, 0.1, x + 360); - assertWave(true, msg, chart, EngineChart.INJECTOR_2, 0.1553333333333329, 0.02, 0.1, x + 180); - assertWave(true, msg, chart, EngineChart.INJECTOR_3, 0.1553333333333329, 0.02, 0.1, x + 540); - assertWave(true, msg, chart, EngineChart.INJECTOR_4, 0.1553333333333329, 0.02, 0.1, x); + assertWave(true, msg, chart, EngineChart.INJECTOR_1, 0.1553333333333329, 0.02, 0.2, x + 360); + assertWave(true, msg, chart, EngineChart.INJECTOR_2, 0.1553333333333329, 0.02, 0.2, x + 180); + assertWave(true, msg, chart, EngineChart.INJECTOR_3, 0.1553333333333329, 0.02, 0.2, x + 540); + assertWave(true, msg, chart, EngineChart.INJECTOR_4, 0.1553333333333329, 0.02, 0.2, x); } private static void testMazdaProtege() { diff --git a/java_console/ui/src/com/rusefi/ui/ConnectionStatus.java b/java_console/ui/src/com/rusefi/ui/ConnectionStatus.java index dd026f59cb..bc5c0c6588 100644 --- a/java_console/ui/src/com/rusefi/ui/ConnectionStatus.java +++ b/java_console/ui/src/com/rusefi/ui/ConnectionStatus.java @@ -19,7 +19,7 @@ public class ConnectionStatus { private List listeners = new CopyOnWriteArrayList<>(); private ConnectionStatus() { - final Timer timer = new Timer(2000, new ActionListener() { + final Timer timer = new Timer(3000, new ActionListener() { @Override public void actionPerformed(ActionEvent e) { setConnected(false);