andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#494

This commit is contained in:
rusEfi 2019-03-02 23:32:52 -05:00
parent 48ef2ee1cc
commit d42ea7f97e
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java_console/ui/src/com/rusefi/SensorLogger.java
View File

@ -120,10 +120,8 @@ public class SensorLogger {
if (logFile == null) if (logFile == null)
return; return;
long msSinceFileStart = System.currentTimeMillis() - fileStartTime;
try { try {
logFile.write((msSinceFileStart / 1000.0) + "\t"); logFile.write(getSecondsSinceFileStart() + "\t");
for (Sensor sensor : SENSORS) { for (Sensor sensor : SENSORS) {
logFile.write(SensorCentral.getInstance().getValue(sensor) + "\t"); 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() { private static void startSensorLogFile() {
String fileName = FileLog.DIR + FileLog.getDate() + ".msl"; String fileName = FileLog.DIR + FileLog.getDate() + ".msl";

6
java_console/ui/src/com/rusefi/ui/widgets/EtbMonteCarloSequence.java
View File

@ -9,6 +9,7 @@ import javax.swing.*;
import java.util.Random; import java.util.Random;
import static com.rusefi.SensorLogger.getSecondsSinceFileStart;
import static com.rusefi.Timeouts.SECOND; import static com.rusefi.Timeouts.SECOND;
import static com.rusefi.ui.widgets.EtbTestSequence.*; import static com.rusefi.ui.widgets.EtbTestSequence.*;
@ -17,7 +18,7 @@ import static com.rusefi.ui.widgets.EtbTestSequence.*;
* (c) Andrey Belomutskiy * (c) Andrey Belomutskiy
*/ */
public class EtbMonteCarloSequence { 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 JButton button = new JButton("ETB I feel lucky!");
private final static Random r = new Random(); private final static Random r = new Random();
private int counter; private int counter;
@ -54,7 +55,8 @@ public class EtbMonteCarloSequence {
@Override @Override
protected void doJob() { protected void doJob() {
double result = SensorCentral.getInstance().getValue(Sensor.ETB_CONTROL_QUALITY); 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) { if (counter == LIMIT) {
MessagesCentral.getInstance().postMessage(EtbTestSequence.class, "ETB MC sequence done!"); MessagesCentral.getInstance().postMessage(EtbTestSequence.class, "ETB MC sequence done!");
return; return;

18
java_console/ui/src/com/rusefi/ui/widgets/EtbTestSequence.java
View File

@ -81,15 +81,15 @@ public class EtbTestSequence {
.addNext(3 * SECOND, 2 /*position*/) .addNext(3 * SECOND, 2 /*position*/)
.addNext(3 * SECOND, 1 /*position*/) .addNext(3 * SECOND, 1 /*position*/)
.addNext(3 * SECOND, 0 /*position*/) .addNext(3 * SECOND, 0 /*position*/)
// .addNext(10 * SECOND, 6 /*position*/) .addNext(10 * SECOND, 6 /*position*/)
// .addNext(10 * SECOND, 30 /*position*/) .addNext(10 * SECOND, 30 /*position*/)
// .addNext(10 * SECOND, 50 /*position*/) .addNext(10 * SECOND, 50 /*position*/)
// .addNext(10 * SECOND, 70 /*position*/) .addNext(10 * SECOND, 70 /*position*/)
// .addNext(10 * SECOND, 100 /*position*/) .addNext(10 * SECOND, 100 /*position*/)
// .addNext(10 * SECOND, 50 /*position*/) .addNext(10 * SECOND, 50 /*position*/)
// .addNext(10 * SECOND, 70 /*position*/) .addNext(10 * SECOND, 70 /*position*/)
// .addNext(10 * SECOND, 4 /*position*/) .addNext(10 * SECOND, 4 /*position*/)
// .addNext(10 * SECOND, 0 /*position*/) .addNext(10 * SECOND, 0 /*position*/)
; ;
} }