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

Lua to read tsOutputs #3376

This commit is contained in:
rusefillc 2021-12-14 18:25:48 -05:00
parent 8ee2f49966
commit 5ed26f1ca1
3 changed files with 25 additions and 9 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.

29
java_tools/configuration_definition/src/main/java/com/rusefi/output/GetConfigValueConsumer.java
View File

@ -14,13 +14,13 @@ import static com.rusefi.output.DataLogConsumer.UNUSED;
@SuppressWarnings("StringConcatenationInsideStringBufferAppend")
public class GetConfigValueConsumer extends AbstractConfigurationConsumer {
public static final String CONFIG_ENGINE_CONFIGURATION = "config->engineConfiguration.";
public static final String ENGINE_CONFIGURATION = "engineConfiguration.";
public static final String FILE_HEADER = "#include \"pch.h\"\n";
public static final String GET_METHOD_HEADER = "float getConfigValueByName(const char *name) {\n";
public static final String GET_METHOD_FOOTER = "\treturn EFI_ERROR_CODE;\n" + "}\n";
public static final String SET_METHOD_HEADER = "void setConfigValueByName(const char *name, float value) {\n";
public static final String SET_METHOD_FOOTER = "}\n";
private static final String CONFIG_ENGINE_CONFIGURATION = "config->engineConfiguration.";
private static final String ENGINE_CONFIGURATION = "engineConfiguration.";
private static final String FILE_HEADER = "#include \"pch.h\"\n";
private static final String GET_METHOD_HEADER = "float getConfigValueByName(const char *name) {\n";
private static final String GET_METHOD_FOOTER = "\treturn EFI_ERROR_CODE;\n" + "}\n";
private static final String SET_METHOD_HEADER = "void setConfigValueByName(const char *name, float value) {\n";
private static final String SET_METHOD_FOOTER = "}\n";
private final StringBuilder getterBody = new StringBuilder();
private final StringBuilder setterBody = new StringBuilder();
private final String outputFIleName;
@ -79,14 +79,25 @@ public class GetConfigValueConsumer extends AbstractConfigurationConsumer {
if (TypesHelper.isFloat(cf.getType())) {
setterBody.append(getCompareName(userName));
setterBody.append("\t{\n" + "\t\t" + javaName + cf.getName() + " = value;\n" +
"\t\treturn;\n\t}\n");
String str = getAssignment(cf, javaName, "");
setterBody.append(str);
} else {
setterBody.append(getCompareName(userName));
String str = getAssignment(cf, javaName, "(int)");
setterBody.append(str);
}
return "";
}
@NotNull
private String getAssignment(ConfigField cf, String javaName, String cast) {
return "\t{\n" + "\t\t" + javaName + cf.getName() + " = " + cast +
"value;\n" +
"\t\treturn;\n\t}\n";
}
@NotNull
private String getCompareName(String userName) {
return "\tif (strEqualCaseInsensitive(name, \"" + userName + "\"))\n";

5
java_tools/configuration_definition/src/main/java/com/rusefi/test/OutputsTest.java
View File

@ -156,6 +156,11 @@ public class OutputsTest {
"\t{\n" +
"\t\tconfig->iat.config.tempC_1 = value;\n" +
"\t\treturn;\n" +
"\t}\n" +
"\tif (strEqualCaseInsensitive(name, \"iat.adcChannel\"))\n" +
"\t{\n" +
"\t\tconfig->iat.adcChannel = (int)value;\n" +
"\t\treturn;\n" +
"\t}\n", getConfigValueConsumer.getSetterBody());
assertEquals("#include \"pch.h\"\n" +