From dbcfa6f660ccdfc925531c96af300607be7ff1b9 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 19 Dec 2023 16:29:21 -0500 Subject: [PATCH] custom FW repos code generation process #5817 preparation --- ... => engine_configuration_generated_structures_cypress.h} | 0 .../algo/{rusefi_generated.h => rusefi_generated_cypress.h} | 2 +- firmware/config/boards/cypress/config/gen_cypress_config.sh | 4 ++-- ...es.h => engine_configuration_generated_structures_kin.h} | 0 .../algo/{rusefi_generated.h => rusefi_generated_kin.h} | 2 +- firmware/config/boards/kinetis/config/gen_kinetis_config.sh | 4 ++-- ...ine_configuration_generated_structures_subaru_eg33_f7.h} | 0 ...rusefi_generated.h => rusefi_generated_subaru_eg33_f7.h} | 2 +- .../config/boards/subaru_eg33/config/gen_subaru_config.sh | 6 +++--- 9 files changed, 10 insertions(+), 10 deletions(-) rename firmware/config/boards/cypress/config/controllers/algo/{engine_configuration_generated_structures.h => engine_configuration_generated_structures_cypress.h} (100%) rename firmware/config/boards/cypress/config/controllers/algo/{rusefi_generated.h => rusefi_generated_cypress.h} (99%) rename firmware/config/boards/kinetis/config/controllers/algo/{engine_configuration_generated_structures.h => engine_configuration_generated_structures_kin.h} (100%) rename firmware/config/boards/kinetis/config/controllers/algo/{rusefi_generated.h => rusefi_generated_kin.h} (99%) rename firmware/config/boards/subaru_eg33/config/controllers/algo/{engine_configuration_generated_structures.h => engine_configuration_generated_structures_subaru_eg33_f7.h} (100%) rename firmware/config/boards/subaru_eg33/config/controllers/algo/{rusefi_generated.h => rusefi_generated_subaru_eg33_f7.h} (99%) diff --git a/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures_cypress.h similarity index 100% rename from firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures.h rename to firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures_cypress.h diff --git a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated_cypress.h similarity index 99% rename from firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h rename to firmware/config/boards/cypress/config/controllers/algo/rusefi_generated_cypress.h index d3a12e9b9f..130dd5c517 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated_cypress.h @@ -1116,7 +1116,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.20.cypress.2195950183" +#define TS_SIGNATURE "rusEFI custom-generated-name.2023.12.19.cypress.2195950183" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/config/boards/cypress/config/gen_cypress_config.sh b/firmware/config/boards/cypress/config/gen_cypress_config.sh index 7456ed55ee..fc65262472 100755 --- a/firmware/config/boards/cypress/config/gen_cypress_config.sh +++ b/firmware/config/boards/cypress/config/gen_cypress_config.sh @@ -34,8 +34,8 @@ java \ $COMMON_GEN_CONFIG_PREFIX \ -tool hellen_cypress_gen_config.bat \ $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 \ + -c_defines ${BOARD_DIR}/config/controllers/algo/rusefi_generated_cypress.h \ + -c_destination ${BOARD_DIR}/config/controllers/algo/engine_configuration_generated_structures_cypress.h \ -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/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures_kin.h similarity index 100% rename from firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h rename to firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures_kin.h diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated_kin.h similarity index 99% rename from firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h rename to firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated_kin.h index e80147885d..dedef12adf 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated_kin.h @@ -1116,7 +1116,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.20.kin.3224522185" +#define TS_SIGNATURE "rusEFI custom-generated-name.2023.12.19.kin.3224522185" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/config/boards/kinetis/config/gen_kinetis_config.sh b/firmware/config/boards/kinetis/config/gen_kinetis_config.sh index 6b5d7d39c5..26445476f6 100755 --- a/firmware/config/boards/kinetis/config/gen_kinetis_config.sh +++ b/firmware/config/boards/kinetis/config/gen_kinetis_config.sh @@ -34,8 +34,8 @@ java \ $COMMON_GEN_CONFIG_PREFIX \ -tool kinetis_gen_config.bat \ $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 \ + -c_defines ${BOARD_DIR}/config/controllers/algo/rusefi_generated_kin.h \ + -c_destination ${BOARD_DIR}/config/controllers/algo/engine_configuration_generated_structures_kin.h \ -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/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures_subaru_eg33_f7.h similarity index 100% rename from firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h rename to firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures_subaru_eg33_f7.h diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated_subaru_eg33_f7.h similarity index 99% rename from firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h rename to firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated_subaru_eg33_f7.h index da28491e8d..fcd87e1edd 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated_subaru_eg33_f7.h @@ -1354,7 +1354,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.20.subaru_eg33_f7.2238598512" +#define TS_SIGNATURE "rusEFI custom-generated-name.2023.12.19.subaru_eg33_f7.2238598512" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' 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 a454b93a0d..4200b8c39e 100755 --- a/firmware/config/boards/subaru_eg33/config/gen_subaru_config.sh +++ b/firmware/config/boards/subaru_eg33/config/gen_subaru_config.sh @@ -34,10 +34,10 @@ java \ $COMMON_GEN_CONFIG_PREFIX \ -tool ${BOARD_DIR}/config/gen_subaru_config.sh \ $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 \ + -c_defines ${BOARD_DIR}/config/controllers/algo/rusefi_generated_subaru_eg33_f7.h \ + -c_destination ${BOARD_DIR}/config/controllers/algo/engine_configuration_generated_structures_subaru_eg33_f7.h \ -enumInputFile ${BOARD_DIR}/rusefi_hw_enums.h [ $? -eq 0 ] || { echo "ERROR generating TunerStudio config for ${BOARDNAME}"; exit 1; } -# EG33 does not get fancy mass storage device since it does not have create_ini_image.sh etc invocations like gen_config_board.sh does \ No newline at end of file +# EG33 does not get fancy mass storage device since it does not have create_ini_image.sh etc invocations like gen_config_board.sh does