reducing inconsistency between gen scripts

This commit is contained in:
rusefillc 2022-08-16 16:41:33 -04:00
parent 65220dbbe1
commit e50860594d
5 changed files with 5 additions and 8 deletions

View File

@ -37,7 +37,6 @@ java \
$COMMON_GEN_CONFIG \
-c_defines ${BOARD_DIR}/config/controllers/algo/rusefi_generated.h \
-c_destination ${BOARD_DIR}/config/controllers/algo/engine_configuration_generated_structures.h \
-enumInputFile controllers/algo/rusefi_hw_enums.h \
-prepend ${BOARD_DIR}/prepend.txt
-enumInputFile controllers/algo/rusefi_hw_enums.h
[ $? -eq 0 ] || { echo "ERROR generating TunerStudio config for ${BOARDNAME}"; exit 1; }

View File

@ -37,7 +37,6 @@ java \
$COMMON_GEN_CONFIG \
-c_defines ${BOARD_DIR}/config/controllers/algo/rusefi_generated.h \
-c_destination ${BOARD_DIR}/config/controllers/algo/engine_configuration_generated_structures.h \
-enumInputFile controllers/algo/rusefi_hw_enums.h \
-prepend ${BOARD_DIR}/prepend.txt
-enumInputFile controllers/algo/rusefi_hw_enums.h
[ $? -eq 0 ] || { echo "ERROR generating TunerStudio config for ${BOARDNAME}"; exit 1; }

View File

@ -37,8 +37,7 @@ java \
$COMMON_GEN_CONFIG \
-c_defines ${BOARD_DIR}/config/controllers/algo/rusefi_generated.h \
-c_destination ${BOARD_DIR}/config/controllers/algo/engine_configuration_generated_structures.h \
-enumInputFile ${BOARD_DIR}/rusefi_hw_enums.h \
-prepend ${BOARD_DIR}/prepend.txt
-enumInputFile ${BOARD_DIR}/rusefi_hw_enums.h
[ $? -eq 0 ] || { echo "ERROR generating TunerStudio config for ${BOARDNAME}"; exit 1; }

View File

@ -53,8 +53,7 @@ java -DSystemOut.name=logs/gen_config_board \
-enumInputFile controllers/algo/rusefi_hw_enums.h \
-romraider_destination ../java_console/rusefi.xml \
-c_defines controllers/generated/rusefi_generated.h \
-c_destination controllers/generated/engine_configuration_generated_structures.h \
-prepend ${BOARD_DIR}/prepend.txt
-c_destination controllers/generated/engine_configuration_generated_structures.h
[ $? -eq 0 ] || { echo "ERROR generating TunerStudio config for ${BOARDNAME}"; exit 1; }

View File

@ -17,5 +17,6 @@ COMMON_GEN_CONFIG="
-signature tunerstudio/generated/signature_${SHORT_BOARDNAME}.txt \
-signature_destination controllers/generated/signature_${SHORT_BOARDNAME}.h \
-ts_output_name generated/${INI} \
-prepend ${BOARD_DIR}/prepend.txt \
-board ${BOARDNAME} \
-definition integration/rusefi_config.txt"