From a9c91a407987a4894db42e552b0d55971aeb55c0 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 7 Jun 2020 12:27:21 -0400 Subject: [PATCH] progress --- java_console/autotest/src/com/rusefi/AutoTest.java | 6 +++--- .../autotest/src/com/rusefi/EnduranceTest.java | 5 ++--- java_console/autotest/src/com/rusefi/IoUtil.java | 2 +- .../com/rusefi/autodetect/PortDetectorSandbox.java | 14 ++++++++++++++ 4 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 java_console/ui/src/com/rusefi/autodetect/PortDetectorSandbox.java diff --git a/java_console/autotest/src/com/rusefi/AutoTest.java b/java_console/autotest/src/com/rusefi/AutoTest.java index 1bbc61c616..f87ffdebb9 100644 --- a/java_console/autotest/src/com/rusefi/AutoTest.java +++ b/java_console/autotest/src/com/rusefi/AutoTest.java @@ -102,7 +102,7 @@ this is just too unreliable at this point :( public static void assertRpmDoesNotJump(int rpm, int settleTime, int testDuration, Function callback) { changeRpm(rpm); - sleep(settleTime); + sleepSeconds(settleTime); AtomicReference result = new AtomicReference<>(); SensorCentral.SensorListener listener = new SensorCentral.SensorListener() { @Override @@ -113,7 +113,7 @@ this is just too unreliable at this point :( } }; SensorCentral.getInstance().addListener(Sensor.RPM, listener); - sleep(testDuration); + sleepSeconds(testDuration); callback.apply(result.get()); SensorCentral.getInstance().removeListener(Sensor.RPM, listener); } @@ -192,7 +192,7 @@ this is just too unreliable at this point :( currentEngineType = type; sendCommand("set " + Fields.CMD_ENGINE_TYPE + " " + type, COMPLEX_COMMAND_RETRY, Timeouts.SET_ENGINE_TIMEOUT); // TODO: document the reason for this sleep?! - sleep(1); + sleepSeconds(1); sendCommand(getEnableCommand("self_stimulation")); } diff --git a/java_console/autotest/src/com/rusefi/EnduranceTest.java b/java_console/autotest/src/com/rusefi/EnduranceTest.java index 1ba9c042b7..951ce847a7 100644 --- a/java_console/autotest/src/com/rusefi/EnduranceTest.java +++ b/java_console/autotest/src/com/rusefi/EnduranceTest.java @@ -1,7 +1,6 @@ package com.rusefi; import com.rusefi.config.generated.Fields; -import org.junit.rules.Timeout; import static com.rusefi.IoUtil.*; import static com.rusefi.RealHwTest.startRealHardwareTest; @@ -27,12 +26,12 @@ public class EnduranceTest { for (int i = 0; i < count; i++) { AutoTest.currentEngineType = 3; sendCommand("set " + Fields.CMD_ENGINE_TYPE + " " + 3, AutoTest.COMPLEX_COMMAND_RETRY, Timeouts.SET_ENGINE_TIMEOUT); - sleep(2); + sleepSeconds(2); sendCommand(getEnableCommand("self_stimulation")); // IoUtil.changeRpm(1200); AutoTest.currentEngineType = 28; sendCommand("set " + Fields.CMD_ENGINE_TYPE + " " + 28, AutoTest.COMPLEX_COMMAND_RETRY, Timeouts.SET_ENGINE_TIMEOUT); - sleep(2); + sleepSeconds(2); FileLog.MAIN.logLine("++++++++++++++++++++++++++++++++++++ " + i + " +++++++++++++++"); } diff --git a/java_console/autotest/src/com/rusefi/IoUtil.java b/java_console/autotest/src/com/rusefi/IoUtil.java index 95cc37309f..950c28c595 100644 --- a/java_console/autotest/src/com/rusefi/IoUtil.java +++ b/java_console/autotest/src/com/rusefi/IoUtil.java @@ -142,7 +142,7 @@ public class IoUtil { } @SuppressWarnings("UnusedDeclaration") - static void sleep(int seconds) { + public static void sleepSeconds(int seconds) { FileLog.MAIN.logLine("Sleeping " + seconds + " seconds"); try { Thread.sleep(seconds * 1000L); diff --git a/java_console/ui/src/com/rusefi/autodetect/PortDetectorSandbox.java b/java_console/ui/src/com/rusefi/autodetect/PortDetectorSandbox.java new file mode 100644 index 0000000000..c1fd6ee8b1 --- /dev/null +++ b/java_console/ui/src/com/rusefi/autodetect/PortDetectorSandbox.java @@ -0,0 +1,14 @@ +package com.rusefi.autodetect; + +import com.rusefi.IoUtil; + +public class PortDetectorSandbox { + public static void main(String[] args) { + while (true) { + String port = PortDetector.autoDetectSerial(null); + System.out.println("Detected " + port); + + IoUtil.sleepSeconds(1); + } + } +}