From fc81ef9ce551edab74a5646dc5fbf26c69d14c5b Mon Sep 17 00:00:00 2001 From: rusefillc Date: Wed, 1 Jun 2022 11:07:28 -0400 Subject: [PATCH] hard requirement for console version match #4187 --- firmware/console/status_loop.cpp | 1 + .../src/main/java/com/rusefi/core/Sensor.java | 2 +- .../main/java/com/rusefi/rusEFIVersion.java | 2 +- .../src/main/java/com/rusefi/ConsoleUI.java | 19 ------------------- 4 files changed, 3 insertions(+), 21 deletions(-) diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index 2681eff6ca..ff33fd6854 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -725,6 +725,7 @@ void updateTunerStudioState() { // header tsOutputChannels->tsConfigVersion = TS_FILE_VERSION; + static_assert(offsetof (TunerStudioOutputChannels, tsConfigVersion) == TS_FILE_VERSION_OFFSET); #if EFI_SHAFT_POSITION_INPUT 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 7b3fa45c48..be525e909f 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 @@ -98,7 +98,7 @@ public enum Sensor { TIME_SECONDS(GAUGE_NAME_TIME, SensorCategory.OPERATIONS, FieldType.INT, 112, 1, 0, 5, ""), engineMode("mode", SensorCategory.OPERATIONS, FieldType.INT, 116, 0, 5), FIRMWARE_VERSION(GAUGE_NAME_VERSION, SensorCategory.OPERATIONS, FieldType.INT, 120, 1, 0, 100, "version_f"), - TS_CONFIG_VERSION(".ini version", SensorCategory.OPERATIONS, FieldType.INT, 124), + TS_CONFIG_VERSION(".ini version", SensorCategory.OPERATIONS, FieldType.INT, TS_FILE_VERSION_OFFSET), engineMakeCodeNameCrc16("engine crc16", SensorCategory.STATUS, FieldType.UINT16, 138, 0, 5), // Errors 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 0387b9b010..2a44a22a96 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 = 20220525; + public static final int CONSOLE_VERSION = 20220601; public static AtomicReference firmwareVersion = new AtomicReference<>("N/A"); public static long classBuildTimeMillis() { diff --git a/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java b/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java index 03f9c54300..a6ed7535e4 100644 --- a/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java +++ b/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java @@ -4,10 +4,7 @@ import com.devexperts.logging.Logging; import com.rusefi.autodetect.PortDetector; import com.rusefi.autoupdate.AutoupdateUtil; import com.rusefi.binaryprotocol.BinaryProtocolLogger; -import com.rusefi.config.generated.Fields; import com.rusefi.core.MessagesCentral; -import com.rusefi.core.Sensor; -import com.rusefi.core.SensorCentral; import com.rusefi.io.LinkManager; import com.rusefi.io.serial.BaudRateHolder; import com.rusefi.maintenance.FirmwareFlasher; @@ -41,7 +38,6 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; public class ConsoleUI { private static final Logging log = getLogging(ConsoleUI.class); private static final int DEFAULT_TAB_INDEX = 0; - private static SensorCentral.SensorListener wrongVersionListener; public static final String TAB_INDEX = "main_tab"; protected static final String PORT_KEY = "port"; @@ -204,21 +200,6 @@ public class ConsoleUI { if (result == JOptionPane.NO_OPTION) System.exit(-1); } - wrongVersionListener = new SensorCentral.SensorListener() { - @Override - public void onSensorUpdate(double value) { - // todo: we need to migrate to TS_SIGNATURE validation!!! - if (value != Fields.TS_FILE_VERSION) { - String message = "This copy of rusEFI console is not compatible with this version of firmware\r\n" + - "Console compatible with " + Fields.TS_FILE_VERSION + " while firmware compatible with " + - (int) value; - JOptionPane.showMessageDialog(getFrame(), message); - assert wrongVersionListener != null; - SensorCentral.getInstance().removeListener(Sensor.TS_CONFIG_VERSION, wrongVersionListener); - } - } - }; - SensorCentral.getInstance().addListener(Sensor.TS_CONFIG_VERSION, wrongVersionListener); JustOneInstance.onStart(); try { boolean isPortDefined = args.length > 0;