rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.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-11 20:53:51 -05:00
parent 6d0e9cf914
commit 8a75f86191
5 changed files with 172 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,6 +57,7 @@ public class ConfigDefinition {
*/
public static boolean needZeroInit = true;
public static String definitionInputFile = null;
private static String fieldLookupFile = null;
public static void main(String[] args) {
try {
@ -136,6 +137,9 @@ public class ConfigDefinition {
case KEY_JAVA_DESTINATION:
javaDestinationFileName = args[i + 1];
break;
case "-field_lookup_file":
fieldLookupFile = args[i + 1];
break;
case "-readfile":
String keyName = args[i + 1];
// yes, we take three parameters here thus pre-increment!
@ -270,6 +274,8 @@ public class ConfigDefinition {
if (destCHeaderFileName != null) {
destinations.add(new CHeaderConsumer(state.variableRegistry, destCHeaderFileName));
}
if (fieldLookupFile!=null)
destinations.add(new GetConfigValueConsumer(fieldLookupFile));
if (javaDestinationFileName != null) {
destinations.add(new FileJavaFieldsConsumer(state, javaDestinationFileName));
}

2
java_tools/configuration_definition/src/main/java/com/rusefi/output/ConfigStructure.java
View File

@ -19,7 +19,7 @@ import static com.rusefi.ConfigField.BOOLEAN_T;
* 1/15/15
*/
public class ConfigStructure {
private static final String ALIGNMENT_FILL_AT = "alignmentFill_at_";
public static final String ALIGNMENT_FILL_AT = "alignmentFill_at_";
public final String name;
public final String comment;

10
java_tools/configuration_definition/src/main/java/com/rusefi/output/DataLogConsumer.java
View File

@ -5,6 +5,7 @@ import com.rusefi.ReaderState;
import com.rusefi.TypesHelper;
import com.rusefi.VariableRegistry;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.CharArrayWriter;
import java.io.FileWriter;
@ -15,6 +16,7 @@ import static com.rusefi.ConfigField.unquote;
import static org.abego.treelayout.internal.util.java.lang.string.StringUtil.quote;
public class DataLogConsumer extends AbstractConfigurationConsumer {
public static final String UNUSED = "unused";
private final String fileName;
private final ReaderState state;
private final CharArrayWriter tsWriter = new CharArrayWriter();
@ -35,15 +37,19 @@ public class DataLogConsumer extends AbstractConfigurationConsumer {
tsWriter.append(content);
}
writeStringToFile(fileName, tsWriter);
}
private void writeStringToFile(@Nullable String fileName, CharArrayWriter writer) throws IOException {
if (fileName != null) {
FileWriter fw = new FileWriter(fileName);
fw.write(tsWriter.toCharArray());
fw.write(writer.toCharArray());
fw.close();
}
}
private String handle(ConfigField configField, String prefix) {
if (configField.getName().contains("unused"))
if (configField.getName().contains(UNUSED))
return "";
if (configField.isArray()) {

69
java_tools/configuration_definition/src/main/java/com/rusefi/output/GetConfigValueConsumer.java Normal file
View File

@ -0,0 +1,69 @@
package com.rusefi.output;
import com.rusefi.ConfigField;
import org.jetbrains.annotations.Nullable;
import java.io.FileWriter;
import java.io.IOException;
import static com.rusefi.output.ConfigStructure.ALIGNMENT_FILL_AT;
import static com.rusefi.output.DataLogConsumer.UNUSED;
@SuppressWarnings("StringConcatenationInsideStringBufferAppend")
public class GetConfigValueConsumer extends AbstractConfigurationConsumer {
private final StringBuilder content = new StringBuilder();
private final String outputFIleName;
public GetConfigValueConsumer(String outputFIleName) {
System.out.println("Hello " + getClass() + " " + outputFIleName);
this.outputFIleName = outputFIleName;
}
private void writeStringToFile(@Nullable String fileName, String content) throws IOException {
if (fileName != null) {
FileWriter fw = new FileWriter(fileName);
fw.write(content);
fw.close();
}
}
@Override
public void handleEndStruct(ConfigStructure structure) throws IOException {
FieldIterator iterator = new FieldIterator(structure.cFields);
for (int i = 0; i < structure.cFields.size(); i++) {
iterator.start(i);
append(iterator.cf);
iterator.end();
}
}
@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());
}
private void append(ConfigField cf) {
if (cf.getName().contains(UNUSED) || cf.getName().contains(ALIGNMENT_FILL_AT))
return;
content.append("\tif (strEqualCaseInsensitive(name, \"" + cf.getName() + "\"))\n");
content.append("\t\treturn engineConfiguration->" + cf.getName() + ";\n");
}
public String getContent() {
return content.toString();
}
}

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

@ -4,6 +4,7 @@ import com.rusefi.BitState;
import com.rusefi.ReaderState;
import com.rusefi.output.DataLogConsumer;
import com.rusefi.output.GaugeConsumer;
import com.rusefi.output.GetConfigValueConsumer;
import com.rusefi.output.OutputsSectionConsumer;
import org.junit.Test;
@ -114,6 +115,93 @@ public class OutputsTest {
}
@Test
public void generateGetConfig() throws IOException {
String test = "struct total\n" +
"#define adc_channel_e_enum \"Disabled\", \"PA0\", \"PA1\", \"PA2\", \"PA3\", \"PA4\", \"PA5\", \"PA6\", \"PA7\", \"PB0\", \"PB1\", \"PC0\", \"PC1\", \"PC2\", \"PC3\", \"PC4\", \"PC5\"\n" +
"custom adc_channel_e 1 bits, U08, @OFFSET@, [0:5], @@adc_channel_e_enum@@\n" +
"struct_no_prefix thermistor_conf_s @brief Thermistor known values\n" +
"float tempC_1;these values are in Celcius;\"*C\", 1, 0, -40, 200, 1\n" +
"float tempC_2;;\"*C\", 1, 0, -40, 200, 1\n" +
"float tempC_3;;\"*C\", 1, 0, -40, 200, 1\n" +
"float resistance_1;;\"Ohm\", 1, 0, 0, 200000, 1\n" +
"float resistance_2;;\"Ohm\", 1, 0, 0, 200000, 1\n" +
"float resistance_3;;\"Ohm\", 1, 0, 0, 200000, 1\n" +
"\n" +
"\tfloat bias_resistor;+Pull-up resistor value on your board;\"Ohm\", 1, 0, 0, 200000, 1\n" +
"end_struct\n" +
"struct ThermistorConf @brief Thermistor curve parameters\n" +
"\tthermistor_conf_s config;\n" +
"\tadc_channel_e adcChannel;\n" +
"end_struct\n" +
"ThermistorConf clt;todo: merge with channel settings, use full-scale Thermistor here!\n" +
"ThermistorConf iat;\n" +
"bit issue_294_31,\"si_example\",\"nada_example\"\n" +
"uint8_t[2 iterate] autoscale knock;;\"\",1, 0, 0, 0, 0\n" +
"\tuint16_t autoscale baseFuel;@@GAUGE_NAME_FUEL_BASE@@\\nThis is the raw value we take from the fuel map or base fuel algorithm, before the corrections;\"mg\",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0\n" +
"float afr_type;PID dTime;\"ms\", 1, 0, 0, 3000, 0\n" +
"uint16_t autoscale speedToRpmRatio;s2rpm;\"value\",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0\n" +
"uint8_t afr_typet;;\"ms\", 1, 0, 0, 3000, 0\n" +
"uint8_t autoscale vehicleSpeedKph;;\"kph\",1, 0, 0, 0, 0\n" +
"bit isForcedInduction;Does the vehicle have a turbo or supercharger?\n" +
"\tuint8_t unused37;;\"\",1, 0, 0, 0, 0\n" +
"bit enableFan1WithAc;+Turn on this fan when AC is on.\n" +
"end_struct\n";
ReaderState state = new ReaderState();
state.variableRegistry.register("PACK_MULT_PERCENT", 100);
state.variableRegistry.register("GAUGE_NAME_FUEL_BASE", "hello");
GetConfigValueConsumer getConfigValueConsumer = new GetConfigValueConsumer(null);
state.readBufferedReader(test, Collections.singletonList(getConfigValueConsumer));
assertEquals("#include \"pch.h\"\n" +
"float getConfigValueByName(const char *name) {\n" +
"\tif (strEqualCaseInsensitive(name, \"tempC_1\"))\n" +
"\t\treturn engineConfiguration->tempC_1;\n" +
"\tif (strEqualCaseInsensitive(name, \"tempC_2\"))\n" +
"\t\treturn engineConfiguration->tempC_2;\n" +
"\tif (strEqualCaseInsensitive(name, \"tempC_3\"))\n" +
"\t\treturn engineConfiguration->tempC_3;\n" +
"\tif (strEqualCaseInsensitive(name, \"resistance_1\"))\n" +
"\t\treturn engineConfiguration->resistance_1;\n" +
"\tif (strEqualCaseInsensitive(name, \"resistance_2\"))\n" +
"\t\treturn engineConfiguration->resistance_2;\n" +
"\tif (strEqualCaseInsensitive(name, \"resistance_3\"))\n" +
"\t\treturn engineConfiguration->resistance_3;\n" +
"\tif (strEqualCaseInsensitive(name, \"bias_resistor\"))\n" +
"\t\treturn engineConfiguration->bias_resistor;\n" +
"\tif (strEqualCaseInsensitive(name, \"config\"))\n" +
"\t\treturn engineConfiguration->config;\n" +
"\tif (strEqualCaseInsensitive(name, \"adcChannel\"))\n" +
"\t\treturn engineConfiguration->adcChannel;\n" +
"\tif (strEqualCaseInsensitive(name, \"clt\"))\n" +
"\t\treturn engineConfiguration->clt;\n" +
"\tif (strEqualCaseInsensitive(name, \"iat\"))\n" +
"\t\treturn engineConfiguration->iat;\n" +
"\tif (strEqualCaseInsensitive(name, \"issue_294_31\"))\n" +
"\t\treturn engineConfiguration->issue_294_31;\n" +
"\tif (strEqualCaseInsensitive(name, \"knock\"))\n" +
"\t\treturn engineConfiguration->knock;\n" +
"\tif (strEqualCaseInsensitive(name, \"baseFuel\"))\n" +
"\t\treturn engineConfiguration->baseFuel;\n" +
"\tif (strEqualCaseInsensitive(name, \"afr_type\"))\n" +
"\t\treturn engineConfiguration->afr_type;\n" +
"\tif (strEqualCaseInsensitive(name, \"speedToRpmRatio\"))\n" +
"\t\treturn engineConfiguration->speedToRpmRatio;\n" +
"\tif (strEqualCaseInsensitive(name, \"afr_typet\"))\n" +
"\t\treturn engineConfiguration->afr_typet;\n" +
"\tif (strEqualCaseInsensitive(name, \"vehicleSpeedKph\"))\n" +
"\t\treturn engineConfiguration->vehicleSpeedKph;\n" +
"\tif (strEqualCaseInsensitive(name, \"isForcedInduction\"))\n" +
"\t\treturn engineConfiguration->isForcedInduction;\n" +
"\tif (strEqualCaseInsensitive(name, \"enableFan1WithAc\"))\n" +
"\t\treturn engineConfiguration->enableFan1WithAc;\n" +
"\treturn EFI_ERROR_CODE;\n" +
"}\n", getConfigValueConsumer.getContent());
}
@Test
public void sensorStruct() throws IOException {
String test = "struct total\n" +