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

progress

This commit is contained in:
rusefi 2020-05-31 12:49:21 -04:00
parent a8196b197e
commit 8a3ccbc242
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
java_console/ui/src/com/rusefi/autodetect/SerialAutoChecker.java
View File

@ -14,10 +14,11 @@ import java.util.concurrent.atomic.AtomicReference;
import static com.rusefi.binaryprotocol.IoHelper.checkResponseCode; import static com.rusefi.binaryprotocol.IoHelper.checkResponseCode;
class SerialAutoChecker implements Runnable { public class SerialAutoChecker implements Runnable {
private final String serialPort; private final String serialPort;
private final CountDownLatch portFound; private final CountDownLatch portFound;
private final AtomicReference<String> result; private final AtomicReference<String> result;
public static String SIGNATURE;
public SerialAutoChecker(String serialPort, CountDownLatch portFound, AtomicReference<String> result) { public SerialAutoChecker(String serialPort, CountDownLatch portFound, AtomicReference<String> result) {
this.serialPort = serialPort; this.serialPort = serialPort;
@ -36,10 +37,11 @@ class SerialAutoChecker implements Runnable {
byte[] response = incomingData.getPacket(logger, "", false, System.currentTimeMillis()); byte[] response = incomingData.getPacket(logger, "", false, System.currentTimeMillis());
if (!checkResponseCode(response, BinaryProtocolCommands.RESPONSE_OK)) if (!checkResponseCode(response, BinaryProtocolCommands.RESPONSE_OK))
return; return;
String message = new String(response, 1, response.length - 1); String signature = new String(response, 1, response.length - 1);
System.out.println("Got " + message + " from " + serialPort); SIGNATURE = signature;
System.out.println("Got " + signature + " from " + serialPort);
String signatureWithoutMinorVersion = Fields.TS_SIGNATURE.substring(0, Fields.TS_SIGNATURE.length() - 2); String signatureWithoutMinorVersion = Fields.TS_SIGNATURE.substring(0, Fields.TS_SIGNATURE.length() - 2);
if (message.startsWith(signatureWithoutMinorVersion)) { if (signature.startsWith(signatureWithoutMinorVersion)) {
result.set(serialPort); result.set(serialPort);
portFound.countDown(); portFound.countDown();
} }