diff --git a/firmware/gen_live_documentation.sh b/firmware/gen_live_documentation.sh index c086740091..2d35a3c85e 100755 --- a/firmware/gen_live_documentation.sh +++ b/firmware/gen_live_documentation.sh @@ -4,7 +4,7 @@ rm gen_live_documentation.log java -DSystemOut.name=logs/gen_live_documentation \ -cp ../java_tools/ConfigDefinition.jar \ - com.rusefi.ldmp.UsagesReader integration/LiveData.yaml + com.rusefi.ldmp.LiveDataProcessor integration/LiveData.yaml [ $? -eq 0 ] || { echo "ERROR generating"; exit 1; } bash gen_output_channels.sh diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/ReaderState.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ReaderState.java index ffe0f146d0..8150c1d8a5 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/ReaderState.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/ReaderState.java @@ -352,7 +352,7 @@ public class ReaderState { public void addPrepend(String fileName) { if (fileName == null || fileName.isEmpty()) { - // see UsagesReader use-case with dynamic prepend usage + // see LiveDataProcessor use-case with dynamic prepend usage return; } prependFiles.add(fileName); 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/LiveDataProcessor.java similarity index 91% rename from java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/UsagesReader.java rename to java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java index f00b5b8d6e..9ffe3baef1 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/LiveDataProcessor.java @@ -16,10 +16,10 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; -public class UsagesReader { - private final static Logging log = Logging.getLogging(UsagesReader.class); +public class LiveDataProcessor { + private final static Logging log = Logging.getLogging(LiveDataProcessor.class); - private final static String header = "// generated by gen_live_documentation.sh / UsagesReader.java\n"; + private final static String header = "// generated by gen_live_documentation.sh / LiveDataProcessor.java\n"; private final StringBuilder enumContent = new StringBuilder(header + "#pragma once\n" + @@ -34,7 +34,7 @@ public class UsagesReader { private final StringBuilder fragmentsContent = new StringBuilder(header); - private final String extraPrepend = System.getProperty("UsagesReader.extra_prepend"); + private final String extraPrepend = System.getProperty("LiveDataProcessor.extra_prepend"); public static void main(String[] args) throws IOException { if (args.length != 1) { @@ -45,10 +45,10 @@ public class UsagesReader { Yaml yaml = new Yaml(); Map data = yaml.load(new FileReader(yamlFileName)); - UsagesReader usagesReader = new UsagesReader(); + LiveDataProcessor liveDataProcessor = new LiveDataProcessor(); - int sensorTsPosition = usagesReader.handleYaml(data, null); - usagesReader.writeFiles(); + int sensorTsPosition = liveDataProcessor.handleYaml(data, null); + liveDataProcessor.writeFiles(); log.info("TS_TOTAL_OUTPUT_SIZE=" + sensorTsPosition); try (FileWriter fw = new FileWriter("console/binary/generated/total_live_data_generated.h")) { @@ -57,15 +57,15 @@ public class UsagesReader { } try (FileWriter fw = new FileWriter("console/binary/generated/sensors.java")) { - fw.write(usagesReader.totalSensors.toString()); + fw.write(liveDataProcessor.totalSensors.toString()); } try (FileWriter fw = new FileWriter("console/binary/generated/fancy_content.ini")) { - fw.write(usagesReader.fancyNewStuff.toString()); + fw.write(liveDataProcessor.fancyNewStuff.toString()); } try (FileWriter fw = new FileWriter("console/binary/generated/fancy_menu.ini")) { - fw.write(usagesReader.fancyNewMenu.toString()); + fw.write(liveDataProcessor.fancyNewMenu.toString()); } } diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/JavaSensorsConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/JavaSensorsConsumer.java index e8ce13e514..96ab0798bf 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/JavaSensorsConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/JavaSensorsConsumer.java @@ -54,7 +54,7 @@ public class JavaSensorsConsumer implements ConfigurationConsumer { } tsPosition += configField.getSize(next); - // this value would be consumed by UsagesReader + // this value would be consumed by LiveDataProcessor // todo: too many variables that's fragile shall we move tsPosition to iterator state? sensorTsPosition = tsPosition;