From 2bc19e703e50432e08efb947281051e2d3e11c3d Mon Sep 17 00:00:00 2001 From: rusefillc Date: Wed, 5 Feb 2025 09:19:19 -0500 Subject: [PATCH] Console should get much smarter around compatibility with older units #6845 --- firmware/integration/rusefi_config.txt | 4 ---- firmware/integration/ts_protocol.txt | 4 ++++ .../main/java/com/rusefi/config/generated/Integration.java | 4 ++++ .../src/main/java/com/rusefi/ui/engine/NameUtil.java | 3 ++- .../src/main/java/com/rusefi/SimpleDefinesProcessor.java | 1 + 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 30002505c5..503efd6a41 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -2398,10 +2398,6 @@ end_struct #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" -#define PROTOCOL_COIL_SHORT_PREFIX "c" -#define PROTOCOL_INJ_SHORT_PREFIX "i" -#define PROTOCOL_INJ_STAGE2_SHORT_PREFIX "j" - #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" diff --git a/firmware/integration/ts_protocol.txt b/firmware/integration/ts_protocol.txt index 38f34fb42b..33df83e1be 100644 --- a/firmware/integration/ts_protocol.txt +++ b/firmware/integration/ts_protocol.txt @@ -158,6 +158,10 @@ #define PROTOCOL_CRANK1 "t1" #define PROTOCOL_CRANK2 "t2" +#define PROTOCOL_COIL_SHORT_PREFIX "c" +#define PROTOCOL_INJ_SHORT_PREFIX "i" +#define PROTOCOL_INJ_STAGE2_SHORT_PREFIX "j" + #define MLQ_HEADER_SIZE 24 #define MLQ_FIELD_HEADER_SIZE 89 diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Integration.java b/java_console/models/src/main/java/com/rusefi/config/generated/Integration.java index 19f7000148..26d1b4c026 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Integration.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Integration.java @@ -1,3 +1,4 @@ +// generated by class com.rusefi.SimpleDefinesProcessor package com.rusefi.config.generated; public class Integration { @@ -63,12 +64,15 @@ public class Integration { public static final int MLQ_FIELD_HEADER_SIZE = 89; public static final int MLQ_HEADER_SIZE = 24; public static final String PROTOCOL_ANALOG_CHART = "analog_chart"; + public static final String PROTOCOL_COIL_SHORT_PREFIX = "c"; public static final String PROTOCOL_CRANK1 = "t1"; public static final String PROTOCOL_CRANK2 = "t2"; public static final String PROTOCOL_ENGINE_SNIFFER = "wave_chart"; public static final String PROTOCOL_ES_DOWN = "d"; public static final String PROTOCOL_ES_UP = "u"; public static final String PROTOCOL_HELLO_PREFIX = "***"; + public static final String PROTOCOL_INJ_SHORT_PREFIX = "i"; + public static final String PROTOCOL_INJ_STAGE2_SHORT_PREFIX = "j"; public static final String PROTOCOL_MSG = "msg"; public static final String PROTOCOL_OUTPIN = "outpin"; public static final String PROTOCOL_SIGNATURE_PREFIX = "rusEFI "; diff --git a/java_console/trigger-ui/src/main/java/com/rusefi/ui/engine/NameUtil.java b/java_console/trigger-ui/src/main/java/com/rusefi/ui/engine/NameUtil.java index 2478da056f..1df2e1f4bb 100644 --- a/java_console/trigger-ui/src/main/java/com/rusefi/ui/engine/NameUtil.java +++ b/java_console/trigger-ui/src/main/java/com/rusefi/ui/engine/NameUtil.java @@ -1,6 +1,7 @@ package com.rusefi.ui.engine; import com.rusefi.config.generated.Fields; +import com.rusefi.config.generated.Integration; import com.rusefi.core.Sensor; import java.util.Map; @@ -14,7 +15,7 @@ public class NameUtil { static String getUiName(String name) { if (name.isEmpty()) return name; - if (name.charAt(0) == Fields.PROTOCOL_CRANK1.charAt(0)) + if (name.charAt(0) == Integration.PROTOCOL_CRANK1.charAt(0)) return "Trigger #" + name.substring(1); if (name.charAt(0) == Fields.PROTOCOL_COIL_SHORT_PREFIX.charAt(0)) return "Coil #" + name.substring(1); diff --git a/java_tools/configuration_definition_base/src/main/java/com/rusefi/SimpleDefinesProcessor.java b/java_tools/configuration_definition_base/src/main/java/com/rusefi/SimpleDefinesProcessor.java index edf3373253..19313d78b2 100644 --- a/java_tools/configuration_definition_base/src/main/java/com/rusefi/SimpleDefinesProcessor.java +++ b/java_tools/configuration_definition_base/src/main/java/com/rusefi/SimpleDefinesProcessor.java @@ -21,6 +21,7 @@ public class SimpleDefinesProcessor { String className = "Integration"; LazyFile javaFields = LazyFile.REAL.create(LiveDataProcessor.JAVA_DESTINATION + className + ".java"); + javaFields.write("// generated by " + SimpleDefinesProcessor.class + "\n"); FileJavaFieldsConsumer.writePackageLine(javaFields); FileJavaFieldsConsumer.writeClassOpenLine(javaFields, className); javaFields.write(variableRegistry.getJavaConstants());