diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar index 29d122d182..08919ec836 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/ConfigDefinition.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java index 21a9aa667f..fbd92cd5a1 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java @@ -187,18 +187,18 @@ public class ConfigDefinition { // Load prepend files { // Ignore duplicates of definitions made during prepend phase - parseState.setDefinitionPolicy(Definition.OverwritePolicy.IgnoreNew); +// parseState.setDefinitionPolicy(Definition.OverwritePolicy.IgnoreNew); for (String prependFile : state.prependFiles) { - RusefiParseErrorStrategy.parseDefinitionFile(parseState.getListener(), prependFile); +// RusefiParseErrorStrategy.parseDefinitionFile(parseState.getListener(), prependFile); } } // Now load the main config file { // don't allow duplicates in the main file - parseState.setDefinitionPolicy(Definition.OverwritePolicy.NotAllowed); - RusefiParseErrorStrategy.parseDefinitionFile(parseState.getListener(), state.definitionInputFile); +// parseState.setDefinitionPolicy(Definition.OverwritePolicy.NotAllowed); +// RusefiParseErrorStrategy.parseDefinitionFile(parseState.getListener(), state.definitionInputFile); } // Write C structs diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigFieldParserTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigFieldParserTest.java index 1e522003bf..21915a1c79 100644 --- a/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigFieldParserTest.java +++ b/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigFieldParserTest.java @@ -50,14 +50,14 @@ public class ConfigFieldParserTest { @Test public void testFloatMsAlias() { String test = "struct pid_s\n" + - "floatms_t afr_type;PID dTime;\"ms\", 1.0, 0, 0, 3000, 0\n" + + "floatms_t afr_type;PID dTime;\"ms\", 1.0, 0, 0, 3000, 0, noMsqSave\n" + "percent_t afr_typet;PID dTime;\"ms\", 1, 0, 0, 3000, 0\n" + "end_struct\n"; ReaderState state = new ReaderState(); TestTSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer("", state); state.readBufferedReader(test, tsProjectConsumer); - assertEquals("afr_type = scalar, F32, 0, \"ms\", 1, 0, 0, 3000, 0\n" + + assertEquals("afr_type = scalar, F32, 0, \"ms\", 1, 0, 0, 3000, 0, noMsqSave\n" + "afr_typet = scalar, F32, 4, \"ms\", 1, 0, 0, 3000, 0\n" + "; total TS size = 8\n", tsProjectConsumer.getContent()); }