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

executeCommand knows about opcodes (#3915) 

* executeCommand knows about opcodes

* kick

* extra line

* gross duplication

* ugh more
This commit is contained in:
Matthew Kennedy 2022-02-11 04:03:15 -08:00 committed by GitHub
parent 6451638ab3
commit 5fc5bb40bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 76 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -282,10 +282,7 @@ public class BinaryProtocol {
if (needCompositeLogger) { if (needCompositeLogger) {
getComposite(); getComposite();
} else if (isCompositeLoggerEnabled) { } else if (isCompositeLoggerEnabled) {
byte[] packet = new byte[2]; executeCommand(Fields.TS_SET_LOGGER_SWITCH, new byte[] { Fields.TS_COMPOSITE_DISABLE }, "disable composite");
packet[0] = Fields.TS_SET_LOGGER_SWITCH;
packet[1] = Fields.TS_COMPOSITE_DISABLE;
executeCommand(packet, "disable composite");
isCompositeLoggerEnabled = false; isCompositeLoggerEnabled = false;
closeComposites(); closeComposites();
} }
@ -379,12 +376,11 @@ public class BinaryProtocol {
int remainingSize = image.getSize() - offset; int remainingSize = image.getSize() - offset;
int requestSize = Math.min(remainingSize, Fields.BLOCKING_FACTOR); int requestSize = Math.min(remainingSize, Fields.BLOCKING_FACTOR);
byte[] packet = new byte[5]; byte[] packet = new byte[4];
packet[0] = Fields.TS_READ_COMMAND; putShort(packet, 0, swap16(offset));
putShort(packet, 1, swap16(offset)); putShort(packet, 2, swap16(requestSize));
putShort(packet, 3, swap16(requestSize));
byte[] response = executeCommand(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, (byte) Fields.TS_RESPONSE_OK) || response.length != requestSize + 1) {
String code = (response == null || response.length == 0) ? "empty" : "ERROR_CODE=" + getCode(response); String code = (response == null || response.length == 0) ? "empty" : "ERROR_CODE=" + getCode(response);
@ -455,7 +451,7 @@ public class BinaryProtocol {
public int getCrcFromController(int configSize) { public int getCrcFromController(int configSize) {
byte[] packet = createCrcCommand(configSize); byte[] packet = createCrcCommand(configSize);
byte[] response = executeCommand(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, (byte) Fields.TS_RESPONSE_OK) && response.length == 5) {
ByteBuffer bb = ByteBuffer.wrap(response, 1, 4); ByteBuffer bb = ByteBuffer.wrap(response, 1, 4);
@ -472,15 +468,22 @@ public class BinaryProtocol {
} }
public static byte[] createCrcCommand(int size) { public static byte[] createCrcCommand(int size) {
byte[] packet = new byte[5]; byte[] packet = new byte[4];
packet[0] = Fields.TS_CRC_CHECK_COMMAND; putShort(packet, 0, swap16(/*offset = */ 0));
putShort(packet, 1, swap16(/*offset = */ 0)); putShort(packet, 2, swap16(size));
putShort(packet, 3, swap16(size));
return packet; return packet;
} }
public byte[] executeCommand(byte[] packet, String msg) { public byte[] executeCommand(char opcode, String msg) {
return executeCommand(packet, msg, false); return executeCommand(opcode, null, msg);
}
public byte[] executeCommand(char opcode, String msg, boolean allowLongResponse) {
return executeCommand(opcode, null, msg, allowLongResponse);
}
public byte[] executeCommand(char opcode, byte[] data, String msg) {
return executeCommand(opcode, data, msg, false);
} }
/** /**
@ -488,14 +491,26 @@ public class BinaryProtocol {
* *
* @return null in case of IO issues * @return null in case of IO issues
*/ */
public byte[] executeCommand(byte[] packet, String msg, boolean allowLongResponse) { public byte[] executeCommand(char opcode, byte[] packet, String msg, boolean allowLongResponse) {
if (isClosed) if (isClosed)
return null; return null;
byte[] fullRequest;
if (packet != null) {
fullRequest = new byte[packet.length + 1];
System.arraycopy(packet, 0, fullRequest, 1, packet.length);
} else {
fullRequest = new byte[1];
}
fullRequest[0] = (byte)opcode;
try { try {
linkManager.assertCommunicationThread(); linkManager.assertCommunicationThread();
dropPending(); dropPending();
sendPacket(packet); sendPacket(fullRequest);
return receivePacket(msg, allowLongResponse); return receivePacket(msg, allowLongResponse);
} catch (IOException e) { } catch (IOException e) {
log.error(msg + ": executeCommand failed: " + e); log.error(msg + ": executeCommand failed: " + e);
@ -517,16 +532,15 @@ public class BinaryProtocol {
public void writeData(byte[] content, int contentOffset, int ecuOffset, int size) { public void writeData(byte[] content, int contentOffset, int ecuOffset, int size) {
isBurnPending = true; isBurnPending = true;
byte[] packet = new byte[5 + size]; byte[] packet = new byte[4 + size];
packet[0] = Fields.TS_CHUNK_WRITE_COMMAND; putShort(packet, 0, swap16(ecuOffset));
putShort(packet, 1, swap16(ecuOffset)); putShort(packet, 2, swap16(size));
putShort(packet, 3, swap16(size));
System.arraycopy(content, contentOffset, packet, 5, size); System.arraycopy(content, contentOffset, packet, 4, size);
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(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, (byte) Fields.TS_RESPONSE_OK) || response.length != 1) {
log.error("writeData: Something is wrong, retrying..."); log.error("writeData: Something is wrong, retrying...");
continue; continue;
@ -543,7 +557,7 @@ public class BinaryProtocol {
while (true) { while (true) {
if (isClosed) if (isClosed)
return; return;
byte[] response = executeCommand(new byte[]{Fields.TS_BURN_COMMAND}, "burn"); byte[] response = executeCommand(Fields.TS_BURN_COMMAND, "burn");
if (!checkResponseCode(response, (byte) Fields.TS_RESPONSE_BURN_OK) || response.length != 1) { if (!checkResponseCode(response, (byte) Fields.TS_RESPONSE_BURN_OK) || response.length != 1) {
continue; continue;
} }
@ -579,7 +593,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(command, "execute", false); byte[] response = executeCommand(Fields.TS_EXECUTE, command, "execute", false);
if (!checkResponseCode(response, (byte) Fields.TS_RESPONSE_COMMAND_OK) || response.length != 1) { if (!checkResponseCode(response, (byte) Fields.TS_RESPONSE_COMMAND_OK) || response.length != 1) {
continue; continue;
} }
@ -590,17 +604,14 @@ public class BinaryProtocol {
public static byte[] getTextCommandBytes(String text) { public static byte[] getTextCommandBytes(String text) {
byte[] asBytes = text.getBytes(); byte[] asBytes = text.getBytes();
byte[] command = new byte[asBytes.length + 1]; return asBytes;
command[0] = Fields.TS_EXECUTE;
System.arraycopy(asBytes, 0, command, 1, asBytes.length);
return command;
} }
private String requestPendingMessages() { private String requestPendingMessages() {
if (isClosed) if (isClosed)
return null; return null;
try { try {
byte[] response = executeCommand(new byte[]{Fields.TS_GET_TEXT}, "text", true); byte[] response = executeCommand(Fields.TS_GET_TEXT, "text", true);
if (response != null && response.length == 1) if (response != null && response.length == 1)
Thread.sleep(100); Thread.sleep(100);
return new String(response, 1, response.length - 1); return new String(response, 1, response.length - 1);
@ -614,13 +625,11 @@ public class BinaryProtocol {
if (isClosed) if (isClosed)
return; return;
byte[] packet = new byte[1];
packet[0] = Fields.TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY;
// get command would enable composite logging in controller but we need to turn it off from our end // get command would enable composite logging in controller but we need to turn it off from our end
// todo: actually if console gets disconnected composite logging might end up enabled in controller? // todo: actually if console gets disconnected composite logging might end up enabled in controller?
isCompositeLoggerEnabled = true; isCompositeLoggerEnabled = true;
byte[] response = executeCommand(packet, "composite log", true); byte[] response = executeCommand(Fields.TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY, "composite log", true);
if (checkResponseCode(response, (byte) Fields.TS_RESPONSE_OK)) { if (checkResponseCode(response, (byte) Fields.TS_RESPONSE_OK)) {
List<CompositeEvent> events = CompositeParser.parse(response); List<CompositeEvent> events = CompositeParser.parse(response);
createCompositesIfNeeded(); createCompositesIfNeeded();
@ -635,7 +644,7 @@ public class BinaryProtocol {
byte[] packet = GetOutputsCommand.createRequest(); byte[] packet = GetOutputsCommand.createRequest();
byte[] response = executeCommand(packet, "output channels", false); byte[] response = executeCommand(Fields.TS_OUTPUT_COMMAND, packet, "output channels", false);
if (response == null || response.length != (Fields.TS_OUTPUT_SIZE + 1) || response[0] != Fields.TS_RESPONSE_OK) if (response == null || response.length != (Fields.TS_OUTPUT_SIZE + 1) || response[0] != Fields.TS_RESPONSE_OK)
return false; return false;

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

@ -36,8 +36,7 @@ public class IoHelper {
log.info("makeCrc32Packet: raw packet " + IoStream.printByteArray(command)); log.info("makeCrc32Packet: raw packet " + IoStream.printByteArray(command));
byte[] packet = new byte[command.length + 6]; byte[] packet = new byte[command.length + 6];
packet[0] = (byte) (command.length / 256); putShort(packet, 0, command.length);
packet[1] = (byte) command.length;
System.arraycopy(command, 0, packet, 2, command.length); System.arraycopy(command, 0, packet, 2, command.length);
int crc = getCrc32(command); int crc = getCrc32(command);
@ -57,19 +56,15 @@ public class IoHelper {
} }
public static void putInt(byte[] packet, int offset, int value) { public static void putInt(byte[] packet, int offset, int value) {
int index = offset + 3; packet[offset + 3] = (byte) value;
for (int i = 0; i < 4; i++) { packet[offset + 2] = (byte) (value >> 8);
packet[index--] = (byte) value; packet[offset + 1] = (byte) (value >> 16);
value >>= 8; packet[offset] = (byte) (value >> 24);
}
} }
public static void putShort(byte[] packet, int offset, int value) { public static void putShort(byte[] packet, int offset, int value) {
int index = offset + 1; packet[offset + 1] = (byte) value;
for (int i = 0; i < 2; i++) { packet[offset] = (byte) (value >> 8);
packet[index--] = (byte) value;
value >>= 8;
}
} }
/** /**

7
java_console/io/src/main/java/com/rusefi/io/commands/GetOutputsCommand.java
View File

@ -11,10 +11,9 @@ import static com.rusefi.binaryprotocol.IoHelper.swap16;
public class GetOutputsCommand { public class GetOutputsCommand {
public static byte[] createRequest() { public static byte[] createRequest() {
byte[] packet = new byte[5]; byte[] packet = new byte[4];
packet[0] = Fields.TS_OUTPUT_COMMAND; putShort(packet, 0, 0); // offset
putShort(packet, 1, 0); // offset putShort(packet, 2, swap16(Fields.TS_OUTPUT_SIZE));
putShort(packet, 3, swap16(Fields.TS_OUTPUT_SIZE));
return packet; return packet;
} }

6
java_console/io/src/main/java/com/rusefi/proxy/client/LocalApplicationProxy.java
View File

@ -113,7 +113,11 @@ public class LocalApplicationProxy implements Closeable {
while (true) { while (true) {
sleep(context.gaugePokingPeriod()); sleep(context.gaugePokingPeriod());
if (isTimeForApplicationToConnect(lastActivity.get(), BINARY_IO_TIMEOUT / 2)) { if (isTimeForApplicationToConnect(lastActivity.get(), BINARY_IO_TIMEOUT / 2)) {
byte[] commandPacket = GetOutputsCommand.createRequest(); // TODO: why is this logic duplicated from BinaryProtocol?
byte[] commandPacket = new byte[5];
commandPacket[0] = Fields.TS_OUTPUT_COMMAND;
System.arraycopy(GetOutputsCommand.createRequest(), 0, commandPacket, 1, 4);
// we do not really need the data, we just need to take response from the socket // we do not really need the data, we just need to take response from the socket
authenticatorToProxyStream.sendAndGetPacket(commandPacket, "Gauge Poker", false); authenticatorToProxyStream.sendAndGetPacket(commandPacket, "Gauge Poker", false);
} }

9
java_console/io/src/main/java/com/rusefi/ui/livedocs/LiveDocsRegistry.java
View File

@ -50,12 +50,11 @@ public enum LiveDocsRegistry {
return context -> { return context -> {
Field[] values = StateDictionary.INSTANCE.getFields(context); Field[] values = StateDictionary.INSTANCE.getFields(context);
int size = Field.getStructureSize(values); int size = Field.getStructureSize(values);
byte[] packet = new byte[5]; byte[] packet = new byte[4];
packet[0] = Fields.TS_GET_STRUCT; putShort(packet, 0, swap16(context.ordinal())); // offset
putShort(packet, 1, swap16(context.ordinal())); // offset putShort(packet, 2, swap16(size));
putShort(packet, 3, swap16(size));
byte[] responseWithCode = binaryProtocol.executeCommand(packet, "get LiveDoc"); byte[] responseWithCode = binaryProtocol.executeCommand(Fields.TS_GET_STRUCT, packet, "get LiveDoc");
if (responseWithCode == null || responseWithCode.length != (size + 1) || responseWithCode[0] != Fields.TS_RESPONSE_OK) if (responseWithCode == null || responseWithCode.length != (size + 1) || responseWithCode[0] != Fields.TS_RESPONSE_OK)
return null; return null;

4
java_console/ui/src/main/java/com/rusefi/PerformanceTraceHelper.java
View File

@ -21,12 +21,12 @@ public class PerformanceTraceHelper {
JOptionPane.showMessageDialog(parent, "Failed to located serial ports"); JOptionPane.showMessageDialog(parent, "Failed to located serial ports");
return; return;
} }
bp.executeCommand(new byte[]{Fields.TS_PERF_TRACE_BEGIN}, "begin trace"); bp.executeCommand(Fields.TS_PERF_TRACE_BEGIN, "begin trace");
try { try {
Thread.sleep(500); Thread.sleep(500);
byte[] packet = bp.executeCommand(new byte[]{Fields.TS_PERF_TRACE_GET_BUFFER}, "get trace", true); byte[] packet = bp.executeCommand(Fields.TS_PERF_TRACE_GET_BUFFER, "get trace", true);
if (!checkResponseCode(packet, (byte) Fields.TS_RESPONSE_OK) || ((packet.length - 1) % 8) != 0) if (!checkResponseCode(packet, (byte) Fields.TS_RESPONSE_OK) || ((packet.length - 1) % 8) != 0)
throw new IllegalStateException("Unexpected packet, length=" + (packet != null ? 0 : packet.length)); throw new IllegalStateException("Unexpected packet, length=" + (packet != null ? 0 : packet.length));

2
java_console/ui/src/main/java/com/rusefi/ui/engine/EngineSnifferPanel.java
View File

@ -240,7 +240,7 @@ public class EngineSnifferPanel {
int index = getInsertIndex(name, images.keySet()); int index = getInsertIndex(name, images.keySet());
FileLog.MAIN.logLine("Registering " + name + "@" + index); FileLog.MAIN.logLine("Engine sniffer register channel " + name + " at idx " + index);
UpDownImage image = createImage(name); UpDownImage image = createImage(name);
images.put(name, image); images.put(name, image);

6
java_console/ui/src/test/java/com/rusefi/proxy/client/LocalApplicationProxyTest.java
View File

@ -91,7 +91,11 @@ public class LocalApplicationProxyTest {
applicationConnection.getDataBuffer().read(protocolResponse); applicationConnection.getDataBuffer().read(protocolResponse);
assertArrayEquals(protocolResponse, TS_PROTOCOL.getBytes()); assertArrayEquals(protocolResponse, TS_PROTOCOL.getBytes());
byte[] commandPacket = GetOutputsCommand.createRequest(); // TODO: why is this logic duplicated from BinaryProtocol?
byte[] commandPacket = new byte[5];
commandPacket[0] = Fields.TS_OUTPUT_COMMAND;
System.arraycopy(GetOutputsCommand.createRequest(), 0, commandPacket, 1, 4);
applicationConnection.sendPacket(commandPacket); applicationConnection.sendPacket(commandPacket);
BinaryProtocolServer.Packet response = applicationConnection.readPacket(); BinaryProtocolServer.Packet response = applicationConnection.readPacket();
assertEquals(Fields.TS_OUTPUT_SIZE + 1, response.getPacket().length); assertEquals(Fields.TS_OUTPUT_SIZE + 1, response.getPacket().length);

6
java_tools/proxy_server/src/main/java/com/rusefi/server/ControllerConnectionState.java
View File

@ -128,7 +128,11 @@ public class ControllerConnectionState {
} }
public void getOutputs() throws IOException { public void getOutputs() throws IOException {
byte[] commandPacket = GetOutputsCommand.createRequest(); // TODO: why is this logic duplicated from BinaryProtocol?
byte[] commandPacket = new byte[5];
commandPacket[0] = Fields.TS_OUTPUT_COMMAND;
System.arraycopy(GetOutputsCommand.createRequest(), 0, commandPacket, 1, 4);
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
stream.sendPacket(commandPacket); stream.sendPacket(commandPacket);