rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gen_config.sh code duplication #2451

This commit is contained in:
Andrey 2021-07-30 16:54:55 -04:00
parent 58202a97f3
commit 2bc09aca74
3 changed files with 71 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
firmware/config/boards/f407-discovery/prepend.txt Normal file
View File

15
firmware/gen_config_board.sh
View File

@ -31,17 +31,28 @@ bash gen_signature.sh ${SHORT_BOARDNAME}
java -DSystemOut.name=gen_config_board \ java -DSystemOut.name=gen_config_board \
-jar ../java_tools/ConfigDefinition.jar \ -jar ../java_tools/ConfigDefinition.jar \
-definition integration/rusefi_config.txt \ -definition integration/rusefi_config.txt \
-romraider integration \
-tool gen_config.sh \ -tool gen_config.sh \
-ts_destination tunerstudio \ -ts_destination tunerstudio \
-board ${BOARDNAME} \
-ts_output_name generated/${INI} \
-cache ${SHORT_BOARDNAME} \ -cache ${SHORT_BOARDNAME} \
-cache_zip_file tunerstudio/generated/cache.zip \ -cache_zip_file tunerstudio/generated/cache.zip \
-with_c_defines true \
-initialize_to_zero true \
-firing_order controllers/algo/firing_order.h \ -firing_order controllers/algo/firing_order.h \
-ts_output_name generated/${INI} \
-signature tunerstudio/generated/signature_${SHORT_BOARDNAME}.txt \ -signature tunerstudio/generated/signature_${SHORT_BOARDNAME}.txt \
-signature_destination controllers/generated/signature_${SHORT_BOARDNAME}.h \ -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_enums.h \
-enumInputFile controllers/algo/rusefi_hw_enums.h \ -enumInputFile controllers/algo/rusefi_hw_enums.h \
-board ${BOARDNAME} \ \
\
\
\
\
\
\
-prepend config/boards/${BOARDNAME}/prepend.txt -prepend config/boards/${BOARDNAME}/prepend.txt
[ $? -eq 0 ] || { echo "ERROR generating TunerStudio config for ${BOARDNAME}"; exit 1; } [ $? -eq 0 ] || { echo "ERROR generating TunerStudio config for ${BOARDNAME}"; exit 1; }

54
firmware/gen_config_default.sh
View File

@ -1,34 +1,68 @@
#!/bin/bash
# file gen_config_default.sh
mkdir build mkdir build
# todo gen_config.sh code duplication https://github.com/rusefi/rusefi/issues/2451
set -e
rm -f gen_config.log rm -f gen_config.log
rm -f gen_config_board.log rm -f gen_config_board.log
BOARDNAME=f407-discovery
SHORT_BOARDNAME=all
INI=rusefi.ini
bash gen_signature.sh all bash gen_signature.sh all
java -DSystemOut.name=gen_config \ java -DSystemOut.name=gen_config \
-jar ../java_tools/ConfigDefinition.jar \ -jar ../java_tools/ConfigDefinition.jar \
-definition integration/rusefi_config.txt \ -definition integration/rusefi_config.txt \
-romraider integration \ -romraider integration \
-tool gen_config.sh \
-ts_destination tunerstudio \ -ts_destination tunerstudio \
-ts_output_name generated/rusefi.ini \ -board ${BOARDNAME} \
-cache . \ -ts_output_name generated/${INI} \
-cache ${SHORT_BOARDNAME} \
-cache_zip_file tunerstudio/generated/cache.zip \ -cache_zip_file tunerstudio/generated/cache.zip \
-with_c_defines false \ -with_c_defines false \
-initialize_to_zero false \ -initialize_to_zero false \
-tool gen_config.sh \
-c_defines controllers/generated/rusefi_generated.h \
-firing_order controllers/algo/firing_order.h \ -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_destination controllers/generated/engine_configuration_generated_structures.h \
-c_fsio_constants controllers/generated/fsio_enums_generated.def \ -c_fsio_constants controllers/generated/fsio_enums_generated.def \
-c_fsio_getters controllers/generated/fsio_getters.def \ -c_fsio_getters controllers/generated/fsio_getters.def \
-c_fsio_names controllers/generated/fsio_names.def \ -c_fsio_names controllers/generated/fsio_names.def \
-c_fsio_strings controllers/generated/fsio_strings.def \ -c_fsio_strings controllers/generated/fsio_strings.def \
-java_destination ../java_console/models/src/main/java/com/rusefi/config/generated/Fields.java \ -prepend config/boards/${BOARDNAME}/prepend.txt
-signature tunerstudio/generated/signature_all.txt \
-signature_destination controllers/generated/signature_all.h \ [ $? -eq 0 ] || { echo "ERROR generating TunerStudio config for ${BOARDNAME}"; exit 1; }
-enumInputFile controllers/algo/rusefi_enums.h \
-romraider_destination ../java_console/rusefi.xml
[ $? -eq 0 ] || { echo "ERROR generating default"; exit 1; }
exit 0 exit 0