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

binary math is hard

This commit is contained in:
rusefi 2020-05-23 00:24:50 -04:00
parent 4a4b23754f
commit a678933262
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java_console/inifile/src/com/opensr5/ini/field/EnumIniField.java
View File

@ -48,7 +48,7 @@ public class EnumIniField extends IniField {
public static int getBitRange(int ordinal, int bitPosition, int bitSize) {
ordinal = ordinal >> bitPosition;
ordinal = ordinal & (1 << bitSize);
ordinal = ordinal & ((1 << (bitSize + 1)) - 1);
return ordinal;
}

5
java_console/inifile/src/com/opensr5/ini/test/IniFileReaderTest.java
View File

@ -103,6 +103,11 @@ public class IniFileReaderTest {
@Test
public void testBitLogic() {
assertEquals(4, EnumIniField.getBitRange(4, 0, 7));
assertEquals(4, EnumIniField.getBitRange(4, 0, 2));
assertEquals(0, EnumIniField.getBitRange(4, 0, 1));
assertEquals(3, EnumIniField.getBitRange(7, 0, 1));
assertEquals(1, EnumIniField.getBitRange(0xff, 0, 0));
assertEquals(1, EnumIniField.getBitRange(0xf0, 4, 0));