From 2d901f8106fd8bdc7dbda9812620455e1c4b7ca9 Mon Sep 17 00:00:00 2001 From: Andrey Date: Sun, 17 Apr 2022 18:01:13 -0400 Subject: [PATCH] progress --- .../src/main/java/com/rusefi/ldmp/UsagesReader.java | 2 +- .../src/main/java/com/rusefi/output/JavaSensorsConsumer.java | 4 ---- .../main/java/com/rusefi/output/OutputsSectionConsumer.java | 3 ++- .../test/java/com/rusefi/test/JavaSensorsConsumerTest.java | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) 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 e6dfccfd85..0c476d14c5 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 @@ -68,7 +68,7 @@ public class UsagesReader { } private int handleYaml(Map data, EntryHandler _handler) throws IOException { - JavaSensorsConsumer javaSensorsConsumer = new JavaSensorsConsumer(0); + JavaSensorsConsumer javaSensorsConsumer = new JavaSensorsConsumer(); EntryHandler handler = new EntryHandler() { 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 6b5b508a16..239d9c54c3 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 @@ -10,10 +10,6 @@ public class JavaSensorsConsumer implements ConfigurationConsumer { private final StringBuilder sb = new StringBuilder(); - public JavaSensorsConsumer(int sensorTsPosition) { - this.sensorTsPosition = sensorTsPosition; - } - @Override public void startFile() { } diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/OutputsSectionConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/OutputsSectionConsumer.java index 2c12d12af6..bd22e8efb2 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/OutputsSectionConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/OutputsSectionConsumer.java @@ -10,6 +10,7 @@ import java.io.*; public class OutputsSectionConsumer implements ConfigurationConsumer { private final String tsOutputsSectionFileName; private final TsOutput tsOutput; + public int sensorTsPosition; public OutputsSectionConsumer(String tsOutputsSectionFileName) { this.tsOutputsSectionFileName = tsOutputsSectionFileName; @@ -24,7 +25,7 @@ public class OutputsSectionConsumer implements ConfigurationConsumer { public void handleEndStruct(ReaderState readerState, ConfigStructure structure) throws IOException { System.out.println("handleEndStruct"); - tsOutput.run(readerState, structure, 0); + sensorTsPosition = tsOutput.run(readerState, structure, sensorTsPosition); if (readerState.stack.isEmpty()) { if (tsOutputsSectionFileName != null) { diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/test/JavaSensorsConsumerTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/JavaSensorsConsumerTest.java index 4b3b614054..686d113135 100644 --- a/java_tools/configuration_definition/src/test/java/com/rusefi/test/JavaSensorsConsumerTest.java +++ b/java_tools/configuration_definition/src/test/java/com/rusefi/test/JavaSensorsConsumerTest.java @@ -28,7 +28,7 @@ public class JavaSensorsConsumerTest { "\tuint8_t vehicleSpeedKph\n" + "\tint8_t autoscale internalMcuTemperature;mcu;\"deg C\",1, 0, 0, 0, 0\n" + "end_struct\n"; - JavaSensorsConsumer javaSensorsConsumer = new JavaSensorsConsumer(0); + JavaSensorsConsumer javaSensorsConsumer = new JavaSensorsConsumer(); state.readBufferedReader(outputChannels, javaSensorsConsumer); assertEquals("RPMValue(\"hello\", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 4, 1.0, 0.0, 8000.0, \"RPM\"),\n" +