diff --git a/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures.h index 1d90e25701..5e2836bd91 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Mon Nov 27 04:25:20 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:22:28 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -738,13 +738,13 @@ struct engine_configuration_s { bool allowIdenticalPps : 1 {}; /** offset 120 bit 29 */ - bool unusedBit_44_29 : 1 {}; + bool overrideVvtTriggerGaps : 1 {}; /** offset 120 bit 30 */ - bool unusedBit_44_30 : 1 {}; + bool unused30 : 1 {}; /** offset 120 bit 31 */ - bool unusedBit_44_31 : 1 {}; + bool unused31 : 1 {}; /** * Closed throttle, 1 volt = 200 units. * See also tps1_1AdcChannel @@ -1243,11 +1243,11 @@ struct engine_configuration_s { */ pin_output_mode_e fuelPumpPinMode; /** - * need 4 byte alignment - units + * How many consecutive VVT gap rations have to match expected ranges for sync to happen + count * offset 619 */ - uint8_t alignmentFill_at_619[1]; + int8_t gapVvtTrackingLengthOverride; /** * Check engine light, also malfunction indicator light. Always blinks once on boot. * offset 620 @@ -4450,10 +4450,24 @@ struct engine_configuration_s { */ uint8_t simulatorCamPosition[CAM_INPUTS_COUNT]; /** - units * offset 4314 */ - uint8_t mainUnusedEnd[242]; + uint16_t unusedExplicitFilling2; + /** + ratio + * offset 4316 + */ + float triggerVVTGapOverrideFrom[VVT_TRACKING_LENGTH]; + /** + ratio + * offset 4332 + */ + float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; + /** + units + * offset 4348 + */ + uint8_t mainUnusedEnd[208]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5365,4 +5379,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 23880); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Mon Nov 27 04:25:20 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:22:28 UTC 2023 diff --git a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h index ca62162366..ce7ff9ea34 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -818,7 +818,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 926563551 +#define SIGNATURE_HASH 3749130979 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1116,7 +1116,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.11.30.cypress.926563551" +#define TS_SIGNATURE "rusEFI master.2023.11.30.cypress.3749130979" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' @@ -1191,5 +1191,6 @@ #define vvt_mode_e_VVT_SINGLE_TOOTH 1 #define vvt_mode_e_VVT_TOYOTA_3_TOOTH 2 #define vvt_mode_e_VVT_TOYOTA_4_1 6 +#define VVT_TRACKING_LENGTH 4 #define WARNING_BUFFER_SIZE 120 #define WWAE_TABLE_SIZE 8 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 f1af7a1b95..c9f82b616a 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 config_definition.jar based on (unknown script) integration/rusefi_config.txt Mon Nov 27 04:25:19 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:22:27 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -738,13 +738,13 @@ struct engine_configuration_s { bool allowIdenticalPps : 1 {}; /** offset 120 bit 29 */ - bool unusedBit_44_29 : 1 {}; + bool overrideVvtTriggerGaps : 1 {}; /** offset 120 bit 30 */ - bool unusedBit_44_30 : 1 {}; + bool unused30 : 1 {}; /** offset 120 bit 31 */ - bool unusedBit_44_31 : 1 {}; + bool unused31 : 1 {}; /** * Closed throttle, 1 volt = 200 units. * See also tps1_1AdcChannel @@ -1243,11 +1243,11 @@ struct engine_configuration_s { */ pin_output_mode_e fuelPumpPinMode; /** - * need 4 byte alignment - units + * How many consecutive VVT gap rations have to match expected ranges for sync to happen + count * offset 619 */ - uint8_t alignmentFill_at_619[1]; + int8_t gapVvtTrackingLengthOverride; /** * Check engine light, also malfunction indicator light. Always blinks once on boot. * offset 620 @@ -4450,10 +4450,24 @@ struct engine_configuration_s { */ uint8_t simulatorCamPosition[CAM_INPUTS_COUNT]; /** - units * offset 4314 */ - uint8_t mainUnusedEnd[242]; + uint16_t unusedExplicitFilling2; + /** + ratio + * offset 4316 + */ + float triggerVVTGapOverrideFrom[VVT_TRACKING_LENGTH]; + /** + ratio + * offset 4332 + */ + float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; + /** + units + * offset 4348 + */ + uint8_t mainUnusedEnd[208]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5365,4 +5379,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22504); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Mon Nov 27 04:25:19 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:22:27 UTC 2023 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 e6d188d539..433528edc3 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -818,7 +818,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 1978399601 +#define SIGNATURE_HASH 2644964685 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1116,7 +1116,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.11.30.kin.1978399601" +#define TS_SIGNATURE "rusEFI master.2023.11.30.kin.2644964685" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' @@ -1191,5 +1191,6 @@ #define vvt_mode_e_VVT_SINGLE_TOOTH 1 #define vvt_mode_e_VVT_TOYOTA_3_TOOTH 2 #define vvt_mode_e_VVT_TOYOTA_4_1 6 +#define VVT_TRACKING_LENGTH 4 #define WARNING_BUFFER_SIZE 120 #define WWAE_TABLE_SIZE 8 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 8625abfb0d..33b2b2035c 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 config_definition.jar based on (unknown script) integration/rusefi_config.txt Mon Nov 27 04:25:21 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:22:29 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -738,13 +738,13 @@ struct engine_configuration_s { bool allowIdenticalPps : 1 {}; /** offset 120 bit 29 */ - bool unusedBit_44_29 : 1 {}; + bool overrideVvtTriggerGaps : 1 {}; /** offset 120 bit 30 */ - bool unusedBit_44_30 : 1 {}; + bool unused30 : 1 {}; /** offset 120 bit 31 */ - bool unusedBit_44_31 : 1 {}; + bool unused31 : 1 {}; /** * Closed throttle, 1 volt = 200 units. * See also tps1_1AdcChannel @@ -1243,11 +1243,11 @@ struct engine_configuration_s { */ pin_output_mode_e fuelPumpPinMode; /** - * need 4 byte alignment - units + * How many consecutive VVT gap rations have to match expected ranges for sync to happen + count * offset 619 */ - uint8_t alignmentFill_at_619[1]; + int8_t gapVvtTrackingLengthOverride; /** * Check engine light, also malfunction indicator light. Always blinks once on boot. * offset 620 @@ -4450,10 +4450,24 @@ struct engine_configuration_s { */ uint8_t simulatorCamPosition[CAM_INPUTS_COUNT]; /** - units * offset 4314 */ - uint8_t mainUnusedEnd[242]; + uint16_t unusedExplicitFilling2; + /** + ratio + * offset 4316 + */ + float triggerVVTGapOverrideFrom[VVT_TRACKING_LENGTH]; + /** + ratio + * offset 4332 + */ + float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; + /** + units + * offset 4348 + */ + uint8_t mainUnusedEnd[208]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5365,4 +5379,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 23880); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Mon Nov 27 04:25:21 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:22:29 UTC 2023 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 eb6faed654..f027ae40dd 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 @@ -1056,7 +1056,7 @@ #define show_Frankenso_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 817363912 +#define SIGNATURE_HASH 3640325620 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1354,7 +1354,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.11.30.subaru_eg33_f7.817363912" +#define TS_SIGNATURE "rusEFI master.2023.11.30.subaru_eg33_f7.3640325620" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' @@ -1429,5 +1429,6 @@ #define vvt_mode_e_VVT_SINGLE_TOOTH 1 #define vvt_mode_e_VVT_TOYOTA_3_TOOTH 2 #define vvt_mode_e_VVT_TOYOTA_4_1 6 +#define VVT_TRACKING_LENGTH 4 #define WARNING_BUFFER_SIZE 120 #define WWAE_TABLE_SIZE 8 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index ea3df8bf67..a9df10f9f5 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 config_definition.jar based on (unknown script) integration/rusefi_config.txt Mon Nov 27 04:27:06 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:24:13 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -738,13 +738,13 @@ struct engine_configuration_s { bool allowIdenticalPps : 1 {}; /** offset 120 bit 29 */ - bool unusedBit_44_29 : 1 {}; + bool overrideVvtTriggerGaps : 1 {}; /** offset 120 bit 30 */ - bool unusedBit_44_30 : 1 {}; + bool unused30 : 1 {}; /** offset 120 bit 31 */ - bool unusedBit_44_31 : 1 {}; + bool unused31 : 1 {}; /** * Closed throttle, 1 volt = 200 units. * See also tps1_1AdcChannel @@ -1243,11 +1243,11 @@ struct engine_configuration_s { */ pin_output_mode_e fuelPumpPinMode; /** - * need 4 byte alignment - units + * How many consecutive VVT gap rations have to match expected ranges for sync to happen + count * offset 619 */ - uint8_t alignmentFill_at_619[1]; + int8_t gapVvtTrackingLengthOverride; /** * Check engine light, also malfunction indicator light. Always blinks once on boot. * offset 620 @@ -4450,10 +4450,24 @@ struct engine_configuration_s { */ uint8_t simulatorCamPosition[CAM_INPUTS_COUNT]; /** - units * offset 4314 */ - uint8_t mainUnusedEnd[242]; + uint16_t unusedExplicitFilling2; + /** + ratio + * offset 4316 + */ + float triggerVVTGapOverrideFrom[VVT_TRACKING_LENGTH]; + /** + ratio + * offset 4332 + */ + float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; + /** + units + * offset 4348 + */ + uint8_t mainUnusedEnd[208]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5365,4 +5379,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 23880); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Mon Nov 27 04:27:06 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:24:13 UTC 2023 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index a179193462..1090f0284a 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1144,7 +1144,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 2739034009 +#define SIGNATURE_HASH 1259297189 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1442,7 +1442,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.11.30.f407-discovery.2739034009" +#define TS_SIGNATURE "rusEFI master.2023.11.30.f407-discovery.1259297189" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' @@ -1517,5 +1517,6 @@ #define vvt_mode_e_VVT_SINGLE_TOOTH 1 #define vvt_mode_e_VVT_TOYOTA_3_TOOTH 2 #define vvt_mode_e_VVT_TOYOTA_4_1 6 +#define VVT_TRACKING_LENGTH 4 #define WARNING_BUFFER_SIZE 120 #define WWAE_TABLE_SIZE 8 diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 7291588275..76eaf769ce 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1196394712 -#define TS_SIGNATURE "rusEFI master.2023.11.30.alphax-2chan.1196394712" +#define SIGNATURE_HASH 2936178404 +#define TS_SIGNATURE "rusEFI master.2023.11.30.alphax-2chan.2936178404" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 8f65926b65..e496b35af0 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4012028430 -#define TS_SIGNATURE "rusEFI master.2023.11.30.alphax-4chan.4012028430" +#define SIGNATURE_HASH 124763186 +#define TS_SIGNATURE "rusEFI master.2023.11.30.alphax-4chan.124763186" diff --git a/firmware/controllers/generated/signature_alphax-4chan_f7.h b/firmware/controllers/generated/signature_alphax-4chan_f7.h index 999a46d51f..c749cabc31 100644 --- a/firmware/controllers/generated/signature_alphax-4chan_f7.h +++ b/firmware/controllers/generated/signature_alphax-4chan_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4012028430 -#define TS_SIGNATURE "rusEFI master.2023.11.30.alphax-4chan_f7.4012028430" +#define SIGNATURE_HASH 124763186 +#define TS_SIGNATURE "rusEFI master.2023.11.30.alphax-4chan_f7.124763186" diff --git a/firmware/controllers/generated/signature_alphax-8chan-revA.h b/firmware/controllers/generated/signature_alphax-8chan-revA.h index 19301b26d2..e0ced35000 100644 --- a/firmware/controllers/generated/signature_alphax-8chan-revA.h +++ b/firmware/controllers/generated/signature_alphax-8chan-revA.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 113894108 -#define TS_SIGNATURE "rusEFI master.2023.11.30.alphax-8chan-revA.113894108" +#define SIGNATURE_HASH 4001688800 +#define TS_SIGNATURE "rusEFI master.2023.11.30.alphax-8chan-revA.4001688800" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index eeebb0de6a..24dddd0e4b 100644 --- a/firmware/controllers/generated/signature_alphax-8chan.h +++ b/firmware/controllers/generated/signature_alphax-8chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3647854463 -#define TS_SIGNATURE "rusEFI master.2023.11.30.alphax-8chan.3647854463" +#define SIGNATURE_HASH 824236355 +#define TS_SIGNATURE "rusEFI master.2023.11.30.alphax-8chan.824236355" diff --git a/firmware/controllers/generated/signature_alphax-8chan_f7.h b/firmware/controllers/generated/signature_alphax-8chan_f7.h index 49e53f69b0..98295e4815 100644 --- a/firmware/controllers/generated/signature_alphax-8chan_f7.h +++ b/firmware/controllers/generated/signature_alphax-8chan_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3647854463 -#define TS_SIGNATURE "rusEFI master.2023.11.30.alphax-8chan_f7.3647854463" +#define SIGNATURE_HASH 824236355 +#define TS_SIGNATURE "rusEFI master.2023.11.30.alphax-8chan_f7.824236355" diff --git a/firmware/controllers/generated/signature_at_start_f435.h b/firmware/controllers/generated/signature_at_start_f435.h index 081ffa6324..05fdcf21db 100644 --- a/firmware/controllers/generated/signature_at_start_f435.h +++ b/firmware/controllers/generated/signature_at_start_f435.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 926563551 -#define TS_SIGNATURE "rusEFI master.2023.11.30.at_start_f435.926563551" +#define SIGNATURE_HASH 3749130979 +#define TS_SIGNATURE "rusEFI master.2023.11.30.at_start_f435.3749130979" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 248561f931..75f7e223f5 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1933437073 -#define TS_SIGNATURE "rusEFI master.2023.11.30.atlas.1933437073" +#define SIGNATURE_HASH 2607867565 +#define TS_SIGNATURE "rusEFI master.2023.11.30.atlas.2607867565" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index fd61c0f04a..51b04f7a1d 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 253571433 -#define TS_SIGNATURE "rusEFI master.2023.11.30.core8.253571433" +#define SIGNATURE_HASH 3880795989 +#define TS_SIGNATURE "rusEFI master.2023.11.30.core8.3880795989" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index 69be1929a6..6857e7e2a6 100644 --- a/firmware/controllers/generated/signature_cypress.h +++ b/firmware/controllers/generated/signature_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on hellen_cypress_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH 926563551 -#define TS_SIGNATURE "rusEFI master.2023.11.30.cypress.926563551" +#define SIGNATURE_HASH 3749130979 +#define TS_SIGNATURE "rusEFI master.2023.11.30.cypress.3749130979" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 4c5a47fe10..6e9ca90caf 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2739034009 -#define TS_SIGNATURE "rusEFI master.2023.11.30.f407-discovery.2739034009" +#define SIGNATURE_HASH 1259297189 +#define TS_SIGNATURE "rusEFI master.2023.11.30.f407-discovery.1259297189" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index edede120c5..b1054be571 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 926563551 -#define TS_SIGNATURE "rusEFI master.2023.11.30.f429-discovery.926563551" +#define SIGNATURE_HASH 3749130979 +#define TS_SIGNATURE "rusEFI master.2023.11.30.f429-discovery.3749130979" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 9c4695aa96..59d68afccd 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 359193621 -#define TS_SIGNATURE "rusEFI master.2023.11.30.frankenso_na6.359193621" +#define SIGNATURE_HASH 4247114281 +#define TS_SIGNATURE "rusEFI master.2023.11.30.frankenso_na6.4247114281" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index 36515bfaea..550298ff9f 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4147374807 -#define TS_SIGNATURE "rusEFI master.2023.11.30.harley81.4147374807" +#define SIGNATURE_HASH 528409835 +#define TS_SIGNATURE "rusEFI master.2023.11.30.harley81.528409835" diff --git a/firmware/controllers/generated/signature_hellen-112-17.h b/firmware/controllers/generated/signature_hellen-112-17.h index 9acc6aa6fa..db714394fc 100644 --- a/firmware/controllers/generated/signature_hellen-112-17.h +++ b/firmware/controllers/generated/signature_hellen-112-17.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1370057203 -#define TS_SIGNATURE "rusEFI master.2023.11.30.hellen-112-17.1370057203" +#define SIGNATURE_HASH 3118753743 +#define TS_SIGNATURE "rusEFI master.2023.11.30.hellen-112-17.3118753743" diff --git a/firmware/controllers/generated/signature_hellen-112-mg1.h b/firmware/controllers/generated/signature_hellen-112-mg1.h index 5d356d1448..33c87bdb3f 100644 --- a/firmware/controllers/generated/signature_hellen-112-mg1.h +++ b/firmware/controllers/generated/signature_hellen-112-mg1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3850711437 -#define TS_SIGNATURE "rusEFI master.2023.11.30.hellen-112-mg1.3850711437" +#define SIGNATURE_HASH 231227313 +#define TS_SIGNATURE "rusEFI master.2023.11.30.hellen-112-mg1.231227313" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 494ab7689b..6fc3b90501 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2278066735 -#define TS_SIGNATURE "rusEFI master.2023.11.30.hellen-gm-e67.2278066735" +#define SIGNATURE_HASH 1871021075 +#define TS_SIGNATURE "rusEFI master.2023.11.30.hellen-gm-e67.1871021075" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index de804caf65..bd70391d43 100644 --- a/firmware/controllers/generated/signature_hellen-honda-k.h +++ b/firmware/controllers/generated/signature_hellen-honda-k.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4007265020 -#define TS_SIGNATURE "rusEFI master.2023.11.30.hellen-honda-k.4007265020" +#define SIGNATURE_HASH 110562496 +#define TS_SIGNATURE "rusEFI master.2023.11.30.hellen-honda-k.110562496" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 51e08a38ed..3679aa74a8 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1492660680 -#define TS_SIGNATURE "rusEFI master.2023.11.30.hellen-nb1.1492660680" +#define SIGNATURE_HASH 2964668404 +#define TS_SIGNATURE "rusEFI master.2023.11.30.hellen-nb1.2964668404" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 09c82e6a82..6a17b29c79 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2920078059 -#define TS_SIGNATURE "rusEFI master.2023.11.30.hellen121nissan.2920078059" +#define SIGNATURE_HASH 1178719447 +#define TS_SIGNATURE "rusEFI master.2023.11.30.hellen121nissan.1178719447" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index c09a223190..194a6522ba 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2739151644 -#define TS_SIGNATURE "rusEFI master.2023.11.30.hellen121vag.2739151644" +#define SIGNATURE_HASH 1258892576 +#define TS_SIGNATURE "rusEFI master.2023.11.30.hellen121vag.1258892576" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index a58d7db2bd..98e58e182b 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4176001973 -#define TS_SIGNATURE "rusEFI master.2023.11.30.hellen128.4176001973" +#define SIGNATURE_HASH 279295369 +#define TS_SIGNATURE "rusEFI master.2023.11.30.hellen128.279295369" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index a317dba2f6..ef34638529 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3866703461 -#define TS_SIGNATURE "rusEFI master.2023.11.30.hellen154hyundai.3866703461" +#define SIGNATURE_HASH 238303321 +#define TS_SIGNATURE "rusEFI master.2023.11.30.hellen154hyundai.238303321" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 91d36e28ae..9e79cd4c39 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1534999282 -#define TS_SIGNATURE "rusEFI master.2023.11.30.hellen72.1534999282" +#define SIGNATURE_HASH 3006477518 +#define TS_SIGNATURE "rusEFI master.2023.11.30.hellen72.3006477518" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 6b11857a0c..9730837b43 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3932802736 -#define TS_SIGNATURE "rusEFI master.2023.11.30.hellen81.3932802736" +#define SIGNATURE_HASH 35963020 +#define TS_SIGNATURE "rusEFI master.2023.11.30.hellen81.35963020" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 5258e6fe02..d59546c26f 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3642732827 -#define TS_SIGNATURE "rusEFI master.2023.11.30.hellen88bmw.3642732827" +#define SIGNATURE_HASH 827506471 +#define TS_SIGNATURE "rusEFI master.2023.11.30.hellen88bmw.827506471" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 55162d49ea..5972ebd23f 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3694633211 -#define TS_SIGNATURE "rusEFI master.2023.11.30.hellenNA6.3694633211" +#define SIGNATURE_HASH 880455367 +#define TS_SIGNATURE "rusEFI master.2023.11.30.hellenNA6.880455367" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index bceb70934b..42f05a82ac 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3130437684 -#define TS_SIGNATURE "rusEFI master.2023.11.30.hellenNA8_96.3130437684" +#define SIGNATURE_HASH 1390132744 +#define TS_SIGNATURE "rusEFI master.2023.11.30.hellenNA8_96.1390132744" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 9c2f3cb383..f474c792f2 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on kinetis_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH 1978399601 -#define TS_SIGNATURE "rusEFI master.2023.11.30.kin.1978399601" +#define SIGNATURE_HASH 2644964685 +#define TS_SIGNATURE "rusEFI master.2023.11.30.kin.2644964685" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index db6bf376b5..ff628c1ca9 100644 --- a/firmware/controllers/generated/signature_m74_9.h +++ b/firmware/controllers/generated/signature_m74_9.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2952006006 -#define TS_SIGNATURE "rusEFI master.2023.11.30.m74_9.2952006006" +#define SIGNATURE_HASH 1203308362 +#define TS_SIGNATURE "rusEFI master.2023.11.30.m74_9.1203308362" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 6098ef6d35..7189d7c7ce 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 341300575 -#define TS_SIGNATURE "rusEFI master.2023.11.30.mre_f4.341300575" +#define SIGNATURE_HASH 4229618531 +#define TS_SIGNATURE "rusEFI master.2023.11.30.mre_f4.4229618531" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 242676ff8f..e4c51ee880 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 341300575 -#define TS_SIGNATURE "rusEFI master.2023.11.30.mre_f7.341300575" +#define SIGNATURE_HASH 4229618531 +#define TS_SIGNATURE "rusEFI master.2023.11.30.mre_f7.4229618531" diff --git a/firmware/controllers/generated/signature_nucleo_f429.h b/firmware/controllers/generated/signature_nucleo_f429.h index 893805b3fb..95d34c585b 100644 --- a/firmware/controllers/generated/signature_nucleo_f429.h +++ b/firmware/controllers/generated/signature_nucleo_f429.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 926563551 -#define TS_SIGNATURE "rusEFI master.2023.11.30.nucleo_f429.926563551" +#define SIGNATURE_HASH 3749130979 +#define TS_SIGNATURE "rusEFI master.2023.11.30.nucleo_f429.3749130979" diff --git a/firmware/controllers/generated/signature_nucleo_f767.h b/firmware/controllers/generated/signature_nucleo_f767.h index 6d0a101765..20ad15facb 100644 --- a/firmware/controllers/generated/signature_nucleo_f767.h +++ b/firmware/controllers/generated/signature_nucleo_f767.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 926563551 -#define TS_SIGNATURE "rusEFI master.2023.11.30.nucleo_f767.926563551" +#define SIGNATURE_HASH 3749130979 +#define TS_SIGNATURE "rusEFI master.2023.11.30.nucleo_f767.3749130979" diff --git a/firmware/controllers/generated/signature_nucleo_h743.h b/firmware/controllers/generated/signature_nucleo_h743.h index 9a1afe219f..1c7bcea702 100644 --- a/firmware/controllers/generated/signature_nucleo_h743.h +++ b/firmware/controllers/generated/signature_nucleo_h743.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 926563551 -#define TS_SIGNATURE "rusEFI master.2023.11.30.nucleo_h743.926563551" +#define SIGNATURE_HASH 3749130979 +#define TS_SIGNATURE "rusEFI master.2023.11.30.nucleo_h743.3749130979" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index df7e6a78ef..2e1f276c06 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 128905551 -#define TS_SIGNATURE "rusEFI master.2023.11.30.prometheus_405.128905551" +#define SIGNATURE_HASH 4024696691 +#define TS_SIGNATURE "rusEFI master.2023.11.30.prometheus_405.4024696691" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 244363bf43..f6ef59ce3b 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 128905551 -#define TS_SIGNATURE "rusEFI master.2023.11.30.prometheus_469.128905551" +#define SIGNATURE_HASH 4024696691 +#define TS_SIGNATURE "rusEFI master.2023.11.30.prometheus_469.4024696691" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 2dc965346d..db4dd953ca 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 925483685 -#define TS_SIGNATURE "rusEFI master.2023.11.30.proteus_f4.925483685" +#define SIGNATURE_HASH 3747925145 +#define TS_SIGNATURE "rusEFI master.2023.11.30.proteus_f4.3747925145" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 6e9ef49065..d8a364d9ff 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 925483685 -#define TS_SIGNATURE "rusEFI master.2023.11.30.proteus_f7.925483685" +#define SIGNATURE_HASH 3747925145 +#define TS_SIGNATURE "rusEFI master.2023.11.30.proteus_f7.3747925145" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 85c617c97e..00b1edd02f 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 925483685 -#define TS_SIGNATURE "rusEFI master.2023.11.30.proteus_h7.925483685" +#define SIGNATURE_HASH 3747925145 +#define TS_SIGNATURE "rusEFI master.2023.11.30.proteus_h7.3747925145" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index 80f96f731f..ad5792f9e5 100644 --- a/firmware/controllers/generated/signature_s105.h +++ b/firmware/controllers/generated/signature_s105.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1477565625 -#define TS_SIGNATURE "rusEFI master.2023.11.30.s105.1477565625" +#define SIGNATURE_HASH 2958873221 +#define TS_SIGNATURE "rusEFI master.2023.11.30.s105.2958873221" diff --git a/firmware/controllers/generated/signature_small-can-board.h b/firmware/controllers/generated/signature_small-can-board.h index a46840e6fe..957ca89756 100644 --- a/firmware/controllers/generated/signature_small-can-board.h +++ b/firmware/controllers/generated/signature_small-can-board.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 984219859 -#define TS_SIGNATURE "rusEFI master.2023.11.30.small-can-board.984219859" +#define SIGNATURE_HASH 3538357999 +#define TS_SIGNATURE "rusEFI master.2023.11.30.small-can-board.3538357999" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index ba8dcce258..8070d36f7b 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 817363912 -#define TS_SIGNATURE "rusEFI master.2023.11.30.subaru_eg33_f7.817363912" +#define SIGNATURE_HASH 3640325620 +#define TS_SIGNATURE "rusEFI master.2023.11.30.subaru_eg33_f7.3640325620" diff --git a/firmware/controllers/generated/signature_t-b-g.h b/firmware/controllers/generated/signature_t-b-g.h index 3626c5b8ac..f5ebb4a6c7 100644 --- a/firmware/controllers/generated/signature_t-b-g.h +++ b/firmware/controllers/generated/signature_t-b-g.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 926563551 -#define TS_SIGNATURE "rusEFI master.2023.11.30.t-b-g.926563551" +#define SIGNATURE_HASH 3749130979 +#define TS_SIGNATURE "rusEFI master.2023.11.30.t-b-g.3749130979" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 26d65629f4..813255ad90 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3180597501 -#define TS_SIGNATURE "rusEFI master.2023.11.30.tdg-pdm8.3180597501" +#define SIGNATURE_HASH 1440292545 +#define TS_SIGNATURE "rusEFI master.2023.11.30.tdg-pdm8.1440292545" diff --git a/firmware/controllers/generated/signature_uaefi.h b/firmware/controllers/generated/signature_uaefi.h index 4c5e548088..9446a985b3 100644 --- a/firmware/controllers/generated/signature_uaefi.h +++ b/firmware/controllers/generated/signature_uaefi.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2573691820 -#define TS_SIGNATURE "rusEFI master.2023.11.30.uaefi.2573691820" +#define SIGNATURE_HASH 1898603920 +#define TS_SIGNATURE "rusEFI master.2023.11.30.uaefi.1898603920" diff --git a/firmware/controllers/lua/generated/value_lookup_generated.cpp b/firmware/controllers/lua/generated/value_lookup_generated.cpp index b04601c75b..1de08613c4 100644 --- a/firmware/controllers/lua/generated/value_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/value_lookup_generated.cpp @@ -127,6 +127,9 @@ float getConfigValueByName(const char *name) { // allowIdenticalPps case 445194564: return engineConfiguration->allowIdenticalPps; +// overrideVvtTriggerGaps + case 840966724: + return engineConfiguration->overrideVvtTriggerGaps; // tpsMin case 513872736: return engineConfiguration->tpsMin; @@ -349,6 +352,9 @@ float getConfigValueByName(const char *name) { // vssToothCount case -1958312328: return engineConfiguration->vssToothCount; +// gapVvtTrackingLengthOverride + case -188591438: + return engineConfiguration->gapVvtTrackingLengthOverride; // idle_antiwindupFreq case -524949197: return engineConfiguration->idle_antiwindupFreq; @@ -1942,6 +1948,11 @@ bool setConfigValueByName(const char *name, float value) { { engineConfiguration->allowIdenticalPps = (int)value; return 1; + } + case 840966724: + { + engineConfiguration->overrideVvtTriggerGaps = (int)value; + return 1; } case 513872736: { @@ -2312,6 +2323,11 @@ bool setConfigValueByName(const char *name, float value) { { engineConfiguration->vssToothCount = (int)value; return 1; + } + case -188591438: + { + engineConfiguration->gapVvtTrackingLengthOverride = (int)value; + return 1; } case -524949197: { diff --git a/firmware/controllers/lua/generated/value_lookup_generated.md b/firmware/controllers/lua/generated/value_lookup_generated.md index aaf8ac770f..1e445e7e4f 100644 --- a/firmware/controllers/lua/generated/value_lookup_generated.md +++ b/firmware/controllers/lua/generated/value_lookup_generated.md @@ -121,6 +121,9 @@ On some Ford and Toyota vehicles one of the pedal sensors is not linear on the f ### allowIdenticalPps +### overrideVvtTriggerGaps + + ### tpsMin Closed throttle, 1 volt = 200 units.\nSee also tps1_1AdcChannel\nset tps_min X @@ -343,6 +346,9 @@ Number of turns of your vehicle speed sensor per turn of the wheels. For example ### vssToothCount Number of pulses output per revolution of the shaft where your VSS is mounted. For example, GM applications of the T56 output 17 pulses per revolution of the transmission output shaft. +### gapVvtTrackingLengthOverride +How many consecutive VVT gap rations have to match expected ranges for sync to happen + ### idle_antiwindupFreq 0.1 is a good default value diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 3bf388228d..120d87057d 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.f407-discovery.2739034009" + signature = "rusEFI master.2023.11.30.f407-discovery.1259297189" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.f407-discovery.2739034009" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.f407-discovery.1259297189" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:34:47 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:24:13 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6491,6 +6513,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index f26537694f..486af799fa 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.alphax-2chan.1196394712" + signature = "rusEFI master.2023.11.30.alphax-2chan.2936178404" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.alphax-2chan.1196394712" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.alphax-2chan.2936178404" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","B4 - O2","On-board MAP","INVALID","B5 - TPS","A2 Battery Sense","C7 - CAM Hall/Digital","X7 - AIN4","X1 - AIN1","INVALID","INVALID","B2 - MAP","B7 - CLT","B3 - IAT","X3 - AIN2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:33:03 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:22:31 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6486,6 +6508,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 625eb9c4c6..23e4fe4fe7 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.alphax-4chan.4012028430" + signature = "rusEFI master.2023.11.30.alphax-4chan.124763186" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.alphax-4chan.4012028430" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.alphax-4chan.124763186" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","B4 - O2","On-board MAP","D5 - PPS","B5 - TPS","F7 - Ignition Key Voltage","C7 - CAM Hall/Digital","INVALID","D4 - TPS2","INVALID","X5 - AIN3","B2 - MAP","B7 - CLT","B3 - IAT","F6 - PPS2","X7 - AIN4","INVALID","INVALID","INVALID","X3 - AIN2","X1 - AIN1 and D5 on older boards" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:33:06 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:22:34 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6489,6 +6511,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini index 4671d54435..2fa95f5985 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.alphax-4chan_f7.4012028430" + signature = "rusEFI master.2023.11.30.alphax-4chan_f7.124763186" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.alphax-4chan_f7.4012028430" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.alphax-4chan_f7.124763186" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","B4 - O2","On-board MAP","D5 - PPS","B5 - TPS","F7 - Ignition Key Voltage","C7 - CAM Hall/Digital","INVALID","D4 - TPS2","INVALID","X5 - AIN3","B2 - MAP","B7 - CLT","B3 - IAT","F6 - PPS2","X7 - AIN4","INVALID","INVALID","INVALID","X3 - AIN2","X1 - AIN1 and D5 on older boards" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:33:09 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:22:36 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6489,6 +6511,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini index 943953ec0d..19b9a74e35 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.alphax-8chan-revA.113894108" + signature = "rusEFI master.2023.11.30.alphax-8chan-revA.4001688800" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.alphax-8chan-revA.113894108" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.alphax-8chan-revA.4001688800" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","17A - PPS","23C - TPS","Battery Sense","INVALID","15D - AN5","24C - TPS2","14A - Analog 1","22A - Analog 22","On-board MAP","16A - CLT","15A - IAT","31C - PPS2","33A - AN3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","16D - AN6","INVALID","INVALID","INVALID","INVALID","7C - AT4","INVALID","6C - AT3","14D - AN4" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:33:16 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:22:43 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6490,6 +6512,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index 90aae93ed3..1e5e2fa96a 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.alphax-8chan.3647854463" + signature = "rusEFI master.2023.11.30.alphax-8chan.824236355" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.alphax-8chan.3647854463" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.alphax-8chan.824236355" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","3A - Aux Analog 2","On-board MAP","32A - PPS Sensor Input","31A - TPS Sensor Input","24 - Ignition Key Voltage","INVALID","INVALID","19A - Aux Analog 6","1A - Aux Analog 1","2A - Aux Analog 4","INVALID","29A - CLT Sensor Input","27A - IAT Sensor Input","INVALID","12A - Aux Analog 8","INVALID","11A - Aux Analog 3","INVALID","34A - PPS2 Sensor Input","33A - TPS2 Sensor Input","INVALID","INVALID","INVALID","4A - Aux Analog 7","INVALID","10A - Aux Analog 5","INVALID","28A - Aux Temp 2","28A - Aux Temp 1","INVALID","20A - Aux Analog 9" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 01:09:53 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:22:38 UTC 2023 pageSize = 23896 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1295,7 +1299,16 @@ simulatorCamPosition1 = scalar, U08, 4326, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4327, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4328, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4329, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4330, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4330, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4348, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4352, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4356, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4360, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4364, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4572, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4604, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4636, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1681,6 +1694,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23886, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2241,6 +2255,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23886, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6493,6 +6515,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini index f442c3434e..6a1967bf36 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.alphax-8chan_f7.3647854463" + signature = "rusEFI master.2023.11.30.alphax-8chan_f7.824236355" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.alphax-8chan_f7.3647854463" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.alphax-8chan_f7.824236355" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","3A - Aux Analog 2","On-board MAP","32A - PPS Sensor Input","31A - TPS Sensor Input","24 - Ignition Key Voltage","INVALID","INVALID","19A - Aux Analog 6","1A - Aux Analog 1","2A - Aux Analog 4","INVALID","29A - CLT Sensor Input","27A - IAT Sensor Input","INVALID","12A - Aux Analog 8","INVALID","11A - Aux Analog 3","INVALID","34A - PPS2 Sensor Input","33A - TPS2 Sensor Input","INVALID","INVALID","INVALID","4A - Aux Analog 7","INVALID","10A - Aux Analog 5","INVALID","28A - Aux Temp 2","28A - Aux Temp 1","INVALID","20A - Aux Analog 9" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 01:09:55 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:22:41 UTC 2023 pageSize = 23896 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1295,7 +1299,16 @@ simulatorCamPosition1 = scalar, U08, 4326, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4327, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4328, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4329, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4330, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4330, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4348, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4352, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4356, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4360, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4364, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4572, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4604, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4636, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1681,6 +1694,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23886, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2241,6 +2255,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23886, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6493,6 +6515,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_at_start_f435.ini b/firmware/tunerstudio/generated/rusefi_at_start_f435.ini index 28f9d88c26..3288277c8c 100644 --- a/firmware/tunerstudio/generated/rusefi_at_start_f435.ini +++ b/firmware/tunerstudio/generated/rusefi_at_start_f435.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.at_start_f435.926563551" + signature = "rusEFI master.2023.11.30.at_start_f435.3749130979" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.at_start_f435.926563551" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.at_start_f435.3749130979" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:34:43 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:24:09 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6488,6 +6510,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index c2c7ade069..0ad952ccab 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.atlas.1933437073" + signature = "rusEFI master.2023.11.30.atlas.2607867565" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.atlas.1933437073" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.atlas.2607867565" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:34:36 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:24:02 UTC 2023 pageSize = 23380 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4150, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4151, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4152, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4153, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4154, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4154, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4156, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4160, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4164, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4168, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4172, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4176, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4180, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4184, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4188, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4396, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4428, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4460, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23370, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23370, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6488,6 +6510,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index e7d04d5c12..6c5306e08e 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.core8.253571433" + signature = "rusEFI master.2023.11.30.core8.3880795989" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.core8.253571433" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.core8.3880795989" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","On-board Battery Sense (A0)","Analog Inputs 1 (A1)","Analog Inputs 2 (A2)","Analog Inputs 3 (A3)","Analog Inputs 4 (A4)","On-board MAP (A5)","Analog Inputs 6 (A6)","Analog Inputs 7 (A7)","On-board BARO (B0)","Analog Inputs 9 (B1)","Analog Inputs 10 (C0)","Primary On-board O2 (C1)","Secondary On-board O2 (C2)","Analog Inputs 13 (C3)","Analog Inputs 14 (C4)","Analog Inputs 15 (C5)" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:34:03 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:23:30 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6490,6 +6512,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index cb97933a10..524d6c08ed 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.cypress.926563551" + signature = "rusEFI master.2023.11.30.cypress.3749130979" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.cypress.926563551" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.cypress.3749130979" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:33:00 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:22:28 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6488,6 +6510,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index b644e01ce3..7a762ef476 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.f407-discovery.2739034009" + signature = "rusEFI master.2023.11.30.f407-discovery.1259297189" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.f407-discovery.2739034009" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.f407-discovery.1259297189" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:34:41 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:24:07 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6491,6 +6513,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 9358f238d1..d12282dbbc 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.f429-discovery.926563551" + signature = "rusEFI master.2023.11.30.f429-discovery.3749130979" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.f429-discovery.926563551" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.f429-discovery.3749130979" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:34:27 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:23:54 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6488,6 +6510,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index b777de984f..13d840eb4f 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.frankenso_na6.359193621" + signature = "rusEFI master.2023.11.30.frankenso_na6.4247114281" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.frankenso_na6.359193621" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.frankenso_na6.4247114281" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog 3O","Analog 3L","Analog 3M","Analog 3J","Analog 3I","INVALID","Analog 3H","Analog 3G","INVALID","INVALID","INVALID","Analog 3P","Analog 3Q","Analog 3N","Analog VBatt","Analog 3E" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:34:13 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:23:39 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6488,6 +6510,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 63bfb03f00..ff66624504 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.harley81.4147374807" + signature = "rusEFI master.2023.11.30.harley81.528409835" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.harley81.4147374807" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.harley81.528409835" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","27 - TPS 2","INVALID","41 - PPS 1","52 - TPS 1","5 Battery Sense","INVALID","INVALID","42 - PPS 2","INVALID","53 - MAP","55 Engine Head Temperature","49 CLT","72 IAT","32 Oil Pressure","34 Kickstand Position Sensor" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:33:18 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:22:46 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6488,6 +6510,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini index 26b273a741..8aa10e1d18 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.hellen-112-17.1370057203" + signature = "rusEFI master.2023.11.30.hellen-112-17.3118753743" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.hellen-112-17.1370057203" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.hellen-112-17.3118753743" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","220 TPS Throttle Position 2","114 Analog Input","INVALID","121 PPS1","203 TPS Throttle Position 1","INVALID","107 TODO","119 Analog Input","110 Analog Input","INVALID","219 MAP","109 Analog Input","215 CLT","227 IAT","111 Analog Input","112 Analog Input" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:33:37 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:23:04 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6487,6 +6509,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_hellen-112-mg1.ini b/firmware/tunerstudio/generated/rusefi_hellen-112-mg1.ini index 4a11cd5a36..738e42dee6 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-112-mg1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-112-mg1.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.hellen-112-mg1.3850711437" + signature = "rusEFI master.2023.11.30.hellen-112-mg1.231227313" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.hellen-112-mg1.3850711437" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.hellen-112-mg1.231227313" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:33:39 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:23:07 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6487,6 +6509,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index a6daba2fe6..498fa3eee4 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.hellen-gm-e67.2278066735" + signature = "rusEFI master.2023.11.30.hellen-gm-e67.1871021075" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.hellen-gm-e67.2278066735" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.hellen-gm-e67.1871021075" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","C2-60 - Oil Pressure","C3-58 - Baro","C1-47 - PPS1","C2-64 - TPS1","C1-19 Battery Sense","C1-45 Secondary Fuel Level","C3-57 - A/C Pressure","C2-66 - TPS2","C1-44 Primary Fuel Level","C2-65 - Trans Fluids","C3-59 - MAP","C3-55 - CLT","C3-56 - IAT","C1-49 - PPS2","C1-46 Vac Sense" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:33:49 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:23:16 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6489,6 +6511,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini index 83de3c8db6..155c7344b6 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.hellen-honda-k.4007265020" + signature = "rusEFI master.2023.11.30.hellen-honda-k.110562496" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.hellen-honda-k.4007265020" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.hellen-honda-k.110562496" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","INVALID","A15 TPS","E9 Ignition Key Voltage","INVALID","INVALID","Aux Analog 1","INVALID","A19 - MAP","INVALID","B8 - CLT","B17 IAT","Aux Analog 2","Aux Analog 3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:33:28 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:22:55 UTC 2023 pageSize = 24552 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 24542, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 24542, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6486,6 +6508,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 7c5814fa84..ea8ace861d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.hellen-nb1.1492660680" + signature = "rusEFI master.2023.11.30.hellen-nb1.2964668404" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.hellen-nb1.1492660680" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.hellen-nb1.2964668404" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","2C - O2S","TPS1","intMAP","1G - Steering/RES2","3E - TPS","1B - Battery Sense","2H - CAM","3S - EGR BOOST IN","2A - Pressure Input","2J - CRANK","2L - MAF","3D - MAP","2E - Coolant","2B - IAT","4C - IN TEMP/PPS2","1P - AC Switch" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:33:46 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:23:14 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6489,6 +6511,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 2230695207..d7adce1b52 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.hellen121nissan.2920078059" + signature = "rusEFI master.2023.11.30.hellen121nissan.1178719447" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.hellen121nissan.2920078059" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.hellen121nissan.1178719447" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","51 - MAF","INVALID","Aux P68","106 - PPS 1","50 - TPS 1","109 Ignition Key Voltage","INVALID","INVALID","69 - TPS 2","INVALID","Aux P66","Aux P67","73 - CLT","34 - IAT","98 - PPS 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:33:25 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:22:53 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6486,6 +6508,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index ae3ea0b669..d0acbd1c43 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.hellen121vag.2739151644" + signature = "rusEFI master.2023.11.30.hellen121vag.1258892576" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.hellen121vag.2739151644" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.hellen121vag.1258892576" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","14 - O2","INVALID","INVALID","34 In PPS1","92 - TPS 1","106 - KNOCK","86 - CAM1","87 - CAM2","84 - TPS2","INVALID","29 In Maf","101 - MAP2","93 - CLT","85 - IAT","35 In PPS2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:33:23 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:22:50 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6489,6 +6511,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index ab7bfa7ffe..ce6dbb5665 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.hellen128.4176001973" + signature = "rusEFI master.2023.11.30.hellen128.279295369" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.hellen128.4176001973" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.hellen128.279295369" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","P36_IN_O2S","P32_IN_O2S2","P40_IN_MAP3","C24 - PPS1","E31 - TPS1","Battery Sense","E40 - IN_CAM","P30_IN_AUX4","E34 - TPS2","E37 - Crank Input","E47 - MAF","E23 - MAP","E29 - Coolant Temp","E45 - IAT","C25 - PPS2","P41_IN_AUX3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:33:21 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:22:48 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6488,6 +6510,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index b99dc5a17c..96c29bce64 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.hellen154hyundai.3866703461" + signature = "rusEFI master.2023.11.30.hellen154hyundai.238303321" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.hellen154hyundai.3866703461" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.hellen154hyundai.238303321" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","K21 Ambient Temperature","K58 Oil Temp","K54 A/C pressure","PPS 1","TPS 1","K2 Ignition Key Voltage","X10 AIN2","INVALID","TPS 2","X11 AIN1","Map Sensor K31","K10 Sensor","CLT","IAT","PPS 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:33:30 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:22:58 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6486,6 +6508,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 5e9ae5f59e..33638ecba1 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.hellen72.1534999282" + signature = "rusEFI master.2023.11.30.hellen72.3006477518" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.hellen72.1534999282" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.hellen72.3006477518" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","5N - TPS2","3L - IGN_7 / AFR","intMAP (A15)","5P - PPS1","4V - TPS (A17)","4S/4T - Alternator voltage","3V - CAM (A19)","4J - VTCS/AUX4 (A20)","4F - AC_PRES/AUX1 (A23)","3Y - CRANK (A24)","4X - MAF (A9)","4U - MAP2/Ign8 (A10)","4P - CLT (A11)","4N - IAT (A14)","5M - PPS2 OR TEMPERATURE SENSOR","4AE - EGR/MAP4 (A22)" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:33:41 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:23:09 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6489,6 +6511,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 8995191293..846be4235f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.hellen81.3932802736" + signature = "rusEFI master.2023.11.30.hellen81.35963020" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.hellen81.3932802736" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.hellen81.35963020" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","18 - IN_O2S","55 - IN_O2S2","41 - IN_MAP3","78 - IN_PPS","16 - IN_TPS","13 - IN_VIGN","79 - IN_CAM","77 - IN_AUX4","74 - IN_AUX1","15 - IN_CRANK (A24)","37 - IN_MAP1","38 - IN_MAP2","39 - IN_CLT","40 - IN_IAT","75 - IN_AUX2","76 - IN_AUX3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:33:44 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:23:12 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6487,6 +6509,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 8351fb83bb..283d470590 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.hellen88bmw.3642732827" + signature = "rusEFI master.2023.11.30.hellen88bmw.827506471" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.hellen88bmw.3642732827" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.hellen88bmw.827506471" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","VIN5","VIN6","INVALID","PPS1","73 - TPS","56 - Battery Sense","17 - CAM","Aux BARO","Aux TPS2","16 - CRANK","41 - MAF","Aux MAP","78 - CLT","77 - IAT","Aux PPS2","Aux TPS3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:33:32 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:23:00 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6488,6 +6510,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index e83f4233b9..0e8e1ba083 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.hellenNA6.3694633211" + signature = "rusEFI master.2023.11.30.hellenNA6.880455367" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.hellenNA6.3694633211" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.hellenNA6.880455367" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","3N - O2S","2N - Temperature Sensor","intMAP (A15)","4I - PPS1","TPS Input","1B - Battery Sense","INVALID","4G - PPS2 OR TEMPERATURE SENSOR","4H - TPS2","INVALID","3O - MAF","2M - Pressure Sensor","3Q - CLT","3P - IAT","1V - Clutch Switch","1Q AC Switch" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:33:51 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:23:19 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6489,6 +6511,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 4a091517e1..3ba976d395 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.hellenNA8_96.3130437684" + signature = "rusEFI master.2023.11.30.hellenNA8_96.1390132744" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.hellenNA8_96.3130437684" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.hellenNA8_96.1390132744" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","2C - O2S","TPS1","intMAP","PPS1","2F - TPS","3B - Battery Sense","3G - CAM","3S - EGR BOOST IN","2A - Pressure Input","3F - CRANK","2B - MAF","INVALID","2G - Coolant","2B - IAT","4C - IN TEMP/PPS2","1K - AC Switch" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:33:53 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:23:21 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6489,6 +6511,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index abc5a976a1..28893e89ad 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.kin.1978399601" + signature = "rusEFI master.2023.11.30.kin.2644964685" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.kin.1978399601" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.kin.2644964685" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA2", "PA3", "INVALID", "PD3", "INVALID", "INVALID", "INVALID", "PB12", "PB13", "INVALID", "PE2", "INVALID", "PC14", "PC15", "PC16", "PC17" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:32:59 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:22:27 UTC 2023 pageSize = 22504 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22494, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 22494, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6488,6 +6510,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index 5eaf89b081..ef161f30ef 100644 --- a/firmware/tunerstudio/generated/rusefi_m74_9.ini +++ b/firmware/tunerstudio/generated/rusefi_m74_9.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.m74_9.2952006006" + signature = "rusEFI master.2023.11.30.m74_9.1203308362" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.m74_9.2952006006" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.m74_9.1203308362" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","IAT sensor signal","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","ETB position sensor 1 signal","ETB position sensor 2 signal" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:34:05 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:23:33 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6489,6 +6511,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 4ff347e579..9a0842c510 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.mre_f4.341300575" + signature = "rusEFI master.2023.11.30.mre_f4.4229618531" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.mre_f4.341300575" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.mre_f4.4229618531" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3 or Hall Input","22 - AN temp 4 or Hall Input","28 - AN volt 10, Aux Reuse","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8, Aux Reuse","40 - AN volt 9, Aux Reuse","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6, Aux Reuse","30 - AN volt 7" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:34:01 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:23:28 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6491,6 +6513,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 0f0507a01b..0f1f634e85 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.mre_f7.341300575" + signature = "rusEFI master.2023.11.30.mre_f7.4229618531" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.mre_f7.341300575" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.mre_f7.4229618531" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3 or Hall Input","22 - AN temp 4 or Hall Input","28 - AN volt 10, Aux Reuse","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8, Aux Reuse","40 - AN volt 9, Aux Reuse","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6, Aux Reuse","30 - AN volt 7" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:33:58 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:23:26 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6491,6 +6513,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini b/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini index ee3dc6946a..68b9430f82 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.nucleo_f429.926563551" + signature = "rusEFI master.2023.11.30.nucleo_f429.3749130979" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.nucleo_f429.926563551" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.nucleo_f429.3749130979" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:34:29 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:23:56 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6488,6 +6510,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini b/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini index 1e2a9af18f..7b216ff036 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.nucleo_f767.926563551" + signature = "rusEFI master.2023.11.30.nucleo_f767.3749130979" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.nucleo_f767.926563551" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.nucleo_f767.3749130979" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:34:31 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:23:58 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6488,6 +6510,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini b/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini index b236c8d99c..5148f54e28 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.nucleo_h743.926563551" + signature = "rusEFI master.2023.11.30.nucleo_h743.3749130979" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.nucleo_h743.926563551" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.nucleo_h743.3749130979" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:34:34 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:24:00 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6488,6 +6510,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 364d0ab978..b93e46e955 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.prometheus_405.128905551" + signature = "rusEFI master.2023.11.30.prometheus_405.4024696691" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.prometheus_405.128905551" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.prometheus_405.4024696691" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:34:17 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:23:44 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6483,6 +6505,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 07c578d540..cfebf00599 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.prometheus_469.128905551" + signature = "rusEFI master.2023.11.30.prometheus_469.4024696691" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.prometheus_469.128905551" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.prometheus_469.4024696691" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:34:15 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:23:42 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6483,6 +6505,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 08cf0823cc..88fb29d7d9 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.proteus_f4.925483685" + signature = "rusEFI master.2023.11.30.proteus_f4.3747925145" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.proteus_f4.925483685" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.proteus_f4.3747925145" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:34:22 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:23:49 UTC 2023 pageSize = 27880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 27870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 27870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6498,6 +6520,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index db79113c2a..94531c5ac7 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.proteus_f7.925483685" + signature = "rusEFI master.2023.11.30.proteus_f7.3747925145" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.proteus_f7.925483685" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.proteus_f7.3747925145" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:34:20 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:23:46 UTC 2023 pageSize = 27880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 27870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 27870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6498,6 +6520,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 049a7d7be2..f983a43aea 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.proteus_h7.925483685" + signature = "rusEFI master.2023.11.30.proteus_h7.3747925145" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.proteus_h7.925483685" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.proteus_h7.3747925145" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:34:25 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:23:51 UTC 2023 pageSize = 27880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 27870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 27870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6498,6 +6520,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_s105.ini b/firmware/tunerstudio/generated/rusefi_s105.ini index 9bdd3b29de..bedf3ee8c2 100644 --- a/firmware/tunerstudio/generated/rusefi_s105.ini +++ b/firmware/tunerstudio/generated/rusefi_s105.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.s105.1477565625" + signature = "rusEFI master.2023.11.30.s105.2958873221" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.s105.1477565625" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.s105.2958873221" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","56 - MAP","16 - TPS","19 - Knock","39 - CLT","INVALID","opt 55 - AFR 2","opt 21 - AC Press","18 - AFR 1","13 - Ignition switch in (15)","44 - +12 sense (MR)","INVALID","na 37 - MAF","INVALID","INVALID","40 - IAT" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:34:08 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:23:35 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6489,6 +6511,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_small-can-board.ini b/firmware/tunerstudio/generated/rusefi_small-can-board.ini index 81b1a29a76..e7d4360602 100644 --- a/firmware/tunerstudio/generated/rusefi_small-can-board.ini +++ b/firmware/tunerstudio/generated/rusefi_small-can-board.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.small-can-board.984219859" + signature = "rusEFI master.2023.11.30.small-can-board.3538357999" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.small-can-board.984219859" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.small-can-board.3538357999" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","B2 - Analog/Digital Input","B3 - Analog/Digital Input","B4 - Analog/Digital Input","B5 - Analog/Digital Input","B7 - Analog/Digital Input","C1 - Analog/Digital Input","INVALID","INVALID","INVALID","A2 Battery Sense","INVALID","INVALID","C2 - Analog/Digital Input","C4 - Analog/Digital Input" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:33:56 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:23:23 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6488,6 +6510,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 874f86e033..480392fc23 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.subaru_eg33_f7.817363912" + signature = "rusEFI master.2023.11.30.subaru_eg33_f7.3640325620" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.subaru_eg33_f7.817363912" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.subaru_eg33_f7.3640325620" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","AUX0_18 - MAP Ain","INVALID","INVALID","B05 - MAF Ain","INVALID","AUX0_19 - IAT Ain","A02 - VBat","INVALID","A06 - Oxyg 2 Ain","A04 - EGR t Ain","INVALID","A18 - AUX0 Ain","B02 - TPS Ain","INVALID","A03 - Coolant t Ain","A06 - Oxyg 1 Ain" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:33:01 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:22:29 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6488,6 +6510,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_t-b-g.ini b/firmware/tunerstudio/generated/rusefi_t-b-g.ini index f39205b27c..2e9a126430 100644 --- a/firmware/tunerstudio/generated/rusefi_t-b-g.ini +++ b/firmware/tunerstudio/generated/rusefi_t-b-g.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.t-b-g.926563551" + signature = "rusEFI master.2023.11.30.t-b-g.3749130979" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.t-b-g.926563551" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.t-b-g.3749130979" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:34:10 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:23:37 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6488,6 +6510,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index d487313cf7..1df4dc71e5 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.tdg-pdm8.3180597501" + signature = "rusEFI master.2023.11.30.tdg-pdm8.1440292545" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.tdg-pdm8.3180597501" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.tdg-pdm8.1440292545" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","INVALID","Battery Sense","INVALID","INVALID","INVALID","Sense 7","Sense 8","Sense 1","Sense 2","Sense 3","Sense 4","Sense 5","Sense 6" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:34:38 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:24:05 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6488,6 +6510,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition diff --git a/firmware/tunerstudio/generated/rusefi_uaefi.ini b/firmware/tunerstudio/generated/rusefi_uaefi.ini index b30d9ec53d..c286f615c4 100644 --- a/firmware/tunerstudio/generated/rusefi_uaefi.ini +++ b/firmware/tunerstudio/generated/rusefi_uaefi.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.11.30.uaefi.2573691820" + signature = "rusEFI master.2023.11.30.uaefi.1898603920" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.11.30.uaefi.2573691820" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.11.30.uaefi.1898603920" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","215 CLT","227 IAT" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:33:35 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:23:02 UTC 2023 pageSize = 23880 page = 1 @@ -141,6 +141,9 @@ useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" cltSensorPulldown = bits, U32, 120, [26:26], "false", "true" iatSensorPulldown = bits, U32, 120, [27:27], "false", "true" allowIdenticalPps = bits, U32, 120, [28:28], "false", "true" +overrideVvtTriggerGaps = bits, U32, 120, [29:29], "false", "true" +unused30 = bits, U32, 120, [30:30], "false", "true" +unused31 = bits, U32, 120, [31:31], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -286,6 +289,7 @@ injectionPinMode = bits, U08, 614, [0:1], "default", "default inverted", "open c ignitionPinMode = bits, U08, 615, [0:1], "default", "default inverted", "open collector", "open collector inverted" fuelPumpPin = bits, U16, 616, [0:8], $output_pin_e_list fuelPumpPinMode = bits, U08, 618, [0:1], "default", "default inverted", "open collector", "open collector inverted" +gapVvtTrackingLengthOverride = scalar, S08, 619, "count", 1, 0, 1, 4, 0 malfunctionIndicatorPin = bits, U16, 620, [0:8], $output_pin_e_list malfunctionIndicatorPinMode = bits, U08, 622, [0:1], "default", "default inverted", "open collector", "open collector inverted" fanPinMode = bits, U08, 623, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1292,7 +1296,16 @@ simulatorCamPosition1 = scalar, U08, 4310, "", 1, 0, 0, 100, 0 simulatorCamPosition2 = scalar, U08, 4311, "", 1, 0, 0, 100, 0 simulatorCamPosition3 = scalar, U08, 4312, "", 1, 0, 0, 100, 0 simulatorCamPosition4 = scalar, U08, 4313, "", 1, 0, 0, 100, 0 -mainUnusedEnd = array, U08, 4314, [242], "units", 1, 0, 0, 1, 0 +unusedExplicitFilling2 = scalar, U16, 4314, "", 1, 0, 0, 32000, 0 +triggerVVTGapOverrideFrom1 = scalar, F32, 4316, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom2 = scalar, F32, 4320, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom3 = scalar, F32, 4324, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideFrom4 = scalar, F32, 4328, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 +triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 +mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1678,6 +1691,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ignitionPins10 = "ignitionPins 10" ignitionPins11 = "ignitionPins 11" ignitionPins12 = "ignitionPins 12" + gapVvtTrackingLengthOverride = "How many consecutive VVT gap rations have to match expected ranges for sync to happen" malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot." clutchDownPin = "Some cars have a switch to indicate that clutch pedal is all the way down" digitalPotentiometerChipSelect1 = "digitalPotentiometerChipSelect 1" @@ -2238,6 +2252,14 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 simulatorCamPosition2 = "simulatorCamPosition 2" simulatorCamPosition3 = "simulatorCamPosition 3" simulatorCamPosition4 = "simulatorCamPosition 4" + triggerVVTGapOverrideFrom1 = "triggerVVTGapOverrideFrom 1" + triggerVVTGapOverrideFrom2 = "triggerVVTGapOverrideFrom 2" + triggerVVTGapOverrideFrom3 = "triggerVVTGapOverrideFrom 3" + triggerVVTGapOverrideFrom4 = "triggerVVTGapOverrideFrom 4" + triggerVVTGapOverrideTo1 = "triggerVVTGapOverrideTo 1" + triggerVVTGapOverrideTo2 = "triggerVVTGapOverrideTo 2" + triggerVVTGapOverrideTo3 = "triggerVVTGapOverrideTo 3" + triggerVVTGapOverrideTo4 = "triggerVVTGapOverrideTo 4" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -6487,6 +6509,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Gap #4 to", triggerGapOverrideTo4, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 4 } field = "Gap #5 from", triggerGapOverrideFrom5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } field = "Gap #5 to", triggerGapOverrideTo5, { overrideTriggerGaps == 1 && gapTrackingLengthOverride >= 5 } + field = "Override well known VVT gaps", overrideVvtTriggerGaps + field = gapVvtTrackingLengthOverride, gapVvtTrackingLengthOverride, { overrideVvtTriggerGaps == 1 } + field = "First VVT gap from", triggerVVTGapOverrideFrom1 + field = "First VVT gap to", triggerVVTGapOverrideTo1 + field = "Second VVT gap from", triggerVVTGapOverrideFrom2 + field = "Second VVT gap to", triggerVVTGapOverrideTo2 + field = "VVT gap #3 from", triggerVVTGapOverrideFrom3 + field = "VVT gap #3 to", triggerVVTGapOverrideTo3 + field = "VVT gap #4 from", triggerVVTGapOverrideFrom4 + field = "VVT gap #4 to", triggerVVTGapOverrideTo4 dialog = trigger_advanced, "Advanced Trigger" field = "Require cam/VVT sync for ignition", isPhaseSyncRequiredForIgnition 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 2de9d3d932..84db1bb228 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 config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 00:34:47 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Nov 30 23:24:13 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1084,6 +1084,7 @@ public class Fields { public static final int SentEtbType_FORD_TYPE_1 = 2; public static final int SentEtbType_GM_TYPE_1 = 1; public static final int SentEtbType_NONE = 0; + public static final int SIGNATURE_HASH = 1259297189; public static final String SIMULATOR_TUNE_BIN_FILE_NAME = "generated/simulator_tune_image.bin"; public static final String SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX = "generated/simulator_tune_image"; public static final String SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX = ".bin"; @@ -1312,7 +1313,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 master.2023.11.30.f407-discovery.2739034009"; + public static final String TS_SIGNATURE = "rusEFI master.2023.11.30.f407-discovery.1259297189"; public static final char TS_SIMULATE_CAN = '>'; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; @@ -1376,6 +1377,7 @@ public class Fields { public static final int vvt_mode_e_VVT_SINGLE_TOOTH = 1; public static final int vvt_mode_e_VVT_TOYOTA_3_TOOTH = 2; public static final int vvt_mode_e_VVT_TOYOTA_4_1 = 6; + public static final int VVT_TRACKING_LENGTH = 4; public static final int WARNING_BUFFER_SIZE = 120; public static final int WWAE_TABLE_SIZE = 8; public static final Field ENGINETYPE = Field.create("ENGINETYPE", 0, FieldType.INT16).setScale(1.0).setBaseOffset(0); @@ -1424,6 +1426,7 @@ public class Fields { public static final Field CLTSENSORPULLDOWN = Field.create("CLTSENSORPULLDOWN", 120, FieldType.BIT, 26).setBaseOffset(0); public static final Field IATSENSORPULLDOWN = Field.create("IATSENSORPULLDOWN", 120, FieldType.BIT, 27).setBaseOffset(0); public static final Field ALLOWIDENTICALPPS = Field.create("ALLOWIDENTICALPPS", 120, FieldType.BIT, 28).setBaseOffset(0); + public static final Field OVERRIDEVVTTRIGGERGAPS = Field.create("OVERRIDEVVTTRIGGERGAPS", 120, FieldType.BIT, 29).setBaseOffset(0); public static final Field TPSMIN = Field.create("TPSMIN", 124, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field TPSMAX = Field.create("TPSMAX", 126, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field TPSERRORDETECTIONTOOLOW = Field.create("TPSERRORDETECTIONTOOLOW", 128, FieldType.INT16).setScale(1.0).setBaseOffset(0); @@ -1591,7 +1594,7 @@ public class Fields { public static final Field IGNITIONPINMODE = Field.create("IGNITIONPINMODE", 615, FieldType.INT8, pin_output_mode_e).setScale(1.0).setBaseOffset(0); public static final Field FUELPUMPPIN = Field.create("FUELPUMPPIN", 616, FieldType.INT16, output_pin_e).setScale(1.0).setBaseOffset(0); public static final Field FUELPUMPPINMODE = Field.create("FUELPUMPPINMODE", 618, FieldType.INT8, pin_output_mode_e).setScale(1.0).setBaseOffset(0); - public static final Field ALIGNMENTFILL_AT_619 = Field.create("ALIGNMENTFILL_AT_619", 619, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field GAPVVTTRACKINGLENGTHOVERRIDE = Field.create("GAPVVTTRACKINGLENGTHOVERRIDE", 619, FieldType.INT8).setScale(1.0).setBaseOffset(0); public static final Field MALFUNCTIONINDICATORPIN = Field.create("MALFUNCTIONINDICATORPIN", 620, FieldType.INT16, output_pin_e).setScale(1.0).setBaseOffset(0); public static final Field MALFUNCTIONINDICATORPINMODE = Field.create("MALFUNCTIONINDICATORPINMODE", 622, FieldType.INT8, pin_output_mode_e).setScale(1.0).setBaseOffset(0); public static final Field FANPINMODE = Field.create("FANPINMODE", 623, FieldType.INT8, pin_output_mode_e).setScale(1.0).setBaseOffset(0); @@ -2686,7 +2689,16 @@ public class Fields { public static final Field SIMULATORCAMPOSITION2 = Field.create("SIMULATORCAMPOSITION2", 4311, FieldType.INT8).setScale(1.0).setBaseOffset(0); public static final Field SIMULATORCAMPOSITION3 = Field.create("SIMULATORCAMPOSITION3", 4312, FieldType.INT8).setScale(1.0).setBaseOffset(0); public static final Field SIMULATORCAMPOSITION4 = Field.create("SIMULATORCAMPOSITION4", 4313, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field MAINUNUSEDEND = Field.create("MAINUNUSEDEND", 4314, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDEXPLICITFILLING2 = Field.create("UNUSEDEXPLICITFILLING2", 4314, FieldType.INT16).setScale(1.0).setBaseOffset(0); + public static final Field TRIGGERVVTGAPOVERRIDEFROM1 = Field.create("TRIGGERVVTGAPOVERRIDEFROM1", 4316, FieldType.FLOAT).setBaseOffset(0); + public static final Field TRIGGERVVTGAPOVERRIDEFROM2 = Field.create("TRIGGERVVTGAPOVERRIDEFROM2", 4320, FieldType.FLOAT).setBaseOffset(0); + public static final Field TRIGGERVVTGAPOVERRIDEFROM3 = Field.create("TRIGGERVVTGAPOVERRIDEFROM3", 4324, FieldType.FLOAT).setBaseOffset(0); + public static final Field TRIGGERVVTGAPOVERRIDEFROM4 = Field.create("TRIGGERVVTGAPOVERRIDEFROM4", 4328, FieldType.FLOAT).setBaseOffset(0); + public static final Field TRIGGERVVTGAPOVERRIDETO1 = Field.create("TRIGGERVVTGAPOVERRIDETO1", 4332, FieldType.FLOAT).setBaseOffset(0); + public static final Field TRIGGERVVTGAPOVERRIDETO2 = Field.create("TRIGGERVVTGAPOVERRIDETO2", 4336, FieldType.FLOAT).setBaseOffset(0); + public static final Field TRIGGERVVTGAPOVERRIDETO3 = Field.create("TRIGGERVVTGAPOVERRIDETO3", 4340, FieldType.FLOAT).setBaseOffset(0); + public static final Field TRIGGERVVTGAPOVERRIDETO4 = Field.create("TRIGGERVVTGAPOVERRIDETO4", 4344, FieldType.FLOAT).setBaseOffset(0); + public static final Field MAINUNUSEDEND = Field.create("MAINUNUSEDEND", 4348, FieldType.INT8).setScale(1.0).setBaseOffset(0); public static final Field ETBBIASBINS = Field.create("ETBBIASBINS", 4556, FieldType.FLOAT).setBaseOffset(0); public static final Field ETBBIASVALUES = Field.create("ETBBIASVALUES", 4588, FieldType.FLOAT).setBaseOffset(0); public static final Field IACPIDMULTTABLE = Field.create("IACPIDMULTTABLE", 4620, FieldType.INT8).setScale(0.05).setBaseOffset(0); @@ -3015,6 +3027,7 @@ public class Fields { CLTSENSORPULLDOWN, IATSENSORPULLDOWN, ALLOWIDENTICALPPS, + OVERRIDEVVTTRIGGERGAPS, TPSMIN, TPSMAX, TPSERRORDETECTIONTOOLOW, @@ -3173,7 +3186,7 @@ public class Fields { IGNITIONPINMODE, FUELPUMPPIN, FUELPUMPPINMODE, - ALIGNMENTFILL_AT_619, + GAPVVTTRACKINGLENGTHOVERRIDE, MALFUNCTIONINDICATORPIN, MALFUNCTIONINDICATORPINMODE, FANPINMODE, @@ -4248,6 +4261,15 @@ public class Fields { SIMULATORCAMPOSITION2, SIMULATORCAMPOSITION3, SIMULATORCAMPOSITION4, + UNUSEDEXPLICITFILLING2, + TRIGGERVVTGAPOVERRIDEFROM1, + TRIGGERVVTGAPOVERRIDEFROM2, + TRIGGERVVTGAPOVERRIDEFROM3, + TRIGGERVVTGAPOVERRIDEFROM4, + TRIGGERVVTGAPOVERRIDETO1, + TRIGGERVVTGAPOVERRIDETO2, + TRIGGERVVTGAPOVERRIDETO3, + TRIGGERVVTGAPOVERRIDETO4, MAINUNUSEDEND, ETBBIASBINS, ETBBIASVALUES,