From 344987c59c3f7424a8ffecfb32eedb61e9741990 Mon Sep 17 00:00:00 2001 From: kascade Date: Thu, 4 Jan 2007 04:25:57 +0000 Subject: [PATCH] logger now uses ecu init response to determine loggable parameters git-svn-id: http://svn.3splooges.com/romraider-arch/trunk@403 d2e2e1cd-ba16-0410-be16-b7c4453c7c2d --- .../logger/definition/xml/LoggerDefinitionHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/enginuity/logger/definition/xml/LoggerDefinitionHandler.java b/src/enginuity/logger/definition/xml/LoggerDefinitionHandler.java index f0f57207..19510ab8 100644 --- a/src/enginuity/logger/definition/xml/LoggerDefinitionHandler.java +++ b/src/enginuity/logger/definition/xml/LoggerDefinitionHandler.java @@ -181,7 +181,7 @@ public final class LoggerDefinitionHandler extends DefaultHandler { ecuDataMap.put(param.getId(), param); } } else { - if (ecuByteIndex == null || ecuBit == null || isSupportedParameter(ecuByteIndex, ecuBit)) { + if (ecuByteIndex == null || ecuBit == null || ecuInit == null || isSupportedParameter(ecuInit, ecuByteIndex, ecuBit)) { EcuParameter param = new EcuParameterImpl(id, name, desc, toArray(addressList), convertorList.toArray(new EcuDataConvertor[convertorList.size()])); params.add(param); ecuDataMap.put(param.getId(), param); @@ -206,7 +206,7 @@ public final class LoggerDefinitionHandler extends DefaultHandler { } } - private boolean isSupportedParameter(final String ecuByteIndex, final String ecuBit) { + private boolean isSupportedParameter(final EcuInit ecuInit, final String ecuByteIndex, final String ecuBit) { byte[] bytes = new byte[1]; System.arraycopy(ecuInit.getEcuInitBytes(), Integer.parseInt(ecuByteIndex), bytes, 0, 1); return (bytes[0] & 1 << Integer.parseInt(ecuBit)) > 0;