ByteRateOfChangeReports shows relevant byte
This commit is contained in:
parent
6a04166862
commit
e795581f6a
|
@ -3,6 +3,7 @@ package com.rusefi.can.analysis;
|
||||||
import com.rusefi.can.CANPacket;
|
import com.rusefi.can.CANPacket;
|
||||||
import com.rusefi.can.Launcher;
|
import com.rusefi.can.Launcher;
|
||||||
import com.rusefi.can.reader.CANLineReader;
|
import com.rusefi.can.reader.CANLineReader;
|
||||||
|
import com.rusefi.can.reader.dbc.DbcField;
|
||||||
import com.rusefi.can.reader.dbc.DbcFile;
|
import com.rusefi.can.reader.dbc.DbcFile;
|
||||||
import com.rusefi.can.reader.dbc.DbcPacket;
|
import com.rusefi.can.reader.dbc.DbcPacket;
|
||||||
import com.rusefi.util.FolderUtil;
|
import com.rusefi.util.FolderUtil;
|
||||||
|
@ -55,6 +56,9 @@ public class ByteRateOfChangeReports {
|
||||||
DbcPacket packet = dbc.packets.get(id.sid);
|
DbcPacket packet = dbc.packets.get(id.sid);
|
||||||
if (packet != null) {
|
if (packet != null) {
|
||||||
prefix = packet.getName() + " ";
|
prefix = packet.getName() + " ";
|
||||||
|
DbcField field = packet.getFieldAtByte(id.byteIndex);
|
||||||
|
if (field != null)
|
||||||
|
prefix += field.getName() + " ";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -128,7 +128,7 @@ public class DbcField {
|
||||||
int startBit = byteIndex * 8;
|
int startBit = byteIndex * 8;
|
||||||
if (startOffset > startBit)
|
if (startOffset > startBit)
|
||||||
return false;
|
return false;
|
||||||
if (startOffset + length < byteIndex + 8)
|
if (startOffset + length < startBit + 8)
|
||||||
return false;
|
return false;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -58,6 +58,8 @@ public class GetValueFromTrcTest {
|
||||||
DbcField byte1 = packet640.getFieldAtByte(1);
|
DbcField byte1 = packet640.getFieldAtByte(1);
|
||||||
assertNotNull(byte1);
|
assertNotNull(byte1);
|
||||||
assertEquals("inneres_Motor_Moment", byte1.getName());
|
assertEquals("inneres_Motor_Moment", byte1.getName());
|
||||||
|
DbcField byte4 = packet640.getFieldAtByte(4);
|
||||||
|
assertNotNull(byte4);
|
||||||
assertNull(dbc.findPacket(1640));
|
assertNull(dbc.findPacket(1640));
|
||||||
|
|
||||||
String trcLine = " 3769) 2117.7 Rx 0280 8 01 1D DF 12 1E 00 1A 1E ";
|
String trcLine = " 3769) 2117.7 Rx 0280 8 01 1D DF 12 1E 00 1A 1E ";
|
||||||
|
|
Loading…
Reference in New Issue