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

progress or bug? I am very confused

This commit is contained in:
rusefillc 2024-11-09 10:47:13 -05:00
parent 2dfff3a3e9
commit 416c11423c
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
reader/src/main/java/com/rusefi/can/reader/dbc/DbcField.java
View File

@ -149,8 +149,18 @@ public class DbcField {
public boolean coversByte(int byteIndex) { public boolean coversByte(int byteIndex) {
int startBit = byteIndex * 8; int startBit = byteIndex * 8;
if (isBigEndian && /* byte endianess less important for one byte fields */ length > 8)
startBit += 8; if (isBigEndian) {
if (!DbcFile.compatibilityWithBrokenRusEfiLogic) {
startBit = DbcField.crazyMotorolaMath(startBit, length, true);
} else {
if (/* byte endianess less important for one byte fields */ length > 8) {
startBit += 8;
}
}
}
if (startOffset > startBit) if (startOffset > startBit)
return false; return false;
return startOffset + length >= startBit + 8; return startOffset + length >= startBit + 8;

11
reader/src/test/java/com/rusefi/can/reader/dbc/DbcFieldTest.java
View File

@ -10,12 +10,13 @@ public class DbcFieldTest {
@Test @Test
public void testBigEndian() { public void testBigEndian() {
{ {
// todo: sorry I do not trust this test :(
compatibilityWithBrokenRusEfiLogic = false; compatibilityWithBrokenRusEfiLogic = false;
DbcField field = create(true); DbcField field = create(true);
assertFalse(field.coversByte(0));
assertFalse(field.coversByte(1)); assertFalse(field.coversByte(1));
assertFalse(field.coversByte(2)); assertFalse(field.coversByte(2));
assertTrue(field.coversByte(3)); assertFalse(field.coversByte(3));
assertFalse(field.coversByte(0));
} }
{ {
compatibilityWithBrokenRusEfiLogic = true; compatibilityWithBrokenRusEfiLogic = true;
@ -28,7 +29,11 @@ public class DbcFieldTest {
} }
private static DbcField create(boolean isBigEndian) { private static DbcField create(boolean isBigEndian) {
return new DbcField("", 8, 16, 1, 0, null, isBigEndian); int startBit = 8;
int length = 16;
startBit = DbcField.crazyMotorolaMath(startBit, length, isBigEndian);
return new DbcField("", startBit, length, 1, 0, null, isBigEndian);
} }
@Test @Test

4
reader/src/test/java/com/rusefi/can/reader/impl/ParseDBCTest.java
View File

@ -123,7 +123,6 @@ public class ParseDBCTest {
DbcFile dbc = new DbcFile(false); DbcFile dbc = new DbcFile(false);
DbcFile.compatibilityWithBrokenRusEfiLogic = false;
dbc.read(reader); dbc.read(reader);
assertEquals(dbc.packets.size(), 1); assertEquals(dbc.packets.size(), 1);
@ -136,14 +135,11 @@ public class ParseDBCTest {
@Test @Test
public void crazyMotorola() { public void crazyMotorola() {
DbcFile.compatibilityWithBrokenRusEfiLogic = false;
assertEquals(24, DbcField.crazyMotorolaMath(27, 4, true)); assertEquals(24, DbcField.crazyMotorolaMath(27, 4, true));
assertEquals(24, DbcField.crazyMotorolaMath(30, 7, true)); assertEquals(24, DbcField.crazyMotorolaMath(30, 7, true));
assertEquals(24, DbcField.crazyMotorolaMath(31, 8, true)); assertEquals(24, DbcField.crazyMotorolaMath(31, 8, true));
assertEquals(24, DbcField.crazyMotorolaMath(17, 10, true)); assertEquals(24, DbcField.crazyMotorolaMath(17, 10, true));
assertEquals(24, DbcField.crazyMotorolaMath(17, 10, true)); assertEquals(24, DbcField.crazyMotorolaMath(17, 10, true));
} }
} }