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

updated logger.xml handling 

git-svn-id: http://svn.3splooges.com/romraider-arch/trunk@663 d2e2e1cd-ba16-0410-be16-b7c4453c7c2d
This commit is contained in:
kascade 2007-04-25 00:13:07 +00:00
parent b87f216ecb
commit 956e9e3213
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/enginuity/logger/ecu/definition/xml/LoggerDefinitionHandler.java
View File

@ -100,7 +100,6 @@ public final class LoggerDefinitionHandler extends DefaultHandler {
private EcuAddress address; private EcuAddress address;
private Set<String> dependsList; private Set<String> dependsList;
private Map<String, EcuAddress> ecuAddressMap; private Map<String, EcuAddress> ecuAddressMap;
private boolean isSwitch;
private boolean derived; private boolean derived;
private int addressBit; private int addressBit;
private int addressLength; private int addressLength;
@ -144,7 +143,6 @@ public final class LoggerDefinitionHandler extends DefaultHandler {
ecuByteIndex = attributes.getValue(ATTR_ECUBYTEINDEX); ecuByteIndex = attributes.getValue(ATTR_ECUBYTEINDEX);
ecuBit = attributes.getValue(ATTR_ECUBIT); ecuBit = attributes.getValue(ATTR_ECUBIT);
resetConvertorLists(); resetConvertorLists();
isSwitch = false;
} else if (TAG_ADDRESS.equals(qName)) { } else if (TAG_ADDRESS.equals(qName)) {
String length = attributes.getValue(ATTR_LENGTH); String length = attributes.getValue(ATTR_LENGTH);
addressLength = length == null ? 1 : Integer.valueOf(length); addressLength = length == null ? 1 : Integer.valueOf(length);
@ -169,8 +167,13 @@ public final class LoggerDefinitionHandler extends DefaultHandler {
name = attributes.getValue(ATTR_NAME); name = attributes.getValue(ATTR_NAME);
desc = attributes.getValue(ATTR_DESC); desc = attributes.getValue(ATTR_DESC);
address = new EcuAddressImpl(attributes.getValue(ATTR_BYTE), 1, Integer.valueOf(attributes.getValue(ATTR_BIT))); address = new EcuAddressImpl(attributes.getValue(ATTR_BYTE), 1, Integer.valueOf(attributes.getValue(ATTR_BIT)));
derived = false; EcuDataConvertor[] convertors = new EcuDataConvertor[]{new EcuSwitchConvertorImpl(address.getBit())};
isSwitch = true; EcuSwitch ecuSwitch = new EcuSwitchImpl(id, name, desc, address, convertors);
switches.add(ecuSwitch);
ecuDataMap.put(ecuSwitch.getId(), ecuSwitch);
if (id.equalsIgnoreCase(fileLoggingControllerSwitchId)) {
fileLoggingControllerSwitch = new EcuSwitchImpl(id, name, desc, address, convertors);
}
} else if (TAG_ECUPARAM.equals(qName)) { } else if (TAG_ECUPARAM.equals(qName)) {
id = attributes.getValue(ATTR_ID); id = attributes.getValue(ATTR_ID);
name = attributes.getValue(ATTR_NAME); name = attributes.getValue(ATTR_NAME);
@ -178,7 +181,6 @@ public final class LoggerDefinitionHandler extends DefaultHandler {
resetConvertorLists(); resetConvertorLists();
ecuAddressMap = new HashMap<String, EcuAddress>(); ecuAddressMap = new HashMap<String, EcuAddress>();
derived = false; derived = false;
isSwitch = false;
} else if (TAG_ECU.equals(qName)) { } else if (TAG_ECU.equals(qName)) {
ecuIds = attributes.getValue(ATTR_ID); ecuIds = attributes.getValue(ATTR_ID);
} }
@ -230,22 +232,8 @@ public final class LoggerDefinitionHandler extends DefaultHandler {
derivedConvertorList.add(new EcuDerivedParameterConvertorImpl(conversionUnits, derivedConvertorList.add(new EcuDerivedParameterConvertorImpl(conversionUnits,
conversionExpression, conversionFormat, replaceMap)); conversionExpression, conversionFormat, replaceMap));
} else { } else {
if (isSwitch) { convertorList.add(new EcuParameterConvertorImpl(conversionUnits, conversionExpression, conversionFormat, address.getBit(),
convertorList.add(new EcuSwitchConvertorImpl(address.getBit()));
} else {
convertorList.add(new EcuParameterConvertorImpl(conversionUnits,
conversionExpression, conversionFormat, address.getBit(),
FLOAT.equalsIgnoreCase(conversionStorageType), replaceMap)); FLOAT.equalsIgnoreCase(conversionStorageType), replaceMap));
}
}
} else if (TAG_SWITCH.equals(qName)) {
EcuSwitch ecuSwitch = new EcuSwitchImpl(id, name, desc, address,
new EcuDataConvertor[]{new EcuSwitchConvertorImpl(address.getBit())});
switches.add(ecuSwitch);
ecuDataMap.put(ecuSwitch.getId(), ecuSwitch);
if (id.equalsIgnoreCase(fileLoggingControllerSwitchId)) {
fileLoggingControllerSwitch = new EcuSwitchImpl(id, name, desc, address,
new EcuDataConvertor[]{new EcuSwitchConvertorImpl(address.getBit())});
} }
} else if (TAG_ECUPARAM.equals(qName)) { } else if (TAG_ECUPARAM.equals(qName)) {
if (ecuInit != null && ecuAddressMap.containsKey(ecuInit.getEcuId())) { if (ecuInit != null && ecuAddressMap.containsKey(ecuInit.getEcuId())) {