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 16:04:18 -05:00
parent 5d112a29ca
commit 5854cbb75e
3 changed files with 47 additions and 12 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.

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

@ -3,6 +3,7 @@ package com.rusefi.output;
import com.rusefi.ConfigField;
import com.rusefi.ReaderState;
import com.rusefi.TypesHelper;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.FileWriter;
@ -15,7 +16,13 @@ import static com.rusefi.output.DataLogConsumer.UNUSED;
public class GetConfigValueConsumer extends AbstractConfigurationConsumer {
public static final String CONFIG_ENGINE_CONFIGURATION = "config->engineConfiguration.";
public static final String ENGINE_CONFIGURATION = "engineConfiguration.";
private final StringBuilder content = new StringBuilder();
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 final StringBuilder getterBody = new StringBuilder();
private final StringBuilder setterBody = new StringBuilder();
private final String outputFIleName;
public GetConfigValueConsumer(String outputFIleName) {
@ -42,15 +49,11 @@ public class GetConfigValueConsumer extends AbstractConfigurationConsumer {
@Override
public void startFile() {
content.append("#include \"pch.h\"\n");
content.append("float getConfigValueByName(const char *name) {\n");
}
@Override
public void endFile() throws IOException {
content.append("\treturn EFI_ERROR_CODE;\n");
content.append("}\n");
writeStringToFile(outputFIleName, content.toString());
writeStringToFile(outputFIleName, getContent());
}
private String process(ReaderState readerState, ConfigField cf, String prefix) {
@ -66,17 +69,43 @@ public class GetConfigValueConsumer extends AbstractConfigurationConsumer {
String userName = prefix + cf.getName();
if (userName.startsWith(ENGINE_CONFIGURATION))
userName = userName.substring(ENGINE_CONFIGURATION.length());
content.append("\tif (strEqualCaseInsensitive(name, \"" + userName + "\"))\n");
String javaName = "config->" + prefix;
if (javaName.startsWith(CONFIG_ENGINE_CONFIGURATION))
javaName = "engineConfiguration->" + javaName.substring(CONFIG_ENGINE_CONFIGURATION.length());
content.append("\t\treturn " + javaName + cf.getName() + ";\n");
getterBody.append(getCompareName(userName));
getterBody.append("\t\treturn " + javaName + cf.getName() + ";\n");
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");
}
return "";
}
@NotNull
private String getCompareName(String userName) {
return "\tif (strEqualCaseInsensitive(name, \"" + userName + "\"))\n";
}
public String getGetterForUnitTest() {
return FILE_HEADER +
GET_METHOD_HEADER + getterBody + GET_METHOD_FOOTER;
}
public String getSetterBody() {
return setterBody.toString();
}
public String getContent() {
return content.toString();
return FILE_HEADER +
GET_METHOD_HEADER + getterBody + GET_METHOD_FOOTER
+
SET_METHOD_HEADER + setterBody + SET_METHOD_FOOTER
;
}
}

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

@ -132,7 +132,7 @@ public class OutputsTest {
assertEquals("#include \"pch.h\"\n" +
"float getConfigValueByName(const char *name) {\n" +
"\treturn EFI_ERROR_CODE;\n" +
"}\n", getConfigValueConsumer.getContent());
"}\n", getConfigValueConsumer.getGetterForUnitTest());
}
@Test
@ -152,6 +152,12 @@ public class OutputsTest {
GetConfigValueConsumer getConfigValueConsumer = new GetConfigValueConsumer(null);
state.readBufferedReader(test, Collections.singletonList(getConfigValueConsumer));
assertEquals("\tif (strEqualCaseInsensitive(name, \"iat.config.tempC_1\"))\n" +
"\t{\n" +
"\t\tconfig->iat.config.tempC_1 = value;\n" +
"\t\treturn;\n" +
"\t}\n", getConfigValueConsumer.getSetterBody());
assertEquals("#include \"pch.h\"\n" +
"float getConfigValueByName(const char *name) {\n" +
"\tif (strEqualCaseInsensitive(name, \"iat.config.tempC_1\"))\n" +
@ -159,7 +165,7 @@ public class OutputsTest {
"\tif (strEqualCaseInsensitive(name, \"iat.adcChannel\"))\n" +
"\t\treturn config->iat.adcChannel;\n" +
"\treturn EFI_ERROR_CODE;\n" +
"}\n", getConfigValueConsumer.getContent());
"}\n", getConfigValueConsumer.getGetterForUnitTest());
}
@Test
@ -242,7 +248,7 @@ public class OutputsTest {
"\tif (strEqualCaseInsensitive(name, \"vehicleSpeedKph\"))\n" +
"\t\treturn config->vehicleSpeedKph;\n" +
"\treturn EFI_ERROR_CODE;\n" +
"}\n", getConfigValueConsumer.getContent());
"}\n", getConfigValueConsumer.getGetterForUnitTest());
}