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

progress

This commit is contained in:
rusefi 2020-08-04 22:51:27 -04:00
parent 5a83645e8c
commit b4a8d25909
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
java_tools/ConfigDefinition.jar
View File

Binary file not shown.

10
java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java
View File

@ -17,7 +17,8 @@ import static com.rusefi.ReaderState.MULT_TOKEN;
public class VariableRegistry { public class VariableRegistry {
private static final String _16_HEX_SUFFIX = "_16_hex"; private static final String _16_HEX_SUFFIX = "_16_hex";
private static final String _HEX_SUFFIX = "_hex"; private static final String _HEX_SUFFIX = "_hex";
private TreeMap<String, String> data = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); private static final String HEX_PREFIX = "0x";
private final TreeMap<String, String> data = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
public static final VariableRegistry INSTANCE = new VariableRegistry(); public static final VariableRegistry INSTANCE = new VariableRegistry();
private final Pattern VAR = Pattern.compile("(@@(.*?)@@)"); private final Pattern VAR = Pattern.compile("(@@(.*?)@@)");
@ -85,6 +86,13 @@ public class VariableRegistry {
@SuppressWarnings("StringConcatenationInsideStringBufferAppend") @SuppressWarnings("StringConcatenationInsideStringBufferAppend")
private void tryToRegisterAsInteger(String var, String value) { private void tryToRegisterAsInteger(String var, String value) {
if (value.trim().startsWith(HEX_PREFIX)) {
int intValue = Integer.parseInt(value.trim().substring(HEX_PREFIX.length()), 16);
intValues.put(var, intValue);
javaDefinitions.put(var, "\tpublic static final int " + var + " = " + intValue + ";" + EOL);
return;
}
try { try {
int intValue = Integer.parseInt(value); int intValue = Integer.parseInt(value);
SystemOut.println("key [" + var + "] value: " + intValue); SystemOut.println("key [" + var + "] value: " + intValue);

4
java_tools/configuration_definition/src/com/rusefi/test/ConfigFieldParserTest.java
View File

@ -134,7 +134,9 @@ public class ConfigFieldParserTest {
JavaFieldsConsumer javaFieldsConsumer = new TestJavaFieldsConsumer(state); JavaFieldsConsumer javaFieldsConsumer = new TestJavaFieldsConsumer(state);
state.readBufferedReader(reader, Arrays.asList(javaFieldsConsumer)); state.readBufferedReader(reader, Arrays.asList(javaFieldsConsumer));
assertEquals("\tpublic static final int ERROR_BUFFER_SIZE = 120;\n", assertEquals("\tpublic static final int ERROR_BUFFER_SIZE = 120;\n" +
"\tpublic static final int ERROR_BUFFER_SIZE_H = 288;\n" +
"",
VariableRegistry.INSTANCE.getJavaConstants()); VariableRegistry.INSTANCE.getJavaConstants());
} }