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 9d6d3f945c..612ccedb72 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 Oct 29 19:50:52 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Oct 30 14:49:18 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3988,20 +3988,25 @@ struct engine_configuration_s { */ uint8_t alignmentFill_at_4539[1]; /** - ratio + from * offset 4540 */ - float triggerGapOverride[GAP_TRACKING_LENGTH]; + float triggerGapOverrideFrom[GAP_TRACKING_LENGTH]; /** Percent * offset 4612 */ int8_t fuelTrim[MAX_CYLINDER_COUNT]; /** - units + to * offset 4624 */ - int mainUnusedEnd[344]; + float triggerGapOverrideTo[GAP_TRACKING_LENGTH]; + /** + units + * offset 4696 + */ + int mainUnusedEnd[326]; /** total size 6000*/ }; @@ -4396,4 +4401,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 Oct 29 19:50:52 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Oct 30 14:49:18 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 b2351a4918..d78b96faa8 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 @@ -1579,7 +1579,7 @@ #define MAIN_HELP_URL "http://www.rusefi.com/" #define mainRelayPin_offset 706 #define mainRelayPinMode_offset 752 -#define mainUnusedEnd_offset 4624 +#define mainUnusedEnd_offset 4696 #define malfunctionIndicatorPin_offset 660 #define malfunctionIndicatorPinMode_offset 661 #define manIdlePosition_offset 608 @@ -1799,8 +1799,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2021.10.29 -#define SIGNATURE_HASH 2622329031 +#define SIGNATURE_DATE 2021.10.30 +#define SIGNATURE_HASH 1076147266 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -2161,24 +2161,42 @@ #define triggerCompSensorSatRpm_offset 4039 #define triggerErrorPin_offset 828 #define triggerErrorPinMode_offset 829 -#define triggerGapOverride10_offset 4576 -#define triggerGapOverride11_offset 4580 -#define triggerGapOverride12_offset 4584 -#define triggerGapOverride13_offset 4588 -#define triggerGapOverride14_offset 4592 -#define triggerGapOverride15_offset 4596 -#define triggerGapOverride16_offset 4600 -#define triggerGapOverride17_offset 4604 -#define triggerGapOverride18_offset 4608 -#define triggerGapOverride1_offset 4540 -#define triggerGapOverride2_offset 4544 -#define triggerGapOverride3_offset 4548 -#define triggerGapOverride4_offset 4552 -#define triggerGapOverride5_offset 4556 -#define triggerGapOverride6_offset 4560 -#define triggerGapOverride7_offset 4564 -#define triggerGapOverride8_offset 4568 -#define triggerGapOverride9_offset 4572 +#define triggerGapOverrideFrom10_offset 4576 +#define triggerGapOverrideFrom11_offset 4580 +#define triggerGapOverrideFrom12_offset 4584 +#define triggerGapOverrideFrom13_offset 4588 +#define triggerGapOverrideFrom14_offset 4592 +#define triggerGapOverrideFrom15_offset 4596 +#define triggerGapOverrideFrom16_offset 4600 +#define triggerGapOverrideFrom17_offset 4604 +#define triggerGapOverrideFrom18_offset 4608 +#define triggerGapOverrideFrom1_offset 4540 +#define triggerGapOverrideFrom2_offset 4544 +#define triggerGapOverrideFrom3_offset 4548 +#define triggerGapOverrideFrom4_offset 4552 +#define triggerGapOverrideFrom5_offset 4556 +#define triggerGapOverrideFrom6_offset 4560 +#define triggerGapOverrideFrom7_offset 4564 +#define triggerGapOverrideFrom8_offset 4568 +#define triggerGapOverrideFrom9_offset 4572 +#define triggerGapOverrideTo10_offset 4660 +#define triggerGapOverrideTo11_offset 4664 +#define triggerGapOverrideTo12_offset 4668 +#define triggerGapOverrideTo13_offset 4672 +#define triggerGapOverrideTo14_offset 4676 +#define triggerGapOverrideTo15_offset 4680 +#define triggerGapOverrideTo16_offset 4684 +#define triggerGapOverrideTo17_offset 4688 +#define triggerGapOverrideTo18_offset 4692 +#define triggerGapOverrideTo1_offset 4624 +#define triggerGapOverrideTo2_offset 4628 +#define triggerGapOverrideTo3_offset 4632 +#define triggerGapOverrideTo4_offset 4636 +#define triggerGapOverrideTo5_offset 4640 +#define triggerGapOverrideTo6_offset 4644 +#define triggerGapOverrideTo7_offset 4648 +#define triggerGapOverrideTo8_offset 4652 +#define triggerGapOverrideTo9_offset 4656 #define triggerInputDebugPins1_offset 1756 #define triggerInputDebugPins2_offset 1757 #define triggerInputDebugPins3_offset 1758 @@ -2290,7 +2308,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.10.29.hellen_cypress.2622329031" +#define TS_SIGNATURE "rusEFI 2021.10.30.hellen_cypress.1076147266" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' 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 7c43362a13..a80aed9083 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 Oct 29 19:50:50 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Oct 30 14:49:16 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3982,20 +3982,25 @@ struct engine_configuration_s { */ uint8_t alignmentFill_at_4511[1]; /** - ratio + from * offset 4512 */ - float triggerGapOverride[GAP_TRACKING_LENGTH]; + float triggerGapOverrideFrom[GAP_TRACKING_LENGTH]; /** Percent * offset 4584 */ int8_t fuelTrim[MAX_CYLINDER_COUNT]; /** - units + to * offset 4596 */ - int mainUnusedEnd[344]; + float triggerGapOverrideTo[GAP_TRACKING_LENGTH]; + /** + units + * offset 4668 + */ + int mainUnusedEnd[326]; /** total size 5972*/ }; @@ -4390,4 +4395,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 Oct 29 19:50:50 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Oct 30 14:49:16 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 d6d6ff2829..0bd1125d83 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1564,7 +1564,7 @@ #define MAIN_HELP_URL "http://www.rusefi.com/" #define mainRelayPin_offset 706 #define mainRelayPinMode_offset 752 -#define mainUnusedEnd_offset 4596 +#define mainUnusedEnd_offset 4668 #define malfunctionIndicatorPin_offset 660 #define malfunctionIndicatorPinMode_offset 661 #define manIdlePosition_offset 608 @@ -1784,8 +1784,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2021.10.29 -#define SIGNATURE_HASH 1676172347 +#define SIGNATURE_DATE 2021.10.30 +#define SIGNATURE_HASH 3212933310 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -2146,24 +2146,42 @@ #define triggerCompSensorSatRpm_offset 4011 #define triggerErrorPin_offset 828 #define triggerErrorPinMode_offset 829 -#define triggerGapOverride10_offset 4548 -#define triggerGapOverride11_offset 4552 -#define triggerGapOverride12_offset 4556 -#define triggerGapOverride13_offset 4560 -#define triggerGapOverride14_offset 4564 -#define triggerGapOverride15_offset 4568 -#define triggerGapOverride16_offset 4572 -#define triggerGapOverride17_offset 4576 -#define triggerGapOverride18_offset 4580 -#define triggerGapOverride1_offset 4512 -#define triggerGapOverride2_offset 4516 -#define triggerGapOverride3_offset 4520 -#define triggerGapOverride4_offset 4524 -#define triggerGapOverride5_offset 4528 -#define triggerGapOverride6_offset 4532 -#define triggerGapOverride7_offset 4536 -#define triggerGapOverride8_offset 4540 -#define triggerGapOverride9_offset 4544 +#define triggerGapOverrideFrom10_offset 4548 +#define triggerGapOverrideFrom11_offset 4552 +#define triggerGapOverrideFrom12_offset 4556 +#define triggerGapOverrideFrom13_offset 4560 +#define triggerGapOverrideFrom14_offset 4564 +#define triggerGapOverrideFrom15_offset 4568 +#define triggerGapOverrideFrom16_offset 4572 +#define triggerGapOverrideFrom17_offset 4576 +#define triggerGapOverrideFrom18_offset 4580 +#define triggerGapOverrideFrom1_offset 4512 +#define triggerGapOverrideFrom2_offset 4516 +#define triggerGapOverrideFrom3_offset 4520 +#define triggerGapOverrideFrom4_offset 4524 +#define triggerGapOverrideFrom5_offset 4528 +#define triggerGapOverrideFrom6_offset 4532 +#define triggerGapOverrideFrom7_offset 4536 +#define triggerGapOverrideFrom8_offset 4540 +#define triggerGapOverrideFrom9_offset 4544 +#define triggerGapOverrideTo10_offset 4632 +#define triggerGapOverrideTo11_offset 4636 +#define triggerGapOverrideTo12_offset 4640 +#define triggerGapOverrideTo13_offset 4644 +#define triggerGapOverrideTo14_offset 4648 +#define triggerGapOverrideTo15_offset 4652 +#define triggerGapOverrideTo16_offset 4656 +#define triggerGapOverrideTo17_offset 4660 +#define triggerGapOverrideTo18_offset 4664 +#define triggerGapOverrideTo1_offset 4596 +#define triggerGapOverrideTo2_offset 4600 +#define triggerGapOverrideTo3_offset 4604 +#define triggerGapOverrideTo4_offset 4608 +#define triggerGapOverrideTo5_offset 4612 +#define triggerGapOverrideTo6_offset 4616 +#define triggerGapOverrideTo7_offset 4620 +#define triggerGapOverrideTo8_offset 4624 +#define triggerGapOverrideTo9_offset 4628 #define triggerInputDebugPins1_offset 1756 #define triggerInputDebugPins2_offset 1757 #define triggerInputDebugPins3_offset 1758 @@ -2275,7 +2293,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.10.29.kin.1676172347" +#define TS_SIGNATURE "rusEFI 2021.10.30.kin.3212933310" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' 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 26d87164e7..0fde96a929 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 Oct 29 19:50:54 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 Sat Oct 30 14:49:21 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3988,20 +3988,25 @@ struct engine_configuration_s { */ uint8_t alignmentFill_at_4539[1]; /** - ratio + from * offset 4540 */ - float triggerGapOverride[GAP_TRACKING_LENGTH]; + float triggerGapOverrideFrom[GAP_TRACKING_LENGTH]; /** Percent * offset 4612 */ int8_t fuelTrim[MAX_CYLINDER_COUNT]; /** - units + to * offset 4624 */ - int mainUnusedEnd[344]; + float triggerGapOverrideTo[GAP_TRACKING_LENGTH]; + /** + units + * offset 4696 + */ + int mainUnusedEnd[326]; /** total size 6000*/ }; @@ -4396,4 +4401,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 Oct 29 19:50:54 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 Sat Oct 30 14:49:21 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 56207a3adc..4e28fadd58 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 @@ -1591,7 +1591,7 @@ #define MAIN_HELP_URL "http://www.rusefi.com/" #define mainRelayPin_offset 706 #define mainRelayPinMode_offset 752 -#define mainUnusedEnd_offset 4624 +#define mainUnusedEnd_offset 4696 #define malfunctionIndicatorPin_offset 660 #define malfunctionIndicatorPinMode_offset 661 #define manIdlePosition_offset 608 @@ -1812,8 +1812,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD subaru_eg33_f7 -#define SIGNATURE_DATE 2021.10.29 -#define SIGNATURE_HASH 1270587508 +#define SIGNATURE_DATE 2021.10.30 +#define SIGNATURE_HASH 2547156209 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -2174,24 +2174,42 @@ #define triggerCompSensorSatRpm_offset 4039 #define triggerErrorPin_offset 828 #define triggerErrorPinMode_offset 829 -#define triggerGapOverride10_offset 4576 -#define triggerGapOverride11_offset 4580 -#define triggerGapOverride12_offset 4584 -#define triggerGapOverride13_offset 4588 -#define triggerGapOverride14_offset 4592 -#define triggerGapOverride15_offset 4596 -#define triggerGapOverride16_offset 4600 -#define triggerGapOverride17_offset 4604 -#define triggerGapOverride18_offset 4608 -#define triggerGapOverride1_offset 4540 -#define triggerGapOverride2_offset 4544 -#define triggerGapOverride3_offset 4548 -#define triggerGapOverride4_offset 4552 -#define triggerGapOverride5_offset 4556 -#define triggerGapOverride6_offset 4560 -#define triggerGapOverride7_offset 4564 -#define triggerGapOverride8_offset 4568 -#define triggerGapOverride9_offset 4572 +#define triggerGapOverrideFrom10_offset 4576 +#define triggerGapOverrideFrom11_offset 4580 +#define triggerGapOverrideFrom12_offset 4584 +#define triggerGapOverrideFrom13_offset 4588 +#define triggerGapOverrideFrom14_offset 4592 +#define triggerGapOverrideFrom15_offset 4596 +#define triggerGapOverrideFrom16_offset 4600 +#define triggerGapOverrideFrom17_offset 4604 +#define triggerGapOverrideFrom18_offset 4608 +#define triggerGapOverrideFrom1_offset 4540 +#define triggerGapOverrideFrom2_offset 4544 +#define triggerGapOverrideFrom3_offset 4548 +#define triggerGapOverrideFrom4_offset 4552 +#define triggerGapOverrideFrom5_offset 4556 +#define triggerGapOverrideFrom6_offset 4560 +#define triggerGapOverrideFrom7_offset 4564 +#define triggerGapOverrideFrom8_offset 4568 +#define triggerGapOverrideFrom9_offset 4572 +#define triggerGapOverrideTo10_offset 4660 +#define triggerGapOverrideTo11_offset 4664 +#define triggerGapOverrideTo12_offset 4668 +#define triggerGapOverrideTo13_offset 4672 +#define triggerGapOverrideTo14_offset 4676 +#define triggerGapOverrideTo15_offset 4680 +#define triggerGapOverrideTo16_offset 4684 +#define triggerGapOverrideTo17_offset 4688 +#define triggerGapOverrideTo18_offset 4692 +#define triggerGapOverrideTo1_offset 4624 +#define triggerGapOverrideTo2_offset 4628 +#define triggerGapOverrideTo3_offset 4632 +#define triggerGapOverrideTo4_offset 4636 +#define triggerGapOverrideTo5_offset 4640 +#define triggerGapOverrideTo6_offset 4644 +#define triggerGapOverrideTo7_offset 4648 +#define triggerGapOverrideTo8_offset 4652 +#define triggerGapOverrideTo9_offset 4656 #define triggerInputDebugPins1_offset 1756 #define triggerInputDebugPins2_offset 1757 #define triggerInputDebugPins3_offset 1758 @@ -2303,7 +2321,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2021.10.29.subaru_eg33_f7.1270587508" +#define TS_SIGNATURE "rusEFI 2021.10.30.subaru_eg33_f7.2547156209" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 21c8ba7c1b..6e237b7351 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 Oct 29 19:50:48 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Oct 30 14:49:13 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3988,20 +3988,25 @@ struct engine_configuration_s { */ uint8_t alignmentFill_at_4539[1]; /** - ratio + from * offset 4540 */ - float triggerGapOverride[GAP_TRACKING_LENGTH]; + float triggerGapOverrideFrom[GAP_TRACKING_LENGTH]; /** Percent * offset 4612 */ int8_t fuelTrim[MAX_CYLINDER_COUNT]; /** - units + to * offset 4624 */ - int mainUnusedEnd[344]; + float triggerGapOverrideTo[GAP_TRACKING_LENGTH]; + /** + units + * offset 4696 + */ + int mainUnusedEnd[326]; /** total size 6000*/ }; @@ -4396,4 +4401,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 Oct 29 19:50:48 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Oct 30 14:49:13 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index c6d3d0d403..59711dd59c 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 Oct 29 19:50:48 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Oct 30 14:49:13 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 1f31b9e866..6ac3b9b100 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 Oct 29 19:50:48 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Oct 30 14:49:13 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 525855a6f5..e296eaa546 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 Oct 29 19:50:48 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Oct 30 14:49:13 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 8b0682e6fb..1592812efa 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 Oct 29 19:50:48 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Oct 30 14:49:13 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 6b9e55da6d..abb05f9be5 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1579,7 +1579,7 @@ #define MAIN_HELP_URL "http://www.rusefi.com/" #define mainRelayPin_offset 706 #define mainRelayPinMode_offset 752 -#define mainUnusedEnd_offset 4624 +#define mainUnusedEnd_offset 4696 #define malfunctionIndicatorPin_offset 660 #define malfunctionIndicatorPinMode_offset 661 #define manIdlePosition_offset 608 @@ -1799,8 +1799,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2021.10.29 -#define SIGNATURE_HASH 3727772439 +#define SIGNATURE_DATE 2021.10.30 +#define SIGNATURE_HASH 39350162 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -2161,24 +2161,42 @@ #define triggerCompSensorSatRpm_offset 4039 #define triggerErrorPin_offset 828 #define triggerErrorPinMode_offset 829 -#define triggerGapOverride10_offset 4576 -#define triggerGapOverride11_offset 4580 -#define triggerGapOverride12_offset 4584 -#define triggerGapOverride13_offset 4588 -#define triggerGapOverride14_offset 4592 -#define triggerGapOverride15_offset 4596 -#define triggerGapOverride16_offset 4600 -#define triggerGapOverride17_offset 4604 -#define triggerGapOverride18_offset 4608 -#define triggerGapOverride1_offset 4540 -#define triggerGapOverride2_offset 4544 -#define triggerGapOverride3_offset 4548 -#define triggerGapOverride4_offset 4552 -#define triggerGapOverride5_offset 4556 -#define triggerGapOverride6_offset 4560 -#define triggerGapOverride7_offset 4564 -#define triggerGapOverride8_offset 4568 -#define triggerGapOverride9_offset 4572 +#define triggerGapOverrideFrom10_offset 4576 +#define triggerGapOverrideFrom11_offset 4580 +#define triggerGapOverrideFrom12_offset 4584 +#define triggerGapOverrideFrom13_offset 4588 +#define triggerGapOverrideFrom14_offset 4592 +#define triggerGapOverrideFrom15_offset 4596 +#define triggerGapOverrideFrom16_offset 4600 +#define triggerGapOverrideFrom17_offset 4604 +#define triggerGapOverrideFrom18_offset 4608 +#define triggerGapOverrideFrom1_offset 4540 +#define triggerGapOverrideFrom2_offset 4544 +#define triggerGapOverrideFrom3_offset 4548 +#define triggerGapOverrideFrom4_offset 4552 +#define triggerGapOverrideFrom5_offset 4556 +#define triggerGapOverrideFrom6_offset 4560 +#define triggerGapOverrideFrom7_offset 4564 +#define triggerGapOverrideFrom8_offset 4568 +#define triggerGapOverrideFrom9_offset 4572 +#define triggerGapOverrideTo10_offset 4660 +#define triggerGapOverrideTo11_offset 4664 +#define triggerGapOverrideTo12_offset 4668 +#define triggerGapOverrideTo13_offset 4672 +#define triggerGapOverrideTo14_offset 4676 +#define triggerGapOverrideTo15_offset 4680 +#define triggerGapOverrideTo16_offset 4684 +#define triggerGapOverrideTo17_offset 4688 +#define triggerGapOverrideTo18_offset 4692 +#define triggerGapOverrideTo1_offset 4624 +#define triggerGapOverrideTo2_offset 4628 +#define triggerGapOverrideTo3_offset 4632 +#define triggerGapOverrideTo4_offset 4636 +#define triggerGapOverrideTo5_offset 4640 +#define triggerGapOverrideTo6_offset 4644 +#define triggerGapOverrideTo7_offset 4648 +#define triggerGapOverrideTo8_offset 4652 +#define triggerGapOverrideTo9_offset 4656 #define triggerInputDebugPins1_offset 1756 #define triggerInputDebugPins2_offset 1757 #define triggerInputDebugPins3_offset 1758 @@ -2290,7 +2308,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.10.29.all.3727772439" +#define TS_SIGNATURE "rusEFI 2021.10.30.all.39350162" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 52c1c5e8a9..f8d9690573 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 2021.10.30 -#define SIGNATURE_HASH 117907185 -#define TS_SIGNATURE "rusEFI 2021.10.30.all.117907185" +#define SIGNATURE_HASH 39350162 +#define TS_SIGNATURE "rusEFI 2021.10.30.all.39350162" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index e390cd4d31..4096e3a14b 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD atlas #define SIGNATURE_DATE 2021.10.30 -#define SIGNATURE_HASH 466480086 -#define TS_SIGNATURE "rusEFI 2021.10.30.atlas.466480086" +#define SIGNATURE_HASH 512924341 +#define TS_SIGNATURE "rusEFI 2021.10.30.atlas.512924341" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 6fef52cc37..fe0e6b20db 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD f429-discovery #define SIGNATURE_DATE 2021.10.30 -#define SIGNATURE_HASH 117907185 -#define TS_SIGNATURE "rusEFI 2021.10.30.f429-discovery.117907185" +#define SIGNATURE_HASH 39350162 +#define TS_SIGNATURE "rusEFI 2021.10.30.f429-discovery.39350162" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index f97665c418..408a12cbcf 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 2021.10.30 -#define SIGNATURE_HASH 2100644632 -#define TS_SIGNATURE "rusEFI 2021.10.30.frankenso_na6.2100644632" +#define SIGNATURE_HASH 2020227707 +#define TS_SIGNATURE "rusEFI 2021.10.30.frankenso_na6.2020227707" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index eaf65a2adb..fafa032448 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen-nb1 #define SIGNATURE_DATE 2021.10.30 -#define SIGNATURE_HASH 1621137624 -#define TS_SIGNATURE "rusEFI 2021.10.30.hellen-nb1.1621137624" +#define SIGNATURE_HASH 1711270331 +#define TS_SIGNATURE "rusEFI 2021.10.30.hellen-nb1.1711270331" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 55bf9ec5b9..1c54b36475 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen121nissan #define SIGNATURE_DATE 2021.10.30 -#define SIGNATURE_HASH 2364950195 -#define TS_SIGNATURE "rusEFI 2021.10.30.hellen121nissan.2364950195" +#define SIGNATURE_HASH 2309568464 +#define TS_SIGNATURE "rusEFI 2021.10.30.hellen121nissan.2309568464" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index bbe9d55c18..5260572581 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen121vag #define SIGNATURE_DATE 2021.10.30 -#define SIGNATURE_HASH 1424752311 -#define TS_SIGNATURE "rusEFI 2021.10.30.hellen121vag.1424752311" +#define SIGNATURE_HASH 1370787796 +#define TS_SIGNATURE "rusEFI 2021.10.30.hellen121vag.1370787796" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index f653688bc6..8c04ade383 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen128 #define SIGNATURE_DATE 2021.10.30 -#define SIGNATURE_HASH 3506898465 -#define TS_SIGNATURE "rusEFI 2021.10.30.hellen128.3506898465" +#define SIGNATURE_HASH 3562567490 +#define TS_SIGNATURE "rusEFI 2021.10.30.hellen128.3562567490" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 02a499d36d..9464c347ec 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen154hyundai #define SIGNATURE_DATE 2021.10.30 -#define SIGNATURE_HASH 1131985099 -#define TS_SIGNATURE "rusEFI 2021.10.30.hellen154hyundai.1131985099" +#define SIGNATURE_HASH 1177012648 +#define TS_SIGNATURE "rusEFI 2021.10.30.hellen154hyundai.1177012648" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 3c7909830d..49aff8325a 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen72 #define SIGNATURE_DATE 2021.10.30 -#define SIGNATURE_HASH 1636990678 -#define TS_SIGNATURE "rusEFI 2021.10.30.hellen72.1636990678" +#define SIGNATURE_HASH 1691160501 +#define TS_SIGNATURE "rusEFI 2021.10.30.hellen72.1691160501" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 5a13ce2a62..205df45580 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen88bmw #define SIGNATURE_DATE 2021.10.30 -#define SIGNATURE_HASH 4052214300 -#define TS_SIGNATURE "rusEFI 2021.10.30.hellen88bmw.4052214300" +#define SIGNATURE_HASH 4107834239 +#define TS_SIGNATURE "rusEFI 2021.10.30.hellen88bmw.4107834239" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index bcf9da47d1..02503857ca 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellenNA6 #define SIGNATURE_DATE 2021.10.30 -#define SIGNATURE_HASH 4056774429 -#define TS_SIGNATURE "rusEFI 2021.10.30.hellenNA6.4056774429" +#define SIGNATURE_HASH 4103210622 +#define TS_SIGNATURE "rusEFI 2021.10.30.hellenNA6.4103210622" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 55869c1de9..eeee85be3b 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2021.10.30 -#define SIGNATURE_HASH 1165739297 -#define TS_SIGNATURE "rusEFI 2021.10.30.hellen_cypress.1165739297" +#define SIGNATURE_HASH 1076147266 +#define TS_SIGNATURE "rusEFI 2021.10.30.hellen_cypress.1076147266" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index e34da5468d..497dc9d759 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 2021.10.30 -#define SIGNATURE_HASH 3135113693 -#define TS_SIGNATURE "rusEFI 2021.10.30.kin.3135113693" +#define SIGNATURE_HASH 3212933310 +#define TS_SIGNATURE "rusEFI 2021.10.30.kin.3212933310" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 0de38c3b9a..433833b990 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 2021.10.30 -#define SIGNATURE_HASH 2409040229 -#define TS_SIGNATURE "rusEFI 2021.10.30.mre_f4.2409040229" +#define SIGNATURE_HASH 2328393734 +#define TS_SIGNATURE "rusEFI 2021.10.30.mre_f4.2328393734" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 04b5941247..b060edf6fe 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 2021.10.30 -#define SIGNATURE_HASH 2409040229 -#define TS_SIGNATURE "rusEFI 2021.10.30.mre_f7.2409040229" +#define SIGNATURE_HASH 2328393734 +#define TS_SIGNATURE "rusEFI 2021.10.30.mre_f7.2328393734" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 6d0a7ff49f..0eabf8e245 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 2021.10.30 -#define SIGNATURE_HASH 1475200791 -#define TS_SIGNATURE "rusEFI 2021.10.30.prometheus_405.1475200791" +#define SIGNATURE_HASH 1387443828 +#define TS_SIGNATURE "rusEFI 2021.10.30.prometheus_405.1387443828" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 669e6c3aac..12205b14bb 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 2021.10.30 -#define SIGNATURE_HASH 1475200791 -#define TS_SIGNATURE "rusEFI 2021.10.30.prometheus_469.1475200791" +#define SIGNATURE_HASH 1387443828 +#define TS_SIGNATURE "rusEFI 2021.10.30.prometheus_469.1387443828" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index e031913593..c8718b0b0b 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 2021.10.30 -#define SIGNATURE_HASH 2581812781 -#define TS_SIGNATURE "rusEFI 2021.10.30.proteus_f4.2581812781" +#define SIGNATURE_HASH 2629576526 +#define TS_SIGNATURE "rusEFI 2021.10.30.proteus_f4.2629576526" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 8c37296587..a0bb0db544 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 2021.10.30 -#define SIGNATURE_HASH 2581812781 -#define TS_SIGNATURE "rusEFI 2021.10.30.proteus_f7.2581812781" +#define SIGNATURE_HASH 2629576526 +#define TS_SIGNATURE "rusEFI 2021.10.30.proteus_f7.2629576526" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index f30121f5b7..91ab87b6b6 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD subaru_eg33_f7 #define SIGNATURE_DATE 2021.10.30 -#define SIGNATURE_HASH 2458776978 -#define TS_SIGNATURE "rusEFI 2021.10.30.subaru_eg33_f7.2458776978" +#define SIGNATURE_HASH 2547156209 +#define TS_SIGNATURE "rusEFI 2021.10.30.subaru_eg33_f7.2547156209" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 39c1e3cf2d..c4a56692f4 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 e76c463b55..40b79e4fbd 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.30.all.117907185" + signature = "rusEFI 2021.10.30.all.39350162" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.30.all.117907185" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.30.all.39350162" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Oct 30 10:17:49 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Oct 30 14:49:13 UTC 2021 pageSize = 20000 page = 1 @@ -1211,24 +1211,24 @@ tcu_solenoid_mode5 = bits, U08, 4521, [0:1], "default", "default inverted", "ope tcu_solenoid_mode6 = bits, U08, 4522, [0:1], "default", "default inverted", "open collector", "open collector inverted" knockBaseNoise = array, S08, 4523, [16], "dB", 1, 0, -30, 0, 2 alignmentFill_at_4539 = scalar, U08, 4539, "units", 1, 0, -20, 100, 0 -triggerGapOverride1 = scalar, F32, 4540, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride2 = scalar, F32, 4544, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride3 = scalar, F32, 4548, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride4 = scalar, F32, 4552, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride5 = scalar, F32, 4556, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride6 = scalar, F32, 4560, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride7 = scalar, F32, 4564, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride8 = scalar, F32, 4568, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride9 = scalar, F32, 4572, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride10 = scalar, F32, 4576, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride11 = scalar, F32, 4580, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride12 = scalar, F32, 4584, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride13 = scalar, F32, 4588, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride14 = scalar, F32, 4592, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride15 = scalar, F32, 4596, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride16 = scalar, F32, 4600, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride17 = scalar, F32, 4604, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride18 = scalar, F32, 4608, "ratio", 1, 0, 0, 20, 2 +triggerGapOverrideFrom1 = scalar, F32, 4540, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom2 = scalar, F32, 4544, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom3 = scalar, F32, 4548, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom4 = scalar, F32, 4552, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom5 = scalar, F32, 4556, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom6 = scalar, F32, 4560, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom7 = scalar, F32, 4564, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom8 = scalar, F32, 4568, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom9 = scalar, F32, 4572, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom10 = scalar, F32, 4576, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom11 = scalar, F32, 4580, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom12 = scalar, F32, 4584, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom13 = scalar, F32, 4588, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom14 = scalar, F32, 4592, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom15 = scalar, F32, 4596, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom16 = scalar, F32, 4600, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom17 = scalar, F32, 4604, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom18 = scalar, F32, 4608, "from", 1, 0, 0, 20, 2 fuelTrim1 = scalar, S08, 4612, "Percent", 0.02, 0, -25, 25, 2 fuelTrim2 = scalar, S08, 4613, "Percent", 0.02, 0, -25, 25, 2 fuelTrim3 = scalar, S08, 4614, "Percent", 0.02, 0, -25, 25, 2 @@ -1241,7 +1241,25 @@ fuelTrim9 = scalar, S08, 4620, "Percent", 0.02, 0, -25, 25, 2 fuelTrim10 = scalar, S08, 4621, "Percent", 0.02, 0, -25, 25, 2 fuelTrim11 = scalar, S08, 4622, "Percent", 0.02, 0, -25, 25, 2 fuelTrim12 = scalar, S08, 4623, "Percent", 0.02, 0, -25, 25, 2 -mainUnusedEnd = array, S32, 4624, [344], "units", 1, 0, -20, 100, 0 +triggerGapOverrideTo1 = scalar, F32, 4624, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo2 = scalar, F32, 4628, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo3 = scalar, F32, 4632, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo4 = scalar, F32, 4636, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo5 = scalar, F32, 4640, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo6 = scalar, F32, 4644, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo7 = scalar, F32, 4648, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo8 = scalar, F32, 4652, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo9 = scalar, F32, 4656, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo10 = scalar, F32, 4660, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo11 = scalar, F32, 4664, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo12 = scalar, F32, 4668, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo13 = scalar, F32, 4672, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo14 = scalar, F32, 4676, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 +mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -3630,14 +3648,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Enable Trigger debug mode", cmd_test_debug_mode_trigger field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } - field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } - field = "Second gap", triggerGapOverride2, { overrideTriggerGaps == 1 } - field = "Third gap", triggerGapOverride3, { overrideTriggerGaps == 1 } - field = "Gap #4", triggerGapOverride4, { overrideTriggerGaps == 1 } - field = "Gap #5", triggerGapOverride5, { overrideTriggerGaps == 1 } - field = "Gap #6", triggerGapOverride6, { overrideTriggerGaps == 1 } - field = "Gap #7", triggerGapOverride7, { overrideTriggerGaps == 1 } - field = "Gap #8", triggerGapOverride8, { overrideTriggerGaps == 1 } + field = "First gap from", triggerGapOverrideFrom1, { overrideTriggerGaps == 1 } + field = "First gap to", triggerGapOverrideTo1 , { overrideTriggerGaps == 1 } + + field = "Second gap from", triggerGapOverrideFrom2, { overrideTriggerGaps == 1 } + field = "Second gap to", triggerGapOverrideTo2, { overrideTriggerGaps == 1 } + + field = "Third gap from", triggerGapOverrideFrom3, { overrideTriggerGaps == 1 } + field = "Third gap to", triggerGapOverrideTo3, { overrideTriggerGaps == 1 } + + field = "Gap #4 from", triggerGapOverrideFrom4, { overrideTriggerGaps == 1 } + field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 } + field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 } + field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 } dialog = triggerConfiguration_IO, "Advanced Trigger" field = "!https://rusefi.com/s/vvt" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 1ffdf82626..417955894f 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.30.atlas.466480086" + signature = "rusEFI 2021.10.30.atlas.512924341" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.30.atlas.466480086" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.30.atlas.512924341" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Oct 30 10:17:47 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Oct 30 14:49:10 UTC 2021 pageSize = 20000 page = 1 @@ -1211,24 +1211,24 @@ tcu_solenoid_mode5 = bits, U08, 4521, [0:1], "default", "default inverted", "ope tcu_solenoid_mode6 = bits, U08, 4522, [0:1], "default", "default inverted", "open collector", "open collector inverted" knockBaseNoise = array, S08, 4523, [16], "dB", 1, 0, -30, 0, 2 alignmentFill_at_4539 = scalar, U08, 4539, "units", 1, 0, -20, 100, 0 -triggerGapOverride1 = scalar, F32, 4540, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride2 = scalar, F32, 4544, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride3 = scalar, F32, 4548, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride4 = scalar, F32, 4552, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride5 = scalar, F32, 4556, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride6 = scalar, F32, 4560, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride7 = scalar, F32, 4564, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride8 = scalar, F32, 4568, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride9 = scalar, F32, 4572, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride10 = scalar, F32, 4576, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride11 = scalar, F32, 4580, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride12 = scalar, F32, 4584, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride13 = scalar, F32, 4588, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride14 = scalar, F32, 4592, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride15 = scalar, F32, 4596, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride16 = scalar, F32, 4600, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride17 = scalar, F32, 4604, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride18 = scalar, F32, 4608, "ratio", 1, 0, 0, 20, 2 +triggerGapOverrideFrom1 = scalar, F32, 4540, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom2 = scalar, F32, 4544, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom3 = scalar, F32, 4548, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom4 = scalar, F32, 4552, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom5 = scalar, F32, 4556, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom6 = scalar, F32, 4560, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom7 = scalar, F32, 4564, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom8 = scalar, F32, 4568, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom9 = scalar, F32, 4572, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom10 = scalar, F32, 4576, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom11 = scalar, F32, 4580, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom12 = scalar, F32, 4584, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom13 = scalar, F32, 4588, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom14 = scalar, F32, 4592, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom15 = scalar, F32, 4596, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom16 = scalar, F32, 4600, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom17 = scalar, F32, 4604, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom18 = scalar, F32, 4608, "from", 1, 0, 0, 20, 2 fuelTrim1 = scalar, S08, 4612, "Percent", 0.02, 0, -25, 25, 2 fuelTrim2 = scalar, S08, 4613, "Percent", 0.02, 0, -25, 25, 2 fuelTrim3 = scalar, S08, 4614, "Percent", 0.02, 0, -25, 25, 2 @@ -1241,7 +1241,25 @@ fuelTrim9 = scalar, S08, 4620, "Percent", 0.02, 0, -25, 25, 2 fuelTrim10 = scalar, S08, 4621, "Percent", 0.02, 0, -25, 25, 2 fuelTrim11 = scalar, S08, 4622, "Percent", 0.02, 0, -25, 25, 2 fuelTrim12 = scalar, S08, 4623, "Percent", 0.02, 0, -25, 25, 2 -mainUnusedEnd = array, S32, 4624, [344], "units", 1, 0, -20, 100, 0 +triggerGapOverrideTo1 = scalar, F32, 4624, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo2 = scalar, F32, 4628, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo3 = scalar, F32, 4632, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo4 = scalar, F32, 4636, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo5 = scalar, F32, 4640, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo6 = scalar, F32, 4644, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo7 = scalar, F32, 4648, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo8 = scalar, F32, 4652, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo9 = scalar, F32, 4656, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo10 = scalar, F32, 4660, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo11 = scalar, F32, 4664, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo12 = scalar, F32, 4668, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo13 = scalar, F32, 4672, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo14 = scalar, F32, 4676, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 +mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -3630,14 +3648,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Enable Trigger debug mode", cmd_test_debug_mode_trigger field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } - field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } - field = "Second gap", triggerGapOverride2, { overrideTriggerGaps == 1 } - field = "Third gap", triggerGapOverride3, { overrideTriggerGaps == 1 } - field = "Gap #4", triggerGapOverride4, { overrideTriggerGaps == 1 } - field = "Gap #5", triggerGapOverride5, { overrideTriggerGaps == 1 } - field = "Gap #6", triggerGapOverride6, { overrideTriggerGaps == 1 } - field = "Gap #7", triggerGapOverride7, { overrideTriggerGaps == 1 } - field = "Gap #8", triggerGapOverride8, { overrideTriggerGaps == 1 } + field = "First gap from", triggerGapOverrideFrom1, { overrideTriggerGaps == 1 } + field = "First gap to", triggerGapOverrideTo1 , { overrideTriggerGaps == 1 } + + field = "Second gap from", triggerGapOverrideFrom2, { overrideTriggerGaps == 1 } + field = "Second gap to", triggerGapOverrideTo2, { overrideTriggerGaps == 1 } + + field = "Third gap from", triggerGapOverrideFrom3, { overrideTriggerGaps == 1 } + field = "Third gap to", triggerGapOverrideTo3, { overrideTriggerGaps == 1 } + + field = "Gap #4 from", triggerGapOverrideFrom4, { overrideTriggerGaps == 1 } + field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 } + field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 } + field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 } dialog = triggerConfiguration_IO, "Advanced Trigger" field = "!https://rusefi.com/s/vvt" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index b860840f4f..fde70bf0b8 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.30.f429-discovery.117907185" + signature = "rusEFI 2021.10.30.f429-discovery.39350162" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.30.f429-discovery.117907185" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.30.f429-discovery.39350162" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Oct 30 10:17:07 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Oct 30 14:48:19 UTC 2021 pageSize = 20000 page = 1 @@ -1211,24 +1211,24 @@ tcu_solenoid_mode5 = bits, U08, 4521, [0:1], "default", "default inverted", "ope tcu_solenoid_mode6 = bits, U08, 4522, [0:1], "default", "default inverted", "open collector", "open collector inverted" knockBaseNoise = array, S08, 4523, [16], "dB", 1, 0, -30, 0, 2 alignmentFill_at_4539 = scalar, U08, 4539, "units", 1, 0, -20, 100, 0 -triggerGapOverride1 = scalar, F32, 4540, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride2 = scalar, F32, 4544, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride3 = scalar, F32, 4548, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride4 = scalar, F32, 4552, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride5 = scalar, F32, 4556, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride6 = scalar, F32, 4560, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride7 = scalar, F32, 4564, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride8 = scalar, F32, 4568, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride9 = scalar, F32, 4572, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride10 = scalar, F32, 4576, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride11 = scalar, F32, 4580, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride12 = scalar, F32, 4584, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride13 = scalar, F32, 4588, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride14 = scalar, F32, 4592, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride15 = scalar, F32, 4596, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride16 = scalar, F32, 4600, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride17 = scalar, F32, 4604, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride18 = scalar, F32, 4608, "ratio", 1, 0, 0, 20, 2 +triggerGapOverrideFrom1 = scalar, F32, 4540, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom2 = scalar, F32, 4544, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom3 = scalar, F32, 4548, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom4 = scalar, F32, 4552, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom5 = scalar, F32, 4556, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom6 = scalar, F32, 4560, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom7 = scalar, F32, 4564, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom8 = scalar, F32, 4568, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom9 = scalar, F32, 4572, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom10 = scalar, F32, 4576, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom11 = scalar, F32, 4580, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom12 = scalar, F32, 4584, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom13 = scalar, F32, 4588, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom14 = scalar, F32, 4592, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom15 = scalar, F32, 4596, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom16 = scalar, F32, 4600, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom17 = scalar, F32, 4604, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom18 = scalar, F32, 4608, "from", 1, 0, 0, 20, 2 fuelTrim1 = scalar, S08, 4612, "Percent", 0.02, 0, -25, 25, 2 fuelTrim2 = scalar, S08, 4613, "Percent", 0.02, 0, -25, 25, 2 fuelTrim3 = scalar, S08, 4614, "Percent", 0.02, 0, -25, 25, 2 @@ -1241,7 +1241,25 @@ fuelTrim9 = scalar, S08, 4620, "Percent", 0.02, 0, -25, 25, 2 fuelTrim10 = scalar, S08, 4621, "Percent", 0.02, 0, -25, 25, 2 fuelTrim11 = scalar, S08, 4622, "Percent", 0.02, 0, -25, 25, 2 fuelTrim12 = scalar, S08, 4623, "Percent", 0.02, 0, -25, 25, 2 -mainUnusedEnd = array, S32, 4624, [344], "units", 1, 0, -20, 100, 0 +triggerGapOverrideTo1 = scalar, F32, 4624, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo2 = scalar, F32, 4628, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo3 = scalar, F32, 4632, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo4 = scalar, F32, 4636, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo5 = scalar, F32, 4640, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo6 = scalar, F32, 4644, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo7 = scalar, F32, 4648, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo8 = scalar, F32, 4652, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo9 = scalar, F32, 4656, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo10 = scalar, F32, 4660, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo11 = scalar, F32, 4664, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo12 = scalar, F32, 4668, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo13 = scalar, F32, 4672, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo14 = scalar, F32, 4676, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 +mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -3630,14 +3648,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Enable Trigger debug mode", cmd_test_debug_mode_trigger field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } - field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } - field = "Second gap", triggerGapOverride2, { overrideTriggerGaps == 1 } - field = "Third gap", triggerGapOverride3, { overrideTriggerGaps == 1 } - field = "Gap #4", triggerGapOverride4, { overrideTriggerGaps == 1 } - field = "Gap #5", triggerGapOverride5, { overrideTriggerGaps == 1 } - field = "Gap #6", triggerGapOverride6, { overrideTriggerGaps == 1 } - field = "Gap #7", triggerGapOverride7, { overrideTriggerGaps == 1 } - field = "Gap #8", triggerGapOverride8, { overrideTriggerGaps == 1 } + field = "First gap from", triggerGapOverrideFrom1, { overrideTriggerGaps == 1 } + field = "First gap to", triggerGapOverrideTo1 , { overrideTriggerGaps == 1 } + + field = "Second gap from", triggerGapOverrideFrom2, { overrideTriggerGaps == 1 } + field = "Second gap to", triggerGapOverrideTo2, { overrideTriggerGaps == 1 } + + field = "Third gap from", triggerGapOverrideFrom3, { overrideTriggerGaps == 1 } + field = "Third gap to", triggerGapOverrideTo3, { overrideTriggerGaps == 1 } + + field = "Gap #4 from", triggerGapOverrideFrom4, { overrideTriggerGaps == 1 } + field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 } + field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 } + field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 } dialog = triggerConfiguration_IO, "Advanced Trigger" field = "!https://rusefi.com/s/vvt" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index c19a4bf117..bbf2ccb853 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.30.frankenso_na6.2100644632" + signature = "rusEFI 2021.10.30.frankenso_na6.2020227707" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.30.frankenso_na6.2100644632" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.30.frankenso_na6.2020227707" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Oct 30 10:17:35 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Oct 30 14:48:54 UTC 2021 pageSize = 20000 page = 1 @@ -1211,24 +1211,24 @@ tcu_solenoid_mode5 = bits, U08, 4521, [0:1], "default", "default inverted", "ope tcu_solenoid_mode6 = bits, U08, 4522, [0:1], "default", "default inverted", "open collector", "open collector inverted" knockBaseNoise = array, S08, 4523, [16], "dB", 1, 0, -30, 0, 2 alignmentFill_at_4539 = scalar, U08, 4539, "units", 1, 0, -20, 100, 0 -triggerGapOverride1 = scalar, F32, 4540, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride2 = scalar, F32, 4544, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride3 = scalar, F32, 4548, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride4 = scalar, F32, 4552, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride5 = scalar, F32, 4556, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride6 = scalar, F32, 4560, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride7 = scalar, F32, 4564, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride8 = scalar, F32, 4568, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride9 = scalar, F32, 4572, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride10 = scalar, F32, 4576, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride11 = scalar, F32, 4580, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride12 = scalar, F32, 4584, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride13 = scalar, F32, 4588, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride14 = scalar, F32, 4592, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride15 = scalar, F32, 4596, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride16 = scalar, F32, 4600, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride17 = scalar, F32, 4604, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride18 = scalar, F32, 4608, "ratio", 1, 0, 0, 20, 2 +triggerGapOverrideFrom1 = scalar, F32, 4540, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom2 = scalar, F32, 4544, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom3 = scalar, F32, 4548, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom4 = scalar, F32, 4552, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom5 = scalar, F32, 4556, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom6 = scalar, F32, 4560, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom7 = scalar, F32, 4564, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom8 = scalar, F32, 4568, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom9 = scalar, F32, 4572, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom10 = scalar, F32, 4576, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom11 = scalar, F32, 4580, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom12 = scalar, F32, 4584, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom13 = scalar, F32, 4588, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom14 = scalar, F32, 4592, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom15 = scalar, F32, 4596, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom16 = scalar, F32, 4600, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom17 = scalar, F32, 4604, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom18 = scalar, F32, 4608, "from", 1, 0, 0, 20, 2 fuelTrim1 = scalar, S08, 4612, "Percent", 0.02, 0, -25, 25, 2 fuelTrim2 = scalar, S08, 4613, "Percent", 0.02, 0, -25, 25, 2 fuelTrim3 = scalar, S08, 4614, "Percent", 0.02, 0, -25, 25, 2 @@ -1241,7 +1241,25 @@ fuelTrim9 = scalar, S08, 4620, "Percent", 0.02, 0, -25, 25, 2 fuelTrim10 = scalar, S08, 4621, "Percent", 0.02, 0, -25, 25, 2 fuelTrim11 = scalar, S08, 4622, "Percent", 0.02, 0, -25, 25, 2 fuelTrim12 = scalar, S08, 4623, "Percent", 0.02, 0, -25, 25, 2 -mainUnusedEnd = array, S32, 4624, [344], "units", 1, 0, -20, 100, 0 +triggerGapOverrideTo1 = scalar, F32, 4624, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo2 = scalar, F32, 4628, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo3 = scalar, F32, 4632, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo4 = scalar, F32, 4636, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo5 = scalar, F32, 4640, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo6 = scalar, F32, 4644, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo7 = scalar, F32, 4648, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo8 = scalar, F32, 4652, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo9 = scalar, F32, 4656, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo10 = scalar, F32, 4660, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo11 = scalar, F32, 4664, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo12 = scalar, F32, 4668, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo13 = scalar, F32, 4672, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo14 = scalar, F32, 4676, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 +mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -3630,14 +3648,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Enable Trigger debug mode", cmd_test_debug_mode_trigger field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } - field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } - field = "Second gap", triggerGapOverride2, { overrideTriggerGaps == 1 } - field = "Third gap", triggerGapOverride3, { overrideTriggerGaps == 1 } - field = "Gap #4", triggerGapOverride4, { overrideTriggerGaps == 1 } - field = "Gap #5", triggerGapOverride5, { overrideTriggerGaps == 1 } - field = "Gap #6", triggerGapOverride6, { overrideTriggerGaps == 1 } - field = "Gap #7", triggerGapOverride7, { overrideTriggerGaps == 1 } - field = "Gap #8", triggerGapOverride8, { overrideTriggerGaps == 1 } + field = "First gap from", triggerGapOverrideFrom1, { overrideTriggerGaps == 1 } + field = "First gap to", triggerGapOverrideTo1 , { overrideTriggerGaps == 1 } + + field = "Second gap from", triggerGapOverrideFrom2, { overrideTriggerGaps == 1 } + field = "Second gap to", triggerGapOverrideTo2, { overrideTriggerGaps == 1 } + + field = "Third gap from", triggerGapOverrideFrom3, { overrideTriggerGaps == 1 } + field = "Third gap to", triggerGapOverrideTo3, { overrideTriggerGaps == 1 } + + field = "Gap #4 from", triggerGapOverrideFrom4, { overrideTriggerGaps == 1 } + field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 } + field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 } + field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 } dialog = triggerConfiguration_IO, "Advanced Trigger" field = "!https://rusefi.com/s/vvt" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 6eced3366f..f7e9feb936 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.30.hellen-nb1.1621137624" + signature = "rusEFI 2021.10.30.hellen-nb1.1711270331" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.30.hellen-nb1.1621137624" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.30.hellen-nb1.1711270331" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Oct 30 10:17:24 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Oct 30 14:48:41 UTC 2021 pageSize = 20000 page = 1 @@ -1211,24 +1211,24 @@ tcu_solenoid_mode5 = bits, U08, 4521, [0:1], "default", "default inverted", "ope tcu_solenoid_mode6 = bits, U08, 4522, [0:1], "default", "default inverted", "open collector", "open collector inverted" knockBaseNoise = array, S08, 4523, [16], "dB", 1, 0, -30, 0, 2 alignmentFill_at_4539 = scalar, U08, 4539, "units", 1, 0, -20, 100, 0 -triggerGapOverride1 = scalar, F32, 4540, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride2 = scalar, F32, 4544, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride3 = scalar, F32, 4548, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride4 = scalar, F32, 4552, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride5 = scalar, F32, 4556, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride6 = scalar, F32, 4560, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride7 = scalar, F32, 4564, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride8 = scalar, F32, 4568, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride9 = scalar, F32, 4572, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride10 = scalar, F32, 4576, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride11 = scalar, F32, 4580, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride12 = scalar, F32, 4584, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride13 = scalar, F32, 4588, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride14 = scalar, F32, 4592, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride15 = scalar, F32, 4596, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride16 = scalar, F32, 4600, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride17 = scalar, F32, 4604, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride18 = scalar, F32, 4608, "ratio", 1, 0, 0, 20, 2 +triggerGapOverrideFrom1 = scalar, F32, 4540, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom2 = scalar, F32, 4544, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom3 = scalar, F32, 4548, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom4 = scalar, F32, 4552, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom5 = scalar, F32, 4556, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom6 = scalar, F32, 4560, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom7 = scalar, F32, 4564, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom8 = scalar, F32, 4568, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom9 = scalar, F32, 4572, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom10 = scalar, F32, 4576, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom11 = scalar, F32, 4580, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom12 = scalar, F32, 4584, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom13 = scalar, F32, 4588, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom14 = scalar, F32, 4592, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom15 = scalar, F32, 4596, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom16 = scalar, F32, 4600, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom17 = scalar, F32, 4604, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom18 = scalar, F32, 4608, "from", 1, 0, 0, 20, 2 fuelTrim1 = scalar, S08, 4612, "Percent", 0.02, 0, -25, 25, 2 fuelTrim2 = scalar, S08, 4613, "Percent", 0.02, 0, -25, 25, 2 fuelTrim3 = scalar, S08, 4614, "Percent", 0.02, 0, -25, 25, 2 @@ -1241,7 +1241,25 @@ fuelTrim9 = scalar, S08, 4620, "Percent", 0.02, 0, -25, 25, 2 fuelTrim10 = scalar, S08, 4621, "Percent", 0.02, 0, -25, 25, 2 fuelTrim11 = scalar, S08, 4622, "Percent", 0.02, 0, -25, 25, 2 fuelTrim12 = scalar, S08, 4623, "Percent", 0.02, 0, -25, 25, 2 -mainUnusedEnd = array, S32, 4624, [344], "units", 1, 0, -20, 100, 0 +triggerGapOverrideTo1 = scalar, F32, 4624, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo2 = scalar, F32, 4628, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo3 = scalar, F32, 4632, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo4 = scalar, F32, 4636, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo5 = scalar, F32, 4640, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo6 = scalar, F32, 4644, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo7 = scalar, F32, 4648, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo8 = scalar, F32, 4652, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo9 = scalar, F32, 4656, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo10 = scalar, F32, 4660, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo11 = scalar, F32, 4664, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo12 = scalar, F32, 4668, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo13 = scalar, F32, 4672, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo14 = scalar, F32, 4676, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 +mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -3626,14 +3644,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Enable Trigger debug mode", cmd_test_debug_mode_trigger field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } - field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } - field = "Second gap", triggerGapOverride2, { overrideTriggerGaps == 1 } - field = "Third gap", triggerGapOverride3, { overrideTriggerGaps == 1 } - field = "Gap #4", triggerGapOverride4, { overrideTriggerGaps == 1 } - field = "Gap #5", triggerGapOverride5, { overrideTriggerGaps == 1 } - field = "Gap #6", triggerGapOverride6, { overrideTriggerGaps == 1 } - field = "Gap #7", triggerGapOverride7, { overrideTriggerGaps == 1 } - field = "Gap #8", triggerGapOverride8, { overrideTriggerGaps == 1 } + field = "First gap from", triggerGapOverrideFrom1, { overrideTriggerGaps == 1 } + field = "First gap to", triggerGapOverrideTo1 , { overrideTriggerGaps == 1 } + + field = "Second gap from", triggerGapOverrideFrom2, { overrideTriggerGaps == 1 } + field = "Second gap to", triggerGapOverrideTo2, { overrideTriggerGaps == 1 } + + field = "Third gap from", triggerGapOverrideFrom3, { overrideTriggerGaps == 1 } + field = "Third gap to", triggerGapOverrideTo3, { overrideTriggerGaps == 1 } + + field = "Gap #4 from", triggerGapOverrideFrom4, { overrideTriggerGaps == 1 } + field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 } + field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 } + field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 } dialog = triggerConfiguration_IO, "Advanced Trigger" field = "!https://rusefi.com/s/vvt" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 2758ecdb50..8af0d722e8 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.30.hellen121nissan.2364950195" + signature = "rusEFI 2021.10.30.hellen121nissan.2309568464" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.30.hellen121nissan.2364950195" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.30.hellen121nissan.2309568464" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Oct 30 10:17:15 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Oct 30 14:48:29 UTC 2021 pageSize = 20000 page = 1 @@ -1211,24 +1211,24 @@ tcu_solenoid_mode5 = bits, U08, 4521, [0:1], "default", "default inverted", "ope tcu_solenoid_mode6 = bits, U08, 4522, [0:1], "default", "default inverted", "open collector", "open collector inverted" knockBaseNoise = array, S08, 4523, [16], "dB", 1, 0, -30, 0, 2 alignmentFill_at_4539 = scalar, U08, 4539, "units", 1, 0, -20, 100, 0 -triggerGapOverride1 = scalar, F32, 4540, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride2 = scalar, F32, 4544, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride3 = scalar, F32, 4548, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride4 = scalar, F32, 4552, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride5 = scalar, F32, 4556, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride6 = scalar, F32, 4560, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride7 = scalar, F32, 4564, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride8 = scalar, F32, 4568, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride9 = scalar, F32, 4572, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride10 = scalar, F32, 4576, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride11 = scalar, F32, 4580, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride12 = scalar, F32, 4584, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride13 = scalar, F32, 4588, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride14 = scalar, F32, 4592, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride15 = scalar, F32, 4596, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride16 = scalar, F32, 4600, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride17 = scalar, F32, 4604, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride18 = scalar, F32, 4608, "ratio", 1, 0, 0, 20, 2 +triggerGapOverrideFrom1 = scalar, F32, 4540, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom2 = scalar, F32, 4544, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom3 = scalar, F32, 4548, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom4 = scalar, F32, 4552, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom5 = scalar, F32, 4556, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom6 = scalar, F32, 4560, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom7 = scalar, F32, 4564, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom8 = scalar, F32, 4568, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom9 = scalar, F32, 4572, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom10 = scalar, F32, 4576, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom11 = scalar, F32, 4580, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom12 = scalar, F32, 4584, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom13 = scalar, F32, 4588, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom14 = scalar, F32, 4592, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom15 = scalar, F32, 4596, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom16 = scalar, F32, 4600, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom17 = scalar, F32, 4604, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom18 = scalar, F32, 4608, "from", 1, 0, 0, 20, 2 fuelTrim1 = scalar, S08, 4612, "Percent", 0.02, 0, -25, 25, 2 fuelTrim2 = scalar, S08, 4613, "Percent", 0.02, 0, -25, 25, 2 fuelTrim3 = scalar, S08, 4614, "Percent", 0.02, 0, -25, 25, 2 @@ -1241,7 +1241,25 @@ fuelTrim9 = scalar, S08, 4620, "Percent", 0.02, 0, -25, 25, 2 fuelTrim10 = scalar, S08, 4621, "Percent", 0.02, 0, -25, 25, 2 fuelTrim11 = scalar, S08, 4622, "Percent", 0.02, 0, -25, 25, 2 fuelTrim12 = scalar, S08, 4623, "Percent", 0.02, 0, -25, 25, 2 -mainUnusedEnd = array, S32, 4624, [344], "units", 1, 0, -20, 100, 0 +triggerGapOverrideTo1 = scalar, F32, 4624, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo2 = scalar, F32, 4628, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo3 = scalar, F32, 4632, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo4 = scalar, F32, 4636, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo5 = scalar, F32, 4640, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo6 = scalar, F32, 4644, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo7 = scalar, F32, 4648, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo8 = scalar, F32, 4652, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo9 = scalar, F32, 4656, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo10 = scalar, F32, 4660, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo11 = scalar, F32, 4664, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo12 = scalar, F32, 4668, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo13 = scalar, F32, 4672, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo14 = scalar, F32, 4676, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 +mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -3626,14 +3644,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Enable Trigger debug mode", cmd_test_debug_mode_trigger field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } - field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } - field = "Second gap", triggerGapOverride2, { overrideTriggerGaps == 1 } - field = "Third gap", triggerGapOverride3, { overrideTriggerGaps == 1 } - field = "Gap #4", triggerGapOverride4, { overrideTriggerGaps == 1 } - field = "Gap #5", triggerGapOverride5, { overrideTriggerGaps == 1 } - field = "Gap #6", triggerGapOverride6, { overrideTriggerGaps == 1 } - field = "Gap #7", triggerGapOverride7, { overrideTriggerGaps == 1 } - field = "Gap #8", triggerGapOverride8, { overrideTriggerGaps == 1 } + field = "First gap from", triggerGapOverrideFrom1, { overrideTriggerGaps == 1 } + field = "First gap to", triggerGapOverrideTo1 , { overrideTriggerGaps == 1 } + + field = "Second gap from", triggerGapOverrideFrom2, { overrideTriggerGaps == 1 } + field = "Second gap to", triggerGapOverrideTo2, { overrideTriggerGaps == 1 } + + field = "Third gap from", triggerGapOverrideFrom3, { overrideTriggerGaps == 1 } + field = "Third gap to", triggerGapOverrideTo3, { overrideTriggerGaps == 1 } + + field = "Gap #4 from", triggerGapOverrideFrom4, { overrideTriggerGaps == 1 } + field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 } + field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 } + field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 } dialog = triggerConfiguration_IO, "Advanced Trigger" field = "!https://rusefi.com/s/vvt" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index f1ef6204ad..9a6a126271 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.30.hellen121vag.1424752311" + signature = "rusEFI 2021.10.30.hellen121vag.1370787796" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.30.hellen121vag.1424752311" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.30.hellen121vag.1370787796" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Oct 30 10:17:13 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Oct 30 14:48:25 UTC 2021 pageSize = 20000 page = 1 @@ -1211,24 +1211,24 @@ tcu_solenoid_mode5 = bits, U08, 4521, [0:1], "default", "default inverted", "ope tcu_solenoid_mode6 = bits, U08, 4522, [0:1], "default", "default inverted", "open collector", "open collector inverted" knockBaseNoise = array, S08, 4523, [16], "dB", 1, 0, -30, 0, 2 alignmentFill_at_4539 = scalar, U08, 4539, "units", 1, 0, -20, 100, 0 -triggerGapOverride1 = scalar, F32, 4540, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride2 = scalar, F32, 4544, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride3 = scalar, F32, 4548, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride4 = scalar, F32, 4552, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride5 = scalar, F32, 4556, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride6 = scalar, F32, 4560, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride7 = scalar, F32, 4564, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride8 = scalar, F32, 4568, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride9 = scalar, F32, 4572, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride10 = scalar, F32, 4576, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride11 = scalar, F32, 4580, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride12 = scalar, F32, 4584, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride13 = scalar, F32, 4588, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride14 = scalar, F32, 4592, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride15 = scalar, F32, 4596, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride16 = scalar, F32, 4600, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride17 = scalar, F32, 4604, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride18 = scalar, F32, 4608, "ratio", 1, 0, 0, 20, 2 +triggerGapOverrideFrom1 = scalar, F32, 4540, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom2 = scalar, F32, 4544, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom3 = scalar, F32, 4548, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom4 = scalar, F32, 4552, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom5 = scalar, F32, 4556, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom6 = scalar, F32, 4560, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom7 = scalar, F32, 4564, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom8 = scalar, F32, 4568, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom9 = scalar, F32, 4572, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom10 = scalar, F32, 4576, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom11 = scalar, F32, 4580, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom12 = scalar, F32, 4584, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom13 = scalar, F32, 4588, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom14 = scalar, F32, 4592, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom15 = scalar, F32, 4596, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom16 = scalar, F32, 4600, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom17 = scalar, F32, 4604, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom18 = scalar, F32, 4608, "from", 1, 0, 0, 20, 2 fuelTrim1 = scalar, S08, 4612, "Percent", 0.02, 0, -25, 25, 2 fuelTrim2 = scalar, S08, 4613, "Percent", 0.02, 0, -25, 25, 2 fuelTrim3 = scalar, S08, 4614, "Percent", 0.02, 0, -25, 25, 2 @@ -1241,7 +1241,25 @@ fuelTrim9 = scalar, S08, 4620, "Percent", 0.02, 0, -25, 25, 2 fuelTrim10 = scalar, S08, 4621, "Percent", 0.02, 0, -25, 25, 2 fuelTrim11 = scalar, S08, 4622, "Percent", 0.02, 0, -25, 25, 2 fuelTrim12 = scalar, S08, 4623, "Percent", 0.02, 0, -25, 25, 2 -mainUnusedEnd = array, S32, 4624, [344], "units", 1, 0, -20, 100, 0 +triggerGapOverrideTo1 = scalar, F32, 4624, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo2 = scalar, F32, 4628, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo3 = scalar, F32, 4632, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo4 = scalar, F32, 4636, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo5 = scalar, F32, 4640, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo6 = scalar, F32, 4644, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo7 = scalar, F32, 4648, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo8 = scalar, F32, 4652, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo9 = scalar, F32, 4656, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo10 = scalar, F32, 4660, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo11 = scalar, F32, 4664, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo12 = scalar, F32, 4668, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo13 = scalar, F32, 4672, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo14 = scalar, F32, 4676, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 +mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -3626,14 +3644,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Enable Trigger debug mode", cmd_test_debug_mode_trigger field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } - field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } - field = "Second gap", triggerGapOverride2, { overrideTriggerGaps == 1 } - field = "Third gap", triggerGapOverride3, { overrideTriggerGaps == 1 } - field = "Gap #4", triggerGapOverride4, { overrideTriggerGaps == 1 } - field = "Gap #5", triggerGapOverride5, { overrideTriggerGaps == 1 } - field = "Gap #6", triggerGapOverride6, { overrideTriggerGaps == 1 } - field = "Gap #7", triggerGapOverride7, { overrideTriggerGaps == 1 } - field = "Gap #8", triggerGapOverride8, { overrideTriggerGaps == 1 } + field = "First gap from", triggerGapOverrideFrom1, { overrideTriggerGaps == 1 } + field = "First gap to", triggerGapOverrideTo1 , { overrideTriggerGaps == 1 } + + field = "Second gap from", triggerGapOverrideFrom2, { overrideTriggerGaps == 1 } + field = "Second gap to", triggerGapOverrideTo2, { overrideTriggerGaps == 1 } + + field = "Third gap from", triggerGapOverrideFrom3, { overrideTriggerGaps == 1 } + field = "Third gap to", triggerGapOverrideTo3, { overrideTriggerGaps == 1 } + + field = "Gap #4 from", triggerGapOverrideFrom4, { overrideTriggerGaps == 1 } + field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 } + field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 } + field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 } dialog = triggerConfiguration_IO, "Advanced Trigger" field = "!https://rusefi.com/s/vvt" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 3b9d583980..7033f71593 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.30.hellen128.3506898465" + signature = "rusEFI 2021.10.30.hellen128.3562567490" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.30.hellen128.3506898465" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.30.hellen128.3562567490" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Oct 30 10:17:10 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Oct 30 14:48:22 UTC 2021 pageSize = 20000 page = 1 @@ -1211,24 +1211,24 @@ tcu_solenoid_mode5 = bits, U08, 4521, [0:1], "default", "default inverted", "ope tcu_solenoid_mode6 = bits, U08, 4522, [0:1], "default", "default inverted", "open collector", "open collector inverted" knockBaseNoise = array, S08, 4523, [16], "dB", 1, 0, -30, 0, 2 alignmentFill_at_4539 = scalar, U08, 4539, "units", 1, 0, -20, 100, 0 -triggerGapOverride1 = scalar, F32, 4540, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride2 = scalar, F32, 4544, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride3 = scalar, F32, 4548, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride4 = scalar, F32, 4552, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride5 = scalar, F32, 4556, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride6 = scalar, F32, 4560, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride7 = scalar, F32, 4564, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride8 = scalar, F32, 4568, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride9 = scalar, F32, 4572, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride10 = scalar, F32, 4576, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride11 = scalar, F32, 4580, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride12 = scalar, F32, 4584, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride13 = scalar, F32, 4588, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride14 = scalar, F32, 4592, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride15 = scalar, F32, 4596, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride16 = scalar, F32, 4600, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride17 = scalar, F32, 4604, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride18 = scalar, F32, 4608, "ratio", 1, 0, 0, 20, 2 +triggerGapOverrideFrom1 = scalar, F32, 4540, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom2 = scalar, F32, 4544, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom3 = scalar, F32, 4548, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom4 = scalar, F32, 4552, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom5 = scalar, F32, 4556, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom6 = scalar, F32, 4560, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom7 = scalar, F32, 4564, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom8 = scalar, F32, 4568, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom9 = scalar, F32, 4572, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom10 = scalar, F32, 4576, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom11 = scalar, F32, 4580, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom12 = scalar, F32, 4584, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom13 = scalar, F32, 4588, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom14 = scalar, F32, 4592, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom15 = scalar, F32, 4596, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom16 = scalar, F32, 4600, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom17 = scalar, F32, 4604, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom18 = scalar, F32, 4608, "from", 1, 0, 0, 20, 2 fuelTrim1 = scalar, S08, 4612, "Percent", 0.02, 0, -25, 25, 2 fuelTrim2 = scalar, S08, 4613, "Percent", 0.02, 0, -25, 25, 2 fuelTrim3 = scalar, S08, 4614, "Percent", 0.02, 0, -25, 25, 2 @@ -1241,7 +1241,25 @@ fuelTrim9 = scalar, S08, 4620, "Percent", 0.02, 0, -25, 25, 2 fuelTrim10 = scalar, S08, 4621, "Percent", 0.02, 0, -25, 25, 2 fuelTrim11 = scalar, S08, 4622, "Percent", 0.02, 0, -25, 25, 2 fuelTrim12 = scalar, S08, 4623, "Percent", 0.02, 0, -25, 25, 2 -mainUnusedEnd = array, S32, 4624, [344], "units", 1, 0, -20, 100, 0 +triggerGapOverrideTo1 = scalar, F32, 4624, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo2 = scalar, F32, 4628, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo3 = scalar, F32, 4632, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo4 = scalar, F32, 4636, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo5 = scalar, F32, 4640, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo6 = scalar, F32, 4644, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo7 = scalar, F32, 4648, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo8 = scalar, F32, 4652, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo9 = scalar, F32, 4656, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo10 = scalar, F32, 4660, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo11 = scalar, F32, 4664, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo12 = scalar, F32, 4668, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo13 = scalar, F32, 4672, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo14 = scalar, F32, 4676, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 +mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -3626,14 +3644,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Enable Trigger debug mode", cmd_test_debug_mode_trigger field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } - field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } - field = "Second gap", triggerGapOverride2, { overrideTriggerGaps == 1 } - field = "Third gap", triggerGapOverride3, { overrideTriggerGaps == 1 } - field = "Gap #4", triggerGapOverride4, { overrideTriggerGaps == 1 } - field = "Gap #5", triggerGapOverride5, { overrideTriggerGaps == 1 } - field = "Gap #6", triggerGapOverride6, { overrideTriggerGaps == 1 } - field = "Gap #7", triggerGapOverride7, { overrideTriggerGaps == 1 } - field = "Gap #8", triggerGapOverride8, { overrideTriggerGaps == 1 } + field = "First gap from", triggerGapOverrideFrom1, { overrideTriggerGaps == 1 } + field = "First gap to", triggerGapOverrideTo1 , { overrideTriggerGaps == 1 } + + field = "Second gap from", triggerGapOverrideFrom2, { overrideTriggerGaps == 1 } + field = "Second gap to", triggerGapOverrideTo2, { overrideTriggerGaps == 1 } + + field = "Third gap from", triggerGapOverrideFrom3, { overrideTriggerGaps == 1 } + field = "Third gap to", triggerGapOverrideTo3, { overrideTriggerGaps == 1 } + + field = "Gap #4 from", triggerGapOverrideFrom4, { overrideTriggerGaps == 1 } + field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 } + field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 } + field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 } dialog = triggerConfiguration_IO, "Advanced Trigger" field = "!https://rusefi.com/s/vvt" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 77d0ca8f0c..5046f8be5c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.30.hellen154hyundai.1131985099" + signature = "rusEFI 2021.10.30.hellen154hyundai.1177012648" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.30.hellen154hyundai.1131985099" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.30.hellen154hyundai.1177012648" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Oct 30 10:17:17 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Oct 30 14:48:32 UTC 2021 pageSize = 20000 page = 1 @@ -1211,24 +1211,24 @@ tcu_solenoid_mode5 = bits, U08, 4521, [0:1], "default", "default inverted", "ope tcu_solenoid_mode6 = bits, U08, 4522, [0:1], "default", "default inverted", "open collector", "open collector inverted" knockBaseNoise = array, S08, 4523, [16], "dB", 1, 0, -30, 0, 2 alignmentFill_at_4539 = scalar, U08, 4539, "units", 1, 0, -20, 100, 0 -triggerGapOverride1 = scalar, F32, 4540, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride2 = scalar, F32, 4544, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride3 = scalar, F32, 4548, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride4 = scalar, F32, 4552, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride5 = scalar, F32, 4556, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride6 = scalar, F32, 4560, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride7 = scalar, F32, 4564, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride8 = scalar, F32, 4568, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride9 = scalar, F32, 4572, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride10 = scalar, F32, 4576, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride11 = scalar, F32, 4580, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride12 = scalar, F32, 4584, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride13 = scalar, F32, 4588, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride14 = scalar, F32, 4592, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride15 = scalar, F32, 4596, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride16 = scalar, F32, 4600, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride17 = scalar, F32, 4604, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride18 = scalar, F32, 4608, "ratio", 1, 0, 0, 20, 2 +triggerGapOverrideFrom1 = scalar, F32, 4540, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom2 = scalar, F32, 4544, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom3 = scalar, F32, 4548, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom4 = scalar, F32, 4552, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom5 = scalar, F32, 4556, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom6 = scalar, F32, 4560, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom7 = scalar, F32, 4564, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom8 = scalar, F32, 4568, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom9 = scalar, F32, 4572, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom10 = scalar, F32, 4576, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom11 = scalar, F32, 4580, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom12 = scalar, F32, 4584, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom13 = scalar, F32, 4588, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom14 = scalar, F32, 4592, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom15 = scalar, F32, 4596, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom16 = scalar, F32, 4600, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom17 = scalar, F32, 4604, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom18 = scalar, F32, 4608, "from", 1, 0, 0, 20, 2 fuelTrim1 = scalar, S08, 4612, "Percent", 0.02, 0, -25, 25, 2 fuelTrim2 = scalar, S08, 4613, "Percent", 0.02, 0, -25, 25, 2 fuelTrim3 = scalar, S08, 4614, "Percent", 0.02, 0, -25, 25, 2 @@ -1241,7 +1241,25 @@ fuelTrim9 = scalar, S08, 4620, "Percent", 0.02, 0, -25, 25, 2 fuelTrim10 = scalar, S08, 4621, "Percent", 0.02, 0, -25, 25, 2 fuelTrim11 = scalar, S08, 4622, "Percent", 0.02, 0, -25, 25, 2 fuelTrim12 = scalar, S08, 4623, "Percent", 0.02, 0, -25, 25, 2 -mainUnusedEnd = array, S32, 4624, [344], "units", 1, 0, -20, 100, 0 +triggerGapOverrideTo1 = scalar, F32, 4624, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo2 = scalar, F32, 4628, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo3 = scalar, F32, 4632, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo4 = scalar, F32, 4636, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo5 = scalar, F32, 4640, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo6 = scalar, F32, 4644, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo7 = scalar, F32, 4648, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo8 = scalar, F32, 4652, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo9 = scalar, F32, 4656, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo10 = scalar, F32, 4660, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo11 = scalar, F32, 4664, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo12 = scalar, F32, 4668, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo13 = scalar, F32, 4672, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo14 = scalar, F32, 4676, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 +mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -3626,14 +3644,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Enable Trigger debug mode", cmd_test_debug_mode_trigger field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } - field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } - field = "Second gap", triggerGapOverride2, { overrideTriggerGaps == 1 } - field = "Third gap", triggerGapOverride3, { overrideTriggerGaps == 1 } - field = "Gap #4", triggerGapOverride4, { overrideTriggerGaps == 1 } - field = "Gap #5", triggerGapOverride5, { overrideTriggerGaps == 1 } - field = "Gap #6", triggerGapOverride6, { overrideTriggerGaps == 1 } - field = "Gap #7", triggerGapOverride7, { overrideTriggerGaps == 1 } - field = "Gap #8", triggerGapOverride8, { overrideTriggerGaps == 1 } + field = "First gap from", triggerGapOverrideFrom1, { overrideTriggerGaps == 1 } + field = "First gap to", triggerGapOverrideTo1 , { overrideTriggerGaps == 1 } + + field = "Second gap from", triggerGapOverrideFrom2, { overrideTriggerGaps == 1 } + field = "Second gap to", triggerGapOverrideTo2, { overrideTriggerGaps == 1 } + + field = "Third gap from", triggerGapOverrideFrom3, { overrideTriggerGaps == 1 } + field = "Third gap to", triggerGapOverrideTo3, { overrideTriggerGaps == 1 } + + field = "Gap #4 from", triggerGapOverrideFrom4, { overrideTriggerGaps == 1 } + field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 } + field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 } + field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 } dialog = triggerConfiguration_IO, "Advanced Trigger" field = "!https://rusefi.com/s/vvt" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 0a1f1bb273..bfc25a1954 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.30.hellen72.1636990678" + signature = "rusEFI 2021.10.30.hellen72.1691160501" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.30.hellen72.1636990678" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.30.hellen72.1691160501" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Oct 30 10:17:22 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Oct 30 14:48:38 UTC 2021 pageSize = 20000 page = 1 @@ -1211,24 +1211,24 @@ tcu_solenoid_mode5 = bits, U08, 4521, [0:1], "default", "default inverted", "ope tcu_solenoid_mode6 = bits, U08, 4522, [0:1], "default", "default inverted", "open collector", "open collector inverted" knockBaseNoise = array, S08, 4523, [16], "dB", 1, 0, -30, 0, 2 alignmentFill_at_4539 = scalar, U08, 4539, "units", 1, 0, -20, 100, 0 -triggerGapOverride1 = scalar, F32, 4540, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride2 = scalar, F32, 4544, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride3 = scalar, F32, 4548, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride4 = scalar, F32, 4552, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride5 = scalar, F32, 4556, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride6 = scalar, F32, 4560, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride7 = scalar, F32, 4564, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride8 = scalar, F32, 4568, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride9 = scalar, F32, 4572, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride10 = scalar, F32, 4576, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride11 = scalar, F32, 4580, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride12 = scalar, F32, 4584, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride13 = scalar, F32, 4588, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride14 = scalar, F32, 4592, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride15 = scalar, F32, 4596, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride16 = scalar, F32, 4600, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride17 = scalar, F32, 4604, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride18 = scalar, F32, 4608, "ratio", 1, 0, 0, 20, 2 +triggerGapOverrideFrom1 = scalar, F32, 4540, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom2 = scalar, F32, 4544, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom3 = scalar, F32, 4548, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom4 = scalar, F32, 4552, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom5 = scalar, F32, 4556, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom6 = scalar, F32, 4560, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom7 = scalar, F32, 4564, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom8 = scalar, F32, 4568, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom9 = scalar, F32, 4572, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom10 = scalar, F32, 4576, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom11 = scalar, F32, 4580, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom12 = scalar, F32, 4584, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom13 = scalar, F32, 4588, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom14 = scalar, F32, 4592, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom15 = scalar, F32, 4596, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom16 = scalar, F32, 4600, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom17 = scalar, F32, 4604, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom18 = scalar, F32, 4608, "from", 1, 0, 0, 20, 2 fuelTrim1 = scalar, S08, 4612, "Percent", 0.02, 0, -25, 25, 2 fuelTrim2 = scalar, S08, 4613, "Percent", 0.02, 0, -25, 25, 2 fuelTrim3 = scalar, S08, 4614, "Percent", 0.02, 0, -25, 25, 2 @@ -1241,7 +1241,25 @@ fuelTrim9 = scalar, S08, 4620, "Percent", 0.02, 0, -25, 25, 2 fuelTrim10 = scalar, S08, 4621, "Percent", 0.02, 0, -25, 25, 2 fuelTrim11 = scalar, S08, 4622, "Percent", 0.02, 0, -25, 25, 2 fuelTrim12 = scalar, S08, 4623, "Percent", 0.02, 0, -25, 25, 2 -mainUnusedEnd = array, S32, 4624, [344], "units", 1, 0, -20, 100, 0 +triggerGapOverrideTo1 = scalar, F32, 4624, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo2 = scalar, F32, 4628, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo3 = scalar, F32, 4632, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo4 = scalar, F32, 4636, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo5 = scalar, F32, 4640, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo6 = scalar, F32, 4644, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo7 = scalar, F32, 4648, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo8 = scalar, F32, 4652, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo9 = scalar, F32, 4656, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo10 = scalar, F32, 4660, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo11 = scalar, F32, 4664, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo12 = scalar, F32, 4668, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo13 = scalar, F32, 4672, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo14 = scalar, F32, 4676, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 +mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -3626,14 +3644,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Enable Trigger debug mode", cmd_test_debug_mode_trigger field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } - field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } - field = "Second gap", triggerGapOverride2, { overrideTriggerGaps == 1 } - field = "Third gap", triggerGapOverride3, { overrideTriggerGaps == 1 } - field = "Gap #4", triggerGapOverride4, { overrideTriggerGaps == 1 } - field = "Gap #5", triggerGapOverride5, { overrideTriggerGaps == 1 } - field = "Gap #6", triggerGapOverride6, { overrideTriggerGaps == 1 } - field = "Gap #7", triggerGapOverride7, { overrideTriggerGaps == 1 } - field = "Gap #8", triggerGapOverride8, { overrideTriggerGaps == 1 } + field = "First gap from", triggerGapOverrideFrom1, { overrideTriggerGaps == 1 } + field = "First gap to", triggerGapOverrideTo1 , { overrideTriggerGaps == 1 } + + field = "Second gap from", triggerGapOverrideFrom2, { overrideTriggerGaps == 1 } + field = "Second gap to", triggerGapOverrideTo2, { overrideTriggerGaps == 1 } + + field = "Third gap from", triggerGapOverrideFrom3, { overrideTriggerGaps == 1 } + field = "Third gap to", triggerGapOverrideTo3, { overrideTriggerGaps == 1 } + + field = "Gap #4 from", triggerGapOverrideFrom4, { overrideTriggerGaps == 1 } + field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 } + field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 } + field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 } dialog = triggerConfiguration_IO, "Advanced Trigger" field = "!https://rusefi.com/s/vvt" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 828b8b61e8..1272fe9d2f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.30.hellen88bmw.4052214300" + signature = "rusEFI 2021.10.30.hellen88bmw.4107834239" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.30.hellen88bmw.4052214300" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.30.hellen88bmw.4107834239" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Oct 30 10:17:20 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Oct 30 14:48:35 UTC 2021 pageSize = 20000 page = 1 @@ -1211,24 +1211,24 @@ tcu_solenoid_mode5 = bits, U08, 4521, [0:1], "default", "default inverted", "ope tcu_solenoid_mode6 = bits, U08, 4522, [0:1], "default", "default inverted", "open collector", "open collector inverted" knockBaseNoise = array, S08, 4523, [16], "dB", 1, 0, -30, 0, 2 alignmentFill_at_4539 = scalar, U08, 4539, "units", 1, 0, -20, 100, 0 -triggerGapOverride1 = scalar, F32, 4540, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride2 = scalar, F32, 4544, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride3 = scalar, F32, 4548, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride4 = scalar, F32, 4552, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride5 = scalar, F32, 4556, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride6 = scalar, F32, 4560, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride7 = scalar, F32, 4564, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride8 = scalar, F32, 4568, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride9 = scalar, F32, 4572, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride10 = scalar, F32, 4576, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride11 = scalar, F32, 4580, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride12 = scalar, F32, 4584, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride13 = scalar, F32, 4588, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride14 = scalar, F32, 4592, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride15 = scalar, F32, 4596, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride16 = scalar, F32, 4600, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride17 = scalar, F32, 4604, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride18 = scalar, F32, 4608, "ratio", 1, 0, 0, 20, 2 +triggerGapOverrideFrom1 = scalar, F32, 4540, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom2 = scalar, F32, 4544, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom3 = scalar, F32, 4548, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom4 = scalar, F32, 4552, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom5 = scalar, F32, 4556, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom6 = scalar, F32, 4560, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom7 = scalar, F32, 4564, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom8 = scalar, F32, 4568, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom9 = scalar, F32, 4572, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom10 = scalar, F32, 4576, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom11 = scalar, F32, 4580, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom12 = scalar, F32, 4584, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom13 = scalar, F32, 4588, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom14 = scalar, F32, 4592, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom15 = scalar, F32, 4596, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom16 = scalar, F32, 4600, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom17 = scalar, F32, 4604, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom18 = scalar, F32, 4608, "from", 1, 0, 0, 20, 2 fuelTrim1 = scalar, S08, 4612, "Percent", 0.02, 0, -25, 25, 2 fuelTrim2 = scalar, S08, 4613, "Percent", 0.02, 0, -25, 25, 2 fuelTrim3 = scalar, S08, 4614, "Percent", 0.02, 0, -25, 25, 2 @@ -1241,7 +1241,25 @@ fuelTrim9 = scalar, S08, 4620, "Percent", 0.02, 0, -25, 25, 2 fuelTrim10 = scalar, S08, 4621, "Percent", 0.02, 0, -25, 25, 2 fuelTrim11 = scalar, S08, 4622, "Percent", 0.02, 0, -25, 25, 2 fuelTrim12 = scalar, S08, 4623, "Percent", 0.02, 0, -25, 25, 2 -mainUnusedEnd = array, S32, 4624, [344], "units", 1, 0, -20, 100, 0 +triggerGapOverrideTo1 = scalar, F32, 4624, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo2 = scalar, F32, 4628, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo3 = scalar, F32, 4632, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo4 = scalar, F32, 4636, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo5 = scalar, F32, 4640, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo6 = scalar, F32, 4644, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo7 = scalar, F32, 4648, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo8 = scalar, F32, 4652, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo9 = scalar, F32, 4656, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo10 = scalar, F32, 4660, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo11 = scalar, F32, 4664, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo12 = scalar, F32, 4668, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo13 = scalar, F32, 4672, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo14 = scalar, F32, 4676, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 +mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -3626,14 +3644,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Enable Trigger debug mode", cmd_test_debug_mode_trigger field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } - field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } - field = "Second gap", triggerGapOverride2, { overrideTriggerGaps == 1 } - field = "Third gap", triggerGapOverride3, { overrideTriggerGaps == 1 } - field = "Gap #4", triggerGapOverride4, { overrideTriggerGaps == 1 } - field = "Gap #5", triggerGapOverride5, { overrideTriggerGaps == 1 } - field = "Gap #6", triggerGapOverride6, { overrideTriggerGaps == 1 } - field = "Gap #7", triggerGapOverride7, { overrideTriggerGaps == 1 } - field = "Gap #8", triggerGapOverride8, { overrideTriggerGaps == 1 } + field = "First gap from", triggerGapOverrideFrom1, { overrideTriggerGaps == 1 } + field = "First gap to", triggerGapOverrideTo1 , { overrideTriggerGaps == 1 } + + field = "Second gap from", triggerGapOverrideFrom2, { overrideTriggerGaps == 1 } + field = "Second gap to", triggerGapOverrideTo2, { overrideTriggerGaps == 1 } + + field = "Third gap from", triggerGapOverrideFrom3, { overrideTriggerGaps == 1 } + field = "Third gap to", triggerGapOverrideTo3, { overrideTriggerGaps == 1 } + + field = "Gap #4 from", triggerGapOverrideFrom4, { overrideTriggerGaps == 1 } + field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 } + field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 } + field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 } dialog = triggerConfiguration_IO, "Advanced Trigger" field = "!https://rusefi.com/s/vvt" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index d475e27c1c..0b3898f7ee 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.30.hellenNA6.4056774429" + signature = "rusEFI 2021.10.30.hellenNA6.4103210622" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.30.hellenNA6.4056774429" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.30.hellenNA6.4103210622" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Oct 30 10:17:27 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Oct 30 14:48:45 UTC 2021 pageSize = 20000 page = 1 @@ -1211,24 +1211,24 @@ tcu_solenoid_mode5 = bits, U08, 4521, [0:1], "default", "default inverted", "ope tcu_solenoid_mode6 = bits, U08, 4522, [0:1], "default", "default inverted", "open collector", "open collector inverted" knockBaseNoise = array, S08, 4523, [16], "dB", 1, 0, -30, 0, 2 alignmentFill_at_4539 = scalar, U08, 4539, "units", 1, 0, -20, 100, 0 -triggerGapOverride1 = scalar, F32, 4540, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride2 = scalar, F32, 4544, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride3 = scalar, F32, 4548, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride4 = scalar, F32, 4552, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride5 = scalar, F32, 4556, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride6 = scalar, F32, 4560, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride7 = scalar, F32, 4564, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride8 = scalar, F32, 4568, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride9 = scalar, F32, 4572, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride10 = scalar, F32, 4576, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride11 = scalar, F32, 4580, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride12 = scalar, F32, 4584, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride13 = scalar, F32, 4588, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride14 = scalar, F32, 4592, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride15 = scalar, F32, 4596, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride16 = scalar, F32, 4600, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride17 = scalar, F32, 4604, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride18 = scalar, F32, 4608, "ratio", 1, 0, 0, 20, 2 +triggerGapOverrideFrom1 = scalar, F32, 4540, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom2 = scalar, F32, 4544, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom3 = scalar, F32, 4548, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom4 = scalar, F32, 4552, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom5 = scalar, F32, 4556, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom6 = scalar, F32, 4560, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom7 = scalar, F32, 4564, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom8 = scalar, F32, 4568, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom9 = scalar, F32, 4572, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom10 = scalar, F32, 4576, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom11 = scalar, F32, 4580, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom12 = scalar, F32, 4584, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom13 = scalar, F32, 4588, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom14 = scalar, F32, 4592, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom15 = scalar, F32, 4596, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom16 = scalar, F32, 4600, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom17 = scalar, F32, 4604, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom18 = scalar, F32, 4608, "from", 1, 0, 0, 20, 2 fuelTrim1 = scalar, S08, 4612, "Percent", 0.02, 0, -25, 25, 2 fuelTrim2 = scalar, S08, 4613, "Percent", 0.02, 0, -25, 25, 2 fuelTrim3 = scalar, S08, 4614, "Percent", 0.02, 0, -25, 25, 2 @@ -1241,7 +1241,25 @@ fuelTrim9 = scalar, S08, 4620, "Percent", 0.02, 0, -25, 25, 2 fuelTrim10 = scalar, S08, 4621, "Percent", 0.02, 0, -25, 25, 2 fuelTrim11 = scalar, S08, 4622, "Percent", 0.02, 0, -25, 25, 2 fuelTrim12 = scalar, S08, 4623, "Percent", 0.02, 0, -25, 25, 2 -mainUnusedEnd = array, S32, 4624, [344], "units", 1, 0, -20, 100, 0 +triggerGapOverrideTo1 = scalar, F32, 4624, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo2 = scalar, F32, 4628, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo3 = scalar, F32, 4632, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo4 = scalar, F32, 4636, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo5 = scalar, F32, 4640, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo6 = scalar, F32, 4644, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo7 = scalar, F32, 4648, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo8 = scalar, F32, 4652, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo9 = scalar, F32, 4656, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo10 = scalar, F32, 4660, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo11 = scalar, F32, 4664, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo12 = scalar, F32, 4668, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo13 = scalar, F32, 4672, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo14 = scalar, F32, 4676, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 +mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -3626,14 +3644,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Enable Trigger debug mode", cmd_test_debug_mode_trigger field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } - field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } - field = "Second gap", triggerGapOverride2, { overrideTriggerGaps == 1 } - field = "Third gap", triggerGapOverride3, { overrideTriggerGaps == 1 } - field = "Gap #4", triggerGapOverride4, { overrideTriggerGaps == 1 } - field = "Gap #5", triggerGapOverride5, { overrideTriggerGaps == 1 } - field = "Gap #6", triggerGapOverride6, { overrideTriggerGaps == 1 } - field = "Gap #7", triggerGapOverride7, { overrideTriggerGaps == 1 } - field = "Gap #8", triggerGapOverride8, { overrideTriggerGaps == 1 } + field = "First gap from", triggerGapOverrideFrom1, { overrideTriggerGaps == 1 } + field = "First gap to", triggerGapOverrideTo1 , { overrideTriggerGaps == 1 } + + field = "Second gap from", triggerGapOverrideFrom2, { overrideTriggerGaps == 1 } + field = "Second gap to", triggerGapOverrideTo2, { overrideTriggerGaps == 1 } + + field = "Third gap from", triggerGapOverrideFrom3, { overrideTriggerGaps == 1 } + field = "Third gap to", triggerGapOverrideTo3, { overrideTriggerGaps == 1 } + + field = "Gap #4 from", triggerGapOverrideFrom4, { overrideTriggerGaps == 1 } + field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 } + field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 } + field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 } dialog = triggerConfiguration_IO, "Advanced Trigger" field = "!https://rusefi.com/s/vvt" diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index f727b4aa02..2ec0e540ab 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.30.hellen_cypress.1165739297" + signature = "rusEFI 2021.10.30.hellen_cypress.1076147266" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.30.hellen_cypress.1165739297" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.30.hellen_cypress.1076147266" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Sat Oct 30 10:17:53 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Oct 30 14:49:18 UTC 2021 pageSize = 20000 page = 1 @@ -1211,24 +1211,24 @@ tcu_solenoid_mode5 = bits, U08, 4521, [0:1], "default", "default inverted", "ope tcu_solenoid_mode6 = bits, U08, 4522, [0:1], "default", "default inverted", "open collector", "open collector inverted" knockBaseNoise = array, S08, 4523, [16], "dB", 1, 0, -30, 0, 2 alignmentFill_at_4539 = scalar, U08, 4539, "units", 1, 0, -20, 100, 0 -triggerGapOverride1 = scalar, F32, 4540, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride2 = scalar, F32, 4544, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride3 = scalar, F32, 4548, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride4 = scalar, F32, 4552, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride5 = scalar, F32, 4556, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride6 = scalar, F32, 4560, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride7 = scalar, F32, 4564, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride8 = scalar, F32, 4568, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride9 = scalar, F32, 4572, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride10 = scalar, F32, 4576, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride11 = scalar, F32, 4580, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride12 = scalar, F32, 4584, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride13 = scalar, F32, 4588, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride14 = scalar, F32, 4592, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride15 = scalar, F32, 4596, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride16 = scalar, F32, 4600, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride17 = scalar, F32, 4604, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride18 = scalar, F32, 4608, "ratio", 1, 0, 0, 20, 2 +triggerGapOverrideFrom1 = scalar, F32, 4540, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom2 = scalar, F32, 4544, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom3 = scalar, F32, 4548, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom4 = scalar, F32, 4552, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom5 = scalar, F32, 4556, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom6 = scalar, F32, 4560, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom7 = scalar, F32, 4564, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom8 = scalar, F32, 4568, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom9 = scalar, F32, 4572, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom10 = scalar, F32, 4576, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom11 = scalar, F32, 4580, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom12 = scalar, F32, 4584, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom13 = scalar, F32, 4588, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom14 = scalar, F32, 4592, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom15 = scalar, F32, 4596, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom16 = scalar, F32, 4600, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom17 = scalar, F32, 4604, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom18 = scalar, F32, 4608, "from", 1, 0, 0, 20, 2 fuelTrim1 = scalar, S08, 4612, "Percent", 0.02, 0, -25, 25, 2 fuelTrim2 = scalar, S08, 4613, "Percent", 0.02, 0, -25, 25, 2 fuelTrim3 = scalar, S08, 4614, "Percent", 0.02, 0, -25, 25, 2 @@ -1241,7 +1241,25 @@ fuelTrim9 = scalar, S08, 4620, "Percent", 0.02, 0, -25, 25, 2 fuelTrim10 = scalar, S08, 4621, "Percent", 0.02, 0, -25, 25, 2 fuelTrim11 = scalar, S08, 4622, "Percent", 0.02, 0, -25, 25, 2 fuelTrim12 = scalar, S08, 4623, "Percent", 0.02, 0, -25, 25, 2 -mainUnusedEnd = array, S32, 4624, [344], "units", 1, 0, -20, 100, 0 +triggerGapOverrideTo1 = scalar, F32, 4624, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo2 = scalar, F32, 4628, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo3 = scalar, F32, 4632, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo4 = scalar, F32, 4636, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo5 = scalar, F32, 4640, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo6 = scalar, F32, 4644, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo7 = scalar, F32, 4648, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo8 = scalar, F32, 4652, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo9 = scalar, F32, 4656, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo10 = scalar, F32, 4660, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo11 = scalar, F32, 4664, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo12 = scalar, F32, 4668, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo13 = scalar, F32, 4672, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo14 = scalar, F32, 4676, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 +mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -3630,14 +3648,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Enable Trigger debug mode", cmd_test_debug_mode_trigger field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } - field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } - field = "Second gap", triggerGapOverride2, { overrideTriggerGaps == 1 } - field = "Third gap", triggerGapOverride3, { overrideTriggerGaps == 1 } - field = "Gap #4", triggerGapOverride4, { overrideTriggerGaps == 1 } - field = "Gap #5", triggerGapOverride5, { overrideTriggerGaps == 1 } - field = "Gap #6", triggerGapOverride6, { overrideTriggerGaps == 1 } - field = "Gap #7", triggerGapOverride7, { overrideTriggerGaps == 1 } - field = "Gap #8", triggerGapOverride8, { overrideTriggerGaps == 1 } + field = "First gap from", triggerGapOverrideFrom1, { overrideTriggerGaps == 1 } + field = "First gap to", triggerGapOverrideTo1 , { overrideTriggerGaps == 1 } + + field = "Second gap from", triggerGapOverrideFrom2, { overrideTriggerGaps == 1 } + field = "Second gap to", triggerGapOverrideTo2, { overrideTriggerGaps == 1 } + + field = "Third gap from", triggerGapOverrideFrom3, { overrideTriggerGaps == 1 } + field = "Third gap to", triggerGapOverrideTo3, { overrideTriggerGaps == 1 } + + field = "Gap #4 from", triggerGapOverrideFrom4, { overrideTriggerGaps == 1 } + field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 } + field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 } + field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 } dialog = triggerConfiguration_IO, "Advanced Trigger" field = "!https://rusefi.com/s/vvt" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index ecac346dc4..05da410b9b 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.30.kin.3135113693" + signature = "rusEFI 2021.10.30.kin.3212933310" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.30.kin.3135113693" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.30.kin.3212933310" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Oct 30 10:17:51 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Oct 30 14:49:16 UTC 2021 pageSize = 19972 page = 1 @@ -1189,24 +1189,24 @@ tcu_solenoid_mode5 = bits, U08, 4493, [0:1], "default", "default inverted", "ope tcu_solenoid_mode6 = bits, U08, 4494, [0:1], "default", "default inverted", "open collector", "open collector inverted" knockBaseNoise = array, S08, 4495, [16], "dB", 1, 0, -30, 0, 2 alignmentFill_at_4511 = scalar, U08, 4511, "units", 1, 0, -20, 100, 0 -triggerGapOverride1 = scalar, F32, 4512, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride2 = scalar, F32, 4516, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride3 = scalar, F32, 4520, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride4 = scalar, F32, 4524, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride5 = scalar, F32, 4528, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride6 = scalar, F32, 4532, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride7 = scalar, F32, 4536, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride8 = scalar, F32, 4540, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride9 = scalar, F32, 4544, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride10 = scalar, F32, 4548, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride11 = scalar, F32, 4552, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride12 = scalar, F32, 4556, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride13 = scalar, F32, 4560, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride14 = scalar, F32, 4564, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride15 = scalar, F32, 4568, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride16 = scalar, F32, 4572, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride17 = scalar, F32, 4576, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride18 = scalar, F32, 4580, "ratio", 1, 0, 0, 20, 2 +triggerGapOverrideFrom1 = scalar, F32, 4512, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom2 = scalar, F32, 4516, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom3 = scalar, F32, 4520, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom4 = scalar, F32, 4524, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom5 = scalar, F32, 4528, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom6 = scalar, F32, 4532, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom7 = scalar, F32, 4536, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom8 = scalar, F32, 4540, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom9 = scalar, F32, 4544, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom10 = scalar, F32, 4548, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom11 = scalar, F32, 4552, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom12 = scalar, F32, 4556, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom13 = scalar, F32, 4560, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom14 = scalar, F32, 4564, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom15 = scalar, F32, 4568, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom16 = scalar, F32, 4572, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom17 = scalar, F32, 4576, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom18 = scalar, F32, 4580, "from", 1, 0, 0, 20, 2 fuelTrim1 = scalar, S08, 4584, "Percent", 0.02, 0, -25, 25, 2 fuelTrim2 = scalar, S08, 4585, "Percent", 0.02, 0, -25, 25, 2 fuelTrim3 = scalar, S08, 4586, "Percent", 0.02, 0, -25, 25, 2 @@ -1219,7 +1219,25 @@ fuelTrim9 = scalar, S08, 4592, "Percent", 0.02, 0, -25, 25, 2 fuelTrim10 = scalar, S08, 4593, "Percent", 0.02, 0, -25, 25, 2 fuelTrim11 = scalar, S08, 4594, "Percent", 0.02, 0, -25, 25, 2 fuelTrim12 = scalar, S08, 4595, "Percent", 0.02, 0, -25, 25, 2 -mainUnusedEnd = array, S32, 4596, [344], "units", 1, 0, -20, 100, 0 +triggerGapOverrideTo1 = scalar, F32, 4596, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo2 = scalar, F32, 4600, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo3 = scalar, F32, 4604, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo4 = scalar, F32, 4608, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo5 = scalar, F32, 4612, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo6 = scalar, F32, 4616, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo7 = scalar, F32, 4620, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo8 = scalar, F32, 4624, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo9 = scalar, F32, 4628, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo10 = scalar, F32, 4632, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo11 = scalar, F32, 4636, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo12 = scalar, F32, 4640, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo13 = scalar, F32, 4644, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo14 = scalar, F32, 4648, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo15 = scalar, F32, 4652, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo16 = scalar, F32, 4656, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo17 = scalar, F32, 4660, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo18 = scalar, F32, 4664, "to", 1, 0, 0, 20, 2 +mainUnusedEnd = array, S32, 4668, [326], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 5972, 120 afterstartCoolantBins = array, F32, 6092, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6124, [8], "Seconds", 1, 0, 0, 100, 1 @@ -3596,14 +3614,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Enable Trigger debug mode", cmd_test_debug_mode_trigger field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } - field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } - field = "Second gap", triggerGapOverride2, { overrideTriggerGaps == 1 } - field = "Third gap", triggerGapOverride3, { overrideTriggerGaps == 1 } - field = "Gap #4", triggerGapOverride4, { overrideTriggerGaps == 1 } - field = "Gap #5", triggerGapOverride5, { overrideTriggerGaps == 1 } - field = "Gap #6", triggerGapOverride6, { overrideTriggerGaps == 1 } - field = "Gap #7", triggerGapOverride7, { overrideTriggerGaps == 1 } - field = "Gap #8", triggerGapOverride8, { overrideTriggerGaps == 1 } + field = "First gap from", triggerGapOverrideFrom1, { overrideTriggerGaps == 1 } + field = "First gap to", triggerGapOverrideTo1 , { overrideTriggerGaps == 1 } + + field = "Second gap from", triggerGapOverrideFrom2, { overrideTriggerGaps == 1 } + field = "Second gap to", triggerGapOverrideTo2, { overrideTriggerGaps == 1 } + + field = "Third gap from", triggerGapOverrideFrom3, { overrideTriggerGaps == 1 } + field = "Third gap to", triggerGapOverrideTo3, { overrideTriggerGaps == 1 } + + field = "Gap #4 from", triggerGapOverrideFrom4, { overrideTriggerGaps == 1 } + field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 } + field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 } + field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 } dialog = triggerConfiguration_IO, "Advanced Trigger" field = "!https://rusefi.com/s/vvt" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 38bd491ee5..50880c0b23 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.30.mre_f4.2409040229" + signature = "rusEFI 2021.10.30.mre_f4.2328393734" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.30.mre_f4.2409040229" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.30.mre_f4.2328393734" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Oct 30 10:17:32 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Oct 30 14:48:51 UTC 2021 pageSize = 20000 page = 1 @@ -1211,24 +1211,24 @@ tcu_solenoid_mode5 = bits, U08, 4521, [0:1], "default", "default inverted", "ope tcu_solenoid_mode6 = bits, U08, 4522, [0:1], "default", "default inverted", "open collector", "open collector inverted" knockBaseNoise = array, S08, 4523, [16], "dB", 1, 0, -30, 0, 2 alignmentFill_at_4539 = scalar, U08, 4539, "units", 1, 0, -20, 100, 0 -triggerGapOverride1 = scalar, F32, 4540, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride2 = scalar, F32, 4544, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride3 = scalar, F32, 4548, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride4 = scalar, F32, 4552, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride5 = scalar, F32, 4556, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride6 = scalar, F32, 4560, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride7 = scalar, F32, 4564, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride8 = scalar, F32, 4568, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride9 = scalar, F32, 4572, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride10 = scalar, F32, 4576, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride11 = scalar, F32, 4580, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride12 = scalar, F32, 4584, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride13 = scalar, F32, 4588, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride14 = scalar, F32, 4592, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride15 = scalar, F32, 4596, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride16 = scalar, F32, 4600, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride17 = scalar, F32, 4604, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride18 = scalar, F32, 4608, "ratio", 1, 0, 0, 20, 2 +triggerGapOverrideFrom1 = scalar, F32, 4540, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom2 = scalar, F32, 4544, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom3 = scalar, F32, 4548, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom4 = scalar, F32, 4552, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom5 = scalar, F32, 4556, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom6 = scalar, F32, 4560, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom7 = scalar, F32, 4564, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom8 = scalar, F32, 4568, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom9 = scalar, F32, 4572, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom10 = scalar, F32, 4576, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom11 = scalar, F32, 4580, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom12 = scalar, F32, 4584, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom13 = scalar, F32, 4588, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom14 = scalar, F32, 4592, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom15 = scalar, F32, 4596, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom16 = scalar, F32, 4600, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom17 = scalar, F32, 4604, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom18 = scalar, F32, 4608, "from", 1, 0, 0, 20, 2 fuelTrim1 = scalar, S08, 4612, "Percent", 0.02, 0, -25, 25, 2 fuelTrim2 = scalar, S08, 4613, "Percent", 0.02, 0, -25, 25, 2 fuelTrim3 = scalar, S08, 4614, "Percent", 0.02, 0, -25, 25, 2 @@ -1241,7 +1241,25 @@ fuelTrim9 = scalar, S08, 4620, "Percent", 0.02, 0, -25, 25, 2 fuelTrim10 = scalar, S08, 4621, "Percent", 0.02, 0, -25, 25, 2 fuelTrim11 = scalar, S08, 4622, "Percent", 0.02, 0, -25, 25, 2 fuelTrim12 = scalar, S08, 4623, "Percent", 0.02, 0, -25, 25, 2 -mainUnusedEnd = array, S32, 4624, [344], "units", 1, 0, -20, 100, 0 +triggerGapOverrideTo1 = scalar, F32, 4624, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo2 = scalar, F32, 4628, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo3 = scalar, F32, 4632, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo4 = scalar, F32, 4636, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo5 = scalar, F32, 4640, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo6 = scalar, F32, 4644, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo7 = scalar, F32, 4648, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo8 = scalar, F32, 4652, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo9 = scalar, F32, 4656, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo10 = scalar, F32, 4660, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo11 = scalar, F32, 4664, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo12 = scalar, F32, 4668, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo13 = scalar, F32, 4672, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo14 = scalar, F32, 4676, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 +mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -3626,14 +3644,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Enable Trigger debug mode", cmd_test_debug_mode_trigger field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } - field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } - field = "Second gap", triggerGapOverride2, { overrideTriggerGaps == 1 } - field = "Third gap", triggerGapOverride3, { overrideTriggerGaps == 1 } - field = "Gap #4", triggerGapOverride4, { overrideTriggerGaps == 1 } - field = "Gap #5", triggerGapOverride5, { overrideTriggerGaps == 1 } - field = "Gap #6", triggerGapOverride6, { overrideTriggerGaps == 1 } - field = "Gap #7", triggerGapOverride7, { overrideTriggerGaps == 1 } - field = "Gap #8", triggerGapOverride8, { overrideTriggerGaps == 1 } + field = "First gap from", triggerGapOverrideFrom1, { overrideTriggerGaps == 1 } + field = "First gap to", triggerGapOverrideTo1 , { overrideTriggerGaps == 1 } + + field = "Second gap from", triggerGapOverrideFrom2, { overrideTriggerGaps == 1 } + field = "Second gap to", triggerGapOverrideTo2, { overrideTriggerGaps == 1 } + + field = "Third gap from", triggerGapOverrideFrom3, { overrideTriggerGaps == 1 } + field = "Third gap to", triggerGapOverrideTo3, { overrideTriggerGaps == 1 } + + field = "Gap #4 from", triggerGapOverrideFrom4, { overrideTriggerGaps == 1 } + field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 } + field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 } + field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 } dialog = triggerConfiguration_IO, "Advanced Trigger" field = "!https://rusefi.com/s/vvt" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index e20a359072..d498b3670e 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.30.mre_f7.2409040229" + signature = "rusEFI 2021.10.30.mre_f7.2328393734" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.30.mre_f7.2409040229" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.30.mre_f7.2328393734" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Oct 30 10:17:29 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Oct 30 14:48:48 UTC 2021 pageSize = 20000 page = 1 @@ -1211,24 +1211,24 @@ tcu_solenoid_mode5 = bits, U08, 4521, [0:1], "default", "default inverted", "ope tcu_solenoid_mode6 = bits, U08, 4522, [0:1], "default", "default inverted", "open collector", "open collector inverted" knockBaseNoise = array, S08, 4523, [16], "dB", 1, 0, -30, 0, 2 alignmentFill_at_4539 = scalar, U08, 4539, "units", 1, 0, -20, 100, 0 -triggerGapOverride1 = scalar, F32, 4540, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride2 = scalar, F32, 4544, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride3 = scalar, F32, 4548, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride4 = scalar, F32, 4552, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride5 = scalar, F32, 4556, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride6 = scalar, F32, 4560, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride7 = scalar, F32, 4564, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride8 = scalar, F32, 4568, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride9 = scalar, F32, 4572, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride10 = scalar, F32, 4576, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride11 = scalar, F32, 4580, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride12 = scalar, F32, 4584, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride13 = scalar, F32, 4588, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride14 = scalar, F32, 4592, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride15 = scalar, F32, 4596, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride16 = scalar, F32, 4600, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride17 = scalar, F32, 4604, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride18 = scalar, F32, 4608, "ratio", 1, 0, 0, 20, 2 +triggerGapOverrideFrom1 = scalar, F32, 4540, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom2 = scalar, F32, 4544, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom3 = scalar, F32, 4548, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom4 = scalar, F32, 4552, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom5 = scalar, F32, 4556, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom6 = scalar, F32, 4560, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom7 = scalar, F32, 4564, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom8 = scalar, F32, 4568, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom9 = scalar, F32, 4572, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom10 = scalar, F32, 4576, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom11 = scalar, F32, 4580, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom12 = scalar, F32, 4584, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom13 = scalar, F32, 4588, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom14 = scalar, F32, 4592, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom15 = scalar, F32, 4596, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom16 = scalar, F32, 4600, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom17 = scalar, F32, 4604, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom18 = scalar, F32, 4608, "from", 1, 0, 0, 20, 2 fuelTrim1 = scalar, S08, 4612, "Percent", 0.02, 0, -25, 25, 2 fuelTrim2 = scalar, S08, 4613, "Percent", 0.02, 0, -25, 25, 2 fuelTrim3 = scalar, S08, 4614, "Percent", 0.02, 0, -25, 25, 2 @@ -1241,7 +1241,25 @@ fuelTrim9 = scalar, S08, 4620, "Percent", 0.02, 0, -25, 25, 2 fuelTrim10 = scalar, S08, 4621, "Percent", 0.02, 0, -25, 25, 2 fuelTrim11 = scalar, S08, 4622, "Percent", 0.02, 0, -25, 25, 2 fuelTrim12 = scalar, S08, 4623, "Percent", 0.02, 0, -25, 25, 2 -mainUnusedEnd = array, S32, 4624, [344], "units", 1, 0, -20, 100, 0 +triggerGapOverrideTo1 = scalar, F32, 4624, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo2 = scalar, F32, 4628, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo3 = scalar, F32, 4632, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo4 = scalar, F32, 4636, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo5 = scalar, F32, 4640, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo6 = scalar, F32, 4644, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo7 = scalar, F32, 4648, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo8 = scalar, F32, 4652, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo9 = scalar, F32, 4656, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo10 = scalar, F32, 4660, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo11 = scalar, F32, 4664, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo12 = scalar, F32, 4668, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo13 = scalar, F32, 4672, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo14 = scalar, F32, 4676, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 +mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -3626,14 +3644,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Enable Trigger debug mode", cmd_test_debug_mode_trigger field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } - field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } - field = "Second gap", triggerGapOverride2, { overrideTriggerGaps == 1 } - field = "Third gap", triggerGapOverride3, { overrideTriggerGaps == 1 } - field = "Gap #4", triggerGapOverride4, { overrideTriggerGaps == 1 } - field = "Gap #5", triggerGapOverride5, { overrideTriggerGaps == 1 } - field = "Gap #6", triggerGapOverride6, { overrideTriggerGaps == 1 } - field = "Gap #7", triggerGapOverride7, { overrideTriggerGaps == 1 } - field = "Gap #8", triggerGapOverride8, { overrideTriggerGaps == 1 } + field = "First gap from", triggerGapOverrideFrom1, { overrideTriggerGaps == 1 } + field = "First gap to", triggerGapOverrideTo1 , { overrideTriggerGaps == 1 } + + field = "Second gap from", triggerGapOverrideFrom2, { overrideTriggerGaps == 1 } + field = "Second gap to", triggerGapOverrideTo2, { overrideTriggerGaps == 1 } + + field = "Third gap from", triggerGapOverrideFrom3, { overrideTriggerGaps == 1 } + field = "Third gap to", triggerGapOverrideTo3, { overrideTriggerGaps == 1 } + + field = "Gap #4 from", triggerGapOverrideFrom4, { overrideTriggerGaps == 1 } + field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 } + field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 } + field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 } dialog = triggerConfiguration_IO, "Advanced Trigger" field = "!https://rusefi.com/s/vvt" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 98f7d8dbde..9f00ddb540 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.30.prometheus_405.1475200791" + signature = "rusEFI 2021.10.30.prometheus_405.1387443828" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.30.prometheus_405.1475200791" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.30.prometheus_405.1387443828" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Oct 30 10:17:39 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Oct 30 14:49:01 UTC 2021 pageSize = 20000 page = 1 @@ -1211,24 +1211,24 @@ tcu_solenoid_mode5 = bits, U08, 4521, [0:1], "default", "default inverted", "ope tcu_solenoid_mode6 = bits, U08, 4522, [0:1], "default", "default inverted", "open collector", "open collector inverted" knockBaseNoise = array, S08, 4523, [16], "dB", 1, 0, -30, 0, 2 alignmentFill_at_4539 = scalar, U08, 4539, "units", 1, 0, -20, 100, 0 -triggerGapOverride1 = scalar, F32, 4540, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride2 = scalar, F32, 4544, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride3 = scalar, F32, 4548, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride4 = scalar, F32, 4552, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride5 = scalar, F32, 4556, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride6 = scalar, F32, 4560, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride7 = scalar, F32, 4564, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride8 = scalar, F32, 4568, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride9 = scalar, F32, 4572, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride10 = scalar, F32, 4576, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride11 = scalar, F32, 4580, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride12 = scalar, F32, 4584, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride13 = scalar, F32, 4588, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride14 = scalar, F32, 4592, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride15 = scalar, F32, 4596, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride16 = scalar, F32, 4600, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride17 = scalar, F32, 4604, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride18 = scalar, F32, 4608, "ratio", 1, 0, 0, 20, 2 +triggerGapOverrideFrom1 = scalar, F32, 4540, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom2 = scalar, F32, 4544, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom3 = scalar, F32, 4548, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom4 = scalar, F32, 4552, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom5 = scalar, F32, 4556, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom6 = scalar, F32, 4560, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom7 = scalar, F32, 4564, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom8 = scalar, F32, 4568, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom9 = scalar, F32, 4572, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom10 = scalar, F32, 4576, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom11 = scalar, F32, 4580, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom12 = scalar, F32, 4584, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom13 = scalar, F32, 4588, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom14 = scalar, F32, 4592, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom15 = scalar, F32, 4596, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom16 = scalar, F32, 4600, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom17 = scalar, F32, 4604, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom18 = scalar, F32, 4608, "from", 1, 0, 0, 20, 2 fuelTrim1 = scalar, S08, 4612, "Percent", 0.02, 0, -25, 25, 2 fuelTrim2 = scalar, S08, 4613, "Percent", 0.02, 0, -25, 25, 2 fuelTrim3 = scalar, S08, 4614, "Percent", 0.02, 0, -25, 25, 2 @@ -1241,7 +1241,25 @@ fuelTrim9 = scalar, S08, 4620, "Percent", 0.02, 0, -25, 25, 2 fuelTrim10 = scalar, S08, 4621, "Percent", 0.02, 0, -25, 25, 2 fuelTrim11 = scalar, S08, 4622, "Percent", 0.02, 0, -25, 25, 2 fuelTrim12 = scalar, S08, 4623, "Percent", 0.02, 0, -25, 25, 2 -mainUnusedEnd = array, S32, 4624, [344], "units", 1, 0, -20, 100, 0 +triggerGapOverrideTo1 = scalar, F32, 4624, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo2 = scalar, F32, 4628, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo3 = scalar, F32, 4632, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo4 = scalar, F32, 4636, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo5 = scalar, F32, 4640, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo6 = scalar, F32, 4644, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo7 = scalar, F32, 4648, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo8 = scalar, F32, 4652, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo9 = scalar, F32, 4656, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo10 = scalar, F32, 4660, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo11 = scalar, F32, 4664, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo12 = scalar, F32, 4668, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo13 = scalar, F32, 4672, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo14 = scalar, F32, 4676, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 +mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -3625,14 +3643,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Enable Trigger debug mode", cmd_test_debug_mode_trigger field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } - field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } - field = "Second gap", triggerGapOverride2, { overrideTriggerGaps == 1 } - field = "Third gap", triggerGapOverride3, { overrideTriggerGaps == 1 } - field = "Gap #4", triggerGapOverride4, { overrideTriggerGaps == 1 } - field = "Gap #5", triggerGapOverride5, { overrideTriggerGaps == 1 } - field = "Gap #6", triggerGapOverride6, { overrideTriggerGaps == 1 } - field = "Gap #7", triggerGapOverride7, { overrideTriggerGaps == 1 } - field = "Gap #8", triggerGapOverride8, { overrideTriggerGaps == 1 } + field = "First gap from", triggerGapOverrideFrom1, { overrideTriggerGaps == 1 } + field = "First gap to", triggerGapOverrideTo1 , { overrideTriggerGaps == 1 } + + field = "Second gap from", triggerGapOverrideFrom2, { overrideTriggerGaps == 1 } + field = "Second gap to", triggerGapOverrideTo2, { overrideTriggerGaps == 1 } + + field = "Third gap from", triggerGapOverrideFrom3, { overrideTriggerGaps == 1 } + field = "Third gap to", triggerGapOverrideTo3, { overrideTriggerGaps == 1 } + + field = "Gap #4 from", triggerGapOverrideFrom4, { overrideTriggerGaps == 1 } + field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 } + field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 } + field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 } dialog = triggerConfiguration_IO, "Advanced Trigger" field = "!https://rusefi.com/s/vvt" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index fcbbc060ae..92a023454a 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.30.prometheus_469.1475200791" + signature = "rusEFI 2021.10.30.prometheus_469.1387443828" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.30.prometheus_469.1475200791" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.30.prometheus_469.1387443828" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Oct 30 10:17:37 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Oct 30 14:48:58 UTC 2021 pageSize = 20000 page = 1 @@ -1211,24 +1211,24 @@ tcu_solenoid_mode5 = bits, U08, 4521, [0:1], "default", "default inverted", "ope tcu_solenoid_mode6 = bits, U08, 4522, [0:1], "default", "default inverted", "open collector", "open collector inverted" knockBaseNoise = array, S08, 4523, [16], "dB", 1, 0, -30, 0, 2 alignmentFill_at_4539 = scalar, U08, 4539, "units", 1, 0, -20, 100, 0 -triggerGapOverride1 = scalar, F32, 4540, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride2 = scalar, F32, 4544, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride3 = scalar, F32, 4548, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride4 = scalar, F32, 4552, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride5 = scalar, F32, 4556, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride6 = scalar, F32, 4560, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride7 = scalar, F32, 4564, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride8 = scalar, F32, 4568, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride9 = scalar, F32, 4572, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride10 = scalar, F32, 4576, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride11 = scalar, F32, 4580, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride12 = scalar, F32, 4584, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride13 = scalar, F32, 4588, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride14 = scalar, F32, 4592, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride15 = scalar, F32, 4596, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride16 = scalar, F32, 4600, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride17 = scalar, F32, 4604, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride18 = scalar, F32, 4608, "ratio", 1, 0, 0, 20, 2 +triggerGapOverrideFrom1 = scalar, F32, 4540, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom2 = scalar, F32, 4544, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom3 = scalar, F32, 4548, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom4 = scalar, F32, 4552, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom5 = scalar, F32, 4556, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom6 = scalar, F32, 4560, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom7 = scalar, F32, 4564, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom8 = scalar, F32, 4568, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom9 = scalar, F32, 4572, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom10 = scalar, F32, 4576, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom11 = scalar, F32, 4580, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom12 = scalar, F32, 4584, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom13 = scalar, F32, 4588, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom14 = scalar, F32, 4592, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom15 = scalar, F32, 4596, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom16 = scalar, F32, 4600, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom17 = scalar, F32, 4604, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom18 = scalar, F32, 4608, "from", 1, 0, 0, 20, 2 fuelTrim1 = scalar, S08, 4612, "Percent", 0.02, 0, -25, 25, 2 fuelTrim2 = scalar, S08, 4613, "Percent", 0.02, 0, -25, 25, 2 fuelTrim3 = scalar, S08, 4614, "Percent", 0.02, 0, -25, 25, 2 @@ -1241,7 +1241,25 @@ fuelTrim9 = scalar, S08, 4620, "Percent", 0.02, 0, -25, 25, 2 fuelTrim10 = scalar, S08, 4621, "Percent", 0.02, 0, -25, 25, 2 fuelTrim11 = scalar, S08, 4622, "Percent", 0.02, 0, -25, 25, 2 fuelTrim12 = scalar, S08, 4623, "Percent", 0.02, 0, -25, 25, 2 -mainUnusedEnd = array, S32, 4624, [344], "units", 1, 0, -20, 100, 0 +triggerGapOverrideTo1 = scalar, F32, 4624, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo2 = scalar, F32, 4628, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo3 = scalar, F32, 4632, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo4 = scalar, F32, 4636, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo5 = scalar, F32, 4640, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo6 = scalar, F32, 4644, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo7 = scalar, F32, 4648, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo8 = scalar, F32, 4652, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo9 = scalar, F32, 4656, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo10 = scalar, F32, 4660, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo11 = scalar, F32, 4664, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo12 = scalar, F32, 4668, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo13 = scalar, F32, 4672, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo14 = scalar, F32, 4676, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 +mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -3625,14 +3643,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Enable Trigger debug mode", cmd_test_debug_mode_trigger field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } - field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } - field = "Second gap", triggerGapOverride2, { overrideTriggerGaps == 1 } - field = "Third gap", triggerGapOverride3, { overrideTriggerGaps == 1 } - field = "Gap #4", triggerGapOverride4, { overrideTriggerGaps == 1 } - field = "Gap #5", triggerGapOverride5, { overrideTriggerGaps == 1 } - field = "Gap #6", triggerGapOverride6, { overrideTriggerGaps == 1 } - field = "Gap #7", triggerGapOverride7, { overrideTriggerGaps == 1 } - field = "Gap #8", triggerGapOverride8, { overrideTriggerGaps == 1 } + field = "First gap from", triggerGapOverrideFrom1, { overrideTriggerGaps == 1 } + field = "First gap to", triggerGapOverrideTo1 , { overrideTriggerGaps == 1 } + + field = "Second gap from", triggerGapOverrideFrom2, { overrideTriggerGaps == 1 } + field = "Second gap to", triggerGapOverrideTo2, { overrideTriggerGaps == 1 } + + field = "Third gap from", triggerGapOverrideFrom3, { overrideTriggerGaps == 1 } + field = "Third gap to", triggerGapOverrideTo3, { overrideTriggerGaps == 1 } + + field = "Gap #4 from", triggerGapOverrideFrom4, { overrideTriggerGaps == 1 } + field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 } + field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 } + field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 } dialog = triggerConfiguration_IO, "Advanced Trigger" field = "!https://rusefi.com/s/vvt" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index af4bce2112..278eb2b999 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.30.proteus_f4.2581812781" + signature = "rusEFI 2021.10.30.proteus_f4.2629576526" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.30.proteus_f4.2581812781" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.30.proteus_f4.2629576526" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Oct 30 10:17:44 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Oct 30 14:49:07 UTC 2021 pageSize = 20000 page = 1 @@ -1211,24 +1211,24 @@ tcu_solenoid_mode5 = bits, U08, 4521, [0:1], "default", "default inverted", "ope tcu_solenoid_mode6 = bits, U08, 4522, [0:1], "default", "default inverted", "open collector", "open collector inverted" knockBaseNoise = array, S08, 4523, [16], "dB", 1, 0, -30, 0, 2 alignmentFill_at_4539 = scalar, U08, 4539, "units", 1, 0, -20, 100, 0 -triggerGapOverride1 = scalar, F32, 4540, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride2 = scalar, F32, 4544, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride3 = scalar, F32, 4548, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride4 = scalar, F32, 4552, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride5 = scalar, F32, 4556, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride6 = scalar, F32, 4560, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride7 = scalar, F32, 4564, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride8 = scalar, F32, 4568, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride9 = scalar, F32, 4572, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride10 = scalar, F32, 4576, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride11 = scalar, F32, 4580, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride12 = scalar, F32, 4584, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride13 = scalar, F32, 4588, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride14 = scalar, F32, 4592, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride15 = scalar, F32, 4596, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride16 = scalar, F32, 4600, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride17 = scalar, F32, 4604, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride18 = scalar, F32, 4608, "ratio", 1, 0, 0, 20, 2 +triggerGapOverrideFrom1 = scalar, F32, 4540, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom2 = scalar, F32, 4544, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom3 = scalar, F32, 4548, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom4 = scalar, F32, 4552, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom5 = scalar, F32, 4556, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom6 = scalar, F32, 4560, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom7 = scalar, F32, 4564, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom8 = scalar, F32, 4568, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom9 = scalar, F32, 4572, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom10 = scalar, F32, 4576, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom11 = scalar, F32, 4580, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom12 = scalar, F32, 4584, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom13 = scalar, F32, 4588, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom14 = scalar, F32, 4592, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom15 = scalar, F32, 4596, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom16 = scalar, F32, 4600, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom17 = scalar, F32, 4604, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom18 = scalar, F32, 4608, "from", 1, 0, 0, 20, 2 fuelTrim1 = scalar, S08, 4612, "Percent", 0.02, 0, -25, 25, 2 fuelTrim2 = scalar, S08, 4613, "Percent", 0.02, 0, -25, 25, 2 fuelTrim3 = scalar, S08, 4614, "Percent", 0.02, 0, -25, 25, 2 @@ -1241,7 +1241,25 @@ fuelTrim9 = scalar, S08, 4620, "Percent", 0.02, 0, -25, 25, 2 fuelTrim10 = scalar, S08, 4621, "Percent", 0.02, 0, -25, 25, 2 fuelTrim11 = scalar, S08, 4622, "Percent", 0.02, 0, -25, 25, 2 fuelTrim12 = scalar, S08, 4623, "Percent", 0.02, 0, -25, 25, 2 -mainUnusedEnd = array, S32, 4624, [344], "units", 1, 0, -20, 100, 0 +triggerGapOverrideTo1 = scalar, F32, 4624, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo2 = scalar, F32, 4628, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo3 = scalar, F32, 4632, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo4 = scalar, F32, 4636, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo5 = scalar, F32, 4640, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo6 = scalar, F32, 4644, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo7 = scalar, F32, 4648, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo8 = scalar, F32, 4652, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo9 = scalar, F32, 4656, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo10 = scalar, F32, 4660, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo11 = scalar, F32, 4664, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo12 = scalar, F32, 4668, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo13 = scalar, F32, 4672, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo14 = scalar, F32, 4676, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 +mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -3623,14 +3641,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Enable Trigger debug mode", cmd_test_debug_mode_trigger field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } - field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } - field = "Second gap", triggerGapOverride2, { overrideTriggerGaps == 1 } - field = "Third gap", triggerGapOverride3, { overrideTriggerGaps == 1 } - field = "Gap #4", triggerGapOverride4, { overrideTriggerGaps == 1 } - field = "Gap #5", triggerGapOverride5, { overrideTriggerGaps == 1 } - field = "Gap #6", triggerGapOverride6, { overrideTriggerGaps == 1 } - field = "Gap #7", triggerGapOverride7, { overrideTriggerGaps == 1 } - field = "Gap #8", triggerGapOverride8, { overrideTriggerGaps == 1 } + field = "First gap from", triggerGapOverrideFrom1, { overrideTriggerGaps == 1 } + field = "First gap to", triggerGapOverrideTo1 , { overrideTriggerGaps == 1 } + + field = "Second gap from", triggerGapOverrideFrom2, { overrideTriggerGaps == 1 } + field = "Second gap to", triggerGapOverrideTo2, { overrideTriggerGaps == 1 } + + field = "Third gap from", triggerGapOverrideFrom3, { overrideTriggerGaps == 1 } + field = "Third gap to", triggerGapOverrideTo3, { overrideTriggerGaps == 1 } + + field = "Gap #4 from", triggerGapOverrideFrom4, { overrideTriggerGaps == 1 } + field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 } + field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 } + field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 } dialog = triggerConfiguration_IO, "Advanced Trigger" field = "!https://rusefi.com/s/vvt" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index a1479eadbc..46362e59e0 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.30.proteus_f7.2581812781" + signature = "rusEFI 2021.10.30.proteus_f7.2629576526" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.30.proteus_f7.2581812781" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.30.proteus_f7.2629576526" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Oct 30 10:17:42 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Oct 30 14:49:04 UTC 2021 pageSize = 20000 page = 1 @@ -1211,24 +1211,24 @@ tcu_solenoid_mode5 = bits, U08, 4521, [0:1], "default", "default inverted", "ope tcu_solenoid_mode6 = bits, U08, 4522, [0:1], "default", "default inverted", "open collector", "open collector inverted" knockBaseNoise = array, S08, 4523, [16], "dB", 1, 0, -30, 0, 2 alignmentFill_at_4539 = scalar, U08, 4539, "units", 1, 0, -20, 100, 0 -triggerGapOverride1 = scalar, F32, 4540, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride2 = scalar, F32, 4544, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride3 = scalar, F32, 4548, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride4 = scalar, F32, 4552, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride5 = scalar, F32, 4556, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride6 = scalar, F32, 4560, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride7 = scalar, F32, 4564, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride8 = scalar, F32, 4568, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride9 = scalar, F32, 4572, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride10 = scalar, F32, 4576, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride11 = scalar, F32, 4580, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride12 = scalar, F32, 4584, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride13 = scalar, F32, 4588, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride14 = scalar, F32, 4592, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride15 = scalar, F32, 4596, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride16 = scalar, F32, 4600, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride17 = scalar, F32, 4604, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride18 = scalar, F32, 4608, "ratio", 1, 0, 0, 20, 2 +triggerGapOverrideFrom1 = scalar, F32, 4540, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom2 = scalar, F32, 4544, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom3 = scalar, F32, 4548, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom4 = scalar, F32, 4552, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom5 = scalar, F32, 4556, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom6 = scalar, F32, 4560, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom7 = scalar, F32, 4564, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom8 = scalar, F32, 4568, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom9 = scalar, F32, 4572, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom10 = scalar, F32, 4576, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom11 = scalar, F32, 4580, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom12 = scalar, F32, 4584, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom13 = scalar, F32, 4588, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom14 = scalar, F32, 4592, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom15 = scalar, F32, 4596, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom16 = scalar, F32, 4600, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom17 = scalar, F32, 4604, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom18 = scalar, F32, 4608, "from", 1, 0, 0, 20, 2 fuelTrim1 = scalar, S08, 4612, "Percent", 0.02, 0, -25, 25, 2 fuelTrim2 = scalar, S08, 4613, "Percent", 0.02, 0, -25, 25, 2 fuelTrim3 = scalar, S08, 4614, "Percent", 0.02, 0, -25, 25, 2 @@ -1241,7 +1241,25 @@ fuelTrim9 = scalar, S08, 4620, "Percent", 0.02, 0, -25, 25, 2 fuelTrim10 = scalar, S08, 4621, "Percent", 0.02, 0, -25, 25, 2 fuelTrim11 = scalar, S08, 4622, "Percent", 0.02, 0, -25, 25, 2 fuelTrim12 = scalar, S08, 4623, "Percent", 0.02, 0, -25, 25, 2 -mainUnusedEnd = array, S32, 4624, [344], "units", 1, 0, -20, 100, 0 +triggerGapOverrideTo1 = scalar, F32, 4624, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo2 = scalar, F32, 4628, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo3 = scalar, F32, 4632, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo4 = scalar, F32, 4636, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo5 = scalar, F32, 4640, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo6 = scalar, F32, 4644, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo7 = scalar, F32, 4648, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo8 = scalar, F32, 4652, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo9 = scalar, F32, 4656, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo10 = scalar, F32, 4660, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo11 = scalar, F32, 4664, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo12 = scalar, F32, 4668, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo13 = scalar, F32, 4672, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo14 = scalar, F32, 4676, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 +mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -3623,14 +3641,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Enable Trigger debug mode", cmd_test_debug_mode_trigger field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } - field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } - field = "Second gap", triggerGapOverride2, { overrideTriggerGaps == 1 } - field = "Third gap", triggerGapOverride3, { overrideTriggerGaps == 1 } - field = "Gap #4", triggerGapOverride4, { overrideTriggerGaps == 1 } - field = "Gap #5", triggerGapOverride5, { overrideTriggerGaps == 1 } - field = "Gap #6", triggerGapOverride6, { overrideTriggerGaps == 1 } - field = "Gap #7", triggerGapOverride7, { overrideTriggerGaps == 1 } - field = "Gap #8", triggerGapOverride8, { overrideTriggerGaps == 1 } + field = "First gap from", triggerGapOverrideFrom1, { overrideTriggerGaps == 1 } + field = "First gap to", triggerGapOverrideTo1 , { overrideTriggerGaps == 1 } + + field = "Second gap from", triggerGapOverrideFrom2, { overrideTriggerGaps == 1 } + field = "Second gap to", triggerGapOverrideTo2, { overrideTriggerGaps == 1 } + + field = "Third gap from", triggerGapOverrideFrom3, { overrideTriggerGaps == 1 } + field = "Third gap to", triggerGapOverrideTo3, { overrideTriggerGaps == 1 } + + field = "Gap #4 from", triggerGapOverrideFrom4, { overrideTriggerGaps == 1 } + field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 } + field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 } + field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 } dialog = triggerConfiguration_IO, "Advanced Trigger" field = "!https://rusefi.com/s/vvt" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index c616da7f78..a76b028d21 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.30.subaru_eg33_f7.2458776978" + signature = "rusEFI 2021.10.30.subaru_eg33_f7.2547156209" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.30.subaru_eg33_f7.2458776978" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.30.subaru_eg33_f7.2547156209" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Sat Oct 30 10:17:56 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 Sat Oct 30 14:49:21 UTC 2021 pageSize = 20000 page = 1 @@ -1211,24 +1211,24 @@ tcu_solenoid_mode5 = bits, U08, 4521, [0:1], "default", "default inverted", "ope tcu_solenoid_mode6 = bits, U08, 4522, [0:1], "default", "default inverted", "open collector", "open collector inverted" knockBaseNoise = array, S08, 4523, [16], "dB", 1, 0, -30, 0, 2 alignmentFill_at_4539 = scalar, U08, 4539, "units", 1, 0, -20, 100, 0 -triggerGapOverride1 = scalar, F32, 4540, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride2 = scalar, F32, 4544, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride3 = scalar, F32, 4548, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride4 = scalar, F32, 4552, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride5 = scalar, F32, 4556, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride6 = scalar, F32, 4560, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride7 = scalar, F32, 4564, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride8 = scalar, F32, 4568, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride9 = scalar, F32, 4572, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride10 = scalar, F32, 4576, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride11 = scalar, F32, 4580, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride12 = scalar, F32, 4584, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride13 = scalar, F32, 4588, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride14 = scalar, F32, 4592, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride15 = scalar, F32, 4596, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride16 = scalar, F32, 4600, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride17 = scalar, F32, 4604, "ratio", 1, 0, 0, 20, 2 -triggerGapOverride18 = scalar, F32, 4608, "ratio", 1, 0, 0, 20, 2 +triggerGapOverrideFrom1 = scalar, F32, 4540, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom2 = scalar, F32, 4544, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom3 = scalar, F32, 4548, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom4 = scalar, F32, 4552, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom5 = scalar, F32, 4556, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom6 = scalar, F32, 4560, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom7 = scalar, F32, 4564, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom8 = scalar, F32, 4568, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom9 = scalar, F32, 4572, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom10 = scalar, F32, 4576, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom11 = scalar, F32, 4580, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom12 = scalar, F32, 4584, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom13 = scalar, F32, 4588, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom14 = scalar, F32, 4592, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom15 = scalar, F32, 4596, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom16 = scalar, F32, 4600, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom17 = scalar, F32, 4604, "from", 1, 0, 0, 20, 2 +triggerGapOverrideFrom18 = scalar, F32, 4608, "from", 1, 0, 0, 20, 2 fuelTrim1 = scalar, S08, 4612, "Percent", 0.02, 0, -25, 25, 2 fuelTrim2 = scalar, S08, 4613, "Percent", 0.02, 0, -25, 25, 2 fuelTrim3 = scalar, S08, 4614, "Percent", 0.02, 0, -25, 25, 2 @@ -1241,7 +1241,25 @@ fuelTrim9 = scalar, S08, 4620, "Percent", 0.02, 0, -25, 25, 2 fuelTrim10 = scalar, S08, 4621, "Percent", 0.02, 0, -25, 25, 2 fuelTrim11 = scalar, S08, 4622, "Percent", 0.02, 0, -25, 25, 2 fuelTrim12 = scalar, S08, 4623, "Percent", 0.02, 0, -25, 25, 2 -mainUnusedEnd = array, S32, 4624, [344], "units", 1, 0, -20, 100, 0 +triggerGapOverrideTo1 = scalar, F32, 4624, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo2 = scalar, F32, 4628, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo3 = scalar, F32, 4632, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo4 = scalar, F32, 4636, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo5 = scalar, F32, 4640, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo6 = scalar, F32, 4644, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo7 = scalar, F32, 4648, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo8 = scalar, F32, 4652, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo9 = scalar, F32, 4656, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo10 = scalar, F32, 4660, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo11 = scalar, F32, 4664, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo12 = scalar, F32, 4668, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo13 = scalar, F32, 4672, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo14 = scalar, F32, 4676, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo15 = scalar, F32, 4680, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo16 = scalar, F32, 4684, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo17 = scalar, F32, 4688, "to", 1, 0, 0, 20, 2 +triggerGapOverrideTo18 = scalar, F32, 4692, "to", 1, 0, 0, 20, 2 +mainUnusedEnd = array, S32, 4696, [326], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100, 250, 0 afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 @@ -3626,14 +3644,19 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" commandButton = "Enable Trigger debug mode", cmd_test_debug_mode_trigger field = "Override well known trigger gaps", overrideTriggerGaps field = gapTrackingLengthOverride, gapTrackingLengthOverride, { overrideTriggerGaps == 1 } - field = "First gap", triggerGapOverride1, { overrideTriggerGaps == 1 } - field = "Second gap", triggerGapOverride2, { overrideTriggerGaps == 1 } - field = "Third gap", triggerGapOverride3, { overrideTriggerGaps == 1 } - field = "Gap #4", triggerGapOverride4, { overrideTriggerGaps == 1 } - field = "Gap #5", triggerGapOverride5, { overrideTriggerGaps == 1 } - field = "Gap #6", triggerGapOverride6, { overrideTriggerGaps == 1 } - field = "Gap #7", triggerGapOverride7, { overrideTriggerGaps == 1 } - field = "Gap #8", triggerGapOverride8, { overrideTriggerGaps == 1 } + field = "First gap from", triggerGapOverrideFrom1, { overrideTriggerGaps == 1 } + field = "First gap to", triggerGapOverrideTo1 , { overrideTriggerGaps == 1 } + + field = "Second gap from", triggerGapOverrideFrom2, { overrideTriggerGaps == 1 } + field = "Second gap to", triggerGapOverrideTo2, { overrideTriggerGaps == 1 } + + field = "Third gap from", triggerGapOverrideFrom3, { overrideTriggerGaps == 1 } + field = "Third gap to", triggerGapOverrideTo3, { overrideTriggerGaps == 1 } + + field = "Gap #4 from", triggerGapOverrideFrom4, { overrideTriggerGaps == 1 } + field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 } + field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 } + field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 } dialog = triggerConfiguration_IO, "Advanced Trigger" field = "!https://rusefi.com/s/vvt" 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 52e1067879..20bef225ee 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 Oct 29 19:50:48 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Oct 30 14:49:13 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1524,7 +1524,7 @@ public class Fields { public static final String MAIN_HELP_URL = "http://www.rusefi.com/"; public static final int mainRelayPin_offset = 706; public static final int mainRelayPinMode_offset = 752; - public static final int mainUnusedEnd_offset = 4624; + public static final int mainUnusedEnd_offset = 4696; public static final int malfunctionIndicatorPin_offset = 660; public static final int malfunctionIndicatorPinMode_offset = 661; public static final int manIdlePosition_offset = 608; @@ -1727,6 +1727,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 = 39350162; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -2074,24 +2075,42 @@ public class Fields { public static final int triggerCompSensorSatRpm_offset = 4039; public static final int triggerErrorPin_offset = 828; public static final int triggerErrorPinMode_offset = 829; - public static final int triggerGapOverride10_offset = 4576; - public static final int triggerGapOverride11_offset = 4580; - public static final int triggerGapOverride12_offset = 4584; - public static final int triggerGapOverride13_offset = 4588; - public static final int triggerGapOverride14_offset = 4592; - public static final int triggerGapOverride15_offset = 4596; - public static final int triggerGapOverride16_offset = 4600; - public static final int triggerGapOverride17_offset = 4604; - public static final int triggerGapOverride18_offset = 4608; - public static final int triggerGapOverride1_offset = 4540; - public static final int triggerGapOverride2_offset = 4544; - public static final int triggerGapOverride3_offset = 4548; - public static final int triggerGapOverride4_offset = 4552; - public static final int triggerGapOverride5_offset = 4556; - public static final int triggerGapOverride6_offset = 4560; - public static final int triggerGapOverride7_offset = 4564; - public static final int triggerGapOverride8_offset = 4568; - public static final int triggerGapOverride9_offset = 4572; + public static final int triggerGapOverrideFrom10_offset = 4576; + public static final int triggerGapOverrideFrom11_offset = 4580; + public static final int triggerGapOverrideFrom12_offset = 4584; + public static final int triggerGapOverrideFrom13_offset = 4588; + public static final int triggerGapOverrideFrom14_offset = 4592; + public static final int triggerGapOverrideFrom15_offset = 4596; + public static final int triggerGapOverrideFrom16_offset = 4600; + public static final int triggerGapOverrideFrom17_offset = 4604; + public static final int triggerGapOverrideFrom18_offset = 4608; + public static final int triggerGapOverrideFrom1_offset = 4540; + public static final int triggerGapOverrideFrom2_offset = 4544; + public static final int triggerGapOverrideFrom3_offset = 4548; + public static final int triggerGapOverrideFrom4_offset = 4552; + public static final int triggerGapOverrideFrom5_offset = 4556; + public static final int triggerGapOverrideFrom6_offset = 4560; + public static final int triggerGapOverrideFrom7_offset = 4564; + public static final int triggerGapOverrideFrom8_offset = 4568; + public static final int triggerGapOverrideFrom9_offset = 4572; + public static final int triggerGapOverrideTo10_offset = 4660; + public static final int triggerGapOverrideTo11_offset = 4664; + public static final int triggerGapOverrideTo12_offset = 4668; + public static final int triggerGapOverrideTo13_offset = 4672; + public static final int triggerGapOverrideTo14_offset = 4676; + public static final int triggerGapOverrideTo15_offset = 4680; + public static final int triggerGapOverrideTo16_offset = 4684; + public static final int triggerGapOverrideTo17_offset = 4688; + public static final int triggerGapOverrideTo18_offset = 4692; + public static final int triggerGapOverrideTo1_offset = 4624; + public static final int triggerGapOverrideTo2_offset = 4628; + public static final int triggerGapOverrideTo3_offset = 4632; + public static final int triggerGapOverrideTo4_offset = 4636; + public static final int triggerGapOverrideTo5_offset = 4640; + public static final int triggerGapOverrideTo6_offset = 4644; + public static final int triggerGapOverrideTo7_offset = 4648; + public static final int triggerGapOverrideTo8_offset = 4652; + public static final int triggerGapOverrideTo9_offset = 4656; public static final int triggerInputDebugPins1_offset = 1756; public static final int triggerInputDebugPins2_offset = 1757; public static final int triggerInputDebugPins3_offset = 1758; @@ -2161,7 +2180,7 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2021.10.29.all.3727772439"; + public static final String TS_SIGNATURE = "rusEFI 2021.10.30.all.39350162"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int tunerStudioSerialSpeed_offset = 728; @@ -3431,24 +3450,24 @@ public class Fields { public static final Field TCU_SOLENOID_MODE5 = Field.create("TCU_SOLENOID_MODE5", 4521, FieldType.INT8, pin_output_mode_e); public static final Field TCU_SOLENOID_MODE6 = Field.create("TCU_SOLENOID_MODE6", 4522, FieldType.INT8, pin_output_mode_e); public static final Field ALIGNMENTFILL_AT_4539 = Field.create("ALIGNMENTFILL_AT_4539", 4539, FieldType.INT8); - public static final Field TRIGGERGAPOVERRIDE1 = Field.create("TRIGGERGAPOVERRIDE1", 4540, FieldType.FLOAT); - public static final Field TRIGGERGAPOVERRIDE2 = Field.create("TRIGGERGAPOVERRIDE2", 4544, FieldType.FLOAT); - public static final Field TRIGGERGAPOVERRIDE3 = Field.create("TRIGGERGAPOVERRIDE3", 4548, FieldType.FLOAT); - public static final Field TRIGGERGAPOVERRIDE4 = Field.create("TRIGGERGAPOVERRIDE4", 4552, FieldType.FLOAT); - public static final Field TRIGGERGAPOVERRIDE5 = Field.create("TRIGGERGAPOVERRIDE5", 4556, FieldType.FLOAT); - public static final Field TRIGGERGAPOVERRIDE6 = Field.create("TRIGGERGAPOVERRIDE6", 4560, FieldType.FLOAT); - public static final Field TRIGGERGAPOVERRIDE7 = Field.create("TRIGGERGAPOVERRIDE7", 4564, FieldType.FLOAT); - public static final Field TRIGGERGAPOVERRIDE8 = Field.create("TRIGGERGAPOVERRIDE8", 4568, FieldType.FLOAT); - public static final Field TRIGGERGAPOVERRIDE9 = Field.create("TRIGGERGAPOVERRIDE9", 4572, FieldType.FLOAT); - public static final Field TRIGGERGAPOVERRIDE10 = Field.create("TRIGGERGAPOVERRIDE10", 4576, FieldType.FLOAT); - public static final Field TRIGGERGAPOVERRIDE11 = Field.create("TRIGGERGAPOVERRIDE11", 4580, FieldType.FLOAT); - public static final Field TRIGGERGAPOVERRIDE12 = Field.create("TRIGGERGAPOVERRIDE12", 4584, FieldType.FLOAT); - public static final Field TRIGGERGAPOVERRIDE13 = Field.create("TRIGGERGAPOVERRIDE13", 4588, FieldType.FLOAT); - public static final Field TRIGGERGAPOVERRIDE14 = Field.create("TRIGGERGAPOVERRIDE14", 4592, FieldType.FLOAT); - public static final Field TRIGGERGAPOVERRIDE15 = Field.create("TRIGGERGAPOVERRIDE15", 4596, FieldType.FLOAT); - public static final Field TRIGGERGAPOVERRIDE16 = Field.create("TRIGGERGAPOVERRIDE16", 4600, FieldType.FLOAT); - public static final Field TRIGGERGAPOVERRIDE17 = Field.create("TRIGGERGAPOVERRIDE17", 4604, FieldType.FLOAT); - public static final Field TRIGGERGAPOVERRIDE18 = Field.create("TRIGGERGAPOVERRIDE18", 4608, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDEFROM1 = Field.create("TRIGGERGAPOVERRIDEFROM1", 4540, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDEFROM2 = Field.create("TRIGGERGAPOVERRIDEFROM2", 4544, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDEFROM3 = Field.create("TRIGGERGAPOVERRIDEFROM3", 4548, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDEFROM4 = Field.create("TRIGGERGAPOVERRIDEFROM4", 4552, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDEFROM5 = Field.create("TRIGGERGAPOVERRIDEFROM5", 4556, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDEFROM6 = Field.create("TRIGGERGAPOVERRIDEFROM6", 4560, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDEFROM7 = Field.create("TRIGGERGAPOVERRIDEFROM7", 4564, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDEFROM8 = Field.create("TRIGGERGAPOVERRIDEFROM8", 4568, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDEFROM9 = Field.create("TRIGGERGAPOVERRIDEFROM9", 4572, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDEFROM10 = Field.create("TRIGGERGAPOVERRIDEFROM10", 4576, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDEFROM11 = Field.create("TRIGGERGAPOVERRIDEFROM11", 4580, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDEFROM12 = Field.create("TRIGGERGAPOVERRIDEFROM12", 4584, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDEFROM13 = Field.create("TRIGGERGAPOVERRIDEFROM13", 4588, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDEFROM14 = Field.create("TRIGGERGAPOVERRIDEFROM14", 4592, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDEFROM15 = Field.create("TRIGGERGAPOVERRIDEFROM15", 4596, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDEFROM16 = Field.create("TRIGGERGAPOVERRIDEFROM16", 4600, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDEFROM17 = Field.create("TRIGGERGAPOVERRIDEFROM17", 4604, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDEFROM18 = Field.create("TRIGGERGAPOVERRIDEFROM18", 4608, FieldType.FLOAT); public static final Field FUELTRIM1 = Field.create("FUELTRIM1", 4612, FieldType.INT8); public static final Field FUELTRIM2 = Field.create("FUELTRIM2", 4613, FieldType.INT8); public static final Field FUELTRIM3 = Field.create("FUELTRIM3", 4614, FieldType.INT8); @@ -3461,6 +3480,24 @@ public class Fields { public static final Field FUELTRIM10 = Field.create("FUELTRIM10", 4621, FieldType.INT8); public static final Field FUELTRIM11 = Field.create("FUELTRIM11", 4622, FieldType.INT8); public static final Field FUELTRIM12 = Field.create("FUELTRIM12", 4623, FieldType.INT8); + public static final Field TRIGGERGAPOVERRIDETO1 = Field.create("TRIGGERGAPOVERRIDETO1", 4624, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDETO2 = Field.create("TRIGGERGAPOVERRIDETO2", 4628, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDETO3 = Field.create("TRIGGERGAPOVERRIDETO3", 4632, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDETO4 = Field.create("TRIGGERGAPOVERRIDETO4", 4636, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDETO5 = Field.create("TRIGGERGAPOVERRIDETO5", 4640, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDETO6 = Field.create("TRIGGERGAPOVERRIDETO6", 4644, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDETO7 = Field.create("TRIGGERGAPOVERRIDETO7", 4648, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDETO8 = Field.create("TRIGGERGAPOVERRIDETO8", 4652, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDETO9 = Field.create("TRIGGERGAPOVERRIDETO9", 4656, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDETO10 = Field.create("TRIGGERGAPOVERRIDETO10", 4660, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDETO11 = Field.create("TRIGGERGAPOVERRIDETO11", 4664, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDETO12 = Field.create("TRIGGERGAPOVERRIDETO12", 4668, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDETO13 = Field.create("TRIGGERGAPOVERRIDETO13", 4672, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDETO14 = Field.create("TRIGGERGAPOVERRIDETO14", 4676, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDETO15 = Field.create("TRIGGERGAPOVERRIDETO15", 4680, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDETO16 = Field.create("TRIGGERGAPOVERRIDETO16", 4684, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDETO17 = Field.create("TRIGGERGAPOVERRIDETO17", 4688, FieldType.FLOAT); + public static final Field TRIGGERGAPOVERRIDETO18 = Field.create("TRIGGERGAPOVERRIDETO18", 4692, FieldType.FLOAT); public static final Field WARNING_MESSAGE = Field.create("WARNING_MESSAGE", 6000, 120, FieldType.STRING); public static final Field BOOSTTABLEOPENLOOP = Field.create("BOOSTTABLEOPENLOOP", 6248, FieldType.INT); public static final Field BOOSTTABLECLOSEDLOOP = Field.create("BOOSTTABLECLOSEDLOOP", 6328, FieldType.INT); @@ -4523,24 +4560,24 @@ public class Fields { TCU_SOLENOID_MODE5, TCU_SOLENOID_MODE6, ALIGNMENTFILL_AT_4539, - TRIGGERGAPOVERRIDE1, - TRIGGERGAPOVERRIDE2, - TRIGGERGAPOVERRIDE3, - TRIGGERGAPOVERRIDE4, - TRIGGERGAPOVERRIDE5, - TRIGGERGAPOVERRIDE6, - TRIGGERGAPOVERRIDE7, - TRIGGERGAPOVERRIDE8, - TRIGGERGAPOVERRIDE9, - TRIGGERGAPOVERRIDE10, - TRIGGERGAPOVERRIDE11, - TRIGGERGAPOVERRIDE12, - TRIGGERGAPOVERRIDE13, - TRIGGERGAPOVERRIDE14, - TRIGGERGAPOVERRIDE15, - TRIGGERGAPOVERRIDE16, - TRIGGERGAPOVERRIDE17, - TRIGGERGAPOVERRIDE18, + TRIGGERGAPOVERRIDEFROM1, + TRIGGERGAPOVERRIDEFROM2, + TRIGGERGAPOVERRIDEFROM3, + TRIGGERGAPOVERRIDEFROM4, + TRIGGERGAPOVERRIDEFROM5, + TRIGGERGAPOVERRIDEFROM6, + TRIGGERGAPOVERRIDEFROM7, + TRIGGERGAPOVERRIDEFROM8, + TRIGGERGAPOVERRIDEFROM9, + TRIGGERGAPOVERRIDEFROM10, + TRIGGERGAPOVERRIDEFROM11, + TRIGGERGAPOVERRIDEFROM12, + TRIGGERGAPOVERRIDEFROM13, + TRIGGERGAPOVERRIDEFROM14, + TRIGGERGAPOVERRIDEFROM15, + TRIGGERGAPOVERRIDEFROM16, + TRIGGERGAPOVERRIDEFROM17, + TRIGGERGAPOVERRIDEFROM18, FUELTRIM1, FUELTRIM2, FUELTRIM3, @@ -4553,6 +4590,24 @@ public class Fields { FUELTRIM10, FUELTRIM11, FUELTRIM12, + TRIGGERGAPOVERRIDETO1, + TRIGGERGAPOVERRIDETO2, + TRIGGERGAPOVERRIDETO3, + TRIGGERGAPOVERRIDETO4, + TRIGGERGAPOVERRIDETO5, + TRIGGERGAPOVERRIDETO6, + TRIGGERGAPOVERRIDETO7, + TRIGGERGAPOVERRIDETO8, + TRIGGERGAPOVERRIDETO9, + TRIGGERGAPOVERRIDETO10, + TRIGGERGAPOVERRIDETO11, + TRIGGERGAPOVERRIDETO12, + TRIGGERGAPOVERRIDETO13, + TRIGGERGAPOVERRIDETO14, + TRIGGERGAPOVERRIDETO15, + TRIGGERGAPOVERRIDETO16, + TRIGGERGAPOVERRIDETO17, + TRIGGERGAPOVERRIDETO18, WARNING_MESSAGE, BOOSTTABLEOPENLOOP, BOOSTTABLECLOSEDLOOP, diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 40939e4603..8b4b5b350e 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +