From 19f7c552f81035b62e7d47d77237677a7932c54d Mon Sep 17 00:00:00 2001 From: kascade Date: Sun, 1 Feb 2009 11:56:14 +0000 Subject: [PATCH] op20 updates git-svn-id: https://svn2.assembla.com/svn/romraider/trunk@217 38686702-15cf-42e4-a595-3071df8bf5ea --- src/com/romraider/io/connection/ConnectionManagerFactory.java | 2 +- src/com/romraider/io/j2534/api/J2534ConnectionManager.java | 2 +- src/com/romraider/io/j2534/api/TestJ2534.java | 1 + src/com/romraider/io/j2534/op20/Old_J2534OpenPort20.java | 3 ++- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/com/romraider/io/connection/ConnectionManagerFactory.java b/src/com/romraider/io/connection/ConnectionManagerFactory.java index e00510de..1b6cfe7b 100644 --- a/src/com/romraider/io/connection/ConnectionManagerFactory.java +++ b/src/com/romraider/io/connection/ConnectionManagerFactory.java @@ -28,7 +28,7 @@ import static org.apache.log4j.Logger.getLogger; public final class ConnectionManagerFactory { private static final Logger LOGGER = getLogger(ConnectionManagerFactory.class); - private static final boolean ENABLE_TIMER = false; + private static final boolean ENABLE_TIMER = true; private ConnectionManagerFactory() { } diff --git a/src/com/romraider/io/j2534/api/J2534ConnectionManager.java b/src/com/romraider/io/j2534/api/J2534ConnectionManager.java index cdb4d27a..3378d2a6 100644 --- a/src/com/romraider/io/j2534/api/J2534ConnectionManager.java +++ b/src/com/romraider/io/j2534/api/J2534ConnectionManager.java @@ -35,7 +35,7 @@ import static org.apache.log4j.Logger.getLogger; public final class J2534ConnectionManager implements ConnectionManager { private static final Logger LOGGER = getLogger(J2534ConnectionManager.class); private final J2534 api = new Old_J2534OpenPort20(PROTOCOL_ISO9141); - // private final J2534 api = new J2534OpenPort20(PROTOCOL_ISO9141); + // private final J2534 api = new J2534OpenPort20(PROTOCOL_ISO9141); // private final J2534 api = proxy(new Old_J2534OpenPort20(PROTOCOL_ISO9141), TimerWrapper.class); // private final J2534 api = proxy(new J2534OpenPort20(PROTOCOL_ISO9141), TimerWrapper.class); private int channelId; diff --git a/src/com/romraider/io/j2534/api/TestJ2534.java b/src/com/romraider/io/j2534/api/TestJ2534.java index 1bc2e094..fc008be4 100644 --- a/src/com/romraider/io/j2534/api/TestJ2534.java +++ b/src/com/romraider/io/j2534/api/TestJ2534.java @@ -30,6 +30,7 @@ import static com.romraider.util.HexUtil.asHex; import static com.romraider.util.LogManager.initDebugLogging; public final class TestJ2534 { + // private static final J2534 api = new Old_J2534OpenPort20(PROTOCOL_ISO9141); private static final J2534 api = new J2534OpenPort20(PROTOCOL_ISO9141); public static void main(String[] args) { diff --git a/src/com/romraider/io/j2534/op20/Old_J2534OpenPort20.java b/src/com/romraider/io/j2534/op20/Old_J2534OpenPort20.java index b2efd5fd..9c8f383b 100644 --- a/src/com/romraider/io/j2534/op20/Old_J2534OpenPort20.java +++ b/src/com/romraider/io/j2534/op20/Old_J2534OpenPort20.java @@ -157,7 +157,8 @@ public final class Old_J2534OpenPort20 implements J2534 { } private boolean isResponse(PassThruMessage msg) { - if (msg.RxStatus != 0x00) return false; + if (msg.RxStatus == 0x00) return true; + if (msg.RxStatus == 0x01) return true; return msg.Timestamp != 0; }