diff --git a/lib/logger/rxtx/INSTALL b/lib/logger/rxtx/INSTALL deleted file mode 100644 index 6b4c71d8..00000000 --- a/lib/logger/rxtx/INSTALL +++ /dev/null @@ -1,57 +0,0 @@ -Trent Here. I do those ugly brown pages at rxtx.org. Documentation is not -what I do well :) So please help me when you see problems or something is -confusing. - -For more information provided by end users please visit the rxtx wiki at -http://rxtx.qbang.org/wiki. This is also where you can help. - -Short Install Instructions - -Windows - -RXTXcomm.jar goes in \jre\lib\ext (under java) -rxtxSerial.dll goes in \jre\bin - -Mac OS X (x86 and ppc) (there is an Installer with the source) - -RXTXcomm.jar goes in /Library/Java/Extensions -librxtxSerial.jnilib goes in /Library/Java/Extensions -Run fixperm.sh thats in the directory. Fix perms is in the Mac_OS_X -subdirectory. - -Linux (only x86, x86_64, ia64 here but more in the ToyBox) - -RXTXcomm.jar goes in /jre/lib/ext (under java) -librxtxSerial.so goes in /jre/lib/[machine type] (i386 for instance) -Make sure the user is in group lock or uucp so lockfiles work. - -Solaris (sparc only so far) - -RXTXcomm.jar goes in /jre/lib/ext (under java) -librxtxSerial.so goes in /jre/lib/[machine type] -Make sure the user is in group uucp so lockfiles work. - - - - -A person is added to group lock or uucp by editing /etc/groups. Distributions -have various tools but this works: - -lock:x:54: becomes: -lock:x:53:jarvi,taj - -Now jarvi and taj are in group lock. - -Also make sure jarvi and taj have read and write permissions on the port. - - - - -If there are problems please help each other on the wiki and ask questions -on the mail-list. User contributed changes will be used here in the next -release. If you don't like the documentation, you can improve it. - - --- -Trent Jarvi -tjarvi@qbang.org diff --git a/lib/logger/rxtx/OSX/RXTXcomm.jar b/lib/logger/rxtx/OSX/RXTXcomm.jar deleted file mode 100644 index 84e5f01d..00000000 Binary files a/lib/logger/rxtx/OSX/RXTXcomm.jar and /dev/null differ diff --git a/lib/logger/rxtx/RXTXcomm.jar b/lib/logger/rxtx/RXTXcomm.jar deleted file mode 100644 index 84e5f01d..00000000 Binary files a/lib/logger/rxtx/RXTXcomm.jar and /dev/null differ diff --git a/lib/logger/rxtx/linux/i686/librxtxSerial.so b/lib/logger/rxtx/linux/i686/librxtxSerial.so new file mode 100644 index 00000000..e60c5e67 Binary files /dev/null and b/lib/logger/rxtx/linux/i686/librxtxSerial.so differ diff --git a/lib/logger/rxtx/linux/ia64/librxtxSerial.so b/lib/logger/rxtx/linux/ia64/librxtxSerial.so new file mode 100644 index 00000000..916db004 Binary files /dev/null and b/lib/logger/rxtx/linux/ia64/librxtxSerial.so differ diff --git a/lib/logger/rxtx/linux/x86_64/librxtxSerial.so b/lib/logger/rxtx/linux/x86_64/librxtxSerial.so new file mode 100644 index 00000000..eba4e0e9 Binary files /dev/null and b/lib/logger/rxtx/linux/x86_64/librxtxSerial.so differ diff --git a/lib/logger/rxtx/rxtxSerial.dll b/lib/logger/rxtx/win32/rxtxSerial.dll similarity index 100% rename from lib/logger/rxtx/rxtxSerial.dll rename to lib/logger/rxtx/win32/rxtxSerial.dll diff --git a/logger.dtd b/logger.dtd index 3d8278ca..fc6d6240 100644 --- a/logger.dtd +++ b/logger.dtd @@ -4,7 +4,7 @@ - + diff --git a/src/enginuity/io/connection/EcuConnectionImpl.java b/src/enginuity/io/connection/EcuConnectionImpl.java index adfa9993..3bd69294 100644 --- a/src/enginuity/io/connection/EcuConnectionImpl.java +++ b/src/enginuity/io/connection/EcuConnectionImpl.java @@ -36,8 +36,8 @@ public final class EcuConnectionImpl implements EcuConnection { this.sendTimeout = connectionProperties.getSendTimeout(); // Use TestSSMConnectionImpl for testing!! - serialConnection = new SerialConnectionImpl(connectionProperties, portName); -// serialConnection = new TestSSMConnectionImpl(connectionProperties, portName); +// serialConnection = new SerialConnectionImpl(connectionProperties, portName); + serialConnection = new TestSSMConnectionImpl(connectionProperties, portName); } public byte[] send(byte[] bytes) { diff --git a/src/enginuity/logger/ecu/comms/io/connection/SSMLoggerConnection.java b/src/enginuity/logger/ecu/comms/io/connection/SSMLoggerConnection.java index 08274848..fbf1ad7e 100644 --- a/src/enginuity/logger/ecu/comms/io/connection/SSMLoggerConnection.java +++ b/src/enginuity/logger/ecu/comms/io/connection/SSMLoggerConnection.java @@ -23,7 +23,7 @@ package enginuity.logger.ecu.comms.io.connection; import enginuity.io.connection.ConnectionProperties; import enginuity.io.connection.SerialConnection; -import enginuity.io.connection.SerialConnectionImpl; +import enginuity.io.connection.TestSSMConnectionImpl; import enginuity.logger.ecu.comms.io.protocol.LoggerProtocol; import enginuity.logger.ecu.comms.io.protocol.SSMLoggerProtocol; import enginuity.logger.ecu.comms.query.EcuQuery; @@ -45,8 +45,8 @@ public final class SSMLoggerConnection implements LoggerConnection { protocol = new SSMLoggerProtocol(); // Use TestSSMConnectionImpl for testing!! - serialConnection = new SerialConnectionImpl(connectionProperties, portName); -// serialConnection = new TestSSMConnectionImpl(connectionProperties, portName); +// serialConnection = new SerialConnectionImpl(connectionProperties, portName); + serialConnection = new TestSSMConnectionImpl(connectionProperties, portName); } public void sendAddressReads(Collection queries) { diff --git a/src/enginuity/logger/ecu/definition/xml/LoggerDefinitionHandler.java b/src/enginuity/logger/ecu/definition/xml/LoggerDefinitionHandler.java index 8f6155da..e26461d4 100644 --- a/src/enginuity/logger/ecu/definition/xml/LoggerDefinitionHandler.java +++ b/src/enginuity/logger/ecu/definition/xml/LoggerDefinitionHandler.java @@ -24,25 +24,12 @@ package enginuity.logger.ecu.definition.xml; import enginuity.io.connection.ConnectionProperties; import enginuity.io.connection.ConnectionPropertiesImpl; import enginuity.logger.ecu.comms.query.EcuInit; -import enginuity.logger.ecu.definition.EcuData; -import enginuity.logger.ecu.definition.EcuDataConvertor; -import enginuity.logger.ecu.definition.EcuDerivedParameterConvertor; -import enginuity.logger.ecu.definition.EcuDerivedParameterConvertorImpl; -import enginuity.logger.ecu.definition.EcuDerivedParameterImpl; -import enginuity.logger.ecu.definition.EcuParameter; -import enginuity.logger.ecu.definition.EcuParameterConvertorImpl; -import enginuity.logger.ecu.definition.EcuSwitch; +import enginuity.logger.ecu.definition.*; import static enginuity.util.ParamChecker.checkNotNullOrEmpty; import org.xml.sax.Attributes; import org.xml.sax.helpers.DefaultHandler; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; public final class LoggerDefinitionHandler extends DefaultHandler { private static final String FLOAT = "float"; @@ -89,11 +76,11 @@ public final class LoggerDefinitionHandler extends DefaultHandler { private String ecuByteIndex; private String ecuBit; private String ecuIds; - private Set addressList; + private EcuAddress address; private Set dependsList; - private Map ecuAddressMap; + private Map ecuAddressMap; private boolean derived; - private int bit; + private int addressBit; private int addressLength; private Set convertorList; private Set derivedConvertorList; @@ -133,9 +120,8 @@ public final class LoggerDefinitionHandler extends DefaultHandler { } else if (TAG_ADDRESS.equals(qName)) { String length = attributes.getValue(ATTR_LENGTH); addressLength = length == null ? 1 : Integer.valueOf(length); - String bitx = attributes.getValue(ATTR_BIT); - bit = bitx == null ? -1 : Integer.valueOf(bitx); - addressList = new LinkedHashSet(addressLength); + String bit = attributes.getValue(ATTR_BIT); + addressBit = bit == null ? -1 : Integer.valueOf(bit); derived = false; } else if (TAG_DEPENDS.equals(qName)) { dependsList = new LinkedHashSet(); @@ -158,15 +144,14 @@ public final class LoggerDefinitionHandler extends DefaultHandler { id = attributes.getValue(ATTR_ID); name = attributes.getValue(ATTR_NAME); desc = attributes.getValue(ATTR_DESC); - addressList = new HashSet(); - addressList.add(attributes.getValue(ATTR_BYTE)); - bit = Integer.valueOf(attributes.getValue(ATTR_BIT)); + address = new EcuAddressImpl(attributes.getValue(ATTR_BYTE), 1, + Integer.valueOf(attributes.getValue(ATTR_BIT))); derived = false; } else if (TAG_ECUPARAM.equals(qName)) { id = attributes.getValue(ATTR_ID); name = attributes.getValue(ATTR_NAME); desc = attributes.getValue(ATTR_DESC); - ecuAddressMap = new HashMap(); + ecuAddressMap = new HashMap(); derived = false; } else if (TAG_ECU.equals(qName)) { ecuIds = attributes.getValue(ATTR_ID); @@ -180,14 +165,14 @@ public final class LoggerDefinitionHandler extends DefaultHandler { charBuffer.append(ch, start, length); } } -//FIXME: Fix all the commented out stuff!!! + public void endElement(String uri, String localName, String qName) { if (TAG_PROTOCOL.equals(qName)) { parseProtocol = false; } else if (parseProtocol) { if (TAG_ADDRESS.equals(qName)) { String startAddress = charBuffer.toString(); -// addressList.addAll(getAddressList(startAddress, addressLength)); + address = new EcuAddressImpl(startAddress, addressLength, addressBit); } else if (TAG_PARAMETER.equals(qName)) { if (derived) { Set dependencies = new HashSet(); @@ -207,32 +192,31 @@ public final class LoggerDefinitionHandler extends DefaultHandler { } else { 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); + EcuParameter param = new EcuParameterImpl(id, name, desc, address, + convertorList.toArray(new EcuDataConvertor[convertorList.size()])); + params.add(param); + ecuDataMap.put(param.getId(), param); } } } else if (TAG_SWITCH.equals(qName)) { -// EcuSwitch ecuSwitch = new EcuSwitchImpl(id, name, desc, toArray(addressList), -// new EcuDataConvertor[]{new EcuSwitchConvertorImpl(bit)}); -// switches.add(ecuSwitch); -// ecuDataMap.put(ecuSwitch.getId(), ecuSwitch); + 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, toArray(addressList), -// new EcuDataConvertor[]{new EcuSwitchConvertorImpl(bit)}); + fileLoggingControllerSwitch = new EcuSwitchImpl(id, name, desc, address, + new EcuDataConvertor[]{new EcuSwitchConvertorImpl(address.getBit())}); } } else if (TAG_ECUPARAM.equals(qName)) { if (ecuInit != null && ecuAddressMap.containsKey(ecuInit.getEcuId())) { -// EcuParameter param = new EcuParameterImpl(id, name, desc, ecuAddressMap.get(ecuInit.getEcuId()), -// convertorList.toArray(new EcuDataConvertor[convertorList.size()])); -// params.add(param); -// ecuDataMap.put(param.getId(), param); + EcuParameter param = new EcuParameterImpl(id, name, desc, ecuAddressMap.get(ecuInit.getEcuId()), + convertorList.toArray(new EcuDataConvertor[convertorList.size()])); + params.add(param); + ecuDataMap.put(param.getId(), param); } } else if (TAG_ECU.equals(qName)) { - String[] addresses = toArray(addressList); for (String ecuId : ecuIds.split(",")) { - ecuAddressMap.put(ecuId, addresses); + ecuAddressMap.put(ecuId, address); } } } @@ -265,10 +249,4 @@ public final class LoggerDefinitionHandler extends DefaultHandler { return false; } } - - private String[] toArray(Set set) { - String[] addresses = new String[set.size()]; - set.toArray(addresses); - return addresses; - } }