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 013904eb1f..f114797cb8 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 Aug 29 20:46:03 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Aug 29 21:03:27 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1769,8 +1769,9 @@ struct engine_configuration_s { offset 976 bit 12 */ bool enableSoftwareKnock : 1; /** + * enable vvt_details offset 976 bit 13 */ - bool unusedBit_251_13 : 1; + bool verboseVVTDecoding : 1; /** offset 976 bit 14 */ bool unusedBit_251_14 : 1; @@ -3652,4 +3653,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 Aug 29 20:46:03 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Aug 29 21:03:27 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 ae8b57ce02..0438de813d 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1132,7 +1132,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2020.08.29 -#define SIGNATURE_HASH 3901605738 +#define SIGNATURE_HASH 1962405979 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1439,7 +1439,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.08.29.kin.3901605738" +#define TS_SIGNATURE "rusEFI 2020.08.29.kin.1962405979" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1484,7 +1484,6 @@ #define unusedAuxVoltage1_TODO_332_offset 2713 #define unusedAuxVoltage2_TODO_332_offset 2714 #define unusedBit4_1476_offset 1476 -#define unusedBit_251_13_offset 976 #define unusedBit_251_14_offset 976 #define unusedBit_251_15_offset 976 #define unusedBit_251_16_offset 976 @@ -1587,6 +1586,7 @@ #define verboseCanBaseAddress_offset 756 #define verboseTLE8888_offset 744 #define verboseTriggerSynchDetails_offset 1476 +#define verboseVVTDecoding_offset 976 #define veRpmBins_offset 18528 #define veTable_offset 17440 #define VOLTAGE_1_BYTE_PACKING_DIV 0.02 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 9695bc2567..d0d273293c 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 Aug 29 20:45:51 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 21:03:08 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1769,8 +1769,9 @@ struct engine_configuration_s { offset 976 bit 12 */ bool enableSoftwareKnock : 1; /** + * enable vvt_details offset 976 bit 13 */ - bool unusedBit_251_13 : 1; + bool verboseVVTDecoding : 1; /** offset 976 bit 14 */ bool unusedBit_251_14 : 1; @@ -3652,4 +3653,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 Aug 29 20:45:51 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 21:03:08 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 60e062d4f5..31ab42e003 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 Aug 29 20:45:51 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 21:03:08 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 8fbbd55e0b..bac35bec3a 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 Aug 29 20:45:51 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 21:03:08 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 e590173170..e4e910f606 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 Aug 29 20:45:51 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 21:03:08 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 f8cf6378ec..e358ae33a8 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 Aug 29 20:45:51 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 21:03:08 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 8998f814a7..85015ef41d 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1132,7 +1132,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.08.29 -#define SIGNATURE_HASH 3344532170 +#define SIGNATURE_HASH 1529067003 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1439,7 +1439,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.08.29.all.3344532170" +#define TS_SIGNATURE "rusEFI 2020.08.29.all.1529067003" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1484,7 +1484,6 @@ #define unusedAuxVoltage1_TODO_332_offset 2713 #define unusedAuxVoltage2_TODO_332_offset 2714 #define unusedBit4_1476_offset 1476 -#define unusedBit_251_13_offset 976 #define unusedBit_251_14_offset 976 #define unusedBit_251_15_offset 976 #define unusedBit_251_16_offset 976 @@ -1587,6 +1586,7 @@ #define verboseCanBaseAddress_offset 756 #define verboseTLE8888_offset 744 #define verboseTriggerSynchDetails_offset 1476 +#define verboseVVTDecoding_offset 976 #define veRpmBins_offset 18528 #define veTable_offset 17440 #define VOLTAGE_1_BYTE_PACKING_DIV 0.02 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index ad0e8f8277..aced1c37f7 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.08.29 -#define SIGNATURE_HASH 2630242900 -#define TS_SIGNATURE "rusEFI 2020.08.29.all.2630242900" +#define SIGNATURE_HASH 1529067003 +#define TS_SIGNATURE "rusEFI 2020.08.29.all.1529067003" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index cfe8f7dec4..d0d7541f37 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD frankenso_na6 #define SIGNATURE_DATE 2020.08.29 -#define SIGNATURE_HASH 1417303901 -#define TS_SIGNATURE "rusEFI 2020.08.29.frankenso_na6.1417303901" +#define SIGNATURE_HASH 2476716274 +#define TS_SIGNATURE "rusEFI 2020.08.29.frankenso_na6.2476716274" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index d82915ecbb..cb61e87973 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2020.08.29 -#define SIGNATURE_HASH 3004307444 -#define TS_SIGNATURE "rusEFI 2020.08.29.kin.3004307444" +#define SIGNATURE_HASH 1962405979 +#define TS_SIGNATURE "rusEFI 2020.08.29.kin.1962405979" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 5360498f9f..cea5cb03d9 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f4 #define SIGNATURE_DATE 2020.08.29 -#define SIGNATURE_HASH 1734919951 -#define TS_SIGNATURE "rusEFI 2020.08.29.mre_f4.1734919951" +#define SIGNATURE_HASH 2693603488 +#define TS_SIGNATURE "rusEFI 2020.08.29.mre_f4.2693603488" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 40b90e6702..a36d7c7c6b 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f7 #define SIGNATURE_DATE 2020.08.29 -#define SIGNATURE_HASH 1734919951 -#define TS_SIGNATURE "rusEFI 2020.08.29.mre_f7.1734919951" +#define SIGNATURE_HASH 2693603488 +#define TS_SIGNATURE "rusEFI 2020.08.29.mre_f7.2693603488" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 05462a9939..ad26fb13b9 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_405 #define SIGNATURE_DATE 2020.08.29 -#define SIGNATURE_HASH 2335183850 -#define TS_SIGNATURE "rusEFI 2020.08.29.prometheus_405.2335183850" +#define SIGNATURE_HASH 1289090117 +#define TS_SIGNATURE "rusEFI 2020.08.29.prometheus_405.1289090117" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 2889a5c845..6094342214 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_469 #define SIGNATURE_DATE 2020.08.29 -#define SIGNATURE_HASH 2335183850 -#define TS_SIGNATURE "rusEFI 2020.08.29.prometheus_469.2335183850" +#define SIGNATURE_HASH 1289090117 +#define TS_SIGNATURE "rusEFI 2020.08.29.prometheus_469.1289090117" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 0bb4066725..dde6cd31be 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f4 #define SIGNATURE_DATE 2020.08.29 -#define SIGNATURE_HASH 2845318417 -#define TS_SIGNATURE "rusEFI 2020.08.29.proteus_f4.2845318417" +#define SIGNATURE_HASH 1853749950 +#define TS_SIGNATURE "rusEFI 2020.08.29.proteus_f4.1853749950" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 165eeff3b2..2a10ea2ac5 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f7 #define SIGNATURE_DATE 2020.08.29 -#define SIGNATURE_HASH 2845318417 -#define TS_SIGNATURE "rusEFI 2020.08.29.proteus_f7.2845318417" +#define SIGNATURE_HASH 1853749950 +#define TS_SIGNATURE "rusEFI 2020.08.29.proteus_f7.1853749950" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 3cbe1c3343..90f00b420a 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 8ad39ed380..150f1fc1d1 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.08.29.all.2630242900" + signature = "rusEFI 2020.08.29.all.1529067003" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.29.all.2630242900" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.29.all.1529067003" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Aug 29 20:50:48 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 21:03:08 UTC 2020 pageSize = 20000 page = 1 @@ -541,7 +541,7 @@ page = 1 stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" - unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" + verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" unusedBit_251_15 = bits, U32, 976, [15:15], "false", "true" unusedBit_251_16 = bits, U32, 976, [16:16], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 1b3a4b5f4c..c2d8c64bb8 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.08.29.frankenso_na6.1417303901" + signature = "rusEFI 2020.08.29.frankenso_na6.2476716274" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.29.frankenso_na6.1417303901" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.29.frankenso_na6.2476716274" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Aug 29 20:50:53 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 21:03:12 UTC 2020 pageSize = 20000 page = 1 @@ -541,7 +541,7 @@ page = 1 stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" - unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" + verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" unusedBit_251_15 = bits, U32, 976, [15:15], "false", "true" unusedBit_251_16 = bits, U32, 976, [16:16], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 5b1fb5e625..718878c6bb 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.08.29.kin.3004307444" + signature = "rusEFI 2020.08.29.kin.1962405979" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.29.kin.3004307444" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.29.kin.1962405979" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Aug 29 20:51:08 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Aug 29 21:03:27 UTC 2020 pageSize = 20000 page = 1 @@ -541,7 +541,7 @@ page = 1 stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" - unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" + verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" unusedBit_251_15 = bits, U32, 976, [15:15], "false", "true" unusedBit_251_16 = bits, U32, 976, [16:16], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 22cca77ea4..2ce0d455ae 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.08.29.mre_f4.1734919951" + signature = "rusEFI 2020.08.29.mre_f4.2693603488" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.29.mre_f4.1734919951" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.29.mre_f4.2693603488" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Aug 29 20:50:51 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 21:03:11 UTC 2020 pageSize = 20000 page = 1 @@ -541,7 +541,7 @@ page = 1 stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" - unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" + verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" unusedBit_251_15 = bits, U32, 976, [15:15], "false", "true" unusedBit_251_16 = bits, U32, 976, [16:16], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 190a5a2d07..90d81b5b34 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.08.29.mre_f7.1734919951" + signature = "rusEFI 2020.08.29.mre_f7.2693603488" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.29.mre_f7.1734919951" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.29.mre_f7.2693603488" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Aug 29 20:50:50 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 21:03:09 UTC 2020 pageSize = 20000 page = 1 @@ -541,7 +541,7 @@ page = 1 stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" - unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" + verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" unusedBit_251_15 = bits, U32, 976, [15:15], "false", "true" unusedBit_251_16 = bits, U32, 976, [16:16], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 3c924473a2..cd8bf38a46 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.08.29.prometheus_405.2335183850" + signature = "rusEFI 2020.08.29.prometheus_405.1289090117" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.29.prometheus_405.2335183850" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.29.prometheus_405.1289090117" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Aug 29 20:50:56 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 21:03:16 UTC 2020 pageSize = 20000 page = 1 @@ -541,7 +541,7 @@ page = 1 stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" - unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" + verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" unusedBit_251_15 = bits, U32, 976, [15:15], "false", "true" unusedBit_251_16 = bits, U32, 976, [16:16], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index f6d9d8582d..2dddd13d3b 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.08.29.prometheus_469.2335183850" + signature = "rusEFI 2020.08.29.prometheus_469.1289090117" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.29.prometheus_469.2335183850" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.29.prometheus_469.1289090117" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Aug 29 20:50:54 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 21:03:14 UTC 2020 pageSize = 20000 page = 1 @@ -541,7 +541,7 @@ page = 1 stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" - unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" + verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" unusedBit_251_15 = bits, U32, 976, [15:15], "false", "true" unusedBit_251_16 = bits, U32, 976, [16:16], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index bee28802d5..76f1fbdae2 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.08.29.proteus_f4.2845318417" + signature = "rusEFI 2020.08.29.proteus_f4.1853749950" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.29.proteus_f4.2845318417" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.29.proteus_f4.1853749950" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Aug 29 20:51:06 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 21:03:19 UTC 2020 pageSize = 20000 page = 1 @@ -541,7 +541,7 @@ page = 1 stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" - unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" + verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" unusedBit_251_15 = bits, U32, 976, [15:15], "false", "true" unusedBit_251_16 = bits, U32, 976, [16:16], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index d53a2f6125..5704e101d8 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.08.29.proteus_f7.2845318417" + signature = "rusEFI 2020.08.29.proteus_f7.1853749950" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.29.proteus_f7.2845318417" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.29.proteus_f7.1853749950" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Aug 29 20:51:05 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 21:03:17 UTC 2020 pageSize = 20000 page = 1 @@ -541,7 +541,7 @@ page = 1 stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" - unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" + verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" unusedBit_251_15 = bits, U32, 976, [15:15], "false", "true" unusedBit_251_16 = bits, U32, 976, [16:16], "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 93cc9ace18..9068635f98 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 Aug 29 20:45:51 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 21:03:08 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1090,6 +1090,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 = 1529067003; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1346,7 +1347,7 @@ public class Fields { public static final char TS_SD_R_COMMAND = 'r'; public static final char TS_SD_W_COMMAND = 'w'; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2020.08.29.all.3344532170"; + public static final String TS_SIGNATURE = "rusEFI 2020.08.29.all.1529067003"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int tunerStudioSerialSpeed_offset = 728; public static final int twoWireBatchIgnition_offset = 1476; @@ -1388,7 +1389,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_13_offset = 976; public static final int unusedBit_251_14_offset = 976; public static final int unusedBit_251_15_offset = 976; public static final int unusedBit_251_16_offset = 976; @@ -1491,6 +1491,7 @@ public class Fields { public static final int verboseCanBaseAddress_offset = 756; public static final int verboseTLE8888_offset = 744; public static final int verboseTriggerSynchDetails_offset = 1476; + public static final int verboseVVTDecoding_offset = 976; public static final int veRpmBins_offset = 18528; public static final int veTable_offset = 17440; public static final int vRefAdcChannel_offset = 1470; @@ -1962,7 +1963,7 @@ public class Fields { public static final Field STFTIGNOREERRORMAGNITUDE = Field.create("STFTIGNOREERRORMAGNITUDE", 976, FieldType.BIT, 10); public static final Field DCMOTORIDLEVALVE = Field.create("DCMOTORIDLEVALVE", 976, FieldType.BIT, 11); public static final Field ENABLESOFTWAREKNOCK = Field.create("ENABLESOFTWAREKNOCK", 976, FieldType.BIT, 12); - public static final Field UNUSEDBIT_251_13 = Field.create("UNUSEDBIT_251_13", 976, FieldType.BIT, 13); + public static final Field VERBOSEVVTDECODING = Field.create("VERBOSEVVTDECODING", 976, FieldType.BIT, 13); public static final Field UNUSEDBIT_251_14 = Field.create("UNUSEDBIT_251_14", 976, FieldType.BIT, 14); public static final Field UNUSEDBIT_251_15 = Field.create("UNUSEDBIT_251_15", 976, FieldType.BIT, 15); public static final Field UNUSEDBIT_251_16 = Field.create("UNUSEDBIT_251_16", 976, FieldType.BIT, 16); @@ -2986,7 +2987,7 @@ public class Fields { STFTIGNOREERRORMAGNITUDE, DCMOTORIDLEVALVE, ENABLESOFTWAREKNOCK, - UNUSEDBIT_251_13, + VERBOSEVVTDECODING, UNUSEDBIT_251_14, UNUSEDBIT_251_15, UNUSEDBIT_251_16, diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 6d7350dd7f..f6915121b6 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +