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

progress with _hex and _16_hex

This commit is contained in:
rusefi 2020-05-22 01:23:38 -04:00
parent ff4eb5ba98
commit f4169b0819
4 changed files with 28 additions and 4 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.

7
java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java
View File

@ -288,7 +288,12 @@ public class ConfigDefinition {
name = line.substring(0, index);
line = line.substring(index).trim();
}
VariableRegistry.INSTANCE.register(name, line);
if (VariableRegistry.isNumeric(line)) {
Integer v = Integer.valueOf(line);
VariableRegistry.INSTANCE.register(name, v);
} else {
VariableRegistry.INSTANCE.register(name, line);
}
}
private static String getMd5(byte[] content) {

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

@ -15,6 +15,8 @@ import static com.rusefi.ReaderState.MULT_TOKEN;
* 3/30/2015
*/
public class VariableRegistry {
private static final String _16_HEX_SUFFIX = "_16_hex";
private static final String _HEX_SUFFIX = "_hex";
private TreeMap<String, String> data = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
public static final VariableRegistry INSTANCE = new VariableRegistry();
@ -69,18 +71,31 @@ public class VariableRegistry {
if (!value.contains("\n")) {
// multi-lines are not supported in C headers
cAllDefinitions.put(var, "#define " + var + " " + value + EOL);
if (!var.endsWith(_16_HEX_SUFFIX) && !var.endsWith(_HEX_SUFFIX)) {
cAllDefinitions.put(var, "#define " + var + " " + value + EOL);
}
}
tryToRegisterAsInteger(var, value);
}
public static boolean isNumeric(String str) {
try {
Integer.parseInt(str);
return true;
} catch (NumberFormatException e) {
return false;
}
}
@SuppressWarnings("StringConcatenationInsideStringBufferAppend")
private void tryToRegisterAsInteger(String var, String value) {
try {
int intValue = Integer.parseInt(value);
SystemOut.println("key [" + var + "] value: " + intValue);
intValues.put(var, intValue);
javaDefinitions.put(var, "\tpublic static final int " + var + " = " + intValue + ";" + EOL);
if (!var.endsWith(_HEX_SUFFIX)) {
javaDefinitions.put(var, "\tpublic static final int " + var + " = " + intValue + ";" + EOL);
}
} catch (NumberFormatException e) {
SystemOut.println("Not an integer: " + value);
@ -105,7 +120,9 @@ public class VariableRegistry {
*/
public void register(String name, int value) {
register(name, Integer.toString(value));
register(name + "_hex", Integer.toString(value, 16));
register(name + _HEX_SUFFIX, Integer.toString(value, 16));
String _16_hex = String.format("\\\\x%02x\\\\x%02x", (value >> 8) & 0xFF, value & 0xFF);
register(name + _16_HEX_SUFFIX, _16_hex);
}
public void writeDefinesToFile(String fileName) throws IOException {

2
java_tools/configuration_definition/src/com/rusefi/test/VariableRegistryTest.java
View File

@ -21,5 +21,7 @@ public class VariableRegistryTest {
assertEquals("ab256cd", VariableRegistry.INSTANCE.applyVariables("ab@@var@@cd"));
// both decimal and hex values here
assertEquals("aa256qwe100fff", VariableRegistry.INSTANCE.applyVariables("aa@@var@@qwe@@var_hex@@fff"));
assertEquals("\\x01\\x00", VariableRegistry.INSTANCE.applyVariables("@@var_16_hex@@"));
}
}