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

rusEFI console produces invalid .logicdata files #1563

This commit is contained in:
rusefillc 2021-04-13 12:16:29 -04:00
parent 79e0d6ebd4
commit 0180638a22
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
java_console/models/src/main/java/com/rusefi/stream/TSHighSpeedLog.java
View File

@ -16,8 +16,8 @@ public class TSHighSpeedLog extends StreamFile {
private static void writeHeader(Writer writer) throws IOException {
writer.write("#Firmware: console" + rusEFIVersion.CONSOLE_VERSION + " firmware " + rusEFIVersion.firmwareVersion.get() + "\n");
writer.write("PriLevel,SecLevel,Trigger,Sync,Time,ToothTime\n" +
"Flag,Flag,Flag,Flag,ms,ms\n");
writer.write("PriLevel,SecLevel,Trigger,Sync,Time,ToothTime,coil,inj\n" +
"Flag,Flag,Flag,Flag,ms,ms,Flag,Flag\n");
}
@Override
@ -30,7 +30,11 @@ public class TSHighSpeedLog extends StreamFile {
for (CompositeEvent event : events) {
writer.write(event.isPrimaryTriggerAsInt() + "," + event.isSecondaryTriggerAsInt() + "," + event.isTrgAsInt() + "," + event.isSyncAsInt() + ",");
int delta = event.getTimestamp() - prevTime;
writer.write(event.getTimestamp() / 1000.0 + "," + delta / 1000.0 + "\n");
writer.write(event.getTimestamp() / 1000.0 + "," + delta / 1000.0);
writer.write("," + event.isCoil() + "," + event.isInjector());
writer.write("\n");
prevTime = event.getTimestamp();
}
writer.flush();

2
java_console/shared_io/src/main/java/com/rusefi/rusEFIVersion.java
View File

@ -6,7 +6,7 @@ import java.net.URL;
import java.util.concurrent.atomic.AtomicReference;
public class rusEFIVersion {
public static final int CONSOLE_VERSION = 20210315;
public static final int CONSOLE_VERSION = 20210413;
public static AtomicReference<String> firmwareVersion = new AtomicReference<>("N/A");
public static long classBuildTimeMillis() {