diff --git a/java_console/shared_io/src/main/java/com/rusefi/rusEFIVersion.java b/java_console/shared_io/src/main/java/com/rusefi/rusEFIVersion.java index e57cbaa19f..3fa27daa29 100644 --- a/java_console/shared_io/src/main/java/com/rusefi/rusEFIVersion.java +++ b/java_console/shared_io/src/main/java/com/rusefi/rusEFIVersion.java @@ -6,7 +6,7 @@ import java.net.URL; import java.util.concurrent.atomic.AtomicReference; public class rusEFIVersion { - public static final int CONSOLE_VERSION = 20220101; + public static final int CONSOLE_VERSION = 20220110; public static AtomicReference firmwareVersion = new AtomicReference<>("N/A"); public static long classBuildTimeMillis() { diff --git a/java_console/ui/src/main/java/com/rusefi/livedata/LiveDataParserPanel.java b/java_console/ui/src/main/java/com/rusefi/livedata/LiveDataParserPanel.java index 2d870703e4..2084494cca 100644 --- a/java_console/ui/src/main/java/com/rusefi/livedata/LiveDataParserPanel.java +++ b/java_console/ui/src/main/java/com/rusefi/livedata/LiveDataParserPanel.java @@ -173,7 +173,7 @@ public class LiveDataParserPanel { } @NotNull - private static LiveDataParserPanel createLiveDataParserPanel(UIContext uiContext, final live_data_e live_data_e, final Field[] values, String fileName) { + public static LiveDataParserPanel createLiveDataParserPanel(UIContext uiContext, final live_data_e live_data_e, final Field[] values, String fileName) { AtomicReference reference = new AtomicReference<>(); LiveDataParserPanel livePanel = new LiveDataParserPanel(uiContext, name -> { diff --git a/java_console/ui/src/main/java/com/rusefi/ui/LiveDataPane.java b/java_console/ui/src/main/java/com/rusefi/ui/LiveDataPane.java index bb472b6da4..a7a4936e27 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/LiveDataPane.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/LiveDataPane.java @@ -1,7 +1,10 @@ package com.rusefi.ui; import com.rusefi.CodeWalkthrough; +import com.rusefi.config.Field; import com.rusefi.core.Sensor; +import com.rusefi.enums.live_data_e; +import com.rusefi.ldmp.StateDictionary; import com.rusefi.livedata.LiveDataParserPanel; import com.rusefi.livedata.LiveDataView; import com.rusefi.ui.util.UiUtils; @@ -35,10 +38,12 @@ public class LiveDataPane { JPanel leftList = new JPanel(new VerticalFlowLayout()); - for (LiveDataView view : LiveDataView.values()) { - JPanel liveDataParserContent = LiveDataParserPanel.createLiveDataParserContent(uiContext, view); + for (live_data_e view : live_data_e.values()) { + String fileName = StateDictionary.INSTANCE.getFileName(view); + Field[] values = StateDictionary.INSTANCE.getFields(view); + JPanel liveDataParserContent = LiveDataParserPanel.createLiveDataParserPanel(uiContext, view, values, fileName).getContent(); - JButton shortCut = new JButton(view.getFileName()); + JButton shortCut = new JButton(fileName); shortCut.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { diff --git a/java_console/ui/src/test/java/com/rusefi/livedata/LiveDataConventionTest.java b/java_console/ui/src/test/java/com/rusefi/livedata/LiveDataConventionTest.java index ab35be3a03..3fdb7dfb28 100644 --- a/java_console/ui/src/test/java/com/rusefi/livedata/LiveDataConventionTest.java +++ b/java_console/ui/src/test/java/com/rusefi/livedata/LiveDataConventionTest.java @@ -2,6 +2,8 @@ package com.rusefi.livedata; import com.rusefi.CodeWalkthrough; import com.rusefi.config.Field; +import com.rusefi.enums.live_data_e; +import com.rusefi.ldmp.StateDictionary; import com.rusefi.ui.livedata.SourceCodePainter; import com.rusefi.ui.livedata.VariableValueSource; import org.antlr.v4.runtime.tree.ParseTree; @@ -18,8 +20,11 @@ public class LiveDataConventionTest { @Test @Ignore public void assertLiveDataConvention() throws IOException, URISyntaxException { - for (LiveDataView view : LiveDataView.values()) - assertFile(view.getFileName(), view.getValues()); + for (live_data_e view : live_data_e.values()) { + String fileName = StateDictionary.INSTANCE.getFileName(view); + Field[] values = StateDictionary.INSTANCE.getFields(view); + assertFile(fileName, values); + } } private void assertFile(String fileName, Field[] values) throws IOException, URISyntaxException {