From ce091f277835975bee6e73ceb2886a8943628f9d Mon Sep 17 00:00:00 2001 From: rusefi Date: Tue, 4 Aug 2020 23:18:35 -0400 Subject: [PATCH] progress --- firmware/integration/rusefi_config.txt | 1 - java_tools/ConfigDefinition.jar | Bin 1767073 -> 1767065 bytes .../src/com/rusefi/VariableRegistry.java | 2 +- .../rusefi/test/ConfigFieldParserTest.java | 2 +- 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 377a4a064b..88ed2b32af 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1659,7 +1659,6 @@ end_struct #define TS_SD_PROTOCOL_REMOVE_FILE 6 #define TS_SD_PROTOCOL_FETCH_COMPRESSED 8 - // High speed logger commands #define TS_SET_LOGGER_SWITCH 'l' #define TS_GET_LOGGER_GET_BUFFER 'L' diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar index 3dec6e2cd5997cd559fd916c39015cb93ac47def..a98293cf14b4308e6edec4a678f1f39ede1f451f 100644 GIT binary patch delta 39261 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 Y%9ITom+-L^)+APx4}-634*{|N2M>~tkN^Mx diff --git a/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java b/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java index 635ae9c409..20a376eb5f 100644 --- a/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java +++ b/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java @@ -89,7 +89,7 @@ public class VariableRegistry { 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); + javaDefinitions.put(var, "\tpublic static final int " + var + " = " + value + ";" + EOL); return; } diff --git a/java_tools/configuration_definition/src/com/rusefi/test/ConfigFieldParserTest.java b/java_tools/configuration_definition/src/com/rusefi/test/ConfigFieldParserTest.java index faa4dc4ec4..61c16ce569 100644 --- a/java_tools/configuration_definition/src/com/rusefi/test/ConfigFieldParserTest.java +++ b/java_tools/configuration_definition/src/com/rusefi/test/ConfigFieldParserTest.java @@ -135,7 +135,7 @@ public class ConfigFieldParserTest { state.readBufferedReader(reader, Arrays.asList(javaFieldsConsumer)); assertEquals("\tpublic static final int ERROR_BUFFER_SIZE = 120;\n" + - "\tpublic static final int ERROR_BUFFER_SIZE_H = 288;\n" + + "\tpublic static final int ERROR_BUFFER_SIZE_H = 0x120;\n" + "", VariableRegistry.INSTANCE.getJavaConstants()); }