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

Reverted transport class changes

This commit is contained in:
Robin K 2020-04-18 12:51:44 +02:00
parent 3fbbccdec2
commit ff66e650b6
3 changed files with 0 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.classpath
View File

@ -21,7 +21,6 @@
<classpathentry kind="lib" path="lib/common/en_us.jar"/>
<classpathentry kind="lib" path="lib/common/freetts.jar"/>
<classpathentry kind="lib" path="lib/common/RXTXcomm.jar">
</classpathentry>
<classpathentry kind="lib" path="lib/windows/jdic_stub.jar"/>
<classpathentry kind="lib" path="lib/common/jdic.jar"/>
<classpathentry kind="lib" path="lib/common/jfreechart-1.0.9.jar"/>

75
src/main/java/com/romraider/logger/ecu/definition/Transport.java
View File

@ -26,11 +26,6 @@ public final class Transport {
private final String name;
private final String description;
private int baudRateOverride = 500000;
private boolean extendedCANID = false; //11 or 29
private boolean saePWM = true; //PWM or VPW
private boolean isoKWPFast = false; //Fast or 5 Baud init
public Transport(String id, String name, String description) {
checkNotNull(name, "id");
checkNotNull(name, "name");
@ -56,74 +51,4 @@ public final class Transport {
public String toString() {
return name;
}
/*
*
* These settings are used by the ELM327 Connection to define the protocol further
*
*/
public boolean isExtendedCANID() {
return extendedCANID;
}
public void setExtendedCANID(String value) {
if(value == null) return;
if(value.trim().equals("11")) this.extendedCANID = false;
else
this.extendedCANID = true;
}
public void setExtendedCANID(boolean extendedCANID) {
this.extendedCANID = extendedCANID;
}
public int getBaudRateOverride() {
return baudRateOverride;
}
public void setBaudRateOverride(String baudRateOverride) {
if(baudRateOverride == null) return;
int rate = Integer.parseInt(baudRateOverride);
this.baudRateOverride = rate;
}
public void setBaudRateOverride(int baudRateOverride) {
this.baudRateOverride = baudRateOverride;
}
public boolean isSaePWM() {
return saePWM;
}
public void setSaePWM(String saePWM) {
if(saePWM == null) return;
if(saePWM.toLowerCase().trim().equals("pwm")) this.saePWM = true;
else
this.saePWM = false;
}
public void setSaePWM(boolean saePWM) {
this.saePWM = saePWM;
}
public boolean isIsoKWPFast() {
return isoKWPFast;
}
public void setIsoKWPFast(String isoKWPFast) {
if(isoKWPFast == null )return;
if(isoKWPFast.toLowerCase().trim().equals("fast")) this.isoKWPFast = true;
else
this.isoKWPFast = false;
}
public void setIsoKWPFast(boolean isoKWPFast) {
this.isoKWPFast = isoKWPFast;
}
}

4
src/main/java/com/romraider/logger/ecu/definition/xml/LoggerDefinitionHandler.java
View File

@ -208,10 +208,6 @@ public final class LoggerDefinitionHandler extends DefaultHandler {
desc = attributes.getValue(ATTR_DESC);
transport = new Transport(id, name, desc);
moduleList = new ArrayList<Module>();
transport.setBaudRateOverride(attributes.getValue(ATTR_BAUD));
transport.setExtendedCANID(attributes.getValue(ATTR_CANID));
transport.setIsoKWPFast(attributes.getValue(ATTR_KWP));
transport.setSaePWM(attributes.getValue(ATTR_SAE));
} else if (TAG_MODULE.equals(qName)) {
id = attributes.getValue(ATTR_ID);
final String modAddr = attributes.getValue(ATTR_ADDRESS);