diff --git a/firmware/controllers/algo/accel_enrichment.h b/firmware/controllers/algo/accel_enrichment.h index 532ad49cbf..a18b2263b0 100644 --- a/firmware/controllers/algo/accel_enrichment.h +++ b/firmware/controllers/algo/accel_enrichment.h @@ -11,7 +11,7 @@ #include "cyclic_buffer.h" #include "table_helper.h" -#include "wall_fuel_generated.h" +#include "wall_fuel_state_generated.h" typedef Map3D tps_tps_Map3D_t; diff --git a/firmware/controllers/generated/wall_fuel_generated.h b/firmware/controllers/generated/wall_fuel_state_generated.h similarity index 100% rename from firmware/controllers/generated/wall_fuel_generated.h rename to firmware/controllers/generated/wall_fuel_state_generated.h diff --git a/firmware/gen_line_documentation_one_file.sh b/firmware/gen_line_documentation_one_file.sh new file mode 100644 index 0000000000..0dbc4abd9c --- /dev/null +++ b/firmware/gen_line_documentation_one_file.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +if [ ! "$1" ] || [ ! "$2" ]; then + printf "Two parameters expected" + exit 1 +fi + +meta_name=$1 +# TODO: programmatically produce java output name based on meta file name +java_output=$2 + +meta_file_name=${meta_name}.txt +header_file="${meta_name}_generated.h" + + +java -DSystemOut.name=gen_live_documentation \ + -jar ../java_tools/ConfigDefinition.jar \ + -definition integration/$meta_file_name \ + -cache_zip_file tunerstudio/generated/cache.zip \ + -cache . \ + -java_destination ../java_console/models/src/main/java/com/rusefi/config/generated/$java_output \ + -c_destination controllers/generated/${header_file} \ No newline at end of file diff --git a/firmware/gen_live_documentation.sh b/firmware/gen_live_documentation.sh index 53c3472fc8..1d11a2957e 100755 --- a/firmware/gen_live_documentation.sh +++ b/firmware/gen_live_documentation.sh @@ -2,45 +2,15 @@ rm gen_live_documentation.log -java -DSystemOut.name=gen_live_documentation \ - -jar ../java_tools/ConfigDefinition.jar \ - -definition integration/pid_state.txt \ - -cache_zip_file tunerstudio/generated/cache.zip \ - -cache . \ - -java_destination ../java_console/models/src/main/java/com/rusefi/config/generated/PidState.java \ - -c_destination controllers/generated/pid_state_generated.h +bash gen_line_documentation_one_file.sh pid_state.txt PidState.java -java -DSystemOut.name=gen_live_documentation \ - -jar ../java_tools/ConfigDefinition.jar \ - -definition integration/engine_state.txt \ - -cache_zip_file tunerstudio/generated/cache.zip \ - -cache . \ - -java_destination ../java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java \ - -c_destination controllers/generated/engine_state_generated.h +bash gen_line_documentation_one_file.sh engine_state EngineState.java -java -DSystemOut.name=gen_live_documentation \ - -jar ../java_tools/ConfigDefinition.jar \ - -definition integration/trigger_central.txt \ - -cache_zip_file tunerstudio/generated/cache.zip \ - -cache . \ - -java_destination ../java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java \ - -c_destination controllers/generated/trigger_central_generated.h +bash gen_line_documentation_one_file.sh trigger_centralTriggerCentral.java -java -DSystemOut.name=gen_live_documentation \ - -jar ../java_tools/ConfigDefinition.jar \ - -definition integration/trigger_state.txt \ - -cache_zip_file tunerstudio/generated/cache.zip \ - -cache . \ - -java_destination ../java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java \ - -c_destination controllers/generated/trigger_state_generated.h +bash gen_line_documentation_one_file.sh trigger_state.txt TriggerState.java -java -DSystemOut.name=gen_live_documentation \ - -jar ../java_tools/ConfigDefinition.jar \ - -definition integration/wall_fuel_state.txt \ - -cache_zip_file tunerstudio/generated/cache.zip \ - -cache . \ - -java_destination ../java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java \ - -c_destination controllers/generated/wall_fuel_generated.h +bash gen_line_documentation_one_file.sh wall_fuel_state.txtWallFuelState.java java -DSystemOut.name=gen_live_documentation \ -cp ../java_tools/ConfigDefinition.jar \