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

GrowingValuesScanner

This commit is contained in:
rusEFI LLC 2024-04-27 22:23:17 -04:00
parent 432bfc156e
commit cc3e6ebda6
3 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
reader/src/main/java/com/rusefi/can/analysis/ByteRateOfChangeReports.java
View File

@ -124,7 +124,8 @@ public class ByteRateOfChangeReports {
CounterScanner.scanForCounters(dbc, reportDestinationFolder, simpleFileName, logFileContent);
ChecksumScanner.scanForChecksums(reportDestinationFolder, simpleFileName, logFileContent);
GrowingValuesScanner.scanForGrowing(dbc, simpleFileName, logFileContent, reportDestinationFolder);
GrowingValuesScanner.scanForGrowing(dbc, simpleFileName, logFileContent, reportDestinationFolder, 1);
GrowingValuesScanner.scanForGrowing(dbc, simpleFileName, logFileContent, reportDestinationFolder, 20);
CanToMegaLogViewer.createMegaLogViewer(reportDestinationFolder, logFileContent, simpleFileName);

19
reader/src/main/java/com/rusefi/can/analysis/GrowingValuesScanner.java
View File

@ -11,16 +11,16 @@ import java.util.Map;
import java.util.TreeMap;
public class GrowingValuesScanner {
public static void scanForGrowing(DbcFile dbc, String simpleFileName, List<CANPacket> packets, String reportDestinationFolder) throws IOException {
String outputFileName = reportDestinationFolder + File.separator + simpleFileName + "_growing.txt";
public static void scanForGrowing(DbcFile dbc, String simpleFileName, List<CANPacket> packets, String reportDestinationFolder, int delta) throws IOException {
String outputFileName = reportDestinationFolder + File.separator + simpleFileName + "_" + delta + "_growing.txt";
try (PrintWriter pw = new PrintWriter(new FileOutputStream(outputFileName))) {
runScanner(dbc, packets, pw);
runScanner(dbc, packets, pw, delta);
}
}
private static void runScanner(DbcFile dbc, List<CANPacket> packets, PrintWriter pw) {
Map<ByteRateOfChange.ByteId, ByteState> states = runScanner(packets);
private static void runScanner(DbcFile dbc, List<CANPacket> packets, PrintWriter pw, int delta) {
Map<ByteRateOfChange.ByteId, ByteState> states = runScanner(packets, delta);
for (ByteState state : states.values()) {
if (state.isIncrementByte()) {
@ -31,7 +31,7 @@ public class GrowingValuesScanner {
if (packet != null) {
DbcField field = packet.getFieldAtByte(state.byteId.byteIndex);
if (field != null)
key += field.getName() + " ";
key += " " + field.getName();
}
pw.println(key + " only increments at " + state.byteId.byteIndex + " last value " + state.value);
}
@ -39,7 +39,7 @@ public class GrowingValuesScanner {
}
public static Map<ByteRateOfChange.ByteId, ByteState> runScanner(List<CANPacket> packets) {
public static Map<ByteRateOfChange.ByteId, ByteState> runScanner(List<CANPacket> packets, int delta) {
Map<ByteRateOfChange.ByteId, ByteState> states = new TreeMap<>();
@ -59,7 +59,10 @@ public class GrowingValuesScanner {
continue;
}
boolean isIncrement = state.value + 1 == byteValue;
int actualDelta = (byteValue - state.value) & 0xFF;
boolean isIncrement = actualDelta <= delta;
state.withIncrement = state.withIncrement || isIncrement;
state.badChange = state.badChange || !isIncrement;

21
reader/src/test/java/com/rusefi/can/analysis/GrowingValuesScannerTest.java
View File

@ -19,7 +19,7 @@ public class GrowingValuesScannerTest {
new CANPacket(0, id, new byte[]{3,1,0}),
new CANPacket(0, id, new byte[]{4,1,0}),
new CANPacket(0, id, new byte[]{3,2,0})
));
), 1);
assertEquals(3, result.size());
List<GrowingValuesScanner.ByteState> list = new ArrayList<>(result.values());
@ -28,4 +28,23 @@ public class GrowingValuesScannerTest {
assertTrue(list.get(1).isIncrementByte());
assertFalse(list.get(2).isIncrementByte());
}
@Test
public void testDelta() {
int id = 13;
Map<ByteRateOfChange.ByteId, GrowingValuesScanner.ByteState> result = GrowingValuesScanner.runScanner(Arrays.asList(
new CANPacket(0, id, new byte[]{3, (byte) 250,0}),
new CANPacket(0, id, new byte[]{4,3,0}),
new CANPacket(0, id, new byte[]{3,12,0})
), 20);
assertEquals(3, result.size());
List<GrowingValuesScanner.ByteState> list = new ArrayList<>(result.values());
assertFalse(list.get(0).isIncrementByte());
assertTrue(list.get(1).isIncrementByte());
assertFalse(list.get(2).isIncrementByte());
}
}