diff --git a/firmware/gen_enum_to_string.sh b/firmware/gen_enum_to_string.sh index 5c3bb04f1b..2743c533d5 100755 --- a/firmware/gen_enum_to_string.sh +++ b/firmware/gen_enum_to_string.sh @@ -4,8 +4,9 @@ echo "This batch files reads rusefi_enums.h and produces auto_generated_enums.* rm gen_enum_to_string.log -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; } +# 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/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/UsagesReader.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/UsagesReader.java index 68b82b3aa7..f00b5b8d6e 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/UsagesReader.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/UsagesReader.java @@ -1,6 +1,8 @@ package com.rusefi.ldmp; import com.devexperts.logging.Logging; +import com.rusefi.EnumToString; +import com.rusefi.InvokeReader; import com.rusefi.ReaderState; import com.rusefi.output.*; import org.yaml.snakeyaml.Yaml; @@ -10,6 +12,7 @@ import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.util.ArrayList; +import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; @@ -174,12 +177,17 @@ public class UsagesReader { } private void writeFiles() throws IOException { - try (FileWriter fw = new FileWriter("console/binary/generated/live_data_ids.h")) { + String liveDataIdsHeader = "console/binary/generated/live_data_ids.h"; + try (FileWriter fw = new FileWriter(liveDataIdsHeader)) { fw.write(enumContent.toString()); } try (FileWriter fw = new FileWriter("console/binary/generated/live_data_fragments.h")) { fw.write(fragmentsContent.toString()); } + + String outputPath = "../java_console/io/src/main/java/com/rusefi/enums"; + InvokeReader request = new InvokeReader(outputPath, Collections.singletonList(liveDataIdsHeader)); + EnumToString.handleRequest(request); } } diff --git a/java_tools/enum2string.jar b/java_tools/enum2string.jar index 6a1b9cb2cc..42b44ccffb 100644 Binary files a/java_tools/enum2string.jar and b/java_tools/enum2string.jar differ