diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index 05e0b572bf..22109f436d 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Jul 25 16:16:37 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Jul 26 14:49:43 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1760,7 +1760,7 @@ struct engine_configuration_s { bool stftIgnoreErrorMagnitude : 1; /** offset 976 bit 11 */ - bool unusedBit_251_11 : 1; + bool volkswagenEtbIdle : 1; /** offset 976 bit 12 */ bool unusedBit_251_12 : 1; @@ -3530,4 +3530,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Jul 25 16:16:37 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Jul 26 14:49:43 UTC 2020 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 6d0a71a6be..e3234d33bb 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1074,8 +1074,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.07.25 -#define SIGNATURE_HASH 2967996033 +#define SIGNATURE_DATE 2020.07.26 +#define SIGNATURE_HASH 3815423868 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1343,7 +1343,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.07.25.kin.2967996033" +#define TS_SIGNATURE "rusEFI 2020.07.26.kin.3815423868" #define TS_SINGLE_WRITE_COMMAND 'W' #define tunerStudioSerialSpeed_offset 728 #define twoWireBatchIgnition_offset 1476 @@ -1378,7 +1378,6 @@ #define unusedAuxVoltage1_TODO_332_offset 2713 #define unusedAuxVoltage2_TODO_332_offset 2714 #define unusedBit4_1476_offset 1476 -#define unusedBit_251_11_offset 976 #define unusedBit_251_12_offset 976 #define unusedBit_251_13_offset 976 #define unusedBit_251_14_offset 976 @@ -1461,6 +1460,7 @@ #define verboseTriggerSynchDetails_offset 1476 #define veRpmBins_offset 18528 #define veTable_offset 17440 +#define volkswagenEtbIdle_offset 976 #define VOLTAGE_1_BYTE_PACKING_DIV 0.02 #define vRefAdcChannel_offset 1470 #define vvt_mode_e_enum "Inactive", "Second half", "2GZ", "Miata NB2", "First half", "mode5", "mode6", "mode7" diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 42ce66edcc..f4fe42d90d 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 25 16:16:21 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 26 14:49:32 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1760,7 +1760,7 @@ struct engine_configuration_s { bool stftIgnoreErrorMagnitude : 1; /** offset 976 bit 11 */ - bool unusedBit_251_11 : 1; + bool volkswagenEtbIdle : 1; /** offset 976 bit 12 */ bool unusedBit_251_12 : 1; @@ -3530,4 +3530,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 25 16:16:21 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 26 14:49:32 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 940cb1eabe..b7b3fd6d59 100644 --- a/firmware/controllers/generated/fsio_enums_generated.def +++ b/firmware/controllers/generated/fsio_enums_generated.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 25 16:16:21 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 26 14:49:32 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_FANONTEMPERATURE = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index 4ae4c49b21..ac63b1c703 100644 --- a/firmware/controllers/generated/fsio_getters.def +++ b/firmware/controllers/generated/fsio_getters.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 25 16:16:21 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 26 14:49:32 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index 3cc6fd8064..3832fa85ce 100644 --- a/firmware/controllers/generated/fsio_names.def +++ b/firmware/controllers/generated/fsio_names.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 25 16:16:21 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 26 14:49:32 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index 401866a474..7dfdb6e365 100644 --- a/firmware/controllers/generated/fsio_strings.def +++ b/firmware/controllers/generated/fsio_strings.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 25 16:16:21 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 26 14:49:32 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 75e32b9aab..83a6442f2f 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1074,8 +1074,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.07.25 -#define SIGNATURE_HASH 2111232539 +#define SIGNATURE_DATE 2020.07.26 +#define SIGNATURE_HASH 777282534 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1343,7 +1343,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.07.25.all.2111232539" +#define TS_SIGNATURE "rusEFI 2020.07.26.all.777282534" #define TS_SINGLE_WRITE_COMMAND 'W' #define tunerStudioSerialSpeed_offset 728 #define twoWireBatchIgnition_offset 1476 @@ -1378,7 +1378,6 @@ #define unusedAuxVoltage1_TODO_332_offset 2713 #define unusedAuxVoltage2_TODO_332_offset 2714 #define unusedBit4_1476_offset 1476 -#define unusedBit_251_11_offset 976 #define unusedBit_251_12_offset 976 #define unusedBit_251_13_offset 976 #define unusedBit_251_14_offset 976 @@ -1461,6 +1460,7 @@ #define verboseTriggerSynchDetails_offset 1476 #define veRpmBins_offset 18528 #define veTable_offset 17440 +#define volkswagenEtbIdle_offset 976 #define VOLTAGE_1_BYTE_PACKING_DIV 0.02 #define vRefAdcChannel_offset 1470 #define vvt_mode_e_enum "Inactive", "Second half", "2GZ", "Miata NB2", "First half", "mode5", "mode6", "mode7" diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index a505ce8365..307b8047e5 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.07.25 -#define SIGNATURE_HASH 2111232539 -#define TS_SIGNATURE "rusEFI 2020.07.25.all.2111232539" +#define SIGNATURE_DATE 2020.07.26 +#define SIGNATURE_HASH 777282534 +#define TS_SIGNATURE "rusEFI 2020.07.26.all.777282534" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index ffc1fdc5ea..90e8ecb91a 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD frankenso_na6 -#define SIGNATURE_DATE 2020.07.25 -#define SIGNATURE_HASH 2740041464 -#define TS_SIGNATURE "rusEFI 2020.07.25.frankenso_na6.2740041464" +#define SIGNATURE_DATE 2020.07.26 +#define SIGNATURE_HASH 4040363781 +#define TS_SIGNATURE "rusEFI 2020.07.26.frankenso_na6.4040363781" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index c3735b3abe..90e25463d1 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.07.25 -#define SIGNATURE_HASH 2967996033 -#define TS_SIGNATURE "rusEFI 2020.07.25.kin.2967996033" +#define SIGNATURE_DATE 2020.07.26 +#define SIGNATURE_HASH 3815423868 +#define TS_SIGNATURE "rusEFI 2020.07.26.kin.3815423868" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 290c230e83..728e3a57e2 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f4 -#define SIGNATURE_DATE 2020.07.25 -#define SIGNATURE_HASH 875039893 -#define TS_SIGNATURE "rusEFI 2020.07.25.mre_f4.875039893" +#define SIGNATURE_DATE 2020.07.26 +#define SIGNATURE_HASH 1739240808 +#define TS_SIGNATURE "rusEFI 2020.07.26.mre_f4.1739240808" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 90106f0450..eb2cd69b6a 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f7 -#define SIGNATURE_DATE 2020.07.25 -#define SIGNATURE_HASH 875039893 -#define TS_SIGNATURE "rusEFI 2020.07.25.mre_f7.875039893" +#define SIGNATURE_DATE 2020.07.26 +#define SIGNATURE_HASH 1739240808 +#define TS_SIGNATURE "rusEFI 2020.07.26.mre_f7.1739240808" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index ad8d38399c..05bf7d560e 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_405 -#define SIGNATURE_DATE 2020.07.25 -#define SIGNATURE_HASH 2294940319 -#define TS_SIGNATURE "rusEFI 2020.07.25.prometheus_405.2294940319" +#define SIGNATURE_DATE 2020.07.26 +#define SIGNATURE_HASH 3678976866 +#define TS_SIGNATURE "rusEFI 2020.07.26.prometheus_405.3678976866" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index d4bf701167..9ed6d52717 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_469 -#define SIGNATURE_DATE 2020.07.25 -#define SIGNATURE_HASH 2294940319 -#define TS_SIGNATURE "rusEFI 2020.07.25.prometheus_469.2294940319" +#define SIGNATURE_DATE 2020.07.26 +#define SIGNATURE_HASH 3678976866 +#define TS_SIGNATURE "rusEFI 2020.07.26.prometheus_469.3678976866" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 86680c5564..64f8cf12ae 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f4 -#define SIGNATURE_DATE 2020.07.25 -#define SIGNATURE_HASH 4031228884 -#define TS_SIGNATURE "rusEFI 2020.07.25.proteus_f4.4031228884" +#define SIGNATURE_DATE 2020.07.26 +#define SIGNATURE_HASH 2747601449 +#define TS_SIGNATURE "rusEFI 2020.07.26.proteus_f4.2747601449" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index ef08b5c2bf..9ca6a38c0f 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f7 -#define SIGNATURE_DATE 2020.07.25 -#define SIGNATURE_HASH 4031228884 -#define TS_SIGNATURE "rusEFI 2020.07.25.proteus_f7.4031228884" +#define SIGNATURE_DATE 2020.07.26 +#define SIGNATURE_HASH 2747601449 +#define TS_SIGNATURE "rusEFI 2020.07.26.proteus_f7.2747601449" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index d35ff435bf..c1622a30fe 100644 Binary files a/firmware/tunerstudio/generated/cache.zip and b/firmware/tunerstudio/generated/cache.zip differ diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 2a320fed52..a3e7ad594e 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.25.all.2111232539" + signature = "rusEFI 2020.07.26.all.777282534" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.25.all.2111232539" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.26.all.777282534" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 25 16:16:21 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 26 14:49:32 UTC 2020 pageSize = 20000 page = 1 @@ -541,7 +541,7 @@ page = 1 enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" - unusedBit_251_11 = bits, U32, 976, [11:11], "false", "true" + volkswagenEtbIdle = bits, U32, 976, [11:11], "false", "true" unusedBit_251_12 = bits, U32, 976, [12:12], "false", "true" unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 3c067b54d8..25f2af5ca6 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.25.frankenso_na6.2740041464" + signature = "rusEFI 2020.07.26.frankenso_na6.4040363781" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.25.frankenso_na6.2740041464" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.26.frankenso_na6.4040363781" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 25 16:16:27 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 26 14:49:36 UTC 2020 pageSize = 20000 page = 1 @@ -541,7 +541,7 @@ page = 1 enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" - unusedBit_251_11 = bits, U32, 976, [11:11], "false", "true" + volkswagenEtbIdle = bits, U32, 976, [11:11], "false", "true" unusedBit_251_12 = bits, U32, 976, [12:12], "false", "true" unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 4c8493a361..0112f28f7c 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.25.kin.2967996033" + signature = "rusEFI 2020.07.26.kin.3815423868" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.25.kin.2967996033" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.26.kin.3815423868" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Jul 25 16:16:37 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Jul 26 14:49:43 UTC 2020 pageSize = 20000 page = 1 @@ -541,7 +541,7 @@ page = 1 enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" - unusedBit_251_11 = bits, U32, 976, [11:11], "false", "true" + volkswagenEtbIdle = bits, U32, 976, [11:11], "false", "true" unusedBit_251_12 = bits, U32, 976, [12:12], "false", "true" unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 2cb343ec87..fbac4bd5ad 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.25.mre_f4.875039893" + signature = "rusEFI 2020.07.26.mre_f4.1739240808" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.25.mre_f4.875039893" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.26.mre_f4.1739240808" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 25 16:16:24 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 26 14:49:35 UTC 2020 pageSize = 20000 page = 1 @@ -541,7 +541,7 @@ page = 1 enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" - unusedBit_251_11 = bits, U32, 976, [11:11], "false", "true" + volkswagenEtbIdle = bits, U32, 976, [11:11], "false", "true" unusedBit_251_12 = bits, U32, 976, [12:12], "false", "true" unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 814f737329..c061331539 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.25.mre_f7.875039893" + signature = "rusEFI 2020.07.26.mre_f7.1739240808" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.25.mre_f7.875039893" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.26.mre_f7.1739240808" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 25 16:16:23 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 26 14:49:34 UTC 2020 pageSize = 20000 page = 1 @@ -541,7 +541,7 @@ page = 1 enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" - unusedBit_251_11 = bits, U32, 976, [11:11], "false", "true" + volkswagenEtbIdle = bits, U32, 976, [11:11], "false", "true" unusedBit_251_12 = bits, U32, 976, [12:12], "false", "true" unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 7a69f67fe2..d9476f43f7 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.25.prometheus_405.2294940319" + signature = "rusEFI 2020.07.26.prometheus_405.3678976866" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.25.prometheus_405.2294940319" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.26.prometheus_405.3678976866" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 25 16:16:33 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 26 14:49:39 UTC 2020 pageSize = 20000 page = 1 @@ -541,7 +541,7 @@ page = 1 enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" - unusedBit_251_11 = bits, U32, 976, [11:11], "false", "true" + volkswagenEtbIdle = bits, U32, 976, [11:11], "false", "true" unusedBit_251_12 = bits, U32, 976, [12:12], "false", "true" unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 43a35109d0..3ce8ab984d 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.25.prometheus_469.2294940319" + signature = "rusEFI 2020.07.26.prometheus_469.3678976866" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.25.prometheus_469.2294940319" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.26.prometheus_469.3678976866" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 25 16:16:30 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 26 14:49:38 UTC 2020 pageSize = 20000 page = 1 @@ -541,7 +541,7 @@ page = 1 enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" - unusedBit_251_11 = bits, U32, 976, [11:11], "false", "true" + volkswagenEtbIdle = bits, U32, 976, [11:11], "false", "true" unusedBit_251_12 = bits, U32, 976, [12:12], "false", "true" unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index f2289132ee..027cb2c156 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.25.proteus_f4.4031228884" + signature = "rusEFI 2020.07.26.proteus_f4.2747601449" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.25.proteus_f4.4031228884" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.26.proteus_f4.2747601449" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 25 16:16:36 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 26 14:49:42 UTC 2020 pageSize = 20000 page = 1 @@ -541,7 +541,7 @@ page = 1 enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" - unusedBit_251_11 = bits, U32, 976, [11:11], "false", "true" + volkswagenEtbIdle = bits, U32, 976, [11:11], "false", "true" unusedBit_251_12 = bits, U32, 976, [12:12], "false", "true" unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index af18e2cc56..f74242fe2d 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.25.proteus_f7.4031228884" + signature = "rusEFI 2020.07.26.proteus_f7.2747601449" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.25.proteus_f7.4031228884" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.26.proteus_f7.2747601449" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 25 16:16:34 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 26 14:49:40 UTC 2020 pageSize = 20000 page = 1 @@ -541,7 +541,7 @@ page = 1 enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" - unusedBit_251_11 = bits, U32, 976, [11:11], "false", "true" + volkswagenEtbIdle = bits, U32, 976, [11:11], "false", "true" unusedBit_251_12 = bits, U32, 976, [12:12], "false", "true" unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java index d45722b5c4..31d9626e40 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 25 16:16:21 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 26 14:49:32 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1056,7 +1056,7 @@ public class Fields { public static final int servoOutputPins8_offset = 3147; public static final int showHumanReadableWarning_offset = 976; public static final int showSdCardWarning_offset = 76; - public static final int SIGNATURE_HASH = 2111232539; + public static final int SIGNATURE_HASH = 777282534; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1303,7 +1303,7 @@ public class Fields { public static final int TS_RESPONSE_COMMAND_OK = 7; public static final int TS_RESPONSE_OK = 0; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2020.07.25.all.2111232539"; + public static final String TS_SIGNATURE = "rusEFI 2020.07.26.all.777282534"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int tunerStudioSerialSpeed_offset = 728; public static final int twoWireBatchIgnition_offset = 1476; @@ -1338,7 +1338,6 @@ public class Fields { public static final int unusedAuxVoltage1_TODO_332_offset = 2713; public static final int unusedAuxVoltage2_TODO_332_offset = 2714; public static final int unusedBit4_1476_offset = 1476; - public static final int unusedBit_251_11_offset = 976; public static final int unusedBit_251_12_offset = 976; public static final int unusedBit_251_13_offset = 976; public static final int unusedBit_251_14_offset = 976; @@ -1421,6 +1420,7 @@ public class Fields { public static final int verboseTriggerSynchDetails_offset = 1476; public static final int veRpmBins_offset = 18528; public static final int veTable_offset = 17440; + public static final int volkswagenEtbIdle_offset = 976; public static final int vRefAdcChannel_offset = 1470; public static final int vvtCamSensorUseRise_offset = 744; public static final int vvtMode_offset = 2328; @@ -1888,7 +1888,7 @@ public class Fields { public static final Field ENABLEINNOVATELC2 = Field.create("ENABLEINNOVATELC2", 976, FieldType.BIT, 8); public static final Field SHOWHUMANREADABLEWARNING = Field.create("SHOWHUMANREADABLEWARNING", 976, FieldType.BIT, 9); public static final Field STFTIGNOREERRORMAGNITUDE = Field.create("STFTIGNOREERRORMAGNITUDE", 976, FieldType.BIT, 10); - public static final Field UNUSEDBIT_251_11 = Field.create("UNUSEDBIT_251_11", 976, FieldType.BIT, 11); + public static final Field VOLKSWAGENETBIDLE = Field.create("VOLKSWAGENETBIDLE", 976, FieldType.BIT, 11); public static final Field UNUSEDBIT_251_12 = Field.create("UNUSEDBIT_251_12", 976, FieldType.BIT, 12); public static final Field UNUSEDBIT_251_13 = Field.create("UNUSEDBIT_251_13", 976, FieldType.BIT, 13); public static final Field UNUSEDBIT_251_14 = Field.create("UNUSEDBIT_251_14", 976, FieldType.BIT, 14); @@ -2874,7 +2874,7 @@ public class Fields { ENABLEINNOVATELC2, SHOWHUMANREADABLEWARNING, STFTIGNOREERRORMAGNITUDE, - UNUSEDBIT_251_11, + VOLKSWAGENETBIDLE, UNUSEDBIT_251_12, UNUSEDBIT_251_13, UNUSEDBIT_251_14, diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 2bab9150b6..f0a7935b89 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +