From e07b119a7f2ee51f1c3bdc716ebc4ef625e58e79 Mon Sep 17 00:00:00 2001 From: rusefi Date: Fri, 14 Jun 2019 13:04:04 -0400 Subject: [PATCH] bumping configuration version in light of #773 --- firmware/console/binary/tunerstudio_io.h | 2 -- firmware/controllers/algo/rusefi_generated.h | 1 + firmware/controllers/engine_controller.cpp | 2 +- firmware/integration/rusefi_config.txt | 3 +++ firmware/tunerstudio/rusefi.ini | 4 ++-- firmware/tunerstudio/rusefi.input | 2 +- firmware/tunerstudio/rusefi_frankenso.ini | 4 ++-- firmware/tunerstudio/rusefi_microrusefi.ini | 4 ++-- firmware/tunerstudio/rusefi_prometheus.ini | 4 ++-- .../models/src/com/rusefi/config/Fields.java | 3 ++- java_tools/ConfigDefinition.jar | Bin 87697 -> 75632 bytes .../com/rusefi/output/TSProjectConsumer.java | 2 ++ 12 files changed, 18 insertions(+), 13 deletions(-) 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 99fee0da695119c3b847b7e116aff1a669251800..6bc48f05bde349712b6877ea79a2c3d2ea50ba78 100644 GIT binary patch delta 9626 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 delta 20641 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 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);