From d42ea7f97eb002658f8770c37238a3ef404cf9fd Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sat, 2 Mar 2019 23:32:52 -0500 Subject: [PATCH] #494 --- .../ui/src/com/rusefi/SensorLogger.java | 9 ++++++--- .../ui/widgets/EtbMonteCarloSequence.java | 6 ++++-- .../com/rusefi/ui/widgets/EtbTestSequence.java | 18 +++++++++--------- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/java_console/ui/src/com/rusefi/SensorLogger.java b/java_console/ui/src/com/rusefi/SensorLogger.java index adec8d314d..ebb0b7f7a9 100644 --- a/java_console/ui/src/com/rusefi/SensorLogger.java +++ b/java_console/ui/src/com/rusefi/SensorLogger.java @@ -120,10 +120,8 @@ public class SensorLogger { if (logFile == null) return; - long msSinceFileStart = System.currentTimeMillis() - fileStartTime; - try { - logFile.write((msSinceFileStart / 1000.0) + "\t"); + logFile.write(getSecondsSinceFileStart() + "\t"); for (Sensor sensor : SENSORS) { logFile.write(SensorCentral.getInstance().getValue(sensor) + "\t"); } @@ -135,6 +133,11 @@ public class SensorLogger { } } + public static double getSecondsSinceFileStart() { + long msSinceFileStart = System.currentTimeMillis() - fileStartTime; + return msSinceFileStart / 1000.0; + } + private static void startSensorLogFile() { String fileName = FileLog.DIR + FileLog.getDate() + ".msl"; diff --git a/java_console/ui/src/com/rusefi/ui/widgets/EtbMonteCarloSequence.java b/java_console/ui/src/com/rusefi/ui/widgets/EtbMonteCarloSequence.java index e1508b820b..f285f013e4 100644 --- a/java_console/ui/src/com/rusefi/ui/widgets/EtbMonteCarloSequence.java +++ b/java_console/ui/src/com/rusefi/ui/widgets/EtbMonteCarloSequence.java @@ -9,6 +9,7 @@ import javax.swing.*; import java.util.Random; +import static com.rusefi.SensorLogger.getSecondsSinceFileStart; import static com.rusefi.Timeouts.SECOND; import static com.rusefi.ui.widgets.EtbTestSequence.*; @@ -17,7 +18,7 @@ import static com.rusefi.ui.widgets.EtbTestSequence.*; * (c) Andrey Belomutskiy */ public class EtbMonteCarloSequence { - public static final int LIMIT = 100; + public static final int LIMIT = 300; private final JButton button = new JButton("ETB I feel lucky!"); private final static Random r = new Random(); private int counter; @@ -54,7 +55,8 @@ public class EtbMonteCarloSequence { @Override protected void doJob() { double result = SensorCentral.getInstance().getValue(Sensor.ETB_CONTROL_QUALITY); - MessagesCentral.getInstance().postMessage(EtbMonteCarloSequence.class, stats + ":result:" + result); + MessagesCentral.getInstance().postMessage(EtbMonteCarloSequence.class, + getSecondsSinceFileStart() + ":" + stats + ":result:" + result); if (counter == LIMIT) { MessagesCentral.getInstance().postMessage(EtbTestSequence.class, "ETB MC sequence done!"); return; diff --git a/java_console/ui/src/com/rusefi/ui/widgets/EtbTestSequence.java b/java_console/ui/src/com/rusefi/ui/widgets/EtbTestSequence.java index 105f4333c0..ef13932b9f 100644 --- a/java_console/ui/src/com/rusefi/ui/widgets/EtbTestSequence.java +++ b/java_console/ui/src/com/rusefi/ui/widgets/EtbTestSequence.java @@ -81,15 +81,15 @@ public class EtbTestSequence { .addNext(3 * SECOND, 2 /*position*/) .addNext(3 * SECOND, 1 /*position*/) .addNext(3 * SECOND, 0 /*position*/) -// .addNext(10 * SECOND, 6 /*position*/) -// .addNext(10 * SECOND, 30 /*position*/) -// .addNext(10 * SECOND, 50 /*position*/) -// .addNext(10 * SECOND, 70 /*position*/) -// .addNext(10 * SECOND, 100 /*position*/) -// .addNext(10 * SECOND, 50 /*position*/) -// .addNext(10 * SECOND, 70 /*position*/) -// .addNext(10 * SECOND, 4 /*position*/) -// .addNext(10 * SECOND, 0 /*position*/) + .addNext(10 * SECOND, 6 /*position*/) + .addNext(10 * SECOND, 30 /*position*/) + .addNext(10 * SECOND, 50 /*position*/) + .addNext(10 * SECOND, 70 /*position*/) + .addNext(10 * SECOND, 100 /*position*/) + .addNext(10 * SECOND, 50 /*position*/) + .addNext(10 * SECOND, 70 /*position*/) + .addNext(10 * SECOND, 4 /*position*/) + .addNext(10 * SECOND, 0 /*position*/) ; }