Skip to content

Use a TreeSet to store DTC's #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eltonvs merged 1 commit into from
Jul 13, 2017
Merged

Use a TreeSet to store DTC's #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 26 additions & 18 deletions src/main/java/com/github/pires/obd/commands/control/TroubleCodesCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

import java.io.IOException;
import java.io.InputStream;
import java.util.Set;
import java.util.TreeSet;

import com.github.pires.obd.commands.ObdCommand;
import com.github.pires.obd.enums.AvailableCommandNames;
Expand All @@ -32,7 +34,7 @@ public class TroubleCodesCommand extends ObdCommand {
/** Constant <code>hexArray="0123456789ABCDEF".toCharArray()</code> */
protected final static char[] hexArray = "0123456789ABCDEF".toCharArray();

protected StringBuilder codes = null;
protected Set<String> troubleCodes = null;

/**
* <p>
Expand All @@ -41,7 +43,7 @@ public class TroubleCodesCommand extends ObdCommand {
*/
public TroubleCodesCommand() {
super("03");
codes = new StringBuilder();
troubleCodes = new TreeSet<>();
}

/**
Expand All @@ -54,7 +56,7 @@ public TroubleCodesCommand() {
*/
public TroubleCodesCommand(TroubleCodesCommand other) {
super(other);
codes = new StringBuilder();
troubleCodes = new TreeSet<>();
}

/** {@inheritDoc} */
Expand All @@ -67,18 +69,22 @@ protected void fillBuffer() {
protected void performCalculations() {
final String result = getResult();
String workingData;
int startIndex = 0;// Header size.
int startIndex = 0; // Header size.

String canOneFrame = result.replaceAll("[\r\n]", "");
int canOneFrameLength = canOneFrame.length();
if (canOneFrameLength <= 16 && canOneFrameLength % 4 == 0) {// CAN(ISO-15765) protocol one frame.
workingData = canOneFrame;// 43yy{codes}
startIndex = 4;// Header is 43yy, yy showing the number of data items.
} else if (result.contains(":")) {// CAN(ISO-15765) protocol two and more frames.
workingData = result.replaceAll("[\r\n].:", "");// xxx43yy{codes}
startIndex = 7;// Header is xxx43yy, xxx is bytes of information to follow, yy showing the
// number of data items.
} else {// ISO9141-2, KWP2000 Fast and KWP2000 5Kbps (ISO15031) protocols.

// CAN(ISO-15765) protocol one frame.
if (canOneFrameLength <= 16 && canOneFrameLength % 4 == 0) {
workingData = canOneFrame; // 43yy{codes}
startIndex = 4; // Header is 43yy, yy showing the number of data items.
// CAN(ISO-15765) protocol two and more frames.
} else if (result.contains(":")) {
workingData = result.replaceAll("[\r\n].:", ""); // xxx43yy{codes}
startIndex = 7; // Header is xxx43yy, xxx is bytes of information to follow, yy showing the
// number of data items.
// ISO9141-2, KWP2000 Fast and KWP2000 5Kbps (ISO15031) protocols.
} else {
workingData = result.replaceAll("^43|[\r\n]43|[\r\n]", "");
}
for (int begin = startIndex; begin < workingData.length(); begin += 4) {
Expand All @@ -92,8 +98,7 @@ protected void performCalculations() {
if ("P0000".equals(dtc)) {
return;
}
codes.append(dtc);
codes.append('\n');
troubleCodes.add(dtc);
}
}

Expand All @@ -111,13 +116,17 @@ private byte hexStringToByteArray(char s) {
*/
@Deprecated
public String formatResult() {
return codes.toString();
return getCalculatedResult();
}

/** {@inheritDoc} */
@Override
public String getCalculatedResult() {
return String.valueOf(codes);
StringBuilder sb = new StringBuilder();
for (String code : troubleCodes) {
sb.append(code).append("\n");
}
return sb.toString();
}

/** {@inheritDoc} */
Expand Down Expand Up @@ -145,13 +154,12 @@ protected void readRawData(InputStream in) throws IOException {
}

rawData = res.toString().trim();

}

/** {@inheritDoc} */
@Override
public String getFormattedResult() {
return codes.toString();
return getCalculatedResult();
}

/** {@inheritDoc} */
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/github/pires/obd/commands/TroubleCodesCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@ public void twoFramesWithFourDTC() throws IOException {
expectLastCall().andReturn((byte) '>');

replayAll();
String res = "P0003\n";
String res = "B21AB\n";
res += "C1104\n";
res += "B21AB\n";
res += "P0003\n";
res += "U3106\n";

// call the method to test
Expand Down