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 8f5d687cbe..a4a1f2fcfd 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 21:47:05 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 22:00:16 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1774,8 +1774,9 @@ struct engine_configuration_s { offset 976 bit 13 */ bool verboseVVTDecoding : 1; /** + * get invertCamVVTSignal offset 976 bit 14 */ - bool unusedBit_251_14 : 1; + bool invertCamVVTSignal : 1; /** offset 976 bit 15 */ bool unusedBit_251_15 : 1; @@ -3654,4 +3655,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 21:47:05 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 22:00:16 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 cd18b53895..e0879dd83c 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -862,6 +862,7 @@ #define injector_s_size 68 #define injPhaseLoadBins_offset 15008 #define injPhaseRpmBins_offset 15072 +#define invertCamVVTSignal_offset 976 #define invertPrimaryTriggerSignal_offset 1464 #define invertSecondaryTriggerSignal_offset 1464 #define is_enabled_spi_1_offset 744 @@ -1132,7 +1133,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2020.08.29 -#define SIGNATURE_HASH 1827291302 +#define SIGNATURE_HASH 2951368343 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1439,7 +1440,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.1827291302" +#define TS_SIGNATURE "rusEFI 2020.08.29.kin.2951368343" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1484,7 +1485,6 @@ #define unusedAuxVoltage1_TODO_332_offset 2713 #define unusedAuxVoltage2_TODO_332_offset 2714 #define unusedBit4_1476_offset 1476 -#define unusedBit_251_14_offset 976 #define unusedBit_251_15_offset 976 #define unusedBit_251_16_offset 976 #define unusedBit_251_17_offset 976 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 2f4ed7b8a2..19fdc3413d 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 21:46:47 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 22:00:03 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1774,8 +1774,9 @@ struct engine_configuration_s { offset 976 bit 13 */ bool verboseVVTDecoding : 1; /** + * get invertCamVVTSignal offset 976 bit 14 */ - bool unusedBit_251_14 : 1; + bool invertCamVVTSignal : 1; /** offset 976 bit 15 */ bool unusedBit_251_15 : 1; @@ -3654,4 +3655,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 21:46:47 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 22:00:03 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 5ace82882e..a4329404c5 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 21:46:47 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 22:00:03 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 a584e17f6c..b583fa29f8 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 21:46:47 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 22:00:03 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 0a4833054d..20298490e4 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 21:46:47 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 22:00:03 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 3e92cc831d..7a731160c3 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 21:46:47 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 22:00:03 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 e089129130..2c8df2688a 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -862,6 +862,7 @@ #define injector_s_size 68 #define injPhaseLoadBins_offset 15008 #define injPhaseRpmBins_offset 15072 +#define invertCamVVTSignal_offset 976 #define invertPrimaryTriggerSignal_offset 1464 #define invertSecondaryTriggerSignal_offset 1464 #define is_enabled_spi_1_offset 744 @@ -1132,7 +1133,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.08.29 -#define SIGNATURE_HASH 1128137990 +#define SIGNATURE_HASH 2151549751 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1439,7 +1440,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.1128137990" +#define TS_SIGNATURE "rusEFI 2020.08.29.all.2151549751" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1484,7 +1485,6 @@ #define unusedAuxVoltage1_TODO_332_offset 2713 #define unusedAuxVoltage2_TODO_332_offset 2714 #define unusedBit4_1476_offset 1476 -#define unusedBit_251_14_offset 976 #define unusedBit_251_15_offset 976 #define unusedBit_251_16_offset 976 #define unusedBit_251_17_offset 976 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 88a19aad53..25c1008d89 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 1128137990 -#define TS_SIGNATURE "rusEFI 2020.08.29.all.1128137990" +#define SIGNATURE_HASH 2151549751 +#define TS_SIGNATURE "rusEFI 2020.08.29.all.2151549751" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 517c04d327..9b49c57e3c 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 2340552719 -#define TS_SIGNATURE "rusEFI 2020.08.29.frankenso_na6.2340552719" +#define SIGNATURE_HASH 1216482878 +#define TS_SIGNATURE "rusEFI 2020.08.29.frankenso_na6.1216482878" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 5c523eb690..9506436f12 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 1827291302 -#define TS_SIGNATURE "rusEFI 2020.08.29.kin.1827291302" +#define SIGNATURE_HASH 2951368343 +#define TS_SIGNATURE "rusEFI 2020.08.29.kin.2951368343" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index c07a2f009e..ebb295f0e7 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 3096481885 -#define TS_SIGNATURE "rusEFI 2020.08.29.mre_f4.3096481885" +#define SIGNATURE_HASH 2073075308 +#define TS_SIGNATURE "rusEFI 2020.08.29.mre_f4.2073075308" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index d67cc7d922..bf580c07f9 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 3096481885 -#define TS_SIGNATURE "rusEFI 2020.08.29.mre_f7.3096481885" +#define SIGNATURE_HASH 2073075308 +#define TS_SIGNATURE "rusEFI 2020.08.29.mre_f7.2073075308" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index afecbde336..86494e8238 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 1422410936 -#define TS_SIGNATURE "rusEFI 2020.08.29.prometheus_405.1422410936" +#define SIGNATURE_HASH 2546485897 +#define TS_SIGNATURE "rusEFI 2020.08.29.prometheus_405.2546485897" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index c793a64100..64fd701934 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 1422410936 -#define TS_SIGNATURE "rusEFI 2020.08.29.prometheus_469.1422410936" +#define SIGNATURE_HASH 2546485897 +#define TS_SIGNATURE "rusEFI 2020.08.29.prometheus_469.2546485897" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 9df27ee463..88d62c7d07 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 1986021955 -#define TS_SIGNATURE "rusEFI 2020.08.29.proteus_f4.1986021955" +#define SIGNATURE_HASH 3042985074 +#define TS_SIGNATURE "rusEFI 2020.08.29.proteus_f4.3042985074" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index d9e62e436e..a8585fb0b9 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 1986021955 -#define TS_SIGNATURE "rusEFI 2020.08.29.proteus_f7.1986021955" +#define SIGNATURE_HASH 3042985074 +#define TS_SIGNATURE "rusEFI 2020.08.29.proteus_f7.3042985074" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 129c4a1762..391d975edf 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 014415f31f..2fd9989489 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.1128137990" + signature = "rusEFI 2020.08.29.all.2151549751" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.29.all.1128137990" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.29.all.2151549751" ; 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 21:46:47 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 22:00:03 UTC 2020 pageSize = 20000 page = 1 @@ -542,7 +542,7 @@ page = 1 dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" - unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" + invertCamVVTSignal = 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" unusedBit_251_17 = bits, U32, 976, [17:17], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 9e86782076..ccbab5991d 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.2340552719" + signature = "rusEFI 2020.08.29.frankenso_na6.1216482878" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.29.frankenso_na6.2340552719" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.29.frankenso_na6.1216482878" ; 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 21:46: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 22:00:08 UTC 2020 pageSize = 20000 page = 1 @@ -542,7 +542,7 @@ page = 1 dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" - unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" + invertCamVVTSignal = 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" unusedBit_251_17 = bits, U32, 976, [17:17], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 8eedfc672f..4a7e4d64d8 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.1827291302" + signature = "rusEFI 2020.08.29.kin.2951368343" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.29.kin.1827291302" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.29.kin.2951368343" ; 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 21:47:05 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 22:00:16 UTC 2020 pageSize = 20000 page = 1 @@ -542,7 +542,7 @@ page = 1 dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" - unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" + invertCamVVTSignal = 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" unusedBit_251_17 = bits, U32, 976, [17:17], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index f44a1fa913..52036a3b2d 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.3096481885" + signature = "rusEFI 2020.08.29.mre_f4.2073075308" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.29.mre_f4.3096481885" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.29.mre_f4.2073075308" ; 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 21:46: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 22:00:07 UTC 2020 pageSize = 20000 page = 1 @@ -542,7 +542,7 @@ page = 1 dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" - unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" + invertCamVVTSignal = 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" unusedBit_251_17 = bits, U32, 976, [17:17], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index abb5993ef2..ca8430e33c 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.3096481885" + signature = "rusEFI 2020.08.29.mre_f7.2073075308" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.29.mre_f7.3096481885" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.29.mre_f7.2073075308" ; 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 21:46:49 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 22:00:05 UTC 2020 pageSize = 20000 page = 1 @@ -542,7 +542,7 @@ page = 1 dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" - unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" + invertCamVVTSignal = 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" unusedBit_251_17 = bits, U32, 976, [17:17], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 975100ce53..30233de06b 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.1422410936" + signature = "rusEFI 2020.08.29.prometheus_405.2546485897" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.29.prometheus_405.1422410936" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.29.prometheus_405.2546485897" ; 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 21:47:01 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 22:00:12 UTC 2020 pageSize = 20000 page = 1 @@ -542,7 +542,7 @@ page = 1 dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" - unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" + invertCamVVTSignal = 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" unusedBit_251_17 = bits, U32, 976, [17:17], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 212636d560..2c57487b3a 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.1422410936" + signature = "rusEFI 2020.08.29.prometheus_469.2546485897" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.29.prometheus_469.1422410936" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.29.prometheus_469.2546485897" ; 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 21:46:59 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 22:00:09 UTC 2020 pageSize = 20000 page = 1 @@ -542,7 +542,7 @@ page = 1 dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" - unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" + invertCamVVTSignal = 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" unusedBit_251_17 = bits, U32, 976, [17:17], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 92f8a54ce4..03b159cdc9 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.1986021955" + signature = "rusEFI 2020.08.29.proteus_f4.3042985074" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.29.proteus_f4.1986021955" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.29.proteus_f4.3042985074" ; 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 21:47:04 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 22:00:15 UTC 2020 pageSize = 20000 page = 1 @@ -542,7 +542,7 @@ page = 1 dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" - unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" + invertCamVVTSignal = 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" unusedBit_251_17 = bits, U32, 976, [17:17], "false", "true" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index be357f5342..71a542cc76 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.1986021955" + signature = "rusEFI 2020.08.29.proteus_f7.3042985074" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.29.proteus_f7.1986021955" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.29.proteus_f7.3042985074" ; 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 21:47:02 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 22:00:13 UTC 2020 pageSize = 20000 page = 1 @@ -542,7 +542,7 @@ page = 1 dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" - unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" + invertCamVVTSignal = 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" unusedBit_251_17 = bits, U32, 976, [17:17], "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 0dd5003c77..b784084329 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 21:46:47 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 22:00:03 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -841,6 +841,7 @@ public class Fields { public static final int injector_s_size = 68; public static final int injPhaseLoadBins_offset = 15008; public static final int injPhaseRpmBins_offset = 15072; + public static final int invertCamVVTSignal_offset = 976; public static final int invertPrimaryTriggerSignal_offset = 1464; public static final int invertSecondaryTriggerSignal_offset = 1464; public static final int is_enabled_spi_1_offset = 744; @@ -1090,7 +1091,6 @@ 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 = 1128137990; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1347,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.1128137990"; + public static final String TS_SIGNATURE = "rusEFI 2020.08.29.all.2151549751"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int tunerStudioSerialSpeed_offset = 728; public static final int twoWireBatchIgnition_offset = 1476; @@ -1389,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_14_offset = 976; public static final int unusedBit_251_15_offset = 976; public static final int unusedBit_251_16_offset = 976; public static final int unusedBit_251_17_offset = 976; @@ -1964,7 +1963,7 @@ public class Fields { 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 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 INVERTCAMVVTSIGNAL = Field.create("INVERTCAMVVTSIGNAL", 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); public static final Field UNUSEDBIT_251_17 = Field.create("UNUSEDBIT_251_17", 976, FieldType.BIT, 17); @@ -2988,7 +2987,7 @@ public class Fields { DCMOTORIDLEVALVE, ENABLESOFTWAREKNOCK, VERBOSEVVTDECODING, - UNUSEDBIT_251_14, + INVERTCAMVVTSIGNAL, UNUSEDBIT_251_15, UNUSEDBIT_251_16, UNUSEDBIT_251_17, diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 906653a4b3..7b95ee34ec 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +