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

generate java enum from C enum? generate both C and java from yaml? #2102 

refactoring: code duplication
This commit is contained in:
rusefillc 2021-10-23 12:48:49 -04:00
parent 9b58430d53
commit bbaf743b19
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
firmware/config/boards/subaru_eg33/config/gen_config.sh
View File

@ -6,17 +6,24 @@ BOARDNAME=subaru_eg33
SHORT_BOARDNAME=${BOARDNAME}_f7 SHORT_BOARDNAME=${BOARDNAME}_f7
BOARD_DIR=config/boards/${BOARDNAME} BOARD_DIR=config/boards/${BOARDNAME}
bash gen_signature.sh ${SHORT_BOARDNAME} bash gen_signature.sh ${SHORT_BOARDNAME}
source gen_config_common.sh
echo "Using COMMON_GEN_CONFIG [$COMMON_GEN_CONFIG]"
java \ java \
-DSystemOut.name=gen_config_subaru_eg33 \ -DSystemOut.name=gen_config_subaru_eg33 \
-jar ../java_tools/ConfigDefinition.jar \ $COMMON_GEN_CONFIG \
-definition integration/rusefi_config.txt \
-cache ${SHORT_BOARDNAME} \ -cache ${SHORT_BOARDNAME} \
-cache_zip_file tunerstudio/generated/cache.zip \ -cache_zip_file tunerstudio/generated/cache.zip \
-ts_destination tunerstudio \ -ts_destination tunerstudio \
-tool ${BOARD_DIR}/config/gen_config.sh \ -tool ${BOARD_DIR}/config/gen_config.sh \
-firing_order controllers/algo/firing_order.h \
-with_c_defines false \ -with_c_defines false \
-initialize_to_zero false \ -initialize_to_zero false \
-ts_output_name generated/rusefi_${SHORT_BOARDNAME}.ini \ -ts_output_name generated/rusefi_${SHORT_BOARDNAME}.ini \
@ -24,7 +31,6 @@ java \
-c_destination ${BOARD_DIR}/config/controllers/algo/engine_configuration_generated_structures.h \ -c_destination ${BOARD_DIR}/config/controllers/algo/engine_configuration_generated_structures.h \
-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 \
-enumInputFile controllers/algo/rusefi_enums.h \
-enumInputFile ${BOARD_DIR}/rusefi_hw_enums.h \ -enumInputFile ${BOARD_DIR}/rusefi_hw_enums.h \
-board ${BOARDNAME} \ -board ${BOARDNAME} \
-prepend config/boards/${BOARDNAME}/prepend.txt -prepend config/boards/${BOARDNAME}/prepend.txt

8
firmware/gen_config_board.sh
View File

@ -42,10 +42,12 @@ if [ "" = "$BOARD_SPECIFIC_URL" ]; then
fi fi
echo "BOARD_SPECIFIC_URL=[$BOARD_SPECIFIC_URL]" echo "BOARD_SPECIFIC_URL=[$BOARD_SPECIFIC_URL]"
source gen_config_common.sh
echo "Using COMMON_GEN_CONFIG [$COMMON_GEN_CONFIG]"
# work in progress: migrating to rusefi_${BUNDLE_NAME}.txt # work in progress: migrating to rusefi_${BUNDLE_NAME}.txt
java -DSystemOut.name=gen_config_board \ java -DSystemOut.name=gen_config_board \
-jar ../java_tools/ConfigDefinition.jar \ $COMMON_GEN_CONFIG \
-definition integration/rusefi_config.txt \
-romraider integration \ -romraider integration \
-tool gen_config.sh \ -tool gen_config.sh \
-ts_destination tunerstudio \ -ts_destination tunerstudio \
@ -55,11 +57,9 @@ java -DSystemOut.name=gen_config_board \
-cache_zip_file tunerstudio/generated/cache.zip \ -cache_zip_file tunerstudio/generated/cache.zip \
-with_c_defines $SOMETHINGSOMETHING \ -with_c_defines $SOMETHINGSOMETHING \
-initialize_to_zero $SOMETHINGSOMETHING \ -initialize_to_zero $SOMETHINGSOMETHING \
-firing_order controllers/algo/firing_order.h \
-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 \ -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 \ -enumInputFile controllers/algo/rusefi_hw_enums.h \
-romraider_destination ../java_console/rusefi.xml \ -romraider_destination ../java_console/rusefi.xml \
-c_defines controllers/generated/rusefi_generated.h \ -c_defines controllers/generated/rusefi_generated.h \

4
firmware/gen_config_common.sh Normal file
View File

@ -0,0 +1,4 @@
COMMON_GEN_CONFIG="-jar ../java_tools/ConfigDefinition.jar \
-enumInputFile controllers/algo/rusefi_enums.h \
-firing_order controllers/algo/firing_order.h \
-definition integration/rusefi_config.txt"