diff --git a/log4j.properties b/log4j.properties index 29295e28..d1e2c765 100644 --- a/log4j.properties +++ b/log4j.properties @@ -1,4 +1,4 @@ -log4j.rootLogger=info, stdout, file +log4j.rootLogger=trace, stdout, file log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout diff --git a/src/enginuity/io/protocol/SSMResponseProcessor.java b/src/enginuity/io/protocol/SSMResponseProcessor.java index 0f6f297c..e566e7f8 100644 --- a/src/enginuity/io/protocol/SSMResponseProcessor.java +++ b/src/enginuity/io/protocol/SSMResponseProcessor.java @@ -29,6 +29,7 @@ import static enginuity.io.protocol.SSMProtocol.HEADER; import static enginuity.io.protocol.SSMProtocol.READ_ADDRESS_RESPONSE; import static enginuity.io.protocol.SSMProtocol.READ_MEMORY_RESPONSE; import static enginuity.io.protocol.SSMProtocol.RESPONSE_NON_DATA_BYTES; +import static enginuity.io.protocol.SSMProtocol.WRITE_ADDRESS_RESPONSE; import enginuity.logger.ecu.exception.InvalidResponseException; import static enginuity.util.ByteUtil.asByte; import static enginuity.util.HexUtil.asHex; @@ -60,7 +61,7 @@ public final class SSMResponseProcessor { assertEquals(DIAGNOSTIC_TOOL_ID, response[i++], "Invalid diagnostic tool id"); assertEquals(ECU_ID, response[i++], "Invalid ECU id"); assertEquals(asByte(response.length - RESPONSE_NON_DATA_BYTES + 1), response[i++], "Invalid response data length"); - assertOneOf(new byte[]{READ_ADDRESS_RESPONSE, READ_MEMORY_RESPONSE, ECU_INIT_RESPONSE}, response[i], "Invalid response code"); + assertOneOf(new byte[]{ECU_INIT_RESPONSE, READ_ADDRESS_RESPONSE, READ_MEMORY_RESPONSE, WRITE_ADDRESS_RESPONSE}, response[i], "Invalid response code"); assertEquals(calculateChecksum(response), response[response.length - 1], "Invalid checksum"); } diff --git a/src/enginuity/logger/innovate/io/InnovateConnectionProperties.java b/src/enginuity/logger/innovate/io/InnovateConnectionProperties.java index 45513d68..71436239 100644 --- a/src/enginuity/logger/innovate/io/InnovateConnectionProperties.java +++ b/src/enginuity/logger/innovate/io/InnovateConnectionProperties.java @@ -24,6 +24,7 @@ public final class InnovateConnectionProperties implements ConnectionProperties } public int getSendTimeout() { - return 82; + // innovate specifies 82 but this isn't enough... + return 200; } }