diff --git a/firmware/console/binary/tunerstudio_io.h b/firmware/console/binary/tunerstudio_io.h index 4413a13bf7..958fb053fa 100644 --- a/firmware/console/binary/tunerstudio_io.h +++ b/firmware/console/binary/tunerstudio_io.h @@ -18,8 +18,6 @@ #define BINARY_SWITCH_TAG 0x7e0a #define PROTOCOL "001" -// this should match 'signature' in rusefi.ini -#define TS_SIGNATURE "rusEFI v1.05" #define TS_RESPONSE_OK 0x00 #define TS_RESPONSE_BURN_OK 0x04 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index e0d62a82e1..c6f8fa530a 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -1774,6 +1774,7 @@ #define ts_show_hip9011 true #define ts_show_joystick true #define ts_show_lcd true +#define TS_SIGNATURE "rusEFI v1.06" #define tunerStudioSerialSpeed_offset 728 #define tunerStudioSerialSpeed_offset_hex 2d8 #define twoWireBatchIgnition_offset 1476 diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index 2a248c6a70..0bcca8c653 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -810,6 +810,6 @@ int getRusEfiVersion(void) { if (initBootloader() != 0) return 123; #endif /* EFI_BOOTLOADER_INCLUDE_CODE */ - return 20190608; + return 20190614; } #endif /* EFI_UNIT_TEST */ diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 84ae2d3224..253da0c693 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -23,6 +23,9 @@ ! type name;comment +#define TS_SIGNATURE "rusEFI v1.06" + + ! all the sub-structures are going to be nested withint the primary structure, that's ! needed to get a proper TunerStudio file diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 2dc760ac92..fdb715b911 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -41,7 +41,7 @@ enable2ndByteCanID = false [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI v1.05" ; signature is expected to be 7 or more characters. + signature = "rusEFI v1.06" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -82,7 +82,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Thu Jun 13 14:55:38 EDT 2019 +; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jun 14 13:02:44 EDT 2019 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index d5b022548b..a6435a5ca9 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -41,7 +41,7 @@ enable2ndByteCanID = false [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI v1.05" ; signature is expected to be 7 or more characters. + signature = @@TS_SIGNATURE@@ ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index 7ecef9c365..dae4d61bb3 100644 --- a/firmware/tunerstudio/rusefi_frankenso.ini +++ b/firmware/tunerstudio/rusefi_frankenso.ini @@ -41,7 +41,7 @@ enable2ndByteCanID = false [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI v1.05" ; signature is expected to be 7 or more characters. + signature = "rusEFI v1.06" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -82,7 +82,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Thu Jun 13 14:55:43 EDT 2019 +; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jun 14 13:02:49 EDT 2019 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index 6658afe60d..36675c29c9 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -41,7 +41,7 @@ enable2ndByteCanID = false [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI v1.05" ; signature is expected to be 7 or more characters. + signature = "rusEFI v1.06" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -82,7 +82,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Thu Jun 13 14:55:41 EDT 2019 +; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jun 14 13:02:47 EDT 2019 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index 8f779c9e8a..8018f31281 100644 --- a/firmware/tunerstudio/rusefi_prometheus.ini +++ b/firmware/tunerstudio/rusefi_prometheus.ini @@ -41,7 +41,7 @@ enable2ndByteCanID = false [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI v1.05" ; signature is expected to be 7 or more characters. + signature = "rusEFI v1.06" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -82,7 +82,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Thu Jun 13 14:55:46 EDT 2019 +; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jun 14 13:02:52 EDT 2019 pageSize = 20000 page = 1 diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index 90dfab2356..d842cb1b52 100644 --- a/java_console/models/src/com/rusefi/config/Fields.java +++ b/java_console/models/src/com/rusefi/config/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config; -// this file was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jun 14 00:38:21 EDT 2019 +// this file was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jun 14 13:02:44 EDT 2019 public class Fields { public static final int accelerometerSpiDevice_offset = 2736; public static final int acCutoffHighRpm_offset = 1498; @@ -1138,6 +1138,7 @@ public class Fields { public static final int triggerSimulatorPins3_offset = 738; public static final int TS_FILE_VERSION = 20171101; public static final int TS_OUTPUT_SIZE = 356; + public static final String TS_SIGNATURE = "rusEFI v1.06"; public static final int tunerStudioSerialSpeed_offset = 728; public static final int twoWireBatchIgnition_offset = 1476; public static final int twoWireBatchInjection_offset = 1476; diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar index 99fee0da69..6bc48f05bd 100644 Binary files a/java_tools/ConfigDefinition.jar and b/java_tools/ConfigDefinition.jar differ diff --git a/java_tools/configuration_definition/src/com/rusefi/output/TSProjectConsumer.java b/java_tools/configuration_definition/src/com/rusefi/output/TSProjectConsumer.java index 76f926e2f1..07d37814dc 100644 --- a/java_tools/configuration_definition/src/com/rusefi/output/TSProjectConsumer.java +++ b/java_tools/configuration_definition/src/com/rusefi/output/TSProjectConsumer.java @@ -150,6 +150,8 @@ public class TSProjectConsumer implements ConfigurationConsumer { line = removeToken(line); } + line = VariableRegistry.INSTANCE.applyVariables(line); + if (isBeforeStartTag) prefix.append(line + ConfigDefinition.EOL);