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

establishing a bit of API

This commit is contained in:
rusefillc 2022-04-15 21:57:08 -04:00
parent cbcce9d84a
commit 6d8978a006
5 changed files with 60 additions and 46 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.

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

@ -1,10 +1,8 @@
package com.rusefi;
import com.rusefi.newparse.ParseState;
import com.rusefi.newparse.parsing.Definition;
import com.rusefi.output.*;
import com.rusefi.trigger.TriggerWheelTSLogic;
import com.rusefi.util.IoUtils;
import com.rusefi.util.SystemOut;
import java.io.*;
@ -20,13 +18,13 @@ public class ConfigDefinition {
public static final String SIGNATURE_HASH = "SIGNATURE_HASH";
private static final String ROM_RAIDER_XML_TEMPLATE = "rusefi_template.xml";
public static final String KEY_DEFINITION = "-definition";
private static final String KEY_DEFINITION = "-definition";
private static final String KEY_ROMRAIDER_INPUT = "-romraider";
private static final String KEY_TS_DESTINATION = "-ts_destination";
public static final String KEY_C_DESTINATION = "-c_destination";
private static final String KEY_C_DESTINATION = "-c_destination";
private static final String KEY_C_DEFINES = "-c_defines";
public static final String KEY_WITH_C_DEFINES = "-with_c_defines";
public static final String KEY_JAVA_DESTINATION = "-java_destination";
private static final String KEY_JAVA_DESTINATION = "-java_destination";
private static final String KEY_ROMRAIDER_DESTINATION = "-romraider_destination";
private static final String KEY_FIRING = "-firing_order";
public static final String KEY_PREPEND = "-prepend";
@ -80,7 +78,6 @@ public class ConfigDefinition {
String tsOutputsDestination = null;
List<ConfigurationConsumer> destinations = new ArrayList<>();
for (int i = 0; i < args.length - 1; i += 2) {
String key = args[i];
@ -100,7 +97,7 @@ public class ConfigDefinition {
tsOutputsDestination = args[i + 1];
break;
case KEY_C_DESTINATION:
destinations.add(new CHeaderConsumer(state, args[i + 1], state.withC_Defines));
state.addCHeaderDestination(args[i + 1]);
break;
case KEY_ZERO_INIT:
needZeroInit = Boolean.parseBoolean(args[i + 1]);
@ -112,13 +109,13 @@ public class ConfigDefinition {
destCDefinesFileName = args[i + 1];
break;
case KEY_JAVA_DESTINATION:
destinations.add(new FileJavaFieldsConsumer(state, args[i + 1]));
state.addJavaDestination(args[i + 1]);
break;
case "-field_lookup_file":
destinations.add(new GetConfigValueConsumer(args[i + 1]));
state.destinations.add(new GetConfigValueConsumer(args[i + 1]));
break;
case "-output_lookup_file":
destinations.add(new GetOutputValueConsumer(args[i + 1]));
state.destinations.add(new GetOutputValueConsumer(args[i + 1]));
break;
case "-readfile":
String keyName = args[i + 1];
@ -137,14 +134,7 @@ public class ConfigDefinition {
romRaiderDestination = args[i + 1];
break;
case KEY_PREPEND:
{
String value = args[i + 1];
// see UsagesReader use-case with dynamic prepend usage
if (!value.trim().isEmpty()) {
state.prependFiles.add(value);
state.inputFiles.add(value);
}
}
state.addPrepend(args[i + 1].trim());
break;
case KEY_SIGNATURE:
signaturePrependFile = args[i + 1];
@ -202,6 +192,7 @@ public class ConfigDefinition {
if (pinoutLogic != null) {
pinoutLogic.processYamls(state.variableRegistry, state);
}
/*
// Parse the input files
{
@ -231,32 +222,28 @@ public class ConfigDefinition {
// TsWriter writer = new TsWriter();
// writer.writeTunerstudio(parseState, tsPath + "/rusefi.input", tsPath + "/" + TSProjectConsumer.TS_FILE_OUTPUT_NAME);
}
*/
if (tsOutputsDestination != null) {
destinations.add(new OutputsSectionConsumer(tsOutputsDestination + File.separator + "generated/output_channels.ini", state));
destinations.add(new DataLogConsumer(tsOutputsDestination + File.separator + "generated/data_logs.ini"));
destinations.add(new GaugeConsumer(tsOutputsDestination + File.separator + "generated/gauges.ini", state));
state.destinations.add(new OutputsSectionConsumer(tsOutputsDestination + File.separator + "generated/output_channels.ini", state));
state.destinations.add(new DataLogConsumer(tsOutputsDestination + File.separator + "generated/data_logs.ini"));
state.destinations.add(new GaugeConsumer(tsOutputsDestination + File.separator + "generated/gauges.ini", state));
}
if (tsInputFileFolder != null) {
CharArrayWriter tsWriter = new CharArrayWriter();
destinations.add(new TSProjectConsumer(tsWriter, tsInputFileFolder, state));
state.destinations.add(new TSProjectConsumer(tsWriter, tsInputFileFolder, state));
VariableRegistry tmpRegistry = new VariableRegistry();
// store the CRC32 as a built-in variable
tmpRegistry.register(SIGNATURE_HASH, "" + crc32);
tmpRegistry.readPrependValues(signaturePrependFile);
destinations.add(new SignatureConsumer(signatureDestination, tmpRegistry));
state.destinations.add(new SignatureConsumer(signatureDestination, tmpRegistry));
}
if (destinations.isEmpty())
if (state.destinations.isEmpty())
throw new IllegalArgumentException("No destinations specified");
/*
* this is the most important invocation - here we read the primary input file and generated code into all
* the destinations/writers
*/
SystemOut.println("Reading definition from " + state.definitionInputFile);
BufferedReader definitionReader = new BufferedReader(new InputStreamReader(new FileInputStream(state.definitionInputFile), IoUtils.CHARSET.name()));
state.readBufferedReader(definitionReader, destinations);
state.doJob();
if (destCDefinesFileName != null) {
ExtraUtil.writeDefinesToFile(state.variableRegistry, destCDefinesFileName, state.definitionInputFile);

38
java_tools/configuration_definition/src/main/java/com/rusefi/ReaderState.java
View File

@ -4,13 +4,14 @@ import com.devexperts.logging.Logging;
import com.opensr5.ini.RawIniFile;
import com.opensr5.ini.field.EnumIniField;
import com.rusefi.enum_reader.Value;
import com.rusefi.output.CHeaderConsumer;
import com.rusefi.output.ConfigStructure;
import com.rusefi.output.ConfigurationConsumer;
import com.rusefi.output.FileJavaFieldsConsumer;
import com.rusefi.util.IoUtils;
import com.rusefi.util.SystemOut;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import java.io.*;
import java.util.*;
import static com.devexperts.logging.Logging.getLogging;
@ -38,9 +39,11 @@ public class ReaderState {
public final Map<String, String> tsCustomLine = new HashMap<>();
public final Map<String, ConfigStructure> structures = new HashMap<>();
public String headerMessage;
// well, technically those should be a builder for state, not this state class itself
String definitionInputFile = null;
public boolean withC_Defines = true;
List<String> prependFiles = new ArrayList<>();
List<ConfigurationConsumer> destinations = new ArrayList<>();
public final EnumsReader enumsReader = new EnumsReader();
public final VariableRegistry variableRegistry = new VariableRegistry();
@ -70,6 +73,16 @@ public class ReaderState {
structure.addBitField(bitField);
}
public void doJob() throws IOException {
/*
* this is the most important invocation - here we read the primary input file and generated code into all
* the destinations/writers
*/
SystemOut.println("Reading definition from " + this.definitionInputFile);
BufferedReader definitionReader = new BufferedReader(new InputStreamReader(new FileInputStream(this.definitionInputFile), IoUtils.CHARSET.name()));
readBufferedReader(definitionReader, this.destinations);
}
public void read(Reader reader) throws IOException {
Map<String, EnumsReader.EnumState> newEnums = EnumsReader.readStatic(reader);
@ -301,4 +314,21 @@ public class ReaderState {
headerMessage = ToolUtil.getGeneratedAutomaticallyTag() + definitionInputFile + " " + new Date();
inputFiles.add(definitionInputFile);
}
public void addCHeaderDestination(String cHeader) {
destinations.add(new CHeaderConsumer(this, cHeader, withC_Defines));
}
public void addJavaDestination(String fileName) {
destinations.add(new FileJavaFieldsConsumer(this, fileName));
}
public void addPrepend(String fileName) {
if (fileName.isEmpty()) {
// see UsagesReader use-case with dynamic prepend usage
return;
}
prependFiles.add(fileName);
inputFiles.add(fileName);
}
}

3
java_tools/configuration_definition/src/main/java/com/rusefi/RusefiParseErrorStrategy.java
View File

@ -11,6 +11,9 @@ import org.antlr.v4.runtime.tree.ParseTreeWalker;
import java.io.FileInputStream;
import java.io.IOException;
/**
* dead code? shall we drop it yet?
*/
public class RusefiParseErrorStrategy extends DefaultErrorStrategy {
private boolean hadError = false;

16
java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/UsagesReader.java
View File

@ -48,7 +48,7 @@ public class UsagesReader {
String key = pair[0];
String value = pair[1];
if (key.equals(ConfigDefinition.KEY_WITH_C_DEFINES)) {
withCDefines = Boolean.valueOf(value);
withCDefines = Boolean.parseBoolean(value);
} else if (key.equals(ConfigDefinition.KEY_PREPEND)) {
prepend = value;
}
@ -61,16 +61,10 @@ public class UsagesReader {
state.setDefinitionInputFile(folder + File.separator + name + ".txt");
state.withC_Defines = withCDefines;
ConfigDefinition.doJob(new String[]{
ConfigDefinition.KEY_PREPEND,
prepend,
ConfigDefinition.KEY_JAVA_DESTINATION,
"../java_console/models/src/main/java/com/rusefi/config/generated/" + javaName,
ConfigDefinition.KEY_C_DESTINATION,
folder + File.separator + name + "_generated.h"
}, state);
state.addPrepend(prepend);
state.addCHeaderDestination(folder + File.separator + name + "_generated.h");
state.addJavaDestination("../java_console/models/src/main/java/com/rusefi/config/generated/" + javaName);
state.doJob();
}
};