From e50860594d027163a48ee43ac657e49fbd16361a Mon Sep 17 00:00:00 2001 From: rusefillc Date: Tue, 16 Aug 2022 16:41:33 -0400 Subject: [PATCH] reducing inconsistency between gen scripts --- firmware/config/boards/cypress/config/gen_cypress_config.sh | 3 +-- firmware/config/boards/kinetis/config/gen_kinetis_config.sh | 3 +-- firmware/config/boards/subaru_eg33/config/gen_subaru_config.sh | 3 +-- firmware/gen_config_board.sh | 3 +-- firmware/gen_config_common.sh | 1 + 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/firmware/config/boards/cypress/config/gen_cypress_config.sh b/firmware/config/boards/cypress/config/gen_cypress_config.sh index c4594a123c..bffdc32512 100755 --- a/firmware/config/boards/cypress/config/gen_cypress_config.sh +++ b/firmware/config/boards/cypress/config/gen_cypress_config.sh @@ -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; } diff --git a/firmware/config/boards/kinetis/config/gen_kinetis_config.sh b/firmware/config/boards/kinetis/config/gen_kinetis_config.sh index 038b130f98..b27f134823 100755 --- a/firmware/config/boards/kinetis/config/gen_kinetis_config.sh +++ b/firmware/config/boards/kinetis/config/gen_kinetis_config.sh @@ -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; } diff --git a/firmware/config/boards/subaru_eg33/config/gen_subaru_config.sh b/firmware/config/boards/subaru_eg33/config/gen_subaru_config.sh index 31db94ae3b..96437f57e4 100755 --- a/firmware/config/boards/subaru_eg33/config/gen_subaru_config.sh +++ b/firmware/config/boards/subaru_eg33/config/gen_subaru_config.sh @@ -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; } diff --git a/firmware/gen_config_board.sh b/firmware/gen_config_board.sh index bf5bf79a94..942d1a72e7 100755 --- a/firmware/gen_config_board.sh +++ b/firmware/gen_config_board.sh @@ -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; } diff --git a/firmware/gen_config_common.sh b/firmware/gen_config_common.sh index 26d74dd540..756adc949d 100755 --- a/firmware/gen_config_common.sh +++ b/firmware/gen_config_common.sh @@ -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"