diff --git a/java_tools/configuration_definition_base/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java b/java_tools/configuration_definition_base/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java index 785a424d26..e66865d274 100644 --- a/java_tools/configuration_definition_base/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java +++ b/java_tools/configuration_definition_base/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java @@ -15,8 +15,6 @@ public class LiveDataProcessor { private final static String header = "// generated by gen_live_documentation.sh / LiveDataProcessor.java\n"; - public final static String enumContentFileName = "console/binary/generated/live_data_ids.h"; - public static final String STATE_DICTIONARY_FACTORY_JAVA = "../java_console/io/src/main/java/com/rusefi/enums/StateDictionaryFactory.java"; public static final String JAVA_DESTINATION = "../java_console/models/src/main/java/com/rusefi/config/generated/"; @@ -93,6 +91,10 @@ public class LiveDataProcessor { return destinationFolder + "console/binary/generated/"; } + public String getEnumContentFileName() { + return getTsOutputsDestination() + "live_data_ids.h"; + } + public String getGauges() { return getTsOutputsDestination() + "gauges.ini"; } @@ -336,7 +338,7 @@ public class LiveDataProcessor { private void writeFiles() throws IOException { gaugeConsumer.endFile(); - try (LazyFile fw = fileFactory.create(enumContentFileName)) { + try (LazyFile fw = fileFactory.create(getEnumContentFileName())) { fw.write(enumContent.toString()); fw.write(baseAddressCHeader.toString()); } diff --git a/java_tools/configuration_definition_base/src/test/java/com/rusefi/ldmp/LiveDataProcessorTest.java b/java_tools/configuration_definition_base/src/test/java/com/rusefi/ldmp/LiveDataProcessorTest.java index b74e2c79eb..3811b0a227 100644 --- a/java_tools/configuration_definition_base/src/test/java/com/rusefi/ldmp/LiveDataProcessorTest.java +++ b/java_tools/configuration_definition_base/src/test/java/com/rusefi/ldmp/LiveDataProcessorTest.java @@ -5,7 +5,6 @@ import com.rusefi.output.SdCardFieldsContent; import org.junit.jupiter.api.Test; import java.io.*; -import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; @@ -136,6 +135,6 @@ public class LiveDataProcessorTest { "LDS_output_channels,\n" + "} live_data_e;\n" + "#define WBO_CHANNELS_BASE_ADDRESS 0\n" + - "#define OUTPUT_CHANNELS_BASE_ADDRESS 24\n", LiveDataProcessor.enumContentFileName); + "#define OUTPUT_CHANNELS_BASE_ADDRESS 24\n", liveDataProcessor.getEnumContentFileName()); } }