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

tune via CAN #3361 

OMG that was a lame bug
This commit is contained in:
rusefillc 2021-12-04 19:58:48 -05:00
parent 7ab14ca4c6
commit 65e9bc5e0f
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
java_console/io/src/main/java/com/rusefi/autodetect/SerialAutoChecker.java
View File

@ -8,6 +8,7 @@ import com.rusefi.io.can.Elm327Connector;
import com.rusefi.io.commands.HelloCommand;
import com.rusefi.io.serial.BufferedSerialIoStream;
import com.rusefi.io.serial.SerialIoStream;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.IOException;
@ -29,9 +30,13 @@ public class SerialAutoChecker {
this.portFound = portFound;
}
/**
* @return ECU signature from specified stream
*/
public String checkResponse(IoStream stream, Function<CallbackContext, Void> callback) {
if (mode == PortDetector.DetectorMode.DETECT_ELM327) {
if (Elm327Connector.checkConnection(serialPort, stream)) {
// todo: this method is supposed to return signature not serial port!
return serialPort;
}
return null;
@ -58,13 +63,10 @@ public class SerialAutoChecker {
public void openAndCheckResponse(PortDetector.DetectorMode mode, AtomicReference<AutoDetectResult> result, Function<CallbackContext, Void> callback) {
String signature;
IoStream stream;
if (mode == PortDetector.DetectorMode.DETECT_ELM327) {
stream = SerialIoStream.openPort(serialPort);
} else {
stream = BufferedSerialIoStream.openPort(serialPort);
// java 101: just a reminder that try-with syntax would take care of closing stream and that's important here!
try (IoStream stream = getStreamByMode(mode)) {
signature = checkResponse(stream, callback);
}
signature = checkResponse(stream, callback);
if (signature != null) {
/**
* propagating result after closing the port so that it could be used right away
@ -74,6 +76,15 @@ public class SerialAutoChecker {
}
}
@NotNull
private IoStream getStreamByMode(PortDetector.DetectorMode mode) {
if (mode == PortDetector.DetectorMode.DETECT_ELM327) {
return SerialIoStream.openPort(serialPort);
} else {
return BufferedSerialIoStream.openPort(serialPort);
}
}
public static class CallbackContext {
private final IoStream stream;
private final String signature;