From 7a2176afad48d716cf53f4bcccc1c52561d73efc Mon Sep 17 00:00:00 2001 From: Andrey Date: Fri, 30 Jul 2021 17:15:01 -0400 Subject: [PATCH] gen_config.sh code duplication #2451 --- firmware/gen_config_board.sh | 23 ++++++++++++++--------- firmware/gen_config_default.sh | 11 ++++++++--- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/firmware/gen_config_board.sh b/firmware/gen_config_board.sh index cee110aa8d..9c5a368981 100755 --- a/firmware/gen_config_board.sh +++ b/firmware/gen_config_board.sh @@ -24,6 +24,11 @@ else fi echo "BOARDNAME=${BOARDNAME} SHORT_BOARDNAME=${SHORT_BOARDNAME}" +if [ "${SHORT_BOARDNAME}" = "all" ]; then + SOMETHINGSOMETHING=false +else + SOMETHINGSOMETHING=true +fi bash gen_signature.sh ${SHORT_BOARDNAME} @@ -38,21 +43,21 @@ java -DSystemOut.name=gen_config_board \ -ts_output_name generated/${INI} \ -cache ${SHORT_BOARDNAME} \ -cache_zip_file tunerstudio/generated/cache.zip \ - -with_c_defines true \ - -initialize_to_zero true \ + -with_c_defines $SOMETHINGSOMETHING \ + -initialize_to_zero $SOMETHINGSOMETHING \ -firing_order controllers/algo/firing_order.h \ -signature tunerstudio/generated/signature_${SHORT_BOARDNAME}.txt \ -signature_destination controllers/generated/signature_${SHORT_BOARDNAME}.h \ -java_destination ../java_console/models/src/main/java/com/rusefi/config/generated/Fields.java \ -enumInputFile controllers/algo/rusefi_enums.h \ -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 \ + -c_fsio_constants controllers/generated/fsio_enums_generated.def \ + -c_fsio_getters controllers/generated/fsio_getters.def \ + -c_fsio_names controllers/generated/fsio_names.def \ + -c_fsio_strings controllers/generated/fsio_strings.def \ -prepend config/boards/${BOARDNAME}/prepend.txt [ $? -eq 0 ] || { echo "ERROR generating TunerStudio config for ${BOARDNAME}"; exit 1; } diff --git a/firmware/gen_config_default.sh b/firmware/gen_config_default.sh index 32ee126caa..c8b8591fed 100755 --- a/firmware/gen_config_default.sh +++ b/firmware/gen_config_default.sh @@ -23,7 +23,12 @@ INI=rusefi.ini - +echo "BOARDNAME=${BOARDNAME} SHORT_BOARDNAME=${SHORT_BOARDNAME}" +if [ "${SHORT_BOARDNAME}" = "all" ]; then + SOMETHINGSOMETHING=false +else + SOMETHINGSOMETHING=true +fi bash gen_signature.sh all @@ -38,8 +43,8 @@ java -DSystemOut.name=gen_config \ -ts_output_name generated/${INI} \ -cache ${SHORT_BOARDNAME} \ -cache_zip_file tunerstudio/generated/cache.zip \ - -with_c_defines false \ - -initialize_to_zero false \ + -with_c_defines $SOMETHINGSOMETHING \ + -initialize_to_zero $SOMETHINGSOMETHING \ -firing_order controllers/algo/firing_order.h \ -signature tunerstudio/generated/signature_${SHORT_BOARDNAME}.txt \ -signature_destination controllers/generated/signature_${SHORT_BOARDNAME}.h \