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

inverting boolean, also better name

This commit is contained in:
rusefillc 2025-04-27 13:06:50 -04:00
parent 87a8ac1ca5
commit 2dfff3a3e9
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,7 @@ public class DbcField {
} }
public static int crazyMotorolaMath(int b, int length, boolean isBigEndian) { public static int crazyMotorolaMath(int b, int length, boolean isBigEndian) {
if (!DbcFile.applyOrderForStartOffset || !isBigEndian) if (DbcFile.compatibilityWithBrokenRusEfiLogic || !isBigEndian)
return b; return b;
// https://github.com/ebroecker/canmatrix/wiki/signal-Byteorder // https://github.com/ebroecker/canmatrix/wiki/signal-Byteorder

2
reader/src/main/java/com/rusefi/can/reader/dbc/DbcFile.java
View File

@ -17,7 +17,7 @@ public class DbcFile {
* problem: looks like some DBC files which were created by AndreyB manually were invalid * problem: looks like some DBC files which were created by AndreyB manually were invalid
* this flag is technical debt of conversion from bad DBC into legit DBC * this flag is technical debt of conversion from bad DBC into legit DBC
*/ */
public static boolean applyOrderForStartOffset = true; public static boolean compatibilityWithBrokenRusEfiLogic;
private List<BinaryLogEntry> list; private List<BinaryLogEntry> list;

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

@ -2,7 +2,7 @@ package com.rusefi.can.reader.dbc;
import org.junit.Test; import org.junit.Test;
import static com.rusefi.can.reader.dbc.DbcFile.applyOrderForStartOffset; import static com.rusefi.can.reader.dbc.DbcFile.compatibilityWithBrokenRusEfiLogic;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
@ -10,7 +10,7 @@ public class DbcFieldTest {
@Test @Test
public void testBigEndian() { public void testBigEndian() {
{ {
applyOrderForStartOffset = true; compatibilityWithBrokenRusEfiLogic = false;
DbcField field = create(true); DbcField field = create(true);
assertFalse(field.coversByte(1)); assertFalse(field.coversByte(1));
assertFalse(field.coversByte(2)); assertFalse(field.coversByte(2));
@ -18,13 +18,13 @@ public class DbcFieldTest {
assertFalse(field.coversByte(0)); assertFalse(field.coversByte(0));
} }
{ {
applyOrderForStartOffset = false; compatibilityWithBrokenRusEfiLogic = true;
DbcField field = create(true); DbcField field = create(true);
assertTrue(field.coversByte(0)); assertTrue(field.coversByte(0));
assertTrue(field.coversByte(1)); assertTrue(field.coversByte(1));
assertFalse(field.coversByte(3)); assertFalse(field.coversByte(3));
} }
applyOrderForStartOffset = true; compatibilityWithBrokenRusEfiLogic = false;
} }
private static DbcField create(boolean isBigEndian) { private static DbcField create(boolean isBigEndian) {

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

@ -8,7 +8,6 @@ import org.junit.Test;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.StringReader; import java.io.StringReader;
import java.util.ArrayList;
import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertEquals;
import static org.junit.Assert.*; import static org.junit.Assert.*;
@ -124,7 +123,7 @@ public class ParseDBCTest {
DbcFile dbc = new DbcFile(false); DbcFile dbc = new DbcFile(false);
DbcFile.applyOrderForStartOffset = true; DbcFile.compatibilityWithBrokenRusEfiLogic = false;
dbc.read(reader); dbc.read(reader);
assertEquals(dbc.packets.size(), 1); assertEquals(dbc.packets.size(), 1);
@ -137,7 +136,7 @@ public class ParseDBCTest {
@Test @Test
public void crazyMotorola() { public void crazyMotorola() {
DbcFile.applyOrderForStartOffset = true; 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));