From 02fe0e6e142cc440d6989049db9ed58d26d0a059 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Tue, 16 Aug 2022 10:25:40 -0400 Subject: [PATCH] reducing inconsistency, renaming .ini file --- .github/workflows/build-firmware.yaml | 2 +- .../kinetis/config/gen_kinetis_config.sh | 32 ++++++++++--------- .../{rusefi_kinetis.ini => rusefi_kin.ini} | 0 3 files changed, 18 insertions(+), 16 deletions(-) rename firmware/tunerstudio/generated/{rusefi_kinetis.ini => rusefi_kin.ini} (100%) diff --git a/.github/workflows/build-firmware.yaml b/.github/workflows/build-firmware.yaml index ba146e53f2..cc1198bf2f 100644 --- a/.github/workflows/build-firmware.yaml +++ b/.github/workflows/build-firmware.yaml @@ -137,7 +137,7 @@ jobs: - build-target: kinetis folder: kinetis - ini-file: rusefi_kinetis.ini + ini-file: rusefi_kin.ini skip-rate: 0 - build-target: mre_f4 diff --git a/firmware/config/boards/kinetis/config/gen_kinetis_config.sh b/firmware/config/boards/kinetis/config/gen_kinetis_config.sh index e561dcc6e5..18a64e5604 100755 --- a/firmware/config/boards/kinetis/config/gen_kinetis_config.sh +++ b/firmware/config/boards/kinetis/config/gen_kinetis_config.sh @@ -1,16 +1,18 @@ #!/bin/bash # This script files reads rusefi_config.txt and produces firmware persistent configuration headers # the storage section of rusefi.ini is updated as well -# -# many of the files generated here require time consuming full compilation thus we have an aggressive caching mechanism -# to make sure that we do not regenerate for no reason -# the primary input files are rusefi_config.txt and rusefi.input, also mapping.yaml etc -# see inside cache.zip for all input files -# -pwd +BOARDNAME=kinetis +SHORT_BOARDNAME=kin +BOARD_DIR=config/boards/${BOARDNAME} -bash gen_signature.sh kin + + + + + + +bash gen_signature.sh ${SHORT_BOARDNAME} source gen_config_common.sh echo "Using COMMON_GEN_CONFIG [$COMMON_GEN_CONFIG]" @@ -20,13 +22,13 @@ java \ $COMMON_GEN_CONFIG_PREFIX \ -tool kinetis_gen_config.bat \ $COMMON_GEN_CONFIG \ - -ts_output_name generated/rusefi_kinetis.ini \ - -c_defines config/boards/kinetis/config/controllers/algo/rusefi_generated.h \ - -c_destination config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h \ - -signature tunerstudio/generated/signature_kin.txt \ - -signature_destination controllers/generated/signature_kin.h \ + -ts_output_name generated/rusefi_${SHORT_BOARDNAME}.ini \ + -c_defines ${BOARD_DIR}/config/controllers/algo/rusefi_generated.h \ + -c_destination ${BOARD_DIR}/config/controllers/algo/engine_configuration_generated_structures.h \ + -signature tunerstudio/generated/signature_${SHORT_BOARDNAME}.txt \ + -signature_destination controllers/generated/signature_${SHORT_BOARDNAME}.h \ -enumInputFile controllers/algo/rusefi_hw_enums.h \ - -board kinetis \ + -board ${BOARDNAME} \ -prepend config/boards/kinetis/config/rusefi_config_kinetis.txt -[ $? -eq 0 ] || { echo "ERROR generating TunerStudio config for kinetis"; exit 1; } +[ $? -eq 0 ] || { echo "ERROR generating TunerStudio config for ${BOARDNAME}"; exit 1; } diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kin.ini similarity index 100% rename from firmware/tunerstudio/generated/rusefi_kinetis.ini rename to firmware/tunerstudio/generated/rusefi_kin.ini