rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1 byte issue in TuneReadWriteTest #1512 

fixing first issue
This commit is contained in:
rusefi 2020-06-18 11:51:52 -04:00
parent f33189db69
commit 647a672aa6
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
java_console/inifile/src/com/rusefi/config/Field.java
View File

@ -159,12 +159,18 @@ public class Field {
if (bitOffset != NO_BIT_OFFSET) { if (bitOffset != NO_BIT_OFFSET) {
int packed = wrapped.getInt(); int packed = wrapped.getInt();
value = (packed >> bitOffset) & 1; value = (packed >> bitOffset) & 1;
} else if (type == INT8 || type == UINT8) { } else if (type == INT8) {
value = wrapped.get(); value = wrapped.get();
} else if (type == UINT8) {
byte signed = wrapped.get();
value = signed & 0xFF;
} else if (type == INT) { } else if (type == INT) {
value = wrapped.getInt(); value = wrapped.getInt();
} else if (type == INT16 || type == UINT16) { } else if (type == INT16) {
value = wrapped.getShort(); value = wrapped.getShort();
} else if (type == UINT16) {
short signed = wrapped.getShort();
value = signed & 0xFFFF;
} else { } else {
value = wrapped.getFloat(); value = wrapped.getFloat();
} }

3
java_console/ui/src/test/java/com/rusefi/ui/TuneReadWriteTest.java
View File

@ -57,8 +57,7 @@ public class TuneReadWriteTest {
ConfigurationImage binaryDataFromXml = tuneFromFile.asImage(IniFileModel.getInstance()); ConfigurationImage binaryDataFromXml = tuneFromFile.asImage(IniFileModel.getInstance());
// todo: why one byte mismatch? since it's in floats I kind of do not care, floats are weird assertEquals(0, compareImages(originalBinaryData, binaryDataFromXml));
assertEquals(1, compareImages(originalBinaryData, binaryDataFromXml));
Files.delete(path); Files.delete(path);
} }