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

only:Improve toolset for default tune canned tune generation #4871

This commit is contained in:
Andrey 2023-06-17 16:51:11 -04:00
parent a61197aabe
commit 9a27431161
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,6 +44,15 @@ public class ConfigDefinition {
List<String> options = Files.readAllLines(Paths.get("../java_tools/configuration_definition/src/main/resources/config_definition.options")); List<String> options = Files.readAllLines(Paths.get("../java_tools/configuration_definition/src/main/resources/config_definition.options"));
options.addAll(Arrays.asList(args)); options.addAll(Arrays.asList(args));
String[] totalArgs = options.toArray(new String[0]); String[] totalArgs = options.toArray(new String[0]);
if (totalArgs.length < 2) {
SystemOut.println("Please specify\r\n"
+ KEY_DEFINITION + " x\r\n"
+ KEY_TS_DESTINATION + " x\r\n"
+ KEY_C_DESTINATION + " x\r\n"
+ KEY_JAVA_DESTINATION + " x\r\n"
);
return;
}
doJob(totalArgs, new ReaderStateImpl()); doJob(totalArgs, new ReaderStateImpl());
} catch (Throwable e) { } catch (Throwable e) {
SystemOut.println(e); SystemOut.println(e);
@ -55,16 +64,6 @@ public class ConfigDefinition {
} }
private static void doJob(String[] args, ReaderStateImpl state) throws IOException { private static void doJob(String[] args, ReaderStateImpl state) throws IOException {
if (args.length < 2) {
SystemOut.println("Please specify\r\n"
+ KEY_DEFINITION + " x\r\n"
+ KEY_TS_DESTINATION + " x\r\n"
+ KEY_C_DESTINATION + " x\r\n"
+ KEY_JAVA_DESTINATION + " x\r\n"
);
return;
}
SystemOut.println(ConfigDefinition.class + " Invoked with " + Arrays.toString(args)); SystemOut.println(ConfigDefinition.class + " Invoked with " + Arrays.toString(args));
String tsInputFileFolder = null; String tsInputFileFolder = null;
@ -144,8 +143,11 @@ public class ConfigDefinition {
case KEY_SIGNATURE_DESTINATION: case KEY_SIGNATURE_DESTINATION:
signatureDestination = args[i + 1]; signatureDestination = args[i + 1];
break; break;
case EnumToString.KEY_ENUM_INPUT_FILE: case EnumToString.KEY_ENUM_INPUT_FILE: {
enumInputFiles.add(args[i + 1]); String enumInputFile = args[i + 1];
enumInputFiles.add(enumInputFile);
state.read(new FileReader(enumInputFile));
}
break; break;
case "-ts_output_name": case "-ts_output_name":
state.setTsFileOutputName(args[i + 1]); state.setTsFileOutputName(args[i + 1]);
@ -164,13 +166,7 @@ public class ConfigDefinition {
state.addInputFile(TSProjectConsumer.getTsFileInputName(tsInputFileFolder)); state.addInputFile(TSProjectConsumer.getTsFileInputName(tsInputFileFolder));
} }
if (!enumInputFiles.isEmpty()) { SystemOut.println(state.getEnumsReader().getEnums().size() + " total enumsReader");
for (String ef : enumInputFiles) {
state.read(new FileReader(ef));
}
SystemOut.println(state.getEnumsReader().getEnums().size() + " total enumsReader");
}
// Add the variable for the config signature // Add the variable for the config signature
FirmwareVersion uniqueId = new FirmwareVersion(IoUtil2.getCrc32(state.getInputFiles())); FirmwareVersion uniqueId = new FirmwareVersion(IoUtil2.getCrc32(state.getInputFiles()));