From 04afb8e63da2dfa7e5d2c807c650e94eb02a5924 Mon Sep 17 00:00:00 2001 From: Andrey Date: Sun, 15 Jan 2023 05:55:54 -0500 Subject: [PATCH] live_data_e part of the process was broken? --- firmware/gen_enum_to_string.sh | 4 ---- firmware/gen_live_documentation.sh | 3 +++ .../io/src/main/java/com/rusefi/enums/live_data_e.java | 5 ++++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/firmware/gen_enum_to_string.sh b/firmware/gen_enum_to_string.sh index 3211f329d4..2bbc9daa26 100755 --- a/firmware/gen_enum_to_string.sh +++ b/firmware/gen_enum_to_string.sh @@ -4,10 +4,6 @@ echo "This batch files reads rusefi_enums.h and produces auto_generated_enums.* rm gen_enum_to_string.log -# todo: remove me soon, UsageReader generates java by itself now! -#java -DSystemOut.name=logs/gen_java_enum -cp ../java_tools/enum2string.jar com.rusefi.ToJavaEnum -enumInputFile console/binary/generated/live_data_ids.h -outputPath ../java_console/io/src/main/java/com/rusefi/enums -#[ $? -eq 0 ] || { echo "ERROR generating live data ids"; exit 1; } - java -DSystemOut.name=logs/gen_java_enum -cp ../java_tools/enum2string.jar com.rusefi.ToJavaEnum -enumInputFile controllers/sensors/sensor_type.h -outputPath ../java_console/io/src/main/java/com/rusefi/enums [ $? -eq 0 ] || { echo "ERROR generating sensors"; exit 1; } diff --git a/firmware/gen_live_documentation.sh b/firmware/gen_live_documentation.sh index 2d35a3c85e..e282965064 100755 --- a/firmware/gen_live_documentation.sh +++ b/firmware/gen_live_documentation.sh @@ -7,4 +7,7 @@ java -DSystemOut.name=logs/gen_live_documentation \ com.rusefi.ldmp.LiveDataProcessor integration/LiveData.yaml [ $? -eq 0 ] || { echo "ERROR generating"; exit 1; } +java -DSystemOut.name=logs/gen_java_enum -cp ../java_tools/enum2string.jar com.rusefi.ToJavaEnum -enumInputFile console/binary/generated/live_data_ids.h -outputPath ../java_console/io/src/main/java/com/rusefi/enums +[ $? -eq 0 ] || { echo "ERROR generating live data ids"; exit 1; } + bash gen_output_channels.sh diff --git a/java_console/io/src/main/java/com/rusefi/enums/live_data_e.java b/java_console/io/src/main/java/com/rusefi/enums/live_data_e.java index 1a873b05f7..911d1d5d32 100644 --- a/java_console/io/src/main/java/com/rusefi/enums/live_data_e.java +++ b/java_console/io/src/main/java/com/rusefi/enums/live_data_e.java @@ -1,15 +1,18 @@ package com.rusefi.enums; +// based on ./console/binary/generated/live_data_ids.h //auto-generated by ToJavaEnum.java public enum live_data_e { + LDS_fuel_computer, + LDS_timing_state, LDS_output_channels, LDS_knock_controller, LDS_high_pressure_fuel_pump, LDS_injector_model, - LDS_fuel_computer, LDS_launch_control_state, + LDS_antilag_system_state, LDS_boost_control, LDS_ac_control, LDS_fan_control,