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

refactoring: nicer API

This commit is contained in:
rusefillc 2021-12-04 21:06:47 -05:00
parent a469f72eee
commit 3bc9935a23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,6 @@ import com.rusefi.Timeouts;
import com.rusefi.composite.CompositeEvent; import com.rusefi.composite.CompositeEvent;
import com.rusefi.composite.CompositeParser; import com.rusefi.composite.CompositeParser;
import com.rusefi.config.generated.Fields; import com.rusefi.config.generated.Fields;
import com.rusefi.core.MessagesCentral;
import com.rusefi.core.Pair; import com.rusefi.core.Pair;
import com.rusefi.core.Sensor; import com.rusefi.core.Sensor;
import com.rusefi.core.SensorCentral; import com.rusefi.core.SensorCentral;
@ -28,7 +27,6 @@ import com.rusefi.ui.livedocs.LiveDocsRegistry;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.io.EOFException;
import java.io.IOException; import java.io.IOException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.ByteOrder; import java.nio.ByteOrder;
@ -220,9 +218,9 @@ public class BinaryProtocol {
linkManager.getCommandQueue().handleConfirmationMessage(CommandQueue.CONFIRMATION_PREFIX + command); linkManager.getCommandQueue().handleConfirmationMessage(CommandQueue.CONFIRMATION_PREFIX + command);
} }
public String getSignature() throws IOException { public static String getSignature(IoStream stream) throws IOException {
HelloCommand.send(stream); HelloCommand.send(stream);
return HelloCommand.getHelloResponse(incomingData); return HelloCommand.getHelloResponse(stream.getDataBuffer());
} }
/** /**
@ -232,7 +230,7 @@ public class BinaryProtocol {
*/ */
public boolean connectAndReadConfiguration(DataListener listener) { public boolean connectAndReadConfiguration(DataListener listener) {
try { try {
signature = getSignature(); signature = getSignature(stream);
System.out.println("BinaryProtocol: Got " + signature + " signature"); System.out.println("BinaryProtocol: Got " + signature + " signature");
SignatureHelper.downloadIfNotAvailable(SignatureHelper.getUrl(signature)); SignatureHelper.downloadIfNotAvailable(SignatureHelper.getUrl(signature));
} catch (IOException e) { } catch (IOException e) {