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

.logicdata files are a bit broken #1482

This commit is contained in:
rusefi 2020-06-05 18:52:04 -04:00
parent 9fb76630c4
commit 9990a48c7f
4 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java
View File

@ -28,6 +28,7 @@ import java.io.EOFException;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.ExecutionException;
@ -81,9 +82,15 @@ public class BinaryProtocol implements BinaryProtocolCommands {
private boolean isCompositeLoggerEnabled;
private long lastLowRpmTime = System.currentTimeMillis();
private List<StreamFile> compositeLogs = Arrays.asList(new VcdStreamFile(getFileName("rusEFI_trigger_log_")),
new TSHighSpeedLog(getFileName("rusEFI_trigger_log_")),
new LogicdataStreamFile(getFileName("rusEFI_trigger_log_", ".logicdata")));
private List<StreamFile> compositeLogs = new ArrayList<>();
private void createCompositesIfNeeded() {
if (!compositeLogs.isEmpty())
return;
compositeLogs.addAll(Arrays.asList(new VcdStreamFile(getFileName("rusEFI_trigger_log_")),
new TSHighSpeedLog(getFileName("rusEFI_trigger_log_")),
new LogicdataStreamFile(getFileName("rusEFI_trigger_log_", ".logicdata"))));
}
public boolean isClosed;
/**
@ -101,11 +108,14 @@ public class BinaryProtocol implements BinaryProtocolCommands {
}
};
private final Thread hook = new Thread(() -> closeComposites());
protected BinaryProtocol(final Logger logger, IoStream stream) {
this.logger = logger;
this.stream = stream;
incomingData = createDataBuffer(stream, logger);
Runtime.getRuntime().addShutdownHook(hook);
}
public static IncomingDataBuffer createDataBuffer(IoStream stream, Logger logger) {
@ -222,11 +232,17 @@ public class BinaryProtocol implements BinaryProtocolCommands {
packet[1] = Fields.TS_COMPOSITE_DISABLE;
executeCommand(packet, "disable composite");
isCompositeLoggerEnabled = false;
for (StreamFile composite : compositeLogs)
composite.close();
closeComposites();
}
}
private void closeComposites() {
for (StreamFile composite : compositeLogs) {
composite.close();
}
compositeLogs.clear();
}
public Logger getLogger() {
return logger;
}
@ -397,6 +413,8 @@ public class BinaryProtocol implements BinaryProtocolCommands {
isClosed = true;
SensorCentral.getInstance().removeListener(Sensor.RPM, rpmListener);
stream.close();
closeComposites();
Runtime.getRuntime().removeShutdownHook(hook);
}
public void writeData(byte[] content, Integer offset, int size, Logger logger) throws SerialPortException, EOFException, InterruptedException {
@ -521,6 +539,7 @@ public class BinaryProtocol implements BinaryProtocolCommands {
byte[] response = executeCommand(packet, "composite log", true);
if (checkResponseCode(response, RESPONSE_OK)) {
List<CompositeEvent> events = CompositeParser.parse(response);
createCompositesIfNeeded();
for (StreamFile composite : compositeLogs)
composite.append(events);
}

2
java_console/models/src/com/rusefi/stream/LogicdataStreamFile.java
View File

@ -344,6 +344,8 @@ public class LogicdataStreamFile extends StreamFile {
@Override
protected void writeFooter() throws IOException {
if (stream == null)
return;
write(BLOCK);
for (int i = 0; i < numChannels; i++) {
writeId(i, 1);

3
java_console/models/src/com/rusefi/stream/StreamFile.java
View File

@ -32,14 +32,15 @@ public abstract class StreamFile {
} catch (IOException e) {
// ignoring this one
}
writer = null;
}
writer = null;
if (stream != null) {
try {
stream.close();
} catch (IOException e) {
// ignoring this one
}
stream = null;
}
}

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

@ -42,6 +42,7 @@ public class TSHighSpeedLog extends StreamFile {
@Override
protected void writeFooter() throws IOException {
writer.write("MARK 028\n");
if (writer != null)
writer.write("MARK 028\n");
}
}