From 259ecc4bbf151859957ff8588fdb98021b4b738a Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sun, 16 Feb 2025 08:56:17 -0500 Subject: [PATCH] Console should get much smarter around compatibility with older units #6845 only:preparation --- .../config/generated/VariableRegistryValues.java | 4 ++++ .../src/main/java/com/rusefi/core/Sensor.java | 4 ++-- .../main/java/com/rusefi/waves/EngineReport.java | 4 ++-- .../test/java/com/rusefi/autotune/AfrDataPoint.java | 13 ++++++++----- .../test/java/com/rusefi/autotune/FuelAutoTune.java | 4 ++-- .../com/rusefi/autotune/test/FuelAutoTuneTest.java | 4 +++- .../test/java/com/rusefi/config/test/FieldTest.java | 3 ++- .../rusefi/waves/test/EngineChartParserTest.java | 3 ++- .../ui/src/main/java/com/rusefi/BenchTestPane.java | 11 ++++++----- .../main/java/com/rusefi/ui/PcanConnectorUI.java | 3 ++- .../src/test/java/com/rusefi/ServerTest.java | 3 ++- .../proxy/client/LocalApplicationProxyTest.java | 10 +++++----- .../rusefi/server/ControllerConnectionState.java | 3 ++- .../java/com/rusefi/ts_plugin/TuneUploadTab.java | 3 ++- .../tools/tune/WriteSimulatorConfiguration.java | 3 ++- 15 files changed, 46 insertions(+), 29 deletions(-) create mode 100644 java_console/models/src/main/java/com/rusefi/config/generated/VariableRegistryValues.java diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/VariableRegistryValues.java b/java_console/models/src/main/java/com/rusefi/config/generated/VariableRegistryValues.java new file mode 100644 index 0000000000..894e88d400 --- /dev/null +++ b/java_console/models/src/main/java/com/rusefi/config/generated/VariableRegistryValues.java @@ -0,0 +1,4 @@ +package com.rusefi.config.generated; + +public class VariableRegistryValues extends Fields { +} diff --git a/java_console/models/src/main/java/com/rusefi/core/Sensor.java b/java_console/models/src/main/java/com/rusefi/core/Sensor.java index 297ba32523..e041a43114 100644 --- a/java_console/models/src/main/java/com/rusefi/core/Sensor.java +++ b/java_console/models/src/main/java/com/rusefi/core/Sensor.java @@ -16,7 +16,7 @@ import java.util.Comparator; import java.util.Set; import java.util.TreeSet; -import static com.rusefi.config.generated.Fields.*; +import static com.rusefi.config.generated.VariableRegistryValues.*; /** * @author Andrey Belomutskiy @@ -83,7 +83,7 @@ public enum Sensor implements BinaryLogEntry { // // TPS/load AE // engineLoadAccelDelta("load accel delta", SensorCategory.FUEL, FieldType.INT16, 76, 1.0 / PACK_MULT_PERCENT, -5, 5, "ratio"), // deltaTps(Fields.GAUGE_NAME_FUEL_TPS_ROC, SensorCategory.FUEL, FieldType.INT16, 78, 1.0 / PACK_MULT_PERCENT, -100, 100, "%"), - tpsAccelFuel(Fields.GAUGE_NAME_FUEL_TPS_EXTRA, SensorCategory.FUEL, FieldType.INT16, TsOutputs.TPSACCELFUEL, 1.0 / PACK_MULT_MS, 0, 200, "ms"), + tpsAccelFuel(GAUGE_NAME_FUEL_TPS_EXTRA, SensorCategory.FUEL, FieldType.INT16, TsOutputs.TPSACCELFUEL, 1.0 / PACK_MULT_MS, 0, 200, "ms"), // // // Ignition // ignitionAdvance("ignition timing", SensorCategory.OPERATIONS, FieldType.INT16, 84, 1.0 / PACK_MULT_ANGLE, 30, 140, "deg"), diff --git a/java_console/models/src/main/java/com/rusefi/waves/EngineReport.java b/java_console/models/src/main/java/com/rusefi/waves/EngineReport.java index e4dd6b1a1e..b2f7bcc27e 100644 --- a/java_console/models/src/main/java/com/rusefi/waves/EngineReport.java +++ b/java_console/models/src/main/java/com/rusefi/waves/EngineReport.java @@ -8,8 +8,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import static com.rusefi.config.generated.Fields.PROTOCOL_ES_DOWN; -import static com.rusefi.config.generated.Fields.PROTOCOL_ES_UP; +import static com.rusefi.config.generated.VariableRegistryValues.PROTOCOL_ES_DOWN; +import static com.rusefi.config.generated.VariableRegistryValues.PROTOCOL_ES_UP; /** * A model of a digital signal represented as a sequence of {@link UpDown} diff --git a/java_console/models/src/test/java/com/rusefi/autotune/AfrDataPoint.java b/java_console/models/src/test/java/com/rusefi/autotune/AfrDataPoint.java index 0417ccd399..d0fa5e48dd 100644 --- a/java_console/models/src/test/java/com/rusefi/autotune/AfrDataPoint.java +++ b/java_console/models/src/test/java/com/rusefi/autotune/AfrDataPoint.java @@ -2,6 +2,9 @@ package com.rusefi.autotune; import com.rusefi.config.generated.Fields; +import static com.rusefi.config.generated.VariableRegistryValues.FUEL_LOAD_COUNT; +import static com.rusefi.config.generated.VariableRegistryValues.FUEL_RPM_COUNT; + /** * Air/Fuel ratio data point * @@ -19,9 +22,9 @@ public class AfrDataPoint { public AfrDataPoint(double afr, int rpmIndex, int engineLoadIndex, int rpm, double engineLoad) { this.rpm = rpm; this.engineLoad = engineLoad; - if (rpmIndex < 0 || rpmIndex >= Fields.FUEL_RPM_COUNT) + if (rpmIndex < 0 || rpmIndex >= FUEL_RPM_COUNT) throw new IllegalStateException("rpmIndex " + rpmIndex); - if (engineLoadIndex < 0 || engineLoadIndex >= Fields.FUEL_LOAD_COUNT) + if (engineLoadIndex < 0 || engineLoadIndex >= FUEL_LOAD_COUNT) throw new IllegalStateException("engineLoadIndex " + engineLoadIndex); this.afr = afr; this.rpmIndex = rpmIndex; @@ -29,10 +32,10 @@ public class AfrDataPoint { } public static AfrDataPoint valueOf(double afr, int rpm, double engineLoad) { - int rpmIndex = (int) (rpm / 7000.0 * Fields.FUEL_RPM_COUNT); - if (rpmIndex < 0 || rpmIndex >= Fields.FUEL_RPM_COUNT) + int rpmIndex = (int) (rpm / 7000.0 * FUEL_RPM_COUNT); + if (rpmIndex < 0 || rpmIndex >= FUEL_RPM_COUNT) return null; - int engineLoadIndex = (int) (engineLoad / 120.0 * Fields.FUEL_LOAD_COUNT); + int engineLoadIndex = (int) (engineLoad / 120.0 * FUEL_LOAD_COUNT); return new AfrDataPoint(afr, rpmIndex, engineLoadIndex, rpm, engineLoad); } diff --git a/java_console/models/src/test/java/com/rusefi/autotune/FuelAutoTune.java b/java_console/models/src/test/java/com/rusefi/autotune/FuelAutoTune.java index 6e4176a039..94bea184b4 100644 --- a/java_console/models/src/test/java/com/rusefi/autotune/FuelAutoTune.java +++ b/java_console/models/src/test/java/com/rusefi/autotune/FuelAutoTune.java @@ -3,8 +3,8 @@ package com.rusefi.autotune; import java.util.Collection; import static com.rusefi.autotune.MathUtil.square; -import static com.rusefi.config.generated.Fields.FUEL_LOAD_COUNT; -import static com.rusefi.config.generated.Fields.FUEL_RPM_COUNT; +import static com.rusefi.config.generated.VariableRegistryValues.FUEL_LOAD_COUNT; +import static com.rusefi.config.generated.VariableRegistryValues.FUEL_RPM_COUNT; /** * 1/5/2016 diff --git a/java_console/models/src/test/java/com/rusefi/autotune/test/FuelAutoTuneTest.java b/java_console/models/src/test/java/com/rusefi/autotune/test/FuelAutoTuneTest.java index e5b28abf32..8a3fc6a4cf 100644 --- a/java_console/models/src/test/java/com/rusefi/autotune/test/FuelAutoTuneTest.java +++ b/java_console/models/src/test/java/com/rusefi/autotune/test/FuelAutoTuneTest.java @@ -7,6 +7,8 @@ import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; +import static com.rusefi.config.generated.VariableRegistryValues.FUEL_LOAD_COUNT; +import static com.rusefi.config.generated.VariableRegistryValues.FUEL_RPM_COUNT; import static org.junit.jupiter.api.Assertions.assertEquals; /** @@ -111,7 +113,7 @@ public class FuelAutoTuneTest { } static double[][] createVeTable(double value) { - double veMap[][] = new double[Fields.FUEL_LOAD_COUNT][Fields.FUEL_RPM_COUNT]; + double veMap[][] = new double[FUEL_LOAD_COUNT][FUEL_RPM_COUNT]; MathUtil.setArray2D(veMap, value); return veMap; } diff --git a/java_console/models/src/test/java/com/rusefi/config/test/FieldTest.java b/java_console/models/src/test/java/com/rusefi/config/test/FieldTest.java index e83cf19f9d..2d67bca472 100644 --- a/java_console/models/src/test/java/com/rusefi/config/test/FieldTest.java +++ b/java_console/models/src/test/java/com/rusefi/config/test/FieldTest.java @@ -4,6 +4,7 @@ import com.opensr5.ConfigurationImage; import com.rusefi.config.Field; import com.rusefi.config.FieldCommandResponse; import com.rusefi.config.generated.Fields; +import com.rusefi.config.generated.VariableRegistryValues; import com.rusefi.core.Pair; import org.junit.jupiter.api.Test; @@ -31,7 +32,7 @@ public class FieldTest { @Test public void setBooleanValue() { - byte[] config = new byte[Fields.persistent_config_s_size]; + byte[] config = new byte[VariableRegistryValues.persistent_config_s_size]; ConfigurationImage ci = new ConfigurationImage(config); assertFalse(Fields.ISFORCEDINDUCTION.getBooleanValue(ci)); diff --git a/java_console/models/src/test/java/com/rusefi/waves/test/EngineChartParserTest.java b/java_console/models/src/test/java/com/rusefi/waves/test/EngineChartParserTest.java index c2e895aa49..22f1b6a1e5 100644 --- a/java_console/models/src/test/java/com/rusefi/waves/test/EngineChartParserTest.java +++ b/java_console/models/src/test/java/com/rusefi/waves/test/EngineChartParserTest.java @@ -9,6 +9,7 @@ import org.junit.jupiter.api.Test; import java.util.List; +import static com.rusefi.config.generated.Integration.TOP_DEAD_CENTER_MESSAGE; import static com.rusefi.waves.EngineReport.isCloseEnough; import static org.junit.jupiter.api.Assertions.*; @@ -43,7 +44,7 @@ public class EngineChartParserTest { EngineChart result = EngineChartParser.unpackToMap("r!1199!64224414!crank2!u!64225149_3!Injector 2!u!64225149!Spark 1!u!64225249!Injector 2!d!64225303!Spark 1!d!64225649!crank2!d!64226105_4!crank!d!64226980_5!crank2!u!64227730_6!Injector 1!u!64227730!Spark 1!u!64227830!Injector 1!d!64227884!Spark 1!d!64228230!crank2!d!64228678_7!crank2!u!64230212_8!Injector 3!u!64230212!Spark 1!u!64230312!Injector 3!d!64230366!Spark 1!d!64230712!crank2!d!64231156_9!crank!u!64231982_0!crank2!u!64232672_1!Injector 4!u!64232672!Spark 1!u!64232772!Injector 4!d!64232826!Spark 1!d!64233172!crank2!d!64233626_2!r!1200!64234412!crank2!u!64235150_3!Injector 2!u!64235150!Spark 1!u!64235250!Injector 2!d!64235304!Spark 1!d!64235650!crank2!d!64236106_4!crank!d!64236981_5!crank2!u!64237730_6!Injector 1!u!64237730!Spark 1!u!64237830!Injector 1!d!64237884!Spark 1!d!64238230!crank2!d!64238677_7!crank2!u!64240213_8!Injector 3!u!64240213!Spark 1!u!64240313!Injector 3!d!64240367!Spark 1!d!64240713!crank2!d!64241158_9!crank!u!64241982_0!crank2!u!64242674_1!Injector 4!u!64242674!Spark 1!u!64242774!Injector 4!d!64242828!Spark 1!d!64243174!crank2!d!64243625_2!r!1200!64244412!crank2!u!64245149_3!Injector 2!u!64245149!Spark 1!u!64245249!Injector 2!d!64245303!Spark 1!d!64245649!crank2!d!64246106_4!crank!d!64246980_5!crank2!u!64247728_6!Injector 1!u!64247728!Spark 1!u!64247828!Injector 1!d!64247882!Spark 1!d!64248228!crank2!d!64248679_7!crank2!u!64250212_8!Injector 3!u!64250212!Spark 1!u!64250312!Injector 3!d!64250366!Spark 1!d!64250712!crank2!d!64251158_9!crank!u!64251982_0!crank2!u!64252674_1!Injector 4!u!64252674!Spark 1!u!64252774!Injector 4!d!64252828!Spark 1!d!64253174!crank2!d!64253625_2!r!1200!64254412!crank2!u!64255150_3!Injector 2!u!64255150!Spark 1!u!64255250!Injector 2!d!64255304!Spark 1!d!64255650!crank2!d!64256106_4!crank!d!64256982_5!crank2!u!64257728_6!Injector 1!u!64257728!Spark 1!u!64257828!Injector 1!d!64257882!Spark 1!d!64258228!crank2!d!64258678_7!crank2!u!64260214_8!Injector 3!u!64260214!Spark 1!u!64260314!Injector 3!d!64260368!Spark 1!d!64260714!,"); assertFalse(result.getMap().isEmpty()); - StringBuilder revolutions = result.get(Fields.TOP_DEAD_CENTER_MESSAGE); + StringBuilder revolutions = result.get(TOP_DEAD_CENTER_MESSAGE); RevolutionLog rl = RevolutionLog.parseRevolutions(revolutions); diff --git a/java_console/ui/src/main/java/com/rusefi/BenchTestPane.java b/java_console/ui/src/main/java/com/rusefi/BenchTestPane.java index 701cf1f8fe..a981e63c05 100644 --- a/java_console/ui/src/main/java/com/rusefi/BenchTestPane.java +++ b/java_console/ui/src/main/java/com/rusefi/BenchTestPane.java @@ -1,8 +1,8 @@ package com.rusefi; import com.rusefi.binaryprotocol.BinaryProtocol; -import com.rusefi.config.generated.Fields; import com.rusefi.config.generated.Integration; +import com.rusefi.config.generated.VariableRegistryValues; import com.rusefi.core.preferences.storage.PersistentConfiguration; import com.rusefi.ui.MessagesView; import com.rusefi.ui.UIContext; @@ -14,7 +14,8 @@ import java.awt.*; import java.awt.event.ActionListener; import static com.rusefi.CommandControl.TEST; -import static com.rusefi.config.generated.Fields.*; +import static com.rusefi.config.generated.Integration.CMD_STARTER_BENCH; +import static com.rusefi.config.generated.Integration.*; public class BenchTestPane { private final JPanel content = new JPanel(new GridLayout(2, 5)); @@ -100,7 +101,7 @@ public class BenchTestPane { } private Component createSparkTest() { - final JComboBox indexes = createIndexCombo(Fields.MAX_CYLINDER_COUNT); + final JComboBox indexes = createIndexCombo(VariableRegistryValues.MAX_CYLINDER_COUNT); CommandControl panel = new CommandControl(uiContext,"Spark #", "spark.jpg", TEST, indexes) { @Override protected String getCommand() { @@ -111,7 +112,7 @@ public class BenchTestPane { } private Component createInjectorTest() { - final JComboBox indexes = createIndexCombo(Fields.MAX_CYLINDER_COUNT); + final JComboBox indexes = createIndexCombo(VariableRegistryValues.MAX_CYLINDER_COUNT); CommandControl panel = new CommandControl(uiContext,"Injector #", "injector.png", TEST, indexes) { @Override protected String getCommand() { @@ -122,7 +123,7 @@ public class BenchTestPane { } private Component createSolenoidTest() { - final JComboBox indexes = createIndexCombo(Fields.TCU_SOLENOID_COUNT); + final JComboBox indexes = createIndexCombo(VariableRegistryValues.TCU_SOLENOID_COUNT); CommandControl panel = new CommandControl(uiContext,"TCU Solenoid #", "solenoid.jpg", TEST, indexes) { @Override protected String getCommand() { diff --git a/java_console/ui/src/main/java/com/rusefi/ui/PcanConnectorUI.java b/java_console/ui/src/main/java/com/rusefi/ui/PcanConnectorUI.java index d66d880239..0d813072da 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/PcanConnectorUI.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/PcanConnectorUI.java @@ -3,6 +3,7 @@ package com.rusefi.ui; import com.devexperts.logging.Logging; import com.rusefi.NamedThreadFactory; import com.rusefi.config.generated.Fields; +import com.rusefi.config.generated.VariableRegistryValues; import com.rusefi.core.ui.AutoupdateUtil; import com.rusefi.io.can.PCanIoStream; import com.rusefi.tools.CANConnectorStartup; @@ -21,7 +22,7 @@ public class PcanConnectorUI { FrameHelper frame = new FrameHelper(WindowConstants.EXIT_ON_CLOSE); JPanel panel = new JPanel(new BorderLayout()); - panel.add(new JLabel("Running PCAN connector for TS: RX on " + Integer.toString(Fields.CAN_ECU_SERIAL_RX_ID, 16)), BorderLayout.NORTH); + panel.add(new JLabel("Running PCAN connector for TS: RX on " + Integer.toString(VariableRegistryValues.CAN_ECU_SERIAL_RX_ID, 16)), BorderLayout.NORTH); JTextArea logTextArea = new JTextArea(); JPanel panelForScroll = new JPanel(new BorderLayout()); panelForScroll.add(logTextArea, BorderLayout.CENTER); diff --git a/java_tools/proxy_server/src/test/java/com/rusefi/ServerTest.java b/java_tools/proxy_server/src/test/java/com/rusefi/ServerTest.java index 6ae0d0a079..e4506ea18f 100644 --- a/java_tools/proxy_server/src/test/java/com/rusefi/ServerTest.java +++ b/java_tools/proxy_server/src/test/java/com/rusefi/ServerTest.java @@ -2,6 +2,7 @@ package com.rusefi; import com.rusefi.config.generated.Fields; import com.rusefi.config.generated.Integration; +import com.rusefi.config.generated.VariableRegistryValues; import com.rusefi.io.IoStream; import com.rusefi.io.commands.GetOutputsCommandBrokenHelper; import com.rusefi.io.commands.HelloCommand; @@ -177,7 +178,7 @@ covered by FullServerTest BackendTestHelper.runApplicationConnectorBlocking(backend, serverPortForRemoteUsers); - SessionDetails sessionDetails = TestHelper.createTestSession(TestHelper.TEST_TOKEN_1, Fields.TS_SIGNATURE); + SessionDetails sessionDetails = TestHelper.createTestSession(TestHelper.TEST_TOKEN_1, VariableRegistryValues.TS_SIGNATURE); ApplicationRequest applicationRequest = new ApplicationRequest(sessionDetails, BackendTestHelper.createTestUserResolver().apply(TestHelper.TEST_TOKEN_1)); // start authenticator diff --git a/java_tools/proxy_server/src/test/java/com/rusefi/proxy/client/LocalApplicationProxyTest.java b/java_tools/proxy_server/src/test/java/com/rusefi/proxy/client/LocalApplicationProxyTest.java index 6eb4abdce6..81465bc591 100644 --- a/java_tools/proxy_server/src/test/java/com/rusefi/proxy/client/LocalApplicationProxyTest.java +++ b/java_tools/proxy_server/src/test/java/com/rusefi/proxy/client/LocalApplicationProxyTest.java @@ -3,8 +3,8 @@ package com.rusefi.proxy.client; import com.rusefi.BackendTestHelper; import com.rusefi.TestHelper; import com.rusefi.Timeouts; -import com.rusefi.config.generated.Fields; import com.rusefi.config.generated.Integration; +import com.rusefi.config.generated.VariableRegistryValues; import com.rusefi.io.IoStream; import com.rusefi.io.commands.GetOutputsCommandBrokenHelper; import com.rusefi.io.commands.HelloCommand; @@ -55,7 +55,7 @@ public class LocalApplicationProxyTest { }, parameter -> backendCreated.countDown(), StatusConsumer.ANONYMOUS); assertLatch(backendCreated); - SessionDetails sessionDetails = TestHelper.createTestSession(TEST_TOKEN_1, Fields.TS_SIGNATURE); + SessionDetails sessionDetails = TestHelper.createTestSession(TEST_TOKEN_1, VariableRegistryValues.TS_SIGNATURE); ApplicationRequest applicationRequest = new ApplicationRequest(sessionDetails, BackendTestHelper.createTestUserResolver().apply(TEST_TOKEN_1)); CountDownLatch disconnected = new CountDownLatch(1); @@ -71,7 +71,7 @@ public class LocalApplicationProxyTest { CountDownLatch gaugePokes = new CountDownLatch(3); try (ServerSocketReference ignored1 = createMockBackend(context, gaugePokes)) { - SessionDetails sessionDetails = TestHelper.createTestSession(TEST_TOKEN_1, Fields.TS_SIGNATURE); + SessionDetails sessionDetails = TestHelper.createTestSession(TEST_TOKEN_1, VariableRegistryValues.TS_SIGNATURE); ApplicationRequest applicationRequest = new ApplicationRequest(sessionDetails, BackendTestHelper.createTestUserResolver().apply(TEST_TOKEN_1)); try (ServerSocketReference ignored2 = LocalApplicationProxy.startAndRun(context, applicationRequest, -1, TcpIoStream.DisconnectListener.VOID, LocalApplicationProxy.ConnectionListener.VOID)) { @@ -99,7 +99,7 @@ public class LocalApplicationProxyTest { applicationConnection.sendPacket(commandPacket); BinaryProtocolServer.Packet response = applicationConnection.readPacket(); - assertEquals(Fields.TS_TOTAL_OUTPUT_SIZE + 1, response.getPacket().length); + assertEquals(VariableRegistryValues.TS_TOTAL_OUTPUT_SIZE + 1, response.getPacket().length); } } } @@ -112,7 +112,7 @@ public class LocalApplicationProxyTest { try (ServerSocketReference ignored1 = createMockBackend(context, gaugePokes)) { - SessionDetails sessionDetails = TestHelper.createTestSession(TEST_TOKEN_1, Fields.TS_SIGNATURE); + SessionDetails sessionDetails = TestHelper.createTestSession(TEST_TOKEN_1, VariableRegistryValues.TS_SIGNATURE); ApplicationRequest applicationRequest = new ApplicationRequest(sessionDetails, BackendTestHelper.createTestUserResolver().apply(TEST_TOKEN_1)); CountDownLatch disconnected = new CountDownLatch(1); diff --git a/java_tools/proxy_server/src/test/java/com/rusefi/server/ControllerConnectionState.java b/java_tools/proxy_server/src/test/java/com/rusefi/server/ControllerConnectionState.java index 56443f5e5a..d39e0bb3d3 100644 --- a/java_tools/proxy_server/src/test/java/com/rusefi/server/ControllerConnectionState.java +++ b/java_tools/proxy_server/src/test/java/com/rusefi/server/ControllerConnectionState.java @@ -2,6 +2,7 @@ package com.rusefi.server; import com.devexperts.logging.Logging; import com.rusefi.config.generated.Integration; +import com.rusefi.config.generated.VariableRegistryValues; import com.rusefi.core.SignatureHelper; import com.rusefi.auth.AuthTokenUtil; import com.rusefi.binaryprotocol.IncomingDataBuffer; @@ -140,7 +141,7 @@ public class ControllerConnectionState { outputRoundAroundDuration = (int) (System.currentTimeMillis() - start); if (packet == null) throw new IOException("getOutputs: No response"); - if (packet.length != 1 + Fields.TS_TOTAL_OUTPUT_SIZE) + if (packet.length != 1 + VariableRegistryValues.TS_TOTAL_OUTPUT_SIZE) throw new IOException("getOutputs: unexpected package length " + packet.length); sensorsHolder.grabSensorValues(packet); } diff --git a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/TuneUploadTab.java b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/TuneUploadTab.java index a666d4d573..09fb447f1f 100644 --- a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/TuneUploadTab.java +++ b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/TuneUploadTab.java @@ -9,6 +9,7 @@ import com.opensr5.ini.field.IniField; import com.rusefi.NamedThreadFactory; import com.rusefi.TsTuneReader; import com.rusefi.config.generated.Fields; +import com.rusefi.config.generated.VariableRegistryValues; import com.rusefi.tools.online.Online; import com.rusefi.tools.online.UploadResult; import com.rusefi.ts_plugin.util.ManifestHelper; @@ -182,7 +183,7 @@ public class TuneUploadTab { if (model.allIniFields == null) return; for (Map.Entry field : allIniFields.entrySet()) { - boolean isOnlineTuneField = field.getValue().getOffset() >= Fields.engine_configuration_s_size; + boolean isOnlineTuneField = field.getValue().getOffset() >= VariableRegistryValues.engine_configuration_s_size; if (!isOnlineTuneField) { try { controllerAccess.getControllerParameterServer().subscribe(configurationName, field.getKey(), listener); diff --git a/java_tools/tune-tools/src/main/java/com/rusefi/tools/tune/WriteSimulatorConfiguration.java b/java_tools/tune-tools/src/main/java/com/rusefi/tools/tune/WriteSimulatorConfiguration.java index 5795854e40..e60d9b05b6 100644 --- a/java_tools/tune-tools/src/main/java/com/rusefi/tools/tune/WriteSimulatorConfiguration.java +++ b/java_tools/tune-tools/src/main/java/com/rusefi/tools/tune/WriteSimulatorConfiguration.java @@ -7,6 +7,7 @@ import com.rusefi.binaryprotocol.BinaryProtocol; import com.rusefi.binaryprotocol.MsqFactory; import com.rusefi.config.generated.Fields; import com.rusefi.config.generated.Integration; +import com.rusefi.config.generated.VariableRegistryValues; import com.rusefi.enums.engine_type_e; import com.rusefi.tune.xml.Constant; import com.rusefi.tune.xml.Msq; @@ -80,7 +81,7 @@ public class WriteSimulatorConfiguration { Msq m = MsqFactory.valueOf(configuration, ini); String name = Fields.KNOCKNOISERPMBINS.getName(); Constant noiseRpmBins = m.page.get(1).getConstantsAsMap().get(name); - if (!noiseRpmBins.getValue().contains(Fields.DEFAULT_RPM_AXIS_HIGH_VALUE + ".0")) + if (!noiseRpmBins.getValue().contains(VariableRegistryValues.DEFAULT_RPM_AXIS_HIGH_VALUE + ".0")) throw new IllegalStateException(name + " canary wonders if everything is fine?"); m.writeXmlFile(outputXmlFileName);