From 0180638a22ad9413808f5f4b5720bd84fe03320f Mon Sep 17 00:00:00 2001 From: rusefillc Date: Tue, 13 Apr 2021 12:16:29 -0400 Subject: [PATCH] rusEFI console produces invalid .logicdata files #1563 --- .../main/java/com/rusefi/stream/TSHighSpeedLog.java | 10 +++++++--- .../src/main/java/com/rusefi/rusEFIVersion.java | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/java_console/models/src/main/java/com/rusefi/stream/TSHighSpeedLog.java b/java_console/models/src/main/java/com/rusefi/stream/TSHighSpeedLog.java index 3171f0c9c5..ce231a88b9 100644 --- a/java_console/models/src/main/java/com/rusefi/stream/TSHighSpeedLog.java +++ b/java_console/models/src/main/java/com/rusefi/stream/TSHighSpeedLog.java @@ -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(); diff --git a/java_console/shared_io/src/main/java/com/rusefi/rusEFIVersion.java b/java_console/shared_io/src/main/java/com/rusefi/rusEFIVersion.java index 668d4ea5c7..e469c8695d 100644 --- a/java_console/shared_io/src/main/java/com/rusefi/rusEFIVersion.java +++ b/java_console/shared_io/src/main/java/com/rusefi/rusEFIVersion.java @@ -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 firmwareVersion = new AtomicReference<>("N/A"); public static long classBuildTimeMillis() {