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

reducing inconsistency between gen scripts

This commit is contained in:
rusefillc 2022-08-16 16:58:01 -04:00
parent 8bb2e9f9f9
commit 7173d947d6
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/gen_config_board.sh
View File

@ -47,7 +47,6 @@ java \
$COMMON_GEN_CONFIG_PREFIX \
-tool gen_config.sh \
$COMMON_GEN_CONFIG \
-romraider integration \
-field_lookup_file controllers/lua/generated/value_lookup_generated.cpp \
-java_destination ../java_console/models/src/main/java/com/rusefi/config/generated/Fields.java \
-enumInputFile controllers/algo/rusefi_hw_enums.h \

3
firmware/gen_config_common.sh
View File

@ -11,7 +11,8 @@ COMMON_GEN_CONFIG="
-readfile LIVE_DATA_PANELS_FROM_FILE console/binary/generated/fancy_content.ini \
-ts_destination tunerstudio \
-firing_order controllers/algo/firing_order.h \
-triggerFolder ../unit_tests \
-triggerInputFolder ../unit_tests \
-romraider_input_file integration/rusefi_template.xml \
-with_c_defines false \
-initialize_to_zero false \
-prepend console/binary/generated/total_live_data_generated.h \

BIN
java_tools/ConfigDefinition.jar
View File

Binary file not shown.

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

@ -18,9 +18,8 @@ import java.util.*;
public class ConfigDefinition {
public static final String SIGNATURE_HASH = "SIGNATURE_HASH";
private static final String ROM_RAIDER_XML_TEMPLATE = "rusefi_template.xml";
private static final String KEY_DEFINITION = "-definition";
private static final String KEY_ROMRAIDER_INPUT = "-romraider";
private static final String KEY_ROMRAIDER_INPUT = "-romraider_input_file";
private static final String KEY_TS_DESTINATION = "-ts_destination";
private static final String KEY_C_DESTINATION = "-c_destination";
private static final String KEY_C_DEFINES = "-c_defines";
@ -71,7 +70,7 @@ public class ConfigDefinition {
// we postpone reading so that in case of cache hit we do less work
String romRaiderInputFile = null;
String firingEnumFileName = null;
String triggersFolder = null;
String triggersInputFolder = null;
String signatureDestination = null;
String signaturePrependFile = null;
List<String> enumInputFiles = new ArrayList<>();
@ -132,8 +131,8 @@ public class ConfigDefinition {
firingEnumFileName = args[i + 1];
state.inputFiles.add(firingEnumFileName);
break;
case "-triggerFolder":
triggersFolder = args[i + 1];
case "-triggerInputFolder":
triggersInputFolder = args[i + 1];
break;
case KEY_ROMRAIDER_DESTINATION:
romRaiderDestination = args[i + 1];
@ -156,8 +155,7 @@ public class ConfigDefinition {
state.tsFileOutputName = args[i + 1];
break;
case KEY_ROMRAIDER_INPUT:
String inputFilePath = args[i + 1];
romRaiderInputFile = inputFilePath + File.separator + ROM_RAIDER_XML_TEMPLATE;
romRaiderInputFile = args[i + 1];
state.inputFiles.add(romRaiderInputFile);
break;
case KEY_BOARD_NAME:
@ -189,7 +187,7 @@ public class ConfigDefinition {
ExtraUtil.handleFiringOrder(firingEnumFileName, state.variableRegistry, parseState);
new TriggerWheelTSLogic().execute(triggersFolder, state.variableRegistry);
new TriggerWheelTSLogic().execute(triggersInputFolder, state.variableRegistry);
if (pinoutLogic != null) {
pinoutLogic.registerBoardSpecificPinNames(state.variableRegistry, state, parseState);