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

Disabling inactive code for now

This commit is contained in:
rusefillc 2022-11-21 21:31:02 -05:00 committed by rusefillc
parent b6245aa68b
commit a10de1ab1b
3 changed files with 6 additions and 6 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.

8
java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java
View File

@ -187,18 +187,18 @@ public class ConfigDefinition {
// Load prepend files // Load prepend files
{ {
// Ignore duplicates of definitions made during prepend phase // Ignore duplicates of definitions made during prepend phase
parseState.setDefinitionPolicy(Definition.OverwritePolicy.IgnoreNew); // parseState.setDefinitionPolicy(Definition.OverwritePolicy.IgnoreNew);
for (String prependFile : state.prependFiles) { for (String prependFile : state.prependFiles) {
RusefiParseErrorStrategy.parseDefinitionFile(parseState.getListener(), prependFile); // RusefiParseErrorStrategy.parseDefinitionFile(parseState.getListener(), prependFile);
} }
} }
// Now load the main config file // Now load the main config file
{ {
// don't allow duplicates in the main file // don't allow duplicates in the main file
parseState.setDefinitionPolicy(Definition.OverwritePolicy.NotAllowed); // parseState.setDefinitionPolicy(Definition.OverwritePolicy.NotAllowed);
RusefiParseErrorStrategy.parseDefinitionFile(parseState.getListener(), state.definitionInputFile); // RusefiParseErrorStrategy.parseDefinitionFile(parseState.getListener(), state.definitionInputFile);
} }
// Write C structs // Write C structs

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

@ -50,14 +50,14 @@ public class ConfigFieldParserTest {
@Test @Test
public void testFloatMsAlias() { public void testFloatMsAlias() {
String test = "struct pid_s\n" + 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" + "percent_t afr_typet;PID dTime;\"ms\", 1, 0, 0, 3000, 0\n" +
"end_struct\n"; "end_struct\n";
ReaderState state = new ReaderState(); ReaderState state = new ReaderState();
TestTSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer("", state); TestTSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer("", state);
state.readBufferedReader(test, tsProjectConsumer); 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" + "afr_typet = scalar, F32, 4, \"ms\", 1, 0, 0, 3000, 0\n" +
"; total TS size = 8\n", tsProjectConsumer.getContent()); "; total TS size = 8\n", tsProjectConsumer.getContent());
} }