diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar index 66d36f8e87..387cea0f97 100644 Binary files a/java_tools/ConfigDefinition.jar and b/java_tools/ConfigDefinition.jar differ diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetConfigValueConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetConfigValueConsumer.java index d3747813e2..2177551ebb 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetConfigValueConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetConfigValueConsumer.java @@ -18,7 +18,8 @@ public class GetConfigValueConsumer implements ConfigurationConsumer { private static final String CONFIG_ENGINE_CONFIGURATION = "config->engineConfiguration."; private static final String ENGINE_CONFIGURATION = "engineConfiguration."; static final String FILE_HEADER = "#include \"pch.h\"\n" + - "#include \"value_lookup.h\"\n" + + "#include \"value_lookup.h\"\n"; + private static final String FIND_METHOD = "plain_get_float_s * findFloat(const char *name) {\n" + "\tplain_get_float_s *currentF = &getF_plain[0];\n" + "\twhile (currentF < getF_plain + sizeof(getF_plain)/sizeof(getF_plain[0])) {\n" + @@ -127,6 +128,7 @@ public class GetConfigValueConsumer implements ConfigurationConsumer { public String getHeaderAndGetter() { return FILE_HEADER + getFloatsSections() + + FIND_METHOD + getComleteGetterBody(); } diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/test/GetConfigValueConsumerTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/GetConfigValueConsumerTest.java index 92d7d554cc..53247cc4c5 100644 --- a/java_tools/configuration_definition/src/test/java/com/rusefi/test/GetConfigValueConsumerTest.java +++ b/java_tools/configuration_definition/src/test/java/com/rusefi/test/GetConfigValueConsumerTest.java @@ -145,6 +145,14 @@ public class GetConfigValueConsumerTest { assertEquals("#include \"pch.h\"\n" + "#include \"value_lookup.h\"\n" + + "static plain_get_float_s getF_plain[] = {\n" + + "\t{\"clt.config.tempC_1\", &engineConfiguration->clt.config.tempC_1},\n" + + "\t{\"clt.config.map.sensor.highValue\", &engineConfiguration->clt.config.map.sensor.highValue},\n" + + "\t{\"clt.config.injector.flow\", &engineConfiguration->clt.config.injector.flow},\n" + + "\t{\"clt.config.bias_resistor\", &engineConfiguration->clt.config.bias_resistor},\n" + + "\t{\"afr_type\", &engineConfiguration->afr_type},\n" + + "};\n" + + "\n" + "plain_get_float_s * findFloat(const char *name) {\n" + "\tplain_get_float_s *currentF = &getF_plain[0];\n" + "\twhile (currentF < getF_plain + sizeof(getF_plain)/sizeof(getF_plain[0])) {\n" + @@ -155,14 +163,6 @@ public class GetConfigValueConsumerTest { "\t}\n" + "\treturn nullptr;\n" + "}\n" + - "static plain_get_float_s getF_plain[] = {\n" + - "\t{\"clt.config.tempC_1\", &engineConfiguration->clt.config.tempC_1},\n" + - "\t{\"clt.config.map.sensor.highValue\", &engineConfiguration->clt.config.map.sensor.highValue},\n" + - "\t{\"clt.config.injector.flow\", &engineConfiguration->clt.config.injector.flow},\n" + - "\t{\"clt.config.bias_resistor\", &engineConfiguration->clt.config.bias_resistor},\n" + - "\t{\"afr_type\", &engineConfiguration->afr_type},\n" + - "};\n" + - "\n" + "float getConfigValueByName(const char *name) {\n" + "\t{\n" + "\t\tplain_get_float_s * known = findFloat(name);\n" +