From 6ae878a097ebb5799be3cbb01931abb5becb57f1 Mon Sep 17 00:00:00 2001 From: David Holdeman Date: Fri, 19 Jun 2020 07:45:00 -0700 Subject: [PATCH] moved params back to script (#1521) --- firmware/gen_config.conf | 18 ------------------ firmware/gen_config.sh | 19 ++++++++++++++++++- 2 files changed, 18 insertions(+), 19 deletions(-) delete mode 100644 firmware/gen_config.conf diff --git a/firmware/gen_config.conf b/firmware/gen_config.conf deleted file mode 100644 index 8dfb322f7b..0000000000 --- a/firmware/gen_config.conf +++ /dev/null @@ -1,18 +0,0 @@ --DSystemOut.name=gen_config --Drusefi.generator.lazyfile.enabled=true --jar ../java_tools/ConfigDefinition.jar --definition integration/rusefi_config.txt --romraider integration --ts_destination tunerstudio --with_c_defines false --initialize_to_zero false --tool gen_config.sh --c_defines controllers/generated/rusefi_generated.h --firing_order controllers/algo/firing_order.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 --java_destination ../java_console/models/src/com/rusefi/config/generated/Fields.java --romraider_destination ../java_console/rusefi.xml diff --git a/firmware/gen_config.sh b/firmware/gen_config.sh index 3bc7241365..33bbfe5786 100644 --- a/firmware/gen_config.sh +++ b/firmware/gen_config.sh @@ -11,7 +11,24 @@ rm gen_config_board.log mkdir build -java $(< ../gen_config.conf) +java -DSystemOut.name=gen_config \ + -Drusefi.generator.lazyfile.enabled=true \ + -jar ../java_tools/ConfigDefinition.jar \ + -definition integration/rusefi_config.txt \ + -romraider integration \ + -ts_destination tunerstudio \ + -with_c_defines false \ + -initialize_to_zero false \ + -tool gen_config.sh \ + -c_defines controllers/generated/rusefi_generated.h \ + -firing_order controllers/algo/firing_order.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 \ + -java_destination ../java_console/models/src/com/rusefi/config/generated/Fields.java \ + -romraider_destination ../java_console/rusefi.xml [ $? -eq 0 ] || (echo "ERROR generating"; exit $?)