diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h index 2025992f8d..e5829ded82 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Fri Jul 09 14:08:43 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Jul 13 01:14:53 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4268,4 +4268,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Fri Jul 09 14:08:43 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Jul 13 01:14:53 UTC 2021 diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h index 4e3cdb88d9..ee52728349 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h @@ -1312,8 +1312,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2021.07.09 -#define SIGNATURE_HASH 1682852721 +#define SIGNATURE_DATE 2021.07.13 +#define SIGNATURE_HASH 2073854766 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1679,7 +1679,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.07.09.hellen_cypress.1682852721" +#define TS_SIGNATURE "rusEFI 2021.07.13.hellen_cypress.2073854766" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -1863,6 +1863,7 @@ #define verboseVVTDecoding_offset 976 #define veRpmBins_offset 18528 #define veTable_offset 17440 +#define VM_VVT_INACTIVE 0 #define VOLTAGE_1_BYTE_PACKING_DIV 0.02 #define vRefAdcChannel_offset 1470 #define vssFilterReciprocal_offset 15196 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 bce1349ec5..bab2402a55 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 Fri Jul 09 14:08:41 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Jul 13 01:14:51 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4262,4 +4262,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Jul 09 14:08:41 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Jul 13 01:14:51 UTC 2021 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 0c31f76ea0..129abb5ba4 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1296,8 +1296,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2021.07.09 -#define SIGNATURE_HASH 2615904141 +#define SIGNATURE_DATE 2021.07.13 +#define SIGNATURE_HASH 2218348498 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1663,7 +1663,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.07.09.kin.2615904141" +#define TS_SIGNATURE "rusEFI 2021.07.13.kin.2218348498" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -1847,6 +1847,7 @@ #define verboseVVTDecoding_offset 976 #define veRpmBins_offset 18500 #define veTable_offset 17412 +#define VM_VVT_INACTIVE 0 #define VOLTAGE_1_BYTE_PACKING_DIV 0.02 #define vRefAdcChannel_offset 1470 #define vssFilterReciprocal_offset 15168 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h index a3a2db05e7..993efcf4b4 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Fri Jul 09 14:08:45 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Tue Jul 13 01:14:54 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4268,4 +4268,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Fri Jul 09 14:08:45 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Tue Jul 13 01:14:54 UTC 2021 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index 6fea8343b8..f16f36f925 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h @@ -1312,8 +1312,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD subaru_eg33_f7 -#define SIGNATURE_DATE 2021.07.09 -#define SIGNATURE_HASH 2339282615 +#define SIGNATURE_DATE 2021.07.13 +#define SIGNATURE_HASH 2495370984 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1679,7 +1679,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2021.07.09.subaru_eg33_f7.2339282615" +#define TS_SIGNATURE "rusEFI 2021.07.13.subaru_eg33_f7.2495370984" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -1863,6 +1863,7 @@ #define verboseVVTDecoding_offset 976 #define veRpmBins_offset 18528 #define veTable_offset 17440 +#define VM_VVT_INACTIVE 0 #define VOLTAGE_1_BYTE_PACKING_DIV 0.02 #define vRefAdcChannel_offset 1470 #define vssFilterReciprocal_offset 15196 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 3bd96f141c..44b7b8c513 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 Fri Jul 09 14:08:11 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jul 13 01:14:21 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4268,4 +4268,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 09 14:08:11 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jul 13 01:14:21 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 86ecfcc875..aff0aba3f8 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 Fri Jul 09 14:08:11 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jul 13 01:14:21 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_ACIDLEEXTRAOFFSET = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index 52d1f63642..a90ab4de5c 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 Fri Jul 09 14:08:11 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jul 13 01:14:21 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_ACIDLEEXTRAOFFSET: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index bc9522cb9f..530b7effc8 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 Fri Jul 09 14:08:11 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jul 13 01:14:21 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair leacIdleExtraOffset(FSIO_SETTING_ACIDLEEXTRAOFFSET, "cfg_acIdleExtraOffset"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index f5af1ea19e..9fd5c4af8b 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 Fri Jul 09 14:08:11 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jul 13 01:14:21 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_ACIDLEEXTRAOFFSET: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index a7eb3c892d..2dd3f46e24 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1309,8 +1309,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2021.07.09 -#define SIGNATURE_HASH 640848033 +#define SIGNATURE_DATE 2021.07.13 +#define SIGNATURE_HASH 971004158 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1676,7 +1676,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.07.09.all.640848033" +#define TS_SIGNATURE "rusEFI 2021.07.13.all.971004158" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -1860,6 +1860,7 @@ #define verboseVVTDecoding_offset 976 #define veRpmBins_offset 18528 #define veTable_offset 17440 +#define VM_VVT_INACTIVE 0 #define VOLTAGE_1_BYTE_PACKING_DIV 0.02 #define vRefAdcChannel_offset 1470 #define vssFilterReciprocal_offset 15196 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index b6c63cd4b4..2cc67765a8 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 2021.07.12 -#define SIGNATURE_HASH 1894142096 -#define TS_SIGNATURE "rusEFI 2021.07.12.all.1894142096" +#define SIGNATURE_DATE 2021.07.13 +#define SIGNATURE_HASH 971004158 +#define TS_SIGNATURE "rusEFI 2021.07.13.all.971004158" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 6308b39583..e6fc961eb2 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD f429-discovery -#define SIGNATURE_DATE 2021.07.12 -#define SIGNATURE_HASH 848988992 -#define TS_SIGNATURE "rusEFI 2021.07.12.f429-discovery.848988992" +#define SIGNATURE_DATE 2021.07.13 +#define SIGNATURE_HASH 2073854766 +#define TS_SIGNATURE "rusEFI 2021.07.13.f429-discovery.2073854766" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index f245412986..9bbca8c5ff 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 2021.07.12 -#define SIGNATURE_HASH 1219026601 -#define TS_SIGNATURE "rusEFI 2021.07.12.frankenso_na6.1219026601" +#define SIGNATURE_DATE 2021.07.13 +#define SIGNATURE_HASH 28235463 +#define TS_SIGNATURE "rusEFI 2021.07.13.frankenso_na6.28235463" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 750836433b..3ade6f97f8 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen121nissan -#define SIGNATURE_DATE 2021.07.12 -#define SIGNATURE_HASH 450222142 -#define TS_SIGNATURE "rusEFI 2021.07.12.hellen121nissan.450222142" +#define SIGNATURE_DATE 2021.07.13 +#define SIGNATURE_HASH 1406390352 +#define TS_SIGNATURE "rusEFI 2021.07.13.hellen121nissan.1406390352" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index a500291eb5..9d6bdfad3f 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen121vag -#define SIGNATURE_DATE 2021.07.12 -#define SIGNATURE_HASH 2625161185 -#define TS_SIGNATURE "rusEFI 2021.07.12.hellen121vag.2625161185" +#define SIGNATURE_DATE 2021.07.13 +#define SIGNATURE_HASH 3581857679 +#define TS_SIGNATURE "rusEFI 2021.07.13.hellen121vag.3581857679" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 6d608aa0bf..8ae0a0239d 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen128 -#define SIGNATURE_DATE 2021.07.12 -#define SIGNATURE_HASH 3923331394 -#define TS_SIGNATURE "rusEFI 2021.07.12.hellen128.3923331394" +#define SIGNATURE_DATE 2021.07.13 +#define SIGNATURE_HASH 2698985772 +#define TS_SIGNATURE "rusEFI 2021.07.13.hellen128.2698985772" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 197ca4ded4..2dd6c59889 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen72 -#define SIGNATURE_DATE 2021.07.12 -#define SIGNATURE_HASH 1094859887 -#define TS_SIGNATURE "rusEFI 2021.07.12.hellen72.1094859887" +#define SIGNATURE_DATE 2021.07.13 +#define SIGNATURE_HASH 138687489 +#define TS_SIGNATURE "rusEFI 2021.07.13.hellen72.138687489" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index f4194d34be..388aa0b2d8 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellenNA6 -#define SIGNATURE_DATE 2021.07.12 -#define SIGNATURE_HASH 2093226989 -#define TS_SIGNATURE "rusEFI 2021.07.12.hellenNA6.2093226989" +#define SIGNATURE_DATE 2021.07.13 +#define SIGNATURE_HASH 901911427 +#define TS_SIGNATURE "rusEFI 2021.07.13.hellenNA6.901911427" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 9572ba6bb2..09ac9ee919 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2021.07.12 -#define SIGNATURE_HASH 848988992 -#define TS_SIGNATURE "rusEFI 2021.07.12.hellen_cypress.848988992" +#define SIGNATURE_DATE 2021.07.13 +#define SIGNATURE_HASH 2073854766 +#define TS_SIGNATURE "rusEFI 2021.07.13.hellen_cypress.2073854766" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 8b0ad71d30..5bbfc85188 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 2021.07.12 -#define SIGNATURE_HASH 3443476412 -#define TS_SIGNATURE "rusEFI 2021.07.12.kin.3443476412" +#define SIGNATURE_DATE 2021.07.13 +#define SIGNATURE_HASH 2218348498 +#define TS_SIGNATURE "rusEFI 2021.07.13.kin.2218348498" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 43a56db117..41efa7e909 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 2021.07.12 -#define SIGNATURE_HASH 2516476868 -#define TS_SIGNATURE "rusEFI 2021.07.12.mre_f4.2516476868" +#define SIGNATURE_DATE 2021.07.13 +#define SIGNATURE_HASH 3707268010 +#define TS_SIGNATURE "rusEFI 2021.07.13.mre_f4.3707268010" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 546099582e..d860e15080 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 2021.07.12 -#define SIGNATURE_HASH 2516476868 -#define TS_SIGNATURE "rusEFI 2021.07.12.mre_f7.2516476868" +#define SIGNATURE_DATE 2021.07.13 +#define SIGNATURE_HASH 3707268010 +#define TS_SIGNATURE "rusEFI 2021.07.13.mre_f7.3707268010" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index f3664e3d70..e22e2e88ff 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 2021.07.12 -#define SIGNATURE_HASH 1651528358 -#define TS_SIGNATURE "rusEFI 2021.07.12.prometheus_405.1651528358" +#define SIGNATURE_DATE 2021.07.13 +#define SIGNATURE_HASH 729176776 +#define TS_SIGNATURE "rusEFI 2021.07.13.prometheus_405.729176776" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 88bf2dbff0..76abf6a98d 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 2021.07.12 -#define SIGNATURE_HASH 1651528358 -#define TS_SIGNATURE "rusEFI 2021.07.12.prometheus_469.1651528358" +#define SIGNATURE_DATE 2021.07.13 +#define SIGNATURE_HASH 729176776 +#define TS_SIGNATURE "rusEFI 2021.07.13.prometheus_469.729176776" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 935e45eb1f..283246b1af 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 2021.07.12 -#define SIGNATURE_HASH 424734091 -#define TS_SIGNATURE "rusEFI 2021.07.12.proteus_f4.424734091" +#define SIGNATURE_DATE 2021.07.13 +#define SIGNATURE_HASH 1347872229 +#define TS_SIGNATURE "rusEFI 2021.07.13.proteus_f4.1347872229" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index e6981b2fc3..9a09d6ed60 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 2021.07.12 -#define SIGNATURE_HASH 424734091 -#define TS_SIGNATURE "rusEFI 2021.07.12.proteus_f7.424734091" +#define SIGNATURE_DATE 2021.07.13 +#define SIGNATURE_HASH 1347872229 +#define TS_SIGNATURE "rusEFI 2021.07.13.proteus_f7.1347872229" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 09e09b8591..eb3fb51054 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD subaru_eg33_f7 -#define SIGNATURE_DATE 2021.07.12 -#define SIGNATURE_HASH 3719978630 -#define TS_SIGNATURE "rusEFI 2021.07.12.subaru_eg33_f7.3719978630" +#define SIGNATURE_DATE 2021.07.13 +#define SIGNATURE_HASH 2495370984 +#define TS_SIGNATURE "rusEFI 2021.07.13.subaru_eg33_f7.2495370984" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index feb598689d..20e331bab9 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 979a695250..69b318fd00 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 2021.07.12.all.1894142096" + signature = "rusEFI 2021.07.13.all.971004158" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.12.all.1894142096" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.13.all.971004158" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Mon Jul 12 20:59:31 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jul 13 01:14:21 UTC 2021 pageSize = 20000 page = 1 @@ -3382,7 +3382,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" - field = "!This is a pretty advanced feature for when you are debugging trigger syncronizaion" + field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } @@ -3415,10 +3415,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1 - field = "Cam sensor bank 1 exhaust", camInputs2 - field = "Cam sensor bank 2 intake", camInputs3 - field = "Cam sensor bank 2 exhaust", camInputs4 + field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } field = "Invert cam inputs", invertCamVVTSignal diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 4125a2f4a5..8451c7dc23 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.12.f429-discovery.848988992" + signature = "rusEFI 2021.07.13.f429-discovery.2073854766" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.12.f429-discovery.848988992" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.13.f429-discovery.2073854766" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Mon Jul 12 20:59:34 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jul 13 01:14:25 UTC 2021 pageSize = 20000 page = 1 @@ -3382,7 +3382,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" - field = "!This is a pretty advanced feature for when you are debugging trigger syncronizaion" + field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } @@ -3415,10 +3415,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1 - field = "Cam sensor bank 1 exhaust", camInputs2 - field = "Cam sensor bank 2 intake", camInputs3 - field = "Cam sensor bank 2 exhaust", camInputs4 + field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } field = "Invert cam inputs", invertCamVVTSignal diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 7cc4d07623..b6860c84d8 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 2021.07.12.frankenso_na6.1219026601" + signature = "rusEFI 2021.07.13.frankenso_na6.28235463" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.12.frankenso_na6.1219026601" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.13.frankenso_na6.28235463" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Mon Jul 12 20:59:51 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jul 13 01:14:41 UTC 2021 pageSize = 20000 page = 1 @@ -3382,7 +3382,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" - field = "!This is a pretty advanced feature for when you are debugging trigger syncronizaion" + field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } @@ -3415,10 +3415,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1 - field = "Cam sensor bank 1 exhaust", camInputs2 - field = "Cam sensor bank 2 intake", camInputs3 - field = "Cam sensor bank 2 exhaust", camInputs4 + field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } field = "Invert cam inputs", invertCamVVTSignal diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index f2628317c7..1554154bfa 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.12.hellen121nissan.450222142" + signature = "rusEFI 2021.07.13.hellen121nissan.1406390352" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.12.hellen121nissan.450222142" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.13.hellen121nissan.1406390352" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Mon Jul 12 20:59:41 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jul 13 01:14:31 UTC 2021 pageSize = 20000 page = 1 @@ -3378,7 +3378,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" - field = "!This is a pretty advanced feature for when you are debugging trigger syncronizaion" + field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } @@ -3411,10 +3411,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1 - field = "Cam sensor bank 1 exhaust", camInputs2 - field = "Cam sensor bank 2 intake", camInputs3 - field = "Cam sensor bank 2 exhaust", camInputs4 + field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } field = "Invert cam inputs", invertCamVVTSignal diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index efde63672e..f5e009807a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.12.hellen121vag.2625161185" + signature = "rusEFI 2021.07.13.hellen121vag.3581857679" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.12.hellen121vag.2625161185" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.13.hellen121vag.3581857679" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Mon Jul 12 20:59:39 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jul 13 01:14:29 UTC 2021 pageSize = 20000 page = 1 @@ -3378,7 +3378,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" - field = "!This is a pretty advanced feature for when you are debugging trigger syncronizaion" + field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } @@ -3411,10 +3411,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1 - field = "Cam sensor bank 1 exhaust", camInputs2 - field = "Cam sensor bank 2 intake", camInputs3 - field = "Cam sensor bank 2 exhaust", camInputs4 + field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } field = "Invert cam inputs", invertCamVVTSignal diff --git a/firmware/tunerstudio/generated/rusefi_hellen128.ini b/firmware/tunerstudio/generated/rusefi_hellen128.ini index 2923fedf5a..f3e1dead71 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.12.hellen128.3923331394" + signature = "rusEFI 2021.07.13.hellen128.2698985772" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.12.hellen128.3923331394" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.13.hellen128.2698985772" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Mon Jul 12 20:59:37 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jul 13 01:14:27 UTC 2021 pageSize = 20000 page = 1 @@ -3378,7 +3378,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" - field = "!This is a pretty advanced feature for when you are debugging trigger syncronizaion" + field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } @@ -3411,10 +3411,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1 - field = "Cam sensor bank 1 exhaust", camInputs2 - field = "Cam sensor bank 2 intake", camInputs3 - field = "Cam sensor bank 2 exhaust", camInputs4 + field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } field = "Invert cam inputs", invertCamVVTSignal diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index b5b280e084..6f9827fd18 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.12.hellen72.1094859887" + signature = "rusEFI 2021.07.13.hellen72.138687489" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.12.hellen72.1094859887" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.13.hellen72.138687489" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Mon Jul 12 20:59:43 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jul 13 01:14:33 UTC 2021 pageSize = 20000 page = 1 @@ -3378,7 +3378,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" - field = "!This is a pretty advanced feature for when you are debugging trigger syncronizaion" + field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } @@ -3411,10 +3411,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1 - field = "Cam sensor bank 1 exhaust", camInputs2 - field = "Cam sensor bank 2 intake", camInputs3 - field = "Cam sensor bank 2 exhaust", camInputs4 + field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } field = "Invert cam inputs", invertCamVVTSignal diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index c26010b09b..ceff4477a5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.12.hellenNA6.2093226989" + signature = "rusEFI 2021.07.13.hellenNA6.901911427" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.12.hellenNA6.2093226989" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.13.hellenNA6.901911427" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Mon Jul 12 20:59:45 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jul 13 01:14:35 UTC 2021 pageSize = 20000 page = 1 @@ -3378,7 +3378,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" - field = "!This is a pretty advanced feature for when you are debugging trigger syncronizaion" + field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } @@ -3411,10 +3411,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1 - field = "Cam sensor bank 1 exhaust", camInputs2 - field = "Cam sensor bank 2 intake", camInputs3 - field = "Cam sensor bank 2 exhaust", camInputs4 + field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } field = "Invert cam inputs", invertCamVVTSignal diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index ee0dd00e47..0b4f87a93d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.12.hellen_cypress.848988992" + signature = "rusEFI 2021.07.13.hellen_cypress.2073854766" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.12.hellen_cypress.848988992" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.13.hellen_cypress.2073854766" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Jul 12 21:00:04 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Jul 13 01:14:53 UTC 2021 pageSize = 20000 page = 1 @@ -3382,7 +3382,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" - field = "!This is a pretty advanced feature for when you are debugging trigger syncronizaion" + field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } @@ -3415,10 +3415,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1 - field = "Cam sensor bank 1 exhaust", camInputs2 - field = "Cam sensor bank 2 intake", camInputs3 - field = "Cam sensor bank 2 exhaust", camInputs4 + field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } field = "Invert cam inputs", invertCamVVTSignal diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index f06c2933a8..f48b4aa9e4 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 2021.07.12.kin.3443476412" + signature = "rusEFI 2021.07.13.kin.2218348498" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.12.kin.3443476412" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.13.kin.2218348498" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Mon Jul 12 21:00:02 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Jul 13 01:14:51 UTC 2021 pageSize = 19972 page = 1 @@ -3357,7 +3357,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" - field = "!This is a pretty advanced feature for when you are debugging trigger syncronizaion" + field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } @@ -3390,10 +3390,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1 - field = "Cam sensor bank 1 exhaust", camInputs2 - field = "Cam sensor bank 2 intake", camInputs3 - field = "Cam sensor bank 2 exhaust", camInputs4 + field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } field = "Invert cam inputs", invertCamVVTSignal panel = triggerInputComparator diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 2f9cd181e4..ba268cce0b 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 2021.07.12.mre_f4.2516476868" + signature = "rusEFI 2021.07.13.mre_f4.3707268010" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.12.mre_f4.2516476868" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.13.mre_f4.3707268010" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Mon Jul 12 20:59:49 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jul 13 01:14:39 UTC 2021 pageSize = 20000 page = 1 @@ -3378,7 +3378,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" - field = "!This is a pretty advanced feature for when you are debugging trigger syncronizaion" + field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } @@ -3411,10 +3411,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1 - field = "Cam sensor bank 1 exhaust", camInputs2 - field = "Cam sensor bank 2 intake", camInputs3 - field = "Cam sensor bank 2 exhaust", camInputs4 + field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } field = "Invert cam inputs", invertCamVVTSignal diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index a4c7c85df3..e01195c536 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 2021.07.12.mre_f7.2516476868" + signature = "rusEFI 2021.07.13.mre_f7.3707268010" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.12.mre_f7.2516476868" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.13.mre_f7.3707268010" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Mon Jul 12 20:59:47 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jul 13 01:14:37 UTC 2021 pageSize = 20000 page = 1 @@ -3378,7 +3378,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" - field = "!This is a pretty advanced feature for when you are debugging trigger syncronizaion" + field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } @@ -3411,10 +3411,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1 - field = "Cam sensor bank 1 exhaust", camInputs2 - field = "Cam sensor bank 2 intake", camInputs3 - field = "Cam sensor bank 2 exhaust", camInputs4 + field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } field = "Invert cam inputs", invertCamVVTSignal diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 886ff242c0..1044a86d02 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 2021.07.12.prometheus_405.1651528358" + signature = "rusEFI 2021.07.13.prometheus_405.729176776" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.12.prometheus_405.1651528358" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.13.prometheus_405.729176776" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Mon Jul 12 20:59:56 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jul 13 01:14:45 UTC 2021 pageSize = 20000 page = 1 @@ -3377,7 +3377,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" - field = "!This is a pretty advanced feature for when you are debugging trigger syncronizaion" + field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } @@ -3410,10 +3410,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1 - field = "Cam sensor bank 1 exhaust", camInputs2 - field = "Cam sensor bank 2 intake", camInputs3 - field = "Cam sensor bank 2 exhaust", camInputs4 + field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } field = "Invert cam inputs", invertCamVVTSignal diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 90bb2676b9..194f2cc75d 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 2021.07.12.prometheus_469.1651528358" + signature = "rusEFI 2021.07.13.prometheus_469.729176776" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.12.prometheus_469.1651528358" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.13.prometheus_469.729176776" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Mon Jul 12 20:59:54 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jul 13 01:14:43 UTC 2021 pageSize = 20000 page = 1 @@ -3377,7 +3377,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" - field = "!This is a pretty advanced feature for when you are debugging trigger syncronizaion" + field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } @@ -3410,10 +3410,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1 - field = "Cam sensor bank 1 exhaust", camInputs2 - field = "Cam sensor bank 2 intake", camInputs3 - field = "Cam sensor bank 2 exhaust", camInputs4 + field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } field = "Invert cam inputs", invertCamVVTSignal diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 88d59d6216..e1999783cb 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 2021.07.12.proteus_f4.424734091" + signature = "rusEFI 2021.07.13.proteus_f4.1347872229" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.12.proteus_f4.424734091" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.13.proteus_f4.1347872229" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Mon Jul 12 21:00:00 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jul 13 01:14:49 UTC 2021 pageSize = 20000 page = 1 @@ -3374,7 +3374,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" - field = "!This is a pretty advanced feature for when you are debugging trigger syncronizaion" + field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } @@ -3407,10 +3407,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1 - field = "Cam sensor bank 1 exhaust", camInputs2 - field = "Cam sensor bank 2 intake", camInputs3 - field = "Cam sensor bank 2 exhaust", camInputs4 + field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } field = "Invert cam inputs", invertCamVVTSignal diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 9bdd8e4f34..e87fb86330 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 2021.07.12.proteus_f7.424734091" + signature = "rusEFI 2021.07.13.proteus_f7.1347872229" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.12.proteus_f7.424734091" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.13.proteus_f7.1347872229" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Mon Jul 12 20:59:57 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jul 13 01:14:47 UTC 2021 pageSize = 20000 page = 1 @@ -3374,7 +3374,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" - field = "!This is a pretty advanced feature for when you are debugging trigger syncronizaion" + field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } @@ -3407,10 +3407,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1 - field = "Cam sensor bank 1 exhaust", camInputs2 - field = "Cam sensor bank 2 intake", camInputs3 - field = "Cam sensor bank 2 exhaust", camInputs4 + field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } field = "Invert cam inputs", invertCamVVTSignal diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 0e77236fad..1e8af6f363 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.12.subaru_eg33_f7.3719978630" + signature = "rusEFI 2021.07.13.subaru_eg33_f7.2495370984" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.12.subaru_eg33_f7.3719978630" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.13.subaru_eg33_f7.2495370984" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Mon Jul 12 21:00:06 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Tue Jul 13 01:14:54 UTC 2021 pageSize = 20000 page = 1 @@ -3378,7 +3378,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" - field = "!This is a pretty advanced feature for when you are debugging trigger syncronizaion" + field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } @@ -3411,10 +3411,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1 - field = "Cam sensor bank 1 exhaust", camInputs2 - field = "Cam sensor bank 2 intake", camInputs3 - field = "Cam sensor bank 2 exhaust", camInputs4 + field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } field = "Invert cam inputs", invertCamVVTSignal 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 36e8e9a5ff..e5c86fac76 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 Fri Jul 09 14:08:11 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jul 13 01:14:21 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1263,7 +1263,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 = 640848033; + public static final int SIGNATURE_HASH = 971004158; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1578,7 +1578,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 2021.07.09.all.640848033"; + public static final String TS_SIGNATURE = "rusEFI 2021.07.13.all.971004158"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int TT_TT_1_16 = 50; @@ -1757,6 +1757,7 @@ public class Fields { 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 VM_VVT_INACTIVE = 0; public static final int vRefAdcChannel_offset = 1470; public static final int vssFilterReciprocal_offset = 15196; public static final int vvtCamSensorUseRise_offset = 744; diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 1d54af5162..ced340f872 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +