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

only: refactoring: reducing code duplication by adding default parameter value

This commit is contained in:
Andrey 2023-09-14 00:17:33 -04:00
parent 4380ecfd6f
commit 713d4063a2
3 changed files with 10 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

@ -198,7 +198,7 @@ public class BinaryProtocol {
String msg = "load TS_CONFIG_VERSION"; String msg = "load TS_CONFIG_VERSION";
byte[] response = executeCommand(Fields.TS_OUTPUT_COMMAND, packet, msg); byte[] response = executeCommand(Fields.TS_OUTPUT_COMMAND, packet, msg);
if (!checkResponseCode(response, (byte) Fields.TS_RESPONSE_OK) || response.length != requestSize + 1) { if (!checkResponseCode(response) || response.length != requestSize + 1) {
close(); close();
return "Failed to " + msg; return "Failed to " + msg;
} }
@ -346,7 +346,7 @@ public class BinaryProtocol {
byte[] response = executeCommand(Fields.TS_READ_COMMAND, packet, "load image offset=" + offset); byte[] response = executeCommand(Fields.TS_READ_COMMAND, packet, "load image offset=" + offset);
if (!checkResponseCode(response, (byte) Fields.TS_RESPONSE_OK) || response.length != requestSize + 1) { if (!checkResponseCode(response) || response.length != requestSize + 1) {
if (extractCode(response) == TS_RESPONSE_OUT_OF_RANGE) { if (extractCode(response) == TS_RESPONSE_OUT_OF_RANGE) {
throw new IllegalStateException("TS_RESPONSE_OUT_OF_RANGE ECU/console version mismatch?"); throw new IllegalStateException("TS_RESPONSE_OUT_OF_RANGE ECU/console version mismatch?");
} }
@ -427,7 +427,7 @@ public class BinaryProtocol {
byte[] packet = createRequestCrcPayload(configSize); byte[] packet = createRequestCrcPayload(configSize);
byte[] response = executeCommand(Fields.TS_CRC_CHECK_COMMAND, packet, "get CRC32"); byte[] response = executeCommand(Fields.TS_CRC_CHECK_COMMAND, packet, "get CRC32");
if (checkResponseCode(response, (byte) Fields.TS_RESPONSE_OK) && response.length == 5) { if (checkResponseCode(response) && response.length == 5) {
ByteBuffer bb = ByteBuffer.wrap(response, 1, 4); ByteBuffer bb = ByteBuffer.wrap(response, 1, 4);
// that's unusual - most of the protocol is LITTLE_ENDIAN // that's unusual - most of the protocol is LITTLE_ENDIAN
bb.order(ByteOrder.BIG_ENDIAN); bb.order(ByteOrder.BIG_ENDIAN);
@ -511,7 +511,7 @@ public class BinaryProtocol {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
while (!isClosed && (System.currentTimeMillis() - start < Timeouts.BINARY_IO_TIMEOUT)) { while (!isClosed && (System.currentTimeMillis() - start < Timeouts.BINARY_IO_TIMEOUT)) {
byte[] response = executeCommand(Fields.TS_CHUNK_WRITE_COMMAND, packet, "writeImage"); byte[] response = executeCommand(Fields.TS_CHUNK_WRITE_COMMAND, packet, "writeImage");
if (!checkResponseCode(response, (byte) Fields.TS_RESPONSE_OK) || response.length != 1) { if (!checkResponseCode(response) || response.length != 1) {
log.error("writeData: Something is wrong, retrying..."); log.error("writeData: Something is wrong, retrying...");
continue; continue;
} }

2
java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocolLogger.java
View File

@ -100,7 +100,7 @@ public class BinaryProtocolLogger {
isCompositeLoggerEnabled = true; isCompositeLoggerEnabled = true;
byte[] response = binaryProtocol.executeCommand(Fields.TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY, "composite log"); byte[] response = binaryProtocol.executeCommand(Fields.TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY, "composite log");
if (checkResponseCode(response, (byte) Fields.TS_RESPONSE_OK)) { if (checkResponseCode(response)) {
List<CompositeEvent> events = CompositeParser.parse(response); List<CompositeEvent> events = CompositeParser.parse(response);
createCompositesIfNeeded(); createCompositesIfNeeded();
for (StreamFile composite : compositeLogs) for (StreamFile composite : compositeLogs)

5
java_console/io/src/main/java/com/rusefi/binaryprotocol/IoHelper.java
View File

@ -1,6 +1,7 @@
package com.rusefi.binaryprotocol; package com.rusefi.binaryprotocol;
import com.devexperts.logging.Logging; import com.devexperts.logging.Logging;
import com.rusefi.config.generated.Fields;
import com.rusefi.util.HexBinary; import com.rusefi.util.HexBinary;
import java.util.zip.CRC32; import java.util.zip.CRC32;
@ -67,6 +68,10 @@ public class IoHelper {
packet[offset] = (byte) (value >> 8); packet[offset] = (byte) (value >> 8);
} }
public static boolean checkResponseCode(byte[] response) {
return checkResponseCode(response, (byte) Fields.TS_RESPONSE_OK);
}
/** /**
* @return true if packet has the expected response code * @return true if packet has the expected response code
*/ */