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

TS project: hide all invalid entries #1505

This commit is contained in:
rusefi 2020-06-17 18:48:48 -04:00
parent e68c68a2b6
commit e01a260552
7 changed files with 55 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
java_console/inifile/inifile.iml
View File

@ -10,5 +10,6 @@
<orderEntry type="library" exported="" name="junit" level="project" />
<orderEntry type="module" module-name="models" exported="" />
<orderEntry type="module" module-name="autoupdate" exported="" />
<orderEntry type="library" name="annotations" level="project" />
</component>
</module>

9
java_tools/configuration_definition/.idea/libraries/annotations.xml Normal file
View File

@ -0,0 +1,9 @@
<component name="libraryTable">
<library name="annotations">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../../java_console/lib/annotations.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

3
java_tools/configuration_definition/.idea/modules.xml
View File

@ -2,9 +2,12 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/../../java_console/autoupdate/autoupdate.iml" filepath="$PROJECT_DIR$/../../java_console/autoupdate/autoupdate.iml" />
<module fileurl="file://$PROJECT_DIR$/configuration_definition.iml" filepath="$PROJECT_DIR$/configuration_definition.iml" />
<module fileurl="file://$PROJECT_DIR$/../enum_to_string/enum_to_string.iml" filepath="$PROJECT_DIR$/../enum_to_string/enum_to_string.iml" />
<module fileurl="file://$PROJECT_DIR$/../../java_console/inifile/inifile.iml" filepath="$PROJECT_DIR$/../../java_console/inifile/inifile.iml" />
<module fileurl="file://$PROJECT_DIR$/../../java_console/logging/logging.iml" filepath="$PROJECT_DIR$/../../java_console/logging/logging.iml" />
<module fileurl="file://$PROJECT_DIR$/../../java_console/models/models.iml" filepath="$PROJECT_DIR$/../../java_console/models/models.iml" />
</modules>
</component>
</project>

2
java_tools/configuration_definition/configuration_definition.iml
View File

@ -8,5 +8,7 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="enum_to_string" exported="" />
<orderEntry type="library" name="annotations" level="project" />
<orderEntry type="module" module-name="inifile" />
</component>
</module>

4
java_tools/configuration_definition/src/com/rusefi/output/TSProjectConsumer.java
View File

@ -1,5 +1,6 @@
package com.rusefi.output;
import com.opensr5.ini.RawIniFile;
import com.rusefi.*;
import com.rusefi.util.LazyFile;
import com.rusefi.util.Output;
@ -60,6 +61,9 @@ public class TSProjectConsumer implements ConfigurationConsumer {
if (configField.getState().tsCustomLine.containsKey(configField.getType())) {
String bits = configField.getState().tsCustomLine.get(configField.getType());
RawIniFile.Line line = new RawIniFile.Line(bits);
tsHeader.write("\t" + addTabsUpTo(nameWithPrefix, LENGTH));
int size = configField.getState().tsCustomSize.get(configField.getType());
// tsHeader.headerWrite("\t" + size + ",");

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

@ -4,13 +4,13 @@ import com.rusefi.ConfigField;
import com.rusefi.ReaderState;
import com.rusefi.TypesHelper;
import com.rusefi.VariableRegistry;
import com.rusefi.output.ConfigurationConsumer;
import com.rusefi.output.FsioSettingsConsumer;
import com.rusefi.output.JavaFieldsConsumer;
import com.rusefi.output.TSProjectConsumer;
import org.junit.Test;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.StringReader;
import java.io.*;
import java.util.Arrays;
import java.util.Collections;
@ -34,6 +34,23 @@ public class ConfigFieldParserTest {
}
}
@Test
public void testCustomEnum() throws IOException {
String test = "struct pid_s\n" +
"#define ego_sensor_e_enum \"BPSX\", \"Innovate\", \"14Point7\"\n" +
"custom ego_sensor_e 4 bits, S32, @OFFSET@, [0:2], @@ego_sensor_e_enum@@\n" +
"ego_sensor_e afr_type;\n" +
"end_struct\n";
ReaderState state = new ReaderState();
BufferedReader reader = new BufferedReader(new StringReader(test));
CharArrayWriter writer = new CharArrayWriter();
TestTSProjectConsumer javaFieldsConsumer = new TestTSProjectConsumer(writer, "", state);
state.readBufferedReader(reader, Arrays.asList(javaFieldsConsumer));
assertEquals("\tafr_type\t\t\t\t\t = bits, S32, 0, [0:2], \"BPSX\", \"Innovate\", \"14Point7\"\n" +
"; total TS size = 4\n", new String(writer.toCharArray()));
}
@Test
public void alignFourByteTypes() throws IOException {
// we expect padding before each 4 byte field

16
java_tools/configuration_definition/src/com/rusefi/test/TestTSProjectConsumer.java Normal file
View File

@ -0,0 +1,16 @@
package com.rusefi.test;
import com.rusefi.ReaderState;
import com.rusefi.output.TSProjectConsumer;
import java.io.CharArrayWriter;
public class TestTSProjectConsumer extends TSProjectConsumer {
public TestTSProjectConsumer(CharArrayWriter writer, String s, ReaderState state) {
super(writer, s, state);
}
@Override
public void endFile() {
}
}